fix micrometer bridge (open-telemetry#15011)

Author: zeitlinger

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/micrometer/MicrometerBridgeAutoConfiguration.java

@@ -9,6 +9,7 @@
 import io.micrometer.core.instrument.MeterRegistry;
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.micrometer.v1_5.OpenTelemetryMeterRegistry;
+import io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.ConditionalOnEnabledInstrumentation;
 import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
@@ -24,7 +25,7 @@
  * any time.
  */
 @ConditionalOnEnabledInstrumentation(module = "micrometer", enabledByDefault = false)
-@AutoConfigureAfter(MetricsAutoConfiguration.class)
+@AutoConfigureAfter({MetricsAutoConfiguration.class, OpenTelemetryAutoConfiguration.class})
 @AutoConfigureBefore(CompositeMeterRegistryAutoConfiguration.class)
 @ConditionalOnBean(Clock.class)
 @ConditionalOnClass(MeterRegistry.class)

smoke-tests-otel-starter/spring-boot-2/build.gradle.kts

@@ -7,6 +7,7 @@ description = "smoke-tests-otel-starter-spring-boot-2"
 dependencies {
   implementation("org.springframework.boot:spring-boot-starter-web")
   implementation("org.springframework.boot:spring-boot-starter-data-jdbc")
+  implementation("org.springframework.boot:spring-boot-starter-actuator")
   runtimeOnly("com.h2database:h2")
   implementation("org.apache.commons:commons-dbcp2")
   implementation("org.springframework.kafka:spring-kafka")

smoke-tests-otel-starter/spring-boot-2/src/test/java/io/opentelemetry/spring/smoketest/OtelSpringStarterSmokeTest.java

@@ -5,6 +5,7 @@
 
 package io.opentelemetry.spring.smoketest;
 
+import org.assertj.core.api.AbstractIterableAssert;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest(
@@ -20,4 +21,11 @@
       "otel.instrumentation.runtime-telemetry.emit-experimental-telemetry=true",
       "otel.instrumentation.common.thread_details.enabled=true",
     })
-class OtelSpringStarterSmokeTest extends AbstractOtelSpringStarterSmokeTest {}
+class OtelSpringStarterSmokeTest extends AbstractOtelSpringStarterSmokeTest {
+
+  @Override
+  protected void assertAdditionalMetrics() {
+    testing.waitAndAssertMetrics(
+        "io.opentelemetry.micrometer-1.5", "disk.total", AbstractIterableAssert::isNotEmpty);
+  }
+}

smoke-tests-otel-starter/spring-boot-common/src/main/resources/application.yaml

@@ -8,6 +8,8 @@ otel:
     logback-appender:
       experimental:
         capture-code-attributes: true
+    micrometer:
+      enabled: true
     http:
       client:
         emit-experimental-telemetry: true