diff --git a/README.adoc b/README.adoc index aa78f0555..6c5e5b88c 100644 --- a/README.adoc +++ b/README.adoc @@ -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 diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 15361f809..b41a505df 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -28,7 +28,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0 + 2.4.1 diff --git a/spring-cloud-sleuth-brave/src/test/java/org/springframework/cloud/sleuth/brave/bridge/W3CPropagationTest.java b/spring-cloud-sleuth-brave/src/test/java/org/springframework/cloud/sleuth/brave/bridge/W3CPropagationTest.java index dc4ee3be9..1fb49f49e 100644 --- a/spring-cloud-sleuth-brave/src/test/java/org/springframework/cloud/sleuth/brave/bridge/W3CPropagationTest.java +++ b/spring-cloud-sleuth-brave/src/test/java/org/springframework/cloud/sleuth/brave/bridge/W3CPropagationTest.java @@ -95,9 +95,11 @@ class W3CPropagationTest { @Test void inject_traceIdShouldBePaddedWithZeros() { Map 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 diff --git a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceWebSocketAutoConfigurationTests.java b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceWebSocketAutoConfigurationTests.java index a010510b3..ad9d2853c 100644 --- a/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceWebSocketAutoConfigurationTests.java +++ b/tests/common/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/TraceWebSocketAutoConfigurationTests.java @@ -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); }