From d91e16a6c5ab82d871834a52a5036e030eab8130 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 10 Nov 2022 10:09:08 +0000 Subject: [PATCH] Make auto-configured BraveTracer back off when user defines a Tracer Closes gh-33095 --- .../autoconfigure/tracing/BraveAutoConfiguration.java | 2 +- .../tracing/BraveAutoConfigurationTests.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfiguration.java index a0ad63ca9f..c234c8974f 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfiguration.java @@ -160,7 +160,7 @@ public class BraveAutoConfiguration { } @Bean - @ConditionalOnMissingBean + @ConditionalOnMissingBean(io.micrometer.tracing.Tracer.class) BraveTracer braveTracerBridge(brave.Tracer tracer, CurrentTraceContext currentTraceContext) { return new BraveTracer(tracer, new BraveCurrentTraceContext(currentTraceContext), BRAVE_BAGGAGE_MANAGER); } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfigurationTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfigurationTests.java index eecdf5516d..e437f801db 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfigurationTests.java @@ -113,8 +113,8 @@ class BraveAutoConfigurationTests { assertThat(context).hasSingleBean(HttpServerHandler.class); assertThat(context).hasBean("customHttpClientHandler"); assertThat(context).hasSingleBean(HttpClientHandler.class); - assertThat(context).hasBean("customBraveTracer"); - assertThat(context).hasSingleBean(BraveTracer.class); + assertThat(context).hasBean("customMicrometerTracer"); + assertThat(context).hasSingleBean(io.micrometer.tracing.Tracer.class); assertThat(context).hasBean("customBraveBaggageManager"); assertThat(context).hasSingleBean(BraveBaggageManager.class); assertThat(context).hasBean("customBraveHttpServerHandler"); @@ -397,8 +397,8 @@ class BraveAutoConfigurationTests { } @Bean - BraveTracer customBraveTracer() { - return mock(BraveTracer.class); + io.micrometer.tracing.Tracer customMicrometerTracer() { + return mock(io.micrometer.tracing.Tracer.class); } @Bean