diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2017-07-18 08:39:03 +0200 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2017-07-18 08:39:03 +0200 |
commit | ff0ae562b9f603e9a9f708fa592c5a494110e175 (patch) | |
tree | 348f915128e0105d4394d105d5023a6321f4c938 /kamon-core/src/main/scala/kamon/trace/ActiveSpan.scala | |
parent | 276a43f1662ed7b8a584f70441b7f32ea056f770 (diff) | |
download | Kamon-ff0ae562b9f603e9a9f708fa592c5a494110e175.tar.gz Kamon-ff0ae562b9f603e9a9f708fa592c5a494110e175.tar.bz2 Kamon-ff0ae562b9f603e9a9f708fa592c5a494110e175.zip |
return the wrapped Span upon deactivation of a ActiveSpan
Diffstat (limited to 'kamon-core/src/main/scala/kamon/trace/ActiveSpan.scala')
-rw-r--r-- | kamon-core/src/main/scala/kamon/trace/ActiveSpan.scala | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kamon-core/src/main/scala/kamon/trace/ActiveSpan.scala b/kamon-core/src/main/scala/kamon/trace/ActiveSpan.scala index 3a46d94f..3753cd7e 100644 --- a/kamon-core/src/main/scala/kamon/trace/ActiveSpan.scala +++ b/kamon-core/src/main/scala/kamon/trace/ActiveSpan.scala @@ -14,7 +14,7 @@ trait ActiveSpan extends Span { * Sets the currently active Span to whatever Span was active when this Span was activated. * */ - def deactivate(): Unit + def deactivate(): Span } object ActiveSpan { @@ -22,8 +22,10 @@ object ActiveSpan { final class Default(wrappedSpan: Span, restoreOnDeactivate: ActiveSpan, tl: ThreadLocal[ActiveSpan]) extends ActiveSpan { - override def deactivate(): Unit = + override def deactivate(): Span = { tl.set(restoreOnDeactivate) + wrappedSpan + } // // Forward all other members to the wrapped Span. |