fix: fix tracing.enabled=false

apache · Apr 18, 2023 · 27c681b · 27c681b
1 parent 0944de5
commit 27c681b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/nested/ExporterConfig.java b/dubbo-common/src/main/java/org/apache/dubbo/config/nested/ExporterConfig.java
@@ -25,7 +25,7 @@
 public class ExporterConfig implements Serializable {
 
     @Nested
-    private ZipkinConfig zipkinConfig = new ZipkinConfig();
+    private ZipkinConfig zipkinConfig;
 
     public ZipkinConfig getZipkinConfig() {
         return zipkinConfig;

diff --git a/...ubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinAutoConfiguration.java b/...ubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinAutoConfiguration.java
@@ -36,6 +36,7 @@
 import zipkin2.codec.SpanBytesEncoder;
 import zipkin2.reporter.Sender;
 
+import static org.apache.dubbo.spring.boot.observability.autoconfigure.ObservabilityUtils.DUBBO_TRACING_PREFIX;
 import static org.apache.dubbo.spring.boot.observability.autoconfigure.ObservabilityUtils.DUBBO_TRACING_ZIPKIN_CONFIG_PREFIX;
 
 
@@ -44,18 +45,19 @@
  * <p>
  * It uses imports on {@link ZipkinConfigurations} to guarantee the correct configuration ordering.
  *
- * @since 3.2.0
+ * @since 3.2.1
  */
 @AutoConfiguration(after = RestTemplateAutoConfiguration.class)
 @ConditionalOnClass(Sender.class)
 @Import({SenderConfiguration.class,
         ReporterConfiguration.class, BraveConfiguration.class,
         OpenTelemetryConfiguration.class})
-@ConditionalOnProperty(prefix = DUBBO_TRACING_ZIPKIN_CONFIG_PREFIX, name = "endpoint")
+@ConditionalOnProperty(prefix = DUBBO_TRACING_PREFIX, name = "enabled", havingValue = "true")
 @ConditionalOnDubboTracingEnable
 public class ZipkinAutoConfiguration {
 
     @Bean
+    @ConditionalOnProperty(prefix = DUBBO_TRACING_ZIPKIN_CONFIG_PREFIX, name = "endpoint")
     @ConditionalOnMissingBean
     public BytesEncoder<Span> spanBytesEncoder() {
         return SpanBytesEncoder.JSON_V2;

diff --git a/...e/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinConfigurations.java b/...e/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinConfigurations.java
@@ -27,6 +27,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.context.annotation.Bean;
@@ -44,12 +45,15 @@
 
 import java.util.concurrent.atomic.AtomicReference;
 
+import static org.apache.dubbo.spring.boot.observability.autoconfigure.ObservabilityUtils.DUBBO_TRACING_ZIPKIN_CONFIG_PREFIX;
+
 /**
  * Configurations for Zipkin. Those are imported by {@link ZipkinAutoConfiguration}.
  */
 class ZipkinConfigurations {
 
     @Configuration(proxyBeanMethods = false)
+    @ConditionalOnProperty(prefix = DUBBO_TRACING_ZIPKIN_CONFIG_PREFIX, name = "endpoint")
     @Import({UrlConnectionSenderConfiguration.class, WebClientSenderConfiguration.class,
             RestTemplateSenderConfiguration.class})
     static class SenderConfiguration {
@@ -147,6 +151,7 @@ ZipkinSpanHandler zipkinSpanHandler(Reporter<Span> spanReporter) {
 
     @Configuration(proxyBeanMethods = false)
     @ConditionalOnClass(ZipkinSpanExporter.class)
+    @ConditionalOnProperty(prefix = DUBBO_TRACING_ZIPKIN_CONFIG_PREFIX, name = "endpoint")
     @EnableConfigurationProperties(DubboConfigurationProperties.class)
     static class OpenTelemetryConfiguration {