diff options
author | Ivan Topolnak <ivantopo@gmail.com> | 2013-10-23 18:04:15 -0300 |
---|---|---|
committer | Ivan Topolnak <ivantopo@gmail.com> | 2013-10-23 18:04:15 -0300 |
commit | 4a60407106320f8af192258167dc14dfa1acac7c (patch) | |
tree | 30c0bd57867ead06c251727196db2b2ad2ec800a /kamon-core/src | |
parent | c3dc34e0a5c0d796dc5f3278d4c49605b7850d0f (diff) | |
download | Kamon-4a60407106320f8af192258167dc14dfa1acac7c.tar.gz Kamon-4a60407106320f8af192258167dc14dfa1acac7c.tar.bz2 Kamon-4a60407106320f8af192258167dc14dfa1acac7c.zip |
Update to spray 1.2RC1
Diffstat (limited to 'kamon-core/src')
-rw-r--r-- | kamon-core/src/main/scala/kamon/instrumentation/SprayServerInstrumentation.scala | 2 | ||||
-rw-r--r-- | kamon-core/src/main/scala/kamon/trace/UowTracing.scala | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/kamon-core/src/main/scala/kamon/instrumentation/SprayServerInstrumentation.scala b/kamon-core/src/main/scala/kamon/instrumentation/SprayServerInstrumentation.scala index 2bd8643c..2239f382 100644 --- a/kamon-core/src/main/scala/kamon/instrumentation/SprayServerInstrumentation.scala +++ b/kamon-core/src/main/scala/kamon/instrumentation/SprayServerInstrumentation.scala @@ -62,7 +62,7 @@ class SprayServerInstrumentation { } } - @Pointcut("execution(spray.can.client.HttpHostConnector.RequestContext.new(..)) && this(ctx) && args(request, *, *)") + @Pointcut("execution(spray.can.client.HttpHostConnector.RequestContext.new(..)) && this(ctx) && args(request, *, *, *)") def requestRecordInit(ctx: TimedContextAware, request: HttpRequest): Unit = {} @After("requestRecordInit(ctx, request)") diff --git a/kamon-core/src/main/scala/kamon/trace/UowTracing.scala b/kamon-core/src/main/scala/kamon/trace/UowTracing.scala index 9ba3813a..b09478cc 100644 --- a/kamon-core/src/main/scala/kamon/trace/UowTracing.scala +++ b/kamon-core/src/main/scala/kamon/trace/UowTracing.scala @@ -3,13 +3,6 @@ package kamon.trace import akka.actor._ import scala.concurrent.duration.Duration import kamon.trace.UowTracing._ -import scala.Some -import kamon.trace.UowTracing.WebExternalFinish -import kamon.trace.UowTracing.Finish -import kamon.trace.UowTracing.Rename -import kamon.trace.UowTrace -import kamon.trace.UowTracing.WebExternalStart -import scala.Some sealed trait UowSegment { def timestamp: Long @@ -54,6 +47,7 @@ class UowTraceAggregator(reporting: ActorRef, aggregationTimeout: Duration) exte def finishTracing(): Unit = { reporting ! UowTrace(name.getOrElse("UNKNOWN"), segments) + println("Recorded Segments: " + segments) context.stop(self) } } |