= core: avoid using tuples in favor of case classes

3 files changed, 9 insertions, 64 deletions

diff --git a/kamon-core/src/main/scala/kamon/metrics/DispatcherMetrics.scala b/kamon-core/src/main/scala/kamon/metrics/DispatcherMetrics.scala
index 77a1c99b..7e9198f3 100644
--- a/kamon-core/src/main/scala/kamon/metrics/DispatcherMetrics.scala
+++ b/kamon-core/src/main/scala/kamon/metrics/DispatcherMetrics.scala
@@ -26,7 +26,7 @@ case class DispatcherMetrics(name: String) extends MetricGroupIdentity {
 object DispatcherMetrics extends MetricGroupCategory {
   val name = "dispatcher"
 
-  case object MaximunPoolSize extends MetricIdentity { val name, tag = "maximum-pool-size" }
+  case object MaximumPoolSize extends MetricIdentity { val name, tag = "maximum-pool-size" }
   case object RunningThreadCount extends MetricIdentity { val name, tag = "running-thread-count" }
   case object QueueTaskCount extends MetricIdentity { val name, tag = "queued-task-count" }
   case object PoolSize extends MetricIdentity { val name, tag = "pool-size" }
@@ -43,7 +43,7 @@ object DispatcherMetrics extends MetricGroupCategory {
       extends MetricGroupSnapshot {
 
     val metrics: Map[MetricIdentity, MetricSnapshotLike] = Map(
-      (MaximunPoolSize -> maximumPoolSize),
+      (MaximumPoolSize -> maximumPoolSize),
       (RunningThreadCount -> runningThreadCount),
       (QueueTaskCount -> queueTaskCount),
       (PoolSize -> poolSize))
diff --git a/kamon-core/src/main/scala/kamon/metrics/dispatcher/DispatcherMetricsCollector.scala b/kamon-core/src/main/scala/kamon/metrics/dispatcher/DispatcherMetricsCollector.scala
deleted file mode 100644
index 529cc542..00000000
--- a/kamon-core/src/main/scala/kamon/metrics/dispatcher/DispatcherMetricsCollector.scala
+++ /dev/null
@@ -1,59 +0,0 @@
-package kamon.metrics.dispatcher
-
-/*
- * =========================================================================================
- * 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.
- * =========================================================================================
- */
-
-import scala.concurrent.forkjoin.ForkJoinPool
-import java.util.concurrent.ThreadPoolExecutor
-import akka.dispatch.{ ExecutorServiceDelegate, Dispatcher, MessageDispatcher }
-import java.lang.reflect.Method
-
-object DispatcherMetricsCollector {
-
-  private[this]type DispatcherMetrics = (Long, Long, Long, Long)
-
-  private[this] def collectForkJoinMetrics(pool: ForkJoinPool): DispatcherMetrics = {
-    (pool.getParallelism, pool.getActiveThreadCount, (pool.getQueuedTaskCount + pool.getQueuedSubmissionCount), pool.getPoolSize)
-  }
-  private[this] def collectExecutorMetrics(pool: ThreadPoolExecutor): DispatcherMetrics = {
-    (pool.getMaximumPoolSize, pool.getActiveCount, pool.getQueue.size(), pool.getPoolSize)
-  }
-
-  private[this] val executorServiceMethod: Method = {
-    // executorService is protected
-    val method = classOf[Dispatcher].getDeclaredMethod("executorService")
-    method.setAccessible(true)
-    method
-  }
-
-  def collect(dispatcher: MessageDispatcher): (Long, Long, Long, Long) = {
-    dispatcher match {
-      case x: Dispatcher ⇒ {
-        val executor = executorServiceMethod.invoke(x) match {
-          case delegate: ExecutorServiceDelegate ⇒ delegate.executor
-          case other                             ⇒ other
-        }
-
-        executor match {
-          case fjp: ForkJoinPool       ⇒ collectForkJoinMetrics(fjp)
-          case tpe: ThreadPoolExecutor ⇒ collectExecutorMetrics(tpe)
-          case anything                ⇒ (0L, 0L, 0L, 0L)
-        }
-      }
-      case _ ⇒ new DispatcherMetrics(0L, 0L, 0L, 0L)
-    }
-  }
-}
diff --git a/kamon-core/src/main/scala/kamon/metrics/instruments/counter/MinMaxCounter.scala b/kamon-core/src/main/scala/kamon/metrics/instruments/MinMaxCounter.scala
index 6c89a4d1..7f6c2487 100644
--- a/kamon-core/src/main/scala/kamon/metrics/instruments/counter/MinMaxCounter.scala
+++ b/kamon-core/src/main/scala/kamon/metrics/instruments/MinMaxCounter.scala
@@ -1,4 +1,5 @@
-package kamon.metrics.instruments.counter
+package kamon.metrics.instruments
+
 /*
  * =========================================================================================
  * Copyright © 2013-2014 the kamon project <http://kamon.io/>
@@ -18,6 +19,7 @@ package kamon.metrics.instruments.counter
 import java.lang.Math._
 import jsr166e.LongMaxUpdater
 import kamon.util.PaddedAtomicLong
+import kamon.metrics.instruments.MinMaxCounter.CounterMeasurement
 
 class MinMaxCounter {
   private val min = new LongMaxUpdater
@@ -37,9 +39,9 @@ class MinMaxCounter {
     min.update(-currentValue)
   }
 
-  def collect(): (Long, Long, Long) = {
+  def collect(): CounterMeasurement = {
     val currentValue = sum.get()
-    val result = (abs(min.maxThenReset()), max.maxThenReset(), currentValue)
+    val result = CounterMeasurement(abs(min.maxThenReset()), max.maxThenReset(), currentValue)
     max.update(currentValue)
     min.update(-currentValue)
     result
@@ -48,4 +50,6 @@ class MinMaxCounter {
 
 object MinMaxCounter {
   def apply() = new MinMaxCounter()
+
+  case class CounterMeasurement(min: Long, max: Long, current: Long)
 }