From a37b79c0e523ba5057ae7d2c1b286ef932c4f2c5 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 13 Feb 2018 10:08:20 +0100 Subject: [PATCH] Moved span starting to SpanCreator --- .../cloud/sleuth/annotation/DefaultSpanCreator.java | 2 +- .../cloud/sleuth/annotation/SleuthAdvisorConfig.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/DefaultSpanCreator.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/DefaultSpanCreator.java index 7e2d5805f..36ae41a90 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/DefaultSpanCreator.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/DefaultSpanCreator.java @@ -48,7 +48,7 @@ class DefaultSpanCreator implements SpanCreator { log.debug("For the class [" + pjp.getThis().getClass() + "] method " + "[" + pjp.getMethod().getName() + "] will name the span [" + changedName + "]"); } - return this.tracer.tracer().nextSpan().name(changedName); + return this.tracer.tracer().nextSpan().name(changedName).start(); } } diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/SleuthAdvisorConfig.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/SleuthAdvisorConfig.java index ba5daa6f6..7454ebb69 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/SleuthAdvisorConfig.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/SleuthAdvisorConfig.java @@ -195,7 +195,7 @@ class SleuthInterceptor implements IntroductionInterceptor, BeanFactoryAware { } Span span = tracing().tracer().currentSpan(); if (newSpan != null || span == null) { - span = spanCreator().createSpan(invocation, newSpan).start(); + span = spanCreator().createSpan(invocation, newSpan); } String log = log(continueSpan); boolean hasLog = StringUtils.hasText(log);