diff options
Diffstat (limited to 'kamon-core/src/main/scala/kamon/trace')
5 files changed, 46 insertions, 44 deletions
diff --git a/kamon-core/src/main/scala/kamon/trace/MetricsOnlyContext.scala b/kamon-core/src/main/scala/kamon/trace/MetricsOnlyContext.scala index e62178dd..5f7fdff5 100644 --- a/kamon-core/src/main/scala/kamon/trace/MetricsOnlyContext.scala +++ b/kamon-core/src/main/scala/kamon/trace/MetricsOnlyContext.scala @@ -18,16 +18,14 @@ package kamon.trace import java.util.concurrent.ConcurrentLinkedQueue -import akka.actor.{ ExtensionId, ActorSystem } import akka.event.LoggingAdapter -import kamon.Kamon.Extension import kamon.metric.{ MetricsExtension, 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 actorSystem: ActorSystem) + val startTimestamp: RelativeNanoTimestamp, log: LoggingAdapter, metricsExtension: MetricsExtension) extends TraceContext { @volatile private var _name = traceName @@ -48,8 +46,6 @@ private[kamon] class MetricsOnlyContext(traceName: String, val token: String, iz def isOpen: Boolean = _isOpen def addMetadata(key: String, value: String): Unit = {} - def lookupExtension[T <: Extension](id: ExtensionId[T]): T = id(actorSystem) - def finish(): Unit = { _isOpen = false val traceElapsedTime = NanoInterval.since(startTimestamp) diff --git a/kamon-core/src/main/scala/kamon/trace/TraceContext.scala b/kamon-core/src/main/scala/kamon/trace/TraceContext.scala index ed8170a9..48e56153 100644 --- a/kamon-core/src/main/scala/kamon/trace/TraceContext.scala +++ b/kamon-core/src/main/scala/kamon/trace/TraceContext.scala @@ -17,12 +17,8 @@ package kamon.trace import java.io.ObjectStreamException -import akka.actor.{ ExtensionId, ActorSystem } -import kamon.Kamon.Extension -import kamon._ -import kamon.metric._ import kamon.trace.TraceContextAware.DefaultTraceContextAware -import kamon.util.{ NanoInterval, RelativeNanoTimestamp } +import kamon.util.RelativeNanoTimestamp trait TraceContext { def name: String @@ -39,8 +35,6 @@ trait TraceContext { def addMetadata(key: String, value: String) def startTimestamp: RelativeNanoTimestamp - - def lookupExtension[T <: Kamon.Extension](id: ExtensionId[T]): T } object TraceContext { @@ -99,9 +93,6 @@ case object EmptyTraceContext extends TraceContext { def addMetadata(key: String, value: String): Unit = {} def startTimestamp = new RelativeNanoTimestamp(0L) - override def lookupExtension[T <: Extension](id: ExtensionId[T]): T = - sys.error("Can't lookup extensions on a EmptyTraceContext.") - case object EmptySegment extends Segment { val name: String = "empty-segment" val category: String = "empty-category" diff --git a/kamon-core/src/main/scala/kamon/trace/TracerExtension.scala b/kamon-core/src/main/scala/kamon/trace/TracerExtension.scala index 41dcd6bc..be565154 100644 --- a/kamon-core/src/main/scala/kamon/trace/TracerExtension.scala +++ b/kamon-core/src/main/scala/kamon/trace/TracerExtension.scala @@ -20,20 +20,13 @@ import java.net.InetAddress import java.util.concurrent.atomic.AtomicLong import akka.actor._ -import akka.actor -import kamon.Kamon -import kamon.metric.{ Metrics, MetricsExtension } -import kamon.util.{ NanoInterval, RelativeNanoTimestamp, NanoTimestamp, GlobPathFilter } +import com.typesafe.config.Config +import kamon.metric.MetricsExtension +import kamon.util._ import scala.util.Try -object Tracer extends ExtensionId[TracerExtension] with ExtensionIdProvider { - override def get(system: ActorSystem): TracerExtension = super.get(system) - def lookup(): ExtensionId[_ <: actor.Extension] = Tracer - def createExtension(system: ExtendedActorSystem): TracerExtension = new TracerExtensionImpl(system) -} - -trait TracerExtension extends Kamon.Extension { +trait TracerExtension { 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 @@ -42,14 +35,13 @@ trait TracerExtension extends Kamon.Extension { def unsubscribe(subscriber: ActorRef): Unit } -class TracerExtensionImpl(system: ExtendedActorSystem) extends TracerExtension { - private val _settings = TraceSettings(system) - private val _metricsExtension = Metrics.get(system) - +private[kamon] class TracerExtensionImpl(metricsExtension: MetricsExtension, config: Config) extends TracerExtension { + private val _settings = TraceSettings(config) private val _hostnamePrefix = Try(InetAddress.getLocalHost.getHostName).getOrElse("unknown-localhost") private val _tokenCounter = new AtomicLong - private val _subscriptions = system.actorOf(Props[TraceSubscriptions], "trace-subscriptions") - private val _incubator = system.actorOf(Incubator.props(_subscriptions)) + + private val _subscriptions = new LazyActorRef + private val _incubator = new LazyActorRef private def newToken: String = _hostnamePrefix + "-" + String.valueOf(_tokenCounter.incrementAndGet()) @@ -66,7 +58,7 @@ class TracerExtensionImpl(system: ExtendedActorSystem) extends TracerExtension { private def createTraceContext(traceName: String, token: String = newToken, startTimestamp: RelativeNanoTimestamp = RelativeNanoTimestamp.now, isOpen: Boolean = true, isLocal: Boolean = true): TraceContext = { - def newMetricsOnlyContext = new MetricsOnlyContext(traceName, token, isOpen, _settings.levelOfDetail, startTimestamp, null, _metricsExtension, system) + def newMetricsOnlyContext = new MetricsOnlyContext(traceName, token, isOpen, _settings.levelOfDetail, startTimestamp, null, metricsExtension) if (_settings.levelOfDetail == LevelOfDetail.MetricsOnly || !isLocal) newMetricsOnlyContext @@ -74,20 +66,44 @@ class TracerExtensionImpl(system: ExtendedActorSystem) extends TracerExtension { if (!_settings.sampler.shouldTrace) newMetricsOnlyContext else - new TracingContext(traceName, token, true, _settings.levelOfDetail, isLocal, startTimestamp, null, _metricsExtension, this, system, dispatchTracingContext) + new TracingContext(traceName, token, true, _settings.levelOfDetail, isLocal, startTimestamp, null, metricsExtension, this, dispatchTracingContext) } } - def subscribe(subscriber: ActorRef): Unit = _subscriptions ! TraceSubscriptions.Subscribe(subscriber) - def unsubscribe(subscriber: ActorRef): Unit = _subscriptions ! TraceSubscriptions.Unsubscribe(subscriber) + def subscribe(subscriber: ActorRef): Unit = + _subscriptions.tell(TraceSubscriptions.Subscribe(subscriber)) + + def unsubscribe(subscriber: ActorRef): Unit = + _subscriptions.tell(TraceSubscriptions.Unsubscribe(subscriber)) private[kamon] def dispatchTracingContext(trace: TracingContext): Unit = if (_settings.sampler.shouldReport(trace.elapsedTime)) if (trace.shouldIncubate) - _incubator ! trace + _incubator.tell(trace) else - _subscriptions ! trace.generateTraceInfo + _subscriptions.tell(trace.generateTraceInfo) + + /** + * Tracer Extension initialization. + */ + private var _system: ActorSystem = null + private lazy val _start = { + val subscriptions = _system.actorOf(Props[TraceSubscriptions], "trace-subscriptions") + _subscriptions.point(subscriptions) + _incubator.point(_system.actorOf(Incubator.props(subscriptions))) + } + + def start(system: ActorSystem): Unit = synchronized { + _system = system + _start + _system = null + } +} + +private[kamon] object TracerExtensionImpl { + def apply(metricsExtension: MetricsExtension, config: Config) = + new TracerExtensionImpl(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/TracerExtensionSettings.scala b/kamon-core/src/main/scala/kamon/trace/TracerExtensionSettings.scala index d360330d..7510ab7f 100644 --- a/kamon-core/src/main/scala/kamon/trace/TracerExtensionSettings.scala +++ b/kamon-core/src/main/scala/kamon/trace/TracerExtensionSettings.scala @@ -18,13 +18,13 @@ package kamon.trace import java.util.concurrent.TimeUnit -import akka.actor.ActorSystem +import com.typesafe.config.Config case class TraceSettings(levelOfDetail: LevelOfDetail, sampler: Sampler) object TraceSettings { - def apply(system: ActorSystem): TraceSettings = { - val tracerConfig = system.settings.config.getConfig("kamon.trace") + def apply(config: Config): TraceSettings = { + val tracerConfig = config.getConfig("kamon.trace") val detailLevel: LevelOfDetail = tracerConfig.getString("level-of-detail") match { case "metrics-only" ⇒ LevelOfDetail.MetricsOnly diff --git a/kamon-core/src/main/scala/kamon/trace/TracingContext.scala b/kamon-core/src/main/scala/kamon/trace/TracingContext.scala index dd4c3c1a..3d324886 100644 --- a/kamon-core/src/main/scala/kamon/trace/TracingContext.scala +++ b/kamon-core/src/main/scala/kamon/trace/TracingContext.scala @@ -19,7 +19,6 @@ package kamon.trace import java.util.concurrent.ConcurrentLinkedQueue import java.util.concurrent.atomic.AtomicInteger -import akka.actor.ActorSystem import akka.event.LoggingAdapter import kamon.util.{ NanoInterval, RelativeNanoTimestamp, NanoTimestamp } import kamon.metric.MetricsExtension @@ -28,8 +27,8 @@ 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, system: ActorSystem, traceInfoSink: TracingContext ⇒ Unit) - extends MetricsOnlyContext(traceName, token, izOpen, levelOfDetail, startTimeztamp, log, metricsExtension, system) { + traceExtension: TracerExtensionImpl, traceInfoSink: TracingContext ⇒ Unit) + extends MetricsOnlyContext(traceName, token, izOpen, levelOfDetail, startTimeztamp, log, metricsExtension) { private val _openSegments = new AtomicInteger(0) private val _startTimestamp = NanoTimestamp.now |