diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-10-31 02:45:41 +0100 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-10-31 02:45:41 +0100 |
commit | e93f4ee1e845ed07b9c50df5de530196cef5774e (patch) | |
tree | b565973c8b6aa569dcf09d5d06ac48ff10178c7b /kamon-core/src/main/scala/kamon/trace/TraceContext.scala | |
parent | 31d38ce1564cb772a814010b9f832180649a3537 (diff) | |
download | Kamon-e93f4ee1e845ed07b9c50df5de530196cef5774e.tar.gz Kamon-e93f4ee1e845ed07b9c50df5de530196cef5774e.tar.bz2 Kamon-e93f4ee1e845ed07b9c50df5de530196cef5774e.zip |
+ spray: external naming for traces and segments, related to #65
Diffstat (limited to 'kamon-core/src/main/scala/kamon/trace/TraceContext.scala')
-rw-r--r-- | kamon-core/src/main/scala/kamon/trace/TraceContext.scala | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/kamon-core/src/main/scala/kamon/trace/TraceContext.scala b/kamon-core/src/main/scala/kamon/trace/TraceContext.scala index 08289acf..c4c28a68 100644 --- a/kamon-core/src/main/scala/kamon/trace/TraceContext.scala +++ b/kamon-core/src/main/scala/kamon/trace/TraceContext.scala @@ -129,7 +129,7 @@ class DefaultTraceContext(traceName: String, val token: String, izOpen: Boolean, def finish: Unit = { val segmentFinishNanoTime = System.nanoTime() - finishSegment(segmentName, label, (segmentFinishNanoTime - _segmentStartNanoTime)) + finishSegment(name, label, (segmentFinishNanoTime - _segmentStartNanoTime)) } } } @@ -155,7 +155,6 @@ object TraceContextOrigin { } trait TraceContextAware extends Serializable { - def captureNanoTime: Long def traceContext: TraceContext } @@ -163,7 +162,6 @@ object TraceContextAware { def default: TraceContextAware = new DefaultTraceContextAware class DefaultTraceContextAware extends TraceContextAware { - @transient val captureNanoTime = System.nanoTime() @transient val traceContext = TraceRecorder.currentContext // @@ -180,7 +178,17 @@ object TraceContextAware { } } -trait SegmentAware extends TraceContextAware { +trait TimestampedTraceContextAware extends TraceContextAware { + def captureNanoTime: Long +} + +object TimestampedTraceContextAware { + def default: TimestampedTraceContextAware = new DefaultTraceContextAware with TimestampedTraceContextAware { + @transient val captureNanoTime = System.nanoTime() + } +} + +trait SegmentAware { @volatile var segment: Segment = EmptyTraceContext.EmptySegment } |