From 1afe81bdf34f6b91c277bb9f0fa2117ae5491153 Mon Sep 17 00:00:00 2001 From: Toshiaki Maki Date: Fri, 8 May 2020 19:12:11 +0900 Subject: [PATCH] This commit makes TraceRpcAutoConfiguration happens only when (#1628) RpcTracing so that excluding brave-instrumentation-rpc dependency does't make an exception. Also add an missing property to disable RPC tracing in additional-spring-configuration-metadata.json --- .../sleuth/instrument/rpc/TraceRpcAutoConfiguration.java | 2 ++ .../META-INF/additional-spring-configuration-metadata.json | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/rpc/TraceRpcAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/rpc/TraceRpcAutoConfiguration.java index d9a9feb63..7ce6b59cc 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/rpc/TraceRpcAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/rpc/TraceRpcAutoConfiguration.java @@ -28,6 +28,7 @@ import brave.sampler.SamplerFunction; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; 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.cloud.sleuth.autoconfig.TraceAutoConfiguration; @@ -45,6 +46,7 @@ import org.springframework.lang.Nullable; @ConditionalOnProperty(name = "spring.sleuth.rpc.enabled", havingValue = "true", matchIfMissing = true) @ConditionalOnBean(Tracing.class) +@ConditionalOnClass(RpcTracing.class) @AutoConfigureAfter(TraceAutoConfiguration.class) public class TraceRpcAutoConfiguration { diff --git a/spring-cloud-sleuth-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-sleuth-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 458b24a67..749cecf02 100644 --- a/spring-cloud-sleuth-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-cloud-sleuth-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -65,6 +65,12 @@ "type": "java.lang.Boolean", "description": "Enable DefaultKafkaHeaderMapper tracing for Kafka.", "defaultValue": true + }, + { + "name": "spring.sleuth.rpc.enabled", + "type": "java.lang.Boolean", + "description": "Enable tracing of RPC.", + "defaultValue": true } ] }