diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index c1205ca70..dd978454b 100644 --- a/spring-cloud-sleuth-dependencies/pom.xml +++ b/spring-cloud-sleuth-dependencies/pom.xml @@ -16,7 +16,7 @@ 1.1.0.BUILD-SNAPSHOT 1.8.4 - 0.14.0 + 0.15.0 1.39.7 diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml index 74ac42827..ba126b005 100644 --- a/spring-cloud-sleuth-samples/pom.xml +++ b/spring-cloud-sleuth-samples/pom.xml @@ -59,12 +59,12 @@ io.zipkin.java zipkin - 0.14.0 + 0.15.0 io.zipkin.java zipkin-server - 0.14.0 + 0.15.0 diff --git a/spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinMessageListener.java b/spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinMessageListener.java index 841756c11..64420eaa9 100644 --- a/spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinMessageListener.java +++ b/spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/ZipkinMessageListener.java @@ -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