merge(micrometer): Propagate Spring Boot sample parity

Merge the Boot 3 and Boot 4 sample endpoints and dual-registry system tests
from #6116 into the ignored-metrics branch. Keep the top of the stack in
sync without rewriting its history.

Verify all 18 metrics system tests against Boot 2, 3, and 4 with the
ignored-metrics defaults applied. Formatting and API checks also pass.

Refs #6116
Refs #6155
Co-Authored-By: Claude <noreply@anthropic.com>

Author: adinauer

sentry-samples/sentry-samples-spring-boot-4/src/main/java/io/sentry/samples/spring/boot4/MetricController.java

@@ -1,5 +1,7 @@
 package io.sentry.samples.spring.boot4;
 
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 import io.sentry.Sentry;
 import io.sentry.metrics.MetricsUnit;
 import org.slf4j.Logger;
@@ -14,6 +16,14 @@
 public class MetricController {
   private static final Logger LOGGER = LoggerFactory.getLogger(MetricController.class);
 
+  private final MeterRegistry meterRegistry;
+  private final SimpleMeterRegistry simpleMeterRegistry;
+
+  public MetricController(MeterRegistry meterRegistry, SimpleMeterRegistry simpleMeterRegistry) {
+    this.meterRegistry = meterRegistry;
+    this.simpleMeterRegistry = simpleMeterRegistry;
+  }
+
   @GetMapping("count")
   String count() {
     Sentry.setAttribute("user.type", "admin");
@@ -22,6 +32,14 @@ String count() {
     return "count metric increased";
   }
 
+  @GetMapping("micrometer")
+  String micrometer() {
+    meterRegistry.counter("micrometer.counter", "source", "spring").increment();
+    double simpleRegistryCount =
+        simpleMeterRegistry.get("micrometer.counter").tag("source", "spring").counter().count();
+    return "micrometer metric increased: " + simpleRegistryCount;
+  }
+
   @GetMapping("gauge/{value}")
   String gauge(@PathVariable("value") Long value) {
     Sentry.metrics().gauge("memory.free", value.doubleValue(), MetricsUnit.Information.BYTE);

sentry-samples/sentry-samples-spring-boot-4/src/main/java/io/sentry/samples/spring/boot4/SentryDemoApplication.java

@@ -2,6 +2,7 @@
 
 import static io.sentry.quartz.SentryJobListener.SENTRY_SLUG_KEY;
 
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 import io.sentry.samples.spring.boot4.quartz.SampleJob;
 import java.util.Collections;
 import org.quartz.JobDetail;
@@ -42,6 +43,11 @@ RestClient restClient(RestClient.Builder builder) {
     return builder.build();
   }
 
+  @Bean
+  SimpleMeterRegistry simpleMeterRegistry() {
+    return new SimpleMeterRegistry();
+  }
+
   @Bean
   public JobDetailFactoryBean jobDetail() {
     JobDetailFactoryBean jobDetailFactory = new JobDetailFactoryBean();

sentry-samples/sentry-samples-spring-boot-4/src/test/kotlin/io/sentry/systemtest/MetricsSystemTest.kt

@@ -3,6 +3,7 @@ package io.sentry.systemtest
 import io.sentry.systemtest.util.TestHelper
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
 import kotlin.test.assertTrue
 import org.junit.Before
 
@@ -28,6 +29,30 @@ class MetricsSystemTest {
     }
   }
 
+  @Test
+  fun `Micrometer metric is forwarded to Sentry and another registry`() {
+    val restClient = testHelper.restClient
+    val response = assertNotNull(restClient.getMicrometerMetric())
+    val responsePrefix = "micrometer metric increased: "
+    assertTrue(response.startsWith(responsePrefix))
+    assertTrue(response.removePrefix(responsePrefix).toDouble() > 0.0)
+    assertEquals(200, restClient.lastKnownStatusCode)
+
+    testHelper.ensureMetricsReceived { event, header ->
+      testHelper.doesContainMetric(event, "micrometer.counter", "counter", 1.0) &&
+        testHelper.doesMetricHaveAttribute(
+          event,
+          "micrometer.counter",
+          "source",
+          "spring",
+        ) &&
+        header.sdkVersion?.integrationSet?.contains("Micrometer") == true &&
+        header.sdkVersion?.packageSet?.any {
+          it.name == "maven:io.sentry:sentry-micrometer"
+        } == true
+    }
+  }
+
   @Test
   fun `Spring Boot generated HTTP metric is forwarded through Micrometer`() {
     val restClient = testHelper.restClient

sentry-samples/sentry-samples-spring-boot-jakarta/src/main/java/io/sentry/samples/spring/boot/jakarta/MetricController.java

@@ -1,5 +1,7 @@
 package io.sentry.samples.spring.boot.jakarta;
 
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 import io.sentry.Sentry;
 import io.sentry.metrics.MetricsUnit;
 import org.slf4j.Logger;
@@ -14,6 +16,14 @@
 public class MetricController {
   private static final Logger LOGGER = LoggerFactory.getLogger(MetricController.class);
 
+  private final MeterRegistry meterRegistry;
+  private final SimpleMeterRegistry simpleMeterRegistry;
+
+  public MetricController(MeterRegistry meterRegistry, SimpleMeterRegistry simpleMeterRegistry) {
+    this.meterRegistry = meterRegistry;
+    this.simpleMeterRegistry = simpleMeterRegistry;
+  }
+
   @GetMapping("count")
   String count() {
     Sentry.setAttribute("user.type", "admin");
@@ -22,6 +32,14 @@ String count() {
     return "count metric increased";
   }
 
+  @GetMapping("micrometer")
+  String micrometer() {
+    meterRegistry.counter("micrometer.counter", "source", "spring").increment();
+    double simpleRegistryCount =
+        simpleMeterRegistry.get("micrometer.counter").tag("source", "spring").counter().count();
+    return "micrometer metric increased: " + simpleRegistryCount;
+  }
+
   @GetMapping("gauge/{value}")
   String gauge(@PathVariable("value") Long value) {
     Sentry.metrics().gauge("memory.free", value.doubleValue(), MetricsUnit.Information.BYTE);

sentry-samples/sentry-samples-spring-boot-jakarta/src/main/java/io/sentry/samples/spring/boot/jakarta/SentryDemoApplication.java

@@ -2,6 +2,7 @@
 
 import static io.sentry.quartz.SentryJobListener.SENTRY_SLUG_KEY;
 
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 import io.sentry.samples.spring.boot.jakarta.quartz.SampleJob;
 import java.util.Collections;
 import org.quartz.JobDetail;
@@ -42,6 +43,11 @@ RestClient restClient(RestClient.Builder builder) {
     return builder.build();
   }
 
+  @Bean
+  SimpleMeterRegistry simpleMeterRegistry() {
+    return new SimpleMeterRegistry();
+  }
+
   @Bean
   public JobDetailFactoryBean jobDetail() {
     JobDetailFactoryBean jobDetailFactory = new JobDetailFactoryBean();

sentry-samples/sentry-samples-spring-boot-jakarta/src/test/kotlin/io/sentry/systemtest/MetricsSystemTest.kt

@@ -3,6 +3,7 @@ package io.sentry.systemtest
 import io.sentry.systemtest.util.TestHelper
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
 import kotlin.test.assertTrue
 import org.junit.Before
 
@@ -28,6 +29,30 @@ class MetricsSystemTest {
     }
   }
 
+  @Test
+  fun `Micrometer metric is forwarded to Sentry and another registry`() {
+    val restClient = testHelper.restClient
+    val response = assertNotNull(restClient.getMicrometerMetric())
+    val responsePrefix = "micrometer metric increased: "
+    assertTrue(response.startsWith(responsePrefix))
+    assertTrue(response.removePrefix(responsePrefix).toDouble() > 0.0)
+    assertEquals(200, restClient.lastKnownStatusCode)
+
+    testHelper.ensureMetricsReceived { event, header ->
+      testHelper.doesContainMetric(event, "micrometer.counter", "counter", 1.0) &&
+        testHelper.doesMetricHaveAttribute(
+          event,
+          "micrometer.counter",
+          "source",
+          "spring",
+        ) &&
+        header.sdkVersion?.integrationSet?.contains("Micrometer") == true &&
+        header.sdkVersion?.packageSet?.any {
+          it.name == "maven:io.sentry:sentry-micrometer"
+        } == true
+    }
+  }
+
   @Test
   fun `Spring Boot generated HTTP metric is forwarded through Micrometer`() {
     val restClient = testHelper.restClient