Skip to content

Commit 97507f9

Browse files
committed
Add support for ScopeDecorator and CurrentTraceContextCustomizer
See spring-projectsgh-30156
1 parent 3a8d5fd commit 97507f9

File tree

1 file changed

+12
-2
lines changed
  • spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing

1 file changed

+12
-2
lines changed

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

+12-2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
import brave.handler.SpanHandler;
2525
import brave.propagation.B3Propagation;
2626
import brave.propagation.CurrentTraceContext;
27+
import brave.propagation.CurrentTraceContext.ScopeDecorator;
28+
import brave.propagation.CurrentTraceContextCustomizer;
2729
import brave.propagation.Propagation.Factory;
2830
import brave.propagation.ThreadLocalCurrentTraceContext;
2931
import brave.sampler.Sampler;
@@ -74,8 +76,16 @@ brave.Tracer braveTracer(Tracing tracing) {
7476

7577
@Bean
7678
@ConditionalOnMissingBean
77-
CurrentTraceContext currentTraceContext() {
78-
return ThreadLocalCurrentTraceContext.newBuilder().build();
79+
CurrentTraceContext currentTraceContext(List<CurrentTraceContext.ScopeDecorator> scopeDecorators,
80+
List<CurrentTraceContextCustomizer> currentTraceContextCustomizers) {
81+
ThreadLocalCurrentTraceContext.Builder builder = ThreadLocalCurrentTraceContext.newBuilder();
82+
for (ScopeDecorator scopeDecorator : scopeDecorators) {
83+
builder.addScopeDecorator(scopeDecorator);
84+
}
85+
for (CurrentTraceContextCustomizer currentTraceContextCustomizer : currentTraceContextCustomizers) {
86+
currentTraceContextCustomizer.customize(builder);
87+
}
88+
return builder.build();
7989
}
8090

8191
@Bean

0 commit comments

Comments
 (0)