fixes

Author: trask

api/testing-internal/src/main/java/io/opentelemetry/api/testing/internal/AbstractDefaultMeterTest.java

@@ -26,6 +26,7 @@
 
 /** Unit tests for No-op {@link Meter}. */
 @SuppressLogger
+@SuppressWarnings("this-escape")
 public abstract class AbstractDefaultMeterTest {
   private final Meter meter = getMeter();
 

api/testing-internal/src/main/java/io/opentelemetry/api/testing/internal/AbstractDefaultTracerTest.java

@@ -27,7 +27,7 @@
 /** Unit tests for No-op {@link Tracer}. */
 // Need to suppress warnings for MustBeClosed because Android 14 does not support
 // try-with-resources.
-@SuppressWarnings("MustBeClosedChecker")
+@SuppressWarnings({"MustBeClosedChecker", "this-escape"})
 public abstract class AbstractDefaultTracerTest {
   private final Tracer defaultTracer = getTracer();
   private static final String SPAN_NAME = "MySpanName";

buildSrc/build.gradle.kts

@@ -5,9 +5,9 @@ plugins {
   id("com.diffplug.spotless") version "8.0.0"
 }
 
-if (!hasLauncherForJavaVersion(17)) {
+if (!hasLauncherForJavaVersion(21)) {
   throw GradleException(
-    "JDK 17 is required to build and gradle was unable to detect it on the system.  " +
+    "JDK 21 is required to build and gradle was unable to detect it on the system.  " +
         "Please install it and see https://docs.gradle.org/current/userguide/toolchains.html#sec:auto_detection " +
         "for details on how gradle detects java toolchains."
   )
@@ -73,6 +73,6 @@ dependencies {
 // target.
 java {
   toolchain {
-    languageVersion.set(JavaLanguageVersion.of(17))
+    languageVersion.set(JavaLanguageVersion.of(21))
   }
 }

buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts

@@ -51,7 +51,6 @@ tasks {
 
         // We use animal sniffer
         disable("Java8ApiChecker")
-        disable("AndroidJdkLibsChecker")
 
         // apparently disabling android doesn't disable this
         disable("StaticOrDefaultInterfaceMethod")

buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -33,7 +33,7 @@ tasks.withType<AbstractArchiveTask>().configureEach {
 
 java {
   toolchain {
-    languageVersion.set(JavaLanguageVersion.of(17))
+    languageVersion.set(JavaLanguageVersion.of(21))
   }
 
   withJavadocJar()

context/src/main/java/io/opentelemetry/context/internal/shaded/WeakConcurrentMap.java

@@ -49,7 +49,8 @@
   "MissingSummary",
   "UngroupedOverloads",
   "ThreadPriorityCheck",
-  "FieldMissingNullable"
+  "FieldMissingNullable",
+  "this-escape"
 })
 public class WeakConcurrentMap<K, V>
     extends AbstractWeakConcurrentMap<K, V, WeakConcurrentMap.LookupKey<K>> {

exporters/common/src/main/java/io/opentelemetry/exporter/internal/FailedExportException.java

@@ -56,7 +56,7 @@ public static final class HttpExportException extends FailedExportException {
 
     private static final long serialVersionUID = -6787390183017184775L;
 
-    @Nullable private final HttpSender.Response response;
+    @Nullable private final transient HttpSender.Response response;
     @Nullable private final Throwable cause;
 
     private HttpExportException(@Nullable HttpSender.Response response, @Nullable Throwable cause) {
@@ -100,7 +100,7 @@ public static final class GrpcExportException extends FailedExportException {
 
     private static final long serialVersionUID = -9157548250286695364L;
 
-    @Nullable private final GrpcResponse response;
+    @Nullable private final transient GrpcResponse response;
     @Nullable private final Throwable cause;
 
     private GrpcExportException(@Nullable GrpcResponse response, @Nullable Throwable cause) {

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/AggregatorHandle.java

@@ -41,8 +41,8 @@ public abstract class AggregatorHandle<T extends PointData> {
   private final boolean isDoubleType;
   private volatile boolean valuesRecorded = false;
 
-  protected AggregatorHandle(ExemplarReservoirFactory reservoirFactory) {
-    this.isDoubleType = isDoubleType();
+  protected AggregatorHandle(ExemplarReservoirFactory reservoirFactory, boolean isDoubleType) {
+    this.isDoubleType = isDoubleType;
     if (isDoubleType) {
       this.doubleReservoirFactory = reservoirFactory.createDoubleExemplarReservoir();
       this.longReservoirFactory = null;
@@ -80,19 +80,6 @@ public final T aggregateThenMaybeReset(
         reset);
   }
 
-  /**
-   * Indicates whether this {@link AggregatorHandle} supports double or long values.
-   *
-   * <p>If it supports doubles, it MUST implement {@link #doAggregateThenMaybeResetDoubles(long,
-   * long, Attributes, List, boolean)} and {@link #doRecordDouble(double)}.
-   *
-   * <p>If it supports long, it MUST implement {@link #doAggregateThenMaybeResetLongs(long, long,
-   * Attributes, List, boolean)} and {@link #doRecordLong(long)}.
-   *
-   * @return true if it supports doubles, false if it supports longs.
-   */
-  protected abstract boolean isDoubleType();
-
   /** Implementation of the {@link #aggregateThenMaybeReset(long, long, Attributes, boolean)} . */
   protected T doAggregateThenMaybeResetDoubles(
       long startEpochNanos,

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/DoubleBase2ExponentialHistogramAggregator.java

@@ -100,7 +100,7 @@ static final class Handle extends AggregatorHandle<ExponentialHistogramPointData
         int maxBuckets,
         int maxScale,
         MemoryMode memoryMode) {
-      super(reservoirFactory);
+      super(reservoirFactory, /* isDoubleType= */ true);
       this.maxBuckets = maxBuckets;
       this.maxScale = maxScale;
       this.sum = 0;
@@ -260,11 +260,6 @@ protected synchronized void doRecordDouble(double value) {
       }
     }
 
-    @Override
-    protected boolean isDoubleType() {
-      return true;
-    }
-
     @Override
     public void recordLong(long value, Attributes attributes, Context context) {
       // Since there is no LongExplicitBucketHistogramAggregator and we need to support measurements

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/aggregator/DoubleExplicitBucketHistogramAggregator.java

@@ -110,14 +110,14 @@ static final class Handle extends AggregatorHandle<HistogramPointData> {
     private final long[] counts;
 
     // Used only when MemoryMode = REUSABLE_DATA
-    @Nullable private MutableHistogramPointData reusablePoint;
+    @Nullable private final MutableHistogramPointData reusablePoint;
 
     Handle(
         List<Double> boundaryList,
         double[] boundaries,
         ExemplarReservoirFactory reservoirFactory,
         MemoryMode memoryMode) {
-      super(reservoirFactory);
+      super(reservoirFactory, /* isDoubleType= */ true);
       this.boundaryList = boundaryList;
       this.boundaries = boundaries;
       this.counts = new long[this.boundaries.length + 1];
@@ -127,6 +127,8 @@ static final class Handle extends AggregatorHandle<HistogramPointData> {
       this.count = 0;
       if (memoryMode == MemoryMode.REUSABLE_DATA) {
         this.reusablePoint = new MutableHistogramPointData(counts.length);
+      } else {
+        this.reusablePoint = null;
       }
     }
 
@@ -138,11 +140,6 @@ public void recordLong(long value, Attributes attributes, Context context) {
       super.recordDouble((double) value, attributes, context);
     }
 
-    @Override
-    protected boolean isDoubleType() {
-      return true;
-    }
-
     @Override
     protected HistogramPointData doAggregateThenMaybeResetDoubles(
         long startEpochNanos,