From daff0a358c8fe617ff90d480d8ef67d5e81a4e71 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 16 May 2018 17:26:11 +0200 Subject: [PATCH] onError & onComplete should reuse span from ThreadLocal we've played around with the working M7 version, and only after rolling back the changes on wrapping of onError and onComplete with try-with-resources, did we manage to successfully propagate the span context to various places. fixes gh-973 --- .../instrument/reactor/ScopePassingSpanSubscriber.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/ScopePassingSpanSubscriber.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/ScopePassingSpanSubscriber.java index d9b1a806d..63ee1ea7b 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/ScopePassingSpanSubscriber.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/ScopePassingSpanSubscriber.java @@ -83,15 +83,11 @@ final class ScopePassingSpanSubscriber extends AtomicBoolean implements SpanS } @Override public void onError(Throwable throwable) { - try (Tracer.SpanInScope inScope = this.tracer.withSpanInScope(this.span)) { - this.subscriber.onError(throwable); - } + this.subscriber.onError(throwable); } @Override public void onComplete() { - try (Tracer.SpanInScope inScope = this.tracer.withSpanInScope(this.span)) { - this.subscriber.onComplete(); - } + this.subscriber.onComplete(); } @Override public Context currentContext() {