Skip to content

Extend JDBC catch to include Errors #1385

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

Merged
tylerbenson merged 2 commits into from
Apr 21, 2020
Merged

Extend JDBC catch to include Errors #1385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe0b8f5
Extend JDBC catch to include Errors
tylerbenson Apr 20, 2020
a2156fd
Update test to throw Throwable.
tylerbenson Apr 20, 2020
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
2 changes: 1 addition & 1 deletion .../instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public AgentSpan onConnection(final AgentSpan span, final Connection connection)
if (url != null) {
try {
dbInfo = JDBCConnectionUrlParser.parse(url, connection.getClientInfo());
} catch (final Exception ex) {
} catch (final Throwable ex) {
// getClientInfo is likely not allowed.
dbInfo = JDBCConnectionUrlParser.parse(url, null);
}
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/instrumentation/jdbc/src/test/groovy/test/TestConnection.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ class TestConnection implements Connection {

@Override
Properties getClientInfo() throws SQLException {
throw new UnsupportedOperationException("Test 123")
throw new Throwable("Test 123")
}

@Override
Expand Down