diff --git a/pom.xml b/pom.xml
index c223e2c66..bca0d4caa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
org.springframework.cloud
spring-cloud-build
- 3.0.2
+ 3.0.3-SNAPSHOT
@@ -62,7 +62,7 @@
1.8
1.8
1.8
- 3.0.2
+ 3.0.3-SNAPSHOT
3.0.3-SNAPSHOT
3.0.3-SNAPSHOT
2.0.2-SNAPSHOT
diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index b06455a46..1e06ac341 100644
--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/spring-cloud-sleuth-dependencies/pom.xml
@@ -22,7 +22,7 @@
spring-cloud-dependencies-parent
org.springframework.cloud
- 3.0.3-SNAPSHOT
+ 3.0.2
spring-cloud-sleuth-dependencies
diff --git a/spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/MessageHeaderPropagatorGetter.java b/spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/MessageHeaderPropagatorGetter.java
index ca96e37b0..c9726fe60 100644
--- a/spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/MessageHeaderPropagatorGetter.java
+++ b/spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/MessageHeaderPropagatorGetter.java
@@ -114,4 +114,5 @@ public class MessageHeaderPropagatorGetter implements Propagator.Getter !span.equals(initialSpan))
- // it propagates only and all the `spring.sleuth.baggage.remote-fields` in case insensitive way
+ // it propagates only and all the `spring.sleuth.baggage.remote-fields` in
+ // case insensitive way
.allMatch(span -> "FO".equals(COUNTRY_CODE.getValue(BraveAccessor.traceContext(span.context()))))
- .allMatch(span -> "123".equalsIgnoreCase(CASE_INSENSITIVE_ID.getValue(BraveAccessor.traceContext(span.context()))))
+ .allMatch(span -> "123"
+ .equalsIgnoreCase(CASE_INSENSITIVE_ID.getValue(BraveAccessor.traceContext(span.context()))))
.allMatch(span -> NOT_PROPAGATED_HEADER.getValue(BraveAccessor.traceContext(span.context())) == null);
}
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-messaging-tests/src/test/java/org/springframework/cloud/sleuth/brave/instrument/messaging/TracingChannelInterceptorTest.java b/tests/brave/spring-cloud-sleuth-instrumentation-messaging-tests/src/test/java/org/springframework/cloud/sleuth/brave/instrument/messaging/TracingChannelInterceptorTest.java
index 7f0ce0993..c4ba0202e 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-messaging-tests/src/test/java/org/springframework/cloud/sleuth/brave/instrument/messaging/TracingChannelInterceptorTest.java
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-messaging-tests/src/test/java/org/springframework/cloud/sleuth/brave/instrument/messaging/TracingChannelInterceptorTest.java
@@ -48,15 +48,11 @@ public class TracingChannelInterceptorTest
this.testTracing = new BraveTestTracing() {
@Override
public Tracing.Builder tracingBuilder() {
- return super.tracingBuilder()
- .propagationFactory(BaggagePropagation.newFactoryBuilder(B3Propagation.newFactoryBuilder()
- .injectFormat(SINGLE)
- .build()
- )
- .add(BaggagePropagationConfig.SingleBaggageField.remote(BaggageField.create("Foo-Id")))
- .add(BaggagePropagationConfig.SingleBaggageField.remote(BaggageField.create("Baz-Id")))
- .build()
- );
+ return super.tracingBuilder().propagationFactory(BaggagePropagation
+ .newFactoryBuilder(B3Propagation.newFactoryBuilder().injectFormat(SINGLE).build())
+ .add(BaggagePropagationConfig.SingleBaggageField.remote(BaggageField.create("Foo-Id")))
+ .add(BaggagePropagationConfig.SingleBaggageField.remote(BaggageField.create("Baz-Id")))
+ .build());
}
};
this.testTracing.reset();
@@ -77,7 +73,7 @@ public class TracingChannelInterceptorTest
TraceContext receiveContext = parseB3SingleFormat(
((List) ((Map) this.channel.receive().getHeaders().get(NATIVE_HEADERS)).get("b3")).get(0).toString())
- .context();
+ .context();
assertThat(receiveContext.parentIdString()).isEqualTo("000000000000000b");
}
diff --git a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TracingChannelInterceptorTest.java b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TracingChannelInterceptorTest.java
index d305300b9..ae6a36018 100644
--- a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TracingChannelInterceptorTest.java
+++ b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TracingChannelInterceptorTest.java
@@ -381,7 +381,8 @@ public abstract class TracingChannelInterceptorTest implements TestTracingAwareS
Message> actualMessage = channel.receive();
assertThat(actualMessage.getHeaders()).isNotEmpty();
- LinkedMultiValueMap actualNativeHeaders = (LinkedMultiValueMap) actualMessage.getHeaders().get(NATIVE_HEADERS);
+ LinkedMultiValueMap actualNativeHeaders = (LinkedMultiValueMap) actualMessage.getHeaders()
+ .get(NATIVE_HEADERS);
assertThat(actualNativeHeaders).isNotEmpty();
assertThat(actualNativeHeaders.get("not-propagated-header")).isNull();
assertThat(actualNativeHeaders.get("Foo-Id")).isEqualTo(singletonList("123"));