diff options
author | Ivan Topolnak <ivantopo@gmail.com> | 2013-08-12 19:00:49 -0300 |
---|---|---|
committer | Ivan Topolnak <ivantopo@gmail.com> | 2013-08-12 19:00:49 -0300 |
commit | 36ca84c0505c65e7c4947d0b0a7edf12fcdec48e (patch) | |
tree | 45058e34262c8dce7a10d7fd2e35673bf729058f /kamon-core/src/main/scala/kamon/Kamon.scala | |
parent | b2c85b020185c9d5bcc89cfe9d4166405d1b404a (diff) | |
download | Kamon-36ca84c0505c65e7c4947d0b0a7edf12fcdec48e.tar.gz Kamon-36ca84c0505c65e7c4947d0b0a7edf12fcdec48e.tar.bz2 Kamon-36ca84c0505c65e7c4947d0b0a7edf12fcdec48e.zip |
fixed the instrumentation to work nicely with spray
Diffstat (limited to 'kamon-core/src/main/scala/kamon/Kamon.scala')
-rw-r--r-- | kamon-core/src/main/scala/kamon/Kamon.scala | 36 |
1 files changed, 1 insertions, 35 deletions
diff --git a/kamon-core/src/main/scala/kamon/Kamon.scala b/kamon-core/src/main/scala/kamon/Kamon.scala index c3080909..07773c55 100644 --- a/kamon-core/src/main/scala/kamon/Kamon.scala +++ b/kamon-core/src/main/scala/kamon/Kamon.scala @@ -8,33 +8,8 @@ import scala.concurrent.duration.{FiniteDuration, Duration} import com.newrelic.api.agent.NewRelic object Kamon { - - val ctx = new ThreadLocal[Option[TraceContext]] { - override def initialValue() = None - } - implicit lazy val actorSystem = ActorSystem("kamon") - - def context() = ctx.get() - def clear = ctx.remove() - def set(traceContext: TraceContext) = ctx.set(Some(traceContext)) - - def start = set(newTraceContext) - def stop = ctx.get match { - case Some(context) => context.close - case None => - } - - def newTraceContext(): TraceContext = TraceContext() - - - val publisher = actorSystem.actorOf(Props[TransactionPublisher]) - - def publish(tx: FullTransaction) = publisher ! tx - - - object Metric { val actorSystems = new ConcurrentHashMap[String, ActorSystemMetrics] asScala @@ -44,21 +19,12 @@ object Kamon { def actorSystem(name: String): Option[ActorSystemMetrics] = actorSystems.get(name) } - - val metricManager = actorSystem.actorOf(Props[MetricManager], "metric-manager") val newrelicReporter = actorSystem.actorOf(Props[NewrelicReporterActor], "newrelic-reporter") } - - - - - - - object Tracer { val ctx = new ThreadLocal[Option[TraceContext]] { override def initialValue() = None @@ -74,7 +40,7 @@ object Tracer { case None => } - //def newTraceContext(): TraceContext = TraceContext() + def newTraceContext(): TraceContext = TraceContext()(Kamon.actorSystem) } |