diff options
| -rw-r--r-- | kamon-core/src/main/resources/META-INF/aop.xml | 2 | ||||
| -rw-r--r-- | kamon-core/src/main/resources/reference.conf | 14 | ||||
| -rw-r--r-- | kamon-core/src/main/scala/kamon/weaver/logging/KamonWeaverMessageHandler.scala | 61 | ||||
| -rw-r--r-- | kamon-examples/kamon-play-example/conf/application.conf | 7 | ||||
| -rw-r--r-- | kamon-playground/src/main/resources/application.conf | 7 | ||||
| -rw-r--r-- | project/Dependencies.scala | 1 | ||||
| -rw-r--r-- | project/Projects.scala | 2 |
7 files changed, 2 insertions, 92 deletions
diff --git a/kamon-core/src/main/resources/META-INF/aop.xml b/kamon-core/src/main/resources/META-INF/aop.xml index a272320f..cd7b1645 100644 --- a/kamon-core/src/main/resources/META-INF/aop.xml +++ b/kamon-core/src/main/resources/META-INF/aop.xml @@ -29,7 +29,7 @@ <aspect name="akka.instrumentation.AskPatternInstrumentation"/> </aspects> - <weaver options="-XmessageHandlerClass:kamon.weaver.logging.KamonWeaverMessageHandler"> + <weaver> <include within="scala.concurrent..*"/> <include within="scalaz.concurrent..*"/> <include within="akka..*"/> diff --git a/kamon-core/src/main/resources/reference.conf b/kamon-core/src/main/resources/reference.conf index ace05e87..12e21bd7 100644 --- a/kamon-core/src/main/resources/reference.conf +++ b/kamon-core/src/main/resources/reference.conf @@ -132,18 +132,4 @@ kamon { # the future was created. ask-pattern-tracing = off } - - 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 - showWarn = off - } }
\ No newline at end of file diff --git a/kamon-core/src/main/scala/kamon/weaver/logging/KamonWeaverMessageHandler.scala b/kamon-core/src/main/scala/kamon/weaver/logging/KamonWeaverMessageHandler.scala deleted file mode 100644 index 12f7f549..00000000 --- a/kamon-core/src/main/scala/kamon/weaver/logging/KamonWeaverMessageHandler.scala +++ /dev/null @@ -1,61 +0,0 @@ -/* - * ========================================================================================= - * Copyright © 2013-2014 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 - * - * 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 com.typesafe.config.ConfigFactory -import java.util.logging.Logger - -/** - * Implementation of AspectJ's IMessageHandler interface that routes AspectJ weaving messages and controls them through kamon configuration. - */ -class KamonWeaverMessageHandler extends IMessageHandler { - import IMessage._ - - private val log = Logger.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.severe(msg.getMessage) - true - } -} - diff --git a/kamon-examples/kamon-play-example/conf/application.conf b/kamon-examples/kamon-play-example/conf/application.conf index 8c378a22..7d9fba80 100644 --- a/kamon-examples/kamon-play-example/conf/application.conf +++ b/kamon-examples/kamon-play-example/conf/application.conf @@ -49,13 +49,6 @@ kamon { } } - weaver { - showWeaveInfo = off - verbose = off - debug = off - showWarn = off - } - play { include-trace-token-header = true trace-token-header-name = "X-Trace-Token" diff --git a/kamon-playground/src/main/resources/application.conf b/kamon-playground/src/main/resources/application.conf index b4a6636a..32f0269d 100644 --- a/kamon-playground/src/main/resources/application.conf +++ b/kamon-playground/src/main/resources/application.conf @@ -96,11 +96,4 @@ kamon { ] } } - - weaver { - showWeaveInfo = on - verbose = off - debug = off - showWarn = off - } }
\ No newline at end of file diff --git a/project/Dependencies.scala b/project/Dependencies.scala index cb0a80ef..a266bba8 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -18,7 +18,6 @@ object Dependencies { val scalatest = "org.scalatest" %% "scalatest" % "2.2.1" val logback = "ch.qos.logback" % "logback-classic" % "1.0.13" val aspectJ = "org.aspectj" % "aspectjrt" % aspectjVersion - val aspectjWeaver = "org.aspectj" % "aspectjweaver" % aspectjVersion val newrelic = "com.newrelic.agent.java" % "newrelic-api" % "3.11.0" val snakeYaml = "org.yaml" % "snakeyaml" % "1.13" val hdrHistogram = "org.hdrhistogram" % "HdrHistogram" % "1.2.1" diff --git a/project/Projects.scala b/project/Projects.scala index 644e58b1..e3321887 100644 --- a/project/Projects.scala +++ b/project/Projects.scala @@ -24,7 +24,7 @@ object Projects extends Build { mappings in (Compile, packageSrc) ++= mappings.in(kamonMacros, Compile, packageSrc).value, libraryDependencies ++= compile(akkaActor, aspectJ, hdrHistogram) ++ - optional(akkaRemote, akkaCluster, logback, scalazConcurrent, aspectjWeaver) ++ + optional(akkaRemote, akkaCluster, logback, scalazConcurrent) ++ test(scalatest, akkaTestKit, sprayTestkit, akkaSlf4j, logback)) |