Remove unnecessary configs from samples

This commit is contained in:
Dave Syer
2015-12-31 11:24:28 +00:00
parent 9bf19caf07
commit 6a8f23e185
6 changed files with 10 additions and 44 deletions

View File

@@ -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'

View File

@@ -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'

View File

@@ -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

View File

@@ -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

View File

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

View File

@@ -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'