From 4830ef383ef07f5c7b060f98c186aec6392b0dd5 Mon Sep 17 00:00:00 2001 From: Francisco Mateo Date: Tue, 18 Aug 2020 11:40:45 -0500 Subject: [PATCH 1/6] Include WebClient.Builder in HTTP Client Integration docs (#1718) --- docs/src/main/asciidoc/spring-cloud-sleuth.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/main/asciidoc/spring-cloud-sleuth.adoc b/docs/src/main/asciidoc/spring-cloud-sleuth.adoc index 39bc45aad..7d494b516 100644 --- a/docs/src/main/asciidoc/spring-cloud-sleuth.adoc +++ b/docs/src/main/asciidoc/spring-cloud-sleuth.adoc @@ -1261,8 +1261,8 @@ We inject a `ExchangeFilterFunction` implementation that creates a span and, thr To block this feature, set `spring.sleuth.web.client.enabled` to `false`. -IMPORTANT: You have to register `WebClient` as a bean so that the tracing instrumentation gets applied. -If you create a `WebClient` instance with a `new` keyword, the instrumentation does NOT work. +IMPORTANT: You have to register either a `WebClient` or `WebClient.Builder` as a bean so that the tracing instrumentation gets applied. +If you manually create a `WebClient` or `WebClient.Builder`, the instrumentation does NOT work. ==== Traverson From 36d2c3cc2cf7e4e8d4f8bb2a32b19d1f82bf3b09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julio=20G=C3=B3mez=20D=C3=ADaz?= Date: Fri, 28 Aug 2020 18:21:15 +0000 Subject: [PATCH 2/6] Broaden the catched exception when the calculation of patterns could provoke a cyclic reference. Fixes gh-1679 (#1722) --- .../sleuth/instrument/web/TraceWebAutoConfiguration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java index 5858ba405..32fa512f6 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceWebAutoConfiguration.java @@ -25,7 +25,7 @@ import java.util.stream.Collectors; import brave.Tracing; -import org.springframework.beans.factory.BeanCurrentlyInCreationException; +import org.springframework.beans.factory.BeanCreationException; import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties; import org.springframework.boot.actuate.autoconfigure.web.server.ConditionalOnManagementPort; import org.springframework.boot.actuate.autoconfigure.web.server.ManagementPortType; @@ -90,7 +90,7 @@ public class TraceWebAutoConfiguration { } return () -> result; } - catch (BeanCurrentlyInCreationException e) { + catch (BeanCreationException e) { // Most likely, there is an actuator endpoint that indirectly references an // instrumented HTTP client. return () -> consolidateSkipPatterns(patterns); From 53a15b5b52f656d5d5b115120b9c0d891588f0f2 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 28 Aug 2020 20:21:13 +0000 Subject: [PATCH 3/6] Update SNAPSHOT to 2.2.5.RELEASE --- benchmarks/pom.xml | 4 +- docs/pom.xml | 2 +- docs/src/main/asciidoc/_configprops.adoc | 7 +- pom.xml | 18 +- spring-cloud-sleuth-core/pom.xml | 2 +- .../.flattened-pom.xml | 209 ++++++++++++++++++ spring-cloud-sleuth-dependencies/pom.xml | 4 +- spring-cloud-sleuth-samples/pom.xml | 2 +- .../spring-cloud-sleuth-sample-feign/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-sleuth-sample-ribbon/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 +- spring-cloud-starter-zipkin/pom.xml | 2 +- tests/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- 32 files changed, 255 insertions(+), 41 deletions(-) create mode 100644 spring-cloud-sleuth-dependencies/.flattened-pom.xml diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 27c69e4cf..78e4baef3 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -22,7 +22,7 @@ Benchmarks Benchmarks (JMH) org.springframework.cloud - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE benchmarks @@ -32,7 +32,7 @@ true 1.8 1.8 - 2.3.2.RELEASE + 2.3.3.RELEASE 5.12.3 3.14.6 diff --git a/docs/pom.xml b/docs/pom.xml index d83073176..6fdb023d1 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -22,7 +22,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE spring-cloud-sleuth-docs pom diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index 56cb52a46..acd5c66ad 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -6,13 +6,18 @@ |spring.sleuth.async.enabled | true | Enable instrumenting async related components so that the tracing information is passed between threads. |spring.sleuth.async.ignored-beans | | List of {@link java.util.concurrent.Executor} bean names that should be ignored and not wrapped in a trace representation. |spring.sleuth.baggage-keys | | List of baggage key names that should be propagated out of process. These keys will be prefixed with `baggage` before the actual key. This property is set in order to be backward compatible with previous Sleuth versions. @see brave.propagation.ExtraFieldPropagation.FactoryBuilder#addPrefixedFields(String, java.util.Collection) +|spring.sleuth.baggage.correlation-enabled | true | Adds a {@link CorrelationScopeDecorator} to put baggage values into the correlation context. +|spring.sleuth.baggage.correlation-fields | | A list of {@link BaggageField#name() fields} to add to correlation (MDC) context. @see CorrelationScopeConfig.SingleCorrelationField#create(BaggageField) +|spring.sleuth.baggage.local-fields | | Same as {@link #remoteFields} except that this field is not propagated to remote services. @see BaggagePropagationConfig.SingleBaggageField#local(BaggageField) +|spring.sleuth.baggage.remote-fields | | List of fields that are referenced the same in-process as it is on the wire. For example, the field "x-vcap-request-id" would be set as-is including the prefix. @see BaggagePropagationConfig.SingleBaggageField#remote(BaggageField) @see BaggagePropagationConfig.SingleBaggageField.Builder#addKeyName(String) +|spring.sleuth.baggage.tag-fields | | A list of {@link BaggageField#name() fields} to tag into the span. @see Tags#BAGGAGE_FIELD |spring.sleuth.circuitbreaker.enabled | true | Enable Spring Cloud CircuitBreaker instrumentation. |spring.sleuth.enabled | true | |spring.sleuth.feign.enabled | true | Enable span information propagation when using Feign. |spring.sleuth.feign.processor.enabled | true | Enable post processor that wraps Feign Context in its tracing representations. |spring.sleuth.grpc.enabled | true | Enable span information propagation when using GRPC. |spring.sleuth.http.enabled | true | -|spring.sleuth.http.legacy.enabled | false | +|spring.sleuth.http.legacy.enabled | false | Enables the legacy Sleuth setup. |spring.sleuth.hystrix.strategy.enabled | true | Enable custom HystrixConcurrencyStrategy that wraps all Callable instances into their Sleuth representative - the TraceCallable. |spring.sleuth.hystrix.strategy.passthrough | false | When enabled the tracing information is passed to the Hystrix execution threads but spans are not created for each execution. |spring.sleuth.integration.enabled | true | Enable Spring Integration sleuth instrumentation. diff --git a/pom.xml b/pom.xml index 242d23e82..12ddd3935 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 4.0.0 spring-cloud-sleuth - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE pom Spring Cloud Sleuth Spring Cloud Sleuth @@ -29,7 +29,7 @@ org.springframework.cloud spring-cloud-build - 2.3.2.BUILD-SNAPSHOT + 2.3.1.RELEASE @@ -251,15 +251,15 @@ 1.8 1.8 1.8 - 2.2.5.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT - 1.0.5.BUILD-SNAPSHOT - Horsham.SR7 - 2.2.5.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE + 2.2.5.RELEASE + 1.0.4.RELEASE + Horsham.SR8 + 2.2.5.RELEASE + 2.2.5.RELEASE 5.12.3 2.1.7.RELEASE - 2.2.4.BUILD-SNAPSHOT + 2.2.4.RELEASE false 3.14.6 3.14.6 diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml index ed4e23e34..6518b7240 100644 --- a/spring-cloud-sleuth-core/pom.xml +++ b/spring-cloud-sleuth-core/pom.xml @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. diff --git a/spring-cloud-sleuth-dependencies/.flattened-pom.xml b/spring-cloud-sleuth-dependencies/.flattened-pom.xml new file mode 100644 index 000000000..18d709393 --- /dev/null +++ b/spring-cloud-sleuth-dependencies/.flattened-pom.xml @@ -0,0 +1,209 @@ + + + + 4.0.0 + + org.springframework.cloud + spring-cloud-dependencies-parent + 2.3.1.RELEASE + + + org.springframework.cloud + spring-cloud-sleuth-dependencies + 2.2.5.RELEASE + 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-build.git/spring-cloud-sleuth-dependencies + scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git/spring-cloud-sleuth-dependencies + https://github.com/spring-cloud/spring-cloud-build/spring-cloud-sleuth-dependencies + + + + 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/2.3.1.RELEASE/spring-cloud-sleuth-dependencies + + https://github.com/spring-cloud + + + 0.37.2 + 3.4.1 + 5.12.3 + + + + + org.springframework.cloud + spring-cloud-sleuth-core + ${project.version} + + + org.springframework.cloud + spring-cloud-sleuth-zipkin + ${project.version} + + + org.springframework.cloud + spring-cloud-starter-zipkin + ${project.version} + + + org.springframework.cloud + spring-cloud-starter-sleuth + ${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/libs-snapshot-local + + + + false + + spring-milestones + Spring Milestones + https://repo.spring.io/libs-milestone-local + + + + false + + spring-releases + Spring Releases + https://repo.spring.io/release + + + + + + false + + + true + + spring-snapshots + Spring Snapshots + https://repo.spring.io/libs-snapshot-local + + + + false + + spring-milestones + Spring Milestones + https://repo.spring.io/libs-milestone-local + + + + + diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index fb5358e98..794801297 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 - 2.3.2.BUILD-SNAPSHOT + 2.3.1.RELEASE spring-cloud-sleuth-dependencies - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE 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 87a09254f..bb231a266 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.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. 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 3fa6a01ad..970e71af3 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.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. 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 7616ec434..a03716369 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.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. 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 89a2b4c5b..0d6526d8e 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.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. 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 5409bce84..65541f00e 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.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. 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 4232425b9..ce99cfed7 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.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. 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 b1c7238e7..49b24a5f9 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.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. 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 41ea639aa..f990531c4 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.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml index 3f13b116e..a5b1ab95c 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.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml index f556b6c16..251a15b65 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.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-starter-sleuth diff --git a/spring-cloud-starter-zipkin/pom.xml b/spring-cloud-starter-zipkin/pom.xml index 33d2f14e3..cfedfcd53 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.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. spring-cloud-starter-zipkin diff --git a/tests/pom.xml b/tests/pom.xml index 66e355060..435505f2b 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. diff --git a/tests/spring-cloud-sleuth-instrumentation-async-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-async-tests/pom.xml index 6086f0065..d76781805 100644 --- a/tests/spring-cloud-sleuth-instrumentation-async-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-async-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. diff --git a/tests/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml index ca1937f09..28be97735 100644 --- a/tests/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. diff --git a/tests/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml index 6fc1ec1c3..9775d81bd 100644 --- a/tests/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. diff --git a/tests/spring-cloud-sleuth-instrumentation-hystrix-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-hystrix-tests/pom.xml index f780c9b73..0eae558c4 100644 --- a/tests/spring-cloud-sleuth-instrumentation-hystrix-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-hystrix-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. diff --git a/tests/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml index 818964f0e..45286568b 100644 --- a/tests/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. diff --git a/tests/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml index a54944b7d..4f9f6a56a 100644 --- a/tests/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml @@ -31,7 +31,7 @@ https://www.w3.org/2001/XMLSchema-instance "> org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. diff --git a/tests/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml index a80c5fac8..fe6a2bc7d 100644 --- a/tests/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. diff --git a/tests/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml index ade9dae94..ffaff0274 100644 --- a/tests/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. diff --git a/tests/spring-cloud-sleuth-instrumentation-rpc-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-rpc-tests/pom.xml index 7f9550136..a8c957c9c 100644 --- a/tests/spring-cloud-sleuth-instrumentation-rpc-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-rpc-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. diff --git a/tests/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml index ed940a294..fed018ec4 100644 --- a/tests/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. diff --git a/tests/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml index defd15858..af0fbd27d 100644 --- a/tests/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. diff --git a/tests/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml index fcf3cdca6..1614f808a 100644 --- a/tests/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. diff --git a/tests/spring-cloud-sleuth-instrumentation-zuul-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-zuul-tests/pom.xml index 15b0d0009..d003cb7e5 100644 --- a/tests/spring-cloud-sleuth-instrumentation-zuul-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-zuul-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.5.RELEASE .. From 8b1d17fb26dbc3b783ff890530730e86e45f2d10 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 28 Aug 2020 20:23:44 +0000 Subject: [PATCH 4/6] Going back to snapshots --- benchmarks/pom.xml | 4 +- docs/pom.xml | 2 +- docs/src/main/asciidoc/_configprops.adoc | 7 +- pom.xml | 18 +- spring-cloud-sleuth-core/pom.xml | 2 +- .../.flattened-pom.xml | 209 ------------------ spring-cloud-sleuth-dependencies/pom.xml | 4 +- spring-cloud-sleuth-samples/pom.xml | 2 +- .../spring-cloud-sleuth-sample-feign/pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-sleuth-sample-ribbon/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 +- spring-cloud-starter-zipkin/pom.xml | 2 +- tests/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- 32 files changed, 41 insertions(+), 255 deletions(-) delete mode 100644 spring-cloud-sleuth-dependencies/.flattened-pom.xml diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 78e4baef3..27c69e4cf 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -22,7 +22,7 @@ Benchmarks Benchmarks (JMH) org.springframework.cloud - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT benchmarks @@ -32,7 +32,7 @@ true 1.8 1.8 - 2.3.3.RELEASE + 2.3.2.RELEASE 5.12.3 3.14.6 diff --git a/docs/pom.xml b/docs/pom.xml index 6fdb023d1..d83073176 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -22,7 +22,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT spring-cloud-sleuth-docs pom diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index acd5c66ad..56cb52a46 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -6,18 +6,13 @@ |spring.sleuth.async.enabled | true | Enable instrumenting async related components so that the tracing information is passed between threads. |spring.sleuth.async.ignored-beans | | List of {@link java.util.concurrent.Executor} bean names that should be ignored and not wrapped in a trace representation. |spring.sleuth.baggage-keys | | List of baggage key names that should be propagated out of process. These keys will be prefixed with `baggage` before the actual key. This property is set in order to be backward compatible with previous Sleuth versions. @see brave.propagation.ExtraFieldPropagation.FactoryBuilder#addPrefixedFields(String, java.util.Collection) -|spring.sleuth.baggage.correlation-enabled | true | Adds a {@link CorrelationScopeDecorator} to put baggage values into the correlation context. -|spring.sleuth.baggage.correlation-fields | | A list of {@link BaggageField#name() fields} to add to correlation (MDC) context. @see CorrelationScopeConfig.SingleCorrelationField#create(BaggageField) -|spring.sleuth.baggage.local-fields | | Same as {@link #remoteFields} except that this field is not propagated to remote services. @see BaggagePropagationConfig.SingleBaggageField#local(BaggageField) -|spring.sleuth.baggage.remote-fields | | List of fields that are referenced the same in-process as it is on the wire. For example, the field "x-vcap-request-id" would be set as-is including the prefix. @see BaggagePropagationConfig.SingleBaggageField#remote(BaggageField) @see BaggagePropagationConfig.SingleBaggageField.Builder#addKeyName(String) -|spring.sleuth.baggage.tag-fields | | A list of {@link BaggageField#name() fields} to tag into the span. @see Tags#BAGGAGE_FIELD |spring.sleuth.circuitbreaker.enabled | true | Enable Spring Cloud CircuitBreaker instrumentation. |spring.sleuth.enabled | true | |spring.sleuth.feign.enabled | true | Enable span information propagation when using Feign. |spring.sleuth.feign.processor.enabled | true | Enable post processor that wraps Feign Context in its tracing representations. |spring.sleuth.grpc.enabled | true | Enable span information propagation when using GRPC. |spring.sleuth.http.enabled | true | -|spring.sleuth.http.legacy.enabled | false | Enables the legacy Sleuth setup. +|spring.sleuth.http.legacy.enabled | false | |spring.sleuth.hystrix.strategy.enabled | true | Enable custom HystrixConcurrencyStrategy that wraps all Callable instances into their Sleuth representative - the TraceCallable. |spring.sleuth.hystrix.strategy.passthrough | false | When enabled the tracing information is passed to the Hystrix execution threads but spans are not created for each execution. |spring.sleuth.integration.enabled | true | Enable Spring Integration sleuth instrumentation. diff --git a/pom.xml b/pom.xml index 12ddd3935..242d23e82 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 4.0.0 spring-cloud-sleuth - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT pom Spring Cloud Sleuth Spring Cloud Sleuth @@ -29,7 +29,7 @@ org.springframework.cloud spring-cloud-build - 2.3.1.RELEASE + 2.3.2.BUILD-SNAPSHOT @@ -251,15 +251,15 @@ 1.8 1.8 1.8 - 2.2.5.RELEASE - 2.2.5.RELEASE - 1.0.4.RELEASE - Horsham.SR8 - 2.2.5.RELEASE - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT + 1.0.5.BUILD-SNAPSHOT + Horsham.SR7 + 2.2.5.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT 5.12.3 2.1.7.RELEASE - 2.2.4.RELEASE + 2.2.4.BUILD-SNAPSHOT false 3.14.6 3.14.6 diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml index 6518b7240..ed4e23e34 100644 --- a/spring-cloud-sleuth-core/pom.xml +++ b/spring-cloud-sleuth-core/pom.xml @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-dependencies/.flattened-pom.xml b/spring-cloud-sleuth-dependencies/.flattened-pom.xml deleted file mode 100644 index 18d709393..000000000 --- a/spring-cloud-sleuth-dependencies/.flattened-pom.xml +++ /dev/null @@ -1,209 +0,0 @@ - - - - 4.0.0 - - org.springframework.cloud - spring-cloud-dependencies-parent - 2.3.1.RELEASE - - - org.springframework.cloud - spring-cloud-sleuth-dependencies - 2.2.5.RELEASE - 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-build.git/spring-cloud-sleuth-dependencies - scm:git:ssh://git@github.com/spring-cloud/spring-cloud-build.git/spring-cloud-sleuth-dependencies - https://github.com/spring-cloud/spring-cloud-build/spring-cloud-sleuth-dependencies - - - - 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/2.3.1.RELEASE/spring-cloud-sleuth-dependencies - - https://github.com/spring-cloud - - - 0.37.2 - 3.4.1 - 5.12.3 - - - - - org.springframework.cloud - spring-cloud-sleuth-core - ${project.version} - - - org.springframework.cloud - spring-cloud-sleuth-zipkin - ${project.version} - - - org.springframework.cloud - spring-cloud-starter-zipkin - ${project.version} - - - org.springframework.cloud - spring-cloud-starter-sleuth - ${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/libs-snapshot-local - - - - false - - spring-milestones - Spring Milestones - https://repo.spring.io/libs-milestone-local - - - - false - - spring-releases - Spring Releases - https://repo.spring.io/release - - - - - - false - - - true - - spring-snapshots - Spring Snapshots - https://repo.spring.io/libs-snapshot-local - - - - false - - spring-milestones - Spring Milestones - https://repo.spring.io/libs-milestone-local - - - - - diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index 794801297..fb5358e98 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 - 2.3.1.RELEASE + 2.3.2.BUILD-SNAPSHOT spring-cloud-sleuth-dependencies - 2.2.5.RELEASE + 2.2.5.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 bb231a266..87a09254f 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.2.5.RELEASE + 2.2.5.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 970e71af3..3fa6a01ad 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.2.5.RELEASE + 2.2.5.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 a03716369..7616ec434 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.2.5.RELEASE + 2.2.5.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 0d6526d8e..89a2b4c5b 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.2.5.RELEASE + 2.2.5.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 65541f00e..5409bce84 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.2.5.RELEASE + 2.2.5.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 ce99cfed7..4232425b9 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.2.5.RELEASE + 2.2.5.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 49b24a5f9..b1c7238e7 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.2.5.RELEASE + 2.2.5.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 f990531c4..41ea639aa 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml index a5b1ab95c..3f13b116e 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml index 251a15b65..f556b6c16 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-starter-sleuth diff --git a/spring-cloud-starter-zipkin/pom.xml b/spring-cloud-starter-zipkin/pom.xml index cfedfcd53..33d2f14e3 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.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. spring-cloud-starter-zipkin diff --git a/tests/pom.xml b/tests/pom.xml index 435505f2b..66e355060 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. diff --git a/tests/spring-cloud-sleuth-instrumentation-async-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-async-tests/pom.xml index d76781805..6086f0065 100644 --- a/tests/spring-cloud-sleuth-instrumentation-async-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-async-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. diff --git a/tests/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml index 28be97735..ca1937f09 100644 --- a/tests/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. diff --git a/tests/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml index 9775d81bd..6fc1ec1c3 100644 --- a/tests/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. diff --git a/tests/spring-cloud-sleuth-instrumentation-hystrix-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-hystrix-tests/pom.xml index 0eae558c4..f780c9b73 100644 --- a/tests/spring-cloud-sleuth-instrumentation-hystrix-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-hystrix-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. diff --git a/tests/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml index 45286568b..818964f0e 100644 --- a/tests/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. diff --git a/tests/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml index 4f9f6a56a..a54944b7d 100644 --- a/tests/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml @@ -31,7 +31,7 @@ https://www.w3.org/2001/XMLSchema-instance "> org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. diff --git a/tests/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml index fe6a2bc7d..a80c5fac8 100644 --- a/tests/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. diff --git a/tests/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml index ffaff0274..ade9dae94 100644 --- a/tests/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. diff --git a/tests/spring-cloud-sleuth-instrumentation-rpc-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-rpc-tests/pom.xml index a8c957c9c..7f9550136 100644 --- a/tests/spring-cloud-sleuth-instrumentation-rpc-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-rpc-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. diff --git a/tests/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml index fed018ec4..ed940a294 100644 --- a/tests/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. diff --git a/tests/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml index af0fbd27d..defd15858 100644 --- a/tests/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. diff --git a/tests/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml index 1614f808a..fcf3cdca6 100644 --- a/tests/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. diff --git a/tests/spring-cloud-sleuth-instrumentation-zuul-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-zuul-tests/pom.xml index d003cb7e5..15b0d0009 100644 --- a/tests/spring-cloud-sleuth-instrumentation-zuul-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-zuul-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.RELEASE + 2.2.5.BUILD-SNAPSHOT .. From cf3a08247774b876f4fb3b8ec8ce16babc21d246 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 28 Aug 2020 20:23:45 +0000 Subject: [PATCH 5/6] Bumping versions to 2.2.6.BUILD-SNAPSHOT after release --- benchmarks/pom.xml | 4 ++-- docs/pom.xml | 2 +- pom.xml | 18 +++++++++--------- 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 +- .../pom.xml | 2 +- .../spring-cloud-sleuth-sample-ribbon/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 +- spring-cloud-starter-zipkin/pom.xml | 2 +- tests/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- 30 files changed, 39 insertions(+), 39 deletions(-) diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 27c69e4cf..a42087ab1 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -22,7 +22,7 @@ Benchmarks Benchmarks (JMH) org.springframework.cloud - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT benchmarks @@ -32,7 +32,7 @@ true 1.8 1.8 - 2.3.2.RELEASE + 2.3.3.RELEASE 5.12.3 3.14.6 diff --git a/docs/pom.xml b/docs/pom.xml index d83073176..3d783f038 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -22,7 +22,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT spring-cloud-sleuth-docs pom diff --git a/pom.xml b/pom.xml index 242d23e82..318629b8b 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 4.0.0 spring-cloud-sleuth - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT pom Spring Cloud Sleuth Spring Cloud Sleuth @@ -29,7 +29,7 @@ org.springframework.cloud spring-cloud-build - 2.3.2.BUILD-SNAPSHOT + 2.3.1.RELEASE @@ -251,15 +251,15 @@ 1.8 1.8 1.8 - 2.2.5.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT - 1.0.5.BUILD-SNAPSHOT - Horsham.SR7 - 2.2.5.BUILD-SNAPSHOT - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT + 1.0.4.RELEASE + Horsham.SR8 + 2.2.6.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT 5.12.3 2.1.7.RELEASE - 2.2.4.BUILD-SNAPSHOT + 2.2.5.BUILD-SNAPSHOT false 3.14.6 3.14.6 diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml index ed4e23e34..7ecb7c237 100644 --- a/spring-cloud-sleuth-core/pom.xml +++ b/spring-cloud-sleuth-core/pom.xml @@ -31,7 +31,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index fb5358e98..6bff54e45 100644 --- a/spring-cloud-sleuth-dependencies/pom.xml +++ b/spring-cloud-sleuth-dependencies/pom.xml @@ -26,7 +26,7 @@ spring-cloud-sleuth-dependencies - 2.2.5.BUILD-SNAPSHOT + 2.2.6.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 87a09254f..cb00891eb 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.2.5.BUILD-SNAPSHOT + 2.2.6.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 3fa6a01ad..5e5dc5dfb 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.2.5.BUILD-SNAPSHOT + 2.2.6.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 7616ec434..34bf60566 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.2.5.BUILD-SNAPSHOT + 2.2.6.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 89a2b4c5b..0b963a3df 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.2.5.BUILD-SNAPSHOT + 2.2.6.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 5409bce84..540b2c8c1 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.2.5.BUILD-SNAPSHOT + 2.2.6.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 4232425b9..7f83c94e1 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.2.5.BUILD-SNAPSHOT + 2.2.6.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 b1c7238e7..d18a64d72 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.2.5.BUILD-SNAPSHOT + 2.2.6.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 41ea639aa..5674a92f0 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml index 3f13b116e..2197d2641 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml index f556b6c16..d2d195754 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-starter-sleuth diff --git a/spring-cloud-starter-zipkin/pom.xml b/spring-cloud-starter-zipkin/pom.xml index 33d2f14e3..51e5cfa36 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.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. spring-cloud-starter-zipkin diff --git a/tests/pom.xml b/tests/pom.xml index 66e355060..22680bbe1 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. diff --git a/tests/spring-cloud-sleuth-instrumentation-async-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-async-tests/pom.xml index 6086f0065..714983fee 100644 --- a/tests/spring-cloud-sleuth-instrumentation-async-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-async-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. diff --git a/tests/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml index ca1937f09..81a3a0fa6 100644 --- a/tests/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. diff --git a/tests/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml index 6fc1ec1c3..d77334bd8 100644 --- a/tests/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. diff --git a/tests/spring-cloud-sleuth-instrumentation-hystrix-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-hystrix-tests/pom.xml index f780c9b73..e644a4dfa 100644 --- a/tests/spring-cloud-sleuth-instrumentation-hystrix-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-hystrix-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. diff --git a/tests/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml index 818964f0e..41e4e3571 100644 --- a/tests/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. diff --git a/tests/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml index a54944b7d..91d4ba1c3 100644 --- a/tests/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml @@ -31,7 +31,7 @@ https://www.w3.org/2001/XMLSchema-instance "> org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. diff --git a/tests/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml index a80c5fac8..21407a23b 100644 --- a/tests/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. diff --git a/tests/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml index ade9dae94..045d85914 100644 --- a/tests/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. diff --git a/tests/spring-cloud-sleuth-instrumentation-rpc-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-rpc-tests/pom.xml index 7f9550136..12d575425 100644 --- a/tests/spring-cloud-sleuth-instrumentation-rpc-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-rpc-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. diff --git a/tests/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml index ed940a294..8079313cc 100644 --- a/tests/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. diff --git a/tests/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml index defd15858..b4d2c6588 100644 --- a/tests/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. diff --git a/tests/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml index fcf3cdca6..8fa11e523 100644 --- a/tests/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. diff --git a/tests/spring-cloud-sleuth-instrumentation-zuul-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-zuul-tests/pom.xml index 15b0d0009..d40736aee 100644 --- a/tests/spring-cloud-sleuth-instrumentation-zuul-tests/pom.xml +++ b/tests/spring-cloud-sleuth-instrumentation-zuul-tests/pom.xml @@ -30,7 +30,7 @@ org.springframework.cloud spring-cloud-sleuth-tests - 2.2.5.BUILD-SNAPSHOT + 2.2.6.BUILD-SNAPSHOT .. From 65eafad90e56b5d937a16cf2da4b92e74a9e3aad Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Sat, 12 Sep 2020 16:29:52 +0800 Subject: [PATCH 6/6] Updates to lates Brave (#1736) Notably, this fixes a missing localEndpoint.ip field --- benchmarks/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-sleuth-dependencies/pom.xml | 2 +- .../ITSpringConfiguredReactorClient.java | 20 +++++++++++++++---- .../ReactorNettyHttpClientBraveTests.java | 20 ++++++++++++------- .../web/client/WebClientBraveTests.java | 20 ++++++++++++------- 6 files changed, 45 insertions(+), 21 deletions(-) diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index a42087ab1..a8c1d7b9d 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -33,7 +33,7 @@ 1.8 1.8 2.3.3.RELEASE - 5.12.3 + 5.12.6 3.14.6 diff --git a/pom.xml b/pom.xml index 318629b8b..69692c270 100644 --- a/pom.xml +++ b/pom.xml @@ -257,7 +257,7 @@ Horsham.SR8 2.2.6.BUILD-SNAPSHOT 2.2.6.BUILD-SNAPSHOT - 5.12.3 + 5.12.6 2.1.7.RELEASE 2.2.5.BUILD-SNAPSHOT false diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index 6bff54e45..7b7251b96 100644 --- a/spring-cloud-sleuth-dependencies/pom.xml +++ b/spring-cloud-sleuth-dependencies/pom.xml @@ -31,7 +31,7 @@ spring-cloud-sleuth-dependencies Spring Cloud Sleuth Dependencies - 5.12.3 + 5.12.6 0.37.2 3.4.1 diff --git a/tests/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/ITSpringConfiguredReactorClient.java b/tests/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/ITSpringConfiguredReactorClient.java index 0b9f3879a..6284afea5 100644 --- a/tests/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/ITSpringConfiguredReactorClient.java +++ b/tests/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/ITSpringConfiguredReactorClient.java @@ -93,6 +93,12 @@ abstract class ITSpringConfiguredReactorClient getMono(context, pathIncludingQuery).block(); } + @Override + final protected void options(AnnotationConfigApplicationContext context, + String path) { + optionsMono(context, path).block(); + } + @Override final protected void post(AnnotationConfigApplicationContext context, String pathIncludingQuery, String body) { @@ -105,14 +111,20 @@ abstract class ITSpringConfiguredReactorClient TestHttpCallbackSubscriber.subscribe(getMono(context, path), callback); } - /** Returns a {@link Mono} of the HTTP status code from the given "POST" request. */ - abstract Mono postMono(AnnotationConfigApplicationContext context, - String pathIncludingQuery, String body); - /** Returns a {@link Mono} of the HTTP status code. */ abstract Mono getMono(AnnotationConfigApplicationContext context, String pathIncludingQuery); + /** + * Returns a {@link Mono} of the HTTP status code from the given "OPTIONS" request. + */ + abstract Mono optionsMono(AnnotationConfigApplicationContext context, + String path); + + /** Returns a {@link Mono} of the HTTP status code from the given "POST" request. */ + abstract Mono postMono(AnnotationConfigApplicationContext context, + String pathIncludingQuery, String body); + /** * This assumes that implementations do not issue an HTTP request until * {@link Subscription#request(long)} is called. Since a client span is only for diff --git a/tests/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/ReactorNettyHttpClientBraveTests.java b/tests/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/ReactorNettyHttpClientBraveTests.java index cc2230da7..5a499ce09 100644 --- a/tests/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/ReactorNettyHttpClientBraveTests.java +++ b/tests/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/ReactorNettyHttpClientBraveTests.java @@ -70,6 +70,19 @@ public class ReactorNettyHttpClientBraveTests extends ITSpringConfiguredReactorC super(HttpClientBeanPostProcessor.class); } + @Override + Mono getMono(AnnotationConfigApplicationContext context, + String pathIncludingQuery) { + return context.getBean(HttpClient.class).get().uri(pathIncludingQuery).response() + .map(r -> r.status().code()); + } + + @Override + Mono optionsMono(AnnotationConfigApplicationContext context, String path) { + return context.getBean(HttpClient.class).options().uri(path).response() + .map(r -> r.status().code()); + } + @Override Mono postMono(AnnotationConfigApplicationContext context, String pathIncludingQuery, String body) { @@ -78,11 +91,4 @@ public class ReactorNettyHttpClientBraveTests extends ITSpringConfiguredReactorC .response().map(r -> r.status().code()); } - @Override - Mono getMono(AnnotationConfigApplicationContext context, - String pathIncludingQuery) { - return context.getBean(HttpClient.class).get().uri(pathIncludingQuery).response() - .map(r -> r.status().code()); - } - } diff --git a/tests/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/WebClientBraveTests.java b/tests/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/WebClientBraveTests.java index 9e8bf29f8..529f6b820 100644 --- a/tests/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/WebClientBraveTests.java +++ b/tests/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/WebClientBraveTests.java @@ -52,6 +52,19 @@ public class WebClientBraveTests extends ITSpringConfiguredReactorClient { TraceWebClientBeanPostProcessor.class); } + @Override + Mono getMono(AnnotationConfigApplicationContext context, + String pathIncludingQuery) { + return context.getBean(WebClient.Builder.class).build().get() + .uri(pathIncludingQuery).exchange().map(ClientResponse::rawStatusCode); + } + + @Override + Mono optionsMono(AnnotationConfigApplicationContext context, String path) { + return context.getBean(WebClient.Builder.class).build().options().uri(path) + .exchange().map(ClientResponse::rawStatusCode); + } + @Override Mono postMono(AnnotationConfigApplicationContext context, String pathIncludingQuery, String body) { @@ -60,13 +73,6 @@ public class WebClientBraveTests extends ITSpringConfiguredReactorClient { .map(ClientResponse::rawStatusCode); } - @Override - Mono getMono(AnnotationConfigApplicationContext context, - String pathIncludingQuery) { - return context.getBean(WebClient.Builder.class).build().get() - .uri(pathIncludingQuery).exchange().map(ClientResponse::rawStatusCode); - } - @Test @Ignore("WebClient is blind to the implementation of redirects") @Override