From 26232c4d43e7351bef06ffb2e1c20c5b90f6cf4c Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Wed, 17 Jan 2018 10:03:55 -0800 Subject: Update errorprone, google cloud java, grpc versions. (#931) --- .../main/java/io/opencensus/trace/SpanBuilder.java | 6 +++--- api/src/main/java/io/opencensus/trace/Tracer.java | 6 +++--- .../test/java/io/opencensus/tags/TagContextTest.java | 2 +- build.gradle | 6 +++--- .../opencensus/contrib/zpages/ZPageHttpHandler.java | 12 +++++++----- .../StackdriverV2ExporterHandlerProtoTest.java | 2 +- gradle/errorprone/experimental_errors | 2 +- gradle/errorprone/experimental_suggestions | 10 +++++++--- gradle/errorprone/experimental_warnings | 3 +++ gradle/errorprone/warnings | 19 ++++++++++++++++--- .../trace/internal/ConcurrentIntrusiveListTest.java | 5 +++-- 11 files changed, 48 insertions(+), 25 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 startSpanAndCall(Callable 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 Callable withSpan(Span span, final Callable 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 tags; + @Nullable private final List tags; // This Error Prone warning doesn't seem correct, because the constructor is just calling // another constructor. diff --git a/build.gradle b/build.gradle index 0cae27c1..063a2402 100644 --- a/build.gradle +++ b/build.gradle @@ -133,11 +133,11 @@ subprojects { ext { autoValueVersion = '1.4' findBugsVersion = '3.0.1' - errorProneVersion = '2.1.2' - grpcVersion = '1.8.0' + errorProneVersion = '2.2.0' + grpcVersion = '1.9.0' guavaVersion = '19.0' googleAuthVersion = '0.9.0' - googleCloudVersion = '0.30.0-beta' + googleCloudVersion = '0.32.0-beta' signalfxVersion = '0.0.39' zipkinReporterVersion = '2.0.0' diff --git a/contrib/zpages/src/main/java/io/opencensus/contrib/zpages/ZPageHttpHandler.java b/contrib/zpages/src/main/java/io/opencensus/contrib/zpages/ZPageHttpHandler.java index 9c05446b..975bdfcb 100644 --- a/contrib/zpages/src/main/java/io/opencensus/contrib/zpages/ZPageHttpHandler.java +++ b/contrib/zpages/src/main/java/io/opencensus/contrib/zpages/ZPageHttpHandler.java @@ -17,6 +17,7 @@ package io.opencensus.contrib.zpages; import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Splitter; import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpHandler; import io.opencensus.common.Scope; @@ -28,6 +29,7 @@ import java.net.URI; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; +import java.util.List; import java.util.Map; /** An {@link HttpHandler} that can be used to render HTML pages using any {@code ZPageHandler}. */ @@ -73,12 +75,12 @@ final class ZPageHttpHandler implements HttpHandler { return Collections.emptyMap(); } Map result = new HashMap(); - for (String param : query.split("&")) { - String[] pair = param.split("="); - if (pair.length > 1) { - result.put(pair[0], pair[1]); + for (String param : Splitter.on("&").split(query)) { + List splits = Splitter.on("=").splitToList(param); + if (splits.size() > 1) { + result.put(splits.get(0), splits.get(1)); } else { - result.put(pair[0], ""); + result.put(splits.get(0), ""); } } return result; diff --git a/exporters/trace/stackdriver/src/test/java/io/opencensus/exporter/trace/stackdriver/StackdriverV2ExporterHandlerProtoTest.java b/exporters/trace/stackdriver/src/test/java/io/opencensus/exporter/trace/stackdriver/StackdriverV2ExporterHandlerProtoTest.java index a9a50e47..9f012d2a 100644 --- a/exporters/trace/stackdriver/src/test/java/io/opencensus/exporter/trace/stackdriver/StackdriverV2ExporterHandlerProtoTest.java +++ b/exporters/trace/stackdriver/src/test/java/io/opencensus/exporter/trace/stackdriver/StackdriverV2ExporterHandlerProtoTest.java @@ -131,7 +131,7 @@ public final class StackdriverV2ExporterHandlerProtoTest { SpanData.create( spanContext, parentSpanId, - true, + /* hasRemoteParent= */ true, SPAN_NAME, startTimestamp, attributes, diff --git a/gradle/errorprone/experimental_errors b/gradle/errorprone/experimental_errors index 5ce6e181..f791feda 100644 --- a/gradle/errorprone/experimental_errors +++ b/gradle/errorprone/experimental_errors @@ -22,6 +22,6 @@ errorProneExperimentalErrors = \ -Xep:NumericEquality:ERROR,\ -Xep:ParameterPackage:ERROR,\ -Xep:ProtoStringFieldReferenceEquality:ERROR,\ --Xep:QualifierOrScopeOnInjectMethod:ERROR,\ +-Xep:RestrictTo:ERROR,\ -Xep:StaticOrDefaultInterfaceMethod:ERROR,\ -Xep:UnlockMethod:ERROR diff --git a/gradle/errorprone/experimental_suggestions b/gradle/errorprone/experimental_suggestions index c330674c..d44049e9 100644 --- a/gradle/errorprone/experimental_suggestions +++ b/gradle/errorprone/experimental_suggestions @@ -1,13 +1,15 @@ -# FieldMissingNullable is turned off due to -# https://github.com/google/error-prone/issues/823. +# FieldMissingNullable is marked as WARN +# detects errors in autovalue generated code. # ReturnMissingNullable is turned off because it # conflicts with Checker Framework null analysis. errorProneExperimentalSuggestions = \ +-Xep:BooleanParameter:ERROR,\ -Xep:ConstantField:ERROR,\ -Xep:EmptySetMultibindingContributions:ERROR,\ --Xep:FieldMissingNullable:OFF,\ +-Xep:FieldMissingNullable:WARN,\ +-Xep:LambdaFunctionalInterface:ERROR,\ -Xep:MethodCanBeStatic:ERROR,\ -Xep:MixedArrayDimensions:ERROR,\ -Xep:MultiVariableDeclaration:ERROR,\ @@ -20,7 +22,9 @@ errorProneExperimentalSuggestions = \ -Xep:PrivateConstructorForUtilityClass:ERROR,\ -Xep:RemoveUnusedImports:ERROR,\ -Xep:ReturnMissingNullable:OFF,\ +-Xep:SwitchDefault:ERROR,\ -Xep:ThrowsUncheckedException:ERROR,\ +-Xep:TypeParameterNaming:ERROR,\ -Xep:UngroupedOverloads:ERROR,\ -Xep:UnnecessarySetDefault:ERROR,\ -Xep:UnnecessaryStaticImport:ERROR,\ diff --git a/gradle/errorprone/experimental_warnings b/gradle/errorprone/experimental_warnings index b5a7df2b..c89cf2f1 100644 --- a/gradle/errorprone/experimental_warnings +++ b/gradle/errorprone/experimental_warnings @@ -2,11 +2,13 @@ errorProneExperimentalWarnings = \ -Xep:AssertFalse:ERROR,\ -Xep:AssistedInjectAndInjectOnConstructors:ERROR,\ -Xep:BigDecimalLiteralDouble:ERROR,\ +-Xep:BinderIdentityRestoredDangerously:ERROR,\ -Xep:BindingToUnqualifiedCommonType:ERROR,\ -Xep:ConstructorInvokesOverridable:ERROR,\ -Xep:ConstructorLeaksThis:ERROR,\ -Xep:EmptyTopLevelDeclaration:ERROR,\ -Xep:ExpectedExceptionChecker:ERROR,\ +-Xep:FunctionalInterfaceClash:ERROR,\ -Xep:HardCodedSdCardPath:ERROR,\ -Xep:InconsistentOverloads:ERROR,\ -Xep:MissingDefault:ERROR,\ @@ -18,6 +20,7 @@ errorProneExperimentalWarnings = \ -Xep:RedundantThrows:ERROR,\ -Xep:StaticQualifiedUsingExpression:ERROR,\ -Xep:StringEquality:ERROR,\ +-Xep:StringSplit:ERROR,\ -Xep:TestExceptionChecker:ERROR,\ -Xep:UnnecessaryDefaultInEnumSwitch:ERROR,\ -Xep:Var:OFF diff --git a/gradle/errorprone/warnings b/gradle/errorprone/warnings index da7302dd..3a8bb2f5 100644 --- a/gradle/errorprone/warnings +++ b/gradle/errorprone/warnings @@ -1,3 +1,6 @@ +# NarrowingCompoundAssignment is marked as WARN +# detects errors in autovalue generated code. + errorProneWarnings = \ -Xep:AmbiguousMethodReference:ERROR,\ -Xep:ArgumentSelectionDefectChecker:ERROR,\ @@ -8,22 +11,26 @@ errorProneWarnings = \ -Xep:BoxedPrimitiveConstructor:ERROR,\ -Xep:CannotMockFinalClass:ERROR,\ -Xep:CanonicalDuration:ERROR,\ +-Xep:CatchFail:ERROR,\ -Xep:ClassCanBeStatic:ERROR,\ -Xep:ClassNewInstance:ERROR,\ -Xep:CollectionToArraySafeParameter:ERROR,\ -Xep:CollectorShouldNotUseState:ERROR,\ -Xep:ComparableAndComparator:ERROR,\ +-Xep:DateFormatConstant:ERROR,\ -Xep:DefaultCharset:ERROR,\ -Xep:DoubleCheckedLocking:ERROR,\ -Xep:EqualsHashCode:ERROR,\ -Xep:EqualsIncompatibleType:ERROR,\ +-Xep:FallThrough:ERROR,\ -Xep:Finally:ERROR,\ +-Xep:FloatCast:ERROR,\ -Xep:FloatingPointLiteralPrecision:ERROR,\ -Xep:FragmentInjection:ERROR,\ -Xep:FragmentNotInstantiable:ERROR,\ --Xep:FunctionalInterfaceClash:ERROR,\ -Xep:FutureReturnValueIgnored:ERROR,\ -Xep:GetClassOnEnum:ERROR,\ +-Xep:HidingField:ERROR,\ -Xep:ImmutableAnnotationChecker:ERROR,\ -Xep:ImmutableEnumChecker:ERROR,\ -Xep:IncompatibleModifiers:ERROR,\ @@ -39,11 +46,12 @@ errorProneWarnings = \ -Xep:JavaLangClash:ERROR,\ -Xep:JdkObsolete:ERROR,\ -Xep:LogicalAssignment:ERROR,\ +-Xep:MissingCasesInEnumSwitch:ERROR,\ -Xep:MissingFail:ERROR,\ -Xep:MissingOverride:ERROR,\ +-Xep:ModifyCollectionInEnhancedForLoop:ERROR,\ -Xep:MultipleParallelOrSequentialCalls:ERROR,\ -Xep:MutableConstantField:ERROR,\ --Xep:NamedParameters:ERROR,\ -Xep:NarrowingCompoundAssignment:WARN,\ -Xep:NestedInstanceOfConditions:ERROR,\ -Xep:NonAtomicVolatileUpdate:ERROR,\ @@ -59,17 +67,22 @@ errorProneWarnings = \ -Xep:ParameterName:ERROR,\ -Xep:PreconditionsInvalidPlaceholder:ERROR,\ -Xep:ProtoFieldPreconditionsCheckNotNull:ERROR,\ +-Xep:QualifierOrScopeOnInjectMethod:ERROR,\ +-Xep:ReachabilityFenceUsage:ERROR,\ -Xep:ReferenceEquality:ERROR,\ -Xep:RequiredModifiers:ERROR,\ -Xep:ShortCircuitBoolean:ERROR,\ --Xep:SimpleDateFormatConstant:ERROR,\ -Xep:StaticGuardedByInstance:ERROR,\ +-Xep:StringSplitter:ERROR,\ -Xep:SynchronizeOnNonFinalField:ERROR,\ -Xep:ThreadJoinLoop:ERROR,\ +-Xep:ThreadLocalUsage:ERROR,\ +-Xep:ThreeLetterTimeZoneID:ERROR,\ -Xep:TruthConstantAsserts:ERROR,\ -Xep:TypeParameterShadowing:ERROR,\ -Xep:TypeParameterUnusedInFormals:ERROR,\ -Xep:URLEqualsHashCode:ERROR,\ +-Xep:UnsafeFinalization:ERROR,\ -Xep:UnsynchronizedOverridesSynchronized:ERROR,\ -Xep:UseCorrectAssertInTests:ERROR,\ -Xep:WaitNotInLoop:ERROR,\ diff --git a/impl_core/src/test/java/io/opencensus/implcore/trace/internal/ConcurrentIntrusiveListTest.java b/impl_core/src/test/java/io/opencensus/implcore/trace/internal/ConcurrentIntrusiveListTest.java index c78f435f..d7ac2ae8 100644 --- a/impl_core/src/test/java/io/opencensus/implcore/trace/internal/ConcurrentIntrusiveListTest.java +++ b/impl_core/src/test/java/io/opencensus/implcore/trace/internal/ConcurrentIntrusiveListTest.java @@ -19,6 +19,7 @@ package io.opencensus.implcore.trace.internal; import static com.google.common.truth.Truth.assertThat; import io.opencensus.implcore.trace.internal.ConcurrentIntrusiveList.Element; +import javax.annotation.Nullable; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -96,8 +97,8 @@ public class ConcurrentIntrusiveListTest { } private static final class FakeElement implements Element { - private FakeElement next = null; - private FakeElement prev = null; + @Nullable private FakeElement next = null; + @Nullable private FakeElement prev = null; @Override public FakeElement getNext() { -- cgit v1.2.3