Going back to snapshots

This commit is contained in:
buildmaster
2018-07-31 19:36:49 +00:00
committed by Marcin Grzejszczak
parent d9e9b45f78
commit 5dbd18c583
17 changed files with 26 additions and 33 deletions

View File

@@ -492,13 +492,6 @@ dependencies { <2>
If you want to use RabbitMQ or Kafka instead of HTTP, add the `spring-rabbit` or `spring-kafka` dependency.
The default destination name is `zipkin`.
If using Kafka, you must set the property `spring.zipkin.sender.type` property accordingly:
[source,yaml]
----
spring.zipkin.sender.type: kafka
----
CAUTION: `spring-cloud-sleuth-stream` is deprecated and incompatible with these destinations.
If you want Sleuth over RabbitMQ, add the `spring-cloud-starter-zipkin` and `spring-rabbit`
@@ -604,8 +597,8 @@ Consequently, if you set a baggage element on a Span, it is sent downstream to
* If `spring-cloud-sleuth-zipkin` is on the classpath, the app generates and collects Zipkin-compatible traces.
By default, it sends them over HTTP to a Zipkin server on localhost (port 9411).
You can configure the location of the service by setting `spring.zipkin.baseUrl`.
** If you depend on `spring-rabbit`, your app sends traces to a RabbitMQ broker instead of HTTP.
** If you depend on `spring-kafka`, and set `spring.zipkin.sender.type: kafka`, your app sends traces to a Kafka broker instead of HTTP.
** If you depend on `spring-rabbit` or `spring-kafka`, your app sends traces to a broker instead of HTTP.
**
CAUTION: `spring-cloud-sleuth-stream` is deprecated and should no longer be used.

View File

@@ -22,7 +22,7 @@
<name>Benchmarks</name>
<description>Benchmarks (JMH)</description>
<groupId>org.springframework.cloud</groupId>
<version>2.0.1.RELEASE</version>
<version>2.0.1.BUILD-SNAPSHOT</version>
<artifactId>benchmarks</artifactId>
<properties>
@@ -33,7 +33,7 @@
<sonar.skip>true</sonar.skip>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<spring-boot.version>2.0.4.RELEASE</spring-boot.version>
<spring-boot.version>2.0.3.RELEASE</spring-boot.version>
</properties>
<dependencyManagement>

View File

@@ -21,7 +21,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth</artifactId>
<version>2.0.1.RELEASE</version>
<version>2.0.1.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-cloud-sleuth-docs</artifactId>
<packaging>pom</packaging>

14
pom.xml
View File

@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-sleuth</artifactId>
<version>2.0.1.RELEASE</version>
<version>2.0.1.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Spring Cloud Sleuth</name>
<description>Spring Cloud Sleuth</description>
@@ -29,7 +29,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>2.0.3.RELEASE</version>
<version>2.0.2.RELEASE</version>
<relativePath/>
<!-- lookup parent from repository -->
</parent>
@@ -268,11 +268,11 @@
<maven.compiler.testSource>1.8</maven.compiler.testSource>
<surefire.plugin.version>2.19.1</surefire.plugin.version>
<checkstyle.version>2.17</checkstyle.version>
<spring-cloud-build.version>2.0.3.RELEASE</spring-cloud-build.version>
<spring-cloud-commons.version>2.0.1.RELEASE</spring-cloud-commons.version>
<spring-cloud-stream.version>Elmhurst.SR1</spring-cloud-stream.version>
<spring-cloud-netflix.version>2.0.1.RELEASE</spring-cloud-netflix.version>
<spring-cloud-openfeign.version>2.0.1.RELEASE</spring-cloud-openfeign.version>
<spring-cloud-build.version>2.0.2.RELEASE</spring-cloud-build.version>
<spring-cloud-commons.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-commons.version>
<spring-cloud-stream.version>Elmhurst.BUILD-SNAPSHOT</spring-cloud-stream.version>
<spring-cloud-netflix.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
<spring-cloud-openfeign.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-openfeign.version>
<brave.version>5.1.4</brave.version>
<spring-security-boot-autoconfigure.version>2.0.0.RELEASE</spring-security-boot-autoconfigure.version>
</properties>

View File

@@ -27,7 +27,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth</artifactId>
<version>2.0.1.RELEASE</version>
<version>2.0.1.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -21,11 +21,11 @@
<parent>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>2.0.3.RELEASE</version>
<version>2.0.2.BUILD-SNAPSHOT</version>
<relativePath/>
</parent>
<artifactId>spring-cloud-sleuth-dependencies</artifactId>
<version>2.0.1.RELEASE</version>
<version>2.0.1.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<name>spring-cloud-sleuth-dependencies</name>
<description>Spring Cloud Sleuth Dependencies</description>

View File

@@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth</artifactId>
<version>2.0.1.RELEASE</version>
<version>2.0.1.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -27,7 +27,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<version>2.0.1.RELEASE</version>
<version>2.0.1.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<version>2.0.1.RELEASE</version>
<version>2.0.1.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<version>2.0.1.RELEASE</version>
<version>2.0.1.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<version>2.0.1.RELEASE</version>
<version>2.0.1.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<version>2.0.1.RELEASE</version>
<version>2.0.1.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -27,7 +27,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<version>2.0.1.RELEASE</version>
<version>2.0.1.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth-samples</artifactId>
<version>2.0.1.RELEASE</version>
<version>2.0.1.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth</artifactId>
<version>2.0.1.RELEASE</version>
<version>2.0.1.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

View File

@@ -21,7 +21,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth</artifactId>
<version>2.0.1.RELEASE</version>
<version>2.0.1.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-starter-sleuth</artifactId>

View File

@@ -21,7 +21,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-sleuth</artifactId>
<version>2.0.1.RELEASE</version>
<version>2.0.1.BUILD-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>spring-cloud-starter-zipkin</artifactId>