diff options
Diffstat (limited to 'kamon-akka')
-rw-r--r-- | kamon-akka/src/main/scala/kamon/akka/DispatcherMetrics.scala | 34 | ||||
-rw-r--r-- | kamon-akka/src/test/scala/kamon/akka/DispatcherMetricsSpec.scala | 7 |
2 files changed, 11 insertions, 30 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() |