From 37bf47d4ede655df5bda73882a2c15f98b39e820 Mon Sep 17 00:00:00 2001 From: Diego Date: Fri, 13 Mar 2015 00:22:31 -0300 Subject: + log-reporter: include dispatcher metrics and close #163 --- kamon-core/src/main/scala/kamon/ModuleLoader.scala | 4 +--- kamon-core/src/main/scala/kamon/metric/Metrics.scala | 9 ++++----- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'kamon-core') diff --git a/kamon-core/src/main/scala/kamon/ModuleLoader.scala b/kamon-core/src/main/scala/kamon/ModuleLoader.scala index 0cde49c3..d1b7466e 100644 --- a/kamon-core/src/main/scala/kamon/ModuleLoader.scala +++ b/kamon-core/src/main/scala/kamon/ModuleLoader.scala @@ -20,8 +20,7 @@ import _root_.akka.actor import _root_.akka.actor._ import _root_.akka.event.Logging import org.aspectj.lang.ProceedingJoinPoint -import org.aspectj.lang.annotation.{Around, Pointcut, Aspect} - +import org.aspectj.lang.annotation.{ Around, Pointcut, Aspect } private[kamon] object ModuleLoader extends ExtensionId[ModuleLoaderExtension] with ExtensionIdProvider { def lookup(): ExtensionId[_ <: actor.Extension] = ModuleLoader @@ -32,7 +31,6 @@ private[kamon] class ModuleLoaderExtension(system: ExtendedActorSystem) extends val log = Logging(system, "ModuleLoader") val settings = ModuleLoaderSettings(system) - if (settings.modulesRequiringAspectJ.nonEmpty && !isAspectJPresent && settings.showAspectJMissingWarning) logAspectJWeaverMissing(settings.modulesRequiringAspectJ) diff --git a/kamon-core/src/main/scala/kamon/metric/Metrics.scala b/kamon-core/src/main/scala/kamon/metric/Metrics.scala index 6a976a1c..58e16bbd 100644 --- a/kamon-core/src/main/scala/kamon/metric/Metrics.scala +++ b/kamon-core/src/main/scala/kamon/metric/Metrics.scala @@ -16,16 +16,15 @@ package kamon.metric +import akka.actor._ import com.typesafe.config.Config -import kamon.metric.SubscriptionsDispatcher.{ Unsubscribe, Subscribe } +import kamon.metric.SubscriptionsDispatcher.{ Subscribe, Unsubscribe } import kamon.metric.instrument.Gauge.CurrentValueCollector import kamon.metric.instrument.Histogram.DynamicRange import kamon.metric.instrument._ +import kamon.util.LazyActorRef import scala.collection.concurrent.TrieMap -import akka.actor._ -import kamon.util.{ Supplier, LazyActorRef, TriemapAtomicGetOrElseUpdate } - import scala.concurrent.duration.FiniteDuration case class EntityRegistration[T <: EntityRecorder](entity: Entity, recorder: T) @@ -227,7 +226,7 @@ trait Metrics { } private[kamon] class MetricsImpl(config: Config) extends Metrics { - import TriemapAtomicGetOrElseUpdate.Syntax + import kamon.util.TriemapAtomicGetOrElseUpdate.Syntax private val _trackedEntities = TrieMap.empty[Entity, EntityRecorder] private val _subscriptions = new LazyActorRef -- cgit v1.2.3