From 2765d4d2335a64ef11fdba85f865b8a21695c97d Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 23 May 2018 08:25:06 +0000 Subject: [PATCH] Sync docs from master to gh-pages --- multi/multi__sending_spans_to_zipkin.html | 3 +-- single/spring-cloud-sleuth.html | 3 +-- spring-cloud-sleuth.xml | 4 ---- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/multi/multi__sending_spans_to_zipkin.html b/multi/multi__sending_spans_to_zipkin.html index 7a499485f..d302fee54 100644 --- a/multi/multi__sending_spans_to_zipkin.html +++ b/multi/multi__sending_spans_to_zipkin.html @@ -8,8 +8,7 @@ that you can set up the load balancing configuration e.g. via Ribbon.

  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 so, set web, rabbit, or kafka to the spring.zipkin.sender.type property. -The following example shows setting the sender type for web:

spring.zipkin.sender.type: web
[Important]Important

If you have Kafka on the classpath, you need to set -spring.zipkin.kafka.enabled to true apart from setting the sender type.

To customize the RestTemplate that sends spans to Zipkin via HTTP, you can register +The following example shows setting the sender type for web:

spring.zipkin.sender.type: web

To customize the RestTemplate that sends spans to Zipkin via HTTP, you can register the ZipkinRestTemplateCustomizer bean.

@Configuration
 class MyConfig {
 	@Bean ZipkinRestTemplateCustomizer myCustomizer() {
diff --git a/single/spring-cloud-sleuth.html b/single/spring-cloud-sleuth.html
index 05489272c..50ea53105 100644
--- a/single/spring-cloud-sleuth.html
+++ b/single/spring-cloud-sleuth.html
@@ -671,8 +671,7 @@ that you can set up the load balancing configuration e.g. via Ribbon.
  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 so, set web, rabbit, or kafka to the spring.zipkin.sender.type property.
-The following example shows setting the sender type for web:
spring.zipkin.sender.type: web
[Important]Important
If you have Kafka on the classpath, you need to set
-spring.zipkin.kafka.enabled to true apart from setting the sender type.
To customize the RestTemplate that sends spans to Zipkin via HTTP, you can register
+The following example shows setting the sender type for web:
spring.zipkin.sender.type: web
To customize the RestTemplate that sends spans to Zipkin via HTTP, you can register
 the ZipkinRestTemplateCustomizer bean.
@Configuration
 class MyConfig {
 	@Bean ZipkinRestTemplateCustomizer myCustomizer() {
diff --git a/spring-cloud-sleuth.xml b/spring-cloud-sleuth.xml
index ecb98ad24..2197742ba 100644
--- a/spring-cloud-sleuth.xml
+++ b/spring-cloud-sleuth.xml
@@ -1503,10 +1503,6 @@ that you can set up the load balancing configuration e.g. via Ribbon.
 To do so, set web, rabbit, or kafka to the spring.zipkin.sender.type property.
 The following example shows setting the sender type for web:
 spring.zipkin.sender.type: web
-
-If you have Kafka on the classpath, you need to set
-spring.zipkin.kafka.enabled to true apart from setting the sender type.
-
 To customize the RestTemplate that sends spans to Zipkin via HTTP, you can register
 the ZipkinRestTemplateCustomizer bean.
 @Configuration