Refactor multiple modules names (#10276)

* remove stale java-concurrent build file

* Allow parent module name matching in any order

* Naming rules: allow iast suffix and add exclusion for org-json

* Refactor spark instrumentations

* Update codeowners

* Move jersey-filter to jersey

* Move filter-resteasy to resteasy

Author: amarziali

.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',