From 045bfc53170871e68f0f2bc1c0f47bfa1f82ae6e Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 10 Mar 2016 12:13:00 +0100 Subject: [PATCH] Updated docs --- docs/src/main/asciidoc/spring-cloud-sleuth.adoc | 6 +++--- .../web/client/TraceWebAsyncClientAutoConfiguration.java | 2 +- .../web/client/TraceWebClientAutoConfiguration.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/src/main/asciidoc/spring-cloud-sleuth.adoc b/docs/src/main/asciidoc/spring-cloud-sleuth.adoc index 1d473b3ec..4474da846 100644 --- a/docs/src/main/asciidoc/spring-cloud-sleuth.adoc +++ b/docs/src/main/asciidoc/spring-cloud-sleuth.adoc @@ -330,7 +330,7 @@ Features from this section can be disabled by providing the `spring.sleuth.web.e Via the `TraceFilter` all sampled incoming requests result in creation of a Span. That Span's name is `http:` + the path to which the request was sent. E.g. if the request was sent to `/foo/bar` then the name will be `http:/foo/bar`. You can configure which URIs you would - like to skip via the `spring.sleuth.instrument.web.skipPattern` property. If you have `ManagementServerProperties` on classpath then + like to skip via the `spring.sleuth.web.skipPattern` property. If you have `ManagementServerProperties` on classpath then its value of `contextPath` gets appended to the provided skip pattern. ==== Async Servlet support @@ -343,12 +343,12 @@ If your controller returns a `Callable` or a `WebAsyncTask` Spring Cloud Sleuth We're injecting a `RestTemplate` interceptor that ensures that all the tracing information is passed to the requests. Each time a call is made a new Span is created. It gets closed upon receiving the response. In order to block the synchronous `RestTemplate` features -just set `spring.sleuth.client.enabled` to `false`. +just set `spring.sleuth.web.client.enabled` to `false`. ==== Asynchronous Rest Template Custom instrumentation is set to create and close Spans upon sending and receiving requests. To block the `AsyncRestTemplate` -features set `spring.sleuth.async.client.enabled` to `false`. +features set `spring.sleuth.web.async.client.enabled` to `false`. === Feign diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebAsyncClientAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebAsyncClientAutoConfiguration.java index 27d0a21b3..180e3a21d 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebAsyncClientAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebAsyncClientAutoConfiguration.java @@ -39,7 +39,7 @@ import org.springframework.web.client.AsyncRestTemplate; * @since 1.0.0 */ @Configuration -@ConditionalOnProperty(value = "spring.sleuth.async.client.enabled", matchIfMissing = true) +@ConditionalOnProperty(value = "spring.sleuth.web.async.client.enabled", matchIfMissing = true) @ConditionalOnClass(AsyncRestTemplate.class) @ConditionalOnBean(SpanAccessor.class) @AutoConfigureAfter(TraceAutoConfiguration.class) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java index bfc7f1935..73f5aadcf 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java @@ -44,7 +44,7 @@ import org.springframework.web.client.RestTemplate; * @since 1.0.0 */ @Configuration -@ConditionalOnProperty(value = "spring.sleuth.client.enabled", matchIfMissing = true) +@ConditionalOnProperty(value = "spring.sleuth.web.client.enabled", matchIfMissing = true) @ConditionalOnClass(RestTemplate.class) @ConditionalOnBean(Tracer.class) @AutoConfigureAfter(TraceAutoConfiguration.class)