1 files changed, 31 insertions, 34 deletions
diff --git a/kamon-core/src/test/scala/kamon/metric/TickMetricSnapshotBufferSpec.scala b/kamon-core/src/test/scala/kamon/metric/TickMetricSnapshotBufferSpec.scala
index a9197ab5..2e1f246d 100644
--- a/kamon-core/src/test/scala/kamon/metric/TickMetricSnapshotBufferSpec.scala
+++ b/kamon-core/src/test/scala/kamon/metric/TickMetricSnapshotBufferSpec.scala
@@ -17,32 +17,29 @@
 package kamon.metric
 
 import com.typesafe.config.ConfigFactory
-import kamon.{ MilliTimestamp, Kamon }
-import kamon.metric.instrument.Histogram
 import kamon.metric.instrument.Histogram.MutableRecord
-import org.scalatest.{ Matchers, WordSpecLike }
-import akka.testkit.{ ImplicitSender, TestKitBase }
-import akka.actor.ActorSystem
+import kamon.testkit.BaseKamonSpec
+import kamon.util.MilliTimestamp
+import akka.testkit.ImplicitSender
 import scala.concurrent.duration._
-import kamon.metric.Subscriptions.TickMetricSnapshot
-
-class TickMetricSnapshotBufferSpec extends TestKitBase with WordSpecLike with Matchers with ImplicitSender {
-  implicit lazy val system: ActorSystem = ActorSystem("trace-metrics-spec", ConfigFactory.parseString(
-    """
-      |kamon.metrics {
-      |  tick-interval = 1 hour
-      |  default-collection-context-buffer-size = 10
-      |
-      |  filters = [
-      |    {
-      |      trace {
-      |        includes = [ "*" ]
-      |        excludes = [ "non-tracked-trace"]
-      |      }
-      |    }
-      |  ]
-      |}
-    """.stripMargin))
+import kamon.metric.SubscriptionsDispatcher.TickMetricSnapshot
+
+class TickMetricSnapshotBufferSpec extends BaseKamonSpec("trace-metrics-spec") with ImplicitSender {
+  override lazy val config =
+    ConfigFactory.parseString(
+      """
+        |kamon.metric {
+        |  tick-interval = 1 hour
+        |  default-collection-context-buffer-size = 10
+        |
+        |  filters {
+        |    trace {
+        |      includes = [ "*" ]
+        |      excludes = [ "non-tracked-trace" ]
+        |    }
+        |  }
+        |}
+      """.stripMargin)
 
   "the TickMetricSnapshotBuffer" should {
     "merge TickMetricSnapshots received until the flush timeout is reached and fix the from/to fields" in new SnapshotFixtures {
@@ -74,7 +71,7 @@ class TickMetricSnapshotBufferSpec extends TestKitBase with WordSpecLike with Ma
       mergedSnapshot.to.millis should equal(4000)
       mergedSnapshot.metrics should not be ('empty)
 
-      val testMetricSnapshot = mergedSnapshot.metrics(testTraceIdentity).metrics(TraceMetrics.ElapsedTime).asInstanceOf[Histogram.Snapshot]
+      val testMetricSnapshot = mergedSnapshot.metrics(testTraceIdentity).histogram("elapsed-time").get
       testMetricSnapshot.min should equal(10)
       testMetricSnapshot.max should equal(300)
       testMetricSnapshot.numberOfMeasurements should equal(6)
@@ -88,23 +85,23 @@ class TickMetricSnapshotBufferSpec extends TestKitBase with WordSpecLike with Ma
   }
 
   trait SnapshotFixtures {
-    val collectionContext = Kamon(Metrics).buildDefaultCollectionContext
-    val testTraceIdentity = TraceMetrics("buffer-spec-test-trace")
-    val traceRecorder = Kamon(Metrics).register(testTraceIdentity, TraceMetrics.Factory).get
+    val collectionContext = kamon.metrics.buildDefaultCollectionContext
+    val testTraceIdentity = Entity("buffer-spec-test-trace", "trace")
+    val traceRecorder = kamon.metrics.register(TraceMetrics, "buffer-spec-test-trace").get.recorder
 
     val firstEmpty = TickMetricSnapshot(new MilliTimestamp(1000), new MilliTimestamp(2000), Map.empty)
     val secondEmpty = TickMetricSnapshot(new MilliTimestamp(2000), new MilliTimestamp(3000), Map.empty)
     val thirdEmpty = TickMetricSnapshot(new MilliTimestamp(3000), new MilliTimestamp(4000), Map.empty)
 
-    traceRecorder.elapsedTime.record(10L)
-    traceRecorder.elapsedTime.record(20L)
-    traceRecorder.elapsedTime.record(30L)
+    traceRecorder.ElapsedTime.record(10L)
+    traceRecorder.ElapsedTime.record(20L)
+    traceRecorder.ElapsedTime.record(30L)
     val firstNonEmpty = TickMetricSnapshot(new MilliTimestamp(1000), new MilliTimestamp(2000), Map(
       (testTraceIdentity -> traceRecorder.collect(collectionContext))))
 
-    traceRecorder.elapsedTime.record(10L)
-    traceRecorder.elapsedTime.record(10L)
-    traceRecorder.elapsedTime.record(300L)
+    traceRecorder.ElapsedTime.record(10L)
+    traceRecorder.ElapsedTime.record(10L)
+    traceRecorder.ElapsedTime.record(300L)
     val secondNonEmpty = TickMetricSnapshot(new MilliTimestamp(1000), new MilliTimestamp(2000), Map(
       (testTraceIdentity -> traceRecorder.collect(collectionContext))))
   }