Skip to content

Conversation

@andrross
Copy link
Member

Check List

  • Functionality includes testing.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@andrross andrross requested review from a team and peternied as code owners September 10, 2025 21:32
Signed-off-by: Andrew Ross <andrross@amazon.com>
@andrross andrross force-pushed the update-netty-4.1.125 branch from 481bf24 to c6ff25c Compare September 10, 2025 21:33
Copy link
Member

@cwperks cwperks left a comment

Choose a reason for hiding this comment

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

FYI There is a Draft PR open for a bump to 4.2 here: #19178

@github-actions
Copy link
Contributor

✅ Gradle check result for c6ff25c: SUCCESS

@codecov
Copy link

codecov bot commented Sep 10, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 72.92%. Comparing base (579830d) to head (c6ff25c).
⚠️ Report is 4 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main   #19269      +/-   ##
============================================
+ Coverage     72.78%   72.92%   +0.14%     
- Complexity    69651    69690      +39     
============================================
  Files          5658     5658              
  Lines        320114   320114              
  Branches      46350    46350              
============================================
+ Hits         233004   233459     +455     
+ Misses        68248    67714     -534     
- Partials      18862    18941      +79     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@cwperks cwperks merged commit 1df543e into opensearch-project:main Sep 11, 2025
31 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.19 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.19 2.19
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.19
# Create a new branch
git switch --create backport/backport-19269-to-2.19
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1df543e04d7605b7ee37587ff5c635609ebdafbd
# Push it to GitHub
git push --set-upstream origin backport/backport-19269-to-2.19
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.19

Then, create a pull request where the base branch is 2.19 and the compare/head branch is backport/backport-19269-to-2.19.

@andrross andrross deleted the update-netty-4.1.125 branch September 11, 2025 18:24
cwperks added a commit that referenced this pull request Sep 12, 2025
* [2.19] Upgrade netty from 4.1.121.Final to 4.1.125.Final

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Bump netty from 4.1.124.Final to 4.1.125.Final (#19269)

Signed-off-by: Andrew Ross <andrross@amazon.com>
(cherry picked from commit 1df543e)

* remove unnecessary file

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Fix CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Update transport-nio build.gradle file as well

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Andrew Ross <andrross@amazon.com>
Co-authored-by: Andrew Ross <andrross@amazon.com>
jainankitk pushed a commit to jainankitk/OpenSearch that referenced this pull request Sep 22, 2025
)

Signed-off-by: Andrew Ross <andrross@amazon.com>
jainankitk pushed a commit to jainankitk/OpenSearch that referenced this pull request Sep 22, 2025
)

Signed-off-by: Andrew Ross <andrross@amazon.com>
Signed-off-by: Ankit Jain <jainankitk@apache.org>
jainankitk pushed a commit to jainankitk/OpenSearch that referenced this pull request Sep 22, 2025
)

Signed-off-by: Andrew Ross <andrross@amazon.com>
Signed-off-by: Ankit Jain <jainankitk@apache.org>
asimmahmood1 pushed a commit to jainankitk/OpenSearch that referenced this pull request Sep 23, 2025
)

Signed-off-by: Andrew Ross <andrross@amazon.com>
pranikum pushed a commit to pranikum/OpenSearch that referenced this pull request Sep 23, 2025
)

Signed-off-by: Andrew Ross <andrross@amazon.com>
vinaykpud pushed a commit to vinaykpud/OpenSearch that referenced this pull request Sep 26, 2025
)

Signed-off-by: Andrew Ross <andrross@amazon.com>
@akash-shankaran
Copy link

Any chance this'll get backported to 3.2.0 branch? We're running into vulnerabilities in our scans, which get fixed with the 4.1.125 version of Netty.

sokdak pushed a commit to sokdak/OpenSearch that referenced this pull request Oct 15, 2025
…earch-project#19270)

* [2.19] Upgrade netty from 4.1.121.Final to 4.1.125.Final

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Bump netty from 4.1.124.Final to 4.1.125.Final (opensearch-project#19269)

Signed-off-by: Andrew Ross <andrross@amazon.com>
(cherry picked from commit 1df543e)

* remove unnecessary file

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Fix CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Update transport-nio build.gradle file as well

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Andrew Ross <andrross@amazon.com>
Co-authored-by: Andrew Ross <andrross@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants