From ff7ac0ec79dd61849b4c76b10f74af72c7cceea9 Mon Sep 17 00:00:00 2001
From: Ivan Topolnjak <ivantopo@gmail.com>
Date: Sun, 28 Dec 2014 07:59:59 +0100
Subject: ! core,akka: separate all akka instrumentation into it's own
 kamon-akka module, related to #136.

All Akka-related instrumentation and code has been moved to the kamon-akka module,
including the filters for actor, dispatcher and router metrics. Also the following
changes are included:

  - Router Metrics are now working properly, related to #139.
  - Cleanup the log output for this module, related to #142.
  - Some minor cleanups in various tests.

This PR breaks the reporting modules which will need to wait for #141 to be ready to come back
to life.
---
 .../akka/ActorLoggingInstrumentationSpec.scala     | 73 ----------------------
 1 file changed, 73 deletions(-)
 delete mode 100644 kamon-core/src/test/scala/kamon/instrumentation/akka/ActorLoggingInstrumentationSpec.scala

(limited to 'kamon-core/src/test/scala/kamon/instrumentation/akka/ActorLoggingInstrumentationSpec.scala')

diff --git a/kamon-core/src/test/scala/kamon/instrumentation/akka/ActorLoggingInstrumentationSpec.scala b/kamon-core/src/test/scala/kamon/instrumentation/akka/ActorLoggingInstrumentationSpec.scala
deleted file mode 100644
index 4b114d4f..00000000
--- a/kamon-core/src/test/scala/kamon/instrumentation/akka/ActorLoggingInstrumentationSpec.scala
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ===================================================
- * Copyright © 2013 the kamon project <http://kamon.io/>
- *
- * 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.instrumentation.akka
-
-import akka.actor.{ Actor, ActorLogging, ActorSystem, Props }
-import akka.event.Logging.LogEvent
-import akka.testkit.TestKit
-import kamon.trace.TraceLocal.AvailableToMdc
-import kamon.trace.logging.MdcKeysSupport
-import kamon.trace.{ TraceLocal, TraceContextAware, TraceRecorder }
-import org.scalatest.{ Inspectors, Matchers, WordSpecLike }
-import org.slf4j.MDC
-
-class ActorLoggingInstrumentationSpec extends TestKit(ActorSystem("actor-logging-instrumentation-spec")) with WordSpecLike
-    with Matchers with Inspectors with MdcKeysSupport {
-
-  "the ActorLogging instrumentation" should {
-    "attach the TraceContext (if available) to log events" in {
-      val loggerActor = system.actorOf(Props[LoggerActor])
-      system.eventStream.subscribe(testActor, classOf[LogEvent])
-
-      val testTraceContext = TraceRecorder.withNewTraceContext("logging") {
-        loggerActor ! "info"
-        TraceRecorder.currentContext
-      }
-
-      fishForMessage() {
-        case event: LogEvent if event.message.toString contains "TraceContext =>" ⇒
-          val ctxInEvent = event.asInstanceOf[TraceContextAware].traceContext
-          ctxInEvent === testTraceContext
-
-        case event: LogEvent ⇒ false
-      }
-    }
-
-    "allow retrieve a value from the MDC when was created a key of type AvailableToMdc" in {
-      val testString = "Hello World"
-      val SampleTraceLocalKeyAvailableToMDC = AvailableToMdc("some-cool-key")
-
-      val loggerActor = system.actorOf(Props[LoggerActor])
-      system.eventStream.subscribe(testActor, classOf[LogEvent])
-
-      TraceRecorder.withNewTraceContext("logging-with-mdc") {
-        TraceLocal.store(SampleTraceLocalKeyAvailableToMDC)(testString)
-
-        loggerActor ! "info"
-
-        withMdc {
-          MDC.get("some-cool-key") should equal(testString)
-        }
-      }
-    }
-  }
-}
-
-class LoggerActor extends Actor with ActorLogging {
-  def receive = {
-    case "info" ⇒ log.info("TraceContext => {}", TraceRecorder.currentContext)
-  }
-}
-- 
cgit v1.2.3