diff options
Diffstat (limited to 'kamon-akka/src/test/scala')
6 files changed, 3 insertions, 121 deletions
diff --git a/kamon-akka/src/test/scala/kamon/akka/ActorMetricsSpec.scala b/kamon-akka/src/test/scala/kamon/akka/ActorMetricsSpec.scala index 4647abc0..cd64988d 100644 --- a/kamon-akka/src/test/scala/kamon/akka/ActorMetricsSpec.scala +++ b/kamon-akka/src/test/scala/kamon/akka/ActorMetricsSpec.scala @@ -29,28 +29,6 @@ import kamon.testkit.BaseKamonSpec import scala.concurrent.duration._ class ActorMetricsSpec extends BaseKamonSpec("actor-metrics-spec") { - override lazy val config = - ConfigFactory.parseString( - """ - |kamon.metric { - | tick-interval = 1 hour - | default-collection-context-buffer-size = 10 - | - | filters { - | akka-actor { - | includes = [ "*/user/tracked-*", "*/user/measuring-*", "*/user/clean-after-collect", "*/user/stop", "*/" ] - | excludes = [ "*/user/tracked-explicitly-excluded", "*/user/non-tracked-actor" ] - | } - | } - | - | instrument-settings { - | akka-actor.mailbox-size.refresh-interval = 1 hour - | } - |} - | - |akka.loglevel = OFF - | - """.stripMargin) "the Kamon actor metrics" should { "respect the configured include and exclude filters" in new ActorMetricsFixtures { diff --git a/kamon-akka/src/test/scala/kamon/akka/DispatcherMetricsSpec.scala b/kamon-akka/src/test/scala/kamon/akka/DispatcherMetricsSpec.scala index 678c7f73..3fbb10fd 100644 --- a/kamon-akka/src/test/scala/kamon/akka/DispatcherMetricsSpec.scala +++ b/kamon-akka/src/test/scala/kamon/akka/DispatcherMetricsSpec.scala @@ -30,56 +30,6 @@ import scala.concurrent.duration._ import scala.concurrent.{ Await, Future } class DispatcherMetricsSpec extends BaseKamonSpec("dispatcher-metrics-spec") { - override lazy val config = - ConfigFactory.parseString( - """ - |kamon.metric { - | tick-interval = 1 hour - | default-collection-context-buffer-size = 10 - | - | filters = { - | akka-dispatcher { - | includes = [ "**" ] - | excludes = [ "*/explicitly-excluded" ] - | } - | } - | - | default-instrument-settings { - | gauge.refresh-interval = 1 hour - | min-max-counter.refresh-interval = 1 hour - | } - |} - | - |explicitly-excluded { - | type = "Dispatcher" - | executor = "fork-join-executor" - |} - | - |tracked-fjp { - | type = "Dispatcher" - | executor = "fork-join-executor" - | - | fork-join-executor { - | parallelism-min = 8 - | parallelism-factor = 100.0 - | parallelism-max = 22 - | } - |} - | - |tracked-tpe { - | type = "Dispatcher" - | executor = "thread-pool-executor" - | - | thread-pool-executor { - | core-pool-size-min = 7 - | core-pool-size-factor = 100.0 - | max-pool-size-factor = 100.0 - | max-pool-size-max = 21 - | } - |} - | - """.stripMargin) - "the Kamon dispatcher metrics" should { "respect the configured include and exclude filters" in { val defaultDispatcher = forceInit(system.dispatchers.lookup("akka.actor.default-dispatcher")) diff --git a/kamon-akka/src/test/scala/kamon/akka/RouterMetricsSpec.scala b/kamon-akka/src/test/scala/kamon/akka/RouterMetricsSpec.scala index 4128c9ef..bff2382e 100644 --- a/kamon-akka/src/test/scala/kamon/akka/RouterMetricsSpec.scala +++ b/kamon-akka/src/test/scala/kamon/akka/RouterMetricsSpec.scala @@ -20,7 +20,6 @@ import java.nio.LongBuffer import akka.actor._ import akka.routing._ import akka.testkit.TestProbe -import com.typesafe.config.ConfigFactory import kamon.Kamon import kamon.akka.RouterMetricsTestActor._ import kamon.metric.EntitySnapshot @@ -30,24 +29,6 @@ import kamon.testkit.BaseKamonSpec import scala.concurrent.duration._ class RouterMetricsSpec extends BaseKamonSpec("router-metrics-spec") { - override lazy val config = - ConfigFactory.parseString( - """ - |kamon.metric { - | tick-interval = 1 hour - | default-collection-context-buffer-size = 10 - | - | filters = { - | akka-router { - | includes = [ "*/user/tracked-*", "*/user/measuring-*", "*/user/stop-*" ] - | excludes = [ "*/user/tracked-explicitly-excluded-*"] - | } - | } - |} - | - |akka.loglevel = OFF - | - """.stripMargin) "the Kamon router metrics" should { "respect the configured include and exclude filters" in new RouterMetricsFixtures { diff --git a/kamon-akka/src/test/scala/kamon/akka/instrumentation/ActorLoggingInstrumentationSpec.scala b/kamon-akka/src/test/scala/kamon/akka/instrumentation/ActorLoggingInstrumentationSpec.scala index 85f41795..d08f38a4 100644 --- a/kamon-akka/src/test/scala/kamon/akka/instrumentation/ActorLoggingInstrumentationSpec.scala +++ b/kamon-akka/src/test/scala/kamon/akka/instrumentation/ActorLoggingInstrumentationSpec.scala @@ -26,13 +26,6 @@ import org.scalatest.Inspectors import org.slf4j.MDC class ActorLoggingInstrumentationSpec extends BaseKamonSpec("actor-logging-instrumentation-spec") with Inspectors with MdcKeysSupport { - override lazy val config = - ConfigFactory.parseString( - """ - |akka { - | loggers = ["akka.event.slf4j.Slf4jLogger"] - |} - """.stripMargin) "the ActorLogging instrumentation" should { "attach the TraceContext (if available) to log events" in { diff --git a/kamon-akka/src/test/scala/kamon/akka/instrumentation/ActorSystemMessageInstrumentationSpec.scala b/kamon-akka/src/test/scala/kamon/akka/instrumentation/ActorSystemMessageInstrumentationSpec.scala index 1635fadc..d2e7d5e5 100644 --- a/kamon-akka/src/test/scala/kamon/akka/instrumentation/ActorSystemMessageInstrumentationSpec.scala +++ b/kamon-akka/src/test/scala/kamon/akka/instrumentation/ActorSystemMessageInstrumentationSpec.scala @@ -28,14 +28,6 @@ import scala.concurrent.duration._ import scala.util.control.NonFatal class ActorSystemMessageInstrumentationSpec extends BaseKamonSpec("actor-system-message-instrumentation-spec") with WordSpecLike with ImplicitSender { - override lazy val config = - ConfigFactory.parseString( - """ - |akka { - | loglevel = OFF - |} - """.stripMargin) - implicit lazy val executionContext = system.dispatcher "the system message passing instrumentation" should { diff --git a/kamon-akka/src/test/scala/kamon/akka/instrumentation/AskPatternInstrumentationSpec.scala b/kamon-akka/src/test/scala/kamon/akka/instrumentation/AskPatternInstrumentationSpec.scala index d9fbc2df..025c8d0c 100644 --- a/kamon-akka/src/test/scala/kamon/akka/instrumentation/AskPatternInstrumentationSpec.scala +++ b/kamon-akka/src/test/scala/kamon/akka/instrumentation/AskPatternInstrumentationSpec.scala @@ -20,25 +20,14 @@ import akka.actor._ import akka.pattern.ask import akka.testkit.EventFilter import akka.util.Timeout -import com.typesafe.config.ConfigFactory -import kamon.Kamon import kamon.akka.AskPatternTimeoutWarningSettings.{ Off, Lightweight, Heavyweight } -import kamon.akka.{ AskPatternTimeoutWarningSetting, Akka } +import kamon.akka.{ AkkaExtension, AskPatternTimeoutWarningSetting } import kamon.testkit.BaseKamonSpec import kamon.trace.Tracer import scala.concurrent.duration._ class AskPatternInstrumentationSpec extends BaseKamonSpec("ask-pattern-tracing-spec") { - override lazy val config = - ConfigFactory.parseString( - """ - |akka { - | loglevel = OFF - | loggers = [akka.testkit.TestEventListener] - |} - """.stripMargin) - implicit lazy val ec = system.dispatcher implicit val askTimeout = Timeout(10 millis) @@ -93,10 +82,9 @@ class AskPatternInstrumentationSpec extends BaseKamonSpec("ask-pattern-tracing-s override protected def afterAll(): Unit = shutdown() def setAskPatternTimeoutWarningMode(mode: AskPatternTimeoutWarningSetting): Unit = { - val target = Kamon(Akka) - val field = target.getClass.getDeclaredField("askPatternTimeoutWarning") + val field = AkkaExtension.getClass.getDeclaredField("askPatternTimeoutWarning") field.setAccessible(true) - field.set(target, mode) + field.set(AkkaExtension, mode) } } |