From 72e34ee97a1fff681dd0080d77ce679e4249450f Mon Sep 17 00:00:00 2001
From: Diego <diegolparra@gmail.com>
Date: Wed, 26 Nov 2014 11:37:21 -0300
Subject: = kamon-jdbc: change execution pointcut to call

---
 kamon-jdbc/src/main/resources/META-INF/aop.xml                      | 4 ++--
 .../scala/kamon/jdbc/instrumentation/StatementInstrumentation.scala | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kamon-jdbc/src/main/resources/META-INF/aop.xml b/kamon-jdbc/src/main/resources/META-INF/aop.xml
index dd1bbbbe..50529603 100644
--- a/kamon-jdbc/src/main/resources/META-INF/aop.xml
+++ b/kamon-jdbc/src/main/resources/META-INF/aop.xml
@@ -6,7 +6,7 @@
   </aspects>
 
     <weaver>
-       <include within="java.sql.Statement+..*"/>
-       <include within="java.sql.Connection+..*"/>
+       <include within="java.sql.Statement..*"/>
+       <include within="java.sql.Connection..*"/>
    </weaver>
 </aspectj>
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 600a79b9..494c75ca 100644
--- a/kamon-jdbc/src/main/scala/kamon/jdbc/instrumentation/StatementInstrumentation.scala
+++ b/kamon-jdbc/src/main/scala/kamon/jdbc/instrumentation/StatementInstrumentation.scala
@@ -36,13 +36,13 @@ class StatementInstrumentation {
 
   @volatile var statementRecorder: Option[StatementsMetricsRecorder] = Option.empty
 
-  @Pointcut("execution(* java.sql.Statement.execute*(..)) && args(sql)")
+  @Pointcut("call(* java.sql.Statement.execute*(..)) && args(sql)")
   def onExecuteStatement(sql: String): Unit = {}
 
-  @Pointcut("execution(* java.sql.Connection.prepareStatement(..)) && args(sql)")
+  @Pointcut("call(* java.sql.Connection.prepareStatement(..)) && args(sql)")
   def onExecutePreparedStatement(sql: String): Unit = {}
 
-  @Pointcut("execution(* java.sql.Connection.prepareCall(..)) && args(sql)")
+  @Pointcut("call(* java.sql.Connection.prepareCall(..)) && args(sql)")
   def onExecutePreparedCall(sql: String): Unit = {}
 
   @Around("onExecuteStatement(sql) || onExecutePreparedStatement(sql) || onExecutePreparedCall(sql)")
-- 
cgit v1.2.3