From 8241262837e7b03bd007334ddd3a4624372c1564 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 29 Mar 2018 07:41:46 +0000 Subject: [PATCH] Sync docs from 1.3.x to gh-pages --- 1.3.x/multi/multi__sending_spans_to_zipkin.html | 8 +++++++- 1.3.x/single/spring-cloud-sleuth.html | 8 +++++++- 1.3.x/spring-cloud-sleuth.xml | 10 +++++++++- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/1.3.x/multi/multi__sending_spans_to_zipkin.html b/1.3.x/multi/multi__sending_spans_to_zipkin.html index 79fca75f1..a73a5d731 100644 --- a/1.3.x/multi/multi__sending_spans_to_zipkin.html +++ b/1.3.x/multi/multi__sending_spans_to_zipkin.html @@ -7,7 +7,13 @@ on spring-rabbit or spring-ka when the span is closed, it will be sent to Zipkin over HTTP. The communication is asynchronous. You can configure the URL by setting the spring.zipkin.baseUrl property as follows:

spring.zipkin.baseUrl: http://192.168.99.100:9411/

If you want to find Zipkin via service discovery it’s enough to pass the -Zipkin’s service id inside the URL (example for zipkinserver service id)

spring.zipkin.baseUrl: http://zipkinserver/

If you have web, rabbit or kafka together on the classpath, you might need +Zipkin’s service id inside the URL. If you want to disable this feature +just set spring.zipkin.discoveryClientEnabled to false. +Example for `zipkinserver service id:

spring.zipkin.baseUrl: http://zipkinserver/

When this Discovery Client feature is enabled, Sleuth uses +LoadBalancerClient to find the URL of the Zipkin Server. It means +that you can set up the load balancing configuration e.g. via Ribbon.

zipkinserver:
+  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 that just set either web, rabbit or kafka to the spring.zipkin.sender.type property. Example for web:

spring.zipkin.sender.type: web
\ No newline at end of file diff --git a/1.3.x/single/spring-cloud-sleuth.html b/1.3.x/single/spring-cloud-sleuth.html index e55543f34..8834a9e15 100644 --- a/1.3.x/single/spring-cloud-sleuth.html +++ b/1.3.x/single/spring-cloud-sleuth.html @@ -570,7 +570,13 @@ on spring-rabbit or spring-ka when the span is closed, it will be sent to Zipkin over HTTP. The communication is asynchronous. You can configure the URL by setting the spring.zipkin.baseUrl property as follows:

spring.zipkin.baseUrl: http://192.168.99.100:9411/

If you want to find Zipkin via service discovery it’s enough to pass the -Zipkin’s service id inside the URL (example for zipkinserver service id)

spring.zipkin.baseUrl: http://zipkinserver/

If you have web, rabbit or kafka together on the classpath, you might need +Zipkin’s service id inside the URL. If you want to disable this feature +just set spring.zipkin.discoveryClientEnabled to false. +Example for `zipkinserver service id:

spring.zipkin.baseUrl: http://zipkinserver/

When this Discovery Client feature is enabled, Sleuth uses +LoadBalancerClient to find the URL of the Zipkin Server. It means +that you can set up the load balancing configuration e.g. via Ribbon.

zipkinserver:
+  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 that just set either web, rabbit or kafka to the spring.zipkin.sender.type property. Example for web:

spring.zipkin.sender.type: web

11. Span Data as Messages

You can accumulate and send span data over diff --git a/1.3.x/spring-cloud-sleuth.xml b/1.3.x/spring-cloud-sleuth.xml index bed38fae7..836b6d21d 100644 --- a/1.3.x/spring-cloud-sleuth.xml +++ b/1.3.x/spring-cloud-sleuth.xml @@ -1302,8 +1302,16 @@ is asynchronous. You can configure the URL by setting the spring.zipkin property as follows: spring.zipkin.baseUrl: http://192.168.99.100:9411/ If you want to find Zipkin via service discovery it’s enough to pass the -Zipkin’s service id inside the URL (example for zipkinserver service id) +Zipkin’s service id inside the URL. If you want to disable this feature +just set spring.zipkin.discoveryClientEnabled to false. +Example for `zipkinserver service id: spring.zipkin.baseUrl: http://zipkinserver/ +When this Discovery Client feature is enabled, Sleuth uses +LoadBalancerClient to find the URL of the Zipkin Server. It means +that you can set up the load balancing configuration e.g. via Ribbon. +zipkinserver: + 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 that just set either web, rabbit or kafka to the spring.zipkin.sender.type property.