Merge branch 'master' into 2.0.x

2017-10-16 09:21:18 +02:00
parent 11bd578738 806f07e4ce
commit ae3582b1aa
7 changed files with 249 additions and 50 deletions
--- a/docs/src/main/asciidoc/intro.adoc
+++ b/docs/src/main/asciidoc/intro.adoc
@@ -229,6 +229,9 @@ tracer.addTag(baggageKey, baggageValue);

 === Adding to the project

+IMPORTANT: To ensure that your application name is properly displayed in Zipkin
+ set the `spring.application.name` property in `bootstrap.yml`.
+
 ==== Only Sleuth (log correlation)

 If you want to profit only from Spring Cloud Sleuth without the Zipkin integration just add