From d010229ca329fce6ba94d63781a1297465fabfa6 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Tue, 28 Nov 2017 19:00:58 +0100
Subject: [PATCH 1/4] Added whitelisted branch

---
 docs/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index 19edad86f..a51300fce 100644
--- a/docs/pom.xml
+++ b/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</docs.whitelisted.branches>
+		<docs.whitelisted.branches>1.0.x,1.1.x,1.2.x,1.3.x</docs.whitelisted.branches>
 		<main.basedir>${basedir}/..</main.basedir>
 	</properties>
 	<profiles>

From 8a190ddabcc4f970b46d1fd55cee1b322142cd09 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Sun, 3 Dec 2017 09:34:01 -0500
Subject: [PATCH 2/4] Fixed flickering test (due to starting 0 in the traceid)

---
 .../src/test/java/integration/ZipkinTests.java                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/java/integration/ZipkinTests.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/java/integration/ZipkinTests.java
index 581396ab7..bba1e7ae3 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/java/integration/ZipkinTests.java
+++ b/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)

From a1b97002c66a5c518a0370b57231d31f77a29f1b Mon Sep 17 00:00:00 2001
From: Adrian Cole <adriancole@users.noreply.github.com>
Date: Thu, 14 Dec 2017 10:09:04 +0800
Subject: [PATCH 3/4] Moves to significantly more performant zipkin-reporter
 (#808)

Under load, the previous version of zipkin-reporter's AsyncReporter
caused a lot of overhead. This version fixes that by ensuring encoding
is deferred and not done inside a lock.
---
 spring-cloud-sleuth-dependencies/pom.xml                    | 6 +++---
 spring-cloud-sleuth-samples/pom.xml                         | 2 +-
 .../spring-cloud-sleuth-sample-test-core/pom.xml            | 1 +
 spring-cloud-sleuth-zipkin-legacy/pom.xml                   | 2 +-
 spring-cloud-sleuth-zipkin/pom.xml                          | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index db00bd3d3..6dc87eb5c 100644
--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/spring-cloud-sleuth-dependencies/pom.xml
@@ -14,9 +14,9 @@
 	<name>spring-cloud-sleuth-dependencies</name>
 	<description>Spring Cloud Sleuth Dependencies</description>
 	<properties>
-		<zipkin.version>2.3.1</zipkin.version>
+		<zipkin.version>2.4.1</zipkin.version>
 		<zipkin-reporter.version>1.1.2</zipkin-reporter.version>
-		<zipkin-reporter2.version>2.1.4</zipkin-reporter2.version>
+		<zipkin-reporter2.version>2.2.0</zipkin-reporter2.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -69,7 +69,7 @@
 				<groupId>io.zipkin.java</groupId>
 				<artifactId>zipkin</artifactId>
 				<!-- misaligned intentionally https://github.com/spring-projects/spring-boot/issues/10778-->
-				<version>2.3.0</version>
+				<version>2.4.0</version>
 			</dependency>
 			<dependency>
 				<groupId>io.zipkin.zipkin2</groupId>
diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml
index 27aab6485..11b98f3e7 100644
--- a/spring-cloud-sleuth-samples/pom.xml
+++ b/spring-cloud-sleuth-samples/pom.xml
@@ -57,7 +57,7 @@
 			<dependency>
 				<groupId>io.zipkin.zipkin2</groupId>
 				<artifactId>zipkin</artifactId>
-				<version>2.3.1</version>
+				<version>2.4.1</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml
index 06f28d396..c2d17dfa1 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml
@@ -55,6 +55,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>animal-sniffer-maven-plugin</artifactId>
+				<version>1.16</version>
 				<configuration>
 					<skip>true</skip>
 					<signature>
diff --git a/spring-cloud-sleuth-zipkin-legacy/pom.xml b/spring-cloud-sleuth-zipkin-legacy/pom.xml
index 868933011..ed9da0def 100644
--- a/spring-cloud-sleuth-zipkin-legacy/pom.xml
+++ b/spring-cloud-sleuth-zipkin-legacy/pom.xml
@@ -106,7 +106,7 @@
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp</artifactId>
-			<version>3.9.0</version>
+			<version>3.9.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/spring-cloud-sleuth-zipkin/pom.xml b/spring-cloud-sleuth-zipkin/pom.xml
index f2f7c0da2..db2831a03 100644
--- a/spring-cloud-sleuth-zipkin/pom.xml
+++ b/spring-cloud-sleuth-zipkin/pom.xml
@@ -114,7 +114,7 @@
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>mockwebserver</artifactId>
-			<version>3.9.0</version>
+			<version>3.9.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

From 4e8be65dd51da6ef04352ebf9f97b7826009cd36 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Mon, 18 Dec 2017 16:51:55 +0100
Subject: [PATCH 4/4] Updated the docs with default sleuth spans channel name;
 fixes #803

---
 docs/src/main/asciidoc/spring-cloud-sleuth.adoc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/src/main/asciidoc/spring-cloud-sleuth.adoc b/docs/src/main/asciidoc/spring-cloud-sleuth.adoc
index 992166fdd..7d002f5b3 100644
--- a/docs/src/main/asciidoc/spring-cloud-sleuth.adoc
+++ b/docs/src/main/asciidoc/spring-cloud-sleuth.adoc
@@ -508,7 +508,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