diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-11-10 16:35:32 +0100 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-11-10 16:35:32 +0100 |
commit | 007157a3ec7e9886a60f57b2eb9fbd8072ce2320 (patch) | |
tree | bcb3a3f2213c102550bdc8d59aca9ba9d6bf774c /kamon-playground/src/main/scala | |
parent | 63b31056da21238188931552102f963982c96543 (diff) | |
parent | 5b9bbb196734c47e67d69d48e378e196b205fd57 (diff) | |
download | Kamon-007157a3ec7e9886a60f57b2eb9fbd8072ce2320.tar.gz Kamon-007157a3ec7e9886a60f57b2eb9fbd8072ce2320.tar.bz2 Kamon-007157a3ec7e9886a60f57b2eb9fbd8072ce2320.zip |
Merge branch 'master' into release-0.2
Conflicts:
kamon-newrelic/src/main/scala/kamon/newrelic/Agent.scala
kamon-newrelic/src/main/scala/kamon/newrelic/NewRelic.scala
kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala
project/Dependencies.scala
project/Projects.scala
Diffstat (limited to 'kamon-playground/src/main/scala')
-rw-r--r-- | kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala b/kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala index af1eb793..8cb8cc22 100644 --- a/kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala +++ b/kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala @@ -23,7 +23,7 @@ import kamon.Kamon import kamon.metric.Subscriptions.TickMetricSnapshot import kamon.metric._ import kamon.spray.KamonTraceDirectives -import kamon.trace.{ SegmentMetricIdentityLabel, TraceRecorder } +import kamon.trace.{ SegmentCategory, TraceRecorder } import spray.http.{ StatusCodes, Uri } import spray.httpx.RequestBuilding import spray.routing.SimpleRoutingApp @@ -83,8 +83,11 @@ object SimpleRequestProcessor extends App with SimpleRoutingApp with RequestBuil } } ~ path("site") { - complete { - pipeline(Get("http://localhost:9090/site-redirect")) + 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" + } } } ~ path("site-redirect") { @@ -99,14 +102,14 @@ object SimpleRequestProcessor extends App with SimpleRoutingApp with RequestBuil } } ~ path("ok") { - traceName("OK") { + traceName("RespondWithOK-3") { complete { "ok" } } } ~ path("future") { - traceName("OK-Future") { + traceName("OKFuture") { dynamic { counter.increment() complete(Future { "OK" }) @@ -127,7 +130,7 @@ object SimpleRequestProcessor extends App with SimpleRoutingApp with RequestBuil } ~ path("segment") { complete { - val segment = TraceRecorder.currentContext.startSegment("hello-world", SegmentMetricIdentityLabel.HttpClient) + val segment = TraceRecorder.currentContext.startSegment("hello-world", SegmentCategory.HttpClient, "none") (replier ? "hello").mapTo[String].onComplete { t ⇒ segment.finish() } |