From c811f68e13b8817862b8acb44974d880cd66a648 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Wed, 7 Feb 2018 16:30:57 -0500 Subject: [PATCH 1/8] using latest spring cloud build --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 91f8af857..36fbf098f 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 1.3.6.BUILD-SNAPSHOT + 1.3.8.BUILD-SNAPSHOT From c8e8c978a344a29898c36d99e6bd725c91cf510e Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Wed, 7 Feb 2018 16:31:32 -0500 Subject: [PATCH 2/8] using latest spring-cloud-dependencies-parent --- spring-cloud-sleuth-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index 0a3c1867b..4a134d3ac 100644 --- a/spring-cloud-sleuth-dependencies/pom.xml +++ b/spring-cloud-sleuth-dependencies/pom.xml @@ -5,7 +5,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.3.6.BUILD-SNAPSHOT + 1.3.8.BUILD-SNAPSHOT spring-cloud-sleuth-dependencies From 7115086fc195e0f582d5f56d5d9fa5519191ed19 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 8 Feb 2018 18:44:48 +0000 Subject: [PATCH 3/8] Update SNAPSHOT to 1.3.2.RELEASE --- README.adoc | 7 ++++--- benchmarks/pom.xml | 2 +- docs/pom.xml | 2 +- pom.xml | 12 ++++++------ spring-cloud-sleuth-core/pom.xml | 2 +- spring-cloud-sleuth-dependencies/pom.xml | 4 ++-- spring-cloud-sleuth-reactor/pom.xml | 2 +- spring-cloud-sleuth-samples/pom.xml | 2 +- .../spring-cloud-sleuth-sample-feign/pom.xml | 2 +- .../spring-cloud-sleuth-sample-messaging/pom.xml | 2 +- .../spring-cloud-sleuth-sample-ribbon/pom.xml | 2 +- .../spring-cloud-sleuth-sample-test-core/pom.xml | 2 +- .../spring-cloud-sleuth-sample-websocket/pom.xml | 2 +- .../spring-cloud-sleuth-sample-zipkin/pom.xml | 2 +- .../spring-cloud-sleuth-sample/pom.xml | 2 +- spring-cloud-sleuth-stream/pom.xml | 2 +- spring-cloud-sleuth-zipkin-legacy/pom.xml | 2 +- spring-cloud-sleuth-zipkin-stream/pom.xml | 2 +- spring-cloud-sleuth-zipkin/pom.xml | 2 +- spring-cloud-starter-sleuth/pom.xml | 2 +- spring-cloud-starter-zipkin-legacy/pom.xml | 2 +- spring-cloud-starter-zipkin/pom.xml | 2 +- 22 files changed, 31 insertions(+), 30 deletions(-) diff --git a/README.adoc b/README.adoc index 93ed92af2..2739562d0 100644 --- a/README.adoc +++ b/README.adoc @@ -322,9 +322,10 @@ Example of setting baggage on a span: [source,java] ---- -Span initialSpan = this.tracer.createSpan("span"); -initialSpan.setBaggageItem("foo", "bar"); -initialSpan.setBaggageItem("UPPER_CASE", "someValue"); +Span initialSpan = this.tracer.nextSpan().name("span").start(); +try (Tracer.SpanInScope ws = this.tracer.withSpanInScope(initialSpan)) { + ExtraFieldPropagation.set("foo", "bar"); + ExtraFieldPropagation.set("UPPER_CASE", "someValue"); ---- ===== Baggage vs. Span Tags diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index b65c4b8f1..faca8b253 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -17,7 +17,7 @@ Benchmarks Benchmarks (JMH) org.springframework.cloud - 1.3.2.BUILD-SNAPSHOT + 1.3.2.RELEASE benchmarks diff --git a/docs/pom.xml b/docs/pom.xml index 2f598275d..32b1f8720 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.BUILD-SNAPSHOT + 1.3.2.RELEASE spring-cloud-sleuth-docs pom diff --git a/pom.xml b/pom.xml index 36fbf098f..2b0955faf 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-sleuth - 1.3.2.BUILD-SNAPSHOT + 1.3.2.RELEASE pom Spring Cloud Sleuth Spring Cloud Sleuth @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 1.3.8.BUILD-SNAPSHOT + 1.3.8.RELEASE @@ -241,10 +241,10 @@ 1.8 2.19.1 2.17 - 1.3.7.BUILD-SNAPSHOT - 1.3.1.BUILD-SNAPSHOT - Ditmars.BUILD-SNAPSHOT - 1.4.2.BUILD-SNAPSHOT + 1.3.8.RELEASE + 1.3.2.RELEASE + Ditmars.SR3 + 1.4.3.RELEASE 3.1.0.RELEASE 1.0.0 diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml index 205a77dae..93c1b6455 100644 --- a/spring-cloud-sleuth-core/pom.xml +++ b/spring-cloud-sleuth-core/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.BUILD-SNAPSHOT + 1.3.2.RELEASE .. diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index 4a134d3ac..c4632f47f 100644 --- a/spring-cloud-sleuth-dependencies/pom.xml +++ b/spring-cloud-sleuth-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.3.8.BUILD-SNAPSHOT + 1.3.8.RELEASE spring-cloud-sleuth-dependencies - 1.3.2.BUILD-SNAPSHOT + 1.3.2.RELEASE pom spring-cloud-sleuth-dependencies Spring Cloud Sleuth Dependencies diff --git a/spring-cloud-sleuth-reactor/pom.xml b/spring-cloud-sleuth-reactor/pom.xml index 8e4e14ca0..9f6fbaf0f 100644 --- a/spring-cloud-sleuth-reactor/pom.xml +++ b/spring-cloud-sleuth-reactor/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.BUILD-SNAPSHOT + 1.3.2.RELEASE .. diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml index 09314b5ed..aa7590f0b 100644 --- a/spring-cloud-sleuth-samples/pom.xml +++ b/spring-cloud-sleuth-samples/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.BUILD-SNAPSHOT + 1.3.2.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 1c03dc172..6852732ad 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 @@ -20,7 +20,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 1.3.2.BUILD-SNAPSHOT + 1.3.2.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 923c9ca18..1897c1b4c 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 - 1.3.2.BUILD-SNAPSHOT + 1.3.2.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 83dbdad4e..6350dc367 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 - 1.3.2.BUILD-SNAPSHOT + 1.3.2.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 ba38a2bc9..ac92b3748 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 - 1.3.2.BUILD-SNAPSHOT + 1.3.2.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 1079eb331..c61c88801 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 - 1.3.2.BUILD-SNAPSHOT + 1.3.2.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 bfee71a85..343994684 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 @@ -27,7 +27,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 1.3.2.BUILD-SNAPSHOT + 1.3.2.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 5523258d9..97fab27bb 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 - 1.3.2.BUILD-SNAPSHOT + 1.3.2.RELEASE .. diff --git a/spring-cloud-sleuth-stream/pom.xml b/spring-cloud-sleuth-stream/pom.xml index 8775a95ae..eafe725ef 100644 --- a/spring-cloud-sleuth-stream/pom.xml +++ b/spring-cloud-sleuth-stream/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.BUILD-SNAPSHOT + 1.3.2.RELEASE diff --git a/spring-cloud-sleuth-zipkin-legacy/pom.xml b/spring-cloud-sleuth-zipkin-legacy/pom.xml index c2685d0c1..e6a78ab52 100644 --- a/spring-cloud-sleuth-zipkin-legacy/pom.xml +++ b/spring-cloud-sleuth-zipkin-legacy/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.BUILD-SNAPSHOT + 1.3.2.RELEASE .. diff --git a/spring-cloud-sleuth-zipkin-stream/pom.xml b/spring-cloud-sleuth-zipkin-stream/pom.xml index 42f90c506..5318a7cb1 100644 --- a/spring-cloud-sleuth-zipkin-stream/pom.xml +++ b/spring-cloud-sleuth-zipkin-stream/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.BUILD-SNAPSHOT + 1.3.2.RELEASE diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml index 5ebe2113f..2c3c8000b 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 - 1.3.2.BUILD-SNAPSHOT + 1.3.2.RELEASE .. diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml index 648a442f6..48c57b924 100644 --- a/spring-cloud-starter-sleuth/pom.xml +++ b/spring-cloud-starter-sleuth/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.BUILD-SNAPSHOT + 1.3.2.RELEASE .. spring-cloud-starter-sleuth diff --git a/spring-cloud-starter-zipkin-legacy/pom.xml b/spring-cloud-starter-zipkin-legacy/pom.xml index 6f0744670..ac0e22ffd 100644 --- a/spring-cloud-starter-zipkin-legacy/pom.xml +++ b/spring-cloud-starter-zipkin-legacy/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.BUILD-SNAPSHOT + 1.3.2.RELEASE .. spring-cloud-starter-zipkin-legacy diff --git a/spring-cloud-starter-zipkin/pom.xml b/spring-cloud-starter-zipkin/pom.xml index 3d09bc7f2..e1cf69e4c 100644 --- a/spring-cloud-starter-zipkin/pom.xml +++ b/spring-cloud-starter-zipkin/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.BUILD-SNAPSHOT + 1.3.2.RELEASE .. spring-cloud-starter-zipkin From d27c492e6ee5cce03a534bc35aee5be8658e1099 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 8 Feb 2018 18:50:13 +0000 Subject: [PATCH 4/8] Going back to snapshots --- README.adoc | 7 +++---- benchmarks/pom.xml | 2 +- docs/pom.xml | 2 +- pom.xml | 12 ++++++------ spring-cloud-sleuth-core/pom.xml | 2 +- spring-cloud-sleuth-dependencies/pom.xml | 4 ++-- spring-cloud-sleuth-reactor/pom.xml | 2 +- spring-cloud-sleuth-samples/pom.xml | 2 +- .../spring-cloud-sleuth-sample-feign/pom.xml | 2 +- .../spring-cloud-sleuth-sample-messaging/pom.xml | 2 +- .../spring-cloud-sleuth-sample-ribbon/pom.xml | 2 +- .../spring-cloud-sleuth-sample-test-core/pom.xml | 2 +- .../spring-cloud-sleuth-sample-websocket/pom.xml | 2 +- .../spring-cloud-sleuth-sample-zipkin/pom.xml | 2 +- .../spring-cloud-sleuth-sample/pom.xml | 2 +- spring-cloud-sleuth-stream/pom.xml | 2 +- spring-cloud-sleuth-zipkin-legacy/pom.xml | 2 +- spring-cloud-sleuth-zipkin-stream/pom.xml | 2 +- spring-cloud-sleuth-zipkin/pom.xml | 2 +- spring-cloud-starter-sleuth/pom.xml | 2 +- spring-cloud-starter-zipkin-legacy/pom.xml | 2 +- spring-cloud-starter-zipkin/pom.xml | 2 +- 22 files changed, 30 insertions(+), 31 deletions(-) diff --git a/README.adoc b/README.adoc index 2739562d0..93ed92af2 100644 --- a/README.adoc +++ b/README.adoc @@ -322,10 +322,9 @@ Example of setting baggage on a span: [source,java] ---- -Span initialSpan = this.tracer.nextSpan().name("span").start(); -try (Tracer.SpanInScope ws = this.tracer.withSpanInScope(initialSpan)) { - ExtraFieldPropagation.set("foo", "bar"); - ExtraFieldPropagation.set("UPPER_CASE", "someValue"); +Span initialSpan = this.tracer.createSpan("span"); +initialSpan.setBaggageItem("foo", "bar"); +initialSpan.setBaggageItem("UPPER_CASE", "someValue"); ---- ===== Baggage vs. Span Tags diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index faca8b253..b65c4b8f1 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -17,7 +17,7 @@ Benchmarks Benchmarks (JMH) org.springframework.cloud - 1.3.2.RELEASE + 1.3.2.BUILD-SNAPSHOT benchmarks diff --git a/docs/pom.xml b/docs/pom.xml index 32b1f8720..2f598275d 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.RELEASE + 1.3.2.BUILD-SNAPSHOT spring-cloud-sleuth-docs pom diff --git a/pom.xml b/pom.xml index 2b0955faf..36fbf098f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-sleuth - 1.3.2.RELEASE + 1.3.2.BUILD-SNAPSHOT pom Spring Cloud Sleuth Spring Cloud Sleuth @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 1.3.8.RELEASE + 1.3.8.BUILD-SNAPSHOT @@ -241,10 +241,10 @@ 1.8 2.19.1 2.17 - 1.3.8.RELEASE - 1.3.2.RELEASE - Ditmars.SR3 - 1.4.3.RELEASE + 1.3.7.BUILD-SNAPSHOT + 1.3.1.BUILD-SNAPSHOT + Ditmars.BUILD-SNAPSHOT + 1.4.2.BUILD-SNAPSHOT 3.1.0.RELEASE 1.0.0 diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml index 93c1b6455..205a77dae 100644 --- a/spring-cloud-sleuth-core/pom.xml +++ b/spring-cloud-sleuth-core/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.RELEASE + 1.3.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index c4632f47f..4a134d3ac 100644 --- a/spring-cloud-sleuth-dependencies/pom.xml +++ b/spring-cloud-sleuth-dependencies/pom.xml @@ -5,11 +5,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.3.8.RELEASE + 1.3.8.BUILD-SNAPSHOT spring-cloud-sleuth-dependencies - 1.3.2.RELEASE + 1.3.2.BUILD-SNAPSHOT pom spring-cloud-sleuth-dependencies Spring Cloud Sleuth Dependencies diff --git a/spring-cloud-sleuth-reactor/pom.xml b/spring-cloud-sleuth-reactor/pom.xml index 9f6fbaf0f..8e4e14ca0 100644 --- a/spring-cloud-sleuth-reactor/pom.xml +++ b/spring-cloud-sleuth-reactor/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.RELEASE + 1.3.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml index aa7590f0b..09314b5ed 100644 --- a/spring-cloud-sleuth-samples/pom.xml +++ b/spring-cloud-sleuth-samples/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.RELEASE + 1.3.2.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 6852732ad..1c03dc172 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 @@ -20,7 +20,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 1.3.2.RELEASE + 1.3.2.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 1897c1b4c..923c9ca18 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 - 1.3.2.RELEASE + 1.3.2.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 6350dc367..83dbdad4e 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 - 1.3.2.RELEASE + 1.3.2.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 ac92b3748..ba38a2bc9 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 - 1.3.2.RELEASE + 1.3.2.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 c61c88801..1079eb331 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 - 1.3.2.RELEASE + 1.3.2.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 343994684..bfee71a85 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 @@ -27,7 +27,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 1.3.2.RELEASE + 1.3.2.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 97fab27bb..5523258d9 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 - 1.3.2.RELEASE + 1.3.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-stream/pom.xml b/spring-cloud-sleuth-stream/pom.xml index eafe725ef..8775a95ae 100644 --- a/spring-cloud-sleuth-stream/pom.xml +++ b/spring-cloud-sleuth-stream/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.RELEASE + 1.3.2.BUILD-SNAPSHOT diff --git a/spring-cloud-sleuth-zipkin-legacy/pom.xml b/spring-cloud-sleuth-zipkin-legacy/pom.xml index e6a78ab52..c2685d0c1 100644 --- a/spring-cloud-sleuth-zipkin-legacy/pom.xml +++ b/spring-cloud-sleuth-zipkin-legacy/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.RELEASE + 1.3.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-zipkin-stream/pom.xml b/spring-cloud-sleuth-zipkin-stream/pom.xml index 5318a7cb1..42f90c506 100644 --- a/spring-cloud-sleuth-zipkin-stream/pom.xml +++ b/spring-cloud-sleuth-zipkin-stream/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.RELEASE + 1.3.2.BUILD-SNAPSHOT diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml index 2c3c8000b..5ebe2113f 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 - 1.3.2.RELEASE + 1.3.2.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml index 48c57b924..648a442f6 100644 --- a/spring-cloud-starter-sleuth/pom.xml +++ b/spring-cloud-starter-sleuth/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.RELEASE + 1.3.2.BUILD-SNAPSHOT .. spring-cloud-starter-sleuth diff --git a/spring-cloud-starter-zipkin-legacy/pom.xml b/spring-cloud-starter-zipkin-legacy/pom.xml index ac0e22ffd..6f0744670 100644 --- a/spring-cloud-starter-zipkin-legacy/pom.xml +++ b/spring-cloud-starter-zipkin-legacy/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.RELEASE + 1.3.2.BUILD-SNAPSHOT .. spring-cloud-starter-zipkin-legacy diff --git a/spring-cloud-starter-zipkin/pom.xml b/spring-cloud-starter-zipkin/pom.xml index e1cf69e4c..3d09bc7f2 100644 --- a/spring-cloud-starter-zipkin/pom.xml +++ b/spring-cloud-starter-zipkin/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.RELEASE + 1.3.2.BUILD-SNAPSHOT .. spring-cloud-starter-zipkin From de2a4f2de0087a83c932ff2ed6eca71ba0f7d7a2 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 8 Feb 2018 18:50:14 +0000 Subject: [PATCH 5/8] Bumping versions to 1.3.3.BUILD-SNAPSHOT after release --- benchmarks/pom.xml | 2 +- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-sleuth-core/pom.xml | 2 +- spring-cloud-sleuth-dependencies/pom.xml | 2 +- spring-cloud-sleuth-reactor/pom.xml | 2 +- spring-cloud-sleuth-samples/pom.xml | 2 +- .../spring-cloud-sleuth-sample-feign/pom.xml | 2 +- .../spring-cloud-sleuth-sample-messaging/pom.xml | 2 +- .../spring-cloud-sleuth-sample-ribbon/pom.xml | 2 +- .../spring-cloud-sleuth-sample-test-core/pom.xml | 2 +- .../spring-cloud-sleuth-sample-websocket/pom.xml | 2 +- .../spring-cloud-sleuth-sample-zipkin/pom.xml | 2 +- .../spring-cloud-sleuth-sample/pom.xml | 2 +- spring-cloud-sleuth-stream/pom.xml | 2 +- spring-cloud-sleuth-zipkin-legacy/pom.xml | 2 +- spring-cloud-sleuth-zipkin-stream/pom.xml | 2 +- spring-cloud-sleuth-zipkin/pom.xml | 2 +- spring-cloud-starter-sleuth/pom.xml | 2 +- spring-cloud-starter-zipkin-legacy/pom.xml | 2 +- spring-cloud-starter-zipkin/pom.xml | 2 +- 21 files changed, 23 insertions(+), 23 deletions(-) diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index b65c4b8f1..c010f48b5 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -17,7 +17,7 @@ Benchmarks Benchmarks (JMH) org.springframework.cloud - 1.3.2.BUILD-SNAPSHOT + 1.3.3.BUILD-SNAPSHOT benchmarks diff --git a/docs/pom.xml b/docs/pom.xml index 2f598275d..81b38c812 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.BUILD-SNAPSHOT + 1.3.3.BUILD-SNAPSHOT spring-cloud-sleuth-docs pom diff --git a/pom.xml b/pom.xml index 36fbf098f..3abc1a45f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-sleuth - 1.3.2.BUILD-SNAPSHOT + 1.3.3.BUILD-SNAPSHOT pom Spring Cloud Sleuth Spring Cloud Sleuth @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 1.3.8.BUILD-SNAPSHOT + 1.3.8.RELEASE @@ -241,7 +241,7 @@ 1.8 2.19.1 2.17 - 1.3.7.BUILD-SNAPSHOT + 1.3.8.RELEASE 1.3.1.BUILD-SNAPSHOT Ditmars.BUILD-SNAPSHOT 1.4.2.BUILD-SNAPSHOT diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml index 205a77dae..ee80af6ed 100644 --- a/spring-cloud-sleuth-core/pom.xml +++ b/spring-cloud-sleuth-core/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.BUILD-SNAPSHOT + 1.3.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index 4a134d3ac..7eab3dcf2 100644 --- a/spring-cloud-sleuth-dependencies/pom.xml +++ b/spring-cloud-sleuth-dependencies/pom.xml @@ -9,7 +9,7 @@ spring-cloud-sleuth-dependencies - 1.3.2.BUILD-SNAPSHOT + 1.3.3.BUILD-SNAPSHOT pom spring-cloud-sleuth-dependencies Spring Cloud Sleuth Dependencies diff --git a/spring-cloud-sleuth-reactor/pom.xml b/spring-cloud-sleuth-reactor/pom.xml index 8e4e14ca0..7cd1516c2 100644 --- a/spring-cloud-sleuth-reactor/pom.xml +++ b/spring-cloud-sleuth-reactor/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.BUILD-SNAPSHOT + 1.3.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml index 09314b5ed..56483e410 100644 --- a/spring-cloud-sleuth-samples/pom.xml +++ b/spring-cloud-sleuth-samples/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.BUILD-SNAPSHOT + 1.3.3.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 1c03dc172..933108e2d 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 @@ -20,7 +20,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 1.3.2.BUILD-SNAPSHOT + 1.3.3.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 923c9ca18..9bd47d77d 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 - 1.3.2.BUILD-SNAPSHOT + 1.3.3.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 83dbdad4e..214454f9a 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 - 1.3.2.BUILD-SNAPSHOT + 1.3.3.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 ba38a2bc9..6fe6e82c1 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 - 1.3.2.BUILD-SNAPSHOT + 1.3.3.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 1079eb331..e6364de49 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 - 1.3.2.BUILD-SNAPSHOT + 1.3.3.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 bfee71a85..e685c49eb 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 @@ -27,7 +27,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 1.3.2.BUILD-SNAPSHOT + 1.3.3.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 5523258d9..8e8d016c1 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 - 1.3.2.BUILD-SNAPSHOT + 1.3.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-stream/pom.xml b/spring-cloud-sleuth-stream/pom.xml index 8775a95ae..45755848e 100644 --- a/spring-cloud-sleuth-stream/pom.xml +++ b/spring-cloud-sleuth-stream/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.BUILD-SNAPSHOT + 1.3.3.BUILD-SNAPSHOT diff --git a/spring-cloud-sleuth-zipkin-legacy/pom.xml b/spring-cloud-sleuth-zipkin-legacy/pom.xml index c2685d0c1..680ca1806 100644 --- a/spring-cloud-sleuth-zipkin-legacy/pom.xml +++ b/spring-cloud-sleuth-zipkin-legacy/pom.xml @@ -28,7 +28,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.BUILD-SNAPSHOT + 1.3.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-zipkin-stream/pom.xml b/spring-cloud-sleuth-zipkin-stream/pom.xml index 42f90c506..36f90b478 100644 --- a/spring-cloud-sleuth-zipkin-stream/pom.xml +++ b/spring-cloud-sleuth-zipkin-stream/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.BUILD-SNAPSHOT + 1.3.3.BUILD-SNAPSHOT diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml index 5ebe2113f..2556a882a 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 - 1.3.2.BUILD-SNAPSHOT + 1.3.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml index 648a442f6..00e135ec6 100644 --- a/spring-cloud-starter-sleuth/pom.xml +++ b/spring-cloud-starter-sleuth/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.BUILD-SNAPSHOT + 1.3.3.BUILD-SNAPSHOT .. spring-cloud-starter-sleuth diff --git a/spring-cloud-starter-zipkin-legacy/pom.xml b/spring-cloud-starter-zipkin-legacy/pom.xml index 6f0744670..3ca8d1f87 100644 --- a/spring-cloud-starter-zipkin-legacy/pom.xml +++ b/spring-cloud-starter-zipkin-legacy/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.BUILD-SNAPSHOT + 1.3.3.BUILD-SNAPSHOT .. spring-cloud-starter-zipkin-legacy diff --git a/spring-cloud-starter-zipkin/pom.xml b/spring-cloud-starter-zipkin/pom.xml index 3d09bc7f2..1824e8d22 100644 --- a/spring-cloud-starter-zipkin/pom.xml +++ b/spring-cloud-starter-zipkin/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.2.BUILD-SNAPSHOT + 1.3.3.BUILD-SNAPSHOT .. spring-cloud-starter-zipkin From 14a7af970db973583f7d1d93b1953d8d17a6faf6 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 12 Feb 2018 10:12:38 +0100 Subject: [PATCH 6/8] Updated docs and deps --- README.adoc | 4 ++-- docs/src/main/asciidoc/README.adoc | 4 ++-- docs/src/main/asciidoc/spring-cloud-sleuth.adoc | 2 +- pom.xml | 4 ++-- spring-cloud-sleuth-dependencies/pom.xml | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.adoc b/README.adoc index 93ed92af2..3fb9dba36 100644 --- a/README.adoc +++ b/README.adoc @@ -1,14 +1,14 @@ // Do not edit this file (e.g. go instead to src/main/asciidoc) :jdkversion: 1.8 -:github-tag: master +:github-tag: 1.3.x :github-repo: spring-cloud/spring-cloud-sleuth :github-raw: https://raw.githubusercontent.com/{github-repo}/{github-tag} :github-code: https://github.com/{github-repo}/tree/{github-tag} image::https://circleci.com/gh/spring-cloud/spring-cloud-sleuth.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-sleuth"] -image::https://codecov.io/gh/spring-cloud/spring-cloud-sleuth/branch/master/graph/badge.svg["codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-sleuth"] +image::https://codecov.io/gh/spring-cloud/spring-cloud-sleuth/branch/{github-tag}/graph/badge.svg["codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-sleuth"] image::https://badges.gitter.im/spring-cloud/spring-cloud-sleuth.svg[Gitter, link="https://gitter.im/spring-cloud/spring-cloud-sleuth?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"] == Spring Cloud Sleuth diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index ff97ea095..71bebe740 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -1,12 +1,12 @@ :jdkversion: 1.8 -:github-tag: master +:github-tag: 1.3.x :github-repo: spring-cloud/spring-cloud-sleuth :github-raw: https://raw.githubusercontent.com/{github-repo}/{github-tag} :github-code: https://github.com/{github-repo}/tree/{github-tag} image::https://circleci.com/gh/spring-cloud/spring-cloud-sleuth.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-sleuth"] -image::https://codecov.io/gh/spring-cloud/spring-cloud-sleuth/branch/master/graph/badge.svg["codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-sleuth"] +image::https://codecov.io/gh/spring-cloud/spring-cloud-sleuth/branch/{github-tag}/graph/badge.svg["codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-sleuth"] image::https://badges.gitter.im/spring-cloud/spring-cloud-sleuth.svg[Gitter, link="https://gitter.im/spring-cloud/spring-cloud-sleuth?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"] == Spring Cloud Sleuth diff --git a/docs/src/main/asciidoc/spring-cloud-sleuth.adoc b/docs/src/main/asciidoc/spring-cloud-sleuth.adoc index 4dd9e1563..cdab1ffda 100644 --- a/docs/src/main/asciidoc/spring-cloud-sleuth.adoc +++ b/docs/src/main/asciidoc/spring-cloud-sleuth.adoc @@ -1,4 +1,4 @@ -:github-tag: master +:github-tag: 1.3.x :github-repo: spring-cloud/spring-cloud-sleuth :github-raw: https://raw.githubusercontent.com/{github-repo}/{github-tag} :github-code: https://github.com/{github-repo}/tree/{github-tag} diff --git a/pom.xml b/pom.xml index 3abc1a45f..34c05659c 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 1.3.8.RELEASE + 1.3.9.BUILD-SNAPSHOT @@ -241,7 +241,7 @@ 1.8 2.19.1 2.17 - 1.3.8.RELEASE + 1.3.9.BUILD-SNAPSHOT 1.3.1.BUILD-SNAPSHOT Ditmars.BUILD-SNAPSHOT 1.4.2.BUILD-SNAPSHOT diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index 7eab3dcf2..b2d298ec3 100644 --- a/spring-cloud-sleuth-dependencies/pom.xml +++ b/spring-cloud-sleuth-dependencies/pom.xml @@ -5,8 +5,8 @@ spring-cloud-dependencies-parent org.springframework.cloud - 1.3.8.BUILD-SNAPSHOT - + 1.3.9.BUILD-SNAPSHOT + spring-cloud-sleuth-dependencies 1.3.3.BUILD-SNAPSHOT From e1088f5700a470aecb2a3222593a569af0bd725d Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 12 Feb 2018 11:01:20 +0100 Subject: [PATCH 7/8] Lazy rest template interceptor injection without this change there was a ciruclar dependency between rest template, rest template builder creation and instrumentation with this change, in the post construct phase we're setting values for rest template lazilly fixes gh-852 --- .../TraceWebClientAutoConfiguration.java | 22 +-- .../TraceWebClientAutoConfigurationTests.java | 126 +++++++++++++----- ...TraceWebClientUserInfoCustomizerTests.java | 63 +++++++++ .../client/integration/WebClientTests.java | 2 - 4 files changed, 171 insertions(+), 42 deletions(-) create mode 100644 spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientUserInfoCustomizerTests.java diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java index fd8ac3c84..5fa16c009 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java @@ -17,12 +17,13 @@ package org.springframework.cloud.sleuth.instrument.web.client; import java.util.ArrayList; -import java.util.Collection; import java.util.List; +import java.util.Map; import javax.annotation.PostConstruct; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; +import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.boot.autoconfigure.AutoConfigureAfter; @@ -36,9 +37,9 @@ import org.springframework.cloud.sleuth.Tracer; import org.springframework.cloud.sleuth.instrument.web.HttpSpanInjector; import org.springframework.cloud.sleuth.instrument.web.HttpTraceKeysInjector; import org.springframework.cloud.sleuth.instrument.web.TraceWebAutoConfiguration; +import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; import org.springframework.http.client.ClientHttpRequestInterceptor; import org.springframework.security.oauth2.client.OAuth2RestTemplate; @@ -71,14 +72,14 @@ public class TraceWebClientAutoConfiguration { @Configuration protected static class TraceInterceptorConfiguration { - @Autowired(required = false) - private Collection restTemplates; + @Autowired + private ApplicationContext applicationContext; @Autowired private TraceRestTemplateInterceptor traceRestTemplateInterceptor; @Bean - @Order(Ordered.HIGHEST_PRECEDENCE) + @Order RestTemplateCustomizer traceRestTemplateCustomizer() { return new RestTemplateCustomizer() { @Override public void customize(RestTemplate restTemplate) { @@ -90,11 +91,12 @@ public class TraceWebClientAutoConfiguration { @PostConstruct public void init() { - if (this.restTemplates != null) { - for (RestTemplate restTemplate : this.restTemplates) { - new RestTemplateInterceptorInjector( - this.traceRestTemplateInterceptor).inject(restTemplate); - } + Map restTemplates = BeanFactoryUtils + .beansOfTypeIncludingAncestors(this.applicationContext, + RestTemplate.class); + for (RestTemplate restTemplate : restTemplates.values()) { + new RestTemplateInterceptorInjector( + this.traceRestTemplateInterceptor).inject(restTemplate); } } } diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfigurationTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfigurationTests.java index 40e6702e1..448acbfec 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfigurationTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfigurationTests.java @@ -1,22 +1,40 @@ +/* + * Copyright 2013-2018 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.cloud.sleuth.instrument.web.client; -import org.assertj.core.api.BDDAssertions; +import java.io.IOException; +import java.util.List; + import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.ImportAutoConfiguration; -import org.springframework.boot.autoconfigure.security.oauth2.resource.UserInfoRestTemplateCustomizer; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.sleuth.autoconfig.TraceAutoConfiguration; -import org.springframework.cloud.sleuth.instrument.web.TraceHttpAutoConfiguration; -import org.springframework.cloud.sleuth.instrument.web.TraceWebAutoConfiguration; -import org.springframework.cloud.sleuth.log.SleuthLogAutoConfiguration; +import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.web.client.RestTemplateCustomizer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.security.oauth2.client.OAuth2RestTemplate; -import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails; +import org.springframework.http.HttpRequest; +import org.springframework.http.client.ClientHttpRequestExecution; +import org.springframework.http.client.ClientHttpRequestInterceptor; +import org.springframework.http.client.ClientHttpResponse; import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.web.client.RestTemplate; import static org.assertj.core.api.BDDAssertions.then; @@ -27,36 +45,84 @@ import static org.assertj.core.api.BDDAssertions.then; @SpringBootTest(classes = TraceWebClientAutoConfigurationTests.Config.class) public class TraceWebClientAutoConfigurationTests { - @Autowired Config config; - @Autowired UserInfoRestTemplateCustomizer customizer; - @Autowired TraceRestTemplateInterceptor interceptor; + @Autowired @Qualifier("firstRestTemplate") RestTemplate restTemplate; + @Autowired @Qualifier("secondRestTemplate") RestTemplate secondRestTemplate; @Test - public void should_wrap_UserInfoRestTemplateCustomizer_in_a_trace_representation() { - OAuth2ProtectedResourceDetails details = Mockito.mock(OAuth2ProtectedResourceDetails.class); - OAuth2RestTemplate template = new OAuth2RestTemplate(details); - - this.customizer.customize(template); - - then(this.config.executed).isTrue(); - then(template.getInterceptors()).contains(this.interceptor); + public void should_add_rest_template_interceptors() { + assertInterceptorsOrder(assertInterceptorsNotEmpty(this.restTemplate)); + assertInterceptorsOrder(assertInterceptorsNotEmpty(this.secondRestTemplate)); } + private List assertInterceptorsNotEmpty(RestTemplate restTemplate) { + then(restTemplate).isNotNull(); + List interceptors = restTemplate + .getInterceptors(); + then(interceptors).isNotEmpty(); + return interceptors; + } + + private void assertInterceptorsOrder( + List interceptors) { + int traceInterceptorIndex = 0; + int myInterceptorIndex = 0; + int mySecondInterceptorIndex = 0; + for (int i = 0; i < interceptors.size(); i++) { + if (interceptors.get(i) instanceof TraceRestTemplateInterceptor) { + traceInterceptorIndex = i; + } else if (interceptors.get(i) instanceof MyClientHttpRequestInterceptor) { + myInterceptorIndex = i; + } else if (interceptors.get(i) instanceof MySecondClientHttpRequestInterceptor) { + mySecondInterceptorIndex = i; + } + } + then(traceInterceptorIndex) + .isLessThan(myInterceptorIndex) + .isLessThan(mySecondInterceptorIndex); + } @Configuration - @ImportAutoConfiguration(classes = { - TraceWebClientAutoConfiguration.class, SleuthLogAutoConfiguration.class, - TraceHttpAutoConfiguration.class, TraceWebAutoConfiguration.class, TraceAutoConfiguration.class }) + @EnableAutoConfiguration static class Config { - boolean executed = false; + @Bean + @Qualifier("firstRestTemplate") + RestTemplate restTemplate(RestTemplateBuilder restTemplateBuilder) { + return restTemplateBuilder + .additionalInterceptors(new MyClientHttpRequestInterceptor()) + .build(); + } - @Bean UserInfoRestTemplateCustomizer customizer() { - return new UserInfoRestTemplateCustomizer() { - @Override public void customize(OAuth2RestTemplate template) { - Config.this.executed = true; - } + @Bean + @Qualifier("secondRestTemplate") + RestTemplate secondRestTemplate(RestTemplateBuilder restTemplateBuilder) { + return restTemplateBuilder + .additionalInterceptors(new MyClientHttpRequestInterceptor()) + .build(); + } + + @Bean + RestTemplateCustomizer myRestTemplateCustomizer() { + return restTemplate -> { + restTemplate.getInterceptors().add(0, new MySecondClientHttpRequestInterceptor()); }; } + + } +} + +class MyClientHttpRequestInterceptor implements ClientHttpRequestInterceptor { + + @Override public ClientHttpResponse intercept(HttpRequest request, byte[] body, + ClientHttpRequestExecution execution) throws IOException { + return execution.execute(request, body); + } +} + +class MySecondClientHttpRequestInterceptor implements ClientHttpRequestInterceptor { + + @Override public ClientHttpResponse intercept(HttpRequest request, byte[] body, + ClientHttpRequestExecution execution) throws IOException { + return execution.execute(request, body); } } \ No newline at end of file diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientUserInfoCustomizerTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientUserInfoCustomizerTests.java new file mode 100644 index 000000000..46ff55e2d --- /dev/null +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientUserInfoCustomizerTests.java @@ -0,0 +1,63 @@ +package org.springframework.cloud.sleuth.instrument.web.client; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mockito; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.ImportAutoConfiguration; +import org.springframework.boot.autoconfigure.security.oauth2.resource.UserInfoRestTemplateCustomizer; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.cloud.sleuth.autoconfig.TraceAutoConfiguration; +import org.springframework.cloud.sleuth.instrument.web.TraceHttpAutoConfiguration; +import org.springframework.cloud.sleuth.instrument.web.TraceWebAutoConfiguration; +import org.springframework.cloud.sleuth.log.SleuthLogAutoConfiguration; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.oauth2.client.OAuth2RestTemplate; +import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResourceDetails; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.web.client.RestTemplate; + +import static org.assertj.core.api.BDDAssertions.then; + +/** + * @author Marcin Grzejszczak + */ +@RunWith(SpringRunner.class) +@SpringBootTest(classes = TraceWebClientUserInfoCustomizerTests.Config.class) +public class TraceWebClientUserInfoCustomizerTests { + + @Autowired Config config; + @Autowired UserInfoRestTemplateCustomizer customizer; + @Autowired TraceRestTemplateInterceptor interceptor; + + @Test + public void should_wrap_UserInfoRestTemplateCustomizer_in_a_trace_representation() { + OAuth2ProtectedResourceDetails details = Mockito.mock(OAuth2ProtectedResourceDetails.class); + OAuth2RestTemplate template = new OAuth2RestTemplate(details); + + this.customizer.customize(template); + + then(this.config.executed).isTrue(); + then(template.getInterceptors()).contains(this.interceptor); + } + + + @Configuration + @ImportAutoConfiguration(classes = { + TraceWebClientAutoConfiguration.class, SleuthLogAutoConfiguration.class, + TraceHttpAutoConfiguration.class, TraceWebAutoConfiguration.class, TraceAutoConfiguration.class }) + static class Config { + + boolean executed = false; + + @Bean UserInfoRestTemplateCustomizer customizer() { + return new UserInfoRestTemplateCustomizer() { + @Override public void customize(OAuth2RestTemplate template) { + Config.this.executed = true; + } + }; + } + } +} \ No newline at end of file diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/integration/WebClientTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/integration/WebClientTests.java index ef3a6fc43..ca3d82ae4 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/integration/WebClientTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/integration/WebClientTests.java @@ -368,8 +368,6 @@ public class WebClientTests { @Override public void customize(RestTemplate restTemplate) { this.executed = true; - then(restTemplate.getInterceptors().get(0)).isInstanceOf( - TraceRestTemplateInterceptor.class); } public boolean isExecuted() { From d62756e3b116fa8dc818a6388043c46c773c8e69 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 12 Feb 2018 11:19:41 +0100 Subject: [PATCH 8/8] Updated tests --- .../TraceWebClientAutoConfigurationTests.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfigurationTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfigurationTests.java index 448acbfec..f49b83711 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfigurationTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfigurationTests.java @@ -17,6 +17,8 @@ package org.springframework.cloud.sleuth.instrument.web.client; import java.io.IOException; +import java.util.Arrays; +import java.util.Collections; import java.util.List; import org.junit.Test; @@ -64,9 +66,9 @@ public class TraceWebClientAutoConfigurationTests { private void assertInterceptorsOrder( List interceptors) { - int traceInterceptorIndex = 0; - int myInterceptorIndex = 0; - int mySecondInterceptorIndex = 0; + int traceInterceptorIndex = -1; + int myInterceptorIndex = -1; + int mySecondInterceptorIndex = -1; for (int i = 0; i < interceptors.size(); i++) { if (interceptors.get(i) instanceof TraceRestTemplateInterceptor) { traceInterceptorIndex = i; @@ -77,6 +79,7 @@ public class TraceWebClientAutoConfigurationTests { } } then(traceInterceptorIndex) + .isGreaterThanOrEqualTo(0) .isLessThan(myInterceptorIndex) .isLessThan(mySecondInterceptorIndex); } @@ -95,10 +98,12 @@ public class TraceWebClientAutoConfigurationTests { @Bean @Qualifier("secondRestTemplate") - RestTemplate secondRestTemplate(RestTemplateBuilder restTemplateBuilder) { - return restTemplateBuilder - .additionalInterceptors(new MyClientHttpRequestInterceptor()) - .build(); + RestTemplate secondRestTemplate() { + RestTemplate restTemplate = new RestTemplate(); + restTemplate.setInterceptors( + Arrays.asList(new MyClientHttpRequestInterceptor(), + new MySecondClientHttpRequestInterceptor())); + return restTemplate; } @Bean