Skip to content

Commit 60f4444

Browse files
committed
Improve test coverage for batch operations
1 parent 63de06b commit 60f4444

5 files changed

Lines changed: 727 additions & 242 deletions

File tree

instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/JdbcAdviceScope.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
99
import static io.opentelemetry.javaagent.instrumentation.jdbc.JdbcSingletons.statementInstrumenter;
10+
import static java.util.Collections.emptyList;
1011

1112
import io.opentelemetry.context.Context;
1213
import io.opentelemetry.context.Scope;
@@ -83,11 +84,11 @@ private static DbRequest createBatchRequest(Statement statement) {
8384
}
8485
Long batchSize = JdbcData.getPreparedStatementBatchSize((PreparedStatement) statement);
8586
Map<String, String> parameters = JdbcData.getParameters((PreparedStatement) statement);
86-
return DbRequest.create(statement, sql, batchSize, parameters, true);
87+
return DbRequest.create(statement, sql, batchSize != null ? batchSize : 0L, parameters, true);
8788
} else {
8889
JdbcData.StatementBatchInfo batchInfo = JdbcData.getStatementBatchInfo(statement);
8990
if (batchInfo == null) {
90-
return DbRequest.create(statement, null);
91+
return DbRequest.create(statement, emptyList(), 0L, false);
9192
} else {
9293
return DbRequest.create(
9394
statement, batchInfo.getQueryTexts(), batchInfo.getBatchSize(), false);

0 commit comments

Comments
 (0)