From 1c176f002cc26061b1ccb04ec9f13ab4fb39eacd Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Sun, 15 Feb 2015 10:26:58 +0100 Subject: = core: rename UserMetrics to SimpleMetrics. --- .../scala/kamon/metric/SimpleMetricsSpec.scala | 127 +++++++++++++++++++++ .../test/scala/kamon/metric/UserMetricsSpec.scala | 127 --------------------- 2 files changed, 127 insertions(+), 127 deletions(-) create mode 100644 kamon-core/src/test/scala/kamon/metric/SimpleMetricsSpec.scala delete mode 100644 kamon-core/src/test/scala/kamon/metric/UserMetricsSpec.scala (limited to 'kamon-core/src/test') diff --git a/kamon-core/src/test/scala/kamon/metric/SimpleMetricsSpec.scala b/kamon-core/src/test/scala/kamon/metric/SimpleMetricsSpec.scala new file mode 100644 index 00000000..60ba9a0e --- /dev/null +++ b/kamon-core/src/test/scala/kamon/metric/SimpleMetricsSpec.scala @@ -0,0 +1,127 @@ +/* + * ========================================================================================= + * Copyright © 2013-2015 the kamon project + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the + * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language governing permissions + * and limitations under the License. + * ========================================================================================= + */ + +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._ + +class SimpleMetricsSpec extends BaseKamonSpec("simple-metrics-spec") { + override lazy val config = + ConfigFactory.parseString( + """ + |kamon.metric { + | tick-interval = 1 hour + | default-collection-context-buffer-size = 10 + |} + """.stripMargin) + + "the SimpleMetrics extension" should { + + "allow registering a fully configured Histogram and get the same Histogram if registering again" in { + val histogramA = Kamon.simpleMetrics.histogram("histogram-with-settings", DynamicRange(1, 10000, 2)) + val histogramB = Kamon.simpleMetrics.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.simpleMetrics.histogram("histogram-with-settings", DynamicRange(1, 10000, 2)) + val histogramB = Kamon.simpleMetrics.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.simpleMetrics.histogram("histogram-with-default-configuration") + } + + "allow registering a Counter and get the same Counter if registering again" in { + val counterA = Kamon.simpleMetrics.counter("counter") + val counterB = Kamon.simpleMetrics.counter("counter") + + counterA shouldBe theSameInstanceAs(counterB) + } + + "allow registering a fully configured MinMaxCounter and get the same MinMaxCounter if registering again" in { + val minMaxCounterA = Kamon.simpleMetrics.minMaxCounter("min-max-counter-with-settings", DynamicRange(1, 10000, 2), 1 second) + val minMaxCounterB = Kamon.simpleMetrics.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.simpleMetrics.minMaxCounter("min-max-counter-with-settings", DynamicRange(1, 10000, 2), 1 second) + val minMaxCounterB = Kamon.simpleMetrics.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.simpleMetrics.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.simpleMetrics.gauge("gauge-with-settings", DynamicRange(1, 10000, 2), 1 second, { + () ⇒ 1L + }) + + val gaugeB = Kamon.simpleMetrics.gauge("gauge-with-settings", DynamicRange(1, 10000, 2), 1 second, { + () ⇒ 1L + }) + + gaugeA shouldBe theSameInstanceAs(gaugeB) + } + + "return the original Gauge when registering a fully configured Gauge for second time but with different settings" in { + val gaugeA = Kamon.simpleMetrics.gauge("gauge-with-settings", DynamicRange(1, 10000, 2), 1 second, { + () ⇒ 1L + }) + + val gaugeB = Kamon.simpleMetrics.gauge("gauge-with-settings", DynamicRange(1, 10000, 2), 1 second, { + () ⇒ 1L + }) + + gaugeA shouldBe theSameInstanceAs(gaugeB) + } + + "allow registering a Gauge that takes the default configuration from the kamon.metrics.precision settings" in { + Kamon.simpleMetrics.gauge("gauge-with-default-configuration", { + () ⇒ 2L + }) + } + + "allow un-registering user metrics" in { + val counter = Kamon.simpleMetrics.counter("counter-for-remove") + val histogram = Kamon.simpleMetrics.histogram("histogram-for-remove") + val minMaxCounter = Kamon.simpleMetrics.minMaxCounter("min-max-counter-for-remove") + val gauge = Kamon.simpleMetrics.gauge("gauge-for-remove", { () ⇒ 2L }) + + Kamon.simpleMetrics.removeCounter("counter-for-remove") + Kamon.simpleMetrics.removeHistogram("histogram-for-remove") + Kamon.simpleMetrics.removeMinMaxCounter("min-max-counter-for-remove") + Kamon.simpleMetrics.removeGauge("gauge-for-remove") + + counter should not be (theSameInstanceAs(Kamon.simpleMetrics.counter("counter-for-remove"))) + histogram should not be (theSameInstanceAs(Kamon.simpleMetrics.histogram("histogram-for-remove"))) + minMaxCounter should not be (theSameInstanceAs(Kamon.simpleMetrics.minMaxCounter("min-max-counter-for-remove"))) + gauge should not be (theSameInstanceAs(Kamon.simpleMetrics.gauge("gauge-for-remove", { () ⇒ 2L }))) + } + } +} diff --git a/kamon-core/src/test/scala/kamon/metric/UserMetricsSpec.scala b/kamon-core/src/test/scala/kamon/metric/UserMetricsSpec.scala deleted file mode 100644 index 455518f8..00000000 --- a/kamon-core/src/test/scala/kamon/metric/UserMetricsSpec.scala +++ /dev/null @@ -1,127 +0,0 @@ -/* - * ========================================================================================= - * Copyright © 2013-2015 the kamon project - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific language governing permissions - * and limitations under the License. - * ========================================================================================= - */ - -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._ - -class UserMetricsSpec extends BaseKamonSpec("user-metrics-spec") { - override lazy val config = - ConfigFactory.parseString( - """ - |kamon.metric { - | tick-interval = 1 hour - | default-collection-context-buffer-size = 10 - |} - """.stripMargin) - - "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)) - - 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)) - - 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") - } - - "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") - - 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) - - 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) - - 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") - } - - "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, { - () ⇒ 1L - }) - - val gaugeB = Kamon.userMetrics.gauge("gauge-with-settings", DynamicRange(1, 10000, 2), 1 second, { - () ⇒ 1L - }) - - gaugeA shouldBe theSameInstanceAs(gaugeB) - } - - "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, { - () ⇒ 1L - }) - - val gaugeB = Kamon.userMetrics.gauge("gauge-with-settings", DynamicRange(1, 10000, 2), 1 second, { - () ⇒ 1L - }) - - gaugeA shouldBe theSameInstanceAs(gaugeB) - } - - "allow registering a Gauge that takes the default configuration from the kamon.metrics.precision settings" in { - 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 }))) - } - } -} -- cgit v1.2.3