NH-93969: remove stored procedure instrumentation

instrumentation/hibernate/hibernate-4.0/src/test/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v4_0/LoaderInstrumentationTest.java

@@ -31,8 +31,10 @@
 
 @ExtendWith(MockitoExtension.class)
 class LoaderInstrumentationTest {
+
   @RegisterExtension
-  public static AgentInstrumentationExtension testing = AgentInstrumentationExtension.create();
+  private static final AgentInstrumentationExtension testing =
+      AgentInstrumentationExtension.create();
 
   private SessionFactory sessionFactory;
 

instrumentation/hibernate/hibernate-6.0/src/test/java/com/solarwinds/opentelemetry/instrumentation/hibernate/v6_0/DrsaInstrumentationTest.java

@@ -37,7 +37,8 @@
 class DrsaInstrumentationTest {
 
   @RegisterExtension
-  public static AgentInstrumentationExtension testing = AgentInstrumentationExtension.create();
+  private static final AgentInstrumentationExtension testing =
+      AgentInstrumentationExtension.create();
 
   private SessionFactory sessionFactory;
 
@@ -93,6 +94,7 @@ void verifyDbContextInjectionSpanIsCreated() {
 
           session.close();
         });
+
     testing.waitAndAssertTraces(
         trace ->
             trace.hasSpansSatisfyingExactly(

instrumentation/jdbc/build.gradle

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-apply plugin: 'groovy'
 apply from: "$rootDir/gradle/instrumentation.gradle"
 
+
 dependencies {
   compileOnly project(":bootstrap")
   compileOnly project(":instrumentation:instrumentation-shared")
@@ -30,22 +30,8 @@ dependencies {
 
   testImplementation project(":instrumentation:jdbc")
   testImplementation project(":instrumentation:instrumentation-shared")
-  testImplementation("io.opentelemetry.javaagent:opentelemetry-testing-common:${versions.opentelemetryJavaagentAlpha}") {
-    exclude group: 'org.eclipse.jetty', module: 'jetty-server'
-  }
-
-  // mandatory dependencies for using Spock
-  testImplementation "org.apache.groovy:groovy:4.0.1"
-  testImplementation platform("org.spockframework:spock-bom:2.1-groovy-3.0")
-  testImplementation 'org.spockframework:spock-core:2.0-groovy-3.0'
 }
 
-test {
-  useJUnitPlatform()
-  testLogging {
-    events "passed", "skipped", "failed"
-  }
-}
 
 compileJava {
   dependsOn(':instrumentation:instrumentation-shared:byteBuddyJava')

instrumentation/jdbc/src/main/java/com/solarwinds/opentelemetry/instrumentation/JdbcConnectionInstrumentation.java

@@ -69,10 +69,13 @@ public ElementMatcher<TypeDescription> typeMatcher() {
   @Override
   public void transform(TypeTransformer transformer) {
     transformer.applyAdviceToMethod(
-        nameStartsWith("prepare")
-            .and(takesArgument(0, String.class))
-            // Also include CallableStatement, which is a subtype of PreparedStatement
-            .and(returns(implementsInterface(named("java.sql.PreparedStatement")))),
+        named("prepareCall")
+            .and(takesArgument(0, String.class).and(takesArgument(1, int.class)))
+            .and(returns(implementsInterface(named("java.sql.PreparedStatement"))))
+            .or(
+                named("prepareStatement")
+                    .and(takesArgument(0, String.class))
+                    .and(returns(implementsInterface(named("java.sql.PreparedStatement"))))),
         JdbcConnectionInstrumentation.class.getName() + "$PrepareAdvice");
   }
 

testing/agent-for-testing/build.gradle

@@ -45,7 +45,6 @@ dependencies {
     javaagentLibs project(":custom")
     javaagentLibs project(":custom:shared")
     javaagentLibs project(":testing:agent-test-extension")
-    javaagentLibs project(":testing:agent-test-extension")
     javaagentLibs project(":instrumentation:instrumentation-shared")
     javaagentLibs project(':instrumentation:hibernate:hibernate-shared')