Skip to content

Commit d91e16a

Browse files
committed
Make auto-configured BraveTracer back off when user defines a Tracer
Closes gh-33095
1 parent 12c77db commit d91e16a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public HttpClientHandler<HttpClientRequest, HttpClientResponse> httpClientHandle
160160
}
161161

162162
@Bean
163-
@ConditionalOnMissingBean
163+
@ConditionalOnMissingBean(io.micrometer.tracing.Tracer.class)
164164
BraveTracer braveTracerBridge(brave.Tracer tracer, CurrentTraceContext currentTraceContext) {
165165
return new BraveTracer(tracer, new BraveCurrentTraceContext(currentTraceContext), BRAVE_BAGGAGE_MANAGER);
166166
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ void shouldBackOffOnCustomBeans() {
113113
assertThat(context).hasSingleBean(HttpServerHandler.class);
114114
assertThat(context).hasBean("customHttpClientHandler");
115115
assertThat(context).hasSingleBean(HttpClientHandler.class);
116-
assertThat(context).hasBean("customBraveTracer");
117-
assertThat(context).hasSingleBean(BraveTracer.class);
116+
assertThat(context).hasBean("customMicrometerTracer");
117+
assertThat(context).hasSingleBean(io.micrometer.tracing.Tracer.class);
118118
assertThat(context).hasBean("customBraveBaggageManager");
119119
assertThat(context).hasSingleBean(BraveBaggageManager.class);
120120
assertThat(context).hasBean("customBraveHttpServerHandler");
@@ -397,8 +397,8 @@ HttpClientHandler<HttpClientRequest, HttpClientResponse> customHttpClientHandler
397397
}
398398

399399
@Bean
400-
BraveTracer customBraveTracer() {
401-
return mock(BraveTracer.class);
400+
io.micrometer.tracing.Tracer customMicrometerTracer() {
401+
return mock(io.micrometer.tracing.Tracer.class);
402402
}
403403

404404
@Bean

0 commit comments

Comments
 (0)