From b93e739cc74e57b3fa31265bc3d18555c20ebf03 Mon Sep 17 00:00:00 2001 From: mcohen75 Date: Mon, 13 Jan 2020 05:02:53 -0600 Subject: [PATCH] Configure OpentracingAutoConfiguration after TraceAutoConfiguration. (#1519) TraceAutoConfiguration provides the Tracing bean. Without this dependency in place a Tracing bean is sometimes not present when the OpentracingAutoConfiguration is applied. --- .../instrument/opentracing/OpentracingAutoConfiguration.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/opentracing/OpentracingAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/opentracing/OpentracingAutoConfiguration.java index db5a633d6..17fa5edc4 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/opentracing/OpentracingAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/opentracing/OpentracingAutoConfiguration.java @@ -20,11 +20,13 @@ import brave.Tracing; import brave.opentracing.BraveTracer; import io.opentracing.Tracer; +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.boot.context.properties.EnableConfigurationProperties; +import org.springframework.cloud.sleuth.autoconfig.TraceAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -40,6 +42,7 @@ import org.springframework.context.annotation.Configuration; @ConditionalOnProperty(value = "spring.sleuth.opentracing.enabled", matchIfMissing = true) @ConditionalOnBean(Tracing.class) @ConditionalOnClass(Tracer.class) +@AutoConfigureAfter(TraceAutoConfiguration.class) @EnableConfigurationProperties(SleuthOpentracingProperties.class) public class OpentracingAutoConfiguration {