Skip to content

Improve test coverage for batch operations plus a NPE fix for empty JDBC batch operations #19037

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
trask merged 2 commits into from
Jun 19, 2026
Merged

Improve test coverage for batch operations plus a NPE fix for empty JDBC batch operations #19037

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
dff0496
Improve test coverage for batch operations
trask Jun 18, 2026
faf957d
Apply suggestions from code review
trask Jun 19, 2026
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
5 changes: 3 additions & 2 deletions ...aagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcAdviceScope.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
import static io.opentelemetry.javaagent.instrumentation.jdbc.JdbcSingletons.statementInstrumenter;
import static java.util.Collections.emptyList;

import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
Expand Down Expand Up @@ -83,11 +84,11 @@ private static DbRequest createBatchRequest(Statement statement) {
}
Long batchSize = JdbcData.getPreparedStatementBatchSize((PreparedStatement) statement);
Map<String, String> parameters = JdbcData.getParameters((PreparedStatement) statement);
return DbRequest.create(statement, sql, batchSize, parameters, true);
return DbRequest.create(statement, sql, batchSize != null ? batchSize : 0L, parameters, true);
} else {
JdbcData.StatementBatchInfo batchInfo = JdbcData.getStatementBatchInfo(statement);
if (batchInfo == null) {
return DbRequest.create(statement, null);
return DbRequest.create(statement, emptyList(), 0L, false);
} else {
return DbRequest.create(
statement, batchInfo.getQueryTexts(), batchInfo.getBatchSize(), false);
Expand Down
Loading
Loading