From deb04e300afadb0e2c332521456761b2a46c3756 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 15 Jul 2016 08:56:11 +0200 Subject: [PATCH] Updated docs --- docs/src/main/asciidoc/intro.adoc | 10 ++++++++++ docs/src/main/asciidoc/spring-cloud-sleuth.adoc | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/docs/src/main/asciidoc/intro.adoc b/docs/src/main/asciidoc/intro.adoc index c4d7f6217..0ec7c622c 100644 --- a/docs/src/main/asciidoc/intro.adoc +++ b/docs/src/main/asciidoc/intro.adoc @@ -380,3 +380,13 @@ and then just annotate your main class with `@EnableZipkinStreamServer` annotati ---- include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-sleuth/master/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/main/java/example/ZipkinStreamServerApplication.java[] ---- + +== Additional resources + +*Adrian Cole giving an introduction to ditributed tracing with Zipkin* + +video::f9J1Av8rwCE[youtube] + +*Marcin Grzejszczak talking about Spring Cloud Sleuth and Zipkin* + +video::eQV71Mw1u1c[youtube] \ No newline at end of file diff --git a/docs/src/main/asciidoc/spring-cloud-sleuth.adoc b/docs/src/main/asciidoc/spring-cloud-sleuth.adoc index edfa905e9..537a0ad78 100644 --- a/docs/src/main/asciidoc/spring-cloud-sleuth.adoc +++ b/docs/src/main/asciidoc/spring-cloud-sleuth.adoc @@ -520,7 +520,7 @@ the same as the ones sent in HTTP (they contain a `-`) in its name. For the sake backwards compatibility in 1.0.4 we've started sending both valid and invalid headers. Please upgrade to 1.0.4 because 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.