From 6ef32e6a02ea1545b70ce0489059684668c431d5 Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Fri, 17 Jul 2015 15:20:15 +0200 Subject: = akka: minor formatting fixes. --- .../kamon/akka/instrumentation/DispatcherInstrumentation.scala | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/kamon-akka/src/main/scala/kamon/akka/instrumentation/DispatcherInstrumentation.scala b/kamon-akka/src/main/scala/kamon/akka/instrumentation/DispatcherInstrumentation.scala index cc177aac..0b963c16 100644 --- a/kamon-akka/src/main/scala/kamon/akka/instrumentation/DispatcherInstrumentation.scala +++ b/kamon-akka/src/main/scala/kamon/akka/instrumentation/DispatcherInstrumentation.scala @@ -24,7 +24,7 @@ import akka.dispatch._ import akka.kamon.instrumentation.LookupDataAware.LookupData import kamon.Kamon import kamon.akka.{ AkkaDispatcherMetrics, ThreadPoolExecutorDispatcherMetrics, ForkJoinPoolDispatcherMetrics } -import kamon.metric.{MetricsModule, Entity} +import kamon.metric.{ MetricsModule, Entity } import org.aspectj.lang.ProceedingJoinPoint import org.aspectj.lang.annotation._ @@ -121,7 +121,6 @@ class DispatcherInstrumentation { @Pointcut("execution(* akka.dispatch.Dispatcher.LazyExecutorServiceDelegate.shutdown()) && this(lazyExecutor)") def lazyExecutorShutdown(lazyExecutor: LookupDataAware): Unit = {} - @After("lazyExecutorShutdown(lazyExecutor)") def afterLazyExecutorShutdown(lazyExecutor: LookupDataAware): Unit = { import lazyExecutor.lookupData @@ -130,17 +129,16 @@ class DispatcherInstrumentation { lazyExecutor.asInstanceOf[ExecutorServiceDelegate].executor match { case fjp: AkkaForkJoinPool ⇒ lookupData.metrics.removeEntity(Entity(lookupData.actorSystem.name + "/" + lookupData.dispatcherName, - AkkaDispatcherMetrics.Category, tags = Map("dispatcher-type" -> "fork-join-pool"))) + AkkaDispatcherMetrics.Category, tags = Map("dispatcher-type" -> "fork-join-pool"))) case tpe: ThreadPoolExecutor ⇒ lookupData.metrics.removeEntity(Entity(lookupData.actorSystem.name + "/" + lookupData.dispatcherName, - AkkaDispatcherMetrics.Category, tags = Map("dispatcher-type" -> "thread-pool-executor"))) + AkkaDispatcherMetrics.Category, tags = Map("dispatcher-type" -> "thread-pool-executor"))) case other ⇒ // nothing to remove. } } - } @Aspect @@ -169,7 +167,7 @@ trait LookupDataAware { } object LookupDataAware { - case class LookupData(dispatcherName: String, actorSystem: ActorSystem, metrics:MetricsModule = Kamon.metrics) + case class LookupData(dispatcherName: String, actorSystem: ActorSystem, metrics: MetricsModule = Kamon.metrics) private val _currentDispatcherLookupData = new ThreadLocal[LookupData] -- cgit v1.2.3