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
2020-12-18 05:29:57 +00:00
parent d6f54ab4c1
commit 02c00bb682
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.adoc
View File

@@ -86,7 +86,7 @@ Please visit the https://docs.spring.io/spring-cloud-sleuth/docs/[documentation
== Building
:jdkversion: 1.7
:jdkversion: 1.8
=== Basic Compile and Test

2
benchmarks/pom.xml
View File

@@ -28,7 +28,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.0</version>
<version>2.4.1</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

6
spring-cloud-sleuth-brave/src/test/java/org/springframework/cloud/sleuth/brave/bridge/W3CPropagationTest.java
View File

@@ -95,9 +95,11 @@ class W3CPropagationTest {
@Test
void inject_traceIdShouldBePaddedWithZeros() {
Map<String, String> carrier = new LinkedHashMap<>();
TraceContext traceContext = sampledTraceContext("0000000000000000", "123456789abcdef0", "123456789abcdef1").build();
TraceContext traceContext = sampledTraceContext("0000000000000000", "123456789abcdef0", "123456789abcdef1")
.build();
w3CPropagation.injector((ignored, key, value) -> carrier.put(key, value)).inject(traceContext, carrier);
assertThat(carrier).containsExactly(entry(TRACE_PARENT, "00-0000000000000000123456789abcdef0-123456789abcdef1-01"));
assertThat(carrier)
.containsExactly(entry(TRACE_PARENT, "00-0000000000000000123456789abcdef0-123456789abcdef1-01"));
}
@Test

14
tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceWebSocketAutoConfigurationTests.java
View File

@@ -42,16 +42,20 @@ public abstract class TraceWebSocketAutoConfigurationTests {
@Test
public void should_register_interceptors_for_all_channels() {
AbstractSubscribableChannel inboundChannel = this.delegatingWebSocketMessageBrokerConfiguration
.clientInboundChannel(this.delegatingWebSocketMessageBrokerConfiguration.clientInboundChannelExecutor());
.clientInboundChannel(
this.delegatingWebSocketMessageBrokerConfiguration.clientInboundChannelExecutor());
BDDAssertions.then(inboundChannel.getInterceptors())
.hasAtLeastOneElementOfType(TracingChannelInterceptor.class);
AbstractSubscribableChannel outboundChannel = this.delegatingWebSocketMessageBrokerConfiguration
.clientOutboundChannel(this.delegatingWebSocketMessageBrokerConfiguration.clientOutboundChannelExecutor());
.clientOutboundChannel(
this.delegatingWebSocketMessageBrokerConfiguration.clientOutboundChannelExecutor());
BDDAssertions.then(outboundChannel.getInterceptors())
.hasAtLeastOneElementOfType(TracingChannelInterceptor.class);
BDDAssertions.then(this.delegatingWebSocketMessageBrokerConfiguration
.brokerChannel(inboundChannel, outboundChannel, this.delegatingWebSocketMessageBrokerConfiguration.brokerChannelExecutor(inboundChannel, outboundChannel))
.getInterceptors())
BDDAssertions
.then(this.delegatingWebSocketMessageBrokerConfiguration.brokerChannel(inboundChannel, outboundChannel,
this.delegatingWebSocketMessageBrokerConfiguration.brokerChannelExecutor(inboundChannel,
outboundChannel))
.getInterceptors())
.hasAtLeastOneElementOfType(TracingChannelInterceptor.class);
}