From ed4676be2ae7d1c7cce30931d2bbd8289406acef Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Sun, 6 Apr 2014 02:28:45 -0300 Subject: ! core: add the notion of instrument types to metric snapshots --- kamon-core/src/test/scala/kamon/metrics/MetricSnapshotSpec.scala | 6 +++--- .../src/test/scala/kamon/metrics/TickMetricSnapshotBufferSpec.scala | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'kamon-core/src/test/scala') diff --git a/kamon-core/src/test/scala/kamon/metrics/MetricSnapshotSpec.scala b/kamon-core/src/test/scala/kamon/metrics/MetricSnapshotSpec.scala index c273aff1..b4f33ec3 100644 --- a/kamon-core/src/test/scala/kamon/metrics/MetricSnapshotSpec.scala +++ b/kamon-core/src/test/scala/kamon/metrics/MetricSnapshotSpec.scala @@ -49,16 +49,16 @@ class MetricSnapshotSpec extends WordSpec with Matchers { } trait SnapshotFixtures { - val emptySnapshot = MetricSnapshot(0, Scale.Unit, Vector.empty) + val emptySnapshot = MetricSnapshot(InstrumentTypes.Histogram, 0, Scale.Unit, Vector.empty) - val snapshotA = MetricSnapshot(100, Scale.Unit, Vector( + val snapshotA = MetricSnapshot(InstrumentTypes.Histogram, 100, Scale.Unit, Vector( Measurement(1, 3), Measurement(2, 15), Measurement(5, 68), Measurement(7, 13), Measurement(17, 1))) - val snapshotB = MetricSnapshot(100, Scale.Unit, Vector( + val snapshotB = MetricSnapshot(InstrumentTypes.Histogram, 100, Scale.Unit, Vector( Measurement(2, 6), Measurement(4, 48), Measurement(5, 39), diff --git a/kamon-core/src/test/scala/kamon/metrics/TickMetricSnapshotBufferSpec.scala b/kamon-core/src/test/scala/kamon/metrics/TickMetricSnapshotBufferSpec.scala index 33200e2d..d0a0c707 100644 --- a/kamon-core/src/test/scala/kamon/metrics/TickMetricSnapshotBufferSpec.scala +++ b/kamon-core/src/test/scala/kamon/metrics/TickMetricSnapshotBufferSpec.scala @@ -70,10 +70,10 @@ class TickMetricSnapshotBufferSpec extends TestKit(ActorSystem("tick-metric-snap val thirdEmpty = TickMetricSnapshot(3000, 4000, Map.empty) val firstNonEmpty = TickMetricSnapshot(1000, 2000, - Map((CustomMetric("test-metric") -> SimpleGroupSnapshot(Map(CustomMetric.RecordedValues -> MetricSnapshot(20, Scale.Unit, Vector(Measurement(1, 10), Measurement(10, 10)))))))) + Map((CustomMetric("test-metric") -> SimpleGroupSnapshot(Map(CustomMetric.RecordedValues -> MetricSnapshot(InstrumentTypes.Histogram, 20, Scale.Unit, Vector(Measurement(1, 10), Measurement(10, 10)))))))) val secondNonEmpty = TickMetricSnapshot(1000, 2000, - Map((CustomMetric("test-metric") -> SimpleGroupSnapshot(Map(CustomMetric.RecordedValues -> MetricSnapshot(15, Scale.Unit, Vector(Measurement(4, 9), Measurement(10, 6)))))))) + Map((CustomMetric("test-metric") -> SimpleGroupSnapshot(Map(CustomMetric.RecordedValues -> MetricSnapshot(InstrumentTypes.Histogram, 15, Scale.Unit, Vector(Measurement(4, 9), Measurement(10, 6)))))))) } -- cgit v1.2.3