From 3c5625a9deb9e69b44fac45261148cdbab77bfb0 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 20 Jan 2016 13:05:29 +0100 Subject: [PATCH] Changed sampler method to be consistent with open tracing API https://github.com/opentracing/opentracing-python/blob/master/example/zipkin_like/sampler.py#L36 --- .../main/java/org/springframework/cloud/sleuth/Sampler.java | 2 +- .../springframework/cloud/sleuth/sampler/AlwaysSampler.java | 2 +- .../cloud/sleuth/sampler/IsTracingSampler.java | 2 +- .../cloud/sleuth/sampler/PercentageBasedSampler.java | 2 +- .../springframework/cloud/sleuth/trace/DefaultTracer.java | 2 +- .../cloud/sleuth/instrument/web/TraceFilterTests.java | 4 ++-- .../cloud/sleuth/sampler/PercentageBasedSamplerTests.java | 6 +++--- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/Sampler.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/Sampler.java index 109430b75..6febeefde 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/Sampler.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/Sampler.java @@ -20,5 +20,5 @@ package org.springframework.cloud.sleuth; * Extremely simple callback to determine the frequency that an action should be */ public interface Sampler { - boolean next(); + boolean isSampled(); } diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/AlwaysSampler.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/AlwaysSampler.java index 271218902..59765a56d 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/AlwaysSampler.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/AlwaysSampler.java @@ -23,7 +23,7 @@ import org.springframework.cloud.sleuth.Sampler; */ public class AlwaysSampler implements Sampler { @Override - public boolean next() { + public boolean isSampled() { return true; } } diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/IsTracingSampler.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/IsTracingSampler.java index d9bc6056b..26d19dac9 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/IsTracingSampler.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/IsTracingSampler.java @@ -27,7 +27,7 @@ public class IsTracingSampler implements Sampler { public static IsTracingSampler INSTANCE = new IsTracingSampler(); @Override - public boolean next() { + public boolean isSampled() { return SpanContextHolder.isTracing(); } } diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSampler.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSampler.java index 8c9923d09..9ec8394c0 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSampler.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSampler.java @@ -31,7 +31,7 @@ public class PercentageBasedSampler implements Sampler { } @Override - public boolean next() { + public boolean isSampled() { Span currentSpan = this.traceAccessor.getCurrentSpan(); long threshold = Math.abs(Long.MAX_VALUE * (int) (this.configuration.getPercentage() * 100)); // drops fractional percentage. if (currentSpan == null || threshold == 0L) { diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/DefaultTracer.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/DefaultTracer.java index afa452524..dff8b1462 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/DefaultTracer.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/DefaultTracer.java @@ -72,7 +72,7 @@ public class DefaultTracer implements Tracer { @Override public Span startTrace(String name, Sampler s) { Span span; - if (isTracing() || s.next()) { + if (isTracing() || s.isSampled()) { span = createChild(getCurrentSpan(), name); } else { diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceFilterTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceFilterTests.java index fedcc440f..194244c63 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceFilterTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceFilterTests.java @@ -216,8 +216,8 @@ public class TraceFilterTests { private class DelegateSampler implements Sampler { @Override - public boolean next() { - return TraceFilterTests.this.sampler.next(); + public boolean isSampled() { + return TraceFilterTests.this.sampler.isSampled(); } } } diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSamplerTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSamplerTests.java index 50740044d..9a2e03a4a 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSamplerTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/sampler/PercentageBasedSamplerTests.java @@ -20,7 +20,7 @@ public class PercentageBasedSamplerTests { this.samplerConfiguration.setPercentage(1f); for (int i = 0; i < 10; i++) { - then(new PercentageBasedSampler(this.samplerConfiguration, this.traceAccessor).next()).isTrue(); + then(new PercentageBasedSampler(this.samplerConfiguration, this.traceAccessor).isSampled()).isTrue(); } } @@ -30,7 +30,7 @@ public class PercentageBasedSamplerTests { this.samplerConfiguration.setPercentage(0f); for (int i = 0; i < 10; i++) { - then(new PercentageBasedSampler(this.samplerConfiguration, this.traceAccessor).next()).isFalse(); + then(new PercentageBasedSampler(this.samplerConfiguration, this.traceAccessor).isSampled()).isFalse(); } } @@ -48,7 +48,7 @@ public class PercentageBasedSamplerTests { private int countNumberOfSampledElements(int numberOfIterations) { int passedCounter = 0; for (int i = 0; i < numberOfIterations; i++) { - boolean passed = new PercentageBasedSampler(this.samplerConfiguration, traceReturningSpanWithUuid()).next(); + boolean passed = new PercentageBasedSampler(this.samplerConfiguration, traceReturningSpanWithUuid()).isSampled(); passedCounter = passedCounter + (passed ? 1 : 0); } return passedCounter;