! core: generalize ThreadPoolExecutors metrics

7 files changed, 106 insertions, 34 deletions

diff --git a/kamon-akka/src/main/scala/kamon/akka/DispatcherMetrics.scala b/kamon-akka/src/main/scala/kamon/akka/DispatcherMetrics.scala
index 23ecde79..91cbdee9 100644
--- a/kamon-akka/src/main/scala/kamon/akka/DispatcherMetrics.scala
+++ b/kamon-akka/src/main/scala/kamon/akka/DispatcherMetrics.scala
@@ -1,6 +1,6 @@
 /*
  * =========================================================================================
- * Copyright © 2013-2014 the kamon project <http://kamon.io/>
+ * Copyright © 2013-2015 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
@@ -20,40 +20,20 @@ import java.util.concurrent.ThreadPoolExecutor
 
 import _root_.akka.dispatch.ForkJoinExecutorConfigurator.AkkaForkJoinPool
 import kamon.metric._
-import kamon.metric.instrument.{ DifferentialValueCollector, InstrumentFactory }
-
-class ForkJoinPoolDispatcherMetrics(fjp: AkkaForkJoinPool, instrumentFactory: InstrumentFactory) extends GenericEntityRecorder(instrumentFactory) {
-  val paralellism = minMaxCounter("parallelism")
-  paralellism.increment(fjp.getParallelism) // Steady value.
-
-  val poolSize = gauge("pool-size", fjp.getPoolSize.toLong)
-  val activeThreads = gauge("active-threads", fjp.getActiveThreadCount.toLong)
-  val runningThreads = gauge("running-threads", fjp.getRunningThreadCount.toLong)
-  val queuedTaskCount = gauge("queued-task-count", fjp.getQueuedTaskCount)
-}
+import kamon.metric.instrument.InstrumentFactory
+import kamon.util.executors.{ ForkJoinPoolMetrics, ThreadPoolExecutorMetrics }
 
 object ForkJoinPoolDispatcherMetrics {
-
-  def factory(fjp: AkkaForkJoinPool) = new EntityRecorderFactory[ForkJoinPoolDispatcherMetrics] {
+  def factory(fjp: AkkaForkJoinPool) = new EntityRecorderFactory[ForkJoinPoolMetrics] {
     def category: String = AkkaDispatcherMetrics.Category
-    def createRecorder(instrumentFactory: InstrumentFactory) = new ForkJoinPoolDispatcherMetrics(fjp, instrumentFactory)
+    def createRecorder(instrumentFactory: InstrumentFactory) = new ForkJoinPoolMetrics(fjp, instrumentFactory)
   }
 }
 
-class ThreadPoolExecutorDispatcherMetrics(tpe: ThreadPoolExecutor, instrumentFactory: InstrumentFactory) extends GenericEntityRecorder(instrumentFactory) {
-  val corePoolSize = gauge("core-pool-size", tpe.getCorePoolSize.toLong)
-  val maxPoolSize = gauge("max-pool-size", tpe.getMaximumPoolSize.toLong)
-  val poolSize = gauge("pool-size", tpe.getPoolSize.toLong)
-  val activeThreads = gauge("active-threads", tpe.getActiveCount.toLong)
-  val processedTasks = gauge("processed-tasks", DifferentialValueCollector(() ⇒ {
-    tpe.getTaskCount
-  }))
-}
-
 object ThreadPoolExecutorDispatcherMetrics {
-  def factory(tpe: ThreadPoolExecutor) = new EntityRecorderFactory[ThreadPoolExecutorDispatcherMetrics] {
+  def factory(tpe: ThreadPoolExecutor) = new EntityRecorderFactory[ThreadPoolExecutorMetrics] {
     def category: String = AkkaDispatcherMetrics.Category
-    def createRecorder(instrumentFactory: InstrumentFactory) = new ThreadPoolExecutorDispatcherMetrics(tpe, instrumentFactory)
+    def createRecorder(instrumentFactory: InstrumentFactory) = new ThreadPoolExecutorMetrics(tpe, instrumentFactory)
   }
 }
 
diff --git a/kamon-akka/src/test/scala/kamon/akka/DispatcherMetricsSpec.scala b/kamon-akka/src/test/scala/kamon/akka/DispatcherMetricsSpec.scala
index cdd1dd12..678c7f73 100644
--- a/kamon-akka/src/test/scala/kamon/akka/DispatcherMetricsSpec.scala
+++ b/kamon-akka/src/test/scala/kamon/akka/DispatcherMetricsSpec.scala
@@ -1,5 +1,5 @@
 /* =========================================================================================
- * Copyright © 2013-2014 the kamon project <http://kamon.io/>
+ * Copyright © 2013-2015 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
@@ -24,6 +24,7 @@ import kamon.Kamon
 import kamon.akka.RouterMetricsTestActor.{ Pong, Ping }
 import kamon.metric.{ EntityRecorder, EntitySnapshot }
 import kamon.testkit.BaseKamonSpec
+import kamon.util.executors.{ ForkJoinPoolMetrics, ThreadPoolExecutorMetrics }
 
 import scala.concurrent.duration._
 import scala.concurrent.{ Await, Future }
@@ -178,14 +179,14 @@ class DispatcherMetricsSpec extends BaseKamonSpec("dispatcher-metrics-spec") {
 
   def refreshDispatcherInstruments(dispatcher: MessageDispatcher, dispatcherType: String): Unit = {
     findDispatcherRecorder(dispatcher, dispatcherType) match {
-      case Some(tpe: ThreadPoolExecutorDispatcherMetrics) ⇒
+      case Some(tpe: ThreadPoolExecutorMetrics) ⇒
         tpe.processedTasks.refreshValue()
         tpe.activeThreads.refreshValue()
         tpe.maxPoolSize.refreshValue()
         tpe.poolSize.refreshValue()
         tpe.corePoolSize.refreshValue()
 
-      case Some(fjp: ForkJoinPoolDispatcherMetrics) ⇒
+      case Some(fjp: ForkJoinPoolMetrics) ⇒
         fjp.activeThreads.refreshValue()
         fjp.poolSize.refreshValue()
         fjp.queuedTaskCount.refreshValue()
diff --git a/kamon-core/src/main/scala/kamon/util/executors/ExecutorServiceMetrics.scala b/kamon-core/src/main/scala/kamon/util/executors/ExecutorServiceMetrics.scala
new file mode 100644
index 00000000..e1d84df3
--- /dev/null
+++ b/kamon-core/src/main/scala/kamon/util/executors/ExecutorServiceMetrics.scala
@@ -0,0 +1,91 @@
+/*
+ * =========================================================================================
+ * Copyright © 2013-2015 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.util.executors
+
+import kamon.Kamon
+import kamon.metric.{ EntityRecorderFactory, Entity, GenericEntityRecorder }
+import kamon.metric.instrument.{ DifferentialValueCollector, InstrumentFactory }
+import java.util.concurrent.ThreadPoolExecutor
+import scala.concurrent.forkjoin.ForkJoinPool
+import java.util.concurrent.{ ForkJoinPool ⇒ JavaForkJoinPool }
+
+class ForkJoinPoolMetrics(fjp: ForkJoinPool, instrumentFactory: InstrumentFactory) extends GenericEntityRecorder(instrumentFactory) {
+  val paralellism = minMaxCounter("parallelism")
+  paralellism.increment(fjp.getParallelism) // Steady value.
+
+  val poolSize = gauge("pool-size", fjp.getPoolSize.toLong)
+  val activeThreads = gauge("active-threads", fjp.getActiveThreadCount.toLong)
+  val runningThreads = gauge("running-threads", fjp.getRunningThreadCount.toLong)
+  val queuedTaskCount = gauge("queued-task-count", fjp.getQueuedTaskCount)
+}
+
+object ForkJoinPoolMetrics {
+  def factory(fjp: ForkJoinPool) = new EntityRecorderFactory[ForkJoinPoolMetrics] {
+    def category: String = ExecutorServiceMetrics.Category
+    def createRecorder(instrumentFactory: InstrumentFactory) = new ForkJoinPoolMetrics(fjp, instrumentFactory)
+  }
+}
+
+class JavaForkJoinPoolMetrics(fjp: JavaForkJoinPool, instrumentFactory: InstrumentFactory) extends GenericEntityRecorder(instrumentFactory) {
+  val paralellism = minMaxCounter("parallelism")
+  paralellism.increment(fjp.getParallelism) // Steady value.
+
+  val poolSize = gauge("pool-size", fjp.getPoolSize.toLong)
+  val activeThreads = gauge("active-threads", fjp.getActiveThreadCount.toLong)
+  val runningThreads = gauge("running-threads", fjp.getRunningThreadCount.toLong)
+  val queuedTaskCount = gauge("queued-task-count", fjp.getQueuedTaskCount)
+}
+
+object JavaForkJoinPoolMetrics {
+  def factory(fjp: JavaForkJoinPool) = new EntityRecorderFactory[JavaForkJoinPoolMetrics] {
+    def category: String = ExecutorServiceMetrics.Category
+    def createRecorder(instrumentFactory: InstrumentFactory) = new JavaForkJoinPoolMetrics(fjp, instrumentFactory)
+  }
+}
+
+class ThreadPoolExecutorMetrics(tpe: ThreadPoolExecutor, instrumentFactory: InstrumentFactory) extends GenericEntityRecorder(instrumentFactory) {
+  val corePoolSize = gauge("core-pool-size", tpe.getCorePoolSize.toLong)
+  val maxPoolSize = gauge("max-pool-size", tpe.getMaximumPoolSize.toLong)
+  val poolSize = gauge("pool-size", tpe.getPoolSize.toLong)
+  val activeThreads = gauge("active-threads", tpe.getActiveCount.toLong)
+  val processedTasks = gauge("processed-tasks", DifferentialValueCollector(() ⇒ {
+    tpe.getTaskCount
+  }))
+}
+
+object ThreadPoolExecutorMetrics {
+  def factory(tpe: ThreadPoolExecutor) = new EntityRecorderFactory[ThreadPoolExecutorMetrics] {
+    def category: String = ExecutorServiceMetrics.Category
+    def createRecorder(instrumentFactory: InstrumentFactory) = new ThreadPoolExecutorMetrics(tpe, instrumentFactory)
+  }
+}
+
+object ExecutorServiceMetrics {
+  val Category = "thread-pool-executors"
+
+  def register(name: String, tpe: ThreadPoolExecutor): Unit = {
+    Kamon.metrics.entity(ThreadPoolExecutorMetrics.factory(tpe), Entity(name, Category))
+  }
+
+  def register(name: String, fjp: ForkJoinPool): Unit = {
+    Kamon.metrics.entity(ForkJoinPoolMetrics.factory(fjp), Entity(name, Category))
+  }
+
+  def register(name: String, jfjp: JavaForkJoinPool): Unit = {
+    Kamon.metrics.entity(JavaForkJoinPoolMetrics.factory(jfjp), Entity(name, Category))
+  }
+}
diff --git a/kamon-core/src/main/scala/kamon/http/HttpServerMetrics.scala b/kamon-core/src/main/scala/kamon/util/http/HttpServerMetrics.scala
index 553d59ed..81e8fb8b 100644
--- a/kamon-core/src/main/scala/kamon/http/HttpServerMetrics.scala
+++ b/kamon-core/src/main/scala/kamon/util/http/HttpServerMetrics.scala
@@ -14,7 +14,7 @@
  * =========================================================================================
  */
 
-package kamon.http
+package kamon.util.http
 
 import kamon.metric.{ EntityRecorderFactory, GenericEntityRecorder }
 import kamon.metric.instrument.InstrumentFactory
diff --git a/kamon-play-2.3.x/src/main/scala/kamon/play/Play.scala b/kamon-play-2.3.x/src/main/scala/kamon/play/Play.scala
index 58153937..d8ef5c97 100644
--- a/kamon-play-2.3.x/src/main/scala/kamon/play/Play.scala
+++ b/kamon-play-2.3.x/src/main/scala/kamon/play/Play.scala
@@ -19,7 +19,7 @@ package kamon.play
 import akka.actor.{ ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider }
 import akka.event.Logging
 import kamon.Kamon
-import kamon.http.HttpServerMetrics
+import kamon.util.http.HttpServerMetrics
 import play.api.libs.ws.WSRequest
 import play.api.mvc.RequestHeader
 
diff --git a/kamon-play-2.4.x/src/main/scala/kamon/play/Play.scala b/kamon-play-2.4.x/src/main/scala/kamon/play/Play.scala
index c8177610..db05f29f 100644
--- a/kamon-play-2.4.x/src/main/scala/kamon/play/Play.scala
+++ b/kamon-play-2.4.x/src/main/scala/kamon/play/Play.scala
@@ -19,7 +19,7 @@ package kamon.play
 import akka.actor.{ ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider }
 import akka.event.Logging
 import kamon.Kamon
-import kamon.http.HttpServerMetrics
+import kamon.util.http.HttpServerMetrics
 import play.api.libs.ws.WSRequest
 import play.api.mvc.RequestHeader
 
diff --git a/kamon-spray/src/main/scala/kamon/spray/SprayExtension.scala b/kamon-spray/src/main/scala/kamon/spray/SprayExtension.scala
index ebf79496..044d2884 100644
--- a/kamon-spray/src/main/scala/kamon/spray/SprayExtension.scala
+++ b/kamon-spray/src/main/scala/kamon/spray/SprayExtension.scala
@@ -20,7 +20,7 @@ import akka.actor.{ ExtendedActorSystem, ExtensionIdProvider, ExtensionId }
 import akka.actor
 import akka.event.{ Logging, LoggingAdapter }
 import kamon.Kamon
-import kamon.http.HttpServerMetrics
+import kamon.util.http.HttpServerMetrics
 import kamon.metric.Entity
 import spray.http.HttpHeaders.Host
 import spray.http.HttpRequest