Skip to content

Commit b4d57f2

Browse files
authored
Merge pull request #1023 from SimunKaracic/1008-invalid-bytecode
Update instrumentation and sqlite version
2 parents b0851a8 + 9597419 commit b4d57f2

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ lazy val `kamon-jdbc` = (project in file("instrumentation/kamon-jdbc"))
267267
logbackClassic % "test",
268268
"com.typesafe.slick" %% "slick-hikaricp" % "3.3.2" % "test",
269269
"com.h2database" % "h2" % "1.4.182" % "test",
270-
"org.xerial" % "sqlite-jdbc" % "3.27.2.1" % "test",
270+
"org.xerial" % "sqlite-jdbc" % "3.34.0" % "test",
271271
"ch.vorburger.mariaDB4j" % "mariaDB4j" % "2.4.0" % "test"
272272
)
273273
).dependsOn(`kamon-core`, `kamon-executors`, `kamon-testkit` % "test")

instrumentation/kamon-jdbc/src/main/scala/kamon/instrumentation/jdbc/advisor/StatementInstrumentationAdvisors.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import kanela.agent.libs.net.bytebuddy.asm.Advice.Thrown
2828
*/
2929
class StatementExecuteMethodAdvisor
3030
object StatementExecuteMethodAdvisor {
31-
@Advice.OnMethodEnter(suppress = classOf[Throwable])
31+
@Advice.OnMethodEnter()
3232
def executeStart(@Advice.This statement: Any, @Advice.Argument(0) sql: String): Option[Invocation] = {
3333
StatementMonitor.start(statement, sql, StatementTypes.GenericExecute)
3434
}
@@ -61,7 +61,7 @@ object PreparedStatementExecuteMethodAdvisor {
6161
*/
6262
class StatementExecuteQueryMethodAdvisor
6363
object StatementExecuteQueryMethodAdvisor {
64-
@Advice.OnMethodEnter(suppress = classOf[Throwable])
64+
@Advice.OnMethodEnter()
6565
def executeStart(@Advice.This statement: Any, @Advice.Argument(0) sql: String): Option[Invocation] = {
6666
StatementMonitor.start(statement, sql, StatementTypes.Query)
6767
}
@@ -93,7 +93,7 @@ object PreparedStatementExecuteQueryMethodAdvisor {
9393
*/
9494
class StatementExecuteUpdateMethodAdvisor
9595
object StatementExecuteUpdateMethodAdvisor {
96-
@Advice.OnMethodEnter(suppress = classOf[Throwable])
96+
@Advice.OnMethodEnter()
9797
def executeStart(@Advice.This statement: Any, @Advice.Argument(0) sql: String): Option[Invocation] = {
9898
StatementMonitor.start(statement, sql, StatementTypes.Update)
9999
}
@@ -126,7 +126,8 @@ object PreparedStatementExecuteUpdateMethodAdvisor {
126126
*/
127127
class StatementExecuteBatchMethodAdvisor
128128
object StatementExecuteBatchMethodAdvisor {
129-
@Advice.OnMethodEnter(suppress = classOf[Throwable])
129+
// inline
130+
@Advice.OnMethodEnter()
130131
def executeStart(@Advice.This statement: Any): Option[Invocation] = {
131132
val statementSQL = statement match {
132133
case hSQL: HasStatementSQL => hSQL.capturedStatementSQL()

0 commit comments

Comments
 (0)