From 6a8f23e18530425103edf891d42484efbb3f2ac9 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Thu, 31 Dec 2015 11:24:28 +0000
Subject: [PATCH] Remove unnecessary configs from samples

---
 .../src/main/resources/application.yml        |  8 --------
 .../src/main/resources/application.yml        |  8 --------
 .../src/main/resources/application.yml        | 19 ++++++++++---------
 .../src/main/resources/application.yml        |  4 ----
 .../java/sample/SampleSleuthApplication.java  |  7 -------
 .../src/main/resources/application.yml        |  8 --------
 6 files changed, 10 insertions(+), 44 deletions(-)

diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/src/main/resources/application.yml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/src/main/resources/application.yml
index b889b948d..3a90ed27c 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/src/main/resources/application.yml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/src/main/resources/application.yml
@@ -8,10 +8,6 @@ sample:
 spring:
   application:
     name: testSleuthRibbon
-  sleuth:
-    log:
-      json:
-        enabled: true
 
 zipkin:
   ribbon:
@@ -38,7 +34,3 @@ zuul:
       url: http://localhost:3381
     vanilla:
       url: http://localhost:3379
-
-logging:
-  pattern:
-    level: '%clr([trace=%X{X-Trace-Id:-},span=%X{X-Span-Id:-}]){yellow} %5p'
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-stream/src/main/resources/application.yml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-stream/src/main/resources/application.yml
index 4fa8dc06f..398079019 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-stream/src/main/resources/application.yml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-stream/src/main/resources/application.yml
@@ -4,11 +4,3 @@ server:
 spring:
   application:
     name: testSleuthApp
-  sleuth:
-    log:
-      json:
-        enabled: true
-
-logging:
-  pattern:
-    level: '%clr([trace=%X{X-Trace-Id:-},span=%X{X-Span-Id:-}]){yellow} %5p'
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/main/resources/application.yml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/main/resources/application.yml
index 9c244d69a..b13101782 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/main/resources/application.yml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/main/resources/application.yml
@@ -4,6 +4,16 @@ server:
 spring:
   rabbitmq:
     host: ${RABBIT_HOST:localhost}
+  datasource:
+    initialize: false
+
+zipkin:
+  store:
+    type: mem # default is inMemory
+
+---
+spring:
+  profiles: mysql
   datasource:
     schema: classpath:/mysql.sql
     url: jdbc:mysql://${MYSQL_HOST:localhost}/test
@@ -17,12 +27,3 @@ spring:
 zipkin:
   store:
     type: mysql # default is inMemory
-
----
-spring:
-  profiles: test
-  datasource:
-    initialize: false
-zipkin:
-  store:
-    type: mem # default is inMemory
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/resources/application.yml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/resources/application.yml
index 37a0da4da..0c4dab528 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/resources/application.yml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/resources/application.yml
@@ -5,10 +5,6 @@ spring:
   application:
     name: testSleuthZipkin
 
-logging:
-  pattern:
-    level: '%clr([trace=%X{X-Trace-Id:-},span=%X{X-Span-Id:-}]){yellow} %5p'
-
 sample:
   zipkin:
     enabled: false
\ No newline at end of file
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/java/sample/SampleSleuthApplication.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/java/sample/SampleSleuthApplication.java
index 8312ad842..75a425370 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/java/sample/SampleSleuthApplication.java
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/java/sample/SampleSleuthApplication.java
@@ -18,8 +18,6 @@ package sample;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.sleuth.Sampler;
-import org.springframework.cloud.sleuth.sampler.AlwaysSampler;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -34,11 +32,6 @@ public class SampleSleuthApplication {
 
 	public static final String CLIENT_NAME = "testApp";
 
-	@Bean
-	public Sampler<?> defaultSampler() {
-		return new AlwaysSampler();
-	}
-
 	@Bean
 	public SampleController sampleController() {
 		return new SampleController();
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/resources/application.yml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/resources/application.yml
index 4fa8dc06f..398079019 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/resources/application.yml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/resources/application.yml
@@ -4,11 +4,3 @@ server:
 spring:
   application:
     name: testSleuthApp
-  sleuth:
-    log:
-      json:
-        enabled: true
-
-logging:
-  pattern:
-    level: '%clr([trace=%X{X-Trace-Id:-},span=%X{X-Span-Id:-}]){yellow} %5p'