From abaa693a56617c12659b2b8da6406b0f6ddb7ff6 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 19 Dec 2018 18:06:54 +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 | 7 +++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/multi/multi__integrations.html b/multi/multi__integrations.html index be138627e..36d355df4 100644 --- a/multi/multi__integrations.html +++ b/multi/multi__integrations.html @@ -146,6 +146,8 @@ property where you can provide a list of bean names.

Executor:

@Configuration
 @EnableAutoConfiguration
 @EnableAsync
+// add the infrastructure role to ensure that the bean gets auto-proxied
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 static class CustomExecutorConfig extends AsyncConfigurerSupport {
 
 	@Autowired
@@ -164,7 +166,9 @@ The following example shows how to set up such a custom Ex
 		return new LazyTraceExecutor(this.beanFactory, executor);
 	}
 
-}

15.10 Messaging

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

15.10.1 Spring Integration and Spring Cloud Stream

Spring Cloud Sleuth integrates with Spring Integration. +}

[Tip]Tip

To ensure that your configuration gets post processed, remember +to add the @Role(BeanDefinition.ROLE_INFRASTRUCTURE) on your +@Configuration class

15.10 Messaging

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

15.10.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 but hystrixStreamOutput channel are included.

[Important]Important

When using the Executor to build a Spring Integration IntegrationFlow, you must use the untraced version of the Executor. diff --git a/single/spring-cloud-sleuth.html b/single/spring-cloud-sleuth.html index 46e0d5c41..7e3c0be59 100644 --- a/single/spring-cloud-sleuth.html +++ b/single/spring-cloud-sleuth.html @@ -932,6 +932,8 @@ property where you can provide a list of bean names.

Executor:

@Configuration
 @EnableAutoConfiguration
 @EnableAsync
+// add the infrastructure role to ensure that the bean gets auto-proxied
+@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 static class CustomExecutorConfig extends AsyncConfigurerSupport {
 
 	@Autowired
@@ -950,7 +952,9 @@ The following example shows how to set up such a custom Ex
 		return new LazyTraceExecutor(this.beanFactory, executor);
 	}
 
-}

15.10 Messaging

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

15.10.1 Spring Integration and Spring Cloud Stream

Spring Cloud Sleuth integrates with Spring Integration. +}

[Tip]Tip

To ensure that your configuration gets post processed, remember +to add the @Role(BeanDefinition.ROLE_INFRASTRUCTURE) on your +@Configuration class

15.10 Messaging

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

15.10.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 but hystrixStreamOutput channel are included.

[Important]Important

When using the Executor to build a Spring Integration IntegrationFlow, you must use the untraced version of the Executor. diff --git a/spring-cloud-sleuth.xml b/spring-cloud-sleuth.xml index f157c1bcd..7f83eb943 100644 --- a/spring-cloud-sleuth.xml +++ b/spring-cloud-sleuth.xml @@ -1994,6 +1994,8 @@ The following example shows how to set up such a custom Executor@Configuration @EnableAutoConfiguration @EnableAsync +// add the infrastructure role to ensure that the bean gets auto-proxied +@Role(BeanDefinition.ROLE_INFRASTRUCTURE) static class CustomExecutorConfig extends AsyncConfigurerSupport { @Autowired @@ -2013,6 +2015,11 @@ static class CustomExecutorConfig extends AsyncConfigurerSupport { } } + +To ensure that your configuration gets post processed, remember +to add the @Role(BeanDefinition.ROLE_INFRASTRUCTURE) on your +@Configuration class +