diff --git a/spring-sleuth/pom.xml b/spring-sleuth/pom.xml index aac0084720..0116e57fbe 100644 --- a/spring-sleuth/pom.xml +++ b/spring-sleuth/pom.xml @@ -3,17 +3,34 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + 1.8 + 1.8 + + + + org.springframework.boot + spring-boot-starter-parent + 2.0.0.RELEASE + + + com.baeldung spring-sleuth 1.0.0-SNAPSHOT jar - - parent-boot-5 - com.baeldung - 0.0.1-SNAPSHOT - ../parent-boot-5 - + + + + spring-milestones + Spring Milestones + https://repo.spring.io/libs-milestone + + false + + + @@ -27,15 +44,15 @@ - - - org.springframework.cloud - spring-cloud-dependencies - Camden.SR3 - pom - import - - - + + + org.springframework.cloud + spring-cloud-sleuth + 2.0.0.M7 + pom + import + + + - \ No newline at end of file + diff --git a/spring-sleuth/src/main/java/com/baeldung/spring/session/SleuthService.java b/spring-sleuth/src/main/java/com/baeldung/spring/session/SleuthService.java index 38480a9b91..511a6078f5 100644 --- a/spring-sleuth/src/main/java/com/baeldung/spring/session/SleuthService.java +++ b/spring-sleuth/src/main/java/com/baeldung/spring/session/SleuthService.java @@ -3,11 +3,13 @@ package com.baeldung.spring.session; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.sleuth.Span; -import org.springframework.cloud.sleuth.Tracer; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; +import brave.Span; +import brave.Tracer; +import brave.Tracer.SpanInScope; + @Service public class SleuthService { private Logger logger = LoggerFactory.getLogger(this.getClass()); @@ -26,12 +28,12 @@ public class SleuthService { public void doSomeWorkNewSpan() throws InterruptedException { logger.info("I'm in the original span"); - Span newSpan = tracer.createSpan("newSpan"); - try { + Span newSpan = tracer.newTrace().name("newSpan").start(); + try (SpanInScope ws = tracer.withSpanInScope(newSpan.start())) { Thread.sleep(1000L); logger.info("I'm in the new span doing some cool work that needs its own span"); } finally { - tracer.close(newSpan); + newSpan.finish(); } logger.info("I'm in the original span");