Split jetty-server-9.0 project setup to multiple modules (#9683)

* wip

# Conflicts:
#	dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/build.gradle

* wip jetty 9.4.21

* wipwip

* fix: muzzle depes

* wip jetty 10.0

* style: make google-java-format happy

* Fix jetty 11 test

* jetty 10

* fix: Jersey tests

* fix: javax-servlet tests

* fix: jersey-server-9.4.21 websocket tests

* fix: cxf-2.1 tests

---------

Co-authored-by: Andrea Marziali <andrea.marziali@datadoghq.com>

Author: bric3

dd-java-agent/instrumentation/cxf-2.1/build.gradle

@@ -60,6 +60,7 @@ dependencies {
   testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-7.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-7.6')
   testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-10.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-12.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:trace-annotation')

dd-java-agent/instrumentation/jersey/build.gradle

@@ -53,6 +53,7 @@ dependencies {
   jersey2JettyTestRuntimeOnly group: 'javax.activation', name: 'javax.activation-api', version: '1.2.0'
   jersey2JettyTestRuntimeOnly group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
   jersey2JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')
+  jersey2JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0.4')
   jersey2JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jersey-2-appsec')
   jersey2JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jax-rs-annotations-2')
 
@@ -68,6 +69,7 @@ dependencies {
   jersey3JettyTestRuntimeOnly group: 'javax.activation', name: 'javax.activation-api', version: '1.2.0'
   jersey3JettyTestRuntimeOnly group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
   jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')
+  jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-10.0')
   jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0')
   jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jersey-2-appsec')
   jersey3JettyTestRuntimeOnly project(':dd-java-agent:instrumentation:jersey-3-appsec')

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/build.gradle

@@ -0,0 +1,99 @@
+ext {
+  minJavaVersionForTests = JavaVersion.VERSION_11
+}
+
+muzzle {
+  pass {
+    name = "10_series"
+    group = "org.eclipse.jetty"
+    module = 'jetty-server'
+    versions = "[10,11)"
+    assertInverse = true
+    javaVersion = 11
+  }
+  pass {
+    name = "after_10"
+    group = "org.eclipse.jetty"
+    module = 'jetty-server'
+    versions = "[10,12)"
+    assertInverse = true
+    javaVersion = 11
+  }
+  pass {
+    name = 'named_dispatches'
+    group = 'org.eclipse.jetty'
+    module = 'jetty-server'
+    versions = "[10.0.16,11),[11.0.16,12)"
+    assertInverse = true
+    //extraDependency "javax.servlet:javax.servlet-api:3.1.0"
+    //extraDependency "jakarta.servlet:jakarta.servlet-api:5.0.0"
+    javaVersion = 11
+  }
+}
+
+apply from: "$rootDir/gradle/java.gradle"
+apply plugin: "idea"
+
+addTestSuiteForDir("latestDepTest", "test")
+addTestSuiteExtendingForDir("latestDepForkedTest", "latestDepTest", "test")
+
+dependencies {
+  main_java11Implementation project(':dd-java-agent:instrumentation:jetty:jetty-common')
+  main_java11Implementation project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')
+  main_java11CompileOnly group: 'org.eclipse.jetty', name: 'jetty-server', version: '10.0.0'
+
+  // Don't want to conflict with jetty from the test server.
+  testImplementation(project(':dd-java-agent:instrumentation-testing')) {
+    exclude group: 'org.eclipse.jetty', module: 'jetty-server'
+  }
+  testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31')
+
+  testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '10.0.0'
+  testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '10.0.0'
+  testImplementation group: 'org.eclipse.jetty.websocket', name: 'websocket-javax-server', version: '10.0.0'
+  testImplementation project(':dd-java-agent:appsec:appsec-test-fixtures')
+  testImplementation testFixtures(project(":dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0"))
+  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
+
+  // Include all jetty-server instrumentation modules for testing. Only the version-compatible module will apply at runtime.
+  testRuntimeOnly project(":dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0")
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-2.2')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:javax-websocket-1.0')
+  // Include all appsec instrumentation modules for testing. Only the version-compatible module will apply at runtime.
+  testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-7.0')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-8.1.3')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.2')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3')
+  // Include all websocket instrumentation modules for testing. Only the version-compatible module will apply at runtime.
+  testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:javax-websocket-1.0')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:jakarta-websocket-2.0')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-10')
+
+  latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '10.+'
+  latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '10.+'
+  latestDepTestImplementation group: 'org.eclipse.jetty.websocket', name: 'websocket-javax-server', version: '10.+'
+  latestDepTestImplementation project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3')
+  latestDepTestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
+
+  latestDepForkedTestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '10.+'
+  latestDepForkedTestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '10.+'
+  latestDepForkedTestImplementation group: 'org.eclipse.jetty.websocket', name: 'websocket-javax-server', version: '10.+'
+  latestDepForkedTestImplementation project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3')
+  latestDepForkedTestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
+}
+
+configurations.named('latestDepForkedTestRuntimeClasspath') {
+  resolutionStrategy {
+    force libs.slf4j
+  }
+}
+
+tasks.withType(AbstractCompile).configureEach {
+  configureCompiler(it, 11, JavaVersion.VERSION_1_8)
+}
+
+idea {
+  module {
+    jdkName = '11'
+  }
+}

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty10/DispatchableInstrumentation.java renamed to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/DispatchableInstrumentation.java

@@ -44,11 +44,6 @@ public JettyServerInstrumentation() {
     super("jetty");
   }
 
-  @Override
-  public String muzzleDirective() {
-    return "10_series";
-  }
-
   @Override
   public String instrumentedType() {
     return "org.eclipse.jetty.server.HttpChannel";
@@ -90,6 +85,11 @@ public Reference[] additionalMuzzleReferences() {
     };
   }
 
+  @Override
+  public String muzzleDirective() {
+    return "10_series";
+  }
+
   @Override
   public void typeAdvice(TypeTransformer transformer) {
     transformer.applyAdvice(new HttpChannelHandleVisitorWrapper());

dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty10/JettyCommitResponseInstrumentation.java renamed to dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-10.0/src/main/java/datadog/trace/instrumentation/jetty10/JettyCommitResponseInstrumentation.java

@@ -15,16 +15,15 @@ public RequestInstrumentation() {
     super("jetty");
   }
 
-  @Override
-  public String muzzleDirective() {
-    return "10_series";
-  }
-
   @Override
   public String instrumentedType() {
     return "org.eclipse.jetty.server.Request";
   }
 
+  public String muzzleDirective() {
+    return "10_series";
+  }
+
   @Override
   public void methodAdvice(MethodTransformer transformer) {
     transformer.applyAdvice(