diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-07-03 14:39:10 -0300 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-07-03 14:39:10 -0300 |
| commit | 2fd1958484dca0966610945ccadac4d69bf06bfd (patch) | |
| tree | 3d6faacade1f5d56cb956605ba9c2876d8ad3ebe /kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala | |
| parent | b0df3654cb82d87971fa67ff56a2e183dc93358f (diff) | |
| parent | 29068fc70a3e5a17a630c2c7fff951572bb5fa21 (diff) | |
| download | Kamon-2fd1958484dca0966610945ccadac4d69bf06bfd.tar.gz Kamon-2fd1958484dca0966610945ccadac4d69bf06bfd.tar.bz2 Kamon-2fd1958484dca0966610945ccadac4d69bf06bfd.zip | |
Merge branch 'wip/metrics-collection-refactor'
Conflicts:
kamon-datadog/src/test/scala/kamon/datadog/DatadogMetricSenderSpec.scala
Diffstat (limited to 'kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala')
| -rw-r--r-- | kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala b/kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala index 0c3783bb..775d3e26 100644 --- a/kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala +++ b/kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala @@ -28,9 +28,9 @@ import akka.testkit.{ TestKitBase, TestProbe } import com.typesafe.config.ConfigFactory import org.scalatest.{ Matchers, WordSpecLike } import kamon.Kamon -import kamon.metrics.{ TraceMetrics, Metrics } -import kamon.metrics.Subscriptions.TickMetricSnapshot -import kamon.metrics.TraceMetrics.ElapsedTime +import kamon.metric.{ TraceMetrics, Metrics } +import kamon.metric.Subscriptions.TickMetricSnapshot +import kamon.metric.TraceMetrics.ElapsedTime class WSInstrumentationSpec extends TestKitBase with WordSpecLike with Matchers with OneServerPerSuite { |