natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: remove ConditionalOnDubboTracingEnable matchIfMissing (#12409) 

* chore: remove ConditionalOnDubboTracingEnable matchIfMissing

* fix: fix missing property in test

---------

Co-authored-by: songxiaosheng <songxiaosheng@elastic.link>
This commit is contained in:
conghuhu 2023-05-30 12:57:42 +08:00 committed by GitHub
parent ccf7b7b7db
commit 891277912a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/annotation/ConditionalOnDubboTracingEnable.java
View File

@ -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 {
}

2
dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinAutoConfiguration.java
View File

@ -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 {

3
dubbo-spring-boot/dubbo-spring-boot-observability-starters/autoconfigure/src/test/java/org/apache/dubbo/spring/boot/observability/autoconfigure/observability/DubboMicrometerTracingAutoConfigurationTests.java
View File

@ -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() {