diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinSpanReporter.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinSpanReporter.java index 08df19355..169e14446 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinSpanReporter.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinSpanReporter.java @@ -67,7 +67,7 @@ public class ZipkinSpanReporter implements SpanReporter { //TODO: Consider adding support for the debug flag (related to #496) Span convertedSpan = span; for (SpanAdjuster adjuster : this.spanAdjusters) { - convertedSpan = adjuster.adjust(span); + convertedSpan = adjuster.adjust(convertedSpan); } zipkin2.Span.Builder zipkinSpan = zipkin2.Span.newBuilder(); zipkinSpan.localEndpoint(this.endpointLocator.local()); diff --git a/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinSpanReporterTests.java b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinSpanReporterTests.java index eb7c07235..9e0568fc0 100644 --- a/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinSpanReporterTests.java +++ b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinSpanReporterTests.java @@ -17,6 +17,7 @@ package org.springframework.cloud.sleuth.zipkin2; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; import javax.annotation.PostConstruct; @@ -265,16 +266,17 @@ public class ZipkinSpanReporterTests { public void should_adjust_span_before_reporting_it() { this.parent.logEvent(Span.CLIENT_RECV); ZipkinSpanReporter spanListener = new ZipkinSpanReporter(this.zipkinReporter, - this.endpointLocator, null, Collections.singletonList( - span -> Span.builder().from(span).name("foo").build())) { + this.endpointLocator, null, Arrays.asList( + span -> Span.builder().from(span).name("foo").build(), + span -> Span.builder().from(span).name(span.getName() + "bar").build())) { @Override String defaultInstanceId() { - return "foo"; + return "foobar"; } }; zipkin2.Span result = spanListener.convert(this.parent); - assertThat(result.name()).isEqualTo("foo"); + assertThat(result.name()).isEqualTo("foobar"); } /** Zipkin will take care of processing the shared flag wrt timestamp authority */