aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2017-07-18 08:56:03 +0200
committerIvan Topolnjak <ivantopo@gmail.com>2017-07-18 08:56:03 +0200
commitcce0b5d9320c78fc66197104b68d1d9dddebf007 (patch)
treefe4d031faac46d4837bb54bcbdf98cc61ced4bd5
parent762b1a88abf67f234bda1efaa7286bee19399c3f (diff)
downloadKamon-cce0b5d9320c78fc66197104b68d1d9dddebf007.tar.gz
Kamon-cce0b5d9320c78fc66197104b68d1d9dddebf007.tar.bz2
Kamon-cce0b5d9320c78fc66197104b68d1d9dddebf007.zip
continuation now takes ActiveSpanSource as parameter instead of Tracer
-rw-r--r--kamon-core/src/main/scala/kamon/trace/Continuation.scala6
-rw-r--r--kamon-core/src/main/scala/kamon/trace/Span.scala1
2 files changed, 3 insertions, 4 deletions
diff --git a/kamon-core/src/main/scala/kamon/trace/Continuation.scala b/kamon-core/src/main/scala/kamon/trace/Continuation.scala
index 72d77597..18c4b5dd 100644
--- a/kamon-core/src/main/scala/kamon/trace/Continuation.scala
+++ b/kamon-core/src/main/scala/kamon/trace/Continuation.scala
@@ -26,11 +26,11 @@ object Continuation {
/**
*
* @param span
- * @param tracer
+ * @param activeSpanSource
*/
- final class Default(span: Span, tracer: Tracer) extends Continuation {
+ final class Default(span: Span, activeSpanSource: ActiveSpanSource) extends Continuation {
override def activate(): ActiveSpan =
- tracer.makeActive(span)
+ activeSpanSource.makeActive(span)
}
object Default {
diff --git a/kamon-core/src/main/scala/kamon/trace/Span.scala b/kamon-core/src/main/scala/kamon/trace/Span.scala
index 1138b2dd..c77b9a02 100644
--- a/kamon-core/src/main/scala/kamon/trace/Span.scala
+++ b/kamon-core/src/main/scala/kamon/trace/Span.scala
@@ -185,7 +185,6 @@ object Span {
}
-
object Metrics {
val SpanProcessingTimeMetric = Kamon.histogram("span.processing-time", MeasurementUnit.time.microseconds)
val SpanErrorCount = Kamon.counter("span.error-count")