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

Updated poms

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-08-04 11:53:27 +02:00
parent 883a8d4e24 48227e7793
commit 09862f3516
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -240,7 +240,7 @@
<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-commons.version>1.3.0.BUILD-SNAPSHOT</spring-cloud-commons.version>
<spring-cloud-stream.version>Ditmars.BUILD-SNAPSHOT</spring-cloud-stream.version>
<spring-cloud-netflix.version>1.4.0.BUILD-SNAPSHOT</spring-cloud-netflix.version>
<reactor.version>3.1.0.BUILD-SNAPSHOT</reactor.version>

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

@@ -82,7 +82,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