update

Author: trask

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

@@ -30,27 +30,30 @@
 public class TestConnection implements Connection {
 
   private final String url;
-  Consumer<String> sqlConsumer = unused -> {};
+  private final Consumer<String> sqlConsumer;
 
-  public TestConnection() {}
+  public TestConnection() {
+    this(null, unused -> {});
+  }
 
   public TestConnection(String url) {
-    this.url = url;
+    this(url, unused -> {});
   }
 
   public TestConnection(Consumer<String> sqlConsumer) {
-    this.sqlConsumer = sqlConsumer;
+    this(null, sqlConsumer);
   }
 
   public TestConnection(boolean throwException) {
+    this(null, unused -> {});
     if (throwException) {
       throw new IllegalStateException("connection exception");
     }
   }
 
-  public TestConnection(String url, boolean throwException) {
-    this(throwException);
+  private TestConnection(String url, Consumer<String> sqlConsumer) {
     this.url = url;
+    this.sqlConsumer = sqlConsumer;
   }
 
   @Override

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

@@ -1125,7 +1125,7 @@ void testGetConnection(
   @DisplayName("test getClientInfo exception")
   @ValueSource(strings = "testing 123")
   void testGetClientInfoException(String query) throws SQLException {
-    TestConnection rawConnection = new TestConnection("jdbc:testdb://localhost", false);
+    TestConnection rawConnection = new TestConnection("jdbc:testdb://localhost");
     Connection connection = wrap(rawConnection);
     cleanup.deferCleanup(connection);
 

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

@@ -10,14 +10,10 @@
 import java.sql.SQLException;
 
 class DbCallingConnection extends TestConnection {
-  final boolean usePreparedStatement;
-
-  DbCallingConnection(boolean usePreparedStatement) {
-    this(usePreparedStatement, null);
-  }
+  private final boolean usePreparedStatement;
 
   DbCallingConnection(boolean usePreparedStatement, String url) {
-    super(url, false);
+    super(url);
     this.usePreparedStatement = usePreparedStatement;
   }