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

Bumping versions

Browse Source
This commit is contained in:
buildmaster
2021-03-18 05:29:41 +00:00
parent d2c29938b8
commit bf467a9a15
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@@ -29,7 +29,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>3.0.2</version>
<version>3.0.3-SNAPSHOT</version>
<relativePath/>
<!-- lookup parent from repository -->
</parent>
@@ -62,7 +62,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.testTarget>1.8</maven.compiler.testTarget>
<maven.compiler.testSource>1.8</maven.compiler.testSource>
<spring-cloud-build.version>3.0.2</spring-cloud-build.version>
<spring-cloud-build.version>3.0.3-SNAPSHOT</spring-cloud-build.version>
<spring-cloud-commons.version>3.0.3-SNAPSHOT</spring-cloud-commons.version>
<spring-cloud-gateway.version>3.0.3-SNAPSHOT</spring-cloud-gateway.version>
<spring-cloud-circuitbreaker.version>2.0.2-SNAPSHOT</spring-cloud-circuitbreaker.version>

2
spring-cloud-sleuth-dependencies/pom.xml
View File

@@ -22,7 +22,7 @@
<parent>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<groupId>org.springframework.cloud</groupId>
<version>3.0.3-SNAPSHOT</version>
<version>3.0.2</version>
<relativePath/>
</parent>
<artifactId>spring-cloud-sleuth-dependencies</artifactId>

1
spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/MessageHeaderPropagatorGetter.java
View File

@@ -114,4 +114,5 @@ public class MessageHeaderPropagatorGetter implements Propagator.Getter<MessageH
public String toString() {
return "MessageHeaderPropagatorGetter{}";
}
}

6
tests/brave/spring-cloud-sleuth-instrumentation-baggage-tests/src/test/java/org/springframework/cloud/sleuth/brave/baggage/MultipleHopsIntegrationTests.java
View File

@@ -63,9 +63,11 @@ public class MultipleHopsIntegrationTests
// baz is not tagged in the initial span, only downstream!
then(this.application.allSpans()).as("All downstream have country-code")
.filteredOn(span -> !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);
}

16
tests/brave/spring-cloud-sleuth-instrumentation-messaging-tests/src/test/java/org/springframework/cloud/sleuth/brave/instrument/messaging/TracingChannelInterceptorTest.java
View File

@@ -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");
}

3
tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TracingChannelInterceptorTest.java
View File

@@ -381,7 +381,8 @@ public abstract class TracingChannelInterceptorTest implements TestTracingAwareS
Message<?> actualMessage = channel.receive();
assertThat(actualMessage.getHeaders()).isNotEmpty();
LinkedMultiValueMap<String, String> actualNativeHeaders = (LinkedMultiValueMap) actualMessage.getHeaders().get(NATIVE_HEADERS);
LinkedMultiValueMap<String, String> 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"));