diff --git a/1.0.x/images/dependencies.png b/1.0.x/images/dependencies.png index d0eceb6fb..324a10062 100644 Binary files a/1.0.x/images/dependencies.png and b/1.0.x/images/dependencies.png differ diff --git a/1.0.x/images/zipkin-trace-screenshot.png b/1.0.x/images/zipkin-trace-screenshot.png index f0452f0f4..61b7ff769 100644 Binary files a/1.0.x/images/zipkin-trace-screenshot.png and b/1.0.x/images/zipkin-trace-screenshot.png differ diff --git a/1.0.x/images/zipkin-traces.png b/1.0.x/images/zipkin-traces.png index 673ece9aa..4875ca69b 100644 Binary files a/1.0.x/images/zipkin-traces.png and b/1.0.x/images/zipkin-traces.png differ diff --git a/1.0.x/images/zipkin-ui.png b/1.0.x/images/zipkin-ui.png index 34b0215b7..ea99bc100 100644 Binary files a/1.0.x/images/zipkin-ui.png and b/1.0.x/images/zipkin-ui.png differ diff --git a/1.0.x/index.html b/1.0.x/index.html index 3068e1079..240b2db07 100644 --- a/1.0.x/index.html +++ b/1.0.x/index.html @@ -430,6 +430,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
  • Terminology
  • Purpose
  • Adding to the project
    • +
  • Additional resources
  • Features
  • Sampling
  • Instrumentation
    • @@ -481,7 +482,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
    -

    1.0.5.BUILD-SNAPSHOT

    +

    1.1.0.BUILD-SNAPSHOT

    Spring Cloud Sleuth implements a distributed tracing solution for Spring Cloud.

    @@ -1167,6 +1168,22 @@ public class ZipkinStreamServerApplication {
    +

    Additional resources

    +
    +
    +

    Marcin Grzejszczak talking about Spring Cloud Sleuth and Zipkin

    +
    +
    +
    + +
    +
    +
    +

    click here to see the video

    +
    +
    +
    +

    Features

    @@ -1917,6 +1934,25 @@ the consumer app).
    +
    +

    In order to customize the polling mechanism you can create a bean of PollerMetadata type +with name equal to StreamSpanReporter.POLLER. Here you can find an example of such a configuration.

    +
    +
    +
    +
    @Configuration
+public static class CustomPollerConfiguration {
+
+	@Bean(name = StreamSpanReporter.POLLER)
+	PollerMetadata customPoller() {
+		PollerMetadata poller = new PollerMetadata();
+		poller.setMaxMessagesPerPoll(500);
+		poller.setTrigger(new PeriodicTrigger(5000L));
+		return poller;
+	}
+}
    +
    +
    @@ -2109,7 +2145,20 @@ wrap ThreadPoolTaskScheduler in a TraceAsyncListenableTaskExe
    -
    Unresolved directive in spring-cloud-sleuth.adoc - include::../../../../spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebAsyncClientAutoConfigurationTest.java[tags=async_template_factories,indent=0]
    +
    @EnableAutoConfiguration
+@Configuration
+public static class TestConfiguration {
+
+	@Bean
+	ClientHttpRequestFactory mySyncClientFactory() {
+		return new MySyncClientHttpRequestFactory();
+	}
+
+	@Bean
+	AsyncClientHttpRequestFactory myAsyncClientFactory() {
+		return new MyAsyncClientHttpRequestFactory();
+	}
+}
    @@ -2212,10 +2261,23 @@ backwards compatibility in 1.0.4 we’ve started sending both valid and inva in Spring Cloud Sleuth 1.1 we will remove the support for the deprecated headers.

    -

    Since 1.0.4 you can provide the spring.sleuth.integration.patterns pattern to explicitly +

    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
    +    		 +When using the Executor to build a Spring Integration IntegrationFlow remember to use the untraced version of the Executor. +Decorating Spring Integration Executor Channel with TraceableExecutorService will cause the spans to be improperly closed. +
    +

    Zuul

    @@ -2247,7 +2309,7 @@ To disable Zuul support set the spring.sleuth.zuul.enabled property