diff --git a/README.adoc b/README.adoc index 23df48ae1..71493d83d 100644 --- a/README.adoc +++ b/README.adoc @@ -888,7 +888,6 @@ Checkstyle rules are *disabled by default*. To add checkstyle to your project ju spring-javaformat-maven-plugin <5> - org.apache.maven.plugins maven-checkstyle-plugin @@ -896,7 +895,6 @@ Checkstyle rules are *disabled by default*. To add checkstyle to your project ju <5> - org.apache.maven.plugins maven-checkstyle-plugin diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 9ee010576..c5f8035a3 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -14,7 +14,7 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - 4.0.0 @@ -27,15 +27,14 @@ ${project.basedir}/.. - 1.16 - 2.4.3 - 2.5.2 + 1.22 + 3.2.1 true 1.8 1.8 2.3.0.BUILD-SNAPSHOT - 5.8.0 - 3.11.0 + 5.9.1 + 3.14.6 @@ -92,7 +91,7 @@ org.assertj assertj-core - 3.5.2 + 3.14.0 compile @@ -134,9 +133,8 @@ - org.apache.maven.plugins maven-compiler-plugin - 3.1 + 3.8.1 ${maven.compiler.source} ${maven.compiler.target} @@ -151,7 +149,6 @@ maven-install-plugin - ${maven-install-plugin.version} true @@ -369,9 +366,8 @@ - org.apache.maven.plugins maven-failsafe-plugin - 2.19.1 + 2.22.2 diff --git a/docs/pom.xml b/docs/pom.xml index 893f74894..45c220e0d 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 @@ -56,11 +56,9 @@ git-commit-id-plugin - org.apache.maven.plugins maven-dependency-plugin - org.apache.maven.plugins maven-resources-plugin @@ -72,7 +70,6 @@ asciidoctor-maven-plugin - org.apache.maven.plugins maven-antrun-plugin diff --git a/pom.xml b/pom.xml index 759e967b4..032413095 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 @@ -59,9 +59,8 @@ - org.apache.maven.plugins maven-compiler-plugin - 3.1 + 3.8.1 default-compile @@ -88,7 +87,6 @@ - org.apache.maven.plugins maven-enforcer-plugin 1.3.1 @@ -108,7 +106,6 @@ - org.apache.maven.plugins maven-deploy-plugin 2.8.2 @@ -120,7 +117,6 @@ spring-javaformat-maven-plugin - org.apache.maven.plugins maven-checkstyle-plugin @@ -129,7 +125,6 @@ - org.apache.maven.plugins maven-checkstyle-plugin @@ -244,7 +239,7 @@ org.assertj assertj-core - 3.8.0 + 3.14.0 test @@ -262,13 +257,12 @@ Horsham.SR1 2.2.2.BUILD-SNAPSHOT 2.2.2.BUILD-SNAPSHOT - 5.8.0 - 2.1.7.RELEASE - + 5.9.1 + 2.1.7.RELEASE 2.2.2.BUILD-SNAPSHOT false - 3.10.0 - 3.10.0 + 3.14.6 + 3.14.6 20.0 1.7.1 3.3.0 @@ -357,9 +351,7 @@ - org.apache.maven.plugins maven-compiler-plugin - 3.1 ${maven.compiler.testSource} ${maven.compiler.testTarget} @@ -411,7 +403,6 @@ - org.apache.maven.plugins maven-surefire-plugin diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml index 4189ba781..9d7157d31 100644 --- a/spring-cloud-sleuth-core/pom.xml +++ b/spring-cloud-sleuth-core/pom.xml @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 @@ -383,7 +383,6 @@ - org.apache.maven.plugins maven-surefire-plugin 4 diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TracingFeignClientTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TracingFeignClientTests.java index 3f16f999b..d195b7bd0 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TracingFeignClientTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TracingFeignClientTests.java @@ -89,7 +89,7 @@ public class TracingFeignClientTests { } then(this.reporter.getSpans().get(0)).extracting("kind.ordinal") - .contains(Span.Kind.CLIENT.ordinal()); + .isEqualTo(Span.Kind.CLIENT.ordinal()); } @Test @@ -113,7 +113,7 @@ public class TracingFeignClientTests { } then(this.reporter.getSpans().get(0)).extracting("kind.ordinal") - .contains(Span.Kind.CLIENT.ordinal()); + .isEqualTo(Span.Kind.CLIENT.ordinal()); then(this.reporter.getSpans().get(0).tags()).containsEntry("error", "exception has occurred"); } diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index 113a45f45..193ee300a 100644 --- a/spring-cloud-sleuth-dependencies/pom.xml +++ b/spring-cloud-sleuth-dependencies/pom.xml @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 @@ -31,7 +31,7 @@ spring-cloud-sleuth-dependencies Spring Cloud Sleuth Dependencies - 5.9.0 + 5.9.1 0.35.0 3.4.1 diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml index 58ddbfda0..12c863448 100644 --- a/spring-cloud-sleuth-samples/pom.xml +++ b/spring-cloud-sleuth-samples/pom.xml @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 @@ -73,7 +73,7 @@ io.zipkin.zipkin2 zipkin - 2.17.0 + 2.19.2 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 146e4d636..f9b6f6a2a 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 @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 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 a72da4d86..6a83d881c 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 @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 @@ -57,7 +57,6 @@ - org.apache.maven.plugins maven-compiler-plugin 1.8 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 fbd1f652f..428307d5f 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 @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 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 c787fd1f1..9469ac2c4 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 @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 @@ -55,7 +55,7 @@ org.codehaus.mojo animal-sniffer-maven-plugin - 1.16 + 1.18 true 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 a5ba5bc5c..d4f15e8ae 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 @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 @@ -57,7 +57,6 @@ - org.apache.maven.plugins maven-compiler-plugin 1.8 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 cdc1a8747..a71e7e406 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 @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 @@ -57,7 +57,6 @@ - org.apache.maven.plugins maven-compiler-plugin 1.8 @@ -101,7 +100,6 @@ com.squareup.okhttp3 mockwebserver - 3.9.0 test 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 07cd5e4c0..0867149df 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample/pom.xml @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml index a53d2c5ff..5412d198f 100644 --- a/spring-cloud-sleuth-zipkin/pom.xml +++ b/spring-cloud-sleuth-zipkin/pom.xml @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 @@ -149,7 +149,6 @@ com.squareup.okhttp3 mockwebserver - 3.10.0 test diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml index 3d977ba3f..a19c15fd5 100644 --- a/spring-cloud-starter-sleuth/pom.xml +++ b/spring-cloud-starter-sleuth/pom.xml @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 diff --git a/spring-cloud-starter-zipkin/pom.xml b/spring-cloud-starter-zipkin/pom.xml index 57c0b8635..22f67d6c4 100644 --- a/spring-cloud-starter-zipkin/pom.xml +++ b/spring-cloud-starter-zipkin/pom.xml @@ -15,7 +15,7 @@ ~ limitations under the License. --> - 4.0.0 diff --git a/tests/pom.xml b/tests/pom.xml index 52d450753..d08eba732 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -17,7 +17,7 @@ ~ --> - 4.0.0 diff --git a/tests/spring-cloud-sleuth-instrumentation-async-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-async-tests/pom.xml index 2647e89c6..83b5c30cb 100644 --- a/tests/spring-cloud-sleuth-instrumentation-async-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-async-tests/pom.xml @@ -17,7 +17,7 @@ ~ --> - 4.0.0 diff --git a/tests/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml index 4b599ebad..17cf6232b 100644 --- a/tests/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml @@ -17,7 +17,7 @@ ~ --> - 4.0.0 diff --git a/tests/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml index 9981074d3..df04dc0fb 100644 --- a/tests/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml @@ -17,7 +17,7 @@ ~ --> - 4.0.0 @@ -73,7 +73,7 @@ com.google.guava guava - 20.0 + ${guava.version} test diff --git a/tests/spring-cloud-sleuth-instrumentation-hystrix-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-hystrix-tests/pom.xml index e73b1a05a..a6d6c31da 100644 --- a/tests/spring-cloud-sleuth-instrumentation-hystrix-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-hystrix-tests/pom.xml @@ -17,7 +17,7 @@ ~ --> - 4.0.0 diff --git a/tests/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml index 1fd7ec41f..0efc8054a 100644 --- a/tests/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml @@ -17,7 +17,7 @@ ~ --> - 4.0.0 diff --git a/tests/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml index e2ad53798..7560caebb 100644 --- a/tests/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml @@ -17,7 +17,7 @@ ~ --> - diff --git a/tests/spring-cloud-sleuth-instrumentation-messaging-tests/src/test/java/org/springframework/cloud/sleuth/instrument/messaging/JmsTracingConfigurationTest.java b/tests/spring-cloud-sleuth-instrumentation-messaging-tests/src/test/java/org/springframework/cloud/sleuth/instrument/messaging/JmsTracingConfigurationTest.java index 6bb90facb..4af69b17d 100644 --- a/tests/spring-cloud-sleuth-instrumentation-messaging-tests/src/test/java/org/springframework/cloud/sleuth/instrument/messaging/JmsTracingConfigurationTest.java +++ b/tests/spring-cloud-sleuth-instrumentation-messaging-tests/src/test/java/org/springframework/cloud/sleuth/instrument/messaging/JmsTracingConfigurationTest.java @@ -34,7 +34,6 @@ import javax.jms.XAConnectionFactory; import javax.resource.spi.ResourceAdapter; import brave.Tracing; -import brave.internal.HexCodec; import brave.propagation.CurrentTraceContext; import brave.propagation.TraceContext; import org.apache.activemq.ra.ActiveMQActivationSpec; @@ -43,7 +42,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Ignore; import org.junit.Test; -import zipkin2.Annotation; import zipkin2.Span; import org.springframework.beans.factory.annotation.Autowired; @@ -317,8 +315,6 @@ public class JmsTracingConfigurationTest { @EnableAutoConfiguration(exclude = KafkaAutoConfiguration.class) class JmsTestTracingConfiguration { - static final String CONTEXT_LEAK = "context.leak"; - /** * When testing servers or asynchronous clients, spans are reported on a worker * thread. In order to read them on the main thread, we use a concurrent queue. As @@ -340,34 +336,14 @@ class JmsTestTracingConfiguration { return () -> { Span result = this.spans.poll(3, TimeUnit.SECONDS); assertThat(result).withFailMessage("Span was not reported").isNotNull(); - assertThat(result.annotations()).extracting(Annotation::value) - .doesNotContain(CONTEXT_LEAK); return result; }; } @Bean Tracing tracing(CurrentTraceContext currentTraceContext) { - return Tracing.newBuilder().spanReporter(s -> { - // make sure the context was cleared prior to finish.. no leaks! - TraceContext current = currentTraceContext.get(); - boolean contextLeak = false; - if (current != null) { - // add annotation in addition to throwing, in case we are off the main - // thread - if (HexCodec.toLowerHex(current.spanId()).equals(s.id())) { - s = s.toBuilder().addAnnotation(s.timestampAsLong(), CONTEXT_LEAK) - .build(); - contextLeak = true; - } - } - this.spans.add(s); - // throw so that we can see the path to the code that leaked the context - if (contextLeak) { - throw new AssertionError( - CONTEXT_LEAK + " on " + Thread.currentThread().getName()); - } - }).currentTraceContext(currentTraceContext).build(); + return Tracing.newBuilder().spanReporter(spans::add) + .currentTraceContext(currentTraceContext).build(); } } diff --git a/tests/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml index 55384a160..8e2163a5d 100644 --- a/tests/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml @@ -17,7 +17,7 @@ ~ --> - 4.0.0 diff --git a/tests/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml index 1dded5f9e..2e07b1f31 100644 --- a/tests/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml @@ -17,7 +17,7 @@ ~ --> - 4.0.0 diff --git a/tests/spring-cloud-sleuth-instrumentation-rpc-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-rpc-tests/pom.xml index 5261047bf..60c648ac3 100644 --- a/tests/spring-cloud-sleuth-instrumentation-rpc-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-rpc-tests/pom.xml @@ -17,7 +17,7 @@ ~ --> - 4.0.0 diff --git a/tests/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml index 5895238de..1835a004a 100644 --- a/tests/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml @@ -17,7 +17,7 @@ ~ --> - 4.0.0 diff --git a/tests/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml index c73181d29..edb74b25f 100644 --- a/tests/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml @@ -17,7 +17,7 @@ ~ --> - 4.0.0 diff --git a/tests/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml index 8b8443145..2d4c79a35 100644 --- a/tests/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml @@ -17,7 +17,7 @@ ~ --> - 4.0.0 diff --git a/tests/spring-cloud-sleuth-instrumentation-zuul-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-zuul-tests/pom.xml index b5c6393c7..192aff8d3 100644 --- a/tests/spring-cloud-sleuth-instrumentation-zuul-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-zuul-tests/pom.xml @@ -17,7 +17,7 @@ ~ --> - 4.0.0