Merge branch 'master' into 2.0.x

This commit is contained in:
Spencer Gibb
2017-11-27 23:17:41 -05:00
4 changed files with 4 additions and 4 deletions

View File

@@ -444,7 +444,7 @@ Below you can see an example of a call to Redis that is wrapped in such a span.
[source,java]
----
include::../../../..//spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin/HttpZipkinSpanReporterTest.java[tags=service_name,indent=0]
include::../../../..//spring-cloud-sleuth-zipkin-legacy/src/test/java/org/springframework/cloud/sleuth/zipkin/HttpZipkinSpanReporterTest.java[tags=service_name,indent=0]
----
IMPORTANT: Remember not to add both `peer.service` tag and the `SA` tag! You have to add only `peer.service`.