Move several gradle modules

dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/build.gradle

@@ -57,7 +57,7 @@ dependencies {
   }
 
 
-  testImplementation project(':dd-java-agent:instrumentation:guava-10')
+  testImplementation project(':dd-java-agent:instrumentation:guava-10.0')
 
   latestDepTestImplementation group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.7+'
 }

dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/build.gradle

@@ -33,7 +33,7 @@ dependencies {
   }
 
   testImplementation project(':dd-java-agent:instrumentation:datastax-cassandra:datastax-cassandra-3.0')
-  testImplementation project(':dd-java-agent:instrumentation:guava-10')
+  testImplementation project(':dd-java-agent:instrumentation:guava-10.0')
 
   latestDepTestImplementation group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.8+'
 }

dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/build.gradle

@@ -27,7 +27,7 @@ dependencies {
   // Force 0.3.3 because 0.3.0 has a version parsing bug that fails on jdk 15
   testImplementation group: 'com.github.jbellis', name: "jamm", version: '0.3.3'
 
-  testImplementation project(':dd-java-agent:instrumentation:guava-10')
+  testImplementation project(':dd-java-agent:instrumentation:guava-10.0')
 
   latestDepTestImplementation group: 'com.datastax.oss', name: 'java-driver-core', version: '+'
 }

dd-java-agent/instrumentation/google-pubsub/build.gradle

@@ -17,7 +17,7 @@ dependencies {
   testImplementation group: 'org.testcontainers', name: 'gcloud', version: libs.versions.testcontainers.get()
   testImplementation group: 'com.google.cloud', name: 'google-cloud-pubsub', version: '1.116.0'
   testImplementation project(":dd-java-agent:instrumentation:grpc-1.5")
-  testImplementation project(":dd-java-agent:instrumentation:guava-10")
+  testImplementation project(":dd-java-agent:instrumentation:guava-10.0")
   latestDepTestImplementation group: 'com.google.cloud', name: 'google-cloud-pubsub', version: '+'
 }
 

dd-java-agent/instrumentation/mule-4/build.gradle → dd-java-agent/instrumentation/mule-4.5/build.gradle

@@ -148,7 +148,7 @@ dependencies {
   testImplementation project(':dd-java-agent:instrumentation:grizzly:grizzly-http-2.3.20')
   testImplementation project(':dd-java-agent:instrumentation:grizzly:grizzly-client-1.9')
   testImplementation project(':dd-java-agent:instrumentation:caffeine')
-  testImplementation project(':dd-java-agent:instrumentation:quartz-2')
+  testImplementation project(':dd-java-agent:instrumentation:quartz-2.0')
 
   testImplementation group: 'org.mule.runtime', name: 'mule-module-launcher', version: muleVersion
   testImplementation group: 'org.mule.runtime', name: 'mule-core', version: muleVersion

docs/how_instrumentations_work.md

@@ -87,7 +87,7 @@ When the agent is built, the muzzle plugin will download versions of the framewo
 To run muzzle on your instrumentation, run:
 
 ```shell
-./gradlew :dd-java-agent:instrumentation:rediscala-1.8.0:muzzle
+./gradlew :dd-java-agent:instrumentation:rediscala-1.8:muzzle
 ```
 
 * ⚠️ Muzzle does _not_ run tests.
@@ -694,7 +694,7 @@ and [rerun all tasks](https://docs.gradle.org/current/userguide/command_line_int
 Running tests that require JDK-21 will require the `JAVA_21_HOME` env var set and can be done like this:
 
 ```shell
-./gradlew  :dd-java-agent:instrumentation:aerospike-4:allLatestDepTests -PtestJvm=21
+./gradlew  :dd-java-agent:instrumentation:aerospike-4.0:allLatestDepTests -PtestJvm=21
 ```
 
 ### Latest Dependency Tests

settings.gradle.kts

@@ -256,7 +256,7 @@ include(
 
 // instrumentation:
 include(
-  ":dd-java-agent:instrumentation:aerospike-4",
+  ":dd-java-agent:instrumentation:aerospike-4.0",
   ":dd-java-agent:instrumentation:akka:akka-actor-2.5",
   ":dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0",
   ":dd-java-agent:instrumentation:akka:akka-http:akka-http-10.2-iast",
@@ -281,7 +281,7 @@ include(
   ":dd-java-agent:instrumentation:aws-java:aws-java-sqs-1.0",
   ":dd-java-agent:instrumentation:aws-java:aws-java-sqs-2.0",
   ":dd-java-agent:instrumentation:aws-java:aws-java-s3-2.0",
-  ":dd-java-agent:instrumentation:axis-2",
+  ":dd-java-agent:instrumentation:axis2-1.3",
   ":dd-java-agent:instrumentation:axway-api",
   ":dd-java-agent:instrumentation:azure-functions",
   ":dd-java-agent:instrumentation:caffeine",
@@ -291,12 +291,12 @@ include(
   ":dd-java-agent:instrumentation:classloading:jsr14-testing",
   ":dd-java-agent:instrumentation:classloading:osgi-testing",
   ":dd-java-agent:instrumentation:classloading:tomcat-testing",
-  ":dd-java-agent:instrumentation:commons-codec-1",
-  ":dd-java-agent:instrumentation:commons-fileupload",
-  ":dd-java-agent:instrumentation:commons-httpclient-2",
-  ":dd-java-agent:instrumentation:commons-lang-2",
-  ":dd-java-agent:instrumentation:commons-lang-3",
-  ":dd-java-agent:instrumentation:commons-text",
+  ":dd-java-agent:instrumentation:commons-codec-1.1",
+  ":dd-java-agent:instrumentation:commons-fileupload-1.5",
+  ":dd-java-agent:instrumentation:commons-httpclient-2.0",
+  ":dd-java-agent:instrumentation:commons-lang:commons-lang-2.1",
+  ":dd-java-agent:instrumentation:commons-lang:commons-lang-3.5",
+  ":dd-java-agent:instrumentation:commons-text-1.0",
   ":dd-java-agent:instrumentation:couchbase:couchbase-2.0",
   ":dd-java-agent:instrumentation:couchbase:couchbase-2.6",
   ":dd-java-agent:instrumentation:couchbase:couchbase-3.1",
@@ -339,7 +339,7 @@ include(
   ":dd-java-agent:instrumentation:grizzly:grizzly-http-2.3.20",
   ":dd-java-agent:instrumentation:grpc-1.5",
   ":dd-java-agent:instrumentation:gson-1.6",
-  ":dd-java-agent:instrumentation:guava-10",
+  ":dd-java-agent:instrumentation:guava-10.0",
   ":dd-java-agent:instrumentation:hazelcast:hazelcast-3.6",
   ":dd-java-agent:instrumentation:hazelcast:hazelcast-3.9",
   ":dd-java-agent:instrumentation:hazelcast:hazelcast-4.0",
@@ -463,7 +463,7 @@ include(
   ":dd-java-agent:instrumentation:mongo:driver-4.0",
   ":dd-java-agent:instrumentation:mongo:driver-3.3-async-test",
   ":dd-java-agent:instrumentation:mongo:driver-3.10-sync-test",
-  ":dd-java-agent:instrumentation:mule-4",
+  ":dd-java-agent:instrumentation:mule-4.5",
   ":dd-java-agent:instrumentation:netty-3.8",
   ":dd-java-agent:instrumentation:netty-4.0",
   ":dd-java-agent:instrumentation:netty-4.1-shared",
@@ -495,14 +495,14 @@ include(
   ":dd-java-agent:instrumentation:play-ws:play-ws-1.0",
   ":dd-java-agent:instrumentation:play-ws:play-ws-2.0",
   ":dd-java-agent:instrumentation:play-ws:play-ws-2.1",
-  ":dd-java-agent:instrumentation:protobuf",
-  ":dd-java-agent:instrumentation:quartz-2",
+  ":dd-java-agent:instrumentation:protobuf-3.0",
+  ":dd-java-agent:instrumentation:quartz-2.0",
   ":dd-java-agent:instrumentation:rabbitmq-amqp-2.7",
   ":dd-java-agent:instrumentation:ratpack-1.5",
   ":dd-java-agent:instrumentation:reactive-streams",
   ":dd-java-agent:instrumentation:reactor-core-3.1",
   ":dd-java-agent:instrumentation:reactor-netty-1",
-  ":dd-java-agent:instrumentation:rediscala-1.8.0",
+  ":dd-java-agent:instrumentation:rediscala-1.8",
   ":dd-java-agent:instrumentation:renaissance",
   ":dd-java-agent:instrumentation:resteasy-appsec",
   ":dd-java-agent:instrumentation:restlet-2.2",
@@ -552,12 +552,12 @@ include(
   ":dd-java-agent:instrumentation:spring:spring-ws-2.0",
   ":dd-java-agent:instrumentation:spymemcached-2.10",
   ":dd-java-agent:instrumentation:sslsocket",
-  ":dd-java-agent:instrumentation:synapse-3",
+  ":dd-java-agent:instrumentation:synapse-3.0",
   ":dd-java-agent:instrumentation:testng",
   ":dd-java-agent:instrumentation:testng:testng-6",
   ":dd-java-agent:instrumentation:testng:testng-7",
   ":dd-java-agent:instrumentation:thymeleaf",
-  ":dd-java-agent:instrumentation:tinylog-2",
+  ":dd-java-agent:instrumentation:tinylog-2.0",
   ":dd-java-agent:instrumentation:tibco-businessworks",
   ":dd-java-agent:instrumentation:tibco-businessworks:tibcobw-stubs",
   ":dd-java-agent:instrumentation:tibco-businessworks:tibcobw-5",
@@ -569,13 +569,13 @@ include(
   ":dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-7.0",
   ":dd-java-agent:instrumentation:tomcat:tomcat-9.0",
   ":dd-java-agent:instrumentation:trace-annotation",
-  ":dd-java-agent:instrumentation:twilio",
-  ":dd-java-agent:instrumentation:unbescape",
+  ":dd-java-agent:instrumentation:twilio-0.0.1",
+  ":dd-java-agent:instrumentation:unbescape-1.1",
   ":dd-java-agent:instrumentation:undertow",
   ":dd-java-agent:instrumentation:undertow:undertow-2.0",
   ":dd-java-agent:instrumentation:undertow:undertow-2.2",
-  ":dd-java-agent:instrumentation:valkey-java",
-  ":dd-java-agent:instrumentation:velocity",
+  ":dd-java-agent:instrumentation:valkey-java-5.3",
+  ":dd-java-agent:instrumentation:velocity-1.5",
   ":dd-java-agent:instrumentation:vertx:vertx-mysql-client:vertx-mysql-client-3.9",
   ":dd-java-agent:instrumentation:vertx:vertx-mysql-client:vertx-mysql-client-4.0",
   ":dd-java-agent:instrumentation:vertx:vertx-mysql-client:vertx-mysql-client-4.4.2",
@@ -602,7 +602,7 @@ include(
   ":dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-11",
   ":dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-12",
   ":dd-java-agent:instrumentation:websphere-jmx",
-  ":dd-java-agent:instrumentation:wildfly-9",
+  ":dd-java-agent:instrumentation:wildfly-9.0",
   ":dd-java-agent:instrumentation:zio:zio-2.0",
 )