diff options
Diffstat (limited to 'kamon-core/src/test/scala/kamon/metric')
| -rw-r--r-- | kamon-core/src/test/scala/kamon/metric/FilterSpec.scala (renamed from kamon-core/src/test/scala/kamon/metric/EntityFilterSpec.scala) | 12 | ||||
| -rw-r--r-- | kamon-core/src/test/scala/kamon/metric/instrument/CounterSpec.scala | 88 | ||||
| -rw-r--r-- | kamon-core/src/test/scala/kamon/metric/instrument/InstrumentFactorySpec.scala | 224 |
3 files changed, 162 insertions, 162 deletions
diff --git a/kamon-core/src/test/scala/kamon/metric/EntityFilterSpec.scala b/kamon-core/src/test/scala/kamon/metric/FilterSpec.scala index 16481ccd..095c9426 100644 --- a/kamon-core/src/test/scala/kamon/metric/EntityFilterSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/FilterSpec.scala @@ -5,7 +5,7 @@ import com.typesafe.config.ConfigFactory import org.scalatest.{Matchers, WordSpec} -class EntityFilterSpec extends WordSpec with Matchers { +class FilterSpec extends WordSpec with Matchers { val testConfig = ConfigFactory.parseString( """ |kamon.metric.filters { @@ -33,15 +33,15 @@ class EntityFilterSpec extends WordSpec with Matchers { "the entity filters" should { "use the accept-unmatched-categories setting when there is no configuration for a given category" in { - val acceptUnmatched = EntityFilter.fromConfig(ConfigFactory.parseString("kamon.metric.filters.accept-unmatched-categories=true")) - val rejectUnmatched = EntityFilter.fromConfig(ConfigFactory.parseString("kamon.metric.filters.accept-unmatched-categories=false")) + val acceptUnmatched = Filter.fromConfig(ConfigFactory.parseString("kamon.metric.filters.accept-unmatched-categories=true")) + val rejectUnmatched = Filter.fromConfig(ConfigFactory.parseString("kamon.metric.filters.accept-unmatched-categories=false")) acceptUnmatched.accept(Entity("a", "b", Map.empty)) shouldBe true rejectUnmatched.accept(Entity("a", "b", Map.empty)) shouldBe false } "accept entities that are matched by any include and none exclude filters" in { - val entityFilter = EntityFilter.fromConfig(testConfig) + val entityFilter = Filter.fromConfig(testConfig) entityFilter.accept(Entity("anything", "anything", Map.empty)) shouldBe false entityFilter.accept(Entity("anything", "some-category", Map.empty)) shouldBe true @@ -49,7 +49,7 @@ class EntityFilterSpec extends WordSpec with Matchers { } "allow configuring includes only or excludes only for any category" in { - val entityFilter = EntityFilter.fromConfig(testConfig) + val entityFilter = Filter.fromConfig(testConfig) entityFilter.accept(Entity("only-me", "only-includes", Map.empty)) shouldBe true entityFilter.accept(Entity("anything", "only-includes", Map.empty)) shouldBe false @@ -58,7 +58,7 @@ class EntityFilterSpec extends WordSpec with Matchers { } "allow to explicitly decide whether patterns are treated as Glob or Regex" in { - val entityFilter = EntityFilter.fromConfig(testConfig) + val entityFilter = Filter.fromConfig(testConfig) entityFilter.accept(Entity("/user/accepted", "specific-rules", Map.empty)) shouldBe true entityFilter.accept(Entity("/other/rejected/", "specific-rules", Map.empty)) shouldBe false diff --git a/kamon-core/src/test/scala/kamon/metric/instrument/CounterSpec.scala b/kamon-core/src/test/scala/kamon/metric/instrument/CounterSpec.scala index 26b3456d..d76b3613 100644 --- a/kamon-core/src/test/scala/kamon/metric/instrument/CounterSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/instrument/CounterSpec.scala @@ -1,46 +1,46 @@ package kamon.metric.instrument -import kamon.LogInterceptor -import kamon.metric.Entity -import kamon.testkit.DefaultInstrumentFactory -import org.scalatest.{Matchers, WordSpec} -import uk.org.lidalia.slf4jext.Level -import uk.org.lidalia.slf4jtest.TestLoggerFactory - -class CounterSpec extends WordSpec with Matchers with LogInterceptor with DefaultInstrumentFactory { - implicit val testLogger = TestLoggerFactory.getTestLogger(classOf[LongAdderCounter]) - - "a Counter" should { - - "allow unit and bundled increments" in { - val counter = buildCounter("unit-increments") - counter.increment() - counter.increment() - counter.increment(40) - - counter.snapshot().value shouldBe(42) - } - - "warn the user and ignore attempts to decrement the counter" in { - val counter = buildCounter("attempt-to-decrement") - counter.increment(100) - counter.increment(100) - counter.increment(100) - - interceptLog(Level.WARN) { - counter.increment(-10L) - }.head.getMessage() shouldBe(s"Ignored attempt to decrement counter [attempt-to-decrement] on entity [$defaultEntity]") - - counter.snapshot().value shouldBe(300) - } - - "reset the internal state to zero after taking snapshots" in { - val counter = buildCounter("reset-after-snapshot") - counter.increment() - counter.increment(10) - - counter.snapshot().value shouldBe(11) - counter.snapshot().value shouldBe(0) - } - } -} +//import kamon.LogInterceptor +//import kamon.metric.Entity +//import kamon.testkit.DefaultInstrumentFactory +//import org.scalatest.{Matchers, WordSpec} +//import uk.org.lidalia.slf4jext.Level +//import uk.org.lidalia.slf4jtest.TestLoggerFactory +// +//class CounterSpec extends WordSpec with Matchers with LogInterceptor with DefaultInstrumentFactory { +// implicit val testLogger = TestLoggerFactory.getTestLogger(classOf[LongAdderCounter]) +//// +//// "a Counter" should { +//// +//// "allow unit and bundled increments" in { +//// val counter = buildCounter("unit-increments") +//// counter.increment() +//// counter.increment() +//// counter.increment(40) +//// +//// counter.snapshot().value shouldBe(42) +//// } +//// +//// "warn the user and ignore attempts to decrement the counter" in { +//// val counter = buildCounter("attempt-to-decrement") +//// counter.increment(100) +//// counter.increment(100) +//// counter.increment(100) +//// +//// interceptLog(Level.WARN) { +//// counter.increment(-10L) +//// }.head.getMessage() shouldBe(s"Ignored attempt to decrement counter [attempt-to-decrement] on entity [$defaultEntity]") +//// +//// counter.snapshot().value shouldBe(300) +//// } +//// +//// "reset the internal state to zero after taking snapshots" in { +//// val counter = buildCounter("reset-after-snapshot") +//// counter.increment() +//// counter.increment(10) +//// +//// counter.snapshot().value shouldBe(11) +//// counter.snapshot().value shouldBe(0) +//// } +//// } +//} diff --git a/kamon-core/src/test/scala/kamon/metric/instrument/InstrumentFactorySpec.scala b/kamon-core/src/test/scala/kamon/metric/instrument/InstrumentFactorySpec.scala index eda838d5..21fe2b4d 100644 --- a/kamon-core/src/test/scala/kamon/metric/instrument/InstrumentFactorySpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/instrument/InstrumentFactorySpec.scala @@ -1,114 +1,114 @@ package kamon.metric.instrument -import java.time.Duration - -import com.typesafe.config.ConfigFactory -import kamon.metric.Entity -import org.scalatest.{Matchers, WordSpec} - -class InstrumentFactorySpec extends WordSpec with Matchers{ - val testEntity = Entity("test", "test-category", Map.empty) - val customEntity = Entity("test", "custom-category", Map.empty) - val baseConfiguration = ConfigFactory.parseString( - """ - |kamon.metric.instrument-factory { - | default-settings { - | histogram { - | lowest-discernible-value = 100 - | highest-trackable-value = 5000 - | significant-value-digits = 2 - | } - | - | min-max-counter { - | lowest-discernible-value = 200 - | highest-trackable-value = 6000 - | significant-value-digits = 3 - | sample-interval = 647 millis - | } - | } - | - | custom-settings { - | - | } - |} - """.stripMargin - ) - - - "the metrics InstrumentFactory" should { - "create instruments using the default configuration settings" in { - val factory = InstrumentFactory.fromConfig(baseConfiguration) - val histogram = factory.buildHistogram(testEntity, "my-histogram") - val mmCounter = factory.buildMinMaxCounter(testEntity, "my-mm-counter") - - histogram.dynamicRange.lowestDiscernibleValue shouldBe(100) - histogram.dynamicRange.highestTrackableValue shouldBe(5000) - histogram.dynamicRange.significantValueDigits shouldBe(2) - - mmCounter.dynamicRange.lowestDiscernibleValue shouldBe(200) - mmCounter.dynamicRange.highestTrackableValue shouldBe(6000) - mmCounter.dynamicRange.significantValueDigits shouldBe(3) - mmCounter.sampleInterval shouldBe(Duration.ofMillis(647)) - } - - "accept custom settings when building instruments" in { - val factory = InstrumentFactory.fromConfig(baseConfiguration) - val histogram = factory.buildHistogram(testEntity, "my-histogram", DynamicRange.Loose) - val mmCounter = factory.buildMinMaxCounter(testEntity, "my-mm-counter", DynamicRange.Fine, Duration.ofMillis(500)) - - histogram.dynamicRange shouldBe(DynamicRange.Loose) - - mmCounter.dynamicRange shouldBe(DynamicRange.Fine) - mmCounter.sampleInterval shouldBe(Duration.ofMillis(500)) - } - - "allow overriding any default and provided settings via the custom-settings configuration key" in { - val customConfig = ConfigFactory.parseString( - """ - |kamon.metric.instrument-factory.custom-settings { - | custom-category { - | modified-histogram { - | lowest-discernible-value = 99 - | highest-trackable-value = 999 - | significant-value-digits = 4 - | } - | - | modified-mm-counter { - | lowest-discernible-value = 784 - | highest-trackable-value = 14785 - | significant-value-digits = 1 - | sample-interval = 3 seconds - | } - | } - |} - """.stripMargin - ).withFallback(baseConfiguration) - - val factory = InstrumentFactory.fromConfig(customConfig) - val defaultHistogram = factory.buildHistogram(customEntity, "default-histogram") - val modifiedHistogram = factory.buildHistogram(customEntity, "modified-histogram", DynamicRange.Loose) - - defaultHistogram.dynamicRange.lowestDiscernibleValue shouldBe(100) - defaultHistogram.dynamicRange.highestTrackableValue shouldBe(5000) - defaultHistogram.dynamicRange.significantValueDigits shouldBe(2) - - modifiedHistogram.dynamicRange.lowestDiscernibleValue shouldBe(99) - modifiedHistogram.dynamicRange.highestTrackableValue shouldBe(999) - modifiedHistogram.dynamicRange.significantValueDigits shouldBe(4) - - - val defaultMMCounter = factory.buildMinMaxCounter(customEntity, "default-mm-counter") - val modifiedMMCounter = factory.buildMinMaxCounter(customEntity, "modified-mm-counter", DynamicRange.Loose) - - defaultMMCounter.dynamicRange.lowestDiscernibleValue shouldBe(200) - defaultMMCounter.dynamicRange.highestTrackableValue shouldBe(6000) - defaultMMCounter.dynamicRange.significantValueDigits shouldBe(3) - defaultMMCounter.sampleInterval shouldBe(Duration.ofMillis(647)) - - modifiedMMCounter.dynamicRange.lowestDiscernibleValue shouldBe(784) - modifiedMMCounter.dynamicRange.highestTrackableValue shouldBe(14785) - modifiedMMCounter.dynamicRange.significantValueDigits shouldBe(1) - modifiedMMCounter.sampleInterval shouldBe(Duration.ofSeconds(3)) - } - } -} +//import java.time.Duration +// +//import com.typesafe.config.ConfigFactory +//import kamon.metric.Entity +//import org.scalatest.{Matchers, WordSpec} +// +//class InstrumentFactorySpec extends WordSpec with Matchers{ +// val testEntity = Entity("test", "test-category", Map.empty) +// val customEntity = Entity("test", "custom-category", Map.empty) +// val baseConfiguration = ConfigFactory.parseString( +// """ +// |kamon.metric.instrument-factory { +// | default-settings { +// | histogram { +// | lowest-discernible-value = 100 +// | highest-trackable-value = 5000 +// | significant-value-digits = 2 +// | } +// | +// | min-max-counter { +// | lowest-discernible-value = 200 +// | highest-trackable-value = 6000 +// | significant-value-digits = 3 +// | sample-interval = 647 millis +// | } +// | } +// | +// | custom-settings { +// | +// | } +// |} +// """.stripMargin +// ) +// +// +// "the metrics InstrumentFactory" should { +// "create instruments using the default configuration settings" in { +// val factory = InstrumentFactory.fromConfig(baseConfiguration) +// val histogram = factory.buildHistogram(testEntity, "my-histogram") +// val mmCounter = factory.buildMinMaxCounter(testEntity, "my-mm-counter") +// +// histogram.dynamicRange.lowestDiscernibleValue shouldBe(100) +// histogram.dynamicRange.highestTrackableValue shouldBe(5000) +// histogram.dynamicRange.significantValueDigits shouldBe(2) +// +// mmCounter.dynamicRange.lowestDiscernibleValue shouldBe(200) +// mmCounter.dynamicRange.highestTrackableValue shouldBe(6000) +// mmCounter.dynamicRange.significantValueDigits shouldBe(3) +// mmCounter.sampleInterval shouldBe(Duration.ofMillis(647)) +// } +// +// "accept custom settings when building instruments" in { +// val factory = InstrumentFactory.fromConfig(baseConfiguration) +// val histogram = factory.buildHistogram(testEntity, "my-histogram", DynamicRange.Loose) +// val mmCounter = factory.buildMinMaxCounter(testEntity, "my-mm-counter", DynamicRange.Fine, Duration.ofMillis(500)) +// +// histogram.dynamicRange shouldBe(DynamicRange.Loose) +// +// mmCounter.dynamicRange shouldBe(DynamicRange.Fine) +// mmCounter.sampleInterval shouldBe(Duration.ofMillis(500)) +// } +// +// "allow overriding any default and provided settings via the custom-settings configuration key" in { +// val customConfig = ConfigFactory.parseString( +// """ +// |kamon.metric.instrument-factory.custom-settings { +// | custom-category { +// | modified-histogram { +// | lowest-discernible-value = 99 +// | highest-trackable-value = 999 +// | significant-value-digits = 4 +// | } +// | +// | modified-mm-counter { +// | lowest-discernible-value = 784 +// | highest-trackable-value = 14785 +// | significant-value-digits = 1 +// | sample-interval = 3 seconds +// | } +// | } +// |} +// """.stripMargin +// ).withFallback(baseConfiguration) +// +// val factory = InstrumentFactory.fromConfig(customConfig) +// val defaultHistogram = factory.buildHistogram(customEntity, "default-histogram") +// val modifiedHistogram = factory.buildHistogram(customEntity, "modified-histogram", DynamicRange.Loose) +// +// defaultHistogram.dynamicRange.lowestDiscernibleValue shouldBe(100) +// defaultHistogram.dynamicRange.highestTrackableValue shouldBe(5000) +// defaultHistogram.dynamicRange.significantValueDigits shouldBe(2) +// +// modifiedHistogram.dynamicRange.lowestDiscernibleValue shouldBe(99) +// modifiedHistogram.dynamicRange.highestTrackableValue shouldBe(999) +// modifiedHistogram.dynamicRange.significantValueDigits shouldBe(4) +// +// +// val defaultMMCounter = factory.buildMinMaxCounter(customEntity, "default-mm-counter") +// val modifiedMMCounter = factory.buildMinMaxCounter(customEntity, "modified-mm-counter", DynamicRange.Loose) +// +// defaultMMCounter.dynamicRange.lowestDiscernibleValue shouldBe(200) +// defaultMMCounter.dynamicRange.highestTrackableValue shouldBe(6000) +// defaultMMCounter.dynamicRange.significantValueDigits shouldBe(3) +// defaultMMCounter.sampleInterval shouldBe(Duration.ofMillis(647)) +// +// modifiedMMCounter.dynamicRange.lowestDiscernibleValue shouldBe(784) +// modifiedMMCounter.dynamicRange.highestTrackableValue shouldBe(14785) +// modifiedMMCounter.dynamicRange.significantValueDigits shouldBe(1) +// modifiedMMCounter.sampleInterval shouldBe(Duration.ofSeconds(3)) +// } +// } +//} |