Skip to content

Improve exception handling in full mode for SQL Server #7411

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
nenadnoveljic merged 2 commits into from
Aug 12, 2024
+8 −12
Merged

Improve exception handling in full mode for SQL Server #7411

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d7b5514
Improve exception handling in full mode for SQL Server
nenadnoveljic Aug 12, 2024
88369e8
fix
nenadnoveljic Aug 12, 2024
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
20 changes: 8 additions & 12 deletions .../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 @@ -267,7 +267,6 @@ public long setContextInfo(Connection connection, DBInfo dbInfo) {
AgentTracer.get().buildSpan("set context_info").withTag("dd.instrumentation", true).start();
DECORATE.afterStart(instrumentationSpan);
DECORATE.onConnection(instrumentationSpan, dbInfo);
PreparedStatement instrumentationStatement = null;
try (AgentScope scope = activateSpan(instrumentationSpan)) {
final byte samplingDecision =
(byte) (instrumentationSpan.forceSamplingDecision() > 0 ? 1 : 0);
Expand All @@ -283,12 +282,15 @@ public long setContextInfo(Connection connection, DBInfo dbInfo) {
byteBuffer.putLong(traceId.toHighOrderLong());
byteBuffer.putLong(traceId.toLong());
final byte[] contextInfo = byteBuffer.array();

String instrumentationSql = "set context_info ?";
instrumentationStatement = connection.prepareStatement(instrumentationSql);
instrumentationStatement.setBytes(1, contextInfo);
DECORATE.onStatement(instrumentationSpan, instrumentationSql);
instrumentationStatement.execute();
try (PreparedStatement instrumentationStatement =
connection.prepareStatement(instrumentationSql)) {
instrumentationStatement.setBytes(1, contextInfo);
DECORATE.onStatement(instrumentationSpan, instrumentationSql);
instrumentationStatement.execute();
} catch (SQLException e) {
throw e;
}
} catch (Exception e) {
log.debug(
"Failed to set extra DBM data in context info for trace {}. "
Expand All @@ -298,12 +300,6 @@ public long setContextInfo(Connection connection, DBInfo dbInfo) {
e);
DECORATE.onError(instrumentationSpan, e);
} finally {
if (instrumentationStatement != null) {
try {
instrumentationStatement.close();
} catch (Throwable e) {
}
}
instrumentationSpan.finish();
}
return spanID;
Expand Down