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

Merge branch '1.3.x'

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

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

@@ -82,6 +82,7 @@ public final class TracingChannelInterceptor extends ChannelInterceptorAdapter
final TraceContext.Injector<MessageHeaderAccessor> injector;
final TraceContext.Extractor<MessageHeaderAccessor> extractor;
final boolean integrationObjectSupportPresent;
private final boolean hasDirectChannelClass;
TracingChannelInterceptor(Tracing tracing) {
this.tracing = tracing;
@@ -94,6 +95,8 @@ public final class TracingChannelInterceptor extends ChannelInterceptorAdapter
this.integrationObjectSupportPresent = ClassUtils.isPresent(
"org.springframework.integration.context.IntegrationObjectSupport",
null);
this.hasDirectChannelClass = ClassUtils
.isPresent("org.springframework.integration.channel.DirectChannel", null);
}
/**
@@ -158,8 +161,8 @@ public final class TracingChannelInterceptor extends ChannelInterceptorAdapter
}
private boolean isDirectChannel(MessageChannel channel) {
return DirectChannel.class
.isAssignableFrom(AopUtils.getTargetClass(channel));
return this.hasDirectChannelClass &&
DirectChannel.class.isAssignableFrom(AopUtils.getTargetClass(channel));
}
@Override public void afterSendCompletion(Message<?> message, MessageChannel channel,