Fix bean names in Brave and Otel auto-configuration

See spring-projectsgh-30156

Author: mhalbritter

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

@@ -61,7 +61,8 @@ public class BraveAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	Tracing tracing(Environment environment, List<SpanHandler> spanHandlers, List<TracingCustomizer> tracingCustomizers,
+	Tracing braveTracing(Environment environment, List<SpanHandler> spanHandlers,
+			List<TracingCustomizer> tracingCustomizers,
 			CurrentTraceContext currentTraceContext, Factory propagationFactory, Sampler sampler) {
 		String applicationName = environment.getProperty("spring.application.name");
 		Builder builder = Tracing.newBuilder().currentTraceContext(currentTraceContext)
@@ -84,7 +85,7 @@ brave.Tracer braveTracer(Tracing tracing) {
 
 	@Bean
 	@ConditionalOnMissingBean
-	CurrentTraceContext currentTraceContext(List<CurrentTraceContext.ScopeDecorator> scopeDecorators,
+	CurrentTraceContext braveCurrentTraceContext(List<CurrentTraceContext.ScopeDecorator> scopeDecorators,
 			List<CurrentTraceContextCustomizer> currentTraceContextCustomizers) {
 		ThreadLocalCurrentTraceContext.Builder builder = ThreadLocalCurrentTraceContext.newBuilder();
 		for (ScopeDecorator scopeDecorator : scopeDecorators) {
@@ -98,14 +99,14 @@ CurrentTraceContext currentTraceContext(List<CurrentTraceContext.ScopeDecorator>
 
 	@Bean
 	@ConditionalOnMissingBean
-	Factory propagationFactory() {
+	Factory bravePropagationFactory() {
 		// TODO MH: Make configurable?
 		return B3Propagation.newFactoryBuilder().injectFormat(B3Propagation.Format.SINGLE_NO_PARENT).build();
 	}
 
 	@Bean
 	@ConditionalOnMissingBean
-	Sampler sampler(TracingProperties properties) {
+	Sampler braveSampler(TracingProperties properties) {
 		return Sampler.create(properties.getSampling().getProbability());
 	}
 

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

@@ -69,7 +69,7 @@ OpenTelemetry openTelemetry(SdkTracerProvider sdkTracerProvider, ContextPropagat
 
 		@Bean
 		@ConditionalOnMissingBean
-		SdkTracerProvider sdkTracerProvider(List<SpanProcessor> spanProcessors, Sampler sampler) {
+		SdkTracerProvider otelSdkTracerProvider(List<SpanProcessor> spanProcessors, Sampler sampler) {
 			SdkTracerProviderBuilder builder = SdkTracerProvider.builder().setSampler(sampler);
 			for (SpanProcessor spanProcessor : spanProcessors) {
 				builder.addSpanProcessor(spanProcessor);
@@ -79,22 +79,23 @@ SdkTracerProvider sdkTracerProvider(List<SpanProcessor> spanProcessors, Sampler
 
 		@Bean
 		@ConditionalOnMissingBean
-		ContextPropagators contextPropagators(List<TextMapPropagator> textMapPropagators) {
+		ContextPropagators otelContextPropagators(List<TextMapPropagator> textMapPropagators) {
 			return ContextPropagators.create(TextMapPropagator.composite(textMapPropagators));
 		}
 
 		@Bean
 		@ConditionalOnMissingBean
-		Sampler sampler(TracingProperties properties) {
+		Sampler otelSampler(TracingProperties properties) {
 			return Sampler.traceIdRatioBased(properties.getSampling().getProbability());
 		}
 
 		@Bean
 		@ConditionalOnMissingBean
-		SpanProcessor spanProcessor(List<SpanExporter> spanExporter) {
+		SpanProcessor otelSpanProcessor(List<SpanExporter> spanExporter) {
 			return SpanProcessor.composite(spanExporter.stream()
 					.map(exporter -> BatchSpanProcessor.builder(exporter).build()).collect(Collectors.toSet()));
 		}
+
 	}
 
 	@Configuration(proxyBeanMethods = false)
@@ -105,10 +106,11 @@ static class TracerConfiguration {
 		@Bean
 		@ConditionalOnMissingBean
 		@ConditionalOnBean(OpenTelemetry.class)
-		Tracer tracer(OpenTelemetry openTelemetry) {
+		Tracer otelTracer(OpenTelemetry openTelemetry) {
 			// TODO MH: Decide on a name
 			return openTelemetry.getTracer("org.springframework.boot", SpringBootVersion.getVersion());
 		}
+
 	}
 
 	@Configuration(proxyBeanMethods = false)
@@ -119,15 +121,15 @@ static class OpenTelemetryMicrometer {
 		@Bean
 		@ConditionalOnMissingBean
 		@ConditionalOnBean(Tracer.class)
-		OtelTracer otelTracer(Tracer tracer, EventPublisher eventPublisher,
+		OtelTracer micrometerOtelTracer(Tracer tracer, EventPublisher eventPublisher,
 				OtelCurrentTraceContext otelCurrentTraceContext) {
 			return new OtelTracer(tracer, otelCurrentTraceContext, eventPublisher,
 					new OtelBaggageManager(otelCurrentTraceContext, List.of(), List.of()));
 		}
 
 		@Bean
 		@ConditionalOnMissingBean
-		EventPublisher eventPublisher() {
+		EventPublisher otelTracerEventPublisher() {
 			return event -> {
 			};
 		}