Skip to content

Commit 03c321d

Browse files
authored
Merge pull request #585 from yidongnan/feature/more-optional-sleuth-presence
Don't reference sleuth directly in the annotation.
2 parents e334c1b + 076a70f commit 03c321d

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

grpc-common-spring-boot/src/main/java/net/devh/boot/grpc/common/autoconfigure/GrpcCommonTraceAutoConfiguration.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,20 @@
2828
import brave.Tracing;
2929
import brave.grpc.GrpcTracing;
3030

31+
/**
32+
* The configuration containing the common grpc tracing setup.
33+
*
34+
* <p>
35+
* Can be disabled using {@code spring.sleuth.grpc.enabled=false}.
36+
* </p>
37+
*
38+
* <p>
39+
* Should run after {@link BraveAutoConfiguration} if present to ensure the required beans exist.
40+
* </p>
41+
*/
3142
@Configuration(proxyBeanMethods = false)
3243
@ConditionalOnProperty(value = "spring.sleuth.grpc.enabled", matchIfMissing = true)
33-
@AutoConfigureAfter(BraveAutoConfiguration.class)
44+
@AutoConfigureAfter(name = "org.springframework.cloud.sleuth.autoconfig.brave.BraveAutoConfiguration")
3445
@ConditionalOnClass(value = {Tracing.class, GrpcTracing.class})
3546
public class GrpcCommonTraceAutoConfiguration {
3647

0 commit comments

Comments
 (0)