From c52ad221526645be0fc6dc0b2055866ce5392d06 Mon Sep 17 00:00:00 2001 From: Jonas Kunz Date: Thu, 7 Sep 2023 14:57:41 +0200 Subject: [PATCH 1/2] Instrument db2 jdbc connections --- .../co/elastic/apm/agent/jdbc/ConnectionInstrumentation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/ConnectionInstrumentation.java b/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/ConnectionInstrumentation.java index b313c4f8dc..da79e09d49 100644 --- a/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/ConnectionInstrumentation.java +++ b/apm-agent-plugins/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/ConnectionInstrumentation.java @@ -57,7 +57,7 @@ public static void storeSql(@Advice.Return @Nullable PreparedStatement statement @Override public ElementMatcher getTypeMatcherPreFilter() { - return nameContains("Connection"); + return nameContains("Connection").or(nameStartsWith("com.ibm.db2.jcc")); //db2 doesn't have Connection in the name } @Override From 8297979e91b37fe1bf038b0df045144775e0f753 Mon Sep 17 00:00:00 2001 From: Jonas Kunz Date: Wed, 13 Sep 2023 15:44:05 +0200 Subject: [PATCH 2/2] Added changelog --- CHANGELOG.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 99c9032d4f..0e57bf4ea7 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -37,6 +37,7 @@ Use subheadings with the "=====" level for adding notes for unreleased changes: * Allow overriding of transaction type for Servlet-API transactions - {pull}3226[#3226] * Fix micrometer histogram serialization - {pull}3290[#3290], {pull}3304[#3304] * Fix transactions not being correctly handled in certain edge cases - {pull}3294[#3294] +* Fixed JDBC instrumentation for DB2 - {pull}3313[#3313] [float] ===== Features