! kamon-core: Remove KamonWeaverMessageHandler to avoid dependencies issues and closes #97

3 files changed, 1 insertions, 76 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
-  }
-}
-