From 07fc83bb01c5873b47aff50d6d3abbb9f11842bd Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Thu, 12 Feb 2015 11:30:06 +0100 Subject: ! all: Kamon now works as a single instance in a companion object. --- .../test/scala/kamon/metric/UserMetricsSpec.scala | 63 +++++++++++----------- 1 file changed, 32 insertions(+), 31 deletions(-) (limited to 'kamon-core/src/test/scala/kamon/metric/UserMetricsSpec.scala') diff --git a/kamon-core/src/test/scala/kamon/metric/UserMetricsSpec.scala b/kamon-core/src/test/scala/kamon/metric/UserMetricsSpec.scala index 7b6cbebc..455518f8 100644 --- a/kamon-core/src/test/scala/kamon/metric/UserMetricsSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/UserMetricsSpec.scala @@ -17,6 +17,7 @@ package kamon.metric import com.typesafe.config.ConfigFactory +import kamon.Kamon import kamon.metric.instrument.Histogram.DynamicRange import kamon.testkit.BaseKamonSpec import scala.concurrent.duration._ @@ -34,54 +35,54 @@ class UserMetricsSpec extends BaseKamonSpec("user-metrics-spec") { "the UserMetrics extension" should { "allow registering a fully configured Histogram and get the same Histogram if registering again" in { - val histogramA = kamon.userMetrics.histogram("histogram-with-settings", DynamicRange(1, 10000, 2)) - val histogramB = kamon.userMetrics.histogram("histogram-with-settings", DynamicRange(1, 10000, 2)) + val histogramA = Kamon.userMetrics.histogram("histogram-with-settings", DynamicRange(1, 10000, 2)) + val histogramB = Kamon.userMetrics.histogram("histogram-with-settings", DynamicRange(1, 10000, 2)) histogramA shouldBe theSameInstanceAs(histogramB) } "return the original Histogram when registering a fully configured Histogram for second time but with different settings" in { - val histogramA = kamon.userMetrics.histogram("histogram-with-settings", DynamicRange(1, 10000, 2)) - val histogramB = kamon.userMetrics.histogram("histogram-with-settings", DynamicRange(1, 50000, 2)) + val histogramA = Kamon.userMetrics.histogram("histogram-with-settings", DynamicRange(1, 10000, 2)) + val histogramB = Kamon.userMetrics.histogram("histogram-with-settings", DynamicRange(1, 50000, 2)) histogramA shouldBe theSameInstanceAs(histogramB) } "allow registering a Histogram that takes the default configuration from the kamon.metrics.precision settings" in { - kamon.userMetrics.histogram("histogram-with-default-configuration") + Kamon.userMetrics.histogram("histogram-with-default-configuration") } "allow registering a Counter and get the same Counter if registering again" in { - val counterA = kamon.userMetrics.counter("counter") - val counterB = kamon.userMetrics.counter("counter") + val counterA = Kamon.userMetrics.counter("counter") + val counterB = Kamon.userMetrics.counter("counter") counterA shouldBe theSameInstanceAs(counterB) } "allow registering a fully configured MinMaxCounter and get the same MinMaxCounter if registering again" in { - val minMaxCounterA = kamon.userMetrics.minMaxCounter("min-max-counter-with-settings", DynamicRange(1, 10000, 2), 1 second) - val minMaxCounterB = kamon.userMetrics.minMaxCounter("min-max-counter-with-settings", DynamicRange(1, 10000, 2), 1 second) + val minMaxCounterA = Kamon.userMetrics.minMaxCounter("min-max-counter-with-settings", DynamicRange(1, 10000, 2), 1 second) + val minMaxCounterB = Kamon.userMetrics.minMaxCounter("min-max-counter-with-settings", DynamicRange(1, 10000, 2), 1 second) minMaxCounterA shouldBe theSameInstanceAs(minMaxCounterB) } "return the original MinMaxCounter when registering a fully configured MinMaxCounter for second time but with different settings" in { - val minMaxCounterA = kamon.userMetrics.minMaxCounter("min-max-counter-with-settings", DynamicRange(1, 10000, 2), 1 second) - val minMaxCounterB = kamon.userMetrics.minMaxCounter("min-max-counter-with-settings", DynamicRange(1, 50000, 2), 1 second) + val minMaxCounterA = Kamon.userMetrics.minMaxCounter("min-max-counter-with-settings", DynamicRange(1, 10000, 2), 1 second) + val minMaxCounterB = Kamon.userMetrics.minMaxCounter("min-max-counter-with-settings", DynamicRange(1, 50000, 2), 1 second) minMaxCounterA shouldBe theSameInstanceAs(minMaxCounterB) } "allow registering a MinMaxCounter that takes the default configuration from the kamon.metrics.precision settings" in { - kamon.userMetrics.minMaxCounter("min-max-counter-with-default-configuration") + Kamon.userMetrics.minMaxCounter("min-max-counter-with-default-configuration") } "allow registering a fully configured Gauge and get the same Gauge if registering again" in { - val gaugeA = kamon.userMetrics.gauge("gauge-with-settings", DynamicRange(1, 10000, 2), 1 second, { + val gaugeA = Kamon.userMetrics.gauge("gauge-with-settings", DynamicRange(1, 10000, 2), 1 second, { () ⇒ 1L }) - val gaugeB = kamon.userMetrics.gauge("gauge-with-settings", DynamicRange(1, 10000, 2), 1 second, { + val gaugeB = Kamon.userMetrics.gauge("gauge-with-settings", DynamicRange(1, 10000, 2), 1 second, { () ⇒ 1L }) @@ -89,11 +90,11 @@ class UserMetricsSpec extends BaseKamonSpec("user-metrics-spec") { } "return the original Gauge when registering a fully configured Gauge for second time but with different settings" in { - val gaugeA = kamon.userMetrics.gauge("gauge-with-settings", DynamicRange(1, 10000, 2), 1 second, { + val gaugeA = Kamon.userMetrics.gauge("gauge-with-settings", DynamicRange(1, 10000, 2), 1 second, { () ⇒ 1L }) - val gaugeB = kamon.userMetrics.gauge("gauge-with-settings", DynamicRange(1, 10000, 2), 1 second, { + val gaugeB = Kamon.userMetrics.gauge("gauge-with-settings", DynamicRange(1, 10000, 2), 1 second, { () ⇒ 1L }) @@ -101,26 +102,26 @@ class UserMetricsSpec extends BaseKamonSpec("user-metrics-spec") { } "allow registering a Gauge that takes the default configuration from the kamon.metrics.precision settings" in { - kamon.userMetrics.gauge("gauge-with-default-configuration", { + Kamon.userMetrics.gauge("gauge-with-default-configuration", { () ⇒ 2L }) } "allow un-registering user metrics" in { - val counter = kamon.userMetrics.counter("counter-for-remove") - val histogram = kamon.userMetrics.histogram("histogram-for-remove") - val minMaxCounter = kamon.userMetrics.minMaxCounter("min-max-counter-for-remove") - val gauge = kamon.userMetrics.gauge("gauge-for-remove", { () ⇒ 2L }) - - kamon.userMetrics.removeCounter("counter-for-remove") - kamon.userMetrics.removeHistogram("histogram-for-remove") - kamon.userMetrics.removeMinMaxCounter("min-max-counter-for-remove") - kamon.userMetrics.removeGauge("gauge-for-remove") - - counter should not be (theSameInstanceAs(kamon.userMetrics.counter("counter-for-remove"))) - histogram should not be (theSameInstanceAs(kamon.userMetrics.histogram("histogram-for-remove"))) - minMaxCounter should not be (theSameInstanceAs(kamon.userMetrics.minMaxCounter("min-max-counter-for-remove"))) - gauge should not be (theSameInstanceAs(kamon.userMetrics.gauge("gauge-for-remove", { () ⇒ 2L }))) + val counter = Kamon.userMetrics.counter("counter-for-remove") + val histogram = Kamon.userMetrics.histogram("histogram-for-remove") + val minMaxCounter = Kamon.userMetrics.minMaxCounter("min-max-counter-for-remove") + val gauge = Kamon.userMetrics.gauge("gauge-for-remove", { () ⇒ 2L }) + + Kamon.userMetrics.removeCounter("counter-for-remove") + Kamon.userMetrics.removeHistogram("histogram-for-remove") + Kamon.userMetrics.removeMinMaxCounter("min-max-counter-for-remove") + Kamon.userMetrics.removeGauge("gauge-for-remove") + + counter should not be (theSameInstanceAs(Kamon.userMetrics.counter("counter-for-remove"))) + histogram should not be (theSameInstanceAs(Kamon.userMetrics.histogram("histogram-for-remove"))) + minMaxCounter should not be (theSameInstanceAs(Kamon.userMetrics.minMaxCounter("min-max-counter-for-remove"))) + gauge should not be (theSameInstanceAs(Kamon.userMetrics.gauge("gauge-for-remove", { () ⇒ 2L }))) } } } -- cgit v1.2.3