! 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.

3 files changed, 0 insertions, 268 deletions

diff --git a/kamon-core/src/main/scala/kamon/metric/ActorMetrics.scala b/kamon-core/src/main/scala/kamon/metric/ActorMetrics.scala
deleted file mode 100644
index d2cb4e38..00000000
--- a/kamon-core/src/main/scala/kamon/metric/ActorMetrics.scala
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * =========================================================================================
- * Copyright © 2013-2014 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.metric
-
-import akka.actor.ActorSystem
-import com.typesafe.config.Config
-import kamon.metric.instrument.{ MinMaxCounter, Counter, Histogram }
-
-case class ActorMetrics(name: String) extends MetricGroupIdentity {
-  val category = ActorMetrics
-}
-
-object ActorMetrics extends MetricGroupCategory {
-  val name = "actor"
-
-  case object ProcessingTime extends MetricIdentity { val name = "processing-time" }
-  case object MailboxSize extends MetricIdentity { val name = "mailbox-size" }
-  case object TimeInMailbox extends MetricIdentity { val name = "time-in-mailbox" }
-  case object Errors extends MetricIdentity { val name = "errors" }
-
-  case class ActorMetricsRecorder(processingTime: Histogram, timeInMailbox: Histogram, mailboxSize: MinMaxCounter,
-      errors: Counter) extends MetricGroupRecorder {
-
-    def collect(context: CollectionContext): ActorMetricSnapshot =
-      ActorMetricSnapshot(
-        processingTime.collect(context),
-        timeInMailbox.collect(context),
-        mailboxSize.collect(context),
-        errors.collect(context))
-
-    def cleanup: Unit = {
-      processingTime.cleanup
-      mailboxSize.cleanup
-      timeInMailbox.cleanup
-      errors.cleanup
-    }
-  }
-
-  case class ActorMetricSnapshot(processingTime: Histogram.Snapshot, timeInMailbox: Histogram.Snapshot,
-      mailboxSize: Histogram.Snapshot, errors: Counter.Snapshot) extends MetricGroupSnapshot {
-
-    type GroupSnapshotType = ActorMetricSnapshot
-
-    def merge(that: ActorMetricSnapshot, context: CollectionContext): ActorMetricSnapshot =
-      ActorMetricSnapshot(
-        processingTime.merge(that.processingTime, context),
-        timeInMailbox.merge(that.timeInMailbox, context),
-        mailboxSize.merge(that.mailboxSize, context),
-        errors.merge(that.errors, context))
-
-    lazy val metrics: Map[MetricIdentity, MetricSnapshot] = Map(
-      (ProcessingTime -> processingTime),
-      (MailboxSize -> mailboxSize),
-      (TimeInMailbox -> timeInMailbox),
-      (Errors -> errors))
-  }
-
-  val Factory = ActorMetricGroupFactory
-}
-
-case object ActorMetricGroupFactory extends MetricGroupFactory {
-  import ActorMetrics._
-
-  type GroupRecorder = ActorMetricsRecorder
-
-  def create(config: Config, system: ActorSystem): ActorMetricsRecorder = {
-    val settings = config.getConfig("precision.actor")
-
-    val processingTimeConfig = settings.getConfig("processing-time")
-    val timeInMailboxConfig = settings.getConfig("time-in-mailbox")
-    val mailboxSizeConfig = settings.getConfig("mailbox-size")
-
-    new ActorMetricsRecorder(
-      Histogram.fromConfig(processingTimeConfig),
-      Histogram.fromConfig(timeInMailboxConfig),
-      MinMaxCounter.fromConfig(mailboxSizeConfig, system),
-      Counter())
-  }
-}
diff --git a/kamon-core/src/main/scala/kamon/metric/DispatcherMetrics.scala b/kamon-core/src/main/scala/kamon/metric/DispatcherMetrics.scala
deleted file mode 100644
index 126f6333..00000000
--- a/kamon-core/src/main/scala/kamon/metric/DispatcherMetrics.scala
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * =========================================================================================
- * Copyright © 2013-2014 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.metric
-
-import akka.actor.ActorSystem
-import com.typesafe.config.Config
-import kamon.metric.instrument.{ Histogram, HdrHistogram }
-
-case class DispatcherMetrics(name: String) extends MetricGroupIdentity {
-  val category = DispatcherMetrics
-}
-
-object DispatcherMetrics extends MetricGroupCategory {
-  val name = "dispatcher"
-
-  case object MaximumPoolSize extends MetricIdentity { val name = "maximum-pool-size" }
-  case object RunningThreadCount extends MetricIdentity { val name = "running-thread-count" }
-  case object QueueTaskCount extends MetricIdentity { val name = "queued-task-count" }
-  case object PoolSize extends MetricIdentity { val name = "pool-size" }
-
-  case class DispatcherMetricRecorder(maximumPoolSize: Histogram, runningThreadCount: Histogram,
-    queueTaskCount: Histogram, poolSize: Histogram)
-      extends MetricGroupRecorder {
-
-    def collect(context: CollectionContext): MetricGroupSnapshot =
-      DispatcherMetricSnapshot(
-        maximumPoolSize.collect(context),
-        runningThreadCount.collect(context),
-        queueTaskCount.collect(context),
-        poolSize.collect(context))
-
-    def cleanup: Unit = {}
-
-  }
-
-  case class DispatcherMetricSnapshot(maximumPoolSize: Histogram.Snapshot, runningThreadCount: Histogram.Snapshot,
-      queueTaskCount: Histogram.Snapshot, poolSize: Histogram.Snapshot) extends MetricGroupSnapshot {
-
-    type GroupSnapshotType = DispatcherMetricSnapshot
-
-    def merge(that: DispatcherMetricSnapshot, context: CollectionContext): DispatcherMetricSnapshot =
-      DispatcherMetricSnapshot(
-        maximumPoolSize.merge(that.maximumPoolSize, context),
-        runningThreadCount.merge(that.runningThreadCount, context),
-        queueTaskCount.merge(that.queueTaskCount, context),
-        poolSize.merge(that.poolSize, context))
-
-    lazy val metrics: Map[MetricIdentity, MetricSnapshot] = Map(
-      (MaximumPoolSize -> maximumPoolSize),
-      (RunningThreadCount -> runningThreadCount),
-      (QueueTaskCount -> queueTaskCount),
-      (PoolSize -> poolSize))
-  }
-
-  val Factory = DispatcherMetricGroupFactory
-}
-
-case object DispatcherMetricGroupFactory extends MetricGroupFactory {
-
-  import DispatcherMetrics._
-
-  type GroupRecorder = DispatcherMetricRecorder
-
-  def create(config: Config, system: ActorSystem): DispatcherMetricRecorder = {
-    val settings = config.getConfig("precision.dispatcher")
-
-    val maximumPoolSizeConfig = settings.getConfig("maximum-pool-size")
-    val runningThreadCountConfig = settings.getConfig("running-thread-count")
-    val queueTaskCountConfig = settings.getConfig("queued-task-count")
-    val poolSizeConfig = settings.getConfig("pool-size")
-
-    new DispatcherMetricRecorder(
-      Histogram.fromConfig(maximumPoolSizeConfig),
-      Histogram.fromConfig(runningThreadCountConfig),
-      Histogram.fromConfig(queueTaskCountConfig),
-      Histogram.fromConfig(poolSizeConfig))
-  }
-
-}
diff --git a/kamon-core/src/main/scala/kamon/metric/RouterMetrics.scala b/kamon-core/src/main/scala/kamon/metric/RouterMetrics.scala
deleted file mode 100644
index ddfef416..00000000
--- a/kamon-core/src/main/scala/kamon/metric/RouterMetrics.scala
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * =========================================================================================
- * Copyright © 2013-2014 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.metric
-
-import akka.actor.ActorSystem
-import com.typesafe.config.Config
-import kamon.metric.instrument.{ Counter, Histogram }
-
-case class RouterMetrics(name: String) extends MetricGroupIdentity {
-  val category = RouterMetrics
-}
-
-object RouterMetrics extends MetricGroupCategory {
-  val name = "router"
-
-  case object ProcessingTime extends MetricIdentity { val name = "processing-time" }
-  case object TimeInMailbox extends MetricIdentity { val name = "time-in-mailbox" }
-  case object Errors extends MetricIdentity { val name = "errors" }
-
-  case class RouterMetricsRecorder(processingTime: Histogram, timeInMailbox: Histogram, errors: Counter) extends MetricGroupRecorder {
-
-    def collect(context: CollectionContext): RouterMetricSnapshot =
-      RouterMetricSnapshot(processingTime.collect(context), timeInMailbox.collect(context), errors.collect(context))
-
-    def cleanup: Unit = {
-      processingTime.cleanup
-      timeInMailbox.cleanup
-      errors.cleanup
-    }
-  }
-
-  case class RouterMetricSnapshot(processingTime: Histogram.Snapshot, timeInMailbox: Histogram.Snapshot, errors: Counter.Snapshot) extends MetricGroupSnapshot {
-
-    type GroupSnapshotType = RouterMetricSnapshot
-
-    def merge(that: RouterMetricSnapshot, context: CollectionContext): RouterMetricSnapshot =
-      RouterMetricSnapshot(
-        processingTime.merge(that.processingTime, context),
-        timeInMailbox.merge(that.timeInMailbox, context),
-        errors.merge(that.errors, context))
-
-    lazy val metrics: Map[MetricIdentity, MetricSnapshot] = Map(
-      ProcessingTime -> processingTime,
-      TimeInMailbox -> timeInMailbox,
-      Errors -> errors)
-  }
-
-  val Factory = RouterMetricGroupFactory
-}
-
-case object RouterMetricGroupFactory extends MetricGroupFactory {
-
-  import RouterMetrics._
-
-  type GroupRecorder = RouterMetricsRecorder
-
-  def create(config: Config, system: ActorSystem): RouterMetricsRecorder = {
-    val settings = config.getConfig("precision.router")
-
-    val processingTimeConfig = settings.getConfig("processing-time")
-    val timeInMailboxConfig = settings.getConfig("time-in-mailbox")
-
-    new RouterMetricsRecorder(
-      Histogram.fromConfig(processingTimeConfig),
-      Histogram.fromConfig(timeInMailboxConfig),
-      Counter())
-  }
-}
-