2 files changed, 19 insertions, 3 deletions
diff --git a/kamon-core/src/main/scala/kamon/Kamon.scala b/kamon-core/src/main/scala/kamon/Kamon.scala
index 4476de22..e659c4dc 100644
--- a/kamon-core/src/main/scala/kamon/Kamon.scala
+++ b/kamon-core/src/main/scala/kamon/Kamon.scala
@@ -16,13 +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
 
 object Kamon {
-  private val log = LazyLogger(getClass)
+  private val log = LazyLogger("Kamon")
 
   trait Extension extends actor.Extension
 
@@ -40,6 +41,8 @@ object Kamon {
 
     log.info("Initializing Kamon...")
 
+    tryLoadAutoweaveModule()
+
     ActorSystem("kamon", patchedConfig)
   }
 
@@ -55,6 +58,19 @@ object Kamon {
     _system.shutdown()
   }
 
+  private def tryLoadAutoweaveModule(): Unit = {
+    val color = (msg: String) ⇒ s"""\u001B[32m${msg}\u001B[0m"""
+
+    log.info("Trying to load kamon-autoweave...")
+
+    Try(Class.forName("kamon.autoweave.Autoweave$")) 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.info(s"Kamon-autoweave failed to load. Reason: we have not found the ${reason.getMessage} class in the classpath.")
+    }
+  }
+
   private def resolveConfiguration: Config = {
     val defaultConfig = ConfigFactory.load()
 
diff --git a/kamon-core/src/main/scala/kamon/ModuleLoader.scala b/kamon-core/src/main/scala/kamon/ModuleLoader.scala
index a89af19e..ac0511c5 100644
--- a/kamon-core/src/main/scala/kamon/ModuleLoader.scala
+++ b/kamon-core/src/main/scala/kamon/ModuleLoader.scala
@@ -20,7 +20,7 @@ import _root_.akka.actor
 import _root_.akka.actor._
 import kamon.util.logger.LazyLogger
 import org.aspectj.lang.ProceedingJoinPoint
-import org.aspectj.lang.annotation.{Around, Aspect, Pointcut}
+import org.aspectj.lang.annotation.{ Around, Aspect, Pointcut }
 
 private[kamon] object ModuleLoader extends ExtensionId[ModuleLoaderExtension] with ExtensionIdProvider {
   def lookup(): ExtensionId[_ <: actor.Extension] = ModuleLoader
@@ -41,7 +41,7 @@ private[kamon] class ModuleLoaderExtension(system: ExtendedActorSystem) extends
       system.dynamicAccess.getObjectFor[ExtensionId[Kamon.Extension]](extensionClass).map { moduleID ⇒
         log.debug(s"Auto starting the [$name] module.")
         moduleID.get(system)
-  
+
       } recover {
         case th: Throwable ⇒ log.error(s"Failed to auto start the [$name] module.", th)
       }