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

Merge branch '1.2.x'

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-08-18 03:52:31 +02:00
parent 4649d7e3cb e9211e8bd0
commit ebe74c1d8f
1 changed files with 54 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@
package org.springframework.cloud.sleuth.instrument.messaging;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.cloud.sleuth.Log;
import org.springframework.cloud.sleuth.Span;
@@ -37,6 +38,9 @@ import org.springframework.messaging.support.MessageHeaderAccessor;
*/
public class TraceChannelInterceptor extends AbstractTraceChannelInterceptor {
private static final org.apache.commons.logging.Log log = LogFactory
.getLog(TraceChannelInterceptor.class);
public TraceChannelInterceptor(BeanFactory beanFactory) {
super(beanFactory);
}
@@ -44,13 +48,28 @@ public class TraceChannelInterceptor extends AbstractTraceChannelInterceptor {
@Override
public void afterSendCompletion(Message<?> message, MessageChannel channel, boolean sent, Exception ex) {
Span currentSpan = getTracer().getCurrentSpan();
if (log.isDebugEnabled()) {
log.debug("Completed sending and current span is " + currentSpan);
}
if (containsServerReceived(currentSpan)) {
if (log.isDebugEnabled()) {
log.debug("Marking span with server send");
}
currentSpan.logEvent(Span.SERVER_SEND);
} else if (currentSpan != null) {
if (log.isDebugEnabled()) {
log.debug("Marking span with client received");
}
currentSpan.logEvent(Span.CLIENT_RECV);
}
addErrorTag(ex);
if (log.isDebugEnabled()) {
log.debug("Closing messaging span " + currentSpan);
}
getTracer().close(currentSpan);
if (log.isDebugEnabled()) {
log.debug("Messaging span " + currentSpan + " successfully closed");
}
}
private boolean containsServerReceived(Span span) {
@@ -67,15 +86,30 @@ public class TraceChannelInterceptor extends AbstractTraceChannelInterceptor {
@Override
public Message<?> preSend(Message<?> message, MessageChannel channel) {
if (log.isDebugEnabled()) {
log.debug("Processing message before sending it to the channel");
}
Message<?> retrievedMessage = getMessage(message);
MessageBuilder<?> messageBuilder = MessageBuilder.fromMessage(retrievedMessage);
Span parentSpan = getTracer().isTracing() ? getTracer().getCurrentSpan()
: buildSpan(new MessagingTextMap(messageBuilder));
if (log.isDebugEnabled()) {
log.debug("Parent span is " + parentSpan);
}
String name = getMessageChannelName(channel);
if (log.isDebugEnabled()) {
log.debug("Name of the span will be [" + name + "]");
}
Span span = startSpan(parentSpan, name, message);
if (message.getHeaders().containsKey(TraceMessageHeaders.MESSAGE_SENT_FROM_CLIENT)) {
if (log.isDebugEnabled()) {
log.debug("Marking span with server received");
}
span.logEvent(Span.SERVER_RECV);
} else {
if (log.isDebugEnabled()) {
log.debug("Marking span with client send");
}
span.logEvent(Span.CLIENT_SEND);
messageBuilder.setHeader(TraceMessageHeaders.MESSAGE_SENT_FROM_CLIENT, true);
}
@@ -108,10 +142,19 @@ public class TraceChannelInterceptor extends AbstractTraceChannelInterceptor {
public Message<?> beforeHandle(Message<?> message, MessageChannel channel,
MessageHandler handler) {
Span spanFromHeader = getTracer().getCurrentSpan();
if (spanFromHeader!= null) {
if (log.isDebugEnabled()) {
log.debug("Continuing span " + spanFromHeader + " before handling message");
}
if (spanFromHeader != null) {
if (log.isDebugEnabled()) {
log.debug("Marking span with server received");
}
spanFromHeader.logEvent(Span.SERVER_RECV);
}
getTracer().continueSpan(spanFromHeader);
if (log.isDebugEnabled()) {
log.debug("Span " + spanFromHeader + " successfully continued");
}
return message;
}
@@ -119,13 +162,22 @@ public class TraceChannelInterceptor extends AbstractTraceChannelInterceptor {
public void afterMessageHandled(Message<?> message, MessageChannel channel,
MessageHandler handler, Exception ex) {
Span spanFromHeader = getTracer().getCurrentSpan();
if (spanFromHeader!= null) {
if (log.isDebugEnabled()) {
log.debug("Continuing span " + spanFromHeader + " after message handled");
}
if (spanFromHeader != null) {
if (log.isDebugEnabled()) {
log.debug("Marking span with server send");
}
spanFromHeader.logEvent(Span.SERVER_SEND);
addErrorTag(ex);
}
// related to #447
if (getTracer().isTracing()) {
getTracer().detach(spanFromHeader);
if (log.isDebugEnabled()) {
log.debug("Detached " + spanFromHeader + " from current thread");
}
}
}