From 551094af4a1cb079996f996a6088a592f5ba00c4 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 17 Mar 2021 22:09:09 +0000 Subject: [PATCH] Update SNAPSHOT to 3.0.2 --- benchmarks/pom.xml | 4 +- docs/pom.xml | 2 +- pom.xml | 20 +- spring-cloud-sleuth-api/pom.xml | 2 +- spring-cloud-sleuth-autoconfigure/pom.xml | 2 +- spring-cloud-sleuth-brave/pom.xml | 2 +- .../.flattened-pom.xml | 224 ++++++++++++++++++ spring-cloud-sleuth-dependencies/pom.xml | 4 +- spring-cloud-sleuth-instrumentation/pom.xml | 2 +- .../MessageHeaderPropagatorGetter.java | 1 + spring-cloud-sleuth-samples/pom.xml | 2 +- .../spring-cloud-sleuth-sample-feign/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../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 +- tests/brave/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../baggage/MultipleHopsIntegrationTests.java | 6 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../TracingChannelInterceptorTest.java | 16 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-sleuth-zipkin-tests/pom.xml | 2 +- tests/common/pom.xml | 2 +- .../TracingChannelInterceptorTest.java | 3 +- tests/pom.xml | 2 +- 41 files changed, 284 insertions(+), 60 deletions(-) create mode 100644 spring-cloud-sleuth-dependencies/.flattened-pom.xml diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 2e529b161..c20620fca 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -22,7 +22,7 @@ Benchmarks Benchmarks (JMH) org.springframework.cloud - 3.0.2-SNAPSHOT + 3.0.2 benchmarks @@ -41,7 +41,7 @@ 4.9.0 0.2.0.RELEASE 1.26 - 3.1.1-SNAPSHOT + 3.1.2 diff --git a/docs/pom.xml b/docs/pom.xml index 03a3c3b77..edc16ecbf 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -21,7 +21,7 @@ org.springframework.cloud spring-cloud-sleuth - 3.0.2-SNAPSHOT + 3.0.2 spring-cloud-sleuth-docs jar diff --git a/pom.xml b/pom.xml index 4f25baa78..024e931c2 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 4.0.0 spring-cloud-sleuth - 3.0.2-SNAPSHOT + 3.0.2 pom Spring Cloud Sleuth Spring Cloud Sleuth @@ -29,7 +29,7 @@ org.springframework.cloud spring-cloud-build - 3.0.2-SNAPSHOT + 3.0.2 @@ -62,14 +62,14 @@ 1.8 1.8 1.8 - 3.0.2-SNAPSHOT - 3.0.2-SNAPSHOT - 3.0.2-SNAPSHOT - 2.0.1-SNAPSHOT - 3.1.1-SNAPSHOT - 3.1.2-SNAPSHOT - 3.0.2-SNAPSHOT - 3.0.2-SNAPSHOT + 3.0.2 + 3.0.2 + 3.0.2 + 2.0.1 + 3.1.2 + 3.1.2 + 3.0.2 + 3.0.2 5.13.2 0.32.0 2.3.4.RELEASE diff --git a/spring-cloud-sleuth-api/pom.xml b/spring-cloud-sleuth-api/pom.xml index 9fb4fbeb6..238ad194a 100644 --- a/spring-cloud-sleuth-api/pom.xml +++ b/spring-cloud-sleuth-api/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth - 3.0.2-SNAPSHOT + 3.0.2 .. diff --git a/spring-cloud-sleuth-autoconfigure/pom.xml b/spring-cloud-sleuth-autoconfigure/pom.xml index 734ef1bd9..c299ffde4 100644 --- a/spring-cloud-sleuth-autoconfigure/pom.xml +++ b/spring-cloud-sleuth-autoconfigure/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth - 3.0.2-SNAPSHOT + 3.0.2 .. diff --git a/spring-cloud-sleuth-brave/pom.xml b/spring-cloud-sleuth-brave/pom.xml index 80ab5d2b9..2b56f6ba4 100644 --- a/spring-cloud-sleuth-brave/pom.xml +++ b/spring-cloud-sleuth-brave/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth - 3.0.2-SNAPSHOT + 3.0.2 .. diff --git a/spring-cloud-sleuth-dependencies/.flattened-pom.xml b/spring-cloud-sleuth-dependencies/.flattened-pom.xml new file mode 100644 index 000000000..bd1d8cc5c --- /dev/null +++ b/spring-cloud-sleuth-dependencies/.flattened-pom.xml @@ -0,0 +1,224 @@ + + + + 4.0.0 + + org.springframework.cloud + spring-cloud-dependencies-parent + 3.0.2 + + + org.springframework.cloud + spring-cloud-sleuth-dependencies + 3.0.2 + pom + spring-cloud-sleuth-dependencies + Spring Cloud Sleuth Dependencies + https://projects.spring.io/spring-cloud/spring-cloud-sleuth-dependencies/ + + Pivotal Software, Inc. + https://www.spring.io + + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0 + Copyright 2014-2015 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. + + + + + dsyer + Dave Syer + dsyer at pivotal.io + Pivotal Software, Inc. + https://www.spring.io + + Project lead + + + + sgibb + Spencer Gibb + sgibb at pivotal.io + Pivotal Software, Inc. + https://www.spring.io + + Project lead + + + + + scm:git:git://github.com/spring-cloud/spring-cloud-sleuth.git + scm:git:ssh://git@github.com/spring-cloud/spring-cloud-sleuth.git + https://github.com/spring-cloud/spring-cloud-sleuth + + + + repo.spring.io + Spring Release Repository + https://repo.spring.io/libs-release-local + + + repo.spring.io + Spring Snapshot Repository + https://repo.spring.io/libs-snapshot-local + + + spring-docs + scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/spring-cloud-dependencies-parent/3.0.2/spring-cloud-sleuth-dependencies + + https://github.com/spring-cloud + + + 0.37.4 + 4.2.2 + 5.13.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 + + + + false + + + true + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + + + false + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + + + false + + spring-releases + Spring Releases + https://repo.spring.io/release + + + + + + false + + + true + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + + + false + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + + + + diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index c5ecf9cbb..d946db557 100644 --- a/spring-cloud-sleuth-dependencies/pom.xml +++ b/spring-cloud-sleuth-dependencies/pom.xml @@ -22,11 +22,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.0.2-SNAPSHOT + 3.0.2 spring-cloud-sleuth-dependencies - 3.0.2-SNAPSHOT + 3.0.2 pom spring-cloud-sleuth-dependencies Spring Cloud Sleuth Dependencies diff --git a/spring-cloud-sleuth-instrumentation/pom.xml b/spring-cloud-sleuth-instrumentation/pom.xml index 51daaf149..cc0323008 100644 --- a/spring-cloud-sleuth-instrumentation/pom.xml +++ b/spring-cloud-sleuth-instrumentation/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth - 3.0.2-SNAPSHOT + 3.0.2 .. diff --git a/spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/MessageHeaderPropagatorGetter.java b/spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/MessageHeaderPropagatorGetter.java index ca96e37b0..c9726fe60 100644 --- a/spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/MessageHeaderPropagatorGetter.java +++ b/spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/MessageHeaderPropagatorGetter.java @@ -114,4 +114,5 @@ public class MessageHeaderPropagatorGetter implements Propagator.Getter org.springframework.cloud spring-cloud-sleuth - 3.0.2-SNAPSHOT + 3.0.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 895d61229..8fb704f19 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 - 3.0.2-SNAPSHOT + 3.0.2 .. 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 470aea321..c78353932 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 - 3.0.2-SNAPSHOT + 3.0.2 .. 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 83dcff828..0ad8c5f25 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 - 3.0.2-SNAPSHOT + 3.0.2 .. 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 2a4fe52fb..7e810455d 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 - 3.0.2-SNAPSHOT + 3.0.2 .. 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 876c93ce1..3d9d5063e 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 - 3.0.2-SNAPSHOT + 3.0.2 .. 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 26571c0ec..afa1d02a2 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 - 3.0.2-SNAPSHOT + 3.0.2 .. diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml index f11729614..6421099ec 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 - 3.0.2-SNAPSHOT + 3.0.2 .. diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml index 13f2e124f..f7b11b2db 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 - 3.0.2-SNAPSHOT + 3.0.2 .. spring-cloud-starter-sleuth diff --git a/tests/brave/pom.xml b/tests/brave/pom.xml index ccf59fa70..763275d2d 100644 --- a/tests/brave/pom.xml +++ b/tests/brave/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 3.0.2-SNAPSHOT + 3.0.2 .. diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-annotation-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-annotation-tests/pom.xml index d321841ea..25aa20347 100644 --- a/tests/brave/spring-cloud-sleuth-instrumentation-annotation-tests/pom.xml +++ b/tests/brave/spring-cloud-sleuth-instrumentation-annotation-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests-brave - 3.0.2-SNAPSHOT + 3.0.2 .. diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-async-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-async-tests/pom.xml index 073eedb9f..261329309 100644 --- a/tests/brave/spring-cloud-sleuth-instrumentation-async-tests/pom.xml +++ b/tests/brave/spring-cloud-sleuth-instrumentation-async-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests-brave - 3.0.2-SNAPSHOT + 3.0.2 .. diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-baggage-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-baggage-tests/pom.xml index 2370f6da9..70f359cec 100644 --- a/tests/brave/spring-cloud-sleuth-instrumentation-baggage-tests/pom.xml +++ b/tests/brave/spring-cloud-sleuth-instrumentation-baggage-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests-brave - 3.0.2-SNAPSHOT + 3.0.2 .. diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-baggage-tests/src/test/java/org/springframework/cloud/sleuth/brave/baggage/MultipleHopsIntegrationTests.java b/tests/brave/spring-cloud-sleuth-instrumentation-baggage-tests/src/test/java/org/springframework/cloud/sleuth/brave/baggage/MultipleHopsIntegrationTests.java index d36135877..96dafebfe 100644 --- a/tests/brave/spring-cloud-sleuth-instrumentation-baggage-tests/src/test/java/org/springframework/cloud/sleuth/brave/baggage/MultipleHopsIntegrationTests.java +++ b/tests/brave/spring-cloud-sleuth-instrumentation-baggage-tests/src/test/java/org/springframework/cloud/sleuth/brave/baggage/MultipleHopsIntegrationTests.java @@ -63,9 +63,11 @@ public class MultipleHopsIntegrationTests // baz is not tagged in the initial span, only downstream! then(this.application.allSpans()).as("All downstream have country-code") .filteredOn(span -> !span.equals(initialSpan)) - // it propagates only and all the `spring.sleuth.baggage.remote-fields` in case insensitive way + // it propagates only and all the `spring.sleuth.baggage.remote-fields` in + // case insensitive way .allMatch(span -> "FO".equals(COUNTRY_CODE.getValue(BraveAccessor.traceContext(span.context())))) - .allMatch(span -> "123".equalsIgnoreCase(CASE_INSENSITIVE_ID.getValue(BraveAccessor.traceContext(span.context())))) + .allMatch(span -> "123" + .equalsIgnoreCase(CASE_INSENSITIVE_ID.getValue(BraveAccessor.traceContext(span.context())))) .allMatch(span -> NOT_PROPAGATED_HEADER.getValue(BraveAccessor.traceContext(span.context())) == null); } diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-circuitbreaker-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-circuitbreaker-tests/pom.xml index 098bc29b8..398ffb601 100644 --- a/tests/brave/spring-cloud-sleuth-instrumentation-circuitbreaker-tests/pom.xml +++ b/tests/brave/spring-cloud-sleuth-instrumentation-circuitbreaker-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests-brave - 3.0.2-SNAPSHOT + 3.0.2 .. diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml index a1a85169f..e15bf5d70 100644 --- a/tests/brave/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml +++ b/tests/brave/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests-brave - 3.0.2-SNAPSHOT + 3.0.2 .. diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-gateway-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-gateway-tests/pom.xml index 987711d66..577ac9b15 100644 --- a/tests/brave/spring-cloud-sleuth-instrumentation-gateway-tests/pom.xml +++ b/tests/brave/spring-cloud-sleuth-instrumentation-gateway-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests-brave - 3.0.2-SNAPSHOT + 3.0.2 .. diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml index 741cb5bce..d1ec762b1 100644 --- a/tests/brave/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml +++ b/tests/brave/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests-brave - 3.0.2-SNAPSHOT + 3.0.2 .. diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml index f9990c973..d8b2f7381 100644 --- a/tests/brave/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml +++ b/tests/brave/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests-brave - 3.0.2-SNAPSHOT + 3.0.2 .. diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml index 81ba8081a..56d694ce9 100644 --- a/tests/brave/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml +++ b/tests/brave/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests-brave - 3.0.2-SNAPSHOT + 3.0.2 .. diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-messaging-tests/src/test/java/org/springframework/cloud/sleuth/brave/instrument/messaging/TracingChannelInterceptorTest.java b/tests/brave/spring-cloud-sleuth-instrumentation-messaging-tests/src/test/java/org/springframework/cloud/sleuth/brave/instrument/messaging/TracingChannelInterceptorTest.java index 7f0ce0993..c4ba0202e 100644 --- a/tests/brave/spring-cloud-sleuth-instrumentation-messaging-tests/src/test/java/org/springframework/cloud/sleuth/brave/instrument/messaging/TracingChannelInterceptorTest.java +++ b/tests/brave/spring-cloud-sleuth-instrumentation-messaging-tests/src/test/java/org/springframework/cloud/sleuth/brave/instrument/messaging/TracingChannelInterceptorTest.java @@ -48,15 +48,11 @@ public class TracingChannelInterceptorTest this.testTracing = new BraveTestTracing() { @Override public Tracing.Builder tracingBuilder() { - return super.tracingBuilder() - .propagationFactory(BaggagePropagation.newFactoryBuilder(B3Propagation.newFactoryBuilder() - .injectFormat(SINGLE) - .build() - ) - .add(BaggagePropagationConfig.SingleBaggageField.remote(BaggageField.create("Foo-Id"))) - .add(BaggagePropagationConfig.SingleBaggageField.remote(BaggageField.create("Baz-Id"))) - .build() - ); + return super.tracingBuilder().propagationFactory(BaggagePropagation + .newFactoryBuilder(B3Propagation.newFactoryBuilder().injectFormat(SINGLE).build()) + .add(BaggagePropagationConfig.SingleBaggageField.remote(BaggageField.create("Foo-Id"))) + .add(BaggagePropagationConfig.SingleBaggageField.remote(BaggageField.create("Baz-Id"))) + .build()); } }; this.testTracing.reset(); @@ -77,7 +73,7 @@ public class TracingChannelInterceptorTest TraceContext receiveContext = parseB3SingleFormat( ((List) ((Map) this.channel.receive().getHeaders().get(NATIVE_HEADERS)).get("b3")).get(0).toString()) - .context(); + .context(); assertThat(receiveContext.parentIdString()).isEqualTo("000000000000000b"); } diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml index 8c332e30b..56f3c5d15 100644 --- a/tests/brave/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml +++ b/tests/brave/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests-brave - 3.0.2-SNAPSHOT + 3.0.2 .. diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-quartz-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-quartz-tests/pom.xml index 70d15c0bd..99895b1dc 100644 --- a/tests/brave/spring-cloud-sleuth-instrumentation-quartz-tests/pom.xml +++ b/tests/brave/spring-cloud-sleuth-instrumentation-quartz-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests-brave - 3.0.2-SNAPSHOT + 3.0.2 .. diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml index 4d0df14c2..da4866809 100644 --- a/tests/brave/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml +++ b/tests/brave/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests-brave - 3.0.2-SNAPSHOT + 3.0.2 .. diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml index d6a27ca70..3fd87c2e8 100644 --- a/tests/brave/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml +++ b/tests/brave/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests-brave - 3.0.2-SNAPSHOT + 3.0.2 .. diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml index c77afa4e8..753042c86 100644 --- a/tests/brave/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml +++ b/tests/brave/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests-brave - 3.0.2-SNAPSHOT + 3.0.2 .. diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml b/tests/brave/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml index 98c8eae83..4d6890c70 100644 --- a/tests/brave/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml +++ b/tests/brave/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests-brave - 3.0.2-SNAPSHOT + 3.0.2 .. diff --git a/tests/brave/spring-cloud-sleuth-zipkin-tests/pom.xml b/tests/brave/spring-cloud-sleuth-zipkin-tests/pom.xml index 53a55d021..30f864a69 100644 --- a/tests/brave/spring-cloud-sleuth-zipkin-tests/pom.xml +++ b/tests/brave/spring-cloud-sleuth-zipkin-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests-brave - 3.0.2-SNAPSHOT + 3.0.2 .. diff --git a/tests/common/pom.xml b/tests/common/pom.xml index eefbe4201..4a2970ea9 100644 --- a/tests/common/pom.xml +++ b/tests/common/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 3.0.2-SNAPSHOT + 3.0.2 .. diff --git a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TracingChannelInterceptorTest.java b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TracingChannelInterceptorTest.java index d305300b9..ae6a36018 100644 --- a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TracingChannelInterceptorTest.java +++ b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TracingChannelInterceptorTest.java @@ -381,7 +381,8 @@ public abstract class TracingChannelInterceptorTest implements TestTracingAwareS Message actualMessage = channel.receive(); assertThat(actualMessage.getHeaders()).isNotEmpty(); - LinkedMultiValueMap actualNativeHeaders = (LinkedMultiValueMap) actualMessage.getHeaders().get(NATIVE_HEADERS); + LinkedMultiValueMap actualNativeHeaders = (LinkedMultiValueMap) actualMessage.getHeaders() + .get(NATIVE_HEADERS); assertThat(actualNativeHeaders).isNotEmpty(); assertThat(actualNativeHeaders.get("not-propagated-header")).isNull(); assertThat(actualNativeHeaders.get("Foo-Id")).isEqualTo(singletonList("123")); diff --git a/tests/pom.xml b/tests/pom.xml index 5e22d09e2..f9834ca05 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth - 3.0.2-SNAPSHOT + 3.0.2 ..