From 090282d10bffcbd63cee050c1f4ebc9f7cb6e170 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 19 Jun 2018 06:32:47 +0000 Subject: [PATCH] Sync docs from master to gh-pages --- multi/multi__features.html | 3 +-- multi/multi__introduction.html | 2 +- single/spring-cloud-sleuth.html | 5 ++--- spring-cloud-sleuth.xml | 8 ++++++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/multi/multi__features.html b/multi/multi__features.html index bb44cbe90..6c2740f7c 100644 --- a/multi/multi__features.html +++ b/multi/multi__features.html @@ -11,8 +11,7 @@ To that end, Sleuth:

[Caution]Caution

spring-cloud-sleuth-stream is deprecated and should no longer be used.

[Important]Important

If you use Zipkin, configure the probability of spans exported by setting spring.sleuth.sampler.probability +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.
[Caution]Caution

spring-cloud-sleuth-stream is deprecated and should no longer be used.

[Important]Important

If you use Zipkin, configure the probability of spans exported by setting spring.sleuth.sampler.probability (default: 0.1, which is 10 percent). Otherwise, you might think that Sleuth is not working be cause it omits some spans.

[Note]Note

The SLF4J MDC is always set and logback users immediately see the trace and span IDs in logs per the example shown earlier. Other logging systems have to configure their own formatter to get the same result. diff --git a/multi/multi__introduction.html b/multi/multi__introduction.html index 6567cbe6e..081976882 100644 --- a/multi/multi__introduction.html +++ b/multi/multi__introduction.html @@ -210,7 +210,7 @@ dependencies { "org.springframework.cloud:spring-cloud-starter-zipkin" }

1

We recommend that you add the dependency management through the Spring BOM so that you need not manage versions yourself.

2

Add the dependency to spring-cloud-starter-zipkin.

1.3.3 Sleuth with Zipkin over RabbitMQ or Kafka

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.

[Caution]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 +The default destination name is zipkin.

If using Kafka, you must set the property spring.zipkin.sender.type property accordingly:

spring.zipkin.sender.type: kafka
[Caution]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 dependencies.

The following example shows how to do so for Gradle:

Maven.  

<dependencyManagement> 1
       <dependencies>
diff --git a/single/spring-cloud-sleuth.html b/single/spring-cloud-sleuth.html
index 4b6591e16..ccd9440e6 100644
--- a/single/spring-cloud-sleuth.html
+++ b/single/spring-cloud-sleuth.html
@@ -210,7 +210,7 @@ dependencies { "org.springframework.cloud:spring-cloud-starter-zipkin"
 }

1

We recommend that you add the dependency management through the Spring BOM so that you need not manage versions yourself.

2

Add the dependency to spring-cloud-starter-zipkin.

1.3.3 Sleuth with Zipkin over RabbitMQ or Kafka

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.

[Caution]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 +The default destination name is zipkin.

If using Kafka, you must set the property spring.zipkin.sender.type property accordingly:

spring.zipkin.sender.type: kafka
[Caution]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 dependencies.

The following example shows how to do so for Gradle:

Maven.  

<dependencyManagement> 1
       <dependencies>
@@ -255,8 +255,7 @@ To that end, Sleuth:
  • Sleuth can propagate context (also known as baggage) between processes.
 Consequently, if you set  a baggage element on a Span, it is sent downstream to other processes over either HTTP or messaging.
  • Provides a way to create or continue spans and add tags and logs through annotations.
  • 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.
-**
[Caution]Caution
spring-cloud-sleuth-stream is deprecated and should no longer be used.
[Important]Important
If you use Zipkin, configure the probability of spans exported by setting spring.sleuth.sampler.probability
+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.
[Caution]Caution
spring-cloud-sleuth-stream is deprecated and should no longer be used.
[Important]Important
If you use Zipkin, configure the probability of spans exported by setting spring.sleuth.sampler.probability
 (default: 0.1, which is 10 percent). Otherwise, you might think that Sleuth is not working be cause it omits some spans.
[Note]Note
The SLF4J MDC is always set and logback users immediately see the trace and span IDs in logs per the example
 shown earlier.
 Other logging systems have to configure their own formatter to get the same result.
diff --git a/spring-cloud-sleuth.xml b/spring-cloud-sleuth.xml
index 2c80e127b..087a7a567 100644
--- a/spring-cloud-sleuth.xml
+++ b/spring-cloud-sleuth.xml
@@ -531,6 +531,8 @@ dependencies { 
 Sleuth with Zipkin over RabbitMQ or Kafka
 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:
+spring.zipkin.sender.type: kafka
 
 spring-cloud-sleuth-stream is deprecated and incompatible with these destinations.
 
@@ -680,8 +682,10 @@ 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.