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

Updates to zipkin 0.15 (#263)

Browse Source 
Notably, this removes the accidental transient dependency on scala, by
removing the dependency on `zipkin-cassandra-core`. Related classes have
been vendored into `storage-cassandra`.

This also splits out `CollectorSampler` as its own thing and introduces
two options for instrumentation sampling:

* `BoundaryTraceIdSampler` - For high-volume sites, based on Finagle
* `CountingTraceIdSampler` - Trades lower performance for high accuracy
This commit is contained in:
Adrian Cole
2016-04-30 00:22:23 +08:00
committed by Marcin Grzejszczak
parent 645845e88c
commit a5b92b817b
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-sleuth-dependencies/pom.xml
View File

@@ -16,7 +16,7 @@
<properties>
<spring-cloud-netflix.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
<aspectj.version>1.8.4</aspectj.version>
<zipkin-java.version>0.14.0</zipkin-java.version>
<zipkin-java.version>0.15.0</zipkin-java.version>
<zipkin-ui.version>1.39.7</zipkin-ui.version>
</properties>
<dependencyManagement>

4
spring-cloud-sleuth-samples/pom.xml
View File

@@ -59,12 +59,12 @@
<dependency>
<groupId>io.zipkin.java</groupId>
<artifactId>zipkin</artifactId>
<version>0.14.0</version>
<version>0.15.0</version>
</dependency>
<dependency>
<groupId>io.zipkin.java</groupId>
<artifactId>zipkin-server</artifactId>
<version>0.14.0</version>
<version>0.15.0</version>
</dependency>
</dependencies>
</dependencyManagement>

8
spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinMessageListener.java
View File

@@ -37,8 +37,8 @@ import zipkin.Annotation;
import zipkin.AsyncSpanConsumer;
import zipkin.BinaryAnnotation;
import zipkin.BinaryAnnotation.Type;
import zipkin.CollectorSampler;
import zipkin.Endpoint;
import zipkin.Sampler;
import zipkin.Span.Builder;
import zipkin.StorageComponent;
@@ -63,7 +63,7 @@ public class ZipkinMessageListener {
/** lazy so transient storage errors don't crash bootstrap */
@Lazy
@Autowired
ZipkinMessageListener(StorageComponent storage, Sampler sampler) {
ZipkinMessageListener(StorageComponent storage, CollectorSampler sampler) {
this.consumer = storage.asyncSpanConsumer(sampler);
}
@@ -145,8 +145,8 @@ public class ZipkinMessageListener {
float sampleRate = 1.0f;
@Bean
Sampler traceIdSampler() {
return Sampler.create(this.sampleRate);
CollectorSampler collectorSampler() {
return CollectorSampler.create(this.sampleRate);
}
@Bean