diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2015-02-15 10:46:36 +0100 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2015-02-15 10:46:36 +0100 |
commit | 8a532fc8c95a5700721248b6b4f558d9a1dcebcb (patch) | |
tree | 8f7f299e717ec6044b2eaa1f0922b0cbae02fd90 /kamon-core/src/main/scala/kamon/trace | |
parent | 0688c1a84caba17a600c498b158013f9867e4093 (diff) | |
download | Kamon-8a532fc8c95a5700721248b6b4f558d9a1dcebcb.tar.gz Kamon-8a532fc8c95a5700721248b6b4f558d9a1dcebcb.tar.bz2 Kamon-8a532fc8c95a5700721248b6b4f558d9a1dcebcb.zip |
! core: drop the Extension postfix on all core components.
Diffstat (limited to 'kamon-core/src/main/scala/kamon/trace')
-rw-r--r-- | kamon-core/src/main/scala/kamon/trace/MetricsOnlyContext.scala | 4 | ||||
-rw-r--r-- | kamon-core/src/main/scala/kamon/trace/Tracer.scala (renamed from kamon-core/src/main/scala/kamon/trace/TracerExtension.scala) | 12 | ||||
-rw-r--r-- | kamon-core/src/main/scala/kamon/trace/TracingContext.scala | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/kamon-core/src/main/scala/kamon/trace/MetricsOnlyContext.scala b/kamon-core/src/main/scala/kamon/trace/MetricsOnlyContext.scala index 5f7fdff5..eb4bad6f 100644 --- a/kamon-core/src/main/scala/kamon/trace/MetricsOnlyContext.scala +++ b/kamon-core/src/main/scala/kamon/trace/MetricsOnlyContext.scala @@ -19,13 +19,13 @@ package kamon.trace import java.util.concurrent.ConcurrentLinkedQueue import akka.event.LoggingAdapter -import kamon.metric.{ MetricsExtension, TraceMetrics } +import kamon.metric.{ Metrics, TraceMetrics } import kamon.util.{ NanoInterval, RelativeNanoTimestamp } import scala.annotation.tailrec private[kamon] class MetricsOnlyContext(traceName: String, val token: String, izOpen: Boolean, val levelOfDetail: LevelOfDetail, - val startTimestamp: RelativeNanoTimestamp, log: LoggingAdapter, metricsExtension: MetricsExtension) + val startTimestamp: RelativeNanoTimestamp, log: LoggingAdapter, metricsExtension: Metrics) extends TraceContext { @volatile private var _name = traceName diff --git a/kamon-core/src/main/scala/kamon/trace/TracerExtension.scala b/kamon-core/src/main/scala/kamon/trace/Tracer.scala index be565154..49ab518f 100644 --- a/kamon-core/src/main/scala/kamon/trace/TracerExtension.scala +++ b/kamon-core/src/main/scala/kamon/trace/Tracer.scala @@ -21,12 +21,12 @@ import java.util.concurrent.atomic.AtomicLong import akka.actor._ import com.typesafe.config.Config -import kamon.metric.MetricsExtension +import kamon.metric.Metrics import kamon.util._ import scala.util.Try -trait TracerExtension { +trait Tracer { def newContext(name: String): TraceContext def newContext(name: String, token: String): TraceContext def newContext(name: String, token: String, timestamp: RelativeNanoTimestamp, isOpen: Boolean, isLocal: Boolean): TraceContext @@ -35,7 +35,7 @@ trait TracerExtension { def unsubscribe(subscriber: ActorRef): Unit } -private[kamon] class TracerExtensionImpl(metricsExtension: MetricsExtension, config: Config) extends TracerExtension { +private[kamon] class TracerImpl(metricsExtension: Metrics, config: Config) extends Tracer { private val _settings = TraceSettings(config) private val _hostnamePrefix = Try(InetAddress.getLocalHost.getHostName).getOrElse("unknown-localhost") private val _tokenCounter = new AtomicLong @@ -100,10 +100,10 @@ private[kamon] class TracerExtensionImpl(metricsExtension: MetricsExtension, con } } -private[kamon] object TracerExtensionImpl { +private[kamon] object TracerImpl { - def apply(metricsExtension: MetricsExtension, config: Config) = - new TracerExtensionImpl(metricsExtension, config) + def apply(metricsExtension: Metrics, config: Config) = + new TracerImpl(metricsExtension, config) } case class TraceInfo(name: String, token: String, timestamp: NanoTimestamp, elapsedTime: NanoInterval, metadata: Map[String, String], segments: List[SegmentInfo]) diff --git a/kamon-core/src/main/scala/kamon/trace/TracingContext.scala b/kamon-core/src/main/scala/kamon/trace/TracingContext.scala index 3d324886..d34526f7 100644 --- a/kamon-core/src/main/scala/kamon/trace/TracingContext.scala +++ b/kamon-core/src/main/scala/kamon/trace/TracingContext.scala @@ -21,13 +21,13 @@ import java.util.concurrent.atomic.AtomicInteger import akka.event.LoggingAdapter import kamon.util.{ NanoInterval, RelativeNanoTimestamp, NanoTimestamp } -import kamon.metric.MetricsExtension +import kamon.metric.Metrics import scala.collection.concurrent.TrieMap private[trace] class TracingContext(traceName: String, token: String, izOpen: Boolean, levelOfDetail: LevelOfDetail, - isLocal: Boolean, startTimeztamp: RelativeNanoTimestamp, log: LoggingAdapter, metricsExtension: MetricsExtension, - traceExtension: TracerExtensionImpl, traceInfoSink: TracingContext ⇒ Unit) + isLocal: Boolean, startTimeztamp: RelativeNanoTimestamp, log: LoggingAdapter, metricsExtension: Metrics, + traceExtension: TracerImpl, traceInfoSink: TracingContext ⇒ Unit) extends MetricsOnlyContext(traceName, token, izOpen, levelOfDetail, startTimeztamp, log, metricsExtension) { private val _openSegments = new AtomicInteger(0) |