diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2015-05-09 15:36:16 +0200 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2015-05-09 15:36:16 +0200 |
commit | 76f503b8f954e1b149bea3adb8927704f7095876 (patch) | |
tree | 59cabc6055e855c006115c5847a85f879dc36dd9 /kamon-playground/src/main | |
parent | 520895a6a9a6b48b83efe01cf289708efd045b42 (diff) | |
parent | d69f14710b1d933d58412edd63b465b13a09a9d0 (diff) | |
download | Kamon-76f503b8f954e1b149bea3adb8927704f7095876.tar.gz Kamon-76f503b8f954e1b149bea3adb8927704f7095876.tar.bz2 Kamon-76f503b8f954e1b149bea3adb8927704f7095876.zip |
Merge branch 'master' into release-legacy-akka-2.2
Conflicts:
kamon-akka/src/test/scala/kamon/akka/RouterMetricsSpec.scala
kamon-akka/src/test/scala/kamon/akka/instrumentation/ActorCellInstrumentationSpec.scala
kamon-akka/src/test/scala/kamon/akka/instrumentation/AskPatternInstrumentationSpec.scala
kamon-core/src/test/scala/kamon/metric/TraceMetricsSpec.scala
kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala
kamon-play/src/main/scala/kamon/play/action/KamonTraceActions.scala
kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala
kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala
kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala
project/Dependencies.scala
project/Settings.scala
Diffstat (limited to 'kamon-playground/src/main')
-rw-r--r-- | kamon-playground/src/main/resources/application.conf | 10 | ||||
-rw-r--r-- | kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala | 10 |
2 files changed, 13 insertions, 7 deletions
diff --git a/kamon-playground/src/main/resources/application.conf b/kamon-playground/src/main/resources/application.conf index 74e710bc..a8ad9e75 100644 --- a/kamon-playground/src/main/resources/application.conf +++ b/kamon-playground/src/main/resources/application.conf @@ -22,7 +22,8 @@ kamon { metric { filters { trace.includes = [ "**" ] - actor.includes = [ "**" ] + akka-actor.includes = [ "**" ] + akka-dispatcher.includes = [ "**" ] } } @@ -31,9 +32,14 @@ kamon { license-key = e7d350b14228f3d28f35bc3140df2c3e565ea5d5 } + internal-config { + akka.loglevel = DEBUG + } + modules { kamon-newrelic.auto-start = no - kamon-datadog.auto-start = no + kamon-statsd.auto-start = no + kamon-datadog.auto-start = yes kamon-log-reporter.auto-start = no kamon-system-metrics.auto-start = no } diff --git a/kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala b/kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala index 7a38e790..959da862 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.SubscriptionsDispatcher.TickMetricSnapshot import kamon.metric._ import kamon.spray.KamonTraceDirectives -import kamon.trace.{ TraceContext, SegmentCategory } +import kamon.trace.{ Tracer, TraceContext, SegmentCategory } import spray.http.{ StatusCodes, Uri } import spray.httpx.RequestBuilding import spray.routing.SimpleRoutingApp @@ -37,8 +37,8 @@ object SimpleRequestProcessor extends App with SimpleRoutingApp with RequestBuil import scala.concurrent.duration._ - implicit val system = ActorSystem("test") Kamon.start() + implicit val system = ActorSystem("test") import test.SimpleRequestProcessor.system.dispatcher val printer = system.actorOf(Props[PrintWhatever]) @@ -49,7 +49,7 @@ object SimpleRequestProcessor extends App with SimpleRoutingApp with RequestBuil implicit val timeout = Timeout(30 seconds) - val counter = Kamon.userMetrics.counter("requests") + val counter = Kamon.metrics.counter("requests") val pipeline = sendReceive val replier = system.actorOf(Props[Replier].withRouter(RoundRobinRouter(nrOfInstances = 4)), "replier") @@ -116,7 +116,7 @@ object SimpleRequestProcessor extends App with SimpleRoutingApp with RequestBuil } ~ path("segment") { complete { - val segment = TraceContext.currentContext.startSegment("hello-world", SegmentCategory.HttpClient, "none") + val segment = Tracer.currentContext.startSegment("hello-world", SegmentCategory.HttpClient, "none") (replier ? "hello").mapTo[String].onComplete { t ⇒ segment.finish() } @@ -162,7 +162,7 @@ object Verifier extends App { class Replier extends Actor with ActorLogging { def receive = { case anything ⇒ - if (TraceContext.currentContext.isEmpty) + if (Tracer.currentContext.isEmpty) log.warning("PROCESSING A MESSAGE WITHOUT CONTEXT") //log.info("Processing at the Replier, and self is: {}", self) |