Load jetty-server instrumentation in dropwizard-0.8 tests (#11235)

Load jetty-server instrumentation in dropwizard-0.8 tests

Dropwizard 0.8 runs on Jetty 9.2.9, where jetty-server owns the
request span in production. Add jetty-server-9.0 and jetty-server-9.0.4
as test dependencies so the test classpath matches, and update the
expected integration name on DropwizardTest accordingly.

Merge branch 'master' into smola/dropwizard-uses-jetty

Co-authored-by: santiago.mola <santiago.mola@datadoghq.com>

Author: smola

dd-java-agent/instrumentation/dropwizard/dropwizard-0.8/build.gradle

@@ -5,6 +5,15 @@ apply from: "$rootDir/gradle/java.gradle"
 dependencies {
   testImplementation project(':dd-java-agent:instrumentation:rs:jax-rs:jax-rs-annotations:jax-rs-annotations-2.0')
   testImplementation project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
+  // Dropwizard 0.8 transitively depends on Jetty 9.2.9, so load the jetty-server
+  // instrumentation modules whose muzzle ranges cover that version, matching the
+  // production classpath:
+  //   - jetty-server-9.0     applies to [9, 10) and owns the request span
+  //   - jetty-server-9.0.4   applies to [9.0.4, 9.3.0.M1) and owns the AppSec
+  //                          response-commit hook used by Jetty 9.2.x
+  // Without these, the server span is owned by Servlet3Decorator.
+  testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')
+  testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0.4')
 
   // First version with DropwizardTestSupport:
   testImplementation group: 'io.dropwizard', name: 'dropwizard-testing', version: '0.8.0'

dd-java-agent/instrumentation/dropwizard/dropwizard-0.8/src/test/groovy/DropwizardTest.groovy

@@ -95,7 +95,10 @@ class DropwizardTest extends HttpServerTest<DropwizardTestSupport> {
 
   @Override
   String expectedIntegrationName() {
-    "java-web-servlet"
+    // In production, Jetty's server instrumentation creates the request span before Servlet3
+    // gets a chance to. Servlet3Advice detects the existing span and skips, so the span is
+    // owned by jetty-server, not java-web-servlet.
+    "jetty-server"
   }
 
   @Override