feedback

Signed-off-by: Adrian Cole <adrian@tetrate.io>
spring-projects · Feb 14, 2024 · 3fd2086 · 3fd2086
1 parent e2015f2
commit 3fd2086
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/...a/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinConfigurations.java b/...a/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinConfigurations.java
@@ -149,7 +149,6 @@ static class BraveConfiguration {
 
 		@Bean
 		@ConditionalOnMissingBean(value = MutableSpan.class, parameterizedContainer = BytesEncoder.class)
-		@ConditionalOnEnabledTracing
 		BytesEncoder<MutableSpan> braveSpanEncoder(Encoding encoding,
 				ObjectProvider<Tag<Throwable>> throwableTagProvider) {
 			Tag<Throwable> throwableTag = throwableTagProvider.getIfAvailable(() -> Tags.ERROR);
@@ -173,7 +172,6 @@ static class OpenTelemetryConfiguration {
 
 		@Bean
 		@ConditionalOnMissingBean(value = Span.class, parameterizedContainer = BytesEncoder.class)
-		@ConditionalOnEnabledTracing
 		BytesEncoder<Span> zipkinSpanEncoder(Encoding encoding) {
 			return SpanBytesEncoder.forEncoding(encoding);
 		}

diff --git a/...ringframework/boot/actuate/autoconfigure/tracing/zipkin/DefaultEncodingConfiguration.java b/...ringframework/boot/actuate/autoconfigure/tracing/zipkin/DefaultEncodingConfiguration.java
@@ -19,13 +19,13 @@
 import zipkin2.reporter.Encoding;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 /**
  * Configures the bean {@linkplain ZipkinAutoConfiguration} would from properties.
  */
-@Configuration(proxyBeanMethods = false)
+@TestConfiguration(proxyBeanMethods = false)
 class DefaultEncodingConfiguration {
 
 	@Bean