Review fixes for jdbc:testing (#18151)

Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: trask <218610+trask@users.noreply.github.com>

Author: 3 people

instrumentation/jdbc/metadata.yaml

@@ -11,19 +11,23 @@ semantic_conventions:
 library_link: https://docs.oracle.com/javase/8/docs/api/java/sql/package-summary.html
 configurations:
   - name: otel.instrumentation.jdbc.query-sanitization.enabled
+    declarative_name: java.jdbc.query_sanitization.enabled
     description: Enables query sanitization for database queries. Takes precedence over
       otel.instrumentation.common.db.query-sanitization.enabled.
     type: boolean
     default: true
   - name: otel.instrumentation.common.db.query-sanitization.enabled
+    declarative_name: java.common.db.query_sanitization.enabled
     description: Enables query sanitization for database queries.
     type: boolean
     default: true
   - name: otel.instrumentation.jdbc.experimental.transaction.enabled
+    declarative_name: java.jdbc.transaction/development.enabled
     description: Enables experimental instrumentation to create spans for COMMIT and ROLLBACK operations.
     type: boolean
     default: false
   - name: otel.instrumentation.jdbc.experimental.sqlcommenter.enabled
+    declarative_name: java.jdbc.sqlcommenter/development.enabled
     description: >
       Enables augmenting queries with a comment containing the tracing information. See
       [sqlcommenter](https://google.github.io/sqlcommenter/) for more info. WARNING: augmenting
@@ -36,6 +40,7 @@ configurations:
     type: map
     default: ""
   - name: otel.instrumentation.jdbc.experimental.capture-query-parameters
+    declarative_name: java.jdbc.capture_query_parameters/development
     description: >
       Sets whether the query parameters should be captured as span attributes named
       <code>db.query.parameter.&lt;key&gt;</code>. Enabling this option disables the statement
@@ -44,6 +49,7 @@ configurations:
     type: boolean
     default: false
   - name: otel.instrumentation.jdbc-datasource.enabled
+    declarative_name: java.jdbc_datasource.enabled
     description: Enables instrumentation of JDBC datasource connections.
     type: boolean
     default: false

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

@@ -1503,8 +1503,8 @@ void testConnectionCached(String connectionPoolName) throws SQLException {
   }
 
   @FunctionalInterface
-  public interface ThrowingBiConsumer<T, U> {
-    void accept(T t, U u) throws Exception;
+  private interface ThrowingBiConsumer<T, U> {
+    void accept(T t, U u) throws SQLException;
   }
 
   static Stream<Arguments> recursiveStatementsStream() {
@@ -1539,7 +1539,7 @@ void testHandleRecursiveStatements(
       String desc,
       boolean usePreparedStatementInConnection,
       ThrowingBiConsumer<Connection, String> executeQueryFunction)
-      throws Exception {
+      throws SQLException {
     Connection connection =
         wrap(new DbCallingConnection(usePreparedStatementInConnection, "jdbc:testdb://localhost"));
 

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

@@ -644,7 +644,7 @@ DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : url),
                                     expectedParameterValue))));
   }
 
-  public interface ThrowingConsumer<T, E extends Throwable> {
+  private interface ThrowingConsumer<T, E extends Throwable> {
     void accept(T t) throws E;
   }
 }

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

@@ -12,10 +12,9 @@
 import java.sql.PreparedStatement;
 import java.sql.Statement;
 
-public class ProxyStatementFactory {
+class ProxyStatementFactory {
 
-  public static Statement proxyStatementWithCustomClassLoader(Statement statement)
-      throws Exception {
+  static Statement proxyStatementWithCustomClassLoader(Statement statement) throws Exception {
     TestClassLoader classLoader = new TestClassLoader(ProxyStatementFactory.class.getClassLoader());
     Class<?> testInterface = classLoader.loadClass(TestInterface.class.getName());
     if (testInterface.getClassLoader() != classLoader) {
@@ -30,17 +29,17 @@ public static Statement proxyStatementWithCustomClassLoader(Statement statement)
         invocationHandler);
   }
 
-  public static Statement proxyStatement(InvocationHandler invocationHandler) {
+  static Statement proxyStatement(InvocationHandler invocationHandler) {
     return proxy(Statement.class, invocationHandler);
   }
 
-  public static PreparedStatement proxyPreparedStatement(PreparedStatement statement) {
+  static PreparedStatement proxyPreparedStatement(PreparedStatement statement) {
     InvocationHandler invocationHandler =
         (proxy, method, args) -> invokeWithUnwrappedTarget(statement, method, args);
     return proxyPreparedStatement(invocationHandler);
   }
 
-  public static PreparedStatement proxyPreparedStatement(InvocationHandler invocationHandler) {
+  static PreparedStatement proxyPreparedStatement(InvocationHandler invocationHandler) {
     return proxy(PreparedStatement.class, invocationHandler);
   }
 
@@ -58,15 +57,15 @@ private static Object invokeWithUnwrappedTarget(Object target, Method method, Ob
     }
   }
 
-  public static <T> T proxy(Class<T> clazz, InvocationHandler invocationHandler) {
+  static <T> T proxy(Class<T> clazz, InvocationHandler invocationHandler) {
     return proxy(
         clazz,
         ProxyStatementFactory.class.getClassLoader(),
         new Class<?>[] {clazz, TestInterface.class},
         invocationHandler);
   }
 
-  public static <T> T proxy(
+  static <T> T proxy(
       Class<T> clazz,
       ClassLoader classLoader,
       Class<?>[] interfaces,

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

@@ -8,9 +8,9 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 
-public class TestClassLoader extends URLClassLoader {
+class TestClassLoader extends URLClassLoader {
 
-  public TestClassLoader(ClassLoader parent) {
+  TestClassLoader(ClassLoader parent) {
     super(
         new URL[] {TestClassLoader.class.getProtectionDomain().getCodeSource().getLocation()},
         parent);