Refactor multiple modules names

.github/CODEOWNERS

@@ -103,7 +103,6 @@
 
 # @DataDog/data-jobs-monitoring
 /dd-java-agent/instrumentation/spark/           @DataDog/data-jobs-monitoring
-/dd-java-agent/instrumentation/spark-executor/  @DataDog/data-jobs-monitoring
 
 # @DataDog/data-streams-monitoring
 /dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/datastreams  @DataDog/data-streams-monitoring

buildSrc/src/main/kotlin/datadog/gradle/plugin/naming/InstrumentationNamingPlugin.kt

@@ -132,11 +132,11 @@ class InstrumentationNamingPlugin : Plugin<Project> {
     // Rule 1: Module name must end with version pattern or one of the configured suffixes
     validateVersionOrSuffix(moduleName, relativePath, suffixes)?.let { return listOf(it) }
 
-    // Rule 2: Module name must contain parent directory name
-    if (!moduleName.contains(parentName, ignoreCase = true)) {
+    // Rule 2: Module name must contain parent directory name (all characters in any order)
+    if (!containsAllChars(moduleName, parentName)) {
       return listOf(NamingViolation(
         relativePath,
-        "Module name '$moduleName' should contain parent directory name '$parentName'"
+        "Module name '$moduleName' should contain all characters from parent directory name '$parentName'"
       ))
     }
 
@@ -177,6 +177,20 @@ class InstrumentationNamingPlugin : Plugin<Project> {
     return null
   }
 
+  /**
+   * Checks if all characters from 'required' string appear in 'source' string (case-insensitive).
+   * Characters can appear in any order.
+   */
+  private fun containsAllChars(source: String, required: String): Boolean {
+    val sourceChars = source.lowercase().toList()
+    val requiredChars = required.lowercase().groupingBy { it }.eachCount()
+    val sourceCharCounts = sourceChars.groupingBy { it }.eachCount()
+
+    return requiredChars.all { (char, count) ->
+      sourceCharCounts.getOrDefault(char, 0) >= count
+    }
+  }
+
   private data class NamingViolation(
     val path: String,
     val message: String

dd-java-agent/instrumentation/build.gradle

@@ -149,6 +149,11 @@ TaskProvider<JavaExec> registerIndexTask(String indexTaskName, String indexer, S
   return indexTask
 }
 
+instrumentationNaming {
+  exclusions = ["org-json-20230227"] // org-json does not use semver
+  suffixes = ["-common", "-stubs", "-iast"]
+}
+
 registerIndexTask(
   'generateInstrumenterIndex',
   'datadog.trace.agent.tooling.InstrumenterIndex$IndexGenerator',

dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/build.gradle

@@ -28,9 +28,9 @@ dependencies {
   compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0'
 
   testImplementation project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
-  testImplementation project(':dd-java-agent:instrumentation:rs:jax-rs:jax-rs-annotations:jax-rs-annotations-2.0:filter-jersey')
-  testImplementation project(':dd-java-agent:instrumentation:rs:jax-rs:jax-rs-annotations:jax-rs-annotations-2.0:filter-resteasy-3.0')
-  testImplementation project(':dd-java-agent:instrumentation:rs:jax-rs:jax-rs-annotations:jax-rs-annotations-2.0:filter-resteasy-3.1')
+  testImplementation project(':dd-java-agent:instrumentation:jersey:jersey-filter-2.0')
+  testImplementation project(':dd-java-agent:instrumentation:resteasy:filter-resteasy:filter-resteasy-3.0')
+  testImplementation project(':dd-java-agent:instrumentation:resteasy:filter-resteasy:filter-resteasy-3.1')
 
   // Jersey
   testImplementation group: 'io.dropwizard', name: 'dropwizard-testing', version: '1.3.29' // Version compatible with Java 8 and JUnit5.

dd-java-agent/instrumentation/spark/spark_2.12/build.gradle

@@ -31,12 +31,12 @@ testJvmConstraints {
 }
 
 dependencies {
-  implementation project(':dd-java-agent:instrumentation:spark')
+  implementation project(':dd-java-agent:instrumentation:spark:spark-common')
 
   compileOnly group: 'org.apache.spark', name: "spark-core_$scalaVersion", version: "$sparkVersion"
   compileOnly group: 'org.apache.spark', name: "spark-sql_$scalaVersion", version: "$sparkVersion"
 
-  testImplementation(testFixtures(project(":dd-java-agent:instrumentation:spark")))
+  testImplementation(testFixtures(project(":dd-java-agent:instrumentation:spark:spark-common")))
   testImplementation group: 'org.apache.spark', name: "spark-core_$scalaVersion", version: "$sparkVersion"
   testImplementation group: 'org.apache.spark', name: "spark-sql_$scalaVersion", version: "$sparkVersion"
   testImplementation group: 'org.apache.spark', name: "spark-yarn_$scalaVersion", version: "$sparkVersion"

dd-java-agent/instrumentation/spark/spark_2.13/build.gradle

@@ -39,12 +39,12 @@ configurations.configureEach {
 }
 
 dependencies {
-  implementation project(':dd-java-agent:instrumentation:spark')
+  implementation project(':dd-java-agent:instrumentation:spark:spark-common')
 
   compileOnly group: 'org.apache.spark', name: "spark-core_$scalaVersion", version: "$sparkVersion"
   compileOnly group: 'org.apache.spark', name: "spark-sql_$scalaVersion", version: "$sparkVersion"
 
-  testImplementation(testFixtures(project(":dd-java-agent:instrumentation:spark")))
+  testImplementation(testFixtures(project(":dd-java-agent:instrumentation:spark:spark-common")))
   testImplementation group: 'org.apache.spark', name: "spark-core_$scalaVersion", version: "$sparkVersion"
   testImplementation group: 'org.apache.spark', name: "spark-sql_$scalaVersion", version: "$sparkVersion"
   testImplementation group: 'org.apache.spark', name: "spark-yarn_$scalaVersion", version: "$sparkVersion"

settings.gradle.kts

@@ -399,6 +399,7 @@ include(
   ":dd-java-agent:instrumentation:jersey:jersey-appsec:jersey-appsec-2.0",
   ":dd-java-agent:instrumentation:jersey:jersey-appsec:jersey-appsec-3.0",
   ":dd-java-agent:instrumentation:jersey:jersey-client-2.0",
+  ":dd-java-agent:instrumentation:jersey:jersey-filter-2.0",
   ":dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-7.0",
   ":dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-8.1.3",
   ":dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.2",
@@ -513,14 +514,13 @@ include(
   ":dd-java-agent:instrumentation:renaissance-0.7",
   ":dd-java-agent:instrumentation:resilience4j:resilience4j-2.0",
   ":dd-java-agent:instrumentation:resilience4j:resilience4j-reactor-2.0",
+  ":dd-java-agent:instrumentation:resteasy:filter-resteasy:filter-resteasy-3.0",
+  ":dd-java-agent:instrumentation:resteasy:filter-resteasy:filter-resteasy-3.1",
   ":dd-java-agent:instrumentation:resteasy:resteasy-3.0",
   ":dd-java-agent:instrumentation:resteasy:resteasy-appsec-3.0",
   ":dd-java-agent:instrumentation:restlet-2.2",
   ":dd-java-agent:instrumentation:rs:jakarta-rs-annotations-3.0",
   ":dd-java-agent:instrumentation:rs:jax-rs:jax-rs-annotations:jax-rs-annotations-1.1.1",
-  ":dd-java-agent:instrumentation:rs:jax-rs:jax-rs-annotations:jax-rs-annotations-2.0:filter-jersey",
-  ":dd-java-agent:instrumentation:rs:jax-rs:jax-rs-annotations:jax-rs-annotations-2.0:filter-resteasy-3.0",
-  ":dd-java-agent:instrumentation:rs:jax-rs:jax-rs-annotations:jax-rs-annotations-2.0:filter-resteasy-3.1",
   ":dd-java-agent:instrumentation:rs:jax-rs:jax-rs-annotations:jax-rs-annotations-2.0",
   ":dd-java-agent:instrumentation:rs:jax-rs:jax-rs-client:jax-rs-client-1.1",
   ":dd-java-agent:instrumentation:rs:jax-rs:jax-rs-client:jax-rs-client-2.0",
@@ -544,10 +544,11 @@ include(
   ":dd-java-agent:instrumentation:slick-3.2",
   ":dd-java-agent:instrumentation:snakeyaml-1.33",
   ":dd-java-agent:instrumentation:span-origin",
-  ":dd-java-agent:instrumentation:spark-executor",
+  ":dd-java-agent:instrumentation:spark:spark-common",
   ":dd-java-agent:instrumentation:spark:spark_2.12",
   ":dd-java-agent:instrumentation:spark:spark_2.13",
-  ":dd-java-agent:instrumentation:sparkjava-2.3",
+  ":dd-java-agent:instrumentation:spark:spark-executor-common",
+  ":dd-java-agent:instrumentation:spark:sparkjava-2.3",
   ":dd-java-agent:instrumentation:spray-1.3",
   ":dd-java-agent:instrumentation:spring:spring-beans-3.1",
   ":dd-java-agent:instrumentation:spring:spring-boot-1.3",