diff --git a/spring-cloud-sleuth-stream/src/main/java/org/springframework/cloud/sleuth/stream/TracerIgnoringChannelInterceptor.java b/spring-cloud-sleuth-stream/src/main/java/org/springframework/cloud/sleuth/stream/TracerIgnoringChannelInterceptor.java index 32f6d832b..86e68f6ec 100644 --- a/spring-cloud-sleuth-stream/src/main/java/org/springframework/cloud/sleuth/stream/TracerIgnoringChannelInterceptor.java +++ b/spring-cloud-sleuth-stream/src/main/java/org/springframework/cloud/sleuth/stream/TracerIgnoringChannelInterceptor.java @@ -17,6 +17,7 @@ package org.springframework.cloud.sleuth.stream; import org.springframework.cloud.sleuth.Span; +import org.springframework.cloud.sleuth.instrument.messaging.TraceMessageHeaders; import org.springframework.cloud.sleuth.metric.SpanMetricReporter; import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; @@ -43,7 +44,7 @@ class TracerIgnoringChannelInterceptor extends ChannelInterceptorAdapter { @Override public Message preSend(Message message, MessageChannel channel) { return MessageBuilder.fromMessage(message) - .setHeader(Span.SAMPLED_NAME, Span.SPAN_NOT_SAMPLED).build(); + .setHeader(TraceMessageHeaders.SAMPLED_NAME, Span.SPAN_NOT_SAMPLED).build(); } @Override diff --git a/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/TracerIgnoringChannelInterceptorTest.java b/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/TracerIgnoringChannelInterceptorTest.java index 98c437243..8ba765caf 100644 --- a/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/TracerIgnoringChannelInterceptorTest.java +++ b/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/TracerIgnoringChannelInterceptorTest.java @@ -16,9 +16,6 @@ package org.springframework.cloud.sleuth.stream; -import static org.assertj.core.api.BDDAssertions.then; -import static org.mockito.Mockito.verifyZeroInteractions; - import java.util.Arrays; import org.junit.Test; @@ -28,11 +25,15 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.springframework.cloud.sleuth.Span; +import org.springframework.cloud.sleuth.instrument.messaging.TraceMessageHeaders; import org.springframework.cloud.sleuth.metric.SpanMetricReporter; import org.springframework.integration.support.MessageBuilder; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; +import static org.assertj.core.api.BDDAssertions.then; +import static org.mockito.Mockito.verifyZeroInteractions; + /** * @author Marcin Grzejszczak */ @@ -50,7 +51,7 @@ public class TracerIgnoringChannelInterceptorTest { Message interceptedMessage = this.tracerIgnoringChannelInterceptor.preSend(message, this.messageChannel); then(interceptedMessage.getHeaders().get( - Span.SAMPLED_NAME)).isEqualTo(Span.SPAN_NOT_SAMPLED); + TraceMessageHeaders.SAMPLED_NAME)).isEqualTo(Span.SPAN_NOT_SAMPLED); } @Test