3 files changed, 5 insertions, 8 deletions
diff --git a/kamon-annotation/src/main/resources/reference.conf b/kamon-annotation/src/main/resources/reference.conf
index b7680022..ccc57afe 100644
--- a/kamon-annotation/src/main/resources/reference.conf
+++ b/kamon-annotation/src/main/resources/reference.conf
@@ -13,7 +13,7 @@ kamon {
     kamon-annotation {
       auto-start = yes
       requires-aspectj = yes
-      extension-id = "kamon.annotation.Annotation"
+      extension-id = "kamon.annotation.AnnotationExtension"
     }
   }
 }
diff --git a/kamon-annotation/src/main/scala/kamon/annotation/Annotation.scala b/kamon-annotation/src/main/scala/kamon/annotation/AnnotationExtension.scala
index 4a1eed94..21774865 100644
--- a/kamon-annotation/src/main/scala/kamon/annotation/Annotation.scala
+++ b/kamon-annotation/src/main/scala/kamon/annotation/AnnotationExtension.scala
@@ -15,13 +15,11 @@
 
 package kamon.annotation
 
-import akka.actor.{ ExtendedActorSystem, Extension, ExtensionId, ExtensionIdProvider }
-import akka.event.Logging
 import kamon.Kamon
-import org.slf4j.LoggerFactory
+import kamon.util.logger.LazyLogger
 
 object AnnotationExtension {
-  val log = LoggerFactory.getLogger("kamon.annotation.Annotation")
+  val log = LazyLogger("kamon.annotation.Annotation")
 
   val config = Kamon.config.getConfig("kamon.annotation")
   val arraySize = config.getInt("instruments-array-size")
diff --git a/kamon-annotation/src/main/scala/kamon/annotation/instrumentation/AnnotationInstrumentation.scala b/kamon-annotation/src/main/scala/kamon/annotation/instrumentation/AnnotationInstrumentation.scala
index e5d1aff9..e82c5725 100644
--- a/kamon-annotation/src/main/scala/kamon/annotation/instrumentation/AnnotationInstrumentation.scala
+++ b/kamon-annotation/src/main/scala/kamon/annotation/instrumentation/AnnotationInstrumentation.scala
@@ -16,13 +16,12 @@
 
 package kamon.annotation.instrumentation
 
-import kamon.Kamon
+import java.util.concurrent.atomic.AtomicReferenceArray
 import kamon.annotation._
 import kamon.metric.instrument
-import kamon.metric.instrument.{ MinMaxCounter, Counter }
+import kamon.metric.instrument.{ Counter, MinMaxCounter }
 import org.aspectj.lang.annotation._
 import org.aspectj.lang.{ JoinPoint, ProceedingJoinPoint }
-import java.util.concurrent.atomic.AtomicReferenceArray
 
 @Aspect
 class AnnotationInstrumentation extends BaseAnnotationInstrumentation {