aboutsummaryrefslogtreecommitdiffstats
path: root/api/src
diff options
context:
space:
mode:
authorBogdan Drutu <bdrutu@google.com>2018-01-17 10:03:55 -0800
committerGitHub <noreply@github.com>2018-01-17 10:03:55 -0800
commit26232c4d43e7351bef06ffb2e1c20c5b90f6cf4c (patch)
treea1551fe63773a8a80ed3b5b0252dbc75b39970ed /api/src
parent64d05837e565b336865a82a570115d752b88c1ef (diff)
downloadplatform_external_opencensus-java-26232c4d43e7351bef06ffb2e1c20c5b90f6cf4c.tar.gz
platform_external_opencensus-java-26232c4d43e7351bef06ffb2e1c20c5b90f6cf4c.tar.bz2
platform_external_opencensus-java-26232c4d43e7351bef06ffb2e1c20c5b90f6cf4c.zip
Update errorprone, google cloud java, grpc versions. (#931)
Diffstat (limited to 'api/src')
-rw-r--r--api/src/main/java/io/opencensus/trace/SpanBuilder.java6
-rw-r--r--api/src/main/java/io/opencensus/trace/Tracer.java6
-rw-r--r--api/src/test/java/io/opencensus/tags/TagContextTest.java2
3 files changed, 7 insertions, 7 deletions
diff --git a/api/src/main/java/io/opencensus/trace/SpanBuilder.java b/api/src/main/java/io/opencensus/trace/SpanBuilder.java
index 0a7c9177..04c339ff 100644
--- a/api/src/main/java/io/opencensus/trace/SpanBuilder.java
+++ b/api/src/main/java/io/opencensus/trace/SpanBuilder.java
@@ -221,7 +221,7 @@ public abstract class SpanBuilder {
*/
@MustBeClosed
public final Scope startScopedSpan() {
- return CurrentSpanUtils.withSpan(startSpan(), true);
+ return CurrentSpanUtils.withSpan(startSpan(), /* endSpan= */ true);
}
/**
@@ -251,7 +251,7 @@ public abstract class SpanBuilder {
*/
public final void startSpanAndRun(final Runnable runnable) {
final Span span = startSpan();
- CurrentSpanUtils.withSpan(span, true, runnable).run();
+ CurrentSpanUtils.withSpan(span, /* endSpan= */ true, runnable).run();
}
/**
@@ -283,7 +283,7 @@ public abstract class SpanBuilder {
*/
public final <V> V startSpanAndCall(Callable<V> callable) throws Exception {
final Span span = startSpan();
- return CurrentSpanUtils.withSpan(span, true, callable).call();
+ return CurrentSpanUtils.withSpan(span, /* endSpan= */ true, callable).call();
}
static final class NoopSpanBuilder extends SpanBuilder {
diff --git a/api/src/main/java/io/opencensus/trace/Tracer.java b/api/src/main/java/io/opencensus/trace/Tracer.java
index cd4fc822..22b98da5 100644
--- a/api/src/main/java/io/opencensus/trace/Tracer.java
+++ b/api/src/main/java/io/opencensus/trace/Tracer.java
@@ -148,7 +148,7 @@ public abstract class Tracer {
*/
@MustBeClosed
public final Scope withSpan(Span span) {
- return CurrentSpanUtils.withSpan(checkNotNull(span, "span"), false);
+ return CurrentSpanUtils.withSpan(checkNotNull(span, "span"), /* endSpan= */ false);
}
/**
@@ -213,7 +213,7 @@ public abstract class Tracer {
* @since 0.11.0
*/
public final Runnable withSpan(Span span, Runnable runnable) {
- return CurrentSpanUtils.withSpan(span, false, runnable);
+ return CurrentSpanUtils.withSpan(span, /* endSpan= */ false, runnable);
}
/**
@@ -278,7 +278,7 @@ public abstract class Tracer {
* @since 0.11.0
*/
public final <C> Callable<C> withSpan(Span span, final Callable<C> callable) {
- return CurrentSpanUtils.withSpan(span, false, callable);
+ return CurrentSpanUtils.withSpan(span, /* endSpan= */ false, callable);
}
/**
diff --git a/api/src/test/java/io/opencensus/tags/TagContextTest.java b/api/src/test/java/io/opencensus/tags/TagContextTest.java
index b5c44b15..05473255 100644
--- a/api/src/test/java/io/opencensus/tags/TagContextTest.java
+++ b/api/src/test/java/io/opencensus/tags/TagContextTest.java
@@ -84,7 +84,7 @@ public final class TagContextTest {
}
private static final class SimpleTagContext extends TagContext {
- private final List<Tag> tags;
+ @Nullable private final List<Tag> tags;
// This Error Prone warning doesn't seem correct, because the constructor is just calling
// another constructor.