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

Author: spencergibb

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

@@ -37,14 +37,14 @@
  * @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

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

@@ -30,7 +30,7 @@
  * @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 {
 

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

@@ -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 Slf4jSpanListener slf4jSpanStartedListener() {
 	@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();
 		}

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

@@ -49,7 +49,7 @@
 @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 TraceFilters traceFilters(List<TraceFilter> traceFilters) {
 		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);
 	}

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

@@ -36,7 +36,7 @@
 @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 {