Skip to content

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

Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 2 commits intomasterfrom
smola/dropwizard-uses-jetty
Apr 30, 2026
Merged

Load jetty-server instrumentation in dropwizard-0.8 tests#11235
gh-worker-dd-mergequeue-cf854d[bot] merged 2 commits intomasterfrom
smola/dropwizard-uses-jetty

Conversation

@smola
Copy link
Copy Markdown
Member

@smola smola commented Apr 30, 2026

What Does This Do

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.

Motivation

Related to APPSEC-62560; found while investigating why Dropwizard 0.8 tests tag network.client.ip with the X-Forwarded-For IP instead of the raw peer IP.

Additional Notes

Contributor Checklist

Jira ticket: [PROJ-IDENT]

Note: Once your PR is ready to merge, add it to the merge queue by commenting /merge. /merge -c cancels the queue request. /merge -f --reason "reason" skips all merge queue checks; please use this judiciously, as some checks do not run at the PR-level. For more information, see this doc.

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.
@smola smola added comp: testing Testing type: refactoring inst: jetty Jetty instrumentation tag: ai generated Largely based on code generated by an AI or LLM labels Apr 30, 2026
@smola
Copy link
Copy Markdown
Member Author

smola commented Apr 30, 2026

@codex review

@smola smola added the tag: no release notes Changes to exclude from release notes label Apr 30, 2026
@chatgpt-codex-connector
Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Another round soon, please!

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

@smola smola marked this pull request as ready for review April 30, 2026 07:25
@smola smola requested a review from a team as a code owner April 30, 2026 07:25
Copy link
Copy Markdown
Contributor

@ygree ygree left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d Bot merged commit abe7711 into master Apr 30, 2026
750 of 755 checks passed
@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d Bot deleted the smola/dropwizard-uses-jetty branch April 30, 2026 18:02
@github-actions github-actions Bot added this to the 1.62.0 milestone Apr 30, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

comp: testing Testing inst: jetty Jetty instrumentation tag: ai generated Largely based on code generated by an AI or LLM tag: no release notes Changes to exclude from release notes type: refactoring

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants