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 8de635390..a12f7b375 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 @@ -45,5 +45,5 @@ package org.springframework.cloud.sleuth; * This would trace 50% of all gets, 75% of all puts and would not trace any other requests. */ public interface Sampler { - boolean next(T info); + boolean next(); } diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/TraceManager.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/TraceManager.java index 0e150adad..9ae2a27ae 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/TraceManager.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/TraceManager.java @@ -77,12 +77,10 @@ public interface TraceManager extends TraceAccessor { /** * Start a new span if the sampler allows it or if we are already tracing in this * thread. A sampler can be used to limit the number of traces created. - * - * @param name the name of the span + * @param name the name of the span * @param sampler a sampler to decide whether to create the span or not - * @param info the samplers context information */ - Trace startSpan(String name, Sampler sampler, T info); + Trace startSpan(String name, Sampler sampler); /** * Pick up an existing span from another thread. diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/integration/TraceChannelInterceptor.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/integration/TraceChannelInterceptor.java index db0b07dc7..50fa660ea 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/integration/TraceChannelInterceptor.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/integration/TraceChannelInterceptor.java @@ -62,7 +62,7 @@ public class TraceChannelInterceptor extends AbstractTraceChannelInterceptor { return traceManager.startSpan(name, span); } if (message.getHeaders().containsKey(Trace.NOT_SAMPLED_NAME)) { - return traceManager.startSpan(name, IsTracingSampler.INSTANCE, null); + return traceManager.startSpan(name, IsTracingSampler.INSTANCE); } return this.traceManager.startSpan(name); } diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceFilter.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceFilter.java index 88f8a0cf0..745b264ab 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceFilter.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceFilter.java @@ -144,8 +144,8 @@ public class TraceFilter extends OncePerRequestFilter } else { if (skip) { - trace = this.traceManager.startSpan(name, IsTracingSampler.INSTANCE, - null); + trace = this.traceManager.startSpan(name, IsTracingSampler.INSTANCE + ); } else { trace = this.traceManager.startSpan(name); 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 6c75343da..cb517f2ee 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(Void info) { + public boolean next() { 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 590c43f60..ac0cecbca 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(Void info) { + public boolean next() { return TraceContextHolder.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 60de8b7d7..4b58d5519 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 @@ -33,7 +33,7 @@ public class PercentageBasedSampler implements Sampler { } @Override - public boolean next(Void info) { + public boolean next() { Span currentSpan = traceAccessor.getCurrentSpan(); long threshold = Math.abs(Long.MAX_VALUE * (int) (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/DefaultTraceManager.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/DefaultTraceManager.java index f136b375d..816ab14fc 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/DefaultTraceManager.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/trace/DefaultTraceManager.java @@ -68,13 +68,13 @@ public class DefaultTraceManager implements TraceManager { @Override public Trace startSpan(String name) { - return this.startSpan(name, this.defaultSampler, null); + return this.startSpan(name, this.defaultSampler); } @Override - public Trace startSpan(String name, Sampler s, T info) { + public Trace startSpan(String name, Sampler s) { Span span = null; - if (isTracing() || s.next(info)) { + if (isTracing() || s.next()) { span = createChild(getCurrentSpan(), name); } else { diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/DefaultTraceManagerTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/DefaultTraceManagerTests.java index 3eb453aff..6e0b6b073 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/DefaultTraceManagerTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/DefaultTraceManagerTests.java @@ -67,7 +67,7 @@ public class DefaultTraceManagerTests { DefaultTraceManager traceManager = new DefaultTraceManager(new IsTracingSampler(), new Random(), publisher); - Trace trace = traceManager.startSpan(CREATE_SIMPLE_TRACE, new AlwaysSampler(), null); + Trace trace = traceManager.startSpan(CREATE_SIMPLE_TRACE, new AlwaysSampler()); try { importantWork1(traceManager); } diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/integration/AbstractTraceStompIntegrationTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/integration/AbstractTraceStompIntegrationTests.java index c4aa97a66..f66db5139 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/integration/AbstractTraceStompIntegrationTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/integration/AbstractTraceStompIntegrationTests.java @@ -38,7 +38,7 @@ abstract class AbstractTraceStompIntegrationTests { } Trace givenALocallyStartedSpan() { - return traceManager.startSpan("testSendMessage", sampler, null); + return traceManager.startSpan("testSendMessage", sampler); } Message givenMessageToBeSampled() { diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/integration/TraceChannelInterceptorTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/integration/TraceChannelInterceptorTests.java index 95f71a909..ee6b643fa 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/integration/TraceChannelInterceptorTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/integration/TraceChannelInterceptorTests.java @@ -137,7 +137,7 @@ public class TraceChannelInterceptorTests implements MessageHandler { @Test public void headerCreation() { Trace trace = this.traceManager.startSpan("testSendMessage", - new AlwaysSampler(), null); + new AlwaysSampler()); this.channel.send(MessageBuilder.withPayload("hi").build()); this.traceManager.close(trace); assertNotNull("message was null", this.message); @@ -154,7 +154,7 @@ public class TraceChannelInterceptorTests implements MessageHandler { @Test public void headerCreationViaMessagingTemplate() { Trace trace = this.traceManager.startSpan("testSendMessage", - new AlwaysSampler(), null); + new AlwaysSampler()); this.messagingTemplate.send(MessageBuilder.withPayload("hi").build()); this.traceManager.close(trace); assertNotNull("message was null", this.message); diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/integration/TraceContextPropagationChannelInterceptorTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/integration/TraceContextPropagationChannelInterceptorTests.java index faac69633..e3557562c 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/integration/TraceContextPropagationChannelInterceptorTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/integration/TraceContextPropagationChannelInterceptorTests.java @@ -66,7 +66,7 @@ public class TraceContextPropagationChannelInterceptorTests { @Test public void testSpanPropagation() { - Trace trace = this.traceManager.startSpan("testSendMessage", new AlwaysSampler(), null); + Trace trace = this.traceManager.startSpan("testSendMessage", new AlwaysSampler()); this.channel.send(MessageBuilder.withPayload("hi").build()); Long expectedSpanId = trace.getSpan().getSpanId(); this.traceManager.close(trace); 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 ee4a0fc8b..00a202497 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 @@ -179,8 +179,8 @@ public class TraceFilterTests { private class DelegateSampler implements Sampler { @Override - public boolean next(Void info) { - return TraceFilterTests.this.sampler.next(info); + public boolean next() { + return TraceFilterTests.this.sampler.next(); } } } 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 fc766b7a5..d8969010a 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 @@ -7,10 +7,8 @@ import org.junit.Test; import org.springframework.cloud.sleuth.MilliSpan; import org.springframework.cloud.sleuth.Span; import org.springframework.cloud.sleuth.TraceAccessor; -import org.springframework.util.JdkIdGenerator; import java.util.Random; -import java.util.stream.Stream; public class PercentageBasedSamplerTests { @@ -23,7 +21,7 @@ public class PercentageBasedSamplerTests { this.samplerConfiguration.setPercentage(1f); for (int i = 0; i < 10; i++) { - then(new PercentageBasedSampler(this.samplerConfiguration, this.traceAccessor).next(null)).isTrue(); + then(new PercentageBasedSampler(this.samplerConfiguration, this.traceAccessor).next()).isTrue(); } } @@ -33,7 +31,7 @@ public class PercentageBasedSamplerTests { this.samplerConfiguration.setPercentage(0f); for (int i = 0; i < 10; i++) { - then(new PercentageBasedSampler(this.samplerConfiguration, this.traceAccessor).next(null)).isFalse(); + then(new PercentageBasedSampler(this.samplerConfiguration, this.traceAccessor).next()).isFalse(); } } @@ -51,7 +49,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(null); + boolean passed = new PercentageBasedSampler(this.samplerConfiguration, traceReturningSpanWithUuid()).next(); passedCounter = passedCounter + (passed ? 1 : 0); } return passedCounter; diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-stream/src/main/java/sample/SampleController.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-stream/src/main/java/sample/SampleController.java index 38de64a39..4c2270eae 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-stream/src/main/java/sample/SampleController.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-stream/src/main/java/sample/SampleController.java @@ -95,7 +95,7 @@ ApplicationListener { @RequestMapping("/traced") public String traced() { Trace trace = this.traceManager.startSpan("customTraceEndpoint", - new AlwaysSampler(), null); + new AlwaysSampler()); int millis = random.nextInt(1000); log.info("Sleeping for {} millis", millis); Thread.sleep(millis); diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleController.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleController.java index 38de64a39..4c2270eae 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleController.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/main/java/sample/SampleController.java @@ -95,7 +95,7 @@ ApplicationListener { @RequestMapping("/traced") public String traced() { Trace trace = this.traceManager.startSpan("customTraceEndpoint", - new AlwaysSampler(), null); + new AlwaysSampler()); int millis = random.nextInt(1000); log.info("Sleeping for {} millis", millis); Thread.sleep(millis); diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/java/sample/SampleController.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/java/sample/SampleController.java index 38de64a39..4c2270eae 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/java/sample/SampleController.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/src/main/java/sample/SampleController.java @@ -95,7 +95,7 @@ ApplicationListener { @RequestMapping("/traced") public String traced() { Trace trace = this.traceManager.startSpan("customTraceEndpoint", - new AlwaysSampler(), null); + new AlwaysSampler()); int millis = random.nextInt(1000); log.info("Sleeping for {} millis", millis); Thread.sleep(millis); diff --git a/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/StreamSpanListenerTests.java b/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/StreamSpanListenerTests.java index 4876fea05..5a92688c4 100644 --- a/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/StreamSpanListenerTests.java +++ b/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/StreamSpanListenerTests.java @@ -100,7 +100,7 @@ public class StreamSpanListenerTests { @Test public void nullSpanName() { - Trace context = this.traceManager.startSpan(null, null); + Trace context = this.traceManager.startSpan(null, (Sampler) null); this.application.publishEvent(new ClientSentEvent(this, context.getSpan())); this.traceManager.close(context); assertEquals(1, this.test.spans.size());