diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryAutoConfiguration.java index 7bf0a4fa93..1f2173c7cd 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryAutoConfiguration.java @@ -135,7 +135,7 @@ public class OpenTelemetryAutoConfiguration { } @Bean - @ConditionalOnMissingBean + @ConditionalOnMissingBean(io.micrometer.tracing.Tracer.class) OtelTracer micrometerOtelTracer(Tracer tracer, EventPublisher eventPublisher, OtelCurrentTraceContext otelCurrentTraceContext) { return new OtelTracer(tracer, otelCurrentTraceContext, eventPublisher, diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryAutoConfigurationTests.java index b08312eeed..5e49894523 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryAutoConfigurationTests.java @@ -106,8 +106,8 @@ class OpenTelemetryAutoConfigurationTests { @Test void shouldBackOffOnCustomBeans() { this.contextRunner.withUserConfiguration(CustomConfiguration.class).run((context) -> { - assertThat(context).hasBean("customOtelTracer"); - assertThat(context).hasSingleBean(OtelTracer.class); + assertThat(context).hasBean("customMicrometerTracer"); + assertThat(context).hasSingleBean(io.micrometer.tracing.Tracer.class); assertThat(context).hasBean("customEventPublisher"); assertThat(context).hasSingleBean(EventPublisher.class); assertThat(context).hasBean("customOtelCurrentTraceContext"); @@ -201,8 +201,8 @@ class OpenTelemetryAutoConfigurationTests { private static class CustomConfiguration { @Bean - OtelTracer customOtelTracer() { - return mock(OtelTracer.class); + io.micrometer.tracing.Tracer customMicrometerTracer() { + return mock(io.micrometer.tracing.Tracer.class); } @Bean