This is an automated email from the ASF dual-hosted git repository.
songxiaosheng pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.2 by this push:
new 891277912a fix: remove ConditionalOnDubboTracingEnable matchIfMissing
(#12409)
891277912a is described below
commit 891277912add64efde92121c6a5428332bb70657
Author: conghuhu <56248584+congh...@users.noreply.github.com>
AuthorDate: Tue May 30 12:57:42 2023 +0800
fix: remove ConditionalOnDubboTracingEnable matchIfMissing (#12409)
* chore: remove ConditionalOnDubboTracingEnable matchIfMissing
* fix: fix missing property in test
---------
Co-authored-by: songxiaosheng <songxiaosh...@elastic.link>
---
.../autoconfigure/annotation/ConditionalOnDubboTracingEnable.java | 2 +-
.../autoconfigure/exporter/zipkin/ZipkinAutoConfiguration.java | 2 --
.../observability/DubboMicrometerTracingAutoConfigurationTests.java | 3 ++-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git
a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/annotation/ConditionalOnDubboTracingEnable.java
b/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/annotation/ConditionalOnDubboTracingEnable.java
index eaa7d28e15..1404b62908 100644
---
a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/annotation/ConditionalOnDubboTracingEnable.java
+++
b/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/annotation/ConditionalOnDubboTracingEnable.java
@@ -38,6 +38,6 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
@Inherited
@Documented
-@ConditionalOnProperty(prefix = ObservabilityUtils.DUBBO_TRACING_PREFIX, name
= "enabled", matchIfMissing = true)
+@ConditionalOnProperty(prefix = ObservabilityUtils.DUBBO_TRACING_PREFIX, name
= "enabled")
public @interface ConditionalOnDubboTracingEnable {
}
diff --git
a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinAutoConfiguration.java
b/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinAutoConfiguration.java
index 604e7af5da..8e16503b4f 100644
---
a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinAutoConfiguration.java
+++
b/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinAutoConfiguration.java
@@ -36,7 +36,6 @@ import zipkin2.codec.BytesEncoder;
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;
@@ -54,7 +53,6 @@ import static
org.apache.dubbo.spring.boot.observability.autoconfigure.Observabi
@Import({SenderConfiguration.class,
ReporterConfiguration.class, BraveConfiguration.class,
OpenTelemetryConfiguration.class})
-@ConditionalOnProperty(prefix = DUBBO_TRACING_PREFIX, name = "enabled",
havingValue = "true")
@ConditionalOnDubboTracingEnable
public class ZipkinAutoConfiguration {
diff --git
a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/observability/autoconfigure/observability/DubboMicrometerTracingAutoConfigurationTests.java
b/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/observability/autoconfigure/observability/DubboMicrometerTracingAutoConfigurationTests.java
index d0e4c64b67..0e4734a992 100644
---
a/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/observability/autoconfigure/observability/DubboMicrometerTracingAutoConfigurationTests.java
+++
b/dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/observability/autoconfigure/observability/DubboMicrometerTracingAutoConfigurationTests.java
@@ -44,7 +44,8 @@ import static org.mockito.Mockito.mock;
class DubboMicrometerTracingAutoConfigurationTests {
private final ApplicationContextRunner contextRunner = new
ApplicationContextRunner()
-
.withConfiguration(AutoConfigurations.of(DubboMicrometerTracingAutoConfiguration.class));
+
.withConfiguration(AutoConfigurations.of(DubboMicrometerTracingAutoConfiguration.class))
+ .withPropertyValues("dubbo.tracing.enabled=true");
@Test
void shouldSupplyBeans() {
