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

Remove unnecessary sampler

Browse Source
This commit is contained in:
Dave Syer
2016-02-03 16:57:25 +00:00
parent 00b8f8cfce
commit c832cc87d6
3 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
eureka-client/src/main/java/demo/EurekaClientApplication.java
View File

@@ -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<String,String> params) {
public String good(@RequestParam MultiValueMap<String,String> params) {
System.err.println(params);
return "GOOD!";
}

7
sleuth/src/main/java/demo/TraceApplication.java
View File

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

7
zipkin/src/main/java/demo/ZipkinApplication.java
View File

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