From 321191c73e6a7a3d27931386c481cc032a42c336 Mon Sep 17 00:00:00 2001 From: Diego Date: Sat, 15 Mar 2014 11:21:44 -0300 Subject: implementation of IMessageHandler interface in order to control Aspectj weaving messages through kamon --- kamon-core/src/main/resources/META-INF/aop.xml | 2 +- kamon-core/src/main/resources/reference.conf | 12 +++-- .../ActorMessagePassingTracing.scala | 3 +- .../weaver/logging/KamonWeaverMessageHandler.scala | 58 ++++++++++++++++++++++ kamon-testkit/src/main/resources/META-INF/aop.xml | 2 +- 5 files changed, 68 insertions(+), 9 deletions(-) create mode 100644 kamon-core/src/main/scala/kamon/weaver/logging/KamonWeaverMessageHandler.scala diff --git a/kamon-core/src/main/resources/META-INF/aop.xml b/kamon-core/src/main/resources/META-INF/aop.xml index e7c5836a..f5babd54 100644 --- a/kamon-core/src/main/resources/META-INF/aop.xml +++ b/kamon-core/src/main/resources/META-INF/aop.xml @@ -17,7 +17,7 @@ - + diff --git a/kamon-core/src/main/resources/reference.conf b/kamon-core/src/main/resources/reference.conf index a6dd6c15..706132bd 100644 --- a/kamon-core/src/main/resources/reference.conf +++ b/kamon-core/src/main/resources/reference.conf @@ -23,8 +23,6 @@ kamon { } ] - - precision { actor { processing-time { @@ -52,12 +50,16 @@ kamon { } } } - - - } trace { ask-pattern-tracing = off } + + weaver { + showWeaveInfo = off + verbose = off + debug = off + showWarn = off + } } \ No newline at end of file diff --git a/kamon-core/src/main/scala/akka/instrumentation/ActorMessagePassingTracing.scala b/kamon-core/src/main/scala/akka/instrumentation/ActorMessagePassingTracing.scala index 3ed2e63e..c79f980c 100644 --- a/kamon-core/src/main/scala/akka/instrumentation/ActorMessagePassingTracing.scala +++ b/kamon-core/src/main/scala/akka/instrumentation/ActorMessagePassingTracing.scala @@ -22,7 +22,6 @@ import akka.dispatch.{ Envelope, MessageDispatcher } import kamon.trace._ import kamon.metrics.{ ActorMetrics, Metrics } import kamon.Kamon -import kamon.trace.TraceContext import kamon.metrics.ActorMetrics.ActorMetricRecorder @Aspect("perthis(actorCellCreation(*, *, *, *, *))") @@ -45,7 +44,7 @@ class BehaviourInvokeTracing { def invokingActorBehaviourAtActorCell(cell: ActorCell, envelope: Envelope) = {} @Around("invokingActorBehaviourAtActorCell(cell, envelope)") - def aroundBehaviourInvoke(pjp: ProceedingJoinPoint, cell: ActorCell, envelope: Envelope): Unit = { + def aroundBehaviourInvoke(pjp: ProceedingJoinPoint, cell: ActorCell, envelope: Envelope): Any = { val timestampBeforeProcessing = System.nanoTime() val contextAndTimestamp = envelope.asInstanceOf[TraceContextAware] diff --git a/kamon-core/src/main/scala/kamon/weaver/logging/KamonWeaverMessageHandler.scala b/kamon-core/src/main/scala/kamon/weaver/logging/KamonWeaverMessageHandler.scala new file mode 100644 index 00000000..1aa0aae0 --- /dev/null +++ b/kamon-core/src/main/scala/kamon/weaver/logging/KamonWeaverMessageHandler.scala @@ -0,0 +1,58 @@ +/* + * ========================================================================================= + * Copyright © 2013-2014 the kamon project + * + * 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.weaver.logging + +import org.aspectj.bridge.{ IMessage, IMessageHandler } +import org.slf4j.LoggerFactory +import com.typesafe.config.ConfigFactory + +class KamonWeaverMessageHandler extends IMessageHandler { + import IMessage._ + + private val log = LoggerFactory.getLogger("AspectJ Weaver") + private val conf = ConfigFactory.load().getConfig("kamon.weaver") + + private val isVerbose = conf.getBoolean("verbose") + private val isDebug = conf.getBoolean("debug") + private val showWeaveInfo = conf.getBoolean("showWeaveInfo") + private val showWarn = conf.getBoolean("showWarn") + + def handleMessage(message: IMessage) = message.getKind match { + case WEAVEINFO if showWeaveInfo ⇒ showMessage(message) + case DEBUG if isDebug ⇒ showMessage(message) + case WARNING if showWarn ⇒ showMessage(message) + case DEBUG if isDebug ⇒ showMessage(message) + case INFO if isVerbose ⇒ showMessage(message) + case ERROR ⇒ showErrorMessage(message) + case _ ⇒ false + } + + def isIgnoring(kind: IMessage.Kind): Boolean = false // We want to see everything. + def dontIgnore(kind: IMessage.Kind) = {} + def ignore(kind: IMessage.Kind) = {} + + private def showMessage(msg: IMessage): Boolean = { + log.info(msg.getMessage) + true + } + + private def showErrorMessage(msg: IMessage): Boolean = { + log.error(msg.getMessage) + true + } +} + diff --git a/kamon-testkit/src/main/resources/META-INF/aop.xml b/kamon-testkit/src/main/resources/META-INF/aop.xml index 8c5cfe42..839e8c60 100644 --- a/kamon-testkit/src/main/resources/META-INF/aop.xml +++ b/kamon-testkit/src/main/resources/META-INF/aop.xml @@ -6,7 +6,7 @@ - + -- cgit v1.2.3