= all: some clean up in jdbc and annotation modules

2 files changed, 6 insertions, 9 deletions

diff --git a/kamon-jdbc/src/main/scala/kamon/jdbc/Jdbc.scala b/kamon-jdbc/src/main/scala/kamon/jdbc/JdbcExtension.scala
index eca3f89d..5904053d 100644
--- a/kamon-jdbc/src/main/scala/kamon/jdbc/Jdbc.scala
+++ b/kamon-jdbc/src/main/scala/kamon/jdbc/JdbcExtension.scala
@@ -19,8 +19,11 @@ import kamon.util.ConfigTools.Syntax
 
 import akka.actor._
 import kamon.Kamon
+import kamon.util.logger.LazyLogger
 
 object JdbcExtension {
+  val log = LazyLogger("kamon.jdbc.JdbcExtension")
+
   val SegmentLibraryName = "jdbc"
 
   private val config = Kamon.config.getConfig("kamon.jdbc")
@@ -59,9 +62,7 @@ class DefaultJdbcNameGenerator extends JdbcNameGenerator {
 }
 
 class DefaultSqlErrorProcessor extends SqlErrorProcessor {
-  import org.slf4j.LoggerFactory
-
-  val log = LoggerFactory.getLogger(classOf[DefaultSqlErrorProcessor])
+  val log = LazyLogger(classOf[DefaultSqlErrorProcessor])
 
   override def process(sql: String, cause: Throwable): Unit = {
     log.error(s"the query [$sql] failed with exception [${cause.getMessage}]")
@@ -69,9 +70,7 @@ class DefaultSqlErrorProcessor extends SqlErrorProcessor {
 }
 
 class DefaultSlowQueryProcessor extends SlowQueryProcessor {
-  import org.slf4j.LoggerFactory
-
-  val log = LoggerFactory.getLogger(classOf[DefaultSlowQueryProcessor])
+  val log = LazyLogger(classOf[DefaultSlowQueryProcessor])
 
   override def process(sql: String, executionTimeInMillis: Long, queryThresholdInMillis: Long): Unit = {
     log.warn(s"The query [$sql] took $executionTimeInMillis ms and the slow query threshold is $queryThresholdInMillis ms")
diff --git a/kamon-jdbc/src/main/scala/kamon/jdbc/instrumentation/StatementInstrumentation.scala b/kamon-jdbc/src/main/scala/kamon/jdbc/instrumentation/StatementInstrumentation.scala
index 321ce398..8da5c223 100644
--- a/kamon-jdbc/src/main/scala/kamon/jdbc/instrumentation/StatementInstrumentation.scala
+++ b/kamon-jdbc/src/main/scala/kamon/jdbc/instrumentation/StatementInstrumentation.scala
@@ -23,7 +23,6 @@ import kamon.jdbc.metric.StatementsMetrics
 import kamon.trace.{ Tracer, TraceContext, SegmentCategory }
 import org.aspectj.lang.ProceedingJoinPoint
 import org.aspectj.lang.annotation.{ Around, Aspect, Pointcut }
-import org.slf4j.LoggerFactory
 
 import scala.util.control.NonFatal
 
@@ -52,7 +51,7 @@ class StatementInstrumentation {
         case UpdateStatement(_) ⇒ withSegment(ctx, Update)(recordWrite(pjp, sql))
         case DeleteStatement(_) ⇒ withSegment(ctx, Delete)(recordWrite(pjp, sql))
         case anythingElse ⇒
-          log.debug(s"Unable to parse sql [$sql]")
+          JdbcExtension.log.debug(s"Unable to parse sql [$sql]")
           pjp.proceed()
       }
     }
@@ -90,7 +89,6 @@ class StatementInstrumentation {
 }
 
 object StatementInstrumentation {
-  val log = LoggerFactory.getLogger(classOf[StatementInstrumentation])
 
   val SelectStatement = "(?i)^\\s*select.*?\\sfrom[\\s\\[]+([^\\]\\s,)(;]*).*".r
   val InsertStatement = "(?i)^\\s*insert(?:\\s+ignore)?\\s+into\\s+([^\\s(,;]*).*".r