Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix DB2 jdbc connection instrumentation #3313

Merged
merged 3 commits into from
Sep 13, 2023
Merged

Fix DB2 jdbc connection instrumentation #3313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c52ad22
Instrument db2 jdbc connections
JonasKunz Sep 7, 2023
8297979
Added changelog
JonasKunz Sep 13, 2023
b05c6fc
Merge remote-tracking branch 'elastic/main' into db2-connection-instr…
JonasKunz Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ns/apm-jdbc-plugin/src/main/java/co/elastic/apm/agent/jdbc/ConnectionInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public static void storeSql(@Advice.Return @Nullable PreparedStatement statement

@Override
public ElementMatcher<? super NamedElement> getTypeMatcherPreFilter() {
return nameContains("Connection");
return nameContains("Connection").or(nameStartsWith("com.ibm.db2.jcc")); //db2 doesn't have Connection in the name
}

@Override
Expand Down
Loading