updates

Author: trask

instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleCounterBuilder.java

@@ -7,6 +7,7 @@
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.metrics.DoubleCounterBuilder;
+import io.opentelemetry.api.metrics.ObservableDoubleMeasurement;
 import java.util.function.Consumer;
 
 public class ApplicationDoubleCounterBuilder
@@ -42,7 +43,7 @@ public application.io.opentelemetry.api.metrics.DoubleCounter build() {
   public application.io.opentelemetry.api.metrics.ObservableDoubleCounter buildWithCallback(
       Consumer<application.io.opentelemetry.api.metrics.ObservableDoubleMeasurement>
           applicationCallback) {
-    Consumer<io.opentelemetry.api.metrics.ObservableDoubleMeasurement> callback =
+    Consumer<ObservableDoubleMeasurement> callback =
         agentMeasurement ->
             applicationCallback.accept(
                 new ApplicationObservableDoubleMeasurement(agentMeasurement));

instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleGaugeBuilder.java

@@ -7,6 +7,7 @@
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.metrics.DoubleGaugeBuilder;
+import io.opentelemetry.api.metrics.ObservableDoubleMeasurement;
 import java.util.function.Consumer;
 
 public class ApplicationDoubleGaugeBuilder
@@ -42,7 +43,7 @@ public application.io.opentelemetry.api.metrics.LongGaugeBuilder ofLongs() {
   public application.io.opentelemetry.api.metrics.ObservableDoubleGauge buildWithCallback(
       Consumer<application.io.opentelemetry.api.metrics.ObservableDoubleMeasurement>
           applicationCallback) {
-    Consumer<io.opentelemetry.api.metrics.ObservableDoubleMeasurement> callback =
+    Consumer<ObservableDoubleMeasurement> callback =
         agentMeasurement ->
             applicationCallback.accept(
                 new ApplicationObservableDoubleMeasurement(agentMeasurement));

instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleUpDownCounterBuilder.java

@@ -7,6 +7,7 @@
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder;
+import io.opentelemetry.api.metrics.ObservableDoubleMeasurement;
 import java.util.function.Consumer;
 
 public class ApplicationDoubleUpDownCounterBuilder
@@ -42,7 +43,7 @@ public application.io.opentelemetry.api.metrics.DoubleUpDownCounter build() {
   public application.io.opentelemetry.api.metrics.ObservableDoubleUpDownCounter buildWithCallback(
       Consumer<application.io.opentelemetry.api.metrics.ObservableDoubleMeasurement>
           applicationCallback) {
-    Consumer<io.opentelemetry.api.metrics.ObservableDoubleMeasurement> callback =
+    Consumer<ObservableDoubleMeasurement> callback =
         agentMeasurement ->
             applicationCallback.accept(
                 new ApplicationObservableDoubleMeasurement(agentMeasurement));

instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongCounterBuilder.java

@@ -7,6 +7,7 @@
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.metrics.LongCounterBuilder;
+import io.opentelemetry.api.metrics.ObservableLongMeasurement;
 import java.util.function.Consumer;
 
 public class ApplicationLongCounterBuilder
@@ -47,7 +48,7 @@ public application.io.opentelemetry.api.metrics.LongCounter build() {
   public application.io.opentelemetry.api.metrics.ObservableLongCounter buildWithCallback(
       Consumer<application.io.opentelemetry.api.metrics.ObservableLongMeasurement>
           applicationCallback) {
-    Consumer<io.opentelemetry.api.metrics.ObservableLongMeasurement> callback =
+    Consumer<ObservableLongMeasurement> callback =
         agentMeasurement ->
             applicationCallback.accept(new ApplicationObservableLongMeasurement(agentMeasurement));
     return new ApplicationObservableLongCounter(

instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongGaugeBuilder.java

@@ -7,6 +7,7 @@
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.metrics.LongGaugeBuilder;
+import io.opentelemetry.api.metrics.ObservableLongMeasurement;
 import java.util.function.Consumer;
 
 public class ApplicationLongGaugeBuilder
@@ -37,7 +38,7 @@ public application.io.opentelemetry.api.metrics.LongGaugeBuilder setUnit(String
   public application.io.opentelemetry.api.metrics.ObservableLongGauge buildWithCallback(
       Consumer<application.io.opentelemetry.api.metrics.ObservableLongMeasurement>
           applicationCallback) {
-    Consumer<io.opentelemetry.api.metrics.ObservableLongMeasurement> callback =
+    Consumer<ObservableLongMeasurement> callback =
         agentMeasurement ->
             applicationCallback.accept(new ApplicationObservableLongMeasurement(agentMeasurement));
     return new ApplicationObservableLongGauge(

instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongUpDownCounterBuilder.java

@@ -7,6 +7,7 @@
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.metrics.LongUpDownCounterBuilder;
+import io.opentelemetry.api.metrics.ObservableLongMeasurement;
 import java.util.function.Consumer;
 
 public class ApplicationLongUpDownCounterBuilder
@@ -47,7 +48,7 @@ public application.io.opentelemetry.api.metrics.LongUpDownCounter build() {
   public application.io.opentelemetry.api.metrics.ObservableLongUpDownCounter buildWithCallback(
       Consumer<application.io.opentelemetry.api.metrics.ObservableLongMeasurement>
           applicationCallback) {
-    Consumer<io.opentelemetry.api.metrics.ObservableLongMeasurement> callback =
+    Consumer<ObservableLongMeasurement> callback =
         agentMeasurement ->
             applicationCallback.accept(new ApplicationObservableLongMeasurement(agentMeasurement));
     return new ApplicationObservableLongUpDownCounter(

instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/CallbackAnchor.java

@@ -39,11 +39,13 @@ public final class CallbackAnchor {
 
   // Anchors callbacks to this class's lifecycle. Since this class is injected as a helper into each
   // application class loader, callbacks are naturally tied to their class loader's lifecycle.
-  private static final Set<Object> callbacks = ConcurrentHashMap.newKeySet();
+  // Use identity semantics so unusual equals/hashCode implementations don't collapse distinct
+  // callbacks into the same entry.
+  private static final Set<IdentityKey> callbacks = ConcurrentHashMap.newKeySet();
 
   public static <T, R extends AutoCloseable> R anchor(
       Function<Consumer<T>, R> buildFn, Consumer<T> callback) {
-    callbacks.add(callback);
+    callbacks.add(new IdentityKey(callback));
     WeakRefConsumer<T> weak = new WeakRefConsumer<>(new WeakReference<>(callback));
     R instrument = buildFn.apply(weak);
     weak.closeWhenCollected(instrument);
@@ -52,15 +54,34 @@ public static <T, R extends AutoCloseable> R anchor(
 
   public static <R extends AutoCloseable> R anchorBatch(
       Function<Runnable, R> buildFn, Runnable callback) {
-    callbacks.add(callback);
+    callbacks.add(new IdentityKey(callback));
     WeakRefRunnable weak = new WeakRefRunnable(new WeakReference<>(callback));
     R instrument = buildFn.apply(weak);
     weak.closeWhenCollected(instrument);
     return instrument;
   }
 
   public static void remove(Object callback) {
-    callbacks.remove(callback);
+    callbacks.remove(new IdentityKey(callback));
+  }
+
+  private static final class IdentityKey {
+
+    private final Object callback;
+
+    private IdentityKey(Object callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+      return other instanceof IdentityKey && callback == ((IdentityKey) other).callback;
+    }
+
+    @Override
+    public int hashCode() {
+      return System.identityHashCode(callback);
+    }
   }
 
   private CallbackAnchor() {}

instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/CallbackGcCloseTest.java

@@ -8,8 +8,10 @@
 import static io.opentelemetry.api.common.AttributeKey.stringKey;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
 
+import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.metrics.Meter;
+import io.opentelemetry.api.metrics.ObservableLongMeasurement;
 import io.opentelemetry.instrumentation.test.utils.GcUtils;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import java.lang.ref.WeakReference;
@@ -64,11 +66,7 @@ void instrumentClosedWhenClassLoaderCollected() throws Exception {
     // 1. Build a child-first URLClassLoader that loads its own copy of the OTel API.
     //    The agent will instrument GlobalOpenTelemetry in this CL and inject all bridge helpers
     //    (including CallbackAnchor with its own static callbacks list).
-    URL apiJar =
-        io.opentelemetry.api.GlobalOpenTelemetry.class
-            .getProtectionDomain()
-            .getCodeSource()
-            .getLocation();
+    URL apiJar = GlobalOpenTelemetry.class.getProtectionDomain().getCodeSource().getLocation();
     URL testClasses = GaugeRegistrar.class.getProtectionDomain().getCodeSource().getLocation();
 
     URLClassLoader childCl =
@@ -120,7 +118,7 @@ void instrumentClosedWhenClassLoaderCollected() throws Exception {
    */
   @Test
   void instrumentContinuesWhileCallbackAnchored() {
-    Consumer<io.opentelemetry.api.metrics.ObservableLongMeasurement> callback =
+    Consumer<ObservableLongMeasurement> callback =
         result -> result.record(99, Attributes.of(stringKey("key"), "value"));
 
     meter.gaugeBuilder("test.gc.alive").ofLongs().buildWithCallback(callback);