diff options
author | Diego <diegolparra@gmail.com> | 2014-11-26 11:37:21 -0300 |
---|---|---|
committer | Diego <diegolparra@gmail.com> | 2014-12-04 02:27:39 -0300 |
commit | 72e34ee97a1fff681dd0080d77ce679e4249450f (patch) | |
tree | 416ba43ccf5979a30dd757aed52534376ab4aae0 /kamon-jdbc/src | |
parent | 6e6bb0486bc6ad83103e8ab62f6f928da0918a2c (diff) | |
download | Kamon-72e34ee97a1fff681dd0080d77ce679e4249450f.tar.gz Kamon-72e34ee97a1fff681dd0080d77ce679e4249450f.tar.bz2 Kamon-72e34ee97a1fff681dd0080d77ce679e4249450f.zip |
= kamon-jdbc: change execution pointcut to call
Diffstat (limited to 'kamon-jdbc/src')
-rw-r--r-- | kamon-jdbc/src/main/resources/META-INF/aop.xml | 4 | ||||
-rw-r--r-- | kamon-jdbc/src/main/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)") |