Skip to content

Commit ed8a742

Browse files
committed
Pick up all TextMapPropagator beans
See spring-projectsgh-30156
1 parent 2b4f8bf commit ed8a742

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

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

+2-9
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,8 @@ OpenTelemetry openTelemetry(SdkTracerProvider sdkTracerProvider, ContextPropagat
7171

7272
@Bean
7373
@ConditionalOnMissingBean
74-
ContextPropagators contextPropagators(TextMapPropagator textMapPropagator) {
75-
return ContextPropagators.create(textMapPropagator);
76-
}
77-
78-
@Bean
79-
@ConditionalOnMissingBean
80-
TextMapPropagator textMapPropagator() {
81-
// TODO MH: Fix that
82-
return TextMapPropagator.noop();
74+
ContextPropagators contextPropagators(List<TextMapPropagator> textMapPropagators) {
75+
return ContextPropagators.create(TextMapPropagator.composite(textMapPropagators));
8376
}
8477

8578
@Bean

0 commit comments

Comments
 (0)