From eb34bfbedb0dc43780db49a918415aa256940143 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Wed, 14 Mar 2018 20:12:23 +0800 Subject: [PATCH 1/7] Adds test to make sure RestTemplate sender doesn't mess with json There was some doubt on gitter about sleuth generating spans with floating-point rendered timestamps. While this shouldn't break people we certainly shouldn't create json like this. This was presumed to be caused by sleuth's rest template sender by @mojsha who was trying Jaeger. Jaeger's parser doesn't give any errors with a 400. ```json [ { "traceId": "a65dac9d8bbb57f8", "parentId": "a65dac9d8bbb57f8", "id": "f223bb97e1eba9b2", "kind": "SERVER", "name": "https:\/hello3", "timestamp": 1.521027116604e+15, "duration": 1525, "localEndpoint": { "serviceName": "${spring.application.name}", "ipv4": "10.128.6.98", "port": 8443 }, ``` I added a test to make sure it is not the case. --- spring-cloud-sleuth-dependencies/pom.xml | 6 ++ spring-cloud-sleuth-zipkin/pom.xml | 6 ++ .../sender/RestTemplateSenderTest.java | 56 +++++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/sender/RestTemplateSenderTest.java diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index b2d298ec3..6a08b9ac7 100644 --- a/spring-cloud-sleuth-dependencies/pom.xml +++ b/spring-cloud-sleuth-dependencies/pom.xml @@ -76,6 +76,12 @@ zipkin ${zipkin.version} + + io.zipkin.zipkin2 + zipkin + test-jar + ${zipkin.version} + io.zipkin.java zipkin-server diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml index 2556a882a..1ac93d58b 100644 --- a/spring-cloud-sleuth-zipkin/pom.xml +++ b/spring-cloud-sleuth-zipkin/pom.xml @@ -117,6 +117,12 @@ 3.9.1 test + + io.zipkin.zipkin2 + zipkin + test-jar + test + org.aspectj aspectjrt diff --git a/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/sender/RestTemplateSenderTest.java b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/sender/RestTemplateSenderTest.java new file mode 100644 index 000000000..20393ca9d --- /dev/null +++ b/spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/sender/RestTemplateSenderTest.java @@ -0,0 +1,56 @@ +/* + * 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.zipkin2.sender; + +import java.util.stream.Stream; +import okhttp3.mockwebserver.MockResponse; +import okhttp3.mockwebserver.MockWebServer; +import org.junit.Rule; +import org.junit.Test; +import org.springframework.web.client.RestTemplate; +import zipkin2.Call; +import zipkin2.Span; + +import static java.util.stream.Collectors.toList; +import static org.assertj.core.api.Assertions.assertThat; +import static zipkin2.TestObjects.CLIENT_SPAN; +import static zipkin2.TestObjects.UTF_8; +import static zipkin2.codec.SpanBytesEncoder.JSON_V2; + +public class RestTemplateSenderTest { + + @Rule public MockWebServer server = new MockWebServer(); + + String endpoint = server.url("/api/v2/spans").toString(); + RestTemplateSender sender = new RestTemplateSender(new RestTemplate(), endpoint, JSON_V2); + + /** Tests that json is not manipulated as a side-effect of using rest template. */ + @Test public void jsonIsNormal() throws Exception { + server.enqueue(new MockResponse()); + + send(CLIENT_SPAN).execute(); + + assertThat(server.takeRequest().getBody().readUtf8()) + .isEqualTo("[" + new String(JSON_V2.encode(CLIENT_SPAN), UTF_8) + "]"); + } + + Call send(Span... spans) { + return sender.sendSpans(Stream.of(spans) + .map(JSON_V2::encode) + .collect(toList())); + } +} From 91ea1e045722c1dc511164ce149e3ee41e397940 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Thu, 22 Mar 2018 23:20:18 +0800 Subject: [PATCH 2/7] Bumps zipkin versions --- spring-cloud-sleuth-dependencies/pom.xml | 6 +++--- spring-cloud-sleuth-samples/pom.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index 6a08b9ac7..3aa61e5af 100644 --- a/spring-cloud-sleuth-dependencies/pom.xml +++ b/spring-cloud-sleuth-dependencies/pom.xml @@ -14,9 +14,9 @@ spring-cloud-sleuth-dependencies Spring Cloud Sleuth Dependencies - 2.4.1 + 2.6.1 1.1.2 - 2.2.0 + 2.5.0 @@ -69,7 +69,7 @@ io.zipkin.java zipkin - 2.4.0 + 2.4.1 io.zipkin.zipkin2 diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml index 56483e410..365452ab0 100644 --- a/spring-cloud-sleuth-samples/pom.xml +++ b/spring-cloud-sleuth-samples/pom.xml @@ -57,7 +57,7 @@ io.zipkin.zipkin2 zipkin - 2.4.1 + 2.6.1 From 3b16cc6190797662cf95669404bd97300e768099 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Thu, 22 Mar 2018 23:52:00 +0800 Subject: [PATCH 3/7] Re-misaligns old zipkin version and removes internal class use --- spring-cloud-sleuth-dependencies/pom.xml | 2 +- .../cloud/sleuth/zipkin2/sender/RestTemplateSender.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index 3aa61e5af..95c043832 100644 --- a/spring-cloud-sleuth-dependencies/pom.xml +++ b/spring-cloud-sleuth-dependencies/pom.xml @@ -69,7 +69,7 @@ io.zipkin.java zipkin - 2.4.1 + 2.6.0 io.zipkin.zipkin2 diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/RestTemplateSender.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/RestTemplateSender.java index 969d74ee4..851682a40 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/RestTemplateSender.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/RestTemplateSender.java @@ -18,7 +18,6 @@ import zipkin2.codec.BytesEncoder; import zipkin2.codec.Encoding; import zipkin2.reporter.BytesMessageEncoder; import zipkin2.reporter.Sender; -import zipkin2.reporter.internal.BaseCall; import static zipkin2.codec.SpanBytesEncoder.JSON_V2; @@ -94,7 +93,7 @@ final class RestTemplateSender extends Sender { this.restTemplate.exchange(requestEntity, String.class); } - class HttpPostCall extends BaseCall { + class HttpPostCall extends Call.Base { private final byte[] message; HttpPostCall(byte[] message) { From 738aaed79726f9aea92915cfe5045847d70cdea3 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 26 Mar 2018 23:07:40 +0000 Subject: [PATCH 4/7] Update SNAPSHOT to 1.3.3.RELEASE --- 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 +- 21 files changed, 27 insertions(+), 27 deletions(-) diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index c010f48b5..3a84ffe48 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -17,7 +17,7 @@ Benchmarks Benchmarks (JMH) org.springframework.cloud - 1.3.3.BUILD-SNAPSHOT + 1.3.3.RELEASE benchmarks diff --git a/docs/pom.xml b/docs/pom.xml index 81b38c812..0509141ce 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.3.BUILD-SNAPSHOT + 1.3.3.RELEASE spring-cloud-sleuth-docs pom diff --git a/pom.xml b/pom.xml index cc305aaeb..0db32fb1f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-sleuth - 1.3.3.BUILD-SNAPSHOT + 1.3.3.RELEASE pom Spring Cloud Sleuth Spring Cloud Sleuth @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 1.3.9.BUILD-SNAPSHOT + 1.3.8.RELEASE @@ -241,10 +241,10 @@ 1.8 2.19.1 2.17 - 1.3.9.BUILD-SNAPSHOT - 1.3.3.BUILD-SNAPSHOT - Ditmars.BUILD-SNAPSHOT - 1.4.4.BUILD-SNAPSHOT + 1.3.8.RELEASE + 1.3.3.RELEASE + Ditmars.SR3 + 1.4.4.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 ee80af6ed..e4127d0dc 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.3.BUILD-SNAPSHOT + 1.3.3.RELEASE .. diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index 95c043832..94e80ac30 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.9.BUILD-SNAPSHOT + 1.3.8.RELEASE spring-cloud-sleuth-dependencies - 1.3.3.BUILD-SNAPSHOT + 1.3.3.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 7cd1516c2..f4d25d94a 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.3.BUILD-SNAPSHOT + 1.3.3.RELEASE .. diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml index 365452ab0..1a5c6061b 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.3.BUILD-SNAPSHOT + 1.3.3.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 933108e2d..5e05bbf15 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.3.BUILD-SNAPSHOT + 1.3.3.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 9bd47d77d..66a39762f 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.3.BUILD-SNAPSHOT + 1.3.3.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 214454f9a..6efadbe74 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.3.BUILD-SNAPSHOT + 1.3.3.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 6fe6e82c1..bea2d654d 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.3.BUILD-SNAPSHOT + 1.3.3.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 e6364de49..80479be0f 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.3.BUILD-SNAPSHOT + 1.3.3.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 e685c49eb..b69562e57 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.3.BUILD-SNAPSHOT + 1.3.3.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 8e8d016c1..74c3e966c 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.3.BUILD-SNAPSHOT + 1.3.3.RELEASE .. diff --git a/spring-cloud-sleuth-stream/pom.xml b/spring-cloud-sleuth-stream/pom.xml index 45755848e..cfa29cd1b 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.3.BUILD-SNAPSHOT + 1.3.3.RELEASE diff --git a/spring-cloud-sleuth-zipkin-legacy/pom.xml b/spring-cloud-sleuth-zipkin-legacy/pom.xml index 680ca1806..ef3801271 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.3.BUILD-SNAPSHOT + 1.3.3.RELEASE .. diff --git a/spring-cloud-sleuth-zipkin-stream/pom.xml b/spring-cloud-sleuth-zipkin-stream/pom.xml index 36f90b478..51c856aa6 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.3.BUILD-SNAPSHOT + 1.3.3.RELEASE diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml index 1ac93d58b..f7d0e6786 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.3.BUILD-SNAPSHOT + 1.3.3.RELEASE .. diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml index 00e135ec6..241369030 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.3.BUILD-SNAPSHOT + 1.3.3.RELEASE .. spring-cloud-starter-sleuth diff --git a/spring-cloud-starter-zipkin-legacy/pom.xml b/spring-cloud-starter-zipkin-legacy/pom.xml index 3ca8d1f87..a8be769f8 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.3.BUILD-SNAPSHOT + 1.3.3.RELEASE .. spring-cloud-starter-zipkin-legacy diff --git a/spring-cloud-starter-zipkin/pom.xml b/spring-cloud-starter-zipkin/pom.xml index 1824e8d22..b42945135 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.3.BUILD-SNAPSHOT + 1.3.3.RELEASE .. spring-cloud-starter-zipkin From fc1942e94014bf788ef09853901f6faa92db355c Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 26 Mar 2018 23:09:57 +0000 Subject: [PATCH 5/7] Going back to snapshots --- 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 +- 21 files changed, 27 insertions(+), 27 deletions(-) diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 3a84ffe48..c010f48b5 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -17,7 +17,7 @@ Benchmarks Benchmarks (JMH) org.springframework.cloud - 1.3.3.RELEASE + 1.3.3.BUILD-SNAPSHOT benchmarks diff --git a/docs/pom.xml b/docs/pom.xml index 0509141ce..81b38c812 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.3.RELEASE + 1.3.3.BUILD-SNAPSHOT spring-cloud-sleuth-docs pom diff --git a/pom.xml b/pom.xml index 0db32fb1f..cc305aaeb 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-sleuth - 1.3.3.RELEASE + 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.RELEASE + 1.3.9.BUILD-SNAPSHOT @@ -241,10 +241,10 @@ 1.8 2.19.1 2.17 - 1.3.8.RELEASE - 1.3.3.RELEASE - Ditmars.SR3 - 1.4.4.RELEASE + 1.3.9.BUILD-SNAPSHOT + 1.3.3.BUILD-SNAPSHOT + Ditmars.BUILD-SNAPSHOT + 1.4.4.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 e4127d0dc..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.3.RELEASE + 1.3.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index 94e80ac30..95c043832 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.9.BUILD-SNAPSHOT spring-cloud-sleuth-dependencies - 1.3.3.RELEASE + 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 f4d25d94a..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.3.RELEASE + 1.3.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml index 1a5c6061b..365452ab0 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.3.RELEASE + 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 5e05bbf15..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.3.RELEASE + 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 66a39762f..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.3.RELEASE + 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 6efadbe74..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.3.RELEASE + 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 bea2d654d..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.3.RELEASE + 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 80479be0f..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.3.RELEASE + 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 b69562e57..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.3.RELEASE + 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 74c3e966c..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.3.RELEASE + 1.3.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-stream/pom.xml b/spring-cloud-sleuth-stream/pom.xml index cfa29cd1b..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.3.RELEASE + 1.3.3.BUILD-SNAPSHOT diff --git a/spring-cloud-sleuth-zipkin-legacy/pom.xml b/spring-cloud-sleuth-zipkin-legacy/pom.xml index ef3801271..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.3.RELEASE + 1.3.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-zipkin-stream/pom.xml b/spring-cloud-sleuth-zipkin-stream/pom.xml index 51c856aa6..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.3.RELEASE + 1.3.3.BUILD-SNAPSHOT diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml index f7d0e6786..1ac93d58b 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.3.RELEASE + 1.3.3.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml index 241369030..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.3.RELEASE + 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 a8be769f8..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.3.RELEASE + 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 b42945135..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.3.RELEASE + 1.3.3.BUILD-SNAPSHOT .. spring-cloud-starter-zipkin From 5ed219e34fb2d7c620a722b97e883f16a271a9f9 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 26 Mar 2018 23:09:58 +0000 Subject: [PATCH 6/7] Bumping versions to 1.3.4.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 c010f48b5..3a61ca4a5 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -17,7 +17,7 @@ Benchmarks Benchmarks (JMH) org.springframework.cloud - 1.3.3.BUILD-SNAPSHOT + 1.3.4.BUILD-SNAPSHOT benchmarks diff --git a/docs/pom.xml b/docs/pom.xml index 81b38c812..4ece6d113 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-sleuth - 1.3.3.BUILD-SNAPSHOT + 1.3.4.BUILD-SNAPSHOT spring-cloud-sleuth-docs pom diff --git a/pom.xml b/pom.xml index cc305aaeb..10fef99cc 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 spring-cloud-sleuth - 1.3.3.BUILD-SNAPSHOT + 1.3.4.BUILD-SNAPSHOT pom Spring Cloud Sleuth Spring Cloud Sleuth @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-build - 1.3.9.BUILD-SNAPSHOT + 1.3.8.RELEASE @@ -241,7 +241,7 @@ 1.8 2.19.1 2.17 - 1.3.9.BUILD-SNAPSHOT + 1.3.8.RELEASE 1.3.3.BUILD-SNAPSHOT Ditmars.BUILD-SNAPSHOT 1.4.4.BUILD-SNAPSHOT diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml index ee80af6ed..c7643edaf 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.3.BUILD-SNAPSHOT + 1.3.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index 95c043832..6c05aee0a 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.3.BUILD-SNAPSHOT + 1.3.4.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 7cd1516c2..fd7c443b3 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.3.BUILD-SNAPSHOT + 1.3.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml index 365452ab0..bb2673213 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.3.BUILD-SNAPSHOT + 1.3.4.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 933108e2d..201bbf9a7 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.3.BUILD-SNAPSHOT + 1.3.4.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 9bd47d77d..bd2810519 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.3.BUILD-SNAPSHOT + 1.3.4.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 214454f9a..3e7f279bb 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.3.BUILD-SNAPSHOT + 1.3.4.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 6fe6e82c1..5098fc4b8 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.3.BUILD-SNAPSHOT + 1.3.4.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 e6364de49..82920fc8f 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.3.BUILD-SNAPSHOT + 1.3.4.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 e685c49eb..c87e1555a 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.3.BUILD-SNAPSHOT + 1.3.4.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 8e8d016c1..a6ece9b76 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.3.BUILD-SNAPSHOT + 1.3.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-stream/pom.xml b/spring-cloud-sleuth-stream/pom.xml index 45755848e..c2501ef0f 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.3.BUILD-SNAPSHOT + 1.3.4.BUILD-SNAPSHOT diff --git a/spring-cloud-sleuth-zipkin-legacy/pom.xml b/spring-cloud-sleuth-zipkin-legacy/pom.xml index 680ca1806..df2aff554 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.3.BUILD-SNAPSHOT + 1.3.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-sleuth-zipkin-stream/pom.xml b/spring-cloud-sleuth-zipkin-stream/pom.xml index 36f90b478..1c36190f6 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.3.BUILD-SNAPSHOT + 1.3.4.BUILD-SNAPSHOT diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml index 1ac93d58b..0b6dcd7b0 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.3.BUILD-SNAPSHOT + 1.3.4.BUILD-SNAPSHOT .. diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml index 00e135ec6..d7cca695e 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.3.BUILD-SNAPSHOT + 1.3.4.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 3ca8d1f87..899f83cdf 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.3.BUILD-SNAPSHOT + 1.3.4.BUILD-SNAPSHOT .. spring-cloud-starter-zipkin-legacy diff --git a/spring-cloud-starter-zipkin/pom.xml b/spring-cloud-starter-zipkin/pom.xml index 1824e8d22..16f121d89 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.3.BUILD-SNAPSHOT + 1.3.4.BUILD-SNAPSHOT .. spring-cloud-starter-zipkin From eb9b305f7f0d21d610466347f80e2df30efdbf90 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 29 Mar 2018 09:39:38 +0200 Subject: [PATCH 7/7] Added a property to toggle discovery client support for zipkin client. Fixes gh-919 --- .../src/main/asciidoc/spring-cloud-sleuth.adoc | 15 ++++++++++++++- .../cloud/sleuth/zipkin2/ZipkinProperties.java | 18 +++++++++++++++++- .../ZipkinRestTemplateSenderConfiguration.java | 3 +++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/docs/src/main/asciidoc/spring-cloud-sleuth.adoc b/docs/src/main/asciidoc/spring-cloud-sleuth.adoc index 87a4c9c4f..0f2dc64e3 100644 --- a/docs/src/main/asciidoc/spring-cloud-sleuth.adoc +++ b/docs/src/main/asciidoc/spring-cloud-sleuth.adoc @@ -518,13 +518,26 @@ spring.zipkin.baseUrl: http://192.168.99.100:9411/ ---- If you want to find Zipkin via service discovery it's enough to pass the -Zipkin's service id inside the URL (example for `zipkinserver` service id) +Zipkin's service id inside the URL. If you want to disable this feature +just set `spring.zipkin.discoveryClientEnabled` to `false. +Example for `zipkinserver` service id: [source,yaml] ---- spring.zipkin.baseUrl: http://zipkinserver/ ---- +When this Discovery Client feature is enabled, Sleuth uses +`LoadBalancerClient` to find the URL of the Zipkin Server. It means +that you can set up the load balancing configuration e.g. via Ribbon. + +[source,yaml] +---- +zipkinserver: + ribbon: + ListOfServers: host1,host2 +---- + If you have web, rabbit or kafka together on the classpath, you might need to pick the means by which you would like to send spans to zipkin. To do that just set either `web`, `rabbit` or `kafka` to the `spring.zipkin.sender.type` property. diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinProperties.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinProperties.java index 82a88791f..8f0fb5407 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinProperties.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinProperties.java @@ -28,11 +28,19 @@ import zipkin2.codec.SpanBytesEncoder; */ @ConfigurationProperties("spring.zipkin") public class ZipkinProperties { - /** URL of the zipkin query server instance. You can also provide + /** + * URL of the zipkin query server instance. You can also provide * the service id of the Zipkin server if Zipkin's registered in * service discovery (e.g. http://zipkinserver/) */ private String baseUrl = "http://localhost:9411/"; + + /** + * If set to {@code false}, will treat the {@link ZipkinProperties#baseUrl} + * as a URL always + */ + private Boolean discoveryClientEnabled; + /** * Enables sending spans to Zipkin */ @@ -68,6 +76,14 @@ public class ZipkinProperties { return this.enabled; } + public Boolean getDiscoveryClientEnabled() { + return this.discoveryClientEnabled; + } + + public void setDiscoveryClientEnabled(Boolean discoveryClientEnabled) { + this.discoveryClientEnabled = discoveryClientEnabled; + } + public int getMessageTimeout() { return this.messageTimeout; } diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfiguration.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfiguration.java index 2c5f4e376..f31aed60a 100644 --- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfiguration.java +++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfiguration.java @@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.client.loadbalancer.LoadBalancerClient; import org.springframework.cloud.sleuth.zipkin2.ZipkinLoadBalancer; @@ -42,6 +43,7 @@ class ZipkinRestTemplateSenderConfiguration { @Configuration @ConditionalOnMissingClass("org.springframework.cloud.client.loadbalancer.LoadBalancerClient") + @ConditionalOnProperty(value = "spring.zipkin.discoveryClientEnabled", havingValue = "false") static class DefaultZipkinUrlExtractorConfiguration { @Autowired(required = false) LoadBalancerClient client; @@ -58,6 +60,7 @@ class ZipkinRestTemplateSenderConfiguration { @Configuration @ConditionalOnClass(LoadBalancerClient.class) + @ConditionalOnProperty(value = "spring.zipkin.discoveryClientEnabled", havingValue = "true", matchIfMissing = true) static class DiscoveryClientZipkinUrlExtractorConfiguration { @Autowired(required = false) LoadBalancerClient client;