root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Make auto-configured BraveTracer back off when user defines a Tracer 

Closes gh-33095
This commit is contained in:
Andy Wilkinson 2022-11-10 10:09:08 +00:00
parent 12c77dba1c
commit d91e16a6c5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,7 +160,7 @@ public class BraveAutoConfiguration {
} }
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean(io.micrometer.tracing.Tracer.class)
BraveTracer braveTracerBridge(brave.Tracer tracer, CurrentTraceContext currentTraceContext) { BraveTracer braveTracerBridge(brave.Tracer tracer, CurrentTraceContext currentTraceContext) {
return new BraveTracer(tracer, new BraveCurrentTraceContext(currentTraceContext), BRAVE_BAGGAGE_MANAGER); return new BraveTracer(tracer, new BraveCurrentTraceContext(currentTraceContext), BRAVE_BAGGAGE_MANAGER);
} }

8
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfigurationTests.java
View File

@ -113,8 +113,8 @@ class BraveAutoConfigurationTests {
assertThat(context).hasSingleBean(HttpServerHandler.class); assertThat(context).hasSingleBean(HttpServerHandler.class);
assertThat(context).hasBean("customHttpClientHandler"); assertThat(context).hasBean("customHttpClientHandler");
assertThat(context).hasSingleBean(HttpClientHandler.class); assertThat(context).hasSingleBean(HttpClientHandler.class);
assertThat(context).hasBean("customBraveTracer"); assertThat(context).hasBean("customMicrometerTracer");
assertThat(context).hasSingleBean(BraveTracer.class); assertThat(context).hasSingleBean(io.micrometer.tracing.Tracer.class);
assertThat(context).hasBean("customBraveBaggageManager"); assertThat(context).hasBean("customBraveBaggageManager");
assertThat(context).hasSingleBean(BraveBaggageManager.class); assertThat(context).hasSingleBean(BraveBaggageManager.class);
assertThat(context).hasBean("customBraveHttpServerHandler"); assertThat(context).hasBean("customBraveHttpServerHandler");
@ -397,8 +397,8 @@ class BraveAutoConfigurationTests {
} }
@Bean @Bean
BraveTracer customBraveTracer() { io.micrometer.tracing.Tracer customMicrometerTracer() {
return mock(BraveTracer.class); return mock(io.micrometer.tracing.Tracer.class);
} }
@Bean @Bean