diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 049c0732f9c..abb76f9c1b9 100644
--- a/.github/CODEOWNERS
+++ b/.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
diff --git a/buildSrc/src/main/kotlin/datadog/gradle/plugin/naming/InstrumentationNamingPlugin.kt b/buildSrc/src/main/kotlin/datadog/gradle/plugin/naming/InstrumentationNamingPlugin.kt
index 2a41f796161..b8c4ac9a1fa 100644
--- a/buildSrc/src/main/kotlin/datadog/gradle/plugin/naming/InstrumentationNamingPlugin.kt
+++ b/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
diff --git a/dd-java-agent/instrumentation/build.gradle b/dd-java-agent/instrumentation/build.gradle
index 78c289ce1d1..96479c0f6d2 100644
--- a/dd-java-agent/instrumentation/build.gradle
+++ b/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',
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/build.gradle b/dd-java-agent/instrumentation/java/java-concurrent/build.gradle
deleted file mode 100644
index f8d1e61ba6a..00000000000
--- a/dd-java-agent/instrumentation/java/java-concurrent/build.gradle
+++ /dev/null
@@ -1,16 +0,0 @@
-muzzle {
-  pass {
-    coreJdk()
-  }
-}
-
-apply from: "$rootDir/gradle/java.gradle"
-
-dependencies {
-  testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
-
-  // test dependencies required for testing the executors we permit
-  testImplementation 'org.apache.tomcat.embed:tomcat-embed-core:7.0.0'
-  testImplementation libs.guava
-  testImplementation group: 'io.netty', name: 'netty-all', version: '4.1.9.Final'
-}
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/gradle.lockfile b/dd-java-agent/instrumentation/java/java-concurrent/gradle.lockfile
deleted file mode 100644
index 54158f4d767..00000000000
--- a/dd-java-agent/instrumentation/java/java-concurrent/gradle.lockfile
+++ /dev/null
@@ -1,121 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-cafe.cryptography:curve25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-cafe.cryptography:ed25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-ch.qos.logback:logback-classic:1.2.13=testCompileClasspath,testRuntimeClasspath
-ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath
-com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq:dd-instrument-java:0.0.3=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq:java-dogstatsd-client:4.4.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.javaparser:javaparser-core:3.25.6=codenarc
-com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-constants:0.10.4=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-enxio:0.32.17=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-ffi:2.2.16=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-posix:3.1.19=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-unixsocket:0.38.22=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-x86asm:1.0.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs:4.9.8=spotbugs
-com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
-com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath
-com.google.auto.service:auto-service:1.1.1=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:1.2.1=annotationProcessor,testAnnotationProcessor
-com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.code.gson:gson:2.13.2=spotbugs
-com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor
-com.google.errorprone:error_prone_annotations:2.41.0=spotbugs
-com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:32.0.1-jre=annotationProcessor,testAnnotationProcessor
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor
-com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,testAnnotationProcessor
-com.google.re2j:re2j:1.7=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.squareup.moshi:moshi:1.11.0=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath
-com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath
-com.squareup.okio:okio:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.thoughtworks.qdox:qdox:1.12.1=codenarc
-commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath
-commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath
-commons-io:commons-io:2.20.0=spotbugs
-de.thetaphi:forbiddenapis:3.10=compileClasspath
-io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath
-io.netty:netty-all:4.1.9.Final=testCompileClasspath,testRuntimeClasspath
-io.sqreen:libsqreen:17.3.0=testRuntimeClasspath
-javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath
-jaxen:jaxen:2.0.0=spotbugs
-junit:junit:4.13.2=testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.18.1=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.18.1=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.java.dev.jna:jna-platform:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-net.java.dev.jna:jna:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-net.sf.saxon:Saxon-HE:12.9=spotbugs
-org.apache.ant:ant-antlr:1.10.14=codenarc
-org.apache.ant:ant-junit:1.10.14=codenarc
-org.apache.bcel:bcel:6.11.0=spotbugs
-org.apache.commons:commons-lang3:3.19.0=spotbugs
-org.apache.commons:commons-text:1.14.0=spotbugs
-org.apache.logging.log4j:log4j-api:2.25.2=spotbugs
-org.apache.logging.log4j:log4j-core:2.25.2=spotbugs
-org.apache.tomcat.embed:tomcat-embed-core:7.0.0=testCompileClasspath,testRuntimeClasspath
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.checkerframework:checker-qual:3.33.0=annotationProcessor,testAnnotationProcessor
-org.codehaus.groovy:groovy-ant:3.0.23=codenarc
-org.codehaus.groovy:groovy-docgenerator:3.0.23=codenarc
-org.codehaus.groovy:groovy-groovydoc:3.0.23=codenarc
-org.codehaus.groovy:groovy-json:3.0.23=codenarc
-org.codehaus.groovy:groovy-json:3.0.25=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-templates:3.0.23=codenarc
-org.codehaus.groovy:groovy-xml:3.0.23=codenarc
-org.codehaus.groovy:groovy:3.0.23=codenarc
-org.codehaus.groovy:groovy:3.0.25=testCompileClasspath,testRuntimeClasspath
-org.codenarc:CodeNarc:3.7.0=codenarc
-org.dom4j:dom4j:2.2.0=spotbugs
-org.gmetrics:GMetrics:2.1.0=codenarc
-org.hamcrest:hamcrest-core:1.3=testRuntimeClasspath
-org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath
-org.jctools:jctools-core:3.3.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.14.1=testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:5.14.1=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter:5.14.1=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath
-org.junit.platform:junit-platform-runner:1.14.1=testRuntimeClasspath
-org.junit.platform:junit-platform-suite-api:1.14.1=testRuntimeClasspath
-org.junit.platform:junit-platform-suite-commons:1.14.1=testRuntimeClasspath
-org.junit:junit-bom:5.14.0=spotbugs
-org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath
-org.mockito:mockito-core:4.4.0=testRuntimeClasspath
-org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath
-org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
-org.ow2.asm:asm-analysis:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.ow2.asm:asm-analysis:9.9=spotbugs
-org.ow2.asm:asm-commons:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm-commons:9.9=spotbugs,testRuntimeClasspath
-org.ow2.asm:asm-tree:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm-tree:9.9=spotbugs,testRuntimeClasspath
-org.ow2.asm:asm-util:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.ow2.asm:asm-util:9.9=spotbugs
-org.ow2.asm:asm:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm:9.9=spotbugs,testRuntimeClasspath
-org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:slf4j-api:1.7.30=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath
-org.slf4j:slf4j-api:1.7.32=testCompileClasspath,testRuntimeClasspath
-org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j
-org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
-org.snakeyaml:snakeyaml-engine:2.9=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.spockframework:spock-bom:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.4-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.xmlresolver:xmlresolver:5.3.3=spotbugs
-empty=spotbugsPlugins
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/filter-jersey/build.gradle b/dd-java-agent/instrumentation/jersey/jersey-filter-2.0/build.gradle
similarity index 100%
rename from dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/filter-jersey/build.gradle
rename to dd-java-agent/instrumentation/jersey/jersey-filter-2.0/build.gradle
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/filter-jersey/gradle.lockfile b/dd-java-agent/instrumentation/jersey/jersey-filter-2.0/gradle.lockfile
similarity index 100%
rename from dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/filter-jersey/gradle.lockfile
rename to dd-java-agent/instrumentation/jersey/jersey-filter-2.0/gradle.lockfile
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/filter-jersey/src/main/java/datadog/trace/instrumentation/jaxrs2/JerseyRequestContextInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-filter-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JerseyRequestContextInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/filter-jersey/src/main/java/datadog/trace/instrumentation/jaxrs2/JerseyRequestContextInstrumentation.java
rename to dd-java-agent/instrumentation/jersey/jersey-filter-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JerseyRequestContextInstrumentation.java
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/filter-resteasy-3.0/build.gradle b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/build.gradle
similarity index 100%
rename from dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/filter-resteasy-3.0/build.gradle
rename to dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/build.gradle
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/filter-resteasy-3.0/gradle.lockfile b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/gradle.lockfile
similarity index 100%
rename from dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/filter-resteasy-3.0/gradle.lockfile
rename to dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/gradle.lockfile
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/filter-resteasy-3.0/src/main/java/datadog/trace/instrumentation/jaxrs2/Resteasy30RequestContextInstrumentation.java b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/src/main/java/datadog/trace/instrumentation/jaxrs2/Resteasy30RequestContextInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/filter-resteasy-3.0/src/main/java/datadog/trace/instrumentation/jaxrs2/Resteasy30RequestContextInstrumentation.java
rename to dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/src/main/java/datadog/trace/instrumentation/jaxrs2/Resteasy30RequestContextInstrumentation.java
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/filter-resteasy-3.1/build.gradle b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/build.gradle
similarity index 100%
rename from dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/filter-resteasy-3.1/build.gradle
rename to dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/build.gradle
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/filter-resteasy-3.1/gradle.lockfile b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/gradle.lockfile
similarity index 100%
rename from dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/filter-resteasy-3.1/gradle.lockfile
rename to dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/gradle.lockfile
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/filter-resteasy-3.1/src/main/java/datadog/trace/instrumentation/jaxrs2/Resteasy31RequestContextInstrumentation.java b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/src/main/java/datadog/trace/instrumentation/jaxrs2/Resteasy31RequestContextInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/filter-resteasy-3.1/src/main/java/datadog/trace/instrumentation/jaxrs2/Resteasy31RequestContextInstrumentation.java
rename to dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/src/main/java/datadog/trace/instrumentation/jaxrs2/Resteasy31RequestContextInstrumentation.java
diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/build.gradle b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/build.gradle
index 40fbd973f44..fecd82b8ae4 100644
--- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/build.gradle
+++ b/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.
diff --git a/dd-java-agent/instrumentation/spark/build.gradle b/dd-java-agent/instrumentation/spark/spark-common/build.gradle
similarity index 100%
rename from dd-java-agent/instrumentation/spark/build.gradle
rename to dd-java-agent/instrumentation/spark/spark-common/build.gradle
diff --git a/dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java
similarity index 100%
rename from dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java
rename to dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java
diff --git a/dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkInstrumentation.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkInstrumentation.java
rename to dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkInstrumentation.java
diff --git a/dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkPlanSerializer.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkPlanSerializer.java
similarity index 100%
rename from dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkPlanSerializer.java
rename to dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkPlanSerializer.java
diff --git a/dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkPlanUtils.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkPlanUtils.java
similarity index 100%
rename from dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkPlanUtils.java
rename to dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkPlanUtils.java
diff --git a/dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/DatabricksParentContext.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/DatabricksParentContext.java
similarity index 100%
rename from dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/DatabricksParentContext.java
rename to dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/DatabricksParentContext.java
diff --git a/dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/OpenLineageInstrumentation.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/OpenLineageInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/OpenLineageInstrumentation.java
rename to dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/OpenLineageInstrumentation.java
diff --git a/dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/OpenlineageParentContext.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/OpenlineageParentContext.java
similarity index 100%
rename from dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/OpenlineageParentContext.java
rename to dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/OpenlineageParentContext.java
diff --git a/dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/PredeterminedTraceIdContext.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/PredeterminedTraceIdContext.java
similarity index 100%
rename from dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/PredeterminedTraceIdContext.java
rename to dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/PredeterminedTraceIdContext.java
diff --git a/dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/RemoveEldestHashMap.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/RemoveEldestHashMap.java
similarity index 100%
rename from dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/RemoveEldestHashMap.java
rename to dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/RemoveEldestHashMap.java
diff --git a/dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/SparkAggregatedTaskMetrics.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkAggregatedTaskMetrics.java
similarity index 100%
rename from dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/SparkAggregatedTaskMetrics.java
rename to dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkAggregatedTaskMetrics.java
diff --git a/dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/SparkConfAllowList.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkConfAllowList.java
similarity index 100%
rename from dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/SparkConfAllowList.java
rename to dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkConfAllowList.java
diff --git a/dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/SparkExitAdvice.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkExitAdvice.java
similarity index 100%
rename from dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/SparkExitAdvice.java
rename to dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkExitAdvice.java
diff --git a/dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/SparkExitInstrumentation.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkExitInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/SparkExitInstrumentation.java
rename to dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkExitInstrumentation.java
diff --git a/dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/SparkSQLUtils.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkSQLUtils.java
similarity index 100%
rename from dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/SparkSQLUtils.java
rename to dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/SparkSQLUtils.java
diff --git a/dd-java-agent/instrumentation/spark/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSpark24SqlTest.groovy b/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSpark24SqlTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/spark/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSpark24SqlTest.groovy
rename to dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSpark24SqlTest.groovy
diff --git a/dd-java-agent/instrumentation/spark/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSpark32SqlTest.groovy b/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSpark32SqlTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/spark/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSpark32SqlTest.groovy
rename to dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSpark32SqlTest.groovy
diff --git a/dd-java-agent/instrumentation/spark/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkListenerTest.groovy b/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkListenerTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/spark/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkListenerTest.groovy
rename to dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkListenerTest.groovy
diff --git a/dd-java-agent/instrumentation/spark/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkStructuredStreamingTest.groovy b/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkStructuredStreamingTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/spark/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkStructuredStreamingTest.groovy
rename to dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkStructuredStreamingTest.groovy
diff --git a/dd-java-agent/instrumentation/spark/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkTest.groovy b/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/spark/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkTest.groovy
rename to dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkTest.groovy
diff --git a/dd-java-agent/instrumentation/spark/src/testFixtures/groovy/datadog/trace/instrumentation/spark/OpenlineageParentContextTest.groovy b/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/OpenlineageParentContextTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/spark/src/testFixtures/groovy/datadog/trace/instrumentation/spark/OpenlineageParentContextTest.groovy
rename to dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/OpenlineageParentContextTest.groovy
diff --git a/dd-java-agent/instrumentation/spark/src/testFixtures/groovy/datadog/trace/instrumentation/spark/SparkPlanSerializerTestCases.groovy b/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/SparkPlanSerializerTestCases.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/spark/src/testFixtures/groovy/datadog/trace/instrumentation/spark/SparkPlanSerializerTestCases.groovy
rename to dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/SparkPlanSerializerTestCases.groovy
diff --git a/dd-java-agent/instrumentation/spark/src/testFixtures/java/datadog/trace/instrumentation/spark/SparkPlanSerializerTest.java b/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/java/datadog/trace/instrumentation/spark/SparkPlanSerializerTest.java
similarity index 100%
rename from dd-java-agent/instrumentation/spark/src/testFixtures/java/datadog/trace/instrumentation/spark/SparkPlanSerializerTest.java
rename to dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/java/datadog/trace/instrumentation/spark/SparkPlanSerializerTest.java
diff --git a/dd-java-agent/instrumentation/spark/src/testFixtures/java/datadog/trace/instrumentation/spark/TestSparkComputation.java b/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/java/datadog/trace/instrumentation/spark/TestSparkComputation.java
similarity index 100%
rename from dd-java-agent/instrumentation/spark/src/testFixtures/java/datadog/trace/instrumentation/spark/TestSparkComputation.java
rename to dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/java/datadog/trace/instrumentation/spark/TestSparkComputation.java
diff --git a/dd-java-agent/instrumentation/spark/src/testFixtures/java/io/openlineage/client/circuitBreaker/TimeoutCircuitBreaker.java b/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/java/io/openlineage/client/circuitBreaker/TimeoutCircuitBreaker.java
similarity index 100%
rename from dd-java-agent/instrumentation/spark/src/testFixtures/java/io/openlineage/client/circuitBreaker/TimeoutCircuitBreaker.java
rename to dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/java/io/openlineage/client/circuitBreaker/TimeoutCircuitBreaker.java
diff --git a/dd-java-agent/instrumentation/spark-executor/build.gradle b/dd-java-agent/instrumentation/spark/spark-executor-common/build.gradle
similarity index 100%
rename from dd-java-agent/instrumentation/spark-executor/build.gradle
rename to dd-java-agent/instrumentation/spark/spark-executor-common/build.gradle
diff --git a/dd-java-agent/instrumentation/spark-executor/gradle.lockfile b/dd-java-agent/instrumentation/spark/spark-executor-common/gradle.lockfile
similarity index 100%
rename from dd-java-agent/instrumentation/spark-executor/gradle.lockfile
rename to dd-java-agent/instrumentation/spark/spark-executor-common/gradle.lockfile
diff --git a/dd-java-agent/instrumentation/spark-executor/src/baseTest/groovy/SparkExecutorTest.groovy b/dd-java-agent/instrumentation/spark/spark-executor-common/src/baseTest/groovy/SparkExecutorTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/spark-executor/src/baseTest/groovy/SparkExecutorTest.groovy
rename to dd-java-agent/instrumentation/spark/spark-executor-common/src/baseTest/groovy/SparkExecutorTest.groovy
diff --git a/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorDecorator.java b/dd-java-agent/instrumentation/spark/spark-executor-common/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorDecorator.java
similarity index 100%
rename from dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorDecorator.java
rename to dd-java-agent/instrumentation/spark/spark-executor-common/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorDecorator.java
diff --git a/dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java b/dd-java-agent/instrumentation/spark/spark-executor-common/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/spark-executor/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java
rename to dd-java-agent/instrumentation/spark/spark-executor-common/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java
diff --git a/dd-java-agent/instrumentation/spark/spark_2.12/build.gradle b/dd-java-agent/instrumentation/spark/spark_2.12/build.gradle
index 3dfeaa0ce6a..ce207c150da 100644
--- a/dd-java-agent/instrumentation/spark/spark_2.12/build.gradle
+++ b/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"
diff --git a/dd-java-agent/instrumentation/spark/spark_2.13/build.gradle b/dd-java-agent/instrumentation/spark/spark_2.13/build.gradle
index 143a36be810..4f5928c33f1 100644
--- a/dd-java-agent/instrumentation/spark/spark_2.13/build.gradle
+++ b/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"
diff --git a/dd-java-agent/instrumentation/sparkjava-2.3/build.gradle b/dd-java-agent/instrumentation/spark/sparkjava-2.3/build.gradle
similarity index 100%
rename from dd-java-agent/instrumentation/sparkjava-2.3/build.gradle
rename to dd-java-agent/instrumentation/spark/sparkjava-2.3/build.gradle
diff --git a/dd-java-agent/instrumentation/sparkjava-2.3/gradle.lockfile b/dd-java-agent/instrumentation/spark/sparkjava-2.3/gradle.lockfile
similarity index 100%
rename from dd-java-agent/instrumentation/sparkjava-2.3/gradle.lockfile
rename to dd-java-agent/instrumentation/spark/sparkjava-2.3/gradle.lockfile
diff --git a/dd-java-agent/instrumentation/sparkjava-2.3/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java b/dd-java-agent/instrumentation/spark/sparkjava-2.3/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/sparkjava-2.3/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java
rename to dd-java-agent/instrumentation/spark/sparkjava-2.3/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java
diff --git a/dd-java-agent/instrumentation/sparkjava-2.3/src/test/groovy/SparkJavaBasedTest.groovy b/dd-java-agent/instrumentation/spark/sparkjava-2.3/src/test/groovy/SparkJavaBasedTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/sparkjava-2.3/src/test/groovy/SparkJavaBasedTest.groovy
rename to dd-java-agent/instrumentation/spark/sparkjava-2.3/src/test/groovy/SparkJavaBasedTest.groovy
diff --git a/dd-java-agent/instrumentation/sparkjava-2.3/src/test/java/TestSparkJavaApplication.java b/dd-java-agent/instrumentation/spark/sparkjava-2.3/src/test/java/TestSparkJavaApplication.java
similarity index 100%
rename from dd-java-agent/instrumentation/sparkjava-2.3/src/test/java/TestSparkJavaApplication.java
rename to dd-java-agent/instrumentation/spark/sparkjava-2.3/src/test/java/TestSparkJavaApplication.java
diff --git a/settings.gradle.kts b/settings.gradle.kts
index d3b24b25b42..0ce925c46a0 100644
--- a/settings.gradle.kts
+++ b/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",