diff --git a/README.adoc b/README.adoc index 053bdf7a8..b73b066ff 100644 --- a/README.adoc +++ b/README.adoc @@ -123,7 +123,7 @@ That means that, if there were two spans sent to Zipkin with Server Received and Why is there a difference between the seven and four spans in this case? -* Two spans come from the `http:/start` span. It has the Server Received (`sr`) and Server Sent (`ss`) annotations. +* One span comes from the `http:/start` span. It has the Server Received (`sr`) and Server Sent (`ss`) annotations. * Two spans come from the RPC call from `service1` to `service2` to the `http:/foo` endpoint. The Client Sent (`cs`) and Client Received (`cr`) events took place on the `service1` side. Server Received (`sr`) and Server Sent (`ss`) events took place on the `service2` side. @@ -344,7 +344,6 @@ The following example shows setting baggage on a span: Span initialSpan = this.tracer.nextSpan().name("span").start(); ExtraFieldPropagation.set(initialSpan.context(), "foo", "bar"); ExtraFieldPropagation.set(initialSpan.context(), "UPPER_CASE", "someValue"); -} ---- ===== Baggage versus Span Tags diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index a2e0b91a9..287bd757e 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -22,7 +22,7 @@ Benchmarks Benchmarks (JMH) org.springframework.cloud - 2.1.0.BUILD-SNAPSHOT + 2.1.0.RC3 benchmarks @@ -33,7 +33,7 @@ true 1.8 1.8 - 2.1.0.RELEASE + 2.1.1.RELEASE 5.4.3 diff --git a/docs/pom.xml b/docs/pom.xml index 3056af1f7..fad246cfa 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -21,7 +21,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.0.BUILD-SNAPSHOT + 2.1.0.RC3 spring-cloud-sleuth-docs pom diff --git a/pom.xml b/pom.xml index e8de33455..90491b767 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 4.0.0 spring-cloud-sleuth - 2.1.0.BUILD-SNAPSHOT + 2.1.0.RC3 pom Spring Cloud Sleuth Spring Cloud Sleuth @@ -29,7 +29,7 @@ org.springframework.cloud spring-cloud-build - 2.1.0.BUILD-SNAPSHOT + 2.1.0.RC3 @@ -242,11 +242,11 @@ 1.8 1.8 1.8 - 2.1.0.BUILD-SNAPSHOT - 2.1.0.BUILD-SNAPSHOT - Fishtown.BUILD-SNAPSHOT - 2.1.0.BUILD-SNAPSHOT - 2.1.0.BUILD-SNAPSHOT + 2.1.0.RC3 + 2.1.0.RC2 + Fishtown.RC4 + 2.1.0.RC3 + 2.1.0.RC3 5.6.0 2.0.4.RELEASE diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml index 1534a4b2f..0e45a7a81 100644 --- a/spring-cloud-sleuth-core/pom.xml +++ b/spring-cloud-sleuth-core/pom.xml @@ -27,7 +27,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.0.BUILD-SNAPSHOT + 2.1.0.RC3 .. diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml index 29bcc3985..1f9444b3b 100644 --- a/spring-cloud-sleuth-dependencies/pom.xml +++ b/spring-cloud-sleuth-dependencies/pom.xml @@ -21,11 +21,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.1.0.BUILD-SNAPSHOT + 2.1.0.RC3 spring-cloud-sleuth-dependencies - 2.1.0.BUILD-SNAPSHOT + 2.1.0.RC3 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 403815415..e2ffdc4a0 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.1.0.BUILD-SNAPSHOT + 2.1.0.RC3 .. 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 481dfa076..14f6d0b5d 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 @@ -27,7 +27,7 @@ org.springframework.cloud spring-cloud-sleuth-samples - 2.1.0.BUILD-SNAPSHOT + 2.1.0.RC3 .. 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 283cef34a..1a191181f 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.1.0.BUILD-SNAPSHOT + 2.1.0.RC3 .. 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 bb06e9074..b3a3a067a 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.1.0.BUILD-SNAPSHOT + 2.1.0.RC3 .. 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 91d952916..5749a18f2 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.1.0.BUILD-SNAPSHOT + 2.1.0.RC3 .. 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 914b91e7e..88a993c11 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.1.0.BUILD-SNAPSHOT + 2.1.0.RC3 .. 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 b00f3b9a5..6e12bb923 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 - 2.1.0.BUILD-SNAPSHOT + 2.1.0.RC3 .. 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 d6efe3e81..55406a072 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.1.0.BUILD-SNAPSHOT + 2.1.0.RC3 .. diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml index 9488ceb1b..ab1b2eefa 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.1.0.BUILD-SNAPSHOT + 2.1.0.RC3 .. diff --git a/spring-cloud-starter-sleuth/pom.xml b/spring-cloud-starter-sleuth/pom.xml index 38817e4c1..8de9c8289 100644 --- a/spring-cloud-starter-sleuth/pom.xml +++ b/spring-cloud-starter-sleuth/pom.xml @@ -21,7 +21,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.0.BUILD-SNAPSHOT + 2.1.0.RC3 .. spring-cloud-starter-sleuth diff --git a/spring-cloud-starter-zipkin/pom.xml b/spring-cloud-starter-zipkin/pom.xml index 5c0b81ad2..07e915a3a 100644 --- a/spring-cloud-starter-zipkin/pom.xml +++ b/spring-cloud-starter-zipkin/pom.xml @@ -21,7 +21,7 @@ org.springframework.cloud spring-cloud-sleuth - 2.1.0.BUILD-SNAPSHOT + 2.1.0.RC3 .. spring-cloud-starter-zipkin