Update spring-boot-actuator-autoconfigure for spring boot 4 (#15433)

Author: jaydeluca

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

@@ -12,17 +12,22 @@ muzzle {
   }
 }
 
+val latestDepTest = findProperty("testLatestDeps") as Boolean
+
 dependencies {
   library("org.springframework.boot:spring-boot-actuator-autoconfigure:2.0.0.RELEASE")
   library("io.micrometer:micrometer-core:1.5.0")
   testLibrary("io.micrometer:micrometer-registry-prometheus:1.0.1")
 
+  if (latestDepTest) {
+    // Micrometer moved into its own Spring Boot starter in version 4
+    testLibrary("org.springframework.boot:spring-boot-starter-micrometer-metrics:4.0.0")
+  }
+
   implementation(project(":instrumentation:micrometer:micrometer-1.5:javaagent"))
 
   // dependency management pins logback-classic to 1.3 which is the last release that supports java 8
   latestDepTestLibrary("ch.qos.logback:logback-classic:latest.release")
-  // tests don't work with spring boot 4 yet
-  latestDepTestLibrary("org.springframework.boot:spring-boot-actuator-autoconfigure:3.+") // documented limitation
 }
 
 tasks.withType<Test>().configureEach {
@@ -33,8 +38,6 @@ tasks.withType<Test>().configureEach {
   jvmArgs("-Dotel.instrumentation.spring-boot-actuator-autoconfigure.enabled=true")
 }
 
-val latestDepTest = findProperty("testLatestDeps") as Boolean
-
 // spring 6 (spring boot 3) requires java 17
 if (latestDepTest) {
   otelJava {

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

@@ -39,7 +39,11 @@ public static class GetCandidateConfigurationsAdvice {
     public static List<String> onExit(@Advice.Return List<String> originalConfigurations) {
       List<String> configurations = originalConfigurations;
       if (configurations.contains(
-          "org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration")) {
+              // Spring Boot 2.x-3.x location
+              "org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration")
+          || configurations.contains(
+              // Spring Boot 4.x location
+              "org.springframework.boot.micrometer.metrics.autoconfigure.MetricsAutoConfiguration")) {
         List<String> configs = new ArrayList<>(configurations.size() + 1);
         configs.addAll(configurations);
         // using class reference here so that muzzle will consider it a dependency of this advice

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

@@ -16,8 +16,6 @@
 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;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -27,11 +25,19 @@
 
 @Configuration
 // CompositeMeterRegistryAutoConfiguration configures the "final" composite registry
-@AutoConfigureBefore(CompositeMeterRegistryAutoConfiguration.class)
+@AutoConfigureBefore(
+    name = {
+      "org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration", // Spring Boot 2.x-3.x location
+      "org.springframework.boot.micrometer.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration" // Spring Boot 4.x location
+    })
 // 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)
+@AutoConfigureAfter(
+    name = {
+      "org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration", // Spring Boot 2.x-3.x location
+      "org.springframework.boot.micrometer.metrics.autoconfigure.export.simple.SimpleMetricsExportAutoConfiguration" // Spring Boot 4.x location
+    })
 @ConditionalOnBean(Clock.class)
 @ConditionalOnClass(MeterRegistry.class)
 public class OpenTelemetryMeterRegistryAutoConfiguration {