Merge branch '1.3.x'

README.adoc

@@ -570,7 +570,7 @@ a baggage element then it will be sent downstream either via HTTP or messaging t
 
 * Provides a way to create / continue spans and add tags and logs via annotations.
 
-* If `spring-cloud-sleuth-zipkin` then the app will generate and collect Zipkin-compatible traces.
+* If `spring-cloud-sleuth-zipkin` is on the classpath then the app will generate and collect Zipkin-compatible traces.
 By default it sends them via HTTP to a Zipkin server on localhost (port 9411).
 Configure the location of the service using `spring.zipkin.baseUrl`.
   - If you depend on `spring-rabbit` or `spring-kafka` your app will send traces to a broker instead of http.

docs/src/main/asciidoc/features.adoc

@@ -39,7 +39,7 @@ a baggage element then it will be sent downstream either via HTTP or messaging t
 
 * Provides a way to create / continue spans and add tags and logs via annotations.
 
-* If `spring-cloud-sleuth-zipkin` then the app will generate and collect Zipkin-compatible traces.
+* If `spring-cloud-sleuth-zipkin` is on the classpath then the app will generate and collect Zipkin-compatible traces.
 By default it sends them via HTTP to a Zipkin server on localhost (port 9411).
 Configure the location of the service using `spring.zipkin.baseUrl`.
   - If you depend on `spring-rabbit` or `spring-kafka` your app will send traces to a broker instead of http.

docs/src/main/asciidoc/spring-cloud-sleuth.adoc

@@ -919,6 +919,16 @@ 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
+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`:
+
+[source,yaml]
+----
+spring.zipkin.sender.type: web
+----
+
 == Zipkin Stream Span Consumer
 
 IMPORTANT: The suggested approach is to use the Zipkin's