merge: Update Micrometer stack

Carry active meter removal handling forward and use the shared removal lifecycle for function timers.

Co-Authored-By: Claude <noreply@anthropic.com>

Author: adinauer

sentry-micrometer/src/main/java/io/sentry/micrometer/SentryCounter.java

@@ -4,9 +4,10 @@
 import io.micrometer.core.instrument.cumulative.CumulativeCounter;
 import org.jetbrains.annotations.NotNull;
 
-final class SentryCounter extends CumulativeCounter {
+final class SentryCounter extends CumulativeCounter implements SentryRemovableMeter {
   private final @NotNull SentryMeterRegistry registry;
   private final @NotNull SentryMetricInfo metricInfo;
+  private volatile boolean removed;
 
   SentryCounter(
       final @NotNull Meter.Id id,
@@ -20,8 +21,13 @@ final class SentryCounter extends CumulativeCounter {
   @Override
   public void increment(final double amount) {
     super.increment(amount);
-    if (amount > 0.0 && Double.isFinite(amount)) {
+    if (amount > 0.0 && Double.isFinite(amount) && !removed) {
       registry.captureCounter(metricInfo, amount);
     }
   }
+
+  @Override
+  public void markRemoved() {
+    removed = true;
+  }
 }

sentry-micrometer/src/main/java/io/sentry/micrometer/SentryDistributionSummary.java

@@ -6,9 +6,11 @@
 import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
 import org.jetbrains.annotations.NotNull;
 
-final class SentryDistributionSummary extends CumulativeDistributionSummary {
+final class SentryDistributionSummary extends CumulativeDistributionSummary
+    implements SentryRemovableMeter {
   private final @NotNull SentryMeterRegistry registry;
   private final @NotNull SentryMetricInfo metricInfo;
+  private volatile boolean removed;
 
   SentryDistributionSummary(
       final @NotNull Meter.Id id,
@@ -25,8 +27,13 @@ final class SentryDistributionSummary extends CumulativeDistributionSummary {
   @Override
   protected void recordNonNegative(final double amount) {
     super.recordNonNegative(amount);
-    if (Double.isFinite(amount)) {
+    if (Double.isFinite(amount) && !removed) {
       registry.captureDistribution(metricInfo, amount);
     }
   }
+
+  @Override
+  public void markRemoved() {
+    removed = true;
+  }
 }

sentry-micrometer/src/main/java/io/sentry/micrometer/SentryFunctionCounter.java

@@ -5,7 +5,8 @@
 import java.util.function.ToDoubleFunction;
 import org.jetbrains.annotations.NotNull;
 
-final class SentryFunctionCounter<T> extends CumulativeFunctionCounter<T> {
+final class SentryFunctionCounter<T> extends CumulativeFunctionCounter<T>
+    implements SentryRemovableMeter {
   private final @NotNull SentryMeterRegistry registry;
   private final @NotNull SentryMetricInfo metricInfo;
   private volatile boolean removed;
@@ -42,7 +43,8 @@ void poll() {
     }
   }
 
-  void markRemoved() {
+  @Override
+  public void markRemoved() {
     removed = true;
   }
 }

sentry-micrometer/src/main/java/io/sentry/micrometer/SentryFunctionTimer.java

@@ -8,7 +8,8 @@
 import java.util.function.ToLongFunction;
 import org.jetbrains.annotations.NotNull;
 
-final class SentryFunctionTimer<T> extends CumulativeFunctionTimer<T> {
+final class SentryFunctionTimer<T> extends CumulativeFunctionTimer<T>
+    implements SentryRemovableMeter {
   private final @NotNull SentryMeterRegistry registry;
   private final @NotNull SentryMetricInfo countMetricInfo;
   private final @NotNull SentryMetricInfo totalTimeMetricInfo;
@@ -88,7 +89,8 @@ private void pollTotalTime() {
     }
   }
 
-  void markRemoved() {
+  @Override
+  public void markRemoved() {
     removed = true;
   }
 }

sentry-micrometer/src/main/java/io/sentry/micrometer/SentryMeterRegistry.java

@@ -281,10 +281,8 @@ private void publishLongTaskTimer(final @NotNull LongTaskTimer timer) {
   }
 
   private void onMeterRemoved(final @NotNull Meter meter) {
-    if (meter instanceof SentryFunctionCounter) {
-      ((SentryFunctionCounter<?>) meter).markRemoved();
-    } else if (meter instanceof SentryFunctionTimer) {
-      ((SentryFunctionTimer<?>) meter).markRemoved();
+    if (meter instanceof SentryRemovableMeter) {
+      ((SentryRemovableMeter) meter).markRemoved();
     }
   }
 

sentry-micrometer/src/main/java/io/sentry/micrometer/SentryRemovableMeter.java

@@ -0,0 +1,5 @@
+package io.sentry.micrometer;
+
+interface SentryRemovableMeter {
+  void markRemoved();
+}

sentry-micrometer/src/main/java/io/sentry/micrometer/SentryTimer.java

@@ -8,9 +8,10 @@
 import java.util.concurrent.TimeUnit;
 import org.jetbrains.annotations.NotNull;
 
-final class SentryTimer extends CumulativeTimer {
+final class SentryTimer extends CumulativeTimer implements SentryRemovableMeter {
   private final @NotNull SentryMeterRegistry registry;
   private final @NotNull SentryMetricInfo metricInfo;
+  private volatile boolean removed;
 
   SentryTimer(
       final @NotNull Meter.Id id,
@@ -28,7 +29,14 @@ final class SentryTimer extends CumulativeTimer {
   @Override
   protected void recordNonNegative(final long amount, final @NotNull TimeUnit unit) {
     super.recordNonNegative(amount, unit);
-    registry.captureDistribution(metricInfo, toMilliseconds(amount, unit));
+    if (!removed) {
+      registry.captureDistribution(metricInfo, toMilliseconds(amount, unit));
+    }
+  }
+
+  @Override
+  public void markRemoved() {
+    removed = true;
   }
 
   private static double toMilliseconds(final long amount, final @NotNull TimeUnit unit) {

sentry-micrometer/src/test/kotlin/io/sentry/micrometer/SentryMeterRegistryTest.kt

@@ -200,6 +200,44 @@ class SentryMeterRegistryTest {
     verifyNoInteractions(metrics)
   }
 
+  @Test
+  fun `removed active meters stop forwarding but retain local behavior`() {
+    val metrics = installMetricsApi()
+    val registry = SentryMeterRegistry()
+    val counter = registry.counter("counter")
+    val timer = registry.timer("timer")
+    val summary = registry.summary("summary")
+
+    registry.remove(counter)
+    registry.remove(timer)
+    registry.remove(summary)
+    counter.increment()
+    timer.record(1, TimeUnit.MILLISECONDS)
+    summary.record(1.0)
+
+    assertThat(counter.count()).isEqualTo(1.0)
+    assertThat(timer.count()).isEqualTo(1)
+    assertThat(summary.count()).isEqualTo(1)
+    verifyNoInteractions(metrics)
+  }
+
+  @Test
+  fun `re-registering a removed meter does not reactivate its stale handle`() {
+    val metrics = installMetricsApi()
+    val registry = SentryMeterRegistry()
+    val staleCounter = registry.counter("counter")
+
+    registry.remove(staleCounter)
+    val replacementCounter = registry.counter("counter")
+    staleCounter.increment(2.0)
+    replacementCounter.increment(3.0)
+
+    assertThat(staleCounter.count()).isEqualTo(2.0)
+    assertThat(replacementCounter.count()).isEqualTo(3.0)
+    verify(metrics).count(eq("counter"), eq(3.0), anyOrNull(), any())
+    verify(metrics, times(1)).count(any(), anyOrNull(), anyOrNull(), any())
+  }
+
   @Test
   fun `global Sentry metrics option disables forwarding`() {
     val client = mock<ISentryClient>()