From ad379974e10bf534bb1ecb46d232ae72db635aa3 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 23 Jul 2019 10:09:49 +0000 Subject: [PATCH] Bumping versions --- .../JmsTracingConfigurationTest.java | 6 ++-- ...stTemplateTraceAspectIntegrationTests.java | 28 +++++++++++++------ .../instrument/web/TraceWebFluxTests.java | 1 + 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/tests/spring-cloud-sleuth-instrumentation-messaging-tests/src/test/java/org/springframework/cloud/sleuth/instrument/messaging/JmsTracingConfigurationTest.java b/tests/spring-cloud-sleuth-instrumentation-messaging-tests/src/test/java/org/springframework/cloud/sleuth/instrument/messaging/JmsTracingConfigurationTest.java index 25d5d4015..6bb90facb 100644 --- a/tests/spring-cloud-sleuth-instrumentation-messaging-tests/src/test/java/org/springframework/cloud/sleuth/instrument/messaging/JmsTracingConfigurationTest.java +++ b/tests/spring-cloud-sleuth-instrumentation-messaging-tests/src/test/java/org/springframework/cloud/sleuth/instrument/messaging/JmsTracingConfigurationTest.java @@ -222,7 +222,8 @@ public class JmsTracingConfigurationTest { @EnableJms static class SimpleJmsListenerConfiguration implements JmsListenerConfigurer { - private static final Log log = LogFactory.getLog(AnnotationJmsListenerConfiguration.class); + private static final Log log = LogFactory + .getLog(AnnotationJmsListenerConfiguration.class); @Autowired CurrentTraceContext current; @@ -252,7 +253,8 @@ public class JmsTracingConfigurationTest { @EnableJms static class AnnotationJmsListenerConfiguration { - private static final Log log = LogFactory.getLog(AnnotationJmsListenerConfiguration.class); + private static final Log log = LogFactory + .getLog(AnnotationJmsListenerConfiguration.class); @Autowired CurrentTraceContext current; diff --git a/tests/spring-cloud-sleuth-instrumentation-mvc-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/RestTemplateTraceAspectIntegrationTests.java b/tests/spring-cloud-sleuth-instrumentation-mvc-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/RestTemplateTraceAspectIntegrationTests.java index b75303a56..496071b62 100644 --- a/tests/spring-cloud-sleuth-instrumentation-mvc-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/RestTemplateTraceAspectIntegrationTests.java +++ b/tests/spring-cloud-sleuth-instrumentation-mvc-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/RestTemplateTraceAspectIntegrationTests.java @@ -64,7 +64,9 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = RestTemplateTraceAspectIntegrationTests.Config.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = "spring.sleuth.web.client.skipPattern=/issue.*") +@SpringBootTest(classes = RestTemplateTraceAspectIntegrationTests.Config.class, + webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, + properties = "spring.sleuth.web.client.skipPattern=/issue.*") @DirtiesContext public class RestTemplateTraceAspectIntegrationTests { @@ -231,42 +233,49 @@ public class RestTemplateTraceAspectIntegrationTests { this.traceId = null; } - @RequestMapping(value = "/issue1047_end", method = RequestMethod.GET, produces = MediaType.TEXT_PLAIN_VALUE) + @RequestMapping(value = "/issue1047_end", method = RequestMethod.GET, + produces = MediaType.TEXT_PLAIN_VALUE) public String issue1047() { return "should_filter_out_this_endpoint"; } - @RequestMapping(value = "/issue1047_start", method = RequestMethod.GET, produces = MediaType.TEXT_PLAIN_VALUE) + @RequestMapping(value = "/issue1047_start", method = RequestMethod.GET, + produces = MediaType.TEXT_PLAIN_VALUE) public String issue1047Start() { return callAndReturnIssue1047(); } - @RequestMapping(value = "/", method = RequestMethod.GET, produces = MediaType.TEXT_PLAIN_VALUE) + @RequestMapping(value = "/", method = RequestMethod.GET, + produces = MediaType.TEXT_PLAIN_VALUE) public String home( @RequestHeader(value = "X-B3-SpanId", required = false) String traceId) { this.traceId = traceId == null ? "UNKNOWN" : traceId; return "trace=" + this.getTraceId(); } - @RequestMapping(value = "/customTag", method = RequestMethod.GET, produces = MediaType.TEXT_PLAIN_VALUE) + @RequestMapping(value = "/customTag", method = RequestMethod.GET, + produces = MediaType.TEXT_PLAIN_VALUE) public String customTag( @RequestHeader(value = "X-B3-TraceId", required = false) String traceId) { this.traceId = traceId == null ? "UNKNOWN" : traceId; return "trace=" + this.getTraceId(); } - @RequestMapping(value = "/asyncRestTemplate", method = RequestMethod.GET, produces = MediaType.TEXT_PLAIN_VALUE) + @RequestMapping(value = "/asyncRestTemplate", method = RequestMethod.GET, + produces = MediaType.TEXT_PLAIN_VALUE) public String asyncRestTemplate() throws ExecutionException, InterruptedException { return callViaAsyncRestTemplateAndReturnOk(); } - @RequestMapping(value = "/syncPing", method = RequestMethod.GET, produces = MediaType.TEXT_PLAIN_VALUE) + @RequestMapping(value = "/syncPing", method = RequestMethod.GET, + produces = MediaType.TEXT_PLAIN_VALUE) public String syncPing() { return callAndReturnOk(); } - @RequestMapping(value = "/callablePing", method = RequestMethod.GET, produces = MediaType.TEXT_PLAIN_VALUE) + @RequestMapping(value = "/callablePing", method = RequestMethod.GET, + produces = MediaType.TEXT_PLAIN_VALUE) public Callable asyncPing() { return new Callable() { @Override @@ -276,7 +285,8 @@ public class RestTemplateTraceAspectIntegrationTests { }; } - @RequestMapping(value = "/webAsyncTaskPing", method = RequestMethod.GET, produces = MediaType.TEXT_PLAIN_VALUE) + @RequestMapping(value = "/webAsyncTaskPing", method = RequestMethod.GET, + produces = MediaType.TEXT_PLAIN_VALUE) public WebAsyncTask webAsyncTaskPing() { return new WebAsyncTask<>(new Callable() { @Override diff --git a/tests/spring-cloud-sleuth-instrumentation-webflux-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceWebFluxTests.java b/tests/spring-cloud-sleuth-instrumentation-webflux-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceWebFluxTests.java index f94d74e30..95462fe9e 100644 --- a/tests/spring-cloud-sleuth-instrumentation-webflux-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceWebFluxTests.java +++ b/tests/spring-cloud-sleuth-instrumentation-webflux-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceWebFluxTests.java @@ -171,6 +171,7 @@ public class TraceWebFluxTests { Controller2 controller2(Tracer tracer) { return new Controller2(tracer); } + } @RestController