refactor and clean up

Author: amarziali

dd-java-agent/instrumentation/vertx-mysql-client-3.9/build.gradle

@@ -8,11 +8,6 @@ muzzle {
     versions = '[3.9.0,4)'
     assertInverse = true
   }
-  fail {
-    group = 'io.vertx'
-    module = 'vertx-pg-client'
-    versions = '[,]'
-  }
 }
 
 addTestSuiteForDir('latestDepTest', 'test')
@@ -28,7 +23,7 @@ dependencies {
   compileOnly group: 'io.vertx', name: 'vertx-mysql-client', version: '3.9.0'
 
   testImplementation group: 'io.vertx', name: 'vertx-mysql-client', version: '3.9.0'
-  testImplementation project(':dd-java-agent:instrumentation:vertx-sql-common')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:vertx-sql-client-3.9')
 
   // This is needed for the test container to start
   testImplementation group: 'mysql', name: 'mysql-connector-java', version: '8.0.23'

dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/PreparedStatementImplInstrumentation.java

@@ -23,14 +23,15 @@ dependencies {
   compileOnly group: 'io.vertx', name: 'vertx-mysql-client', version: '4.0.0'
 
   testImplementation group: 'io.vertx', name: 'vertx-mysql-client', version: '4.0.0'
-  testImplementation project(':dd-java-agent:instrumentation:vertx-sql-common')
+
+  testRuntimeOnly project(':dd-java-agent:instrumentation:vertx-sql-client-3.9')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:vertx-mysql-client-4.4.2')
 
   // This is needed for the test container to start
   testImplementation group: 'mysql', name: 'mysql-connector-java', version: '8.0.23'
   testImplementation group: 'org.testcontainers', name: 'mysql', version: libs.versions.testcontainers.get()
 
   latestDepTestImplementation group: 'io.vertx', name: 'vertx-mysql-client', version: '4.+'
-  latestDepTestImplementation project(':dd-java-agent:instrumentation:vertx-mysql-client-4.4.2')
 }
 
 tasks.withType(Test).configureEach {

dd-java-agent/instrumentation/vertx-mysql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client/PreparedStatementQueryAdvice.java

@@ -25,15 +25,19 @@ dependencies {
   compileOnly group: 'io.vertx', name: 'vertx-pg-client', version: '4.1.1'
 
   testImplementation group: 'io.vertx', name: 'vertx-pg-client', version: '4.1.1'
-  testImplementation project(':dd-java-agent:instrumentation:vertx-sql-common')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:vertx-sql-client-3.9')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:vertx-pg-client-4.4.2')
+  // to test possible interferences
+  testRuntimeOnly project(':dd-java-agent:instrumentation:vertx-mysql-client-4.4.2')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:vertx-mysql-client-4.0')
+
 
   // This is needed for the test container to start
   testImplementation group: 'com.ongres.scram', name: 'client', version: '2.1'
   testImplementation group: 'org.postgresql', name: 'postgresql', version: '42.7.4'
   testImplementation group: 'org.testcontainers', name: 'postgresql', version: libs.versions.testcontainers.get()
 
   latestDepTestImplementation group: 'io.vertx', name: 'vertx-pg-client', version: '4.+'
-  latestDepTestImplementation project(':dd-java-agent:instrumentation:vertx-pg-client-4.4.2')
 }
 
 tasks.withType(Test).configureEach {