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

Checks if DirectClass is on the classpath; fixes gh-976

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-05-07 20:56:55 +02:00
parent ed51793a79
commit 3efc26d580
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,7 @@ import org.springframework.messaging.support.ErrorMessage;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.messaging.support.MessageBuilder;
import org.springframework.messaging.support.MessageHeaderAccessor;
import org.springframework.util.ClassUtils;
/**
* A channel interceptor that automatically starts / continues / closes and detaches
@@ -48,8 +49,12 @@ public class TraceChannelInterceptor extends AbstractTraceChannelInterceptor {
private static final org.apache.commons.logging.Log log = LogFactory
.getLog(TraceChannelInterceptor.class);
private final boolean hasDirectChannelClass;
public TraceChannelInterceptor(BeanFactory beanFactory) {
super(beanFactory);
this.hasDirectChannelClass = ClassUtils
.isPresent("org.springframework.integration.channel.DirectChannel", null);
}
@Override
@@ -159,8 +164,8 @@ public class TraceChannelInterceptor extends AbstractTraceChannelInterceptor {
}
private boolean isDirectChannel(MessageChannel channel) {
return DirectChannel.class
.isAssignableFrom(AopUtils.getTargetClass(channel));
return this.hasDirectChannelClass &&
DirectChannel.class.isAssignableFrom(AopUtils.getTargetClass(channel));
}
private Message<?> outputMessage(Message<?> message, MessageBuilder<?> messageBuilder,