From 44804d93914ca3f3a6b54305d552027b1427ea8c Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Fri, 4 Aug 2017 11:38:33 +0200
Subject: [PATCH 1/2] Updated pom

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3d10daaae..15d8c3ce6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -235,9 +235,9 @@
 		<surefire.plugin.version>2.19.1</surefire.plugin.version>
 		<checkstyle.version>2.17</checkstyle.version>
 		<spring-cloud-build.version>1.3.3.BUILD-SNAPSHOT</spring-cloud-build.version>
-		<spring-cloud-commons.version>1.2.3.BUILD-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-stream.version>Chelsea.BUILD-SNAPSHOT</spring-cloud-stream.version>
-		<spring-cloud-netflix.version>1.4.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
+		<spring-cloud-commons.version>1.2.4.BUILD-SNAPSHOT</spring-cloud-commons.version>
+		<spring-cloud-stream.version>Chelsea.SR2</spring-cloud-stream.version>
+		<spring-cloud-netflix.version>1.3.3.BUILD-SNAPSHOT</spring-cloud-netflix.version>
 	</properties>
 
 	<profiles>

From 48227e779367c7e6a0fcc656bd285e110518c437 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Fri, 4 Aug 2017 11:52:31 +0200
Subject: [PATCH 2/2] Returns proper message; fixes #669

---
 .../sleuth/instrument/messaging/TraceChannelInterceptor.java   | 2 +-
 .../instrument/messaging/TraceChannelInterceptorTests.java     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptor.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptor.java
index c5bb2393e..d28b8636b 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptor.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptor.java
@@ -91,7 +91,7 @@ public class TraceChannelInterceptor extends AbstractTraceChannelInterceptor {
 		getSpanInjector().inject(span, new MessagingTextMap(messageBuilder));
 		MessageHeaderAccessor headers = MessageHeaderAccessor.getMutableAccessor(message);
 		headers.copyHeaders(messageBuilder.build().getHeaders());
-		return new GenericMessage<>(retrievedMessage.getPayload(), headers.getMessageHeaders());
+		return new GenericMessage<>(message.getPayload(), headers.getMessageHeaders());
 	}
 
 	private Message getMessage(Message<?> message) {
diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptorTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptorTests.java
index 095f23d08..4484b7618 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptorTests.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptorTests.java
@@ -333,13 +333,14 @@ public class TraceChannelInterceptorTests implements MessageHandler {
 		this.tracedChannel.send(message);
 
 		String spanId = this.message.getHeaders().get(TraceMessageHeaders.SPAN_ID_NAME, String.class);
+		then(message.getPayload()).isEqualTo(this.message.getPayload());
 		then(spanId).isNotNull();
 		long traceId = Span
 				.hexToId(this.message.getHeaders().get(TraceMessageHeaders.TRACE_ID_NAME, String.class));
 		then(traceId).isEqualTo(10L);
 		then(spanId).isNotEqualTo(20L);
 		then(this.accumulator.getSpans()).hasSize(1);
-		}
+	}
 
 	@Configuration
 	@EnableAutoConfiguration