Unify jdbc tests between javaagent and library instrumentation (#15137)

Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>

Author: trask

instrumentation/jdbc/javaagent/build.gradle.kts

@@ -20,15 +20,12 @@ dependencies {
   compileOnly("com.google.auto.value:auto-value-annotations")
   annotationProcessor("com.google.auto.value:auto-value")
 
-  // jdbc unit testing
   testLibrary("com.h2database:h2:1.3.169")
-  // first version jdk 1.6 compatible
   testLibrary("org.apache.derby:derby:10.6.1.0")
   testLibrary("org.hsqldb:hsqldb:2.0.0")
 
   testLibrary("org.apache.tomcat:tomcat-jdbc:7.0.19")
-  // tomcat needs this to run
-  testLibrary("org.apache.tomcat:tomcat-juli:7.0.19")
+  testLibrary("org.apache.tomcat:tomcat-juli:7.0.19") // tomcat jdbc needs this
   testLibrary("com.zaxxer:HikariCP:2.4.0")
   testLibrary("com.mchange:c3p0:0.9.5")
   testLibrary("com.alibaba:druid:1.2.20")
@@ -42,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/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/PreparedStatementInstrumentation.java

@@ -60,6 +60,7 @@ public void transform(TypeTransformer transformer) {
     transformer.applyAdviceToMethod(
         namedOneOf(
                 "setBoolean",
+                "setByte",
                 "setShort",
                 "setInt",
                 "setLong",
@@ -155,7 +156,7 @@ public static void onExit(
       String str = null;
 
       if (value instanceof Boolean
-          // Short, Int, Long, Float, Double, BigDecimal
+          // Byte, Short, Int, Long, Float, Double, BigDecimal
           || value instanceof Number
           || value instanceof String
           || value instanceof Date
@@ -190,7 +191,7 @@ public static void onExit(
       String str = null;
 
       if (value instanceof Boolean
-          // Short, Int, Long, Float, Double, BigDecimal
+          // Byte, Short, Int, Long, Float, Double, BigDecimal
           || value instanceof Number
           || value instanceof String
           || value instanceof Date

instrumentation/jdbc/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jdbc/test/DruicDataSourceTest.java renamed to instrumentation/jdbc/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jdbc/test/DruidDataSourceTest.java

@@ -29,22 +29,28 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 @SuppressWarnings("deprecation") // using deprecated semconv
-class DruicDataSourceTest {
+class DruidDataSourceTest {
 
   @RegisterExtension
   static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
 
   private DataSource dataSource;
 
   @BeforeEach
-  void setUp() {
+  void setUp() throws SQLException {
     DruidDataSource druidDataSource = new DruidDataSource();
     druidDataSource.setUrl("jdbc:h2:mem:test");
     druidDataSource.setDriverClassName("org.h2.Driver");
     druidDataSource.setUsername("sa");
     druidDataSource.setPassword("");
     druidDataSource.setMaxActive(1);
     this.dataSource = druidDataSource;
+
+    // Initialize the connection pool to trigger H2's internal schema setup
+    // This prevents internal H2 spans from appearing in the test assertions
+    testing.runWithSpan("parent", () -> dataSource.getConnection().close());
+    testing.waitForTraces(1);
+    testing.clearData();
   }
 
   @AfterEach