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-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.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-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala')
| -rw-r--r-- | kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala | 4 |
1 files changed, 2 insertions, 2 deletions
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 c58e9f0c..2791df80 100644 --- a/kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala +++ b/kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala @@ -18,7 +18,7 @@ package kamon.play.instrumentation import kamon.Kamon import kamon.play.Play -import kamon.trace.SegmentMetricIdentityLabel +import kamon.trace.{ SegmentCategory, SegmentMetricIdentity } import org.aspectj.lang.ProceedingJoinPoint import org.aspectj.lang.annotation.{ Around, Aspect, Pointcut } import kamon.trace.TraceRecorder @@ -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) + val segment = ctx.startSegment(segmentName, SegmentMetricIdentityLabel.HttpClient, Play.SegmentLibraryName) val response = pjp.proceed().asInstanceOf[Future[Response]] response.map(result ⇒ segment.finish())(executor) |