From 7dffabd91a5812b21e5077d173e08523f3f7a6a8 Mon Sep 17 00:00:00 2001 From: Canaan Stafford Date: Sat, 5 Aug 2017 15:10:54 -0500 Subject: [PATCH] Expand type check in TraceChannelInterceptor (#673) The type check in the method 'getMessage' was only for a sub-class of MessagingException. The check was expanded to the base class. --- .../instrument/messaging/TraceChannelInterceptor.java | 6 +++--- .../instrument/messaging/TraceChannelInterceptorTests.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptor.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptor.java index d28b8636b..691c41fdf 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptor.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptor.java @@ -24,7 +24,7 @@ import org.springframework.cloud.sleuth.Tracer; import org.springframework.cloud.sleuth.sampler.NeverSampler; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; -import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessagingException; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.support.GenericMessage; import org.springframework.messaging.support.MessageBuilder; @@ -96,8 +96,8 @@ public class TraceChannelInterceptor extends AbstractTraceChannelInterceptor { private Message getMessage(Message message) { Object payload = message.getPayload(); - if (payload instanceof MessageDeliveryException) { - MessageDeliveryException e = (MessageDeliveryException) payload; + if (payload instanceof MessagingException) { + MessagingException e = (MessagingException) payload; return e.getFailedMessage(); } return message; diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptorTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptorTests.java index 4484b7618..275227bbf 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptorTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/messaging/TraceChannelInterceptorTests.java @@ -323,8 +323,8 @@ public class TraceChannelInterceptorTests implements MessageHandler { } @Test - public void workWithMessageDeliveryException() throws Exception { - Message message = new GenericMessage<>(new MessageDeliveryException( + public void workWithMessagingException() throws Exception { + Message message = new GenericMessage<>(new MessagingException( MessageBuilder.withPayload("hi") .setHeader(TraceMessageHeaders.TRACE_ID_NAME, Span.idToHex(10L)) .setHeader(TraceMessageHeaders.SPAN_ID_NAME, Span.idToHex(20L)).build()