Skip to content

Upgrade jetty to 12.1.11 (latest) - #150

Merged
imjalpreet merged 1 commit into
prestodb:masterfrom
auden-woolfson:upgrade_jettyio
Sep 14, 2026
Merged

imjalpreet merged 1 commit into
prestodb:masterfrom
auden-woolfson:upgrade_jettyio

Conversation

@auden-woolfson

Copy link
Copy Markdown

No description provided.

@auden-woolfson
auden-woolfson requested a review from a team as a code owner July 30, 2026 17:27
@sourcery-ai

sourcery-ai Bot commented Jul 30, 2026 •

Copy link
Copy Markdown
Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Jetty is upgraded to 12.1.11 and the custom async socket address resolver is updated to match the new Jetty API by adding a context parameter to the resolve method and delegating it correctly to the superclass.

Sequence diagram for updated async socket address resolution with context

sequenceDiagram
actor ClientCode
participant JettyAsyncSocketAddressResolver
participant Promise
participant SuperResolver

ClientCode->>JettyAsyncSocketAddressResolver: resolve(host, port, context, promise)
JettyAsyncSocketAddressResolver->>JettyAsyncSocketAddressResolver: resolve(host)
alt address present
  JettyAsyncSocketAddressResolver->>Promise: succeeded(ImmutableList.of(InetSocketAddress))
else address not present
  JettyAsyncSocketAddressResolver->>SuperResolver: resolve(host, port, context, promise)
end
Loading

File-Level Changes

Change Details Files
Update Jetty dependency version to 12.1.11.
  • Change the Jetty version property to 12.1.11 in the Maven build configuration
pom.xml
Adapt JettyAsyncSocketAddressResolver to Jetty 12.1.x resolve API signature.
  • Add a Map-based context parameter to the resolve method signature
  • Pass the context through when delegating to the superclass resolve implementation
  • Import java.util.Map to support the new method parameter
http-client/src/main/java/com/facebook/airlift/http/client/jetty/JettyAsyncSocketAddressResolver.java

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@sourcery-ai sourcery-ai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Hey - I've reviewed your changes and they look great!


Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@imjalpreet imjalpreet left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks, @auden-woolfson.

Changes mostly LGTM. Can you please share a CI run in Presto by including the updated Airlift (via JitPack.io) before we merge these changes? This will eliminate any surprises later.

@auden-woolfson

Copy link
Copy Markdown
Author

@imjalpreet here is the draft PR in presto to show CI run:

prestodb/presto#28277

I also ran unit tests on the upgrade_jetty_io_jitpack branch and they passed:

image

@imjalpreet

Copy link
Copy Markdown
Member

@auden-woolfson, thanks, I see the version being used for airlift in the presto PR is 42be4a951cc868704b4a790fb63c585749b04936, can you please let me know which branch or commit this points to?

@imjalpreet

Copy link
Copy Markdown
Member

@auden-woolfson, also, I see there is a test suite failure for presto-pinot-toolkit (test-other-modules) in your Presto PR. Please look into it.

@auden-woolfson

Copy link
Copy Markdown
Author

@auden-woolfson, thanks, I see the version being used for airlift in the presto PR is 42be4a951cc868704b4a790fb63c585749b04936, can you please let me know which branch or commit this points to?

This points here, I had to add some config file for jitpack so it's a separate branch

master...auden-woolfson:airlift:upgrade_jettyio_jitpack

Ok I will look into that failure, it is probably just flaky since UT pipeline passed

@imjalpreet

@imjalpreet

Copy link
Copy Markdown
Member

@auden-woolfson, the pinot failure is a ClassNotFoundException, so I feel it might be related to the upgrade. But you can check from your end.

@auden-woolfson

auden-woolfson commented Aug 8, 2026 •

Copy link
Copy Markdown
Author

I updated the branch to pull from my jitpack repo after another so the dependency that was failing in pinot toolkit resolves.

There were 2 failures in the jenkins pipeline and I believe they are unrelated.

Presto spark:

11:24:53  [ERROR] Failures: 

11:24:53  [ERROR]   TestPrestoSparkLauncherIntegrationSmokeTest.setUp:137 ? IllegalArgument container not found: hadoop-master

Presto hive has some null pointer exceptions which should be unrelated and fixed in 1d989d1296483077248d61ddf13217a94e62f14f

@aaneja

aaneja commented Aug 8, 2026

Copy link
Copy Markdown

We had issues last time we were upgrading to 12.1.x -
#128 (comment)
#132

I'm all for moving to 12.1.x, but if we cannot figure out a fix for it soon, can we instead move to 12.0.38, which fixes CVE-2026-10051 that we wanted to address ?

@auden-woolfson

Copy link
Copy Markdown
Author

Rebased onto current master. This was conflicting on dep.jetty.version after e0a192c0b moved master to 12.0.38, so the pom hunk now reads 12.0.38 -> 12.1.11 rather than off the stale 12.0.34 base. Diff against master is unchanged in substance: 2 files, +4/-3.

@aaneja, on the 12.1.x history you linked, I went back through both failures and neither reproduces on 12.1.11:

Local verification on JDK 17 with mvn install, matching CI. I ran master as a baseline in a separate worktree so this is a like-for-like comparison rather than an absolute claim:

master (12.0.38) this branch (12.1.11)
result BUILD SUCCESS BUILD SUCCESS
all 43 modules Tests run: 4217, Failures: 0, Errors: 0, Skipped: 0 Tests run: 4217, Failures: 0, Errors: 0, Skipped: 0
http-client only 432 tests, 0 failures, 9 errors 432 tests, 0 failures, 9 errors

Identical. The 9 http-client errors are the same on both sides: testPutMethodWithStaticBodyGenerator requires 1 parameters but 0 were supplied in the @Test annotation in AbstractHttpClientTest, a TestNG parameter-binding issue that predates this change and that this branch does not touch. The same 432 tests show up as Skipped: 9 in the #130 run from November, so it is the same nine categorized differently by the reporter.

mvn dependency:tree on http-client also confirms every Jetty artifact resolves uniformly at 12.1.11, including jetty-ee10-servlet, with no 12.0.x leakage.

Presto side: prestodb/presto#28277 consumes a JitPack build of this branch. 93 of 95 checks pass. The two that do not are Validate PR Title (title lint on a throwaway draft) and singlestore-dockerized-tests (17), which was cancelled rather than failed. Coverage includes maven-checks, presto-main, all eight presto-tests profiles, every Hive profile, Iceberg, spark-integration, test-other-modules, and the full prestocpp-* matrix.

That run predates this rebase but still applies to it: everything between the old PR base and current master is release-plugin <version> churn across 43 poms plus the one 12.0.34 -> 12.0.38 property that this PR overrides anyway. Nothing Jetty-relevant differs. Happy to rebuild the JitPack artifact and re-trigger if you would rather see it on the exact rebased SHA.

@imjalpreet, on the pinot ClassNotFoundException in test-other-modules: you were right that it was not flaky. JitPack answers 200 with an empty stub jar for io.github.* coordinates it cannot build, and that was shadowing the real io.github.hakky54:sslcontext-kickstart that pinot-common pulls transitively from Central. Declaring central ahead of jitpack.io in the Presto PR fixed it, and that job is green now. It is a JitPack-only artifact and disappears once Presto consumes a released airlift.

Two things I would like to settle:

  1. Version. 12.1.12 shipped Aug 4. I have held this at 12.1.11 so it matches the CI evidence above. Say the word and I will re-target before merge, though that would want a fresh Presto run.
  2. Release. Presto cannot bump jetty-bom independently of airlift. The resolver override is a hard signature break in both directions, so a Presto-only bump gets AbstractMethodError at runtime rather than a compile error. It needs a released airlift, and master is exactly one commit ahead of 0.231 (just the dev-iteration bump), so a 0.232 cut would contain this change and nothing else. Who can cut it once this merges? After that, Upgrade dep.jetty.version to 12.1.11 presto#28199 reduces to a two-line change (dep.jetty.version plus dep.airlift.version=0.232) and #28277 gets closed.

@sonarqubecloud

Copy link
Copy Markdown

@imjalpreet imjalpreet left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks, @auden-woolfson.

LGTM. One of the test suite([product tests (basic) / product-tests-basic-environment(17)) was failing in your Presto PR, so I have re-triggered it to confirm whether it was a flaky test. Once it passes, I will merge this.

@imjalpreet
imjalpreet merged commit 626d3e7 into prestodb:master Sep 14, 2026
4 checks passed
imjalpreet pushed a commit to prestodb/presto that referenced this pull request Oct 6, 2026
## Description
Upgrade Jetty from 12.0.38 to 12.1.11.

Bump airlift from 0.231 to 0.232, which is built against Jetty 12.1.11
and adapts `JettyAsyncSocketAddressResolver` to the Jetty 12.1 `resolve`
API.

Airlift PR - prestodb/airlift#150

## Motivation and Context
Moves Presto to the latest Jetty release line (12.1.x). Airlift 0.231 is
compiled against Jetty 12.0 and is not compatible with Jetty 12.1, so
both versions are bumped together.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants