Merge branch '2.2.x'

docs/src/main/asciidoc/_configprops.adoc

@@ -40,7 +40,7 @@
 |spring.sleuth.sampler.probability |  | Probability of requests that should be sampled. E.g. 1.0 - 100% requests should be sampled. The precision is whole-numbers only (i.e. there's no support for 0.1% of the traces).
 |spring.sleuth.sampler.rate | 10 | A rate per second can be a nice choice for low-traffic endpoints as it allows you surge protection. For example, you may never expect the endpoint to get more than 50 requests per second. If there was a sudden surge of traffic, to 5000 requests per second, you would still end up with 50 traces per second. Conversely, if you had a percentage, like 10%, the same surge would end up with 500 traces per second, possibly overloading your storage. Amazon X-Ray includes a rate-limited sampler (named Reservoir) for this purpose. Brave has taken the same approach via the {@link brave.sampler.RateLimitingSampler}.
 |spring.sleuth.scheduled.enabled | true | Enable tracing for {@link org.springframework.scheduling.annotation.Scheduled}.
-|spring.sleuth.scheduled.skip-pattern | org.springframework.cloud.netflix.hystrix.stream.HystrixStreamTask | Pattern for the fully qualified name of a class that should be skipped.
+|spring.sleuth.scheduled.skip-pattern | | Pattern for the fully qualified name of a class that should be skipped.
 |spring.sleuth.supports-join | true | True means the tracing system supports sharing a span ID between a client and server.
 |spring.sleuth.trace-id128 | false | When true, generate 128-bit trace IDs instead of 64-bit ones.
 |spring.sleuth.web.additional-skip-pattern |  | Additional pattern for URLs that should be skipped in tracing. This will be appended to the {@link SleuthWebProperties#skipPattern}.
@@ -52,7 +52,6 @@
 |spring.sleuth.web.filter-order |  | Order in which the tracing filters should be registered. Defaults to {@link TraceHttpAutoConfiguration#TRACING_FILTER_ORDER}.
 |spring.sleuth.web.ignore-auto-configured-skip-patterns | false | If set to true, auto-configured skip patterns will be ignored. @see TraceWebAutoConfiguration
 |spring.sleuth.web.skip-pattern | /api-docs.*\|/swagger.*\|.*\.png\|.*\.css\|.*\.js\|.*\.html\|/favicon.ico\|/hystrix.stream | Pattern for URLs that should be skipped in tracing.
-|spring.sleuth.zuul.enabled | true | Enable span information propagation when using Zuul.
 |spring.zipkin.activemq.message-max-bytes | 100000 | Maximum number of bytes for a given message with spans sent to Zipkin over ActiveMQ.
 |spring.zipkin.activemq.queue | zipkin | Name of the ActiveMQ queue where spans should be sent to Zipkin.
 |spring.zipkin.base-url | http://localhost:9411/ | URL of the zipkin query server instance. You can also provide the service id of the Zipkin server if Zipkin's registered in service discovery (e.g. https://zipkinserver/).

docs/src/main/asciidoc/features.adoc

@@ -32,7 +32,7 @@ To that end, Sleuth:
 ** Includes a sampling policy to manage volume.
 ** Can report to a Zipkin system for query and visualization.
 
-* Instruments common ingress and egress points from Spring applications (servlet filter, async endpoints, rest template, scheduled actions, message channels, Zuul filters, and Feign client).
+* Instruments common ingress and egress points from Spring applications (servlet filter, async endpoints, rest template, scheduled actions, message channels, and Feign client).
 
 * Sleuth includes default logic to join a trace across HTTP or messaging boundaries.
 For example, HTTP propagation works over Zipkin-compatible request headers.

docs/src/main/asciidoc/sagan-index.adoc

@@ -8,5 +8,5 @@ Spring Cloud Sleuth features:
 
 * Adds trace and span ids to the Slf4J MDC, so you can extract all the logs from a given trace or span in a log aggregator.
 * Provides an abstraction over common distributed tracing data models: traces, spans (forming a DAG), annotations, key-value annotations. Loosely based on HTrace, but Zipkin (Dapper) compatible.
-* Instruments common ingress and egress points from Spring applications (servlet filter, rest template, scheduled actions, message channels, zuul filters, feign client).
-* If `spring-cloud-sleuth-zipkin` is available then the app will generate and collect Zipkin-compatible traces via HTTP. By default it sends them to a Zipkin collector service on localhost (port 9411). Configure the location of the service using `spring.zipkin.baseUrl`.
+* Instruments common ingress and egress points from Spring applications (servlet filter, rest template, scheduled actions, message channels, feign client).
+* If `spring-cloud-sleuth-zipkin` is available then the app will generate and collect Zipkin-compatible traces via HTTP. By default it sends them to a Zipkin collector service on localhost (port 9411). Configure the location of the service using `spring.zipkin.baseUrl`.

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

@@ -620,8 +620,6 @@ Sometimes, you do not want to create a new span but you want to continue one. An
 situation might be as follows:
 
 * *AOP*: If there was already a span created before an aspect was reached, you might not want to create a new span.
-* *Hystrix*: Executing a Hystrix command is most likely a logical part of the current processing.
-It is in fact merely a technical implementation detail that you would not necessarily want to reflect in tracing as a separate being.
 
 To continue a span, you can use `brave.Tracer`, as shown in the following example:
 
@@ -1352,8 +1350,6 @@ If you annotate your method with `@Scheduled`, we automatically create a new spa
 * The span is tagged with the method's class name and method name.
 
 If you want to skip span creation for some `@Scheduled` annotated classes, you can set the `spring.sleuth.scheduled.skipPattern` with a regular expression that matches the fully qualified name of the `@Scheduled` annotated class.
-If you use `spring-cloud-sleuth-stream` and `spring-cloud-netflix-hystrix-stream` together, a span is created for each Hystrix metrics and sent to Zipkin.
-This behavior may be annoying. That's why, by default, `spring.sleuth.scheduled.skipPattern=org.springframework.cloud.netflix.hystrix.stream.HystrixStreamTask`.
 
 ==== Executor, ExecutorService, and ScheduledExecutorService
 
@@ -1450,11 +1446,6 @@ so that tracing headers get extracted from the message and a trace gets put into
 
 To block this feature, set `spring.sleuth.messaging.sqs.enabled` to `false`.
 
-=== Zuul
-
-We instrument the Zuul Ribbon integration by enriching the Ribbon requests with tracing information.
-To disable Zuul support, set the `spring.sleuth.zuul.enabled` property to `false`.
-
 === Redis
 
 We set `tracing` property to Lettcue `ClientResources` instance to enable Brave tracing built in Lettuce .