From fc36443ae2742d2f4565c1ebdff609b2a4c44900 Mon Sep 17 00:00:00 2001 From: Attila Uhrin Date: Sun, 30 Jan 2022 10:58:44 +0100 Subject: [PATCH 1/3] Add implementation for BAEL-5317. --- spring-sleuth/pom.xml | 2 +- .../traceid/SleuthCurrentTraceIdApp.java | 11 +++++++ .../traceid/SleuthTraceIdController.java | 32 +++++++++++++++++++ .../CurrentTraceIdAppSpringContextTest.java | 15 +++++++++ .../session}/SpringContextTest.java | 4 +-- 5 files changed, 60 insertions(+), 4 deletions(-) create mode 100644 spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthCurrentTraceIdApp.java create mode 100644 spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthTraceIdController.java create mode 100644 spring-sleuth/src/test/java/com/baeldung/sleuth/traceid/CurrentTraceIdAppSpringContextTest.java rename spring-sleuth/src/test/java/com/baeldung/{ => spring/session}/SpringContextTest.java (83%) diff --git a/spring-sleuth/pom.xml b/spring-sleuth/pom.xml index 5fd109e968..a6fba5ea56 100644 --- a/spring-sleuth/pom.xml +++ b/spring-sleuth/pom.xml @@ -39,7 +39,7 @@ - 2.0.2.RELEASE + 3.1.0 \ No newline at end of file diff --git a/spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthCurrentTraceIdApp.java b/spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthCurrentTraceIdApp.java new file mode 100644 index 0000000000..bae1d310a2 --- /dev/null +++ b/spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthCurrentTraceIdApp.java @@ -0,0 +1,11 @@ +package com.baeldung.sleuth.traceid; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class SleuthCurrentTraceIdApp { + public static void main(String[] args) { + SpringApplication.run(SleuthCurrentTraceIdApp.class, args); + } +} diff --git a/spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthTraceIdController.java b/spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthTraceIdController.java new file mode 100644 index 0000000000..fb4bf2bb1a --- /dev/null +++ b/spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthTraceIdController.java @@ -0,0 +1,32 @@ +package com.baeldung.sleuth.traceid; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import brave.Span; +import brave.Tracer; + +@RestController +public class SleuthTraceIdController { + + private static final Logger logger = LoggerFactory.getLogger(SleuthTraceIdController.class); + + @Autowired + private Tracer tracer; + + @GetMapping("/hello") + public String hello() { + logger.info("Hello with Sleuth"); + Span span = tracer.currentSpan(); + if (span != null) { + logger.info("Span ID hex {}", span.context().spanIdString()); + logger.info("Span ID decimal {}", span.context().spanId()); + logger.info("Trace ID hex {}", span.context().traceIdString()); + logger.info("Trace ID decimal {}", span.context().traceId()); + } + return "hello"; + } +} diff --git a/spring-sleuth/src/test/java/com/baeldung/sleuth/traceid/CurrentTraceIdAppSpringContextTest.java b/spring-sleuth/src/test/java/com/baeldung/sleuth/traceid/CurrentTraceIdAppSpringContextTest.java new file mode 100644 index 0000000000..ba181d730b --- /dev/null +++ b/spring-sleuth/src/test/java/com/baeldung/sleuth/traceid/CurrentTraceIdAppSpringContextTest.java @@ -0,0 +1,15 @@ +package com.baeldung.sleuth.traceid; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes = SleuthCurrentTraceIdApp.class) +public class CurrentTraceIdAppSpringContextTest { + + @Test + public void whenSpringContextIsBootstrapped_thenNoExceptions() { + } +} diff --git a/spring-sleuth/src/test/java/com/baeldung/SpringContextTest.java b/spring-sleuth/src/test/java/com/baeldung/spring/session/SpringContextTest.java similarity index 83% rename from spring-sleuth/src/test/java/com/baeldung/SpringContextTest.java rename to spring-sleuth/src/test/java/com/baeldung/spring/session/SpringContextTest.java index 8dc2455e63..7ddd194632 100644 --- a/spring-sleuth/src/test/java/com/baeldung/SpringContextTest.java +++ b/spring-sleuth/src/test/java/com/baeldung/spring/session/SpringContextTest.java @@ -1,12 +1,10 @@ -package com.baeldung; +package com.baeldung.spring.session; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import com.baeldung.spring.session.SleuthWebApp; - @RunWith(SpringRunner.class) @SpringBootTest(classes = SleuthWebApp.class) public class SpringContextTest { From e8d5b236cca677853a34425d8e940e1863aa96fb Mon Sep 17 00:00:00 2001 From: Attila Uhrin Date: Sun, 30 Jan 2022 11:04:38 +0100 Subject: [PATCH 2/3] Rename API endpoint. --- .../baeldung/sleuth/traceid/SleuthTraceIdController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthTraceIdController.java b/spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthTraceIdController.java index fb4bf2bb1a..07dca487d0 100644 --- a/spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthTraceIdController.java +++ b/spring-sleuth/src/main/java/com/baeldung/sleuth/traceid/SleuthTraceIdController.java @@ -17,8 +17,8 @@ public class SleuthTraceIdController { @Autowired private Tracer tracer; - @GetMapping("/hello") - public String hello() { + @GetMapping("/traceid") + public String getSleuthTraceId() { logger.info("Hello with Sleuth"); Span span = tracer.currentSpan(); if (span != null) { @@ -27,6 +27,6 @@ public class SleuthTraceIdController { logger.info("Trace ID hex {}", span.context().traceIdString()); logger.info("Trace ID decimal {}", span.context().traceId()); } - return "hello"; + return "Hello from Sleuth"; } } From 6147f0b70cc105bf16b53e7a6a6accef153b374d Mon Sep 17 00:00:00 2001 From: Attila Uhrin Date: Mon, 31 Jan 2022 22:10:09 +0100 Subject: [PATCH 3/3] Remove empty test case. --- .../{spring/session => }/SpringContextTest.java | 4 +++- .../CurrentTraceIdAppSpringContextTest.java | 15 --------------- 2 files changed, 3 insertions(+), 16 deletions(-) rename spring-sleuth/src/test/java/com/baeldung/{spring/session => }/SpringContextTest.java (83%) delete mode 100644 spring-sleuth/src/test/java/com/baeldung/sleuth/traceid/CurrentTraceIdAppSpringContextTest.java diff --git a/spring-sleuth/src/test/java/com/baeldung/spring/session/SpringContextTest.java b/spring-sleuth/src/test/java/com/baeldung/SpringContextTest.java similarity index 83% rename from spring-sleuth/src/test/java/com/baeldung/spring/session/SpringContextTest.java rename to spring-sleuth/src/test/java/com/baeldung/SpringContextTest.java index 7ddd194632..8dc2455e63 100644 --- a/spring-sleuth/src/test/java/com/baeldung/spring/session/SpringContextTest.java +++ b/spring-sleuth/src/test/java/com/baeldung/SpringContextTest.java @@ -1,10 +1,12 @@ -package com.baeldung.spring.session; +package com.baeldung; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; +import com.baeldung.spring.session.SleuthWebApp; + @RunWith(SpringRunner.class) @SpringBootTest(classes = SleuthWebApp.class) public class SpringContextTest { diff --git a/spring-sleuth/src/test/java/com/baeldung/sleuth/traceid/CurrentTraceIdAppSpringContextTest.java b/spring-sleuth/src/test/java/com/baeldung/sleuth/traceid/CurrentTraceIdAppSpringContextTest.java deleted file mode 100644 index ba181d730b..0000000000 --- a/spring-sleuth/src/test/java/com/baeldung/sleuth/traceid/CurrentTraceIdAppSpringContextTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.baeldung.sleuth.traceid; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SleuthCurrentTraceIdApp.class) -public class CurrentTraceIdAppSpringContextTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -}