From fe798dcc8c8301eea3ad703c213f76628f8a37fc Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Mon, 9 Sep 2019 20:02:58 -0400 Subject: [PATCH 1/5] Ignoring failing tests in release --- .../sleuth/annotation/SleuthSpanCreatorAspectMonoTests.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectMonoTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectMonoTests.java index 0d59c7d34..5a4b6e0f1 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectMonoTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectMonoTests.java @@ -26,6 +26,7 @@ import brave.sampler.Sampler; import org.apache.commons.lang3.StringUtils; import org.awaitility.Awaitility; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import reactor.core.publisher.Mono; @@ -412,6 +413,7 @@ public class SleuthSpanCreatorAspectMonoTests { } @Test + @Ignore public void shouldReturnNewSpanFromTraceContextOuter() { Mono, Long>> mono = this.testBeanOuter .outerNewSpanInTraceContext(); @@ -454,6 +456,7 @@ public class SleuthSpanCreatorAspectMonoTests { } @Test + @Ignore public void shouldReturnNewSpanFromSubscriberContextOuter() { Mono, Long>> mono = this.testBeanOuter .outerNewSpanInSubscriberContext(); From a93d4d19f0a05c04352fac0fe3b6b77c15d2df17 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 10 Sep 2019 08:57:50 +0200 Subject: [PATCH 2/5] made the tests less brittle; fixes gh-1439 --- .../SleuthSpanCreatorAspectMonoTests.java | 99 +++++++++++++++---- 1 file changed, 81 insertions(+), 18 deletions(-) diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectMonoTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectMonoTests.java index 5a4b6e0f1..43f81c6c6 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectMonoTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectMonoTests.java @@ -18,15 +18,19 @@ package org.springframework.cloud.sleuth.annotation; import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collector; import java.util.stream.Collectors; +import javax.annotation.concurrent.NotThreadSafe; + import brave.Span; import brave.Tracer; import brave.sampler.Sampler; import org.apache.commons.lang3.StringUtils; import org.awaitility.Awaitility; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import reactor.core.publisher.Mono; @@ -39,7 +43,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.sleuth.util.ArrayListSpanReporter; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.data.util.Pair; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; @@ -51,6 +54,7 @@ import static reactor.core.publisher.Mono.just; @SpringBootTest(classes = SleuthSpanCreatorAspectMonoTests.TestConfiguration.class) @RunWith(SpringRunner.class) @DirtiesContext(methodMode = BEFORE_METHOD) +@NotThreadSafe public class SleuthSpanCreatorAspectMonoTests { @Autowired @@ -413,7 +417,6 @@ public class SleuthSpanCreatorAspectMonoTests { } @Test - @Ignore public void shouldReturnNewSpanFromTraceContextOuter() { Mono, Long>> mono = this.testBeanOuter .outerNewSpanInTraceContext(); @@ -422,18 +425,24 @@ public class SleuthSpanCreatorAspectMonoTests { Pair, Long> pair = mono.block(); Long outerSpanIdBefore = pair.getFirst().getFirst(); - Long outerSpanIdAfter = pair.getFirst().getSecond(); Long innerSpanId = pair.getSecond(); - then(outerSpanIdBefore).isEqualTo(outerSpanIdAfter).isNotEqualTo(innerSpanId); + then(outerSpanIdBefore).isNotEqualTo(innerSpanId); Awaitility.await().untilAsserted(() -> { List spans = this.reporter.getSpans(); - then(spans).hasSize(2); - then(spans.get(0).name()).isEqualTo("outer-span-in-trace-context"); - then(spans.get(0).id()).isEqualTo(toHexString(outerSpanIdBefore)); - then(spans.get(1).name()).isEqualTo("span-in-trace-context"); - then(spans.get(1).id()).isEqualTo(toHexString(innerSpanId)); + zipkin2.Span outerSpan = spans.stream() + .filter(span -> span.name().equals("outer-span-in-trace-context")) + .findFirst().orElseThrow(() -> new AssertionError( + "No span with name [outer-span-in-trace-context] found")); + then(outerSpan.name()).isEqualTo("outer-span-in-trace-context"); + then(outerSpan.id()).isEqualTo(toHexString(outerSpanIdBefore)); + zipkin2.Span innerSpan = spans.stream() + .filter(span -> span.name().equals("span-in-trace-context")) + .findFirst().orElseThrow(() -> new AssertionError( + "No span with name [span-in-trace-context] found")); + then(innerSpan.name()).isEqualTo("span-in-trace-context"); + then(innerSpan.id()).isEqualTo(toHexString(innerSpanId)); then(this.tracer.currentSpan()).isNull(); }); } @@ -456,7 +465,6 @@ public class SleuthSpanCreatorAspectMonoTests { } @Test - @Ignore public void shouldReturnNewSpanFromSubscriberContextOuter() { Mono, Long>> mono = this.testBeanOuter .outerNewSpanInSubscriberContext(); @@ -465,18 +473,24 @@ public class SleuthSpanCreatorAspectMonoTests { Pair, Long> pair = mono.block(); Long outerSpanIdBefore = pair.getFirst().getFirst(); - Long outerSpanIdAfter = pair.getFirst().getSecond(); Long innerSpanId = pair.getSecond(); - then(outerSpanIdBefore).isEqualTo(outerSpanIdAfter).isNotEqualTo(innerSpanId); + then(outerSpanIdBefore).isNotEqualTo(innerSpanId); Awaitility.await().untilAsserted(() -> { List spans = this.reporter.getSpans(); - then(spans).hasSize(2); - then(spans.get(0).name()).isEqualTo("outer-span-in-subscriber-context"); - then(spans.get(0).id()).isEqualTo(toHexString(outerSpanIdBefore)); - then(spans.get(1).name()).isEqualTo("span-in-subscriber-context"); - then(spans.get(1).id()).isEqualTo(toHexString(innerSpanId)); + zipkin2.Span outerSpan = spans.stream().filter( + span -> span.name().equals("outer-span-in-subscriber-context")) + .findFirst().orElseThrow(() -> new AssertionError( + "No span with name [outer-span-in-subscriber-context] found")); + then(outerSpan.name()).isEqualTo("outer-span-in-subscriber-context"); + then(outerSpan.id()).isEqualTo(toHexString(outerSpanIdBefore)); + zipkin2.Span innerSpan = spans.stream() + .filter(span -> span.name().equals("span-in-subscriber-context")) + .findFirst().orElseThrow(() -> new AssertionError( + "No span with name [span-in-subscriber-context] found")); + then(innerSpan.name()).isEqualTo("span-in-subscriber-context"); + then(innerSpan.id()).isEqualTo(toHexString(innerSpanId)); then(this.tracer.currentSpan()).isNull(); }); } @@ -700,3 +714,52 @@ public class SleuthSpanCreatorAspectMonoTests { } } + +/** + * Copied from Spring Data + */ +final class Pair { + + private final S first; + + private final T second; + + Pair(S first, T second) { + this.first = first; + this.second = second; + } + + public static Pair of(S first, T second) { + return new Pair<>(first, second); + } + + public S getFirst() { + return first; + } + + public T getSecond() { + return second; + } + + public static Collector, ?, Map> toMap() { + return Collectors.toMap(Pair::getFirst, Pair::getSecond); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Pair pair = (Pair) o; + return Objects.equals(first, pair.first) && Objects.equals(second, pair.second); + } + + @Override + public int hashCode() { + return Objects.hash(first, second); + } + +} \ No newline at end of file From 1529473282e3a8e6f1f09abbdc67b65adf7d8787 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 10 Sep 2019 09:08:16 +0200 Subject: [PATCH 3/5] Fixed checkstyle --- .../sleuth/annotation/SleuthSpanCreatorAspectMonoTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectMonoTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectMonoTests.java index 43f81c6c6..b94888311 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectMonoTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectMonoTests.java @@ -762,4 +762,4 @@ final class Pair { return Objects.hash(first, second); } -} \ No newline at end of file +} From 7ba1ec79eb6db66df500fd3014a993cf477a7f6d Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Tue, 10 Sep 2019 17:08:12 -0400 Subject: [PATCH 4/5] Bumping versions --- benchmarks/pom.xml | 2 +- docs/pom.xml | 2 +- pom.xml | 12 ++++++------ spring-cloud-sleuth-core/pom.xml | 2 +- spring-cloud-sleuth-dependencies/pom.xml | 2 +- spring-cloud-sleuth-samples/pom.xml | 2 +- .../spring-cloud-sleuth-sample-feign/pom.xml | 2 +- .../spring-cloud-sleuth-sample-messaging/pom.xml | 2 +- .../spring-cloud-sleuth-sample-ribbon/pom.xml | 2 +- .../spring-cloud-sleuth-sample-test-core/pom.xml | 2 +- .../spring-cloud-sleuth-sample-websocket/pom.xml | 2 +- .../spring-cloud-sleuth-sample-zipkin/pom.xml | 2 +- .../spring-cloud-sleuth-sample/pom.xml | 2 +- spring-cloud-sleuth-zipkin/pom.xml | 2 +- spring-cloud-starter-sleuth/pom.xml | 2 +- spring-cloud-starter-zipkin/pom.xml | 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index cbb32bf97..eac413bff 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -22,7 +22,7 @@ Benchmarks Benchmarks (JMH) org.springframework.cloud - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT benchmarks diff --git a/docs/pom.xml b/docs/pom.xml index 1871e484f..29df621af 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -22,7 +22,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT spring-cloud-sleuth-docs pom diff --git a/pom.xml b/pom.xml index 3490cb1c7..11efb03fa 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 4.0.0 spring-cloud-sleuth - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT pom Spring Cloud Sleuth Spring Cloud Sleuth @@ -258,12 +258,12 @@ 1.8 1.8 1.8 - 2.1.7.BUILD-SNAPSHOT - 2.1.3.BUILD-SNAPSHOT - 2.1.3.BUILD-SNAPSHOT + 2.1.8.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT Fishtown.BUILD-SNAPSHOT - 2.1.3.BUILD-SNAPSHOT - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT 5.7.0 2.1.2.RELEASE diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml index f99ff7849..be5bb6011 100644 --- a/spring-cloud-sleuth-core/pom.xml +++ b/spring-cloud-sleuth-core/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index 47330208e..49f88d738 100644 --- a/spring-cloud-sleuth-dependencies/pom.xml +++ b/spring-cloud-sleuth-dependencies/pom.xml @@ -26,7 +26,7 @@ spring-cloud-sleuth-dependencies - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT pom spring-cloud-sleuth-dependencies Spring Cloud Sleuth Dependencies diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml index 8305b2ecb..58773cffb 100644 --- a/spring-cloud-sleuth-samples/pom.xml +++ b/spring-cloud-sleuth-samples/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml index 848c93027..438c2b596 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-feign/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml index 2f4b46eaf..1439988f0 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml index e2fc0d1a8..9efd7c0ec 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-ribbon/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml index a6222a7bf..9254801b9 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml index 4cd881f3c..f6ddc8fc4 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml index 1d63b0d39..3b48e64c2 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml index fb3b284ef..04dbb1d98 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml index 86882dacc..4fb1fbba5 100644 --- a/spring-cloud-sleuth-zipkin/pom.xml +++ b/spring-cloud-sleuth-zipkin/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml index 2adb26483..6ccc7884d 100644 --- a/spring-cloud-starter-sleuth/pom.xml +++ b/spring-cloud-starter-sleuth/pom.xml @@ -22,7 +22,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-starter-sleuth diff --git a/spring-cloud-starter-zipkin/pom.xml b/spring-cloud-starter-zipkin/pom.xml index 19aed93db..a25479458 100644 --- a/spring-cloud-starter-zipkin/pom.xml +++ b/spring-cloud-starter-zipkin/pom.xml @@ -22,7 +22,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.3.BUILD-SNAPSHOT + 2.1.4.BUILD-SNAPSHOT .. spring-cloud-starter-zipkin From 6da8b91bcde67a8fafe2467220b90e4afe3d7665 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 16 Sep 2019 15:20:00 +0200 Subject: [PATCH 5/5] Renamed the bean, fixes gh-1444 --- .../web/TraceWebServletAutoConfiguration.java | 58 +++++++++---------- ...SleuthTagPropagationAutoConfiguration.java | 3 +- 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebServletAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebServletAutoConfiguration.java index 72467f9eb..dacce8854 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebServletAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebServletAutoConfiguration.java @@ -122,39 +122,39 @@ public class TraceWebServletAutoConfiguration { } - private static final class LazyTracingFilter implements Filter { +} - private final BeanFactory beanFactory; +final class LazyTracingFilter implements Filter { - private Filter tracingFilter; + private final BeanFactory beanFactory; - private LazyTracingFilter(BeanFactory beanFactory) { - this.beanFactory = beanFactory; + private Filter tracingFilter; + + LazyTracingFilter(BeanFactory beanFactory) { + this.beanFactory = beanFactory; + } + + @Override + public void init(FilterConfig filterConfig) throws ServletException { + tracingFilter().init(filterConfig); + } + + @Override + public void doFilter(ServletRequest request, ServletResponse response, + FilterChain chain) throws IOException, ServletException { + tracingFilter().doFilter(request, response, chain); + } + + @Override + public void destroy() { + tracingFilter().destroy(); + } + + private Filter tracingFilter() { + if (this.tracingFilter == null) { + this.tracingFilter = this.beanFactory.getBean(TracingFilter.class); } - - @Override - public void init(FilterConfig filterConfig) throws ServletException { - tracingFilter().init(filterConfig); - } - - @Override - public void doFilter(ServletRequest request, ServletResponse response, - FilterChain chain) throws IOException, ServletException { - tracingFilter().doFilter(request, response, chain); - } - - @Override - public void destroy() { - tracingFilter().destroy(); - } - - private Filter tracingFilter() { - if (this.tracingFilter == null) { - this.tracingFilter = this.beanFactory.getBean(TracingFilter.class); - } - return this.tracingFilter; - } - + return this.tracingFilter; } } diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfiguration.java index 7bad1c58e..e0aeb1af4 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/propagation/SleuthTagPropagationAutoConfiguration.java @@ -41,7 +41,8 @@ public class SleuthTagPropagationAutoConfiguration { protected static class TagPropagationConfiguration { @Bean - public FinishedSpanHandler finishedSpanHandler(SleuthProperties sleuthProperties, + public FinishedSpanHandler sleuthFinishedSpanHandler( + SleuthProperties sleuthProperties, SleuthTagPropagationProperties tagPropagationProperties) { return new TagPropagationFinishedSpanHandler(sleuthProperties, tagPropagationProperties);