From b21f00e469287002138b9c236fde9ea614f9bf8b Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 12 Mar 2018 14:48:38 +0000 Subject: [PATCH] Sync docs from master to gh-pages --- multi/multi__integrations.html | 6 +++--- single/spring-cloud-sleuth.html | 6 +++--- spring-cloud-sleuth.xml | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/multi/multi__integrations.html b/multi/multi__integrations.html index 10265b888..dc10b441d 100644 --- a/multi/multi__integrations.html +++ b/multi/multi__integrations.html @@ -138,12 +138,12 @@ The following example shows how to set up such a custom Ex executor.initialize(); return new LazyTraceExecutor(this.beanFactory, executor); } -}

15.9 Messaging

15.9.1 Spring Integration and Spring Cloud Stream

Spring Cloud Sleuth integrates with Spring Integration. +}

15.9 Messaging

Features from this section can be disabled by setting the spring.sleuth.messaging.enabled property with value equal to false.

15.9.1 Spring Integration and Spring Cloud Stream

Spring Cloud Sleuth integrates with Spring Integration. It creates spans for publish and subscribe events. To disable Spring Integration instrumentation, set spring.sleuth.integration.enabled to false.

You can provide the spring.sleuth.integration.patterns pattern to explicitly provide the names of channels that you want to include for tracing. By default, all channels are included.

[Important]Important

When using the Executor to build a Spring Integration IntegrationFlow, you must use the untraced version of the Executor. Decorating the Spring Integration Executor Channel with TraceableExecutorService causes the spans to be improperly closed.

15.9.2 Spring RabbitMq

We instrument the RabbitTemplate so that tracing headers get injected -into the message.

To block this feature, set spring.sleuth.messaging.enabled to false.

15.9.3 Spring Kafka

We instrument the Spring Kafka’s ProducerFactory and ConsumerFactory +into the message.

To block this feature, set spring.sleuth.messaging.rabbit.enabled to false.

15.9.3 Spring Kafka

We instrument the Spring Kafka’s ProducerFactory and ConsumerFactory so that tracing headers get injected into the created Spring Kafka’s -Producer and Consumer.

To block this feature, set spring.sleuth.messaging.enabled to false.

15.10 Zuul

We instrument the Zuul Ribbon integration by enriching the Ribbon requests with tracing information. +Producer and Consumer.

To block this feature, set spring.sleuth.messaging.kafka.enabled to false.

15.10 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.

\ No newline at end of file diff --git a/single/spring-cloud-sleuth.html b/single/spring-cloud-sleuth.html index c4be41c11..744ede104 100644 --- a/single/spring-cloud-sleuth.html +++ b/single/spring-cloud-sleuth.html @@ -807,13 +807,13 @@ The following example shows how to set up such a custom Ex executor.initialize(); return new LazyTraceExecutor(this.beanFactory, executor); } -}

15.9 Messaging

15.9.1 Spring Integration and Spring Cloud Stream

Spring Cloud Sleuth integrates with Spring Integration. +}

15.9 Messaging

Features from this section can be disabled by setting the spring.sleuth.messaging.enabled property with value equal to false.

15.9.1 Spring Integration and Spring Cloud Stream

Spring Cloud Sleuth integrates with Spring Integration. It creates spans for publish and subscribe events. To disable Spring Integration instrumentation, set spring.sleuth.integration.enabled to false.

You can provide the spring.sleuth.integration.patterns pattern to explicitly provide the names of channels that you want to include for tracing. By default, all channels are included.

[Important]Important

When using the Executor to build a Spring Integration IntegrationFlow, you must use the untraced version of the Executor. Decorating the Spring Integration Executor Channel with TraceableExecutorService causes the spans to be improperly closed.

15.9.2 Spring RabbitMq

We instrument the RabbitTemplate so that tracing headers get injected -into the message.

To block this feature, set spring.sleuth.messaging.enabled to false.

15.9.3 Spring Kafka

We instrument the Spring Kafka’s ProducerFactory and ConsumerFactory +into the message.

To block this feature, set spring.sleuth.messaging.rabbit.enabled to false.

15.9.3 Spring Kafka

We instrument the Spring Kafka’s ProducerFactory and ConsumerFactory so that tracing headers get injected into the created Spring Kafka’s -Producer and Consumer.

To block this feature, set spring.sleuth.messaging.enabled to false.

15.10 Zuul

We instrument the Zuul Ribbon integration by enriching the Ribbon requests with tracing information. +Producer and Consumer.

To block this feature, set spring.sleuth.messaging.kafka.enabled to false.

15.10 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.

16. Running examples

You can see the running examples deployed in the Pivotal Web Services. Check them out at the following links:

\ No newline at end of file diff --git a/spring-cloud-sleuth.xml b/spring-cloud-sleuth.xml index ef7b0d45e..b3aab77c9 100644 --- a/spring-cloud-sleuth.xml +++ b/spring-cloud-sleuth.xml @@ -1810,6 +1810,7 @@ static class CustomExecutorConfig extends AsyncConfigurerSupport {
Messaging +Features from this section can be disabled by setting the spring.sleuth.messaging.enabled property with value equal to false.
Spring Integration and Spring Cloud Stream Spring Cloud Sleuth integrates with Spring Integration. @@ -1826,14 +1827,14 @@ Decorating the Spring Integration Executor Channel with TraceableExecut Spring RabbitMq We instrument the RabbitTemplate so that tracing headers get injected into the message. -To block this feature, set spring.sleuth.messaging.enabled to false. +To block this feature, set spring.sleuth.messaging.rabbit.enabled to false.
Spring Kafka We instrument the Spring Kafka’s ProducerFactory and ConsumerFactory so that tracing headers get injected into the created Spring Kafka’s Producer and Consumer. -To block this feature, set spring.sleuth.messaging.enabled to false. +To block this feature, set spring.sleuth.messaging.kafka.enabled to false.