From 3a4554d8c1ced9369ce5272d92520e839bab2e7f Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 21 Jan 2016 14:05:16 +0000 Subject: [PATCH] Tidy up conditionals in trace autoconfig --- .../sleuth/autoconfig/TraceAutoConfiguration.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/autoconfig/TraceAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/autoconfig/TraceAutoConfiguration.java index 59750a665..f83a1bb8e 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/autoconfig/TraceAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/autoconfig/TraceAutoConfiguration.java @@ -16,17 +16,18 @@ package org.springframework.cloud.sleuth.autoconfig; +import java.util.Random; + import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.cloud.sleuth.Sampler; +import org.springframework.cloud.sleuth.Tracer; import org.springframework.cloud.sleuth.sampler.IsTracingSampler; import org.springframework.cloud.sleuth.trace.DefaultTracer; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import java.util.Random; - /** * @author Spencer Gibb */ @@ -35,7 +36,8 @@ import java.util.Random; public class TraceAutoConfiguration { @Bean - public Random random() { + @ConditionalOnMissingBean + public Random randomForSpanIds() { return new Random(); } @@ -46,9 +48,9 @@ public class TraceAutoConfiguration { } @Bean - @ConditionalOnMissingBean - public DefaultTracer traceManager(Sampler sampler, + @ConditionalOnMissingBean(Tracer.class) + public DefaultTracer traceManager(Sampler sampler, Random random, ApplicationEventPublisher publisher) { - return new DefaultTracer(sampler, random(), publisher); + return new DefaultTracer(sampler, random, publisher); } }