Merge branch '1.3.x'

docs/pom.xml

@@ -14,7 +14,7 @@
 	<properties>
 		<docs.main>spring-cloud-sleuth</docs.main>
 		<!-- Comma separated list of whitelisted branches -->
-		<docs.whitelisted.branches>1.0.x,1.1.x,1.2.x,2.0.x</docs.whitelisted.branches>
+		<docs.whitelisted.branches>1.0.x,1.1.x,1.2.x,1.3.x,2.0.x</docs.whitelisted.branches>
 		<main.basedir>${basedir}/..</main.basedir>
 	</properties>
 	<profiles>

docs/src/main/asciidoc/spring-cloud-sleuth.adoc

@@ -534,7 +534,8 @@ adding a Channel Binder implementation
 (e.g. `spring-cloud-starter-stream-rabbit` for RabbitMQ or
 `spring-cloud-starter-stream-kafka` for Kafka). This will
 automatically turn your app into a producer of messages with payload
-type `Spans`.
+type `Spans`. The channel name to which the spans will be sent
+is called `sleuth`.
 
 === Zipkin Consumer
 

spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/java/integration/ZipkinTests.java

@@ -107,7 +107,7 @@ public class ZipkinTests extends AbstractIntegrationTest {
 	}
 
 	List<String> traceIdsNotFoundInZipkin(List<Span> spans, long traceId) {
-		String traceIdString = Long.toHexString(traceId);
+		String traceIdString = org.springframework.cloud.sleuth.Span.idToHex(traceId);
 		Optional<String> traceIds = spans.stream()
 				.map(Span::traceId)
 				.filter(traceIdString::equals)