SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

onError & onComplete should reuse span from ThreadLocal

Browse Source 
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
This commit is contained in:
Marcin Grzejszczak
2018-05-16 17:26:11 +02:00
parent 4d9a7e311f
commit daff0a358c
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/ScopePassingSpanSubscriber.java
View File

@@ -83,15 +83,11 @@ final class ScopePassingSpanSubscriber<T> 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() {