Clean up auto-configuration dependencies

See spring-projectsgh-30156

Author: mhalbritter

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfiguration.java

@@ -33,7 +33,6 @@
 import io.micrometer.tracing.brave.bridge.BraveCurrentTraceContext;
 import io.micrometer.tracing.brave.bridge.BraveTracer;
 
-import org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -50,7 +49,7 @@
  * @author Moritz Halbritter
  * @since 3.0.0
  */
-@AutoConfiguration(after = ZipkinAutoConfiguration.class)
+@AutoConfiguration
 @ConditionalOnClass(brave.Tracer.class)
 @EnableConfigurationProperties(TracingProperties.class)
 public class BraveAutoConfiguration {

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/MicrometerTracingAutoConfiguration.java

@@ -19,8 +19,6 @@
 import io.micrometer.tracing.Tracer;
 import io.micrometer.tracing.handler.DefaultTracingObservationHandler;
 
-import org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration;
-import org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -34,8 +32,7 @@
  * @author Moritz Halbritter
  * @since 3.0.0
  */
-@AutoConfiguration(before = ObservationAutoConfiguration.class,
-		after = { ZipkinAutoConfiguration.class, BraveAutoConfiguration.class, OpenTelemetryAutoConfiguration.class })
+@AutoConfiguration(after = { BraveAutoConfiguration.class, OpenTelemetryAutoConfiguration.class })
 @ConditionalOnClass(Tracer.class)
 public class MicrometerTracingAutoConfiguration {
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryAutoConfiguration.java

@@ -36,7 +36,6 @@
 import io.opentelemetry.sdk.trace.samplers.Sampler;
 
 import org.springframework.boot.SpringBootVersion;
-import org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -53,7 +52,7 @@
  * @author Moritz Halbritter
  * @since 3.0.0
  */
-@AutoConfiguration(after = ZipkinAutoConfiguration.class)
+@AutoConfiguration
 public class OpenTelemetryAutoConfiguration {
 
 	@Configuration(proxyBeanMethods = false)

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/wavefront/WavefrontAutoConfiguration.java

@@ -30,8 +30,8 @@
 import io.micrometer.tracing.reporter.wavefront.WavefrontSpanHandler;
 import io.opentelemetry.sdk.trace.export.SpanExporter;
 
-import org.springframework.boot.actuate.autoconfigure.tracing.BraveAutoConfiguration;
-import org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryAutoConfiguration;
+import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
+import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -48,7 +48,7 @@
  *
  * @author Moritz Halbritter
  */
-@AutoConfiguration(before = { OpenTelemetryAutoConfiguration.class, BraveAutoConfiguration.class })
+@AutoConfiguration(after = { MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class })
 @EnableConfigurationProperties(WavefrontTracingProperties.class)
 @ConditionalOnClass(WavefrontSender.class)
 class WavefrontAutoConfiguration {