fix annotation

Author: zeitlinger

instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/build.gradle.kts

@@ -29,6 +29,17 @@ tasks.withType<Test>().configureEach {
 
   jvmArgs("-Dotel.instrumentation.spring-boot-actuator-autoconfigure.enabled=true")
 }
+tasks {
+  val testPrometheus by registering(Test::class) {
+    dependencies {
+      runtimeOnly("io.micrometer:micrometer-registry-prometheus:1.14.3")
+    }
+  }
+
+  check {
+    dependsOn(testPrometheus)
+  }
+}
 
 val latestDepTest = findProperty("testLatestDeps") as Boolean
 

instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/actuator/v2_0/OpenTelemetryMeterRegistryAutoConfiguration.java

@@ -9,7 +9,7 @@
 import io.micrometer.core.instrument.MeterRegistry;
 import io.opentelemetry.javaagent.instrumentation.micrometer.v1_5.MicrometerSingletons;
 import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
-import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
+import org.springframework.boot.actuate.autoconfigure.metrics.export.prometheus.PrometheusMetricsExportAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
@@ -19,15 +19,12 @@
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-// see
-// https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusMetricsExportAutoConfiguration.java
-// for an example of how configure a MeterRegistry properly
 // CompositeMeterRegistryAutoConfiguration configures the "final" composite registry
-@AutoConfigureBefore({
-  CompositeMeterRegistryAutoConfiguration.class,
-  SimpleMetricsExportAutoConfiguration.class
-})
-@AutoConfigureAfter(MetricsAutoConfiguration.class)
+@AutoConfigureBefore(CompositeMeterRegistryAutoConfiguration.class)
+// configure after the SimpleMeterRegistry has initialized; it is normally the last MeterRegistry
+// implementation to be configured, as it's used as a fallback
+// the OTel registry should be added in addition to that fallback and not replace it
+@AutoConfigureAfter({SimpleMetricsExportAutoConfiguration.class, PrometheusMetricsExportAutoConfiguration.class})
 @ConditionalOnBean(Clock.class)
 @ConditionalOnClass(MeterRegistry.class)
 public class OpenTelemetryMeterRegistryAutoConfiguration {