fix micrometer bridge auto configuration annotation

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

@@ -22,6 +22,16 @@ dependencies {
   latestDepTestLibrary("ch.qos.logback:logback-classic:+")
 }
 
+testing {
+  suites {
+    val testPrometheus by registering(JvmTestSuite::class) {
+      dependencies {
+        runtimeOnly("io.micrometer:micrometer-registry-prometheus:1.14.3")
+      }
+    }
+  }
+}
+
 tasks.withType<Test>().configureEach {
   // required on jdk17
   jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
@@ -49,3 +59,9 @@ if (!latestDepTest) {
     }
   }
 }
+
+tasks {
+  check {
+    dependsOn(testing.suites)
+  }
+}

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

@@ -7,7 +7,15 @@
 
 import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
 import io.opentelemetry.javaagent.instrumentation.micrometer.v1_5.MicrometerSingletons;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
@@ -32,4 +40,30 @@ public class OpenTelemetryMeterRegistryAutoConfiguration {
   public MeterRegistry otelMeterRegistry() {
     return MicrometerSingletons.meterRegistry();
   }
+
+  @Bean
+  static BeanPostProcessor postProcessCompositeMeterRegistry() {
+    return new BeanPostProcessor() {
+      @Override
+      public Object postProcessAfterInitialization(Object bean, String beanName) {
+        if (bean instanceof CompositeMeterRegistry) {
+          CompositeMeterRegistry original = (CompositeMeterRegistry) bean;
+          List<MeterRegistry> list = new ArrayList<>(original.getRegistries());
+          // sort otel registry last
+          list.sort(
+              Comparator.comparingInt(
+                  value -> value == MicrometerSingletons.meterRegistry() ? 1 : 0));
+          Set<MeterRegistry> registries = new LinkedHashSet<>(list);
+          return new CompositeMeterRegistry(
+              original.config().clock(), Collections.singletonList(original)) {
+            @Override
+            public Set<MeterRegistry> getRegistries() {
+              return registries;
+            }
+          };
+        }
+        return bean;
+      }
+    };
+  }
 }

instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/actuator/v2_0/ActuatorTest.java

@@ -15,6 +15,9 @@
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.javaagent.instrumentation.spring.actuator.v2_0.SpringApp.TestBean;
+import java.util.Collection;
+import org.assertj.core.api.AbstractCollectionAssert;
+import org.assertj.core.api.ObjectAssert;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.springframework.boot.SpringApplication;
@@ -57,9 +60,19 @@ void shouldInjectOtelMeterRegistry() {
                                                         "value"))))));
 
     MeterRegistry meterRegistry = context.getBean(MeterRegistry.class);
-    assertThat(meterRegistry).isNotNull().isInstanceOf(CompositeMeterRegistry.class);
-    assertThat(((CompositeMeterRegistry) meterRegistry).getRegistries())
-        .anyMatch(r -> r.getClass().getSimpleName().equals("OpenTelemetryMeterRegistry"))
-        .anyMatch(r -> r.getClass().getSimpleName().equals("SimpleMeterRegistry"));
+    assertThat(meterRegistry).isInstanceOf(CompositeMeterRegistry.class);
+    AbstractCollectionAssert<
+            ?, Collection<? extends MeterRegistry>, MeterRegistry, ObjectAssert<MeterRegistry>>
+        match =
+            assertThat(((CompositeMeterRegistry) meterRegistry).getRegistries())
+                .anyMatch(r -> r.getClass().getSimpleName().equals("OpenTelemetryMeterRegistry"))
+                .anyMatch(r -> r.getClass().getSimpleName().equals("SimpleMeterRegistry"));
+
+    try {
+      Class.forName("io.micrometer.prometheusmetrics.PrometheusMeterRegistry");
+      match.anyMatch(r -> r.getClass().getSimpleName().equals("PrometheusMeterRegistry"));
+    } catch (ClassNotFoundException e) {
+      // not testing prometheus
+    }
   }
 }