SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Returns proper message; fixes #669

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-08-04 11:52:31 +02:00
parent 44804d9391
commit 48227e7793
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptor.java
View File

@@ -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) {

3
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptorTests.java
View File

@@ -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