diff --git a/docs/pom.xml b/docs/pom.xml
index cf86faac6..da80c56ff 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -1,82 +1,82 @@
-
-
-
- 4.0.0
-
- org.springframework.cloud
- spring-cloud-sleuth
- 3.1.0-SNAPSHOT
-
- spring-cloud-sleuth-docs
- jar
- Spring Cloud Sleuth Docs
- Spring Sleuth Docs
-
- spring-cloud-sleuth
- ${basedir}/..
- spring.sleuth.*|spring.zipkin.*
- deploy
-
-
-
- ${project.groupId}
- spring-cloud-starter-sleuth
-
-
- ${project.groupId}
- spring-cloud-sleuth-zipkin
-
-
-
- src/main/asciidoc
-
-
-
- docs
-
-
-
- pl.project13.maven
- git-commit-id-plugin
-
-
- maven-dependency-plugin
-
-
- maven-resources-plugin
-
-
- org.codehaus.mojo
- exec-maven-plugin
-
-
- org.asciidoctor
- asciidoctor-maven-plugin
-
-
- maven-antrun-plugin
-
-
- maven-deploy-plugin
-
-
-
-
-
-
+
+
+
+ 4.0.0
+
+ org.springframework.cloud
+ spring-cloud-sleuth
+ 3.1.0-SNAPSHOT
+
+ spring-cloud-sleuth-docs
+ jar
+ Spring Cloud Sleuth Docs
+ Spring Sleuth Docs
+
+ spring-cloud-sleuth
+ ${basedir}/..
+ spring.sleuth.*|spring.zipkin.*
+ deploy
+
+
+
+ ${project.groupId}
+ spring-cloud-starter-sleuth
+
+
+ ${project.groupId}
+ spring-cloud-sleuth-zipkin
+
+
+
+ src/main/asciidoc
+
+
+
+ docs
+
+
+
+ pl.project13.maven
+ git-commit-id-plugin
+
+
+ maven-dependency-plugin
+
+
+ maven-resources-plugin
+
+
+ org.codehaus.mojo
+ exec-maven-plugin
+
+
+ org.asciidoctor
+ asciidoctor-maven-plugin
+
+
+ maven-antrun-plugin
+
+
+ maven-deploy-plugin
+
+
+
+
+
+
diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index 3f2160aa4..696cbadf2 100644
--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/spring-cloud-sleuth-dependencies/pom.xml
@@ -1,187 +1,169 @@
-
-
-
-
- 4.0.0
-
- spring-cloud-dependencies-parent
- org.springframework.cloud
- 3.0.2
-
-
- spring-cloud-sleuth-dependencies
- 3.1.0-SNAPSHOT
- pom
- spring-cloud-sleuth-dependencies
- Spring Cloud Sleuth Dependencies
-
-
- https://github.com/spring-cloud/spring-cloud-sleuth
- scm:git:git://github.com/spring-cloud/spring-cloud-sleuth.git
-
-
- scm:git:ssh://git@github.com/spring-cloud/spring-cloud-sleuth.git
-
- HEAD
-
-
-
- 5.13.2
- 0.37.4
- 4.2.2
-
-
-
-
- org.springframework.cloud
- spring-cloud-sleuth-autoconfigure
- ${project.version}
-
-
- org.springframework.cloud
- spring-cloud-sleuth-api
- ${project.version}
-
-
- org.springframework.cloud
- spring-cloud-sleuth-instrumentation
- ${project.version}
-
-
- org.springframework.cloud
- spring-cloud-sleuth-brave
- ${project.version}
-
-
- org.springframework.cloud
- spring-cloud-sleuth-zipkin
- ${project.version}
-
-
- org.springframework.cloud
- spring-cloud-starter-sleuth
- ${project.version}
-
-
-
- org.springframework.cloud
- spring-cloud-sleuth-tests-common
- ${project.version}
-
-
-
- io.zipkin.brave
- brave-bom
- ${brave.version}
- pom
- import
-
-
- io.opentracing.brave
- brave-opentracing
- ${brave.opentracing.version}
-
-
- io.zipkin.brave
- *
-
-
-
-
-
- io.github.lognet
- grpc-spring-boot-starter
- ${grpc.spring.boot.version}
-
-
-
-
-
- spring
-
-
- spring-snapshots
- Spring Snapshots
- https://repo.spring.io/snapshot
-
- true
-
-
- false
-
-
-
- spring-milestones
- Spring Milestones
- https://repo.spring.io/milestone
-
- false
-
-
-
- spring-releases
- Spring Releases
- https://repo.spring.io/release
-
- false
-
-
-
-
-
- spring-snapshots
- Spring Snapshots
- https://repo.spring.io/snapshot
-
- true
-
-
- false
-
-
-
- spring-milestones
- Spring Milestones
- https://repo.spring.io/milestone
-
- false
-
-
-
-
-
-
-
-
- false
-
- bintray-open-telemetry-maven
- bintray
- https://dl.bintray.com/open-telemetry/maven
-
-
-
- true
-
- bintray-open-telemetry-maven-snapshot
- bintray
- https://oss.jfrog.org/oss-snapshot-local/
-
-
-
+
+
+
+
+ 4.0.0
+
+ spring-cloud-dependencies-parent
+ org.springframework.cloud
+ 3.0.2
+
+
+ spring-cloud-sleuth-dependencies
+ 3.1.0-SNAPSHOT
+ pom
+ spring-cloud-sleuth-dependencies
+ Spring Cloud Sleuth Dependencies
+
+
+ https://github.com/spring-cloud/spring-cloud-sleuth
+ scm:git:git://github.com/spring-cloud/spring-cloud-sleuth.git
+
+
+ scm:git:ssh://git@github.com/spring-cloud/spring-cloud-sleuth.git
+
+ HEAD
+
+
+
+ 5.13.2
+ 0.37.4
+ 4.2.2
+
+
+
+
+ org.springframework.cloud
+ spring-cloud-sleuth-autoconfigure
+ ${project.version}
+
+
+ org.springframework.cloud
+ spring-cloud-sleuth-api
+ ${project.version}
+
+
+ org.springframework.cloud
+ spring-cloud-sleuth-instrumentation
+ ${project.version}
+
+
+ org.springframework.cloud
+ spring-cloud-sleuth-brave
+ ${project.version}
+
+
+ org.springframework.cloud
+ spring-cloud-sleuth-zipkin
+ ${project.version}
+
+
+ org.springframework.cloud
+ spring-cloud-starter-sleuth
+ ${project.version}
+
+
+
+ org.springframework.cloud
+ spring-cloud-sleuth-tests-common
+ ${project.version}
+
+
+
+ io.zipkin.brave
+ brave-bom
+ ${brave.version}
+ pom
+ import
+
+
+ io.opentracing.brave
+ brave-opentracing
+ ${brave.opentracing.version}
+
+
+ io.zipkin.brave
+ *
+
+
+
+
+
+ io.github.lognet
+ grpc-spring-boot-starter
+ ${grpc.spring.boot.version}
+
+
+
+
+
+ spring
+
+
+ spring-snapshots
+ Spring Snapshots
+ https://repo.spring.io/snapshot
+
+ true
+
+
+ false
+
+
+
+ spring-milestones
+ Spring Milestones
+ https://repo.spring.io/milestone
+
+ false
+
+
+
+ spring-releases
+ Spring Releases
+ https://repo.spring.io/release
+
+ false
+
+
+
+
+
+ spring-snapshots
+ Spring Snapshots
+ https://repo.spring.io/snapshot
+
+ true
+
+
+ false
+
+
+
+ spring-milestones
+ Spring Milestones
+ https://repo.spring.io/milestone
+
+ false
+
+
+
+
+
+
diff --git a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/task/SpringCloudTaskIntegrationTests.java b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/task/SpringCloudTaskIntegrationTests.java
index 16722a222..cd55d5174 100644
--- a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/task/SpringCloudTaskIntegrationTests.java
+++ b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/task/SpringCloudTaskIntegrationTests.java
@@ -1,107 +1,107 @@
-/*
- * Copyright 2013-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.sleuth.instrument.task;
-
-import java.util.Iterator;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.ApplicationArguments;
-import org.springframework.boot.ApplicationRunner;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.cloud.sleuth.exporter.FinishedSpan;
-import org.springframework.cloud.sleuth.test.TestSpanHandler;
-import org.springframework.cloud.task.configuration.EnableTask;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestPropertySource;
-
-import static org.assertj.core.api.BDDAssertions.then;
-
-@ContextConfiguration(classes = SpringCloudTaskIntegrationTests.TestConfig.class)
-@TestPropertySource(properties = { "spring.application.name=MyApplication", "spring.sleuth.tx.enabled=false" })
-public abstract class SpringCloudTaskIntegrationTests {
-
- @Autowired
- TestSpanHandler spans;
-
- @Test
- public void should_pass_tracing_information_when_using_spring_cloud_task() {
- Set traceIds = this.spans.reportedSpans().stream().map(FinishedSpan::getTraceId)
- .collect(Collectors.toSet());
- then(traceIds).as("There's one traceid").hasSize(1);
- Set spanIds = this.spans.reportedSpans().stream().map(FinishedSpan::getSpanId)
- .collect(Collectors.toSet());
-
- then(spanIds).as("There are 3 spans").hasSize(3);
- Iterator spanIterator = this.spans.reportedSpans().iterator();
-
- FinishedSpan first = spanIterator.next();
- FinishedSpan second = spanIterator.next();
- FinishedSpan third = spanIterator.next();
- then(first.getName()).isEqualTo("myApplicationRunner");
- then(second.getName()).isEqualTo("myCommandLineRunner");
- then(third.getName()).isEqualTo("MyApplication");
- }
-
- @Configuration(proxyBeanMethods = false)
- @EnableAutoConfiguration
- @EnableTask
- public static class TestConfig {
-
- @Bean
- MyCommandLineRunner myCommandLineRunner() {
- return new MyCommandLineRunner();
- }
-
- @Bean
- MyApplicationRunner myApplicationRunner() {
- return new MyApplicationRunner();
- }
-
- }
-
- static class MyCommandLineRunner implements CommandLineRunner {
-
- private static final Log log = LogFactory.getLog(MyCommandLineRunner.class);
-
- @Override
- public void run(String... args) throws Exception {
- log.info("Ran MyCommandLineRunner");
- }
-
- }
-
- static class MyApplicationRunner implements ApplicationRunner {
-
- private static final Log log = LogFactory.getLog(MyApplicationRunner.class);
-
- @Override
- public void run(ApplicationArguments args) throws Exception {
- log.info("Ran MyApplicationRunner");
- }
-
- }
-
-}
+/*
+ * Copyright 2013-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.sleuth.instrument.task;
+
+import java.util.Iterator;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.cloud.sleuth.exporter.FinishedSpan;
+import org.springframework.cloud.sleuth.test.TestSpanHandler;
+import org.springframework.cloud.task.configuration.EnableTask;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
+
+import static org.assertj.core.api.BDDAssertions.then;
+
+@ContextConfiguration(classes = SpringCloudTaskIntegrationTests.TestConfig.class)
+@TestPropertySource(properties = { "spring.application.name=MyApplication", "spring.sleuth.tx.enabled=false" })
+public abstract class SpringCloudTaskIntegrationTests {
+
+ @Autowired
+ TestSpanHandler spans;
+
+ @Test
+ public void should_pass_tracing_information_when_using_spring_cloud_task() {
+ Set traceIds = this.spans.reportedSpans().stream().map(FinishedSpan::getTraceId)
+ .collect(Collectors.toSet());
+ then(traceIds).as("There's one traceid").hasSize(1);
+ Set spanIds = this.spans.reportedSpans().stream().map(FinishedSpan::getSpanId)
+ .collect(Collectors.toSet());
+
+ then(spanIds).as("There are 3 spans").hasSize(3);
+ Iterator spanIterator = this.spans.reportedSpans().iterator();
+
+ FinishedSpan first = spanIterator.next();
+ FinishedSpan second = spanIterator.next();
+ FinishedSpan third = spanIterator.next();
+ then(first.getName()).isEqualTo("myApplicationRunner");
+ then(second.getName()).isEqualTo("myCommandLineRunner");
+ then(third.getName()).isEqualTo("MyApplication");
+ }
+
+ @Configuration(proxyBeanMethods = false)
+ @EnableAutoConfiguration
+ @EnableTask
+ public static class TestConfig {
+
+ @Bean
+ MyCommandLineRunner myCommandLineRunner() {
+ return new MyCommandLineRunner();
+ }
+
+ @Bean
+ MyApplicationRunner myApplicationRunner() {
+ return new MyApplicationRunner();
+ }
+
+ }
+
+ static class MyCommandLineRunner implements CommandLineRunner {
+
+ private static final Log log = LogFactory.getLog(MyCommandLineRunner.class);
+
+ @Override
+ public void run(String... args) throws Exception {
+ log.info("Ran MyCommandLineRunner");
+ }
+
+ }
+
+ static class MyApplicationRunner implements ApplicationRunner {
+
+ private static final Log log = LogFactory.getLog(MyApplicationRunner.class);
+
+ @Override
+ public void run(ApplicationArguments args) throws Exception {
+ log.info("Ran MyApplicationRunner");
+ }
+
+ }
+
+}
diff --git a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/sampled/WebClientTests.java b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/sampled/WebClientTests.java
index 6f9f9c9ab..7af97c32b 100644
--- a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/sampled/WebClientTests.java
+++ b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/integration/sampled/WebClientTests.java
@@ -269,7 +269,11 @@ public abstract class WebClientTests {
thenThereIsNoCurrentSpan();
then(this.spans.reportedSpans().stream().filter(r -> r.getKind() == Span.Kind.CLIENT).map(r -> r.getName())
- .collect(Collectors.toList())).isNotEmpty().contains("GET /prefix/{variable}/suffix");
+ .collect(Collectors.toList())).isNotEmpty().contains(templatedName());
+ }
+
+ protected String templatedName() {
+ return "GET /prefix/{variable}/suffix";
}
/**