Update errorprone (open-telemetry#4346)

anuraaga · web-flow · commit d78cadabaa5e · 2022-04-08T08:12:57.000+09:00
diff --git a/api/all/src/main/java/io/opentelemetry/api/GlobalOpenTelemetry.java b/api/all/src/main/java/io/opentelemetry/api/GlobalOpenTelemetry.java
@@ -40,6 +40,8 @@
  * @see TracerProvider
  * @see ContextPropagators
  */
+// We intentionally assign to be use for error reporting.
+@SuppressWarnings("StaticAssignmentOfThrowable")
 public final class GlobalOpenTelemetry {
 
   private static final Logger logger = Logger.getLogger(GlobalOpenTelemetry.class.getName());
diff --git a/buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts
@@ -21,6 +21,9 @@ tasks {
         disableWarningsInGeneratedCode.set(true)
         allDisabledChecksAsWarnings.set(true)
 
+        // Still Java 8
+        disable("Varifier")
+
         // Doesn't currently use Var annotations.
         disable("Var") // "-Xep:Var:OFF"
 
@@ -49,7 +52,6 @@ tasks {
         disable("StaticOrDefaultInterfaceMethod")
 
         // Limits APIs
-        disable("NoFunctionalReturnType")
         disable("PreferredInterfaceType")
 
         // We don't depend on Guava so use normal splitting
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -34,7 +34,7 @@ val DEPENDENCY_SETS = listOf(
   ),
   DependencySet(
     "com.google.errorprone",
-    "2.11.0",
+    "2.12.1",
     listOf("error_prone_annotations", "error_prone_core")
   ),
   DependencySet(
diff --git a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/marshal/CodedOutputStream.java b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/marshal/CodedOutputStream.java
@@ -62,7 +62,7 @@
 // - No support for writing fields with tag, we alway write tags separately
 // - Allow resetting and use a ThreadLocal instance
 //
-@SuppressWarnings({"UnnecessaryFinal", "UngroupedOverloads", "InlineMeSuggester"})
+@SuppressWarnings({"UnnecessaryFinal", "UngroupedOverloads", "InlineMeSuggester", "UnusedVariable"})
 public abstract class CodedOutputStream {
 
   /** The buffer size used in {@link #newInstance(OutputStream)}. */
diff --git a/exporters/prometheus/src/integrationTest/java/io/opentelemetry/exporter/prometheus/MetricAdapter.java b/exporters/prometheus/src/integrationTest/java/io/opentelemetry/exporter/prometheus/MetricAdapter.java
@@ -141,7 +141,7 @@ static List<Sample> toSamples(
                   name,
                   labelNames,
                   labelValues,
-                  longPoint.getValue(),
+                  (double) longPoint.getValue(),
                   // Prometheus doesn't support exemplars on SUM/GAUGE
                   null,
                   longPoint.getEpochNanos()));
@@ -171,7 +171,7 @@ private static void addSummarySamples(
             name + SAMPLE_SUFFIX_COUNT,
             labelNames,
             labelValues,
-            doubleSummaryPoint.getCount(),
+            (double) doubleSummaryPoint.getCount(),
             null,
             doubleSummaryPoint.getEpochNanos()));
 
@@ -214,7 +214,7 @@ private static void addHistogramSamples(
             name + SAMPLE_SUFFIX_COUNT,
             labelNames,
             labelValues,
-            histogramPointData.getCount(),
+            (double) histogramPointData.getCount(),
             null,
             histogramPointData.getEpochNanos()));
 
@@ -247,7 +247,7 @@ private static void addHistogramSamples(
               name + SAMPLE_SUFFIX_BUCKET,
               labelNamesWithLe,
               labelValuesWithLe,
-              cumulativeCount,
+              (double) cumulativeCount,
               filterExemplars(
                   histogramPointData.getExemplars(),
                   Serializer.getBucketLowerBound(histogramPointData, i),
diff --git a/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/Serializer.java b/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/Serializer.java
@@ -145,7 +145,7 @@ private void write(MetricData metric, Writer writer) throws IOException {
           writePoint(
               writer,
               name,
-              ((LongPointData) point).getValue(),
+              (double) ((LongPointData) point).getValue(),
               point.getAttributes(),
               point.getEpochNanos());
           break;
@@ -164,7 +164,11 @@ private void write(MetricData metric, Writer writer) throws IOException {
   private void writeHistogram(Writer writer, String name, HistogramPointData point)
       throws IOException {
     writePoint(
-        writer, name + "_count", point.getCount(), point.getAttributes(), point.getEpochNanos());
+        writer,
+        name + "_count",
+        (double) point.getCount(),
+        point.getAttributes(),
+        point.getEpochNanos());
     writePoint(writer, name + "_sum", point.getSum(), point.getAttributes(), point.getEpochNanos());
 
     long cumulativeCount = 0;
@@ -178,7 +182,7 @@ private void writeHistogram(Writer writer, String name, HistogramPointData point
       writePoint(
           writer,
           name + "_bucket",
-          cumulativeCount,
+          (double) cumulativeCount,
           point.getAttributes(),
           point.getEpochNanos(),
           "le",
@@ -212,7 +216,11 @@ static double getBucketUpperBound(HistogramPointData point, int bucketIndex) {
 
   private void writeSummary(Writer writer, String name, SummaryPointData point) throws IOException {
     writePoint(
-        writer, name + "_count", point.getCount(), point.getAttributes(), point.getEpochNanos());
+        writer,
+        name + "_count",
+        (double) point.getCount(),
+        point.getAttributes(),
+        point.getEpochNanos());
     writePoint(writer, name + "_sum", point.getSum(), point.getAttributes(), point.getEpochNanos());
 
     List<ValueAtQuantile> valueAtQuantiles = point.getValues();
diff --git a/integration-tests/tracecontext/src/main/java/io/opentelemetry/Application.java b/integration-tests/tracecontext/src/main/java/io/opentelemetry/Application.java
@@ -75,7 +75,7 @@ public void set(@Nullable RequestHeadersBuilder carrier, String key, String valu
     }
   }
 
-  private static class Service {
+  static class Service {
     private final WebClient client = WebClient.of();
 
     @Post("/verify-tracecontext")
diff --git a/micrometer1-shim/src/main/java/io/opentelemetry/micrometer1shim/OpenTelemetryTimer.java b/micrometer1-shim/src/main/java/io/opentelemetry/micrometer1shim/OpenTelemetryTimer.java
@@ -23,6 +23,7 @@
 import io.opentelemetry.api.metrics.ObservableDoubleGauge;
 import java.util.Collections;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.DoubleAdder;
 import java.util.concurrent.atomic.LongAdder;
 
 final class OpenTelemetryTimer extends AbstractTimer implements RemovableMeter {
@@ -80,7 +81,7 @@ boolean isUsingMicrometerHistograms() {
   @Override
   protected void recordNonNegative(long amount, TimeUnit unit) {
     if (!removed) {
-      long nanos = unit.toNanos(amount);
+      double nanos = (double) unit.toNanos(amount);
       double time = TimeUtils.nanosToUnit(nanos, baseTimeUnit);
       otelHistogram.record(time, attributes);
       measurements.record(nanos);
@@ -116,7 +117,7 @@ public void onRemove() {
   }
 
   private interface Measurements {
-    void record(long nanos);
+    void record(double nanos);
 
     long count();
 
@@ -129,7 +130,7 @@ enum NoopMeasurements implements Measurements {
     INSTANCE;
 
     @Override
-    public void record(long nanos) {}
+    public void record(double nanos) {}
 
     @Override
     public long count() {
@@ -149,10 +150,10 @@ public double totalTime(TimeUnit unit) {
   private static final class MicrometerHistogramMeasurements implements Measurements {
 
     private final LongAdder count = new LongAdder();
-    private final LongAdder totalTime = new LongAdder();
+    private final DoubleAdder totalTime = new DoubleAdder();
 
     @Override
-    public void record(long nanos) {
+    public void record(double nanos) {
       count.increment();
       totalTime.add(nanos);
     }
diff --git a/sdk-extensions/zpages/src/main/java/io/opentelemetry/sdk/extension/zpages/LatencyBoundary.java b/sdk-extensions/zpages/src/main/java/io/opentelemetry/sdk/extension/zpages/LatencyBoundary.java
@@ -12,6 +12,9 @@
  * io.opentelemetry.api.trace.Status#OK} are categorized into one of these buckets om the traceZ
  * zPage.
  */
+// TODO(anuraaga): Consider renaming the enums that don't follow our standard convention for
+// constants.
+@SuppressWarnings("MemberName")
 enum LatencyBoundary {
   /** Stores finished successful requests of duration within the interval [0, 10us). */
   ZERO_MICROSx10(0, TimeUnit.MICROSECONDS.toNanos(10)),
diff --git a/sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/TestSdk.java b/sdk/metrics/src/jmh/java/io/opentelemetry/sdk/metrics/TestSdk.java
@@ -63,13 +63,13 @@ public Meter getMeter() {
   }
 
   public Tracer getTracer() {
-    return sdkBuilder.buildTracer();
+    return SdkBuilder.buildTracer();
   }
 
   private abstract static class SdkBuilder {
     abstract Meter build();
 
-    protected Tracer buildTracer() {
+    protected static Tracer buildTracer() {
       return SdkTracerProvider.builder()
           .setSampler(Sampler.alwaysOn())
           .build()
diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/state/CallbackRegistrationTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/state/CallbackRegistrationTest.java
@@ -21,7 +21,7 @@
 import io.opentelemetry.sdk.metrics.internal.descriptor.InstrumentDescriptor;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -74,7 +74,7 @@ void invokeCallback_Double() {
 
   @Test
   void invokeCallback_Long() {
-    AtomicLong counter = new AtomicLong();
+    AtomicInteger counter = new AtomicInteger();
     Consumer<ObservableDoubleMeasurement> callback =
         measurement ->
             measurement.record(
@@ -92,7 +92,7 @@ void invokeCallback_Long() {
 
   @Test
   void invokeCallback_NoStorage() {
-    AtomicLong counter = new AtomicLong();
+    AtomicInteger counter = new AtomicInteger();
     Consumer<ObservableDoubleMeasurement> callback =
         measurement ->
             measurement.record(
diff --git a/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/testbed/errorreporting/ErrorReportingTest.java b/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/testbed/errorreporting/ErrorReportingTest.java
@@ -114,7 +114,6 @@ void testErrorRecovery() {
   void testInstrumentationLayer() {
     Span span = tracer.spanBuilder("one").startSpan();
     try (Scope ignored = span.makeCurrent()) {
-      // ScopedRunnable captures the active Span at this time.
       executor.submit(
           new ScopedRunnable(
               () -> {
@@ -125,8 +124,7 @@ void testInstrumentationLayer() {
                 } finally {
                   Span.current().end();
                 }
-              },
-              tracer));
+              }));
     }
 
     await()
@@ -139,13 +137,11 @@ void testInstrumentationLayer() {
   }
 
   private static class ScopedRunnable implements Runnable {
-    Runnable runnable;
-    Tracer tracer;
-    Span span;
+    private final Runnable runnable;
+    private final Span span;
 
-    private ScopedRunnable(Runnable runnable, Tracer tracer) {
+    private ScopedRunnable(Runnable runnable) {
       this.runnable = runnable;
-      this.tracer = tracer;
       this.span = Span.current();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public void set(@Nullable RequestHeadersBuilder carrier, String key, String valu`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
`78`		`- private static class Service {`
	`78`	`+ static class Service {`
`79`	`79`	`private final WebClient client = WebClient.of();`
`80`	`80`
`81`	`81`	`@Post("/verify-tracecontext")`
Original file line number	Diff line number	Diff line change
`@@ -63,13 +63,13 @@ public Meter getMeter() {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`public Tracer getTracer() {`
`66`		`- return sdkBuilder.buildTracer();`
	`66`	`+ return SdkBuilder.buildTracer();`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`private abstract static class SdkBuilder {`
`70`	`70`	`abstract Meter build();`
`71`	`71`
`72`		`- protected Tracer buildTracer() {`
	`72`	`+ protected static Tracer buildTracer() {`
`73`	`73`	`return SdkTracerProvider.builder()`
`74`	`74`	`.setSampler(Sampler.alwaysOn())`
`75`	`75`	`.build()`