From a0d15d146c03a451f82c6f22bfebd04adc55b643 Mon Sep 17 00:00:00 2001 From: Diego Date: Wed, 9 Apr 2014 22:17:57 -0300 Subject: = core: minor cleanup before release --- kamon-core/src/main/resources/reference.conf | 6 ++++++ .../main/scala/kamon/weaver/logging/KamonWeaverMessageHandler.scala | 3 +++ kamon-statsd/src/main/scala/kamon/statsd/StatsD.scala | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/kamon-core/src/main/resources/reference.conf b/kamon-core/src/main/resources/reference.conf index d5ed8825..f29b9220 100644 --- a/kamon-core/src/main/resources/reference.conf +++ b/kamon-core/src/main/resources/reference.conf @@ -64,6 +64,12 @@ kamon { } weaver { + # AspectJ options supported by LTW + # showWeaveInfo: show informational messages whenever the weaver touches a class file. + # verbose: show informational messages about the weaving process. + # debug: show a messages for each class passed to the weaver indicating whether it was woven, excluded or ignored. + # showWarn: show warning messages about the weaving process. + showWeaveInfo = off verbose = off debug = off diff --git a/kamon-core/src/main/scala/kamon/weaver/logging/KamonWeaverMessageHandler.scala b/kamon-core/src/main/scala/kamon/weaver/logging/KamonWeaverMessageHandler.scala index 1aa0aae0..bf047898 100644 --- a/kamon-core/src/main/scala/kamon/weaver/logging/KamonWeaverMessageHandler.scala +++ b/kamon-core/src/main/scala/kamon/weaver/logging/KamonWeaverMessageHandler.scala @@ -20,6 +20,9 @@ import org.aspectj.bridge.{ IMessage, IMessageHandler } import org.slf4j.LoggerFactory import com.typesafe.config.ConfigFactory +/** + * Implementation of AspectJ's IMessageHandler interface that routes AspectJ weaving messages and controls them through kamon configuration. + */ class KamonWeaverMessageHandler extends IMessageHandler { import IMessage._ diff --git a/kamon-statsd/src/main/scala/kamon/statsd/StatsD.scala b/kamon-statsd/src/main/scala/kamon/statsd/StatsD.scala index 0f1d2562..7676f97f 100644 --- a/kamon-statsd/src/main/scala/kamon/statsd/StatsD.scala +++ b/kamon-statsd/src/main/scala/kamon/statsd/StatsD.scala @@ -78,6 +78,6 @@ class SimpleMetricKeyGenerator(config: Config) extends StatsD.MetricKeyGenerator val localhostName = ManagementFactory.getRuntimeMXBean.getName.split('@')(1) def generateKey(groupIdentity: MetricGroupIdentity, metricIdentity: MetricIdentity): String = - application + "." + localhostName + "." + groupIdentity.category.name + "." + groupIdentity.name + "." + metricIdentity.name + s"${application}.${localhostName}.${groupIdentity.category.name}.${groupIdentity.name}.${metricIdentity.name}" } -- cgit v1.2.3