diff options
-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 | ||||
-rw-r--r-- | project/Dependencies.scala | 4 | ||||
-rw-r--r-- | project/Settings.scala | 4 | ||||
-rw-r--r-- | project/plugins.sbt | 2 |
5 files changed, 8 insertions, 12 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) } } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index b940edf6..90336c02 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -7,8 +7,8 @@ object Dependencies { "spray nightlies repo" at "http://nightlies.spray.io" ) - val sprayVersion = "1.2-M8" - val akkaVersion = "2.2.0" + val sprayVersion = "1.2-RC1" + val akkaVersion = "2.2.3" val sprayCan = "io.spray" % "spray-can" % sprayVersion val sprayRouting = "io.spray" % "spray-routing" % sprayVersion diff --git a/project/Settings.scala b/project/Settings.scala index 8db28a7e..f7f07527 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -3,12 +3,12 @@ import Keys._ import spray.revolver.RevolverPlugin.Revolver object Settings { - val VERSION = "0.0.5" + val VERSION = "0.0.6" lazy val basicSettings = seq( version := VERSION, organization := "kamon", - scalaVersion := "2.10.2", + scalaVersion := "2.10.3", resolvers ++= Dependencies.resolutionRepos, fork in run := true, scalacOptions := Seq( diff --git a/project/plugins.sbt b/project/plugins.sbt index 6dc4b037..70e313e9 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -7,3 +7,5 @@ addSbtPlugin("io.spray" % "sbt-revolver" % "0.6.2") addSbtPlugin("com.typesafe.sbt" % "sbt-aspectj" % "0.9.0") addSbtPlugin("com.ivantopo.sbt" % "sbt-newrelic" % "0.0.1") + +addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8") |