aboutsummaryrefslogtreecommitdiff
path: root/kamon-core
diff options
context:
space:
mode:
authorIvan Topolnak <ivantopo@gmail.com>2013-10-23 18:04:15 -0300
committerIvan Topolnak <ivantopo@gmail.com>2013-10-23 18:04:15 -0300
commit808846aaa931c2890016d7bb96ad22fd599f4104 (patch)
tree6f2c718bb937fcfec9516ba434776d3ff82ce680 /kamon-core
parent944ef29716d26910998ee20d4ff842301598e81b (diff)
downloadKamon-808846aaa931c2890016d7bb96ad22fd599f4104.tar.gz
Kamon-808846aaa931c2890016d7bb96ad22fd599f4104.tar.bz2
Kamon-808846aaa931c2890016d7bb96ad22fd599f4104.zip
Update to spray 1.2RC1
Diffstat (limited to 'kamon-core')
-rw-r--r--kamon-core/src/main/scala/kamon/instrumentation/SprayServerInstrumentation.scala2
-rw-r--r--kamon-core/src/main/scala/kamon/trace/UowTracing.scala8
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)
}
}