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/test/scala/kamon/play | |
| 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/test/scala/kamon/play')
| -rw-r--r-- | kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala b/kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala index bf1ead05..bda8281b 100644 --- a/kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala +++ b/kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala @@ -19,7 +19,7 @@ package kamon.play import kamon.Kamon import kamon.metric.TraceMetrics.TraceMetricsSnapshot import kamon.metric.{ Metrics, TraceMetrics } -import kamon.trace.{ SegmentMetricIdentityLabel, SegmentMetricIdentity, TraceRecorder } +import kamon.trace.{ SegmentCategory, SegmentMetricIdentity, TraceRecorder } import org.scalatest.{ Matchers, WordSpecLike } import org.scalatestplus.play.OneServerPerSuite import play.api.libs.ws.WS @@ -49,7 +49,7 @@ class WSInstrumentationSpec extends WordSpecLike with Matchers with OneServerPer val snapshot = takeSnapshotOf("GET: /inside") snapshot.elapsedTime.numberOfMeasurements should be(1) snapshot.segments.size should be(1) - snapshot.segments(SegmentMetricIdentity("http://localhost:19001/async", SegmentMetricIdentityLabel.HttpClient)).numberOfMeasurements should be(1) + snapshot.segments(SegmentMetricIdentity("http://localhost:19001/async", SegmentCategory.HttpClient, Play.SegmentLibraryName)).numberOfMeasurements should be(1) } "propagate the TraceContext outside an Action and complete the WS request" in { |