[low-priority] Close bridged instruments when GC'd (#16219)

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,11 +43,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<ObservableDoubleMeasurement> callback =
+        agentMeasurement ->
+            applicationCallback.accept(
+                new ApplicationObservableDoubleMeasurement(agentMeasurement));
     return new ApplicationObservableDoubleCounter(
-        agentBuilder.buildWithCallback(
-            agentMeasurement ->
-                applicationCallback.accept(
-                    new ApplicationObservableDoubleMeasurement(agentMeasurement))));
+        CallbackAnchor.anchor(agentBuilder::buildWithCallback, callback),
+        CallbackAnchor.releaseOnClose(callback));
   }
 
   // added in 1.15.0

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,11 +43,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<ObservableDoubleMeasurement> callback =
+        agentMeasurement ->
+            applicationCallback.accept(
+                new ApplicationObservableDoubleMeasurement(agentMeasurement));
     return new ApplicationObservableDoubleGauge(
-        agentBuilder.buildWithCallback(
-            agentMeasurement ->
-                applicationCallback.accept(
-                    new ApplicationObservableDoubleMeasurement(agentMeasurement))));
+        CallbackAnchor.anchor(agentBuilder::buildWithCallback, callback),
+        CallbackAnchor.releaseOnClose(callback));
   }
 
   // added in 1.15.0

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,11 +43,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<ObservableDoubleMeasurement> callback =
+        agentMeasurement ->
+            applicationCallback.accept(
+                new ApplicationObservableDoubleMeasurement(agentMeasurement));
     return new ApplicationObservableDoubleUpDownCounter(
-        agentBuilder.buildWithCallback(
-            agentMeasurement ->
-                applicationCallback.accept(
-                    new ApplicationObservableDoubleMeasurement(agentMeasurement))));
+        CallbackAnchor.anchor(agentBuilder::buildWithCallback, callback),
+        CallbackAnchor.releaseOnClose(callback));
   }
 
   // added in 1.15.0

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,11 +48,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<ObservableLongMeasurement> callback =
+        agentMeasurement ->
+            applicationCallback.accept(new ApplicationObservableLongMeasurement(agentMeasurement));
     return new ApplicationObservableLongCounter(
-        agentBuilder.buildWithCallback(
-            agentMeasurement ->
-                applicationCallback.accept(
-                    new ApplicationObservableLongMeasurement(agentMeasurement))));
+        CallbackAnchor.anchor(agentBuilder::buildWithCallback, callback),
+        CallbackAnchor.releaseOnClose(callback));
   }
 
   // added in 1.15.0

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,11 +38,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<ObservableLongMeasurement> callback =
+        agentMeasurement ->
+            applicationCallback.accept(new ApplicationObservableLongMeasurement(agentMeasurement));
     return new ApplicationObservableLongGauge(
-        agentBuilder.buildWithCallback(
-            agentMeasurement ->
-                applicationCallback.accept(
-                    new ApplicationObservableLongMeasurement(agentMeasurement))));
+        CallbackAnchor.anchor(agentBuilder::buildWithCallback, callback),
+        CallbackAnchor.releaseOnClose(callback));
   }
 
   // added in 1.15.0

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,11 +48,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<ObservableLongMeasurement> callback =
+        agentMeasurement ->
+            applicationCallback.accept(new ApplicationObservableLongMeasurement(agentMeasurement));
     return new ApplicationObservableLongUpDownCounter(
-        agentBuilder.buildWithCallback(
-            agentMeasurement ->
-                applicationCallback.accept(
-                    new ApplicationObservableLongMeasurement(agentMeasurement))));
+        CallbackAnchor.anchor(agentBuilder::buildWithCallback, callback),
+        CallbackAnchor.releaseOnClose(callback));
   }
 
   // added in 1.15.0

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();
   }
 }

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();
   }
 }

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();
   }
 }

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();
   }
 }