diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-11-10 16:36:04 +0100 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-11-10 16:37:08 +0100 |
| commit | 3ac760af8bea8e26f1e93adb46921e0b24e48740 (patch) | |
| tree | 1516452880616db51c275c8f1bc56c1b3a2c1eb9 | |
| parent | 007157a3ec7e9886a60f57b2eb9fbd8072ce2320 (diff) | |
| download | Kamon-3ac760af8bea8e26f1e93adb46921e0b24e48740.tar.gz Kamon-3ac760af8bea8e26f1e93adb46921e0b24e48740.tar.bz2 Kamon-3ac760af8bea8e26f1e93adb46921e0b24e48740.zip | |
include missing files from previous commit.
4 files changed, 7 insertions, 5 deletions
diff --git a/kamon-newrelic/src/main/scala/kamon/newrelic/MetricReporter.scala b/kamon-newrelic/src/main/scala/kamon/newrelic/MetricReporter.scala index 0aa078f5..9742ed09 100644 --- a/kamon-newrelic/src/main/scala/kamon/newrelic/MetricReporter.scala +++ b/kamon-newrelic/src/main/scala/kamon/newrelic/MetricReporter.scala @@ -34,7 +34,7 @@ class MetricReporter(settings: Agent.Settings, runID: Long, baseUri: Uri) extend val collectorClient = compressedPipeline(IO(Http)(context.system)) val subscriber = { - val tickInterval = context.system.settings.config.getDuration("kamon.metrics.tick-interval", TimeUnit.MILLISECONDS) + val tickInterval = context.system.settings.config.getMilliseconds("kamon.metrics.tick-interval") if (tickInterval == 60000) self else diff --git a/kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala b/kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala index 2791df80..fdc7fb09 100644 --- a/kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala +++ b/kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala @@ -38,7 +38,7 @@ class WSInstrumentation { val playExtension = Kamon(Play)(system) val executor = playExtension.defaultDispatcher val segmentName = playExtension.generateHttpClientSegmentName(request) - val segment = ctx.startSegment(segmentName, SegmentMetricIdentityLabel.HttpClient, Play.SegmentLibraryName) + val segment = ctx.startSegment(segmentName, SegmentCategory.HttpClient, Play.SegmentLibraryName) val response = pjp.proceed().asInstanceOf[Future[Response]] response.map(result ⇒ segment.finish())(executor) diff --git a/kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala b/kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala index 8cb8cc22..b548b057 100644 --- a/kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala +++ b/kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala @@ -85,8 +85,10 @@ object SimpleRequestProcessor extends App with SimpleRoutingApp with RequestBuil path("site") { traceName("FinalGetSite-3") { complete { - for (f1 <- pipeline(Get("http://127.0.0.1:9090/ok")); - f2 <- pipeline(Get("http://www.google.com/search?q=mkyong"))) yield "Ok Double Future" + for ( + f1 ← pipeline(Get("http://127.0.0.1:9090/ok")); + f2 ← pipeline(Get("http://www.google.com/search?q=mkyong")) + ) yield "Ok Double Future" } } } ~ diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 07d62dfb..2f80f1db 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -30,7 +30,7 @@ object Dependencies { val akkaRemote = "com.typesafe.akka" %% "akka-remote" % akkaVersion val akkaCluster = "com.typesafe.akka" %% "akka-cluster" % akkaVersion val play = "com.typesafe.play" %% "play" % playVersion - val playTest = "org.scalatestplus" %% "play" % "1.2.0" + val playTest = "org.scalatestplus" %% "play" % "1.3.0" val slf4Api = "org.slf4j" % "slf4j-api" % slf4jVersion val slf4nop = "org.slf4j" % "slf4j-nop" % slf4jVersion val scalaCompiler = "org.scala-lang" % "scala-compiler" % Settings.ScalaVersion |