From 076a70f41dcecea551f773df67911cf81312a802 Mon Sep 17 00:00:00 2001 From: ST-DDT Date: Sun, 19 Sep 2021 10:43:59 +0200 Subject: [PATCH] Don't reference sleuth directly in the annotation. Fixes https://github.com/yidongnan/grpc-spring-boot-starter/issues/493#issuecomment-864545983 --- .../GrpcCommonTraceAutoConfiguration.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/autoconfigure/GrpcCommonTraceAutoConfiguration.java b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/autoconfigure/GrpcCommonTraceAutoConfiguration.java index ce64eafa3..b09eb1523 100644 --- a/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/autoconfigure/GrpcCommonTraceAutoConfiguration.java +++ b/grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/autoconfigure/GrpcCommonTraceAutoConfiguration.java @@ -28,9 +28,20 @@ import brave.Tracing; import brave.grpc.GrpcTracing; +/** + * The configuration containing the common grpc tracing setup. + * + *

+ * Can be disabled using {@code spring.sleuth.grpc.enabled=false}. + *

+ * + *

+ * Should run after {@link BraveAutoConfiguration} if present to ensure the required beans exist. + *

+ */ @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "spring.sleuth.grpc.enabled", matchIfMissing = true) -@AutoConfigureAfter(BraveAutoConfiguration.class) +@AutoConfigureAfter(name = "org.springframework.cloud.sleuth.autoconfig.brave.BraveAutoConfiguration") @ConditionalOnClass(value = {Tracing.class, GrpcTracing.class}) public class GrpcCommonTraceAutoConfiguration {