reduce diff

Author: trask

instrumentation/jdbc/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/scalaexecutors/SlickTest.scala

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.jdbc.slick
+package io.opentelemetry.javaagent.instrumentation.scalaexecutors
 
 import io.opentelemetry.api.trace.{SpanKind, Tracer}
 import io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv

instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/ConnectionWrapper.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.jdbc;
+
+import io.opentelemetry.instrumentation.jdbc.datasource.JdbcTelemetry;
+import java.io.PrintWriter;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.logging.Logger;
+import javax.sql.DataSource;
+
+class ConnectionWrapper {
+
+  // hack since JdbcTelemetry only supports wrapping data sources
+  static Connection wrap(Connection connection, JdbcTelemetry telemetry) throws SQLException {
+    DataSource dataSource = telemetry.wrap(new SingleConnectionDataSource(connection));
+    return dataSource.getConnection();
+  }
+
+  private ConnectionWrapper() {}
+
+  private static class SingleConnectionDataSource implements DataSource {
+    private final Connection delegate;
+
+    SingleConnectionDataSource(Connection delegate) {
+      this.delegate = delegate;
+    }
+
+    @Override
+    public Connection getConnection() {
+      return delegate;
+    }
+
+    @Override
+    public Connection getConnection(String username, String password) {
+      return getConnection();
+    }
+
+    @Override
+    public PrintWriter getLogWriter() {
+      return null;
+    }
+
+    @Override
+    public void setLogWriter(PrintWriter out) {}
+
+    @Override
+    public void setLoginTimeout(int seconds) {}
+
+    @Override
+    public int getLoginTimeout() {
+      return 0;
+    }
+
+    @Override
+    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+      throw new SQLFeatureNotSupportedException();
+    }
+
+    @Override
+    public <T> T unwrap(Class<T> iface) throws SQLException {
+      if (iface.isInstance(delegate)) {
+        return iface.cast(delegate);
+      }
+      throw new SQLFeatureNotSupportedException();
+    }
+
+    @Override
+    public boolean isWrapperFor(Class<?> iface) {
+      return iface.isInstance(delegate);
+    }
+  }
+}

instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/JdbcInstrumentationTest.java

@@ -32,18 +32,11 @@ protected InstrumentationExtension testing() {
 
   @Override
   protected Connection wrap(Connection connection) throws SQLException {
-    // if (connection instanceof OpenTelemetryConnection) {
-    //   return connection;
-    // }
-    DataSource dataSource = telemetry.wrap(new SingleConnectionDataSource(connection));
-    return dataSource.getConnection();
+    return ConnectionWrapper.wrap(connection, telemetry);
   }
 
   @Override
   protected DataSource wrap(DataSource dataSource) {
-    // if (dataSource instanceof OpenTelemetryDataSource) {
-    //   return dataSource;
-    // }
     return telemetry.wrap(dataSource);
   }
 }

instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/PreparedStatementParametersTest.java

@@ -11,7 +11,6 @@
 import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
 import java.sql.Connection;
 import java.sql.SQLException;
-import javax.sql.DataSource;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 class PreparedStatementParametersTest extends AbstractPreparedStatementParametersTest {
@@ -24,7 +23,6 @@ class PreparedStatementParametersTest extends AbstractPreparedStatementParameter
           .setDataSourceInstrumenterEnabled(true)
           .setTransactionInstrumenterEnabled(true)
           .setCaptureQueryParameters(true)
-          .setStatementSanitizationEnabled(false)
           .build();
 
   @Override
@@ -34,10 +32,6 @@ protected InstrumentationExtension testing() {
 
   @Override
   protected Connection wrap(Connection connection) throws SQLException {
-    // if (connection instanceof OpenTelemetryConnection) {
-    //   return connection;
-    // }
-    DataSource dataSource = telemetry.wrap(new SingleConnectionDataSource(connection));
-    return dataSource.getConnection();
+    return ConnectionWrapper.wrap(connection, telemetry);
   }
 }

instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/SingleConnectionDataSource.java

@@ -13,25 +13,28 @@
 import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
 import java.sql.Connection;
 import java.sql.SQLException;
-import javax.sql.DataSource;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 class SqlCommenterTest extends AbstractSqlCommenterTest {
 
   @RegisterExtension
   static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
 
+  private static final JdbcTelemetry telemetry;
+
+  static {
+    JdbcTelemetryBuilder builder = JdbcTelemetry.builder(testing.getOpenTelemetry());
+    Experimental.setEnableSqlCommenter(builder, true);
+    telemetry = builder.build();
+  }
+
   @Override
   protected InstrumentationExtension testing() {
     return testing;
   }
 
   @Override
   protected Connection wrap(Connection connection) throws SQLException {
-    JdbcTelemetryBuilder builder = JdbcTelemetry.builder(testing.getOpenTelemetry());
-    Experimental.setEnableSqlCommenter(builder, true);
-    JdbcTelemetry telemetry = builder.build();
-    DataSource dataSource = telemetry.wrap(new SingleConnectionDataSource(connection));
-    return dataSource.getConnection();
+    return ConnectionWrapper.wrap(connection, telemetry);
   }
 }

instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/SqlCommenterTest.java

@@ -59,8 +59,7 @@ public static <T> T proxy(
     // in the same package as the package private interface
     // by default we ignore jdk proxies, having the proxy in a different package ensures it gets
     // instrumented
-    String expectedPackage = TestInterface.class.getPackage().getName();
-    if (!proxy.getClass().getName().startsWith(expectedPackage)) {
+    if (!proxy.getClass().getName().startsWith("io.opentelemetry.instrumentation.jdbc.testing")) {
       throw new IllegalStateException("proxy is in wrong package");
     }
 

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

@@ -23,8 +23,7 @@ protected synchronized Class<?> loadClass(String name, boolean resolve)
     if (clazz != null) {
       return clazz;
     }
-    String instrumentationPackage = TestInterface.class.getPackage().getName();
-    if (name.startsWith(instrumentationPackage)) {
+    if (name.startsWith("io.opentelemetry.instrumentation.jdbc.testing")) {
       try {
         return findClass(name);
       } catch (ClassNotFoundException exception) {