From 9879c425a68be4cc42a2acc8ab373192b24043c0 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 31 Aug 2018 10:09:06 +0200 Subject: [PATCH 1/2] Fixed links to docs --- README.adoc | 2 +- docs/src/main/asciidoc/README.adoc | 2 +- docs/src/main/asciidoc/spring-cloud-sleuth.adoc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.adoc b/README.adoc index adacc869c..d9ef40021 100644 --- a/README.adoc +++ b/README.adoc @@ -1,7 +1,7 @@ // Do not edit this file (e.g. go instead to src/main/asciidoc) :jdkversion: 1.8 -:github-tag: master +:github-tag: 2.0.x :github-repo: spring-cloud/spring-cloud-sleuth :github-raw: https://raw.githubusercontent.com/{github-repo}/{github-tag} diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index 49495a245..475a5aa33 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -1,5 +1,5 @@ :jdkversion: 1.8 -:github-tag: master +:github-tag: 2.0.x :github-repo: spring-cloud/spring-cloud-sleuth :github-raw: https://raw.githubusercontent.com/{github-repo}/{github-tag} diff --git a/docs/src/main/asciidoc/spring-cloud-sleuth.adoc b/docs/src/main/asciidoc/spring-cloud-sleuth.adoc index df96a755b..ee66bc2ae 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: 2.0.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} From 1036607d87ebaf4bd30b78e2347bd98a6f7f1df7 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 31 Aug 2018 10:09:37 +0200 Subject: [PATCH 2/2] Fixed links to docs --- README.adoc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index d9ef40021..9be4bba64 100644 --- a/README.adoc +++ b/README.adoc @@ -492,6 +492,13 @@ 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` @@ -597,8 +604,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` or `spring-kafka`, your app sends traces to a broker instead of HTTP. -** +** 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. CAUTION: `spring-cloud-sleuth-stream` is deprecated and should no longer be used.