SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tidy up conditionals in trace autoconfig

Browse Source
This commit is contained in:
Dave Syer
2016-01-21 14:05:16 +00:00
parent 689955a1f6
commit 3a4554d8c1
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/autoconfig/TraceAutoConfiguration.java
View File

@@ -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);
}
}