Skip to content

Commit 09ec2dc

Browse files
Make bridge beans conditionalonmissingbean; fixes gh-52
1 parent febb0ba commit 09ec2dc

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

spring-cloud-sleuth-otel-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/otel/OtelBridgeConfiguration.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
class OtelBridgeConfiguration {
7575

7676
@Bean
77+
@ConditionalOnMissingBean
7778
Tracer otelTracerBridge(io.opentelemetry.api.trace.Tracer tracer, ApplicationEventPublisher publisher,
7879
CurrentTraceContext currentTraceContext, SleuthBaggageProperties sleuthBaggageProperties) {
7980
return new OtelTracer(tracer, publisher, new OtelBaggageManager(currentTraceContext,
@@ -89,11 +90,13 @@ OtelCurrentTraceContext otelCurrentTraceContext(ApplicationEventPublisher publis
8990
}
9091

9192
@Bean
93+
@ConditionalOnMissingBean
9294
SpanCustomizer otelSpanCustomizer() {
9395
return new OtelSpanCustomizer();
9496
}
9597

9698
@Bean
99+
@ConditionalOnMissingBean
97100
Propagator otelPropagator(ContextPropagators contextPropagators, io.opentelemetry.api.trace.Tracer tracer) {
98101
return new OtelPropagator(contextPropagators, tracer);
99102
}
@@ -112,6 +115,7 @@ SpanExporterCustomizer noOpSleuthSpanFilterConverter() {
112115
static class TraceOtelHttpBridgeConfiguration {
113116

114117
@Bean
118+
@ConditionalOnMissingBean
115119
HttpClientHandler otelHttpClientHandler(io.opentelemetry.api.OpenTelemetry openTelemetry,
116120
@Nullable @HttpClientRequestParser HttpRequestParser httpClientRequestParser,
117121
@Nullable @HttpClientResponseParser HttpResponseParser httpClientResponseParser,
@@ -121,6 +125,7 @@ HttpClientHandler otelHttpClientHandler(io.opentelemetry.api.OpenTelemetry openT
121125
}
122126

123127
@Bean
128+
@ConditionalOnMissingBean
124129
HttpServerHandler otelHttpServerHandler(io.opentelemetry.api.OpenTelemetry openTelemetry,
125130
@Nullable @HttpServerRequestParser HttpRequestParser httpServerRequestParser,
126131
@Nullable @HttpServerResponseParser HttpResponseParser httpServerResponseParser,

0 commit comments

Comments
 (0)