From a96d9e0ac5fafd29e2bfc2e4ae10a673690f1e42 Mon Sep 17 00:00:00 2001 From: Diego Date: Fri, 22 Apr 2016 00:40:34 -0300 Subject: ! kamon-autoweave: catch all exceptions thrown for AgentLoader and closes #344 --- kamon-core/src/main/scala/kamon/Kamon.scala | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'kamon-core/src/main/scala/kamon/Kamon.scala') diff --git a/kamon-core/src/main/scala/kamon/Kamon.scala b/kamon-core/src/main/scala/kamon/Kamon.scala index b5ea0c28..9f6e58ee 100644 --- a/kamon-core/src/main/scala/kamon/Kamon.scala +++ b/kamon-core/src/main/scala/kamon/Kamon.scala @@ -16,12 +16,14 @@ package kamon import _root_.akka.actor import _root_.akka.actor._ -import _root_.scala.util.{ Success, Failure, Try } import com.typesafe.config.{ Config, ConfigFactory } import kamon.metric._ import kamon.trace.TracerModuleImpl import kamon.util.logger.LazyLogger +import _root_.scala.util.control.NonFatal +import _root_.scala.util.{ Failure, Success, Try } + object Kamon { private val log = LazyLogger("Kamon") @@ -61,13 +63,20 @@ object Kamon { private def tryLoadAutoweaveModule(): Unit = { val color = (msg: String) ⇒ s"""\u001B[32m${msg}\u001B[0m""" - log.info("Trying to load kamon-autoweave...") + Try { + + log.info("Trying to load kamon-autoweave...") + + val autoweave = Class.forName("kamon.autoweave.Autoweave") + val instance = autoweave.newInstance() + + autoweave.getDeclaredMethod("attach").invoke(instance) - Try(Class.forName("kamon.autoweave.Autoweave$")) match { + } match { case Success(_) ⇒ log.info(color("Kamon-autoweave has been successfully loaded.")) log.info(color("The AspectJ loadtime weaving agent is now attached to the JVM (you don't need to use -javaagent).")) - case Failure(reason) ⇒ log.debug(s"Kamon-autoweave failed to load. Reason: we have not found the ${reason.getMessage} class in the classpath.") + case Failure(NonFatal(reason)) ⇒ log.debug(s"Kamon-autoweave failed to load. Reason: ${reason.getCause}.") } } -- cgit v1.2.3