diff options
Diffstat (limited to 'kamon-core-tests/src/test/scala')
-rw-r--r-- | kamon-core-tests/src/test/scala/kamon/KamonLifecycleSpec.scala | 12 | ||||
-rw-r--r-- | kamon-core-tests/src/test/scala/kamon/module/ModuleRegistrySpec.scala (renamed from kamon-core-tests/src/test/scala/kamon/ReporterRegistrySpec.scala) | 18 |
2 files changed, 15 insertions, 15 deletions
diff --git a/kamon-core-tests/src/test/scala/kamon/KamonLifecycleSpec.scala b/kamon-core-tests/src/test/scala/kamon/KamonLifecycleSpec.scala index 2a0af8c0..9ee07694 100644 --- a/kamon-core-tests/src/test/scala/kamon/KamonLifecycleSpec.scala +++ b/kamon-core-tests/src/test/scala/kamon/KamonLifecycleSpec.scala @@ -39,14 +39,14 @@ class KamonLifecycleSpec extends WordSpec with Matchers with Eventually { } } -class DummyMetricReporter extends MetricReporter { +class DummyMetricReporter extends kamon.module.MetricReporter { override def start(): Unit = {} override def stop(): Unit = {} override def reconfigure(config: Config): Unit = {} override def reportPeriodSnapshot(snapshot: PeriodSnapshot): Unit = {} } -class DummySpanReporter extends SpanReporter { +class DummySpanReporter extends kamon.module.SpanReporter { override def start(): Unit = {} override def stop(): Unit = {} override def reconfigure(config: Config): Unit = {} @@ -54,13 +54,13 @@ class DummySpanReporter extends SpanReporter { } object KamonWithRunningReporter extends App { - Kamon.addReporter(new DummyMetricReporter()) - Kamon.addReporter(new DummySpanReporter()) + Kamon.registerModule("dummy metric reporter", new DummyMetricReporter()) + Kamon.registerModule("dummy span reporter", new DummySpanReporter()) } object KamonWithTemporaryReporter extends App { - Kamon.addReporter(new DummyMetricReporter()) - Kamon.addReporter(new DummySpanReporter()) + Kamon.registerModule("dummy metric reporter", new DummyMetricReporter()) + Kamon.registerModule("dummy span repoter", new DummySpanReporter()) Thread.sleep(5000) Kamon.stopAllReporters() diff --git a/kamon-core-tests/src/test/scala/kamon/ReporterRegistrySpec.scala b/kamon-core-tests/src/test/scala/kamon/module/ModuleRegistrySpec.scala index 515dfdd1..791015fb 100644 --- a/kamon-core-tests/src/test/scala/kamon/ReporterRegistrySpec.scala +++ b/kamon-core-tests/src/test/scala/kamon/module/ModuleRegistrySpec.scala @@ -14,15 +14,17 @@ */ package kamon +package module import com.typesafe.config.Config import kamon.metric.PeriodSnapshot import kamon.testkit.Reconfigure import org.scalatest.concurrent.Eventually import org.scalatest.{BeforeAndAfterAll, Matchers, WordSpec} +import kamon.{MetricReporter => LegacyMetricReporter} -class ReporterRegistrySpec extends WordSpec with Matchers with Reconfigure with Eventually with BeforeAndAfterAll { - "The ReporterRegistry" when { +class ModuleRegistrySpec extends WordSpec with Matchers with Reconfigure with Eventually with BeforeAndAfterAll { + "The ModuleRegistry" when { "working with metrics reporters" should { "report all metrics if no filters are applied" in { Kamon.counter("test.hello").increment() @@ -104,13 +106,7 @@ class ReporterRegistrySpec extends WordSpec with Matchers with Reconfigure with resetConfig() } - abstract class DummyReporter extends MetricReporter { - override def start(): Unit = {} - override def stop(): Unit = {} - override def reconfigure(config: Config): Unit = {} - } - - class SeenMetricsReporter extends DummyReporter { + class SeenMetricsReporter extends LegacyMetricReporter { @volatile private var count = 0 @volatile private var seenMetrics = Seq.empty[String] @@ -125,5 +121,9 @@ class ReporterRegistrySpec extends WordSpec with Matchers with Reconfigure with def snapshotCount(): Int = count + + override def start(): Unit = {} + override def stop(): Unit = {} + override def reconfigure(config: Config): Unit = {} } } |