Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gh-worker-dd-mergequeue-cf854d merged 2 commits into from
Apr 30, 2026
+13 −1
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4905dd8
Load jetty-server instrumentation in dropwizard-0.8 tests
smola Apr 30, 2026
731ba55
Merge branch 'master' into smola/dropwizard-uses-jetty
smola Apr 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions dd-java-agent/instrumentation/dropwizard/dropwizard-0.8/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
5 changes: 4 additions & 1 deletion ...ava-agent/instrumentation/dropwizard/dropwizard-0.8/src/test/groovy/DropwizardTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading