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

Shorten config prefix from 'spring.cloud.sleuth' to 'spring.sleuth'

Browse Source
This commit is contained in:
Spencer Gibb
2015-08-07 11:38:30 -06:00
parent 7deb9aff7b
commit 95f0dbed72
5 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java
View File

@@ -37,14 +37,14 @@ import org.springframework.util.StringUtils;
* @author Spencer Gibb
*/
@Configuration
@ConditionalOnProperty(value = "spring.cloud.sleuth.trace.web.enabled", matchIfMissing = true)
@ConditionalOnProperty(value = "spring.sleuth.trace.web.enabled", matchIfMissing = true)
@ConditionalOnWebApplication
public class TraceWebAutoConfiguration {
/**
* Pattern for URLs that should be skipped in tracing
*/
@Value("${spring.cloud.sleuth.instrument.web.skipPattern:}")
@Value("${spring.sleuth.instrument.web.skipPattern:}")
private String skipPattern;
@Autowired

2
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java
View File

@@ -30,7 +30,7 @@ import org.springframework.web.client.RestTemplate;
* @author Spencer Gibb
*/
@Configuration
@ConditionalOnProperty(value = "spring.cloud.sleuth.trace.web.client.enabled", matchIfMissing = true)
@ConditionalOnProperty(value = "spring.sleuth.trace.web.client.enabled", matchIfMissing = true)
@ConditionalOnClass(RestTemplate.class)
public class TraceWebClientAutoConfiguration {

4
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/SleuthLogAutoConfiguration.java
View File

@@ -33,7 +33,7 @@ public class SleuthLogAutoConfiguration {
@ConditionalOnClass(MDC.class)
protected static class Slf4jConfiguration {
@Bean
@ConditionalOnProperty(value = "spring.cloud.sleuth.log.slf4j.enabled", matchIfMissing = true)
@ConditionalOnProperty(value = "spring.sleuth.log.slf4j.enabled", matchIfMissing = true)
public Slf4jSpanListener slf4jSpanStartedListener() {
return new Slf4jSpanListener();
}
@@ -43,7 +43,7 @@ public class SleuthLogAutoConfiguration {
@ConditionalOnClass(Log.class)
protected static class JsonConfiguration {
@Bean
@ConditionalOnProperty("spring.cloud.sleuth.log.json.enabled")
@ConditionalOnProperty("spring.sleuth.log.json.enabled")
public JsonLogSpanListener jsonSlf4jSpanListener() {
return new JsonLogSpanListener();
}

10
spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinAutoConfiguration.java
View File

@@ -49,7 +49,7 @@ import com.google.common.base.Optional;
@Configuration
@EnableConfigurationProperties
@ConditionalOnClass(ServerTracerConfig.class)
@ConditionalOnProperty(value = "spring.cloud.sleuth.zipkin.enabled", matchIfMissing = true)
@ConditionalOnProperty(value = "spring.sleuth.zipkin.enabled", matchIfMissing = true)
@Import({ AnnotationSubmitterConfig.class, ClientTracerConfig.class,
EndPointSubmitterConfig.class, ServerSpanThreadBinderConfig.class,
ServerTracerConfig.class })
@@ -78,14 +78,8 @@ public class ZipkinAutoConfiguration {
return new TraceFilters(traceFilters);
}
// @Bean
// @ConditionalOnProperty(value = "spring.cloud.sleuth.zipkin.braveTracer.enabled", matchIfMissing = true)
// public ZipkinSpanListener zipkinTrace(ServerTracer serverTracer, ClientTracer clientTracer) {
// return new ZipkinSpanListener(serverTracer, clientTracer);
// }
@Bean
// @ConditionalOnProperty(value = "spring.cloud.sleuth.zipkin.braveTracer.enabled", havingValue = "false")
// @ConditionalOnProperty(value = "spring.sleuth.zipkin.braveTracer.enabled", havingValue = "false")
public ZipkinSpanListener sleuthTracer(SpanCollector spanCollector) {
return new ZipkinSpanListener(spanCollector);
}

2
spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/web/ZipkinWebAutoConfiguration.java
View File

@@ -36,7 +36,7 @@ import com.github.kristofa.brave.ServerTracerConfig;
@Configuration
@ConditionalOnClass(ServerTracerConfig.class)
@ConditionalOnWebApplication
@ConditionalOnProperty(value = "spring.cloud.sleuth.zipkin.enabled", matchIfMissing = true)
@ConditionalOnProperty(value = "spring.sleuth.zipkin.enabled", matchIfMissing = true)
@AutoConfigureAfter(ZipkinAutoConfiguration.class)
@AutoConfigureBefore(TraceAutoConfiguration.class)
public class ZipkinWebAutoConfiguration {