Skip to content

Ensure message headers are still mutable after interceptor is called #420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 10, 2016
Merged

Ensure message headers are still mutable after interceptor is called #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d1f28d
Ensure message headers are still mutable after interceptor is called
Oct 10, 2016
d092d62
Ensure lifecycle callbacks are applied to delegate
Oct 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ...va/org/springframework/cloud/sleuth/instrument/async/LazyTraceThreadPoolTaskExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
* @author Marcin Grzejszczak
* @since 1.0.10
*/
@SuppressWarnings("serial")
public class LazyTraceThreadPoolTaskExecutor extends ThreadPoolTaskExecutor {

private static final Log log = LogFactory.getLog(MethodHandles.lookup().lookupClass());
Expand Down Expand Up @@ -83,6 +84,17 @@ public <T> ListenableFuture<T> submitListenable(Callable<T> task) {
return this.delegate.submitListenable(new SpanContinuingTraceCallable<>(tracer(), traceKeys(), spanNamer(), task));
}

public void destroy() {
this.delegate.destroy();
super.destroy();
}

@Override
public void afterPropertiesSet() {
this.delegate.afterPropertiesSet();
super.afterPropertiesSet();
}

private Tracer tracer() {
if (this.tracer == null) {
this.tracer = this.beanFactory.getBean(Tracer.class);
Expand Down
6 changes: 5 additions & 1 deletion ...n/java/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.messaging.support.MessageBuilder;
import org.springframework.messaging.support.MessageHeaderAccessor;

/**
* A channel interceptor that automatically starts / continues / closes and detaches
Expand Down Expand Up @@ -84,7 +86,9 @@ public Message<?> preSend(Message<?> message, MessageChannel channel) {
messageBuilder.setHeader(TraceMessageHeaders.MESSAGE_SENT_FROM_CLIENT, true);
}
getSpanInjector().inject(span, messageBuilder);
return messageBuilder.build();
MessageHeaderAccessor headers = MessageHeaderAccessor.getMutableAccessor(message);
headers.copyHeaders(messageBuilder.build().getHeaders());
return new GenericMessage<Object>(message.getPayload(), headers.getMessageHeaders());
}

private Span startSpan(Span span, String name, Message<?> message) {
Expand Down
10 changes: 10 additions & 0 deletions ...a/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.MessagingException;
import org.springframework.messaging.support.MessageHeaderAccessor;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

Expand Down Expand Up @@ -117,6 +118,15 @@ public void nonExportableSpanCreation() {
then(this.span.isExportable()).isFalse();
}

@Test
public void messageHeadersStillMutable() {
this.tracedChannel.send(MessageBuilder.withPayload("hi")
.setHeader(Span.SAMPLED_NAME, Span.SPAN_NOT_SAMPLED).build());
assertNotNull("message was null", this.message);
MessageHeaderAccessor accessor = MessageHeaderAccessor.getAccessor(this.message, MessageHeaderAccessor.class);
assertNotNull("Message header accessor should be still available", accessor);
}

@Test
public void parentSpanIncluded() {
this.tracedChannel.send(MessageBuilder.withPayload("hi")
Expand Down