From 90b143008c9c05e8f5934f5e6f6da403f511ae33 Mon Sep 17 00:00:00 2001 From: Jonas Kunz Date: Wed, 13 Sep 2023 16:51:40 +0200 Subject: [PATCH] Fix DB2 jdbc connection instrumentation (#3313) --- CHANGELOG.asciidoc | 1 + .../co/elastic/apm/agent/jdbc/ConnectionInstrumentation.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 94044ca7c9..f8a602aa51 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -46,6 +46,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] [[release-notes-1.x]] === Java Agent version 1.x 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