diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 8dbcb7932..f8f1c14ba 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -22,7 +22,7 @@
Benchmarks
Benchmarks (JMH)
org.springframework.cloud
- 2.2.6.BUILD-SNAPSHOT
+ 2.2.6.RELEASE
benchmarks
@@ -32,7 +32,7 @@
true
1.8
1.8
- 2.3.3.RELEASE
+ 2.3.5.RELEASE
5.12.7
3.14.6
diff --git a/docs/pom.xml b/docs/pom.xml
index 3d783f038..7b938c194 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -22,7 +22,7 @@
org.springframework.cloud
spring-cloud-sleuth
- 2.2.6.BUILD-SNAPSHOT
+ 2.2.6.RELEASE
spring-cloud-sleuth-docs
pom
diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc
index 56cb52a46..ce2caa7b7 100644
--- a/docs/src/main/asciidoc/_configprops.adoc
+++ b/docs/src/main/asciidoc/_configprops.adoc
@@ -6,6 +6,11 @@
|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.
diff --git a/pom.xml b/pom.xml
index 156d48558..75efb81df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
4.0.0
spring-cloud-sleuth
- 2.2.6.BUILD-SNAPSHOT
+ 2.2.6.RELEASE
pom
Spring Cloud Sleuth
Spring Cloud Sleuth
@@ -251,15 +251,15 @@
1.8
1.8
1.8
- 2.2.6.BUILD-SNAPSHOT
- 2.2.6.BUILD-SNAPSHOT
+ 2.2.6.RELEASE
+ 2.2.6.RELEASE
1.0.4.RELEASE
- Horsham.SR8
- 2.2.6.BUILD-SNAPSHOT
- 2.2.6.BUILD-SNAPSHOT
+ Horsham.SR9
+ 2.2.6.RELEASE
+ 2.2.6.RELEASE
5.12.7
2.1.7.RELEASE
- 2.2.5.BUILD-SNAPSHOT
+ 2.2.5.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 7ecb7c237..b1116e8bf 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.6.BUILD-SNAPSHOT
+ 2.2.6.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..2cffdb63f
--- /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.6.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.7
+
+
+
+
+ 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 3d0327fe8..dc5afe6fd 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.6.BUILD-SNAPSHOT
+ 2.2.6.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 cb00891eb..fb6a56d99 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.6.BUILD-SNAPSHOT
+ 2.2.6.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 5e5dc5dfb..e8ab14deb 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.6.BUILD-SNAPSHOT
+ 2.2.6.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 34bf60566..763607cd0 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.6.BUILD-SNAPSHOT
+ 2.2.6.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 0b963a3df..e4ae05764 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.6.BUILD-SNAPSHOT
+ 2.2.6.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 540b2c8c1..64adebc64 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.6.BUILD-SNAPSHOT
+ 2.2.6.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 7f83c94e1..6602b2128 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.6.BUILD-SNAPSHOT
+ 2.2.6.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 d18a64d72..4b1f207c5 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.6.BUILD-SNAPSHOT
+ 2.2.6.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 5674a92f0..83bbd317a 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.6.BUILD-SNAPSHOT
+ 2.2.6.RELEASE
..
diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml
index 2197d2641..0338a0c03 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.6.BUILD-SNAPSHOT
+ 2.2.6.RELEASE
..
diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml
index d2d195754..125d1eace 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.6.BUILD-SNAPSHOT
+ 2.2.6.RELEASE
..
spring-cloud-starter-sleuth
diff --git a/spring-cloud-starter-zipkin/pom.xml b/spring-cloud-starter-zipkin/pom.xml
index 51e5cfa36..0989af4d3 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.6.BUILD-SNAPSHOT
+ 2.2.6.RELEASE
..
spring-cloud-starter-zipkin
diff --git a/tests/pom.xml b/tests/pom.xml
index 22680bbe1..339fcd9eb 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -30,7 +30,7 @@
org.springframework.cloud
spring-cloud-sleuth
- 2.2.6.BUILD-SNAPSHOT
+ 2.2.6.RELEASE
..
diff --git a/tests/spring-cloud-sleuth-instrumentation-async-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-async-tests/pom.xml
index 714983fee..3af13d30a 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.6.BUILD-SNAPSHOT
+ 2.2.6.RELEASE
..
diff --git a/tests/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-feign-tests/pom.xml
index 81a3a0fa6..57a3ca6e8 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.6.BUILD-SNAPSHOT
+ 2.2.6.RELEASE
..
diff --git a/tests/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-grpc-tests/pom.xml
index d77334bd8..98747e282 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.6.BUILD-SNAPSHOT
+ 2.2.6.RELEASE
..
diff --git a/tests/spring-cloud-sleuth-instrumentation-hystrix-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-hystrix-tests/pom.xml
index e644a4dfa..c8bc07822 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.6.BUILD-SNAPSHOT
+ 2.2.6.RELEASE
..
diff --git a/tests/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-lettuce-tests/pom.xml
index 41e4e3571..571762780 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.6.BUILD-SNAPSHOT
+ 2.2.6.RELEASE
..
diff --git a/tests/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-messaging-tests/pom.xml
index 91d4ba1c3..7f523a5f1 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.6.BUILD-SNAPSHOT
+ 2.2.6.RELEASE
..
diff --git a/tests/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-mvc-tests/pom.xml
index 21407a23b..bef09f7b7 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.6.BUILD-SNAPSHOT
+ 2.2.6.RELEASE
..
diff --git a/tests/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-reactor-tests/pom.xml
index 045d85914..40926411a 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.6.BUILD-SNAPSHOT
+ 2.2.6.RELEASE
..
diff --git a/tests/spring-cloud-sleuth-instrumentation-rpc-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-rpc-tests/pom.xml
index 12d575425..b01e62f9e 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.6.BUILD-SNAPSHOT
+ 2.2.6.RELEASE
..
diff --git a/tests/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-rxjava-tests/pom.xml
index 8079313cc..29416cdcb 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.6.BUILD-SNAPSHOT
+ 2.2.6.RELEASE
..
diff --git a/tests/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-scheduling-tests/pom.xml
index b4d2c6588..f1e9978f6 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.6.BUILD-SNAPSHOT
+ 2.2.6.RELEASE
..
diff --git a/tests/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-webflux-tests/pom.xml
index 8fa11e523..d558acfa2 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.6.BUILD-SNAPSHOT
+ 2.2.6.RELEASE
..
diff --git a/tests/spring-cloud-sleuth-instrumentation-zuul-tests/pom.xml b/tests/spring-cloud-sleuth-instrumentation-zuul-tests/pom.xml
index d40736aee..8c0e573b2 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.6.BUILD-SNAPSHOT
+ 2.2.6.RELEASE
..