better

Author: trask

instrumentation/jdbc/javaagent/build.gradle.kts

@@ -20,9 +20,9 @@ dependencies {
   compileOnly("com.google.auto.value:auto-value-annotations")
   annotationProcessor("com.google.auto.value:auto-value")
 
-  testLibrary("com.h2database:h2:1.3.169")
-  testLibrary("org.apache.derby:derby:10.6.1.0") // first version jdk 1.6 compatible
-  testLibrary("org.hsqldb:hsqldb:2.0.0")
+  testLibrary("com.h2database:h2:1.4.197") // Java 1.7 bytecode but supports executeLarge methods from Java 8
+  testLibrary("org.apache.derby:derby:10.6.1.0") // Java 1.4
+  testLibrary("org.hsqldb:hsqldb:2.0.0") // Java 1.6
 
   testLibrary("org.apache.tomcat:tomcat-jdbc:7.0.19")
   testLibrary("org.apache.tomcat:tomcat-juli:7.0.19") // tomcat jdbc needs this
@@ -39,7 +39,6 @@ dependencies {
   // these dependencies are for SlickTest
   testImplementation("org.scala-lang:scala-library:2.11.12")
   testImplementation("com.typesafe.slick:slick_2.11:3.2.0")
-  testImplementation("com.h2database:h2:1.4.197")
 }
 
 sourceSets {

instrumentation/jdbc/library/build.gradle.kts

@@ -14,9 +14,9 @@ dependencies {
 
   testImplementation(project(":instrumentation:jdbc:testing"))
 
-  testLibrary("com.h2database:h2:1.3.169")
-  testLibrary("org.apache.derby:derby:10.6.1.0") // first version jdk 1.6 compatible
-  testLibrary("org.hsqldb:hsqldb:2.0.0")
+  testLibrary("com.h2database:h2:1.4.197") // Java 1.7 bytecode but supports executeLarge methods from Java 8
+  testLibrary("org.apache.derby:derby:10.6.1.0") // Java 1.4
+  testLibrary("org.hsqldb:hsqldb:2.0.0") // Java 1.6
 
   testLibrary("org.apache.tomcat:tomcat-jdbc:7.0.19")
   testLibrary("org.apache.tomcat:tomcat-juli:7.0.19") // tomcat jdbc needs this

instrumentation/jdbc/testing/build.gradle.kts

@@ -11,9 +11,9 @@ dependencies {
   api(project(":testing-common"))
   api("com.google.guava:guava")
 
-  compileOnly("com.h2database:h2:1.3.169")
-  compileOnly("org.apache.derby:derby:10.6.1.0")
-  compileOnly("org.hsqldb:hsqldb:2.0.0")
+  compileOnly("com.h2database:h2:1.4.197") // Java 8 (JDBC 4.2)
+  compileOnly("org.apache.derby:derby:10.6.1.0") // Java 6 (JDBC 4.0)
+  compileOnly("org.hsqldb:hsqldb:2.0.0") // Java 6 (JDBC 4.0)
 
   compileOnly("org.apache.tomcat:tomcat-jdbc:7.0.19")
   compileOnly("org.apache.tomcat:tomcat-juli:7.0.19")

instrumentation/jdbc/testing/src/main/java/io/opentelemetry/instrumentation/jdbc/testing/AbstractJdbcInstrumentationTest.java

@@ -27,7 +27,6 @@
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER;
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
@@ -850,23 +849,44 @@ static Stream<Arguments> preparedStatementLargeUpdateStream() throws SQLExceptio
             "CREATE TABLE PS_LARGE_H2 (id INTEGER not NULL, PRIMARY KEY ( id ))",
             "CREATE TABLE jdbcunittest.PS_LARGE_H2",
             "h2:mem:",
-            "PS_LARGE_H2"),
+            "PS_LARGE_H2",
+            true),
         Arguments.of(
             "h2",
             cpDatasources.get("tomcat").get("h2").getConnection(),
             null,
             "CREATE TABLE PS_LARGE_H2_TOMCAT (id INTEGER not NULL, PRIMARY KEY ( id ))",
             "CREATE TABLE jdbcunittest.PS_LARGE_H2_TOMCAT",
             "h2:mem:",
-            "PS_LARGE_H2_TOMCAT"),
+            "PS_LARGE_H2_TOMCAT",
+            true),
         Arguments.of(
             "h2",
             cpDatasources.get("hikari").get("h2").getConnection(),
             null,
             "CREATE TABLE PS_LARGE_H2_HIKARI (id INTEGER not NULL, PRIMARY KEY ( id ))",
             "CREATE TABLE jdbcunittest.PS_LARGE_H2_HIKARI",
             "h2:mem:",
-            "PS_LARGE_H2_HIKARI"));
+            "PS_LARGE_H2_HIKARI",
+            true),
+        Arguments.of(
+            "derby",
+            new EmbeddedDriver().connect(jdbcUrls.get("derby"), null),
+            "APP",
+            "CREATE TABLE PS_LARGE_DERBY (id INTEGER not NULL, PRIMARY KEY ( id ))",
+            "CREATE TABLE jdbcunittest.PS_LARGE_DERBY",
+            "derby:memory:",
+            "PS_LARGE_DERBY",
+            false),
+        Arguments.of(
+            "hsqldb",
+            new JDBCDriver().connect(jdbcUrls.get("hsqldb"), null),
+            "SA",
+            "CREATE TABLE PUBLIC.PS_LARGE_HSQLDB (id INTEGER not NULL, PRIMARY KEY ( id ))",
+            "CREATE TABLE PUBLIC.PS_LARGE_HSQLDB",
+            "hsqldb:mem:",
+            "PUBLIC.PS_LARGE_HSQLDB",
+            false));
   }
 
   @ParameterizedTest
@@ -878,12 +898,13 @@ void testPreparedStatementLargeUpdate(
       String query,
       String spanName,
       String url,
-      String table)
+      String table,
+      boolean supportsJdbc42)
       throws SQLException {
     Connection connection = wrap(conn);
-    
+
     // executeLargeUpdate was added in JDBC 4.2
-    if (supportsJdbc42(connection)) {
+    if (supportsJdbc42) {
       testPreparedStatementUpdateImpl(
           system,
           connection,
@@ -1433,6 +1454,24 @@ static Stream<Arguments> batchStream() throws SQLException {
             "hsqldb", new JDBCDriver().connect(jdbcUrls.get("hsqldb"), null), "SA", "hsqldb:mem:"));
   }
 
+  static Stream<Arguments> largeBatchStream() throws SQLException {
+    return Stream.of(
+        Arguments.of(
+            "h2", new org.h2.Driver().connect(jdbcUrls.get("h2"), null), null, "h2:mem:", true),
+        Arguments.of(
+            "derby",
+            new EmbeddedDriver().connect(jdbcUrls.get("derby"), null),
+            "APP",
+            "derby:memory:",
+            false),
+        Arguments.of(
+            "hsqldb",
+            new JDBCDriver().connect(jdbcUrls.get("hsqldb"), null),
+            "SA",
+            "hsqldb:mem:",
+            false));
+  }
+
   @ParameterizedTest
   @MethodSource("batchStream")
   void testBatch(String system, Connection connection, String username, String url)
@@ -1447,11 +1486,10 @@ void testBatch(String system, Connection connection, String username, String url
   }
 
   @ParameterizedTest
-  @MethodSource("batchStream")
-  void testLargeBatch(String system, Connection connection, String username, String url)
+  @MethodSource("largeBatchStream")
+  void testLargeBatch(
+      String system, Connection connection, String username, String url, boolean supportsJdbc42)
       throws SQLException {
-    // derby and hsqldb used in this test don't support executeLargeBatch
-    assumeTrue("h2".equals(system));
 
     Statement createTable = wrap(connection).createStatement();
     createTable.execute(
@@ -1461,7 +1499,7 @@ void testLargeBatch(String system, Connection connection, String username, Strin
     statement.addBatch("INSERT INTO simple_batch_test_large VALUES(2)");
 
     // executeLargeBatch was added in JDBC 4.2
-    if (supportsJdbc42(connection)) {
+    if (supportsJdbc42) {
       assertThat(statement.executeLargeBatch()).isEqualTo(new long[] {1, 1});
     } else {
       // Driver doesn't support JDBC 4.2, expect UnsupportedOperationException
@@ -1471,12 +1509,6 @@ void testLargeBatch(String system, Connection connection, String username, Strin
     }
   }
 
-  private static boolean supportsJdbc42(Connection connection) throws SQLException {
-    return connection.getMetaData().getJDBCMajorVersion() > 4
-        || (connection.getMetaData().getJDBCMajorVersion() == 4
-            && connection.getMetaData().getJDBCMinorVersion() >= 2);
-  }
-
   private void testBatchImpl(
       String system,
       Connection connection,