feedback

trask · trask · commit 4c03a99a3a62 · 2026-03-09T21:18:02.000-07:00
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleCounterBuilder.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleCounterBuilder.java
@@ -42,12 +42,13 @@ 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 =
+        agentMeasurement ->
+            applicationCallback.accept(
+                new ApplicationObservableDoubleMeasurement(agentMeasurement));
     return new ApplicationObservableDoubleCounter(
-        CallbackAnchor.anchor(
-            agentBuilder::buildWithCallback,
-            agentMeasurement ->
-                applicationCallback.accept(
-                    new ApplicationObservableDoubleMeasurement(agentMeasurement))));
+        CallbackAnchor.anchor(agentBuilder::buildWithCallback, callback),
+        () -> CallbackAnchor.remove(callback));
   }
 
   // added in 1.15.0
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleGaugeBuilder.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleGaugeBuilder.java
@@ -42,12 +42,13 @@ 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 =
+        agentMeasurement ->
+            applicationCallback.accept(
+                new ApplicationObservableDoubleMeasurement(agentMeasurement));
     return new ApplicationObservableDoubleGauge(
-        CallbackAnchor.anchor(
-            agentBuilder::buildWithCallback,
-            agentMeasurement ->
-                applicationCallback.accept(
-                    new ApplicationObservableDoubleMeasurement(agentMeasurement))));
+        CallbackAnchor.anchor(agentBuilder::buildWithCallback, callback),
+        () -> CallbackAnchor.remove(callback));
   }
 
   // added in 1.15.0
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleUpDownCounterBuilder.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleUpDownCounterBuilder.java
@@ -42,12 +42,13 @@ 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 =
+        agentMeasurement ->
+            applicationCallback.accept(
+                new ApplicationObservableDoubleMeasurement(agentMeasurement));
     return new ApplicationObservableDoubleUpDownCounter(
-        CallbackAnchor.anchor(
-            agentBuilder::buildWithCallback,
-            agentMeasurement ->
-                applicationCallback.accept(
-                    new ApplicationObservableDoubleMeasurement(agentMeasurement))));
+        CallbackAnchor.anchor(agentBuilder::buildWithCallback, callback),
+        () -> CallbackAnchor.remove(callback));
   }
 
   // added in 1.15.0
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongCounterBuilder.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongCounterBuilder.java
@@ -47,12 +47,12 @@ 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 =
+        agentMeasurement ->
+            applicationCallback.accept(new ApplicationObservableLongMeasurement(agentMeasurement));
     return new ApplicationObservableLongCounter(
-        CallbackAnchor.anchor(
-            agentBuilder::buildWithCallback,
-            agentMeasurement ->
-                applicationCallback.accept(
-                    new ApplicationObservableLongMeasurement(agentMeasurement))));
+        CallbackAnchor.anchor(agentBuilder::buildWithCallback, callback),
+        () -> CallbackAnchor.remove(callback));
   }
 
   // added in 1.15.0
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongGaugeBuilder.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongGaugeBuilder.java
@@ -37,12 +37,12 @@ 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 =
+        agentMeasurement ->
+            applicationCallback.accept(new ApplicationObservableLongMeasurement(agentMeasurement));
     return new ApplicationObservableLongGauge(
-        CallbackAnchor.anchor(
-            agentBuilder::buildWithCallback,
-            agentMeasurement ->
-                applicationCallback.accept(
-                    new ApplicationObservableLongMeasurement(agentMeasurement))));
+        CallbackAnchor.anchor(agentBuilder::buildWithCallback, callback),
+        () -> CallbackAnchor.remove(callback));
   }
 
   // added in 1.15.0
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongUpDownCounterBuilder.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongUpDownCounterBuilder.java
@@ -47,12 +47,12 @@ 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 =
+        agentMeasurement ->
+            applicationCallback.accept(new ApplicationObservableLongMeasurement(agentMeasurement));
     return new ApplicationObservableLongUpDownCounter(
-        CallbackAnchor.anchor(
-            agentBuilder::buildWithCallback,
-            agentMeasurement ->
-                applicationCallback.accept(
-                    new ApplicationObservableLongMeasurement(agentMeasurement))));
+        CallbackAnchor.anchor(agentBuilder::buildWithCallback, callback),
+        () -> CallbackAnchor.remove(callback));
   }
 
   // added in 1.15.0
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableDoubleCounter.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableDoubleCounter.java
@@ -11,14 +11,18 @@ public final class ApplicationObservableDoubleCounter
     implements application.io.opentelemetry.api.metrics.ObservableDoubleCounter {
 
   private final ObservableDoubleCounter agentCounter;
+  private final Runnable onClose;
 
-  public ApplicationObservableDoubleCounter(ObservableDoubleCounter agentCounter) {
+  public ApplicationObservableDoubleCounter(
+      ObservableDoubleCounter agentCounter, Runnable onClose) {
     this.agentCounter = agentCounter;
+    this.onClose = onClose;
   }
 
   // not adding @Override because this method was introduced in 1.12
   @SuppressWarnings("unused")
   public void close() {
     agentCounter.close();
+    onClose.run();
   }
 }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableDoubleGauge.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableDoubleGauge.java
@@ -11,14 +11,17 @@ public final class ApplicationObservableDoubleGauge
     implements application.io.opentelemetry.api.metrics.ObservableDoubleGauge {
 
   private final ObservableDoubleGauge agentGauge;
+  private final Runnable onClose;
 
-  public ApplicationObservableDoubleGauge(ObservableDoubleGauge agentGauge) {
+  public ApplicationObservableDoubleGauge(ObservableDoubleGauge agentGauge, Runnable onClose) {
     this.agentGauge = agentGauge;
+    this.onClose = onClose;
   }
 
   // not adding @Override because this method was introduced in 1.12
   @SuppressWarnings("unused")
   public void close() {
     agentGauge.close();
+    onClose.run();
   }
 }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableDoubleUpDownCounter.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableDoubleUpDownCounter.java
@@ -11,15 +11,18 @@ public final class ApplicationObservableDoubleUpDownCounter
     implements application.io.opentelemetry.api.metrics.ObservableDoubleUpDownCounter {
 
   private final ObservableDoubleUpDownCounter agentUpDownCounter;
+  private final Runnable onClose;
 
   public ApplicationObservableDoubleUpDownCounter(
-      ObservableDoubleUpDownCounter agentUpDownCounter) {
+      ObservableDoubleUpDownCounter agentUpDownCounter, Runnable onClose) {
     this.agentUpDownCounter = agentUpDownCounter;
+    this.onClose = onClose;
   }
 
   // not adding @Override because this method was introduced in 1.12
   @SuppressWarnings("unused")
   public void close() {
     agentUpDownCounter.close();
+    onClose.run();
   }
 }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableLongCounter.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableLongCounter.java
@@ -11,14 +11,17 @@ public final class ApplicationObservableLongCounter
     implements application.io.opentelemetry.api.metrics.ObservableLongCounter {
 
   private final ObservableLongCounter agentCounter;
+  private final Runnable onClose;
 
-  public ApplicationObservableLongCounter(ObservableLongCounter agentCounter) {
+  public ApplicationObservableLongCounter(ObservableLongCounter agentCounter, Runnable onClose) {
     this.agentCounter = agentCounter;
+    this.onClose = onClose;
   }
 
   // not adding @Override because this method was introduced in 1.12
   @SuppressWarnings("unused")
   public void close() {
     agentCounter.close();
+    onClose.run();
   }
 }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableLongGauge.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableLongGauge.java
@@ -11,14 +11,17 @@ public final class ApplicationObservableLongGauge
     implements application.io.opentelemetry.api.metrics.ObservableLongGauge {
 
   private final ObservableLongGauge agentGauge;
+  private final Runnable onClose;
 
-  public ApplicationObservableLongGauge(ObservableLongGauge agentGauge) {
+  public ApplicationObservableLongGauge(ObservableLongGauge agentGauge, Runnable onClose) {
     this.agentGauge = agentGauge;
+    this.onClose = onClose;
   }
 
   // not adding @Override because this method was introduced in 1.12
   @SuppressWarnings("unused")
   public void close() {
     agentGauge.close();
+    onClose.run();
   }
 }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableLongUpDownCounter.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationObservableLongUpDownCounter.java
@@ -11,14 +11,18 @@ public final class ApplicationObservableLongUpDownCounter
     implements application.io.opentelemetry.api.metrics.ObservableLongUpDownCounter {
 
   private final ObservableLongUpDownCounter agentUpDownCounter;
+  private final Runnable onClose;
 
-  public ApplicationObservableLongUpDownCounter(ObservableLongUpDownCounter agentUpDownCounter) {
+  public ApplicationObservableLongUpDownCounter(
+      ObservableLongUpDownCounter agentUpDownCounter, Runnable onClose) {
     this.agentUpDownCounter = agentUpDownCounter;
+    this.onClose = onClose;
   }
 
   // not adding @Override because this method was introduced in 1.12
   @SuppressWarnings("unused")
   public void close() {
     agentUpDownCounter.close();
+    onClose.run();
   }
 }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/CallbackAnchor.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/CallbackAnchor.java
@@ -8,8 +8,8 @@
 import io.opentelemetry.javaagent.bootstrap.WeakRefConsumer;
 import io.opentelemetry.javaagent.bootstrap.WeakRefRunnable;
 import java.lang.ref.WeakReference;
-import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
@@ -39,7 +39,7 @@ 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 List<Object> callbacks = new CopyOnWriteArrayList<>();
+  private static final Set<Object> callbacks = ConcurrentHashMap.newKeySet();
 
   public static <T, R extends AutoCloseable> R anchor(
       Function<Consumer<T>, R> buildFn, Consumer<T> callback) {
@@ -59,5 +59,9 @@ public static <R extends AutoCloseable> R anchorBatch(
     return instrument;
   }
 
+  public static void remove(Object callback) {
+    callbacks.remove(callback);
+  }
+
   private CallbackAnchor() {}
 }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_15/metrics/ApplicationBatchCallback.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_15/metrics/ApplicationBatchCallback.java
@@ -10,13 +10,16 @@
 final class ApplicationBatchCallback
     implements application.io.opentelemetry.api.metrics.BatchCallback {
   private final BatchCallback agentCallback;
+  private final Runnable onClose;
 
-  ApplicationBatchCallback(BatchCallback agentCallback) {
+  ApplicationBatchCallback(BatchCallback agentCallback, Runnable onClose) {
     this.agentCallback = agentCallback;
+    this.onClose = onClose;
   }
 
   @Override
   public void close() {
     agentCallback.close();
+    onClose.run();
   }
 }
diff --git a/instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_15/metrics/ApplicationMeter115.java b/instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_15/metrics/ApplicationMeter115.java
@@ -30,7 +30,8 @@ public application.io.opentelemetry.api.metrics.BatchCallback batchCallback(
             weak ->
                 agentMeter.batchCallback(
                     weak, unwrap(observableMeasurement), unwrap(additionalMeasurements)),
-            callback));
+            callback),
+        () -> CallbackAnchor.remove(callback));
   }
 
   private static ObservableMeasurement unwrap(

Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,18 @@ public final class ApplicationObservableDoubleCounter`
`11`	`11`	`implements application.io.opentelemetry.api.metrics.ObservableDoubleCounter {`
`12`	`12`
`13`	`13`	`private final ObservableDoubleCounter agentCounter;`
	`14`	`+ private final Runnable onClose;`
`14`	`15`
`15`		`- public ApplicationObservableDoubleCounter(ObservableDoubleCounter agentCounter) {`
	`16`	`+ public ApplicationObservableDoubleCounter(`
	`17`	`+ ObservableDoubleCounter agentCounter, Runnable onClose) {`
`16`	`18`	`this.agentCounter = agentCounter;`
	`19`	`+ this.onClose = onClose;`
`17`	`20`	`}`
`18`	`21`
`19`	`22`	`// not adding @Override because this method was introduced in 1.12`
`20`	`23`	`@SuppressWarnings("unused")`
`21`	`24`	`public void close() {`
`22`	`25`	`agentCounter.close();`
	`26`	`+ onClose.run();`
`23`	`27`	`}`
`24`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,17 @@ public final class ApplicationObservableDoubleGauge`
`11`	`11`	`implements application.io.opentelemetry.api.metrics.ObservableDoubleGauge {`
`12`	`12`
`13`	`13`	`private final ObservableDoubleGauge agentGauge;`
	`14`	`+ private final Runnable onClose;`
`14`	`15`
`15`		`- public ApplicationObservableDoubleGauge(ObservableDoubleGauge agentGauge) {`
	`16`	`+ public ApplicationObservableDoubleGauge(ObservableDoubleGauge agentGauge, Runnable onClose) {`
`16`	`17`	`this.agentGauge = agentGauge;`
	`18`	`+ this.onClose = onClose;`
`17`	`19`	`}`
`18`	`20`
`19`	`21`	`// not adding @Override because this method was introduced in 1.12`
`20`	`22`	`@SuppressWarnings("unused")`
`21`	`23`	`public void close() {`
`22`	`24`	`agentGauge.close();`
	`25`	`+ onClose.run();`
`23`	`26`	`}`
`24`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,15 +11,18 @@ public final class ApplicationObservableDoubleUpDownCounter`
`11`	`11`	`implements application.io.opentelemetry.api.metrics.ObservableDoubleUpDownCounter {`
`12`	`12`
`13`	`13`	`private final ObservableDoubleUpDownCounter agentUpDownCounter;`
	`14`	`+ private final Runnable onClose;`
`14`	`15`
`15`	`16`	`public ApplicationObservableDoubleUpDownCounter(`
`16`		`- ObservableDoubleUpDownCounter agentUpDownCounter) {`
	`17`	`+ ObservableDoubleUpDownCounter agentUpDownCounter, Runnable onClose) {`
`17`	`18`	`this.agentUpDownCounter = agentUpDownCounter;`
	`19`	`+ this.onClose = onClose;`
`18`	`20`	`}`
`19`	`21`
`20`	`22`	`// not adding @Override because this method was introduced in 1.12`
`21`	`23`	`@SuppressWarnings("unused")`
`22`	`24`	`public void close() {`
`23`	`25`	`agentUpDownCounter.close();`
	`26`	`+ onClose.run();`
`24`	`27`	`}`
`25`	`28`	`}`