From c832cc87d698d70e87cb64cd5d1ad0f770103478 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Wed, 3 Feb 2016 16:57:25 +0000 Subject: [PATCH] Remove unnecessary sampler --- .../src/main/java/demo/EurekaClientApplication.java | 5 ++--- sleuth/src/main/java/demo/TraceApplication.java | 7 ------- zipkin/src/main/java/demo/ZipkinApplication.java | 7 +------ 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/eureka-client/src/main/java/demo/EurekaClientApplication.java b/eureka-client/src/main/java/demo/EurekaClientApplication.java index 4c01b1d..2312504 100644 --- a/eureka-client/src/main/java/demo/EurekaClientApplication.java +++ b/eureka-client/src/main/java/demo/EurekaClientApplication.java @@ -1,10 +1,9 @@ package demo; -import java.util.Map; - import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @@ -18,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; public class EurekaClientApplication { @RequestMapping("/good") - public String good(@RequestParam Map params) { + public String good(@RequestParam MultiValueMap params) { System.err.println(params); return "GOOD!"; } diff --git a/sleuth/src/main/java/demo/TraceApplication.java b/sleuth/src/main/java/demo/TraceApplication.java index ade624f..054b2c2 100644 --- a/sleuth/src/main/java/demo/TraceApplication.java +++ b/sleuth/src/main/java/demo/TraceApplication.java @@ -2,17 +2,10 @@ package demo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.sleuth.sampler.AlwaysSampler; -import org.springframework.context.annotation.Bean; @SpringBootApplication public class TraceApplication { - @Bean - public AlwaysSampler alwaysSampler() { - return new AlwaysSampler(); - } - public static void main(String[] args) { SpringApplication.run(TraceApplication.class, args); } diff --git a/zipkin/src/main/java/demo/ZipkinApplication.java b/zipkin/src/main/java/demo/ZipkinApplication.java index 02d51b2..af3de7d 100644 --- a/zipkin/src/main/java/demo/ZipkinApplication.java +++ b/zipkin/src/main/java/demo/ZipkinApplication.java @@ -5,9 +5,9 @@ import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.cloud.sleuth.sampler.AlwaysSampler; import org.springframework.cloud.sleuth.zipkin.ZipkinSpanReporter; import org.springframework.context.annotation.Bean; + import zipkin.Span; @SpringBootApplication @@ -15,11 +15,6 @@ public class ZipkinApplication { private static Logger log = LoggerFactory.getLogger(ZipkinApplication.class); - @Bean - public AlwaysSampler alwaysSampler() { - return new AlwaysSampler(); - } - // Use this for debugging (or if there is no Zipkin server running on port 9411) @Bean @ConditionalOnProperty(value="sample.zipkin.enabled", havingValue="false")