Skip to content

Update Armeria to 1.32.6#6343

Merged
KarstenSchnitter merged 1 commit into
opensearch-project:mainfrom
JannikBrand:6271-armeria-fix
Apr 29, 2026
Merged

Update Armeria to 1.32.6#6343
KarstenSchnitter merged 1 commit into
opensearch-project:mainfrom
JannikBrand:6271-armeria-fix

Conversation

@JannikBrand
Copy link
Copy Markdown
Contributor

@JannikBrand JannikBrand commented Dec 9, 2025 •
edited
Loading

Description

Fixes #6271 since the current Armeria version is affected by a couple
of bugs (see comment #6271 (comment)).

This Armeria patch version was requested explicitly: line/armeria#6733

Furthermore, replace io.micrometer.core.lang annotation which is going
to be removed in Micrometer 1.16.0 - see release notes:
https://github.com/micrometer-metrics/micrometer/releases/tag/v1.16.0.

Remove deprecated io.micrometer.core.lang annotations micrometer-metrics/micrometer#6407

Issues Resolved

Resolves #6271

Check List

  • New functionality includes testing.
  • New functionality has a documentation issue. Please link to it in this PR.
    • New functionality has javadoc added
  • Commits are signed with a real name per the DCO

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.

KarstenSchnitter
KarstenSchnitter reviewed Dec 10, 2025
View reviewed changes
Copy link
Copy Markdown
Collaborator

@KarstenSchnitter KarstenSchnitter left a comment

Choose a reason for hiding this comment

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

@dlvenable and @kkondaka we need your input on the dependency upgrade. Apparently we need a newer netty version. What do you think about the AWS SDK, that currently uses an older version?

Comment thread build.gradle Outdated
dlvenable
dlvenable reviewed Dec 10, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@dlvenable dlvenable left a comment

Choose a reason for hiding this comment

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

Thanks @JannikBrand for this contribution! This could have compatibility issues unless we get all of our Netty dependencies updated as well. I left some instructions that might help.

Comment thread build.gradle Outdated
@JannikBrand
Copy link
Copy Markdown
Contributor Author

JannikBrand commented Dec 29, 2025

Also found this netty 4.2 migration guide: https://netty.io/wiki/netty-4.2-migration-guide.html

@JannikBrand
Copy link
Copy Markdown
Contributor Author

JannikBrand commented Jan 14, 2026

Found that there is an open PR for the awssdk to upgrade netty to the wanted minor version:
aws/aws-sdk-java-v2#6205

@JannikBrand JannikBrand force-pushed the 6271-armeria-fix branch 2 times, most recently from 112d7ef to c4c1d21 Compare January 14, 2026 11:53
@dlvenable dlvenable mentioned this pull request Apr 22, 2026
Open
@JannikBrand JannikBrand changed the title Update Ameria to 1.34.1 Update Armeria to 1.32.6 Apr 28, 2026
@JannikBrand JannikBrand force-pushed the 6271-armeria-fix branch 2 times, most recently from 3c297d9 to 59326bd Compare April 28, 2026 09:05
@JannikBrand
Copy link
Copy Markdown
Contributor Author

JannikBrand commented Apr 28, 2026

I followed a new approach:
Instead of updating Armeria to 1.34.x I requested Armeria to release a patch version (linked in the PR description). This patch version includes the "HTTP/2 RST_STEAM and flow control" fixes without requiring Netty 4.2.x.

I verified that Data Prepper 2.15.x is still affected by this and that cherry-picking this commit on top will resolve the issue.

Now the only thing missing are the failing integration tests.

@JannikBrand
Update Armeria to 1.32.6
4d10ccf 
This Armeria patch version was requested explicitly:
line/armeria#6733

Fixes opensearch-project#6271 since the current Ameria version is affected by a couple
of bugs (see comment opensearch-project#6271 (comment)).

Furthermore, replace io.micrometer.core.lang annotation which is going
to be deprecated in Micrometer 1.16.0 - see release notes:
https://github.com/micrometer-metrics/micrometer/releases/tag/v1.16.0.

Signed-off-by: Jannik Brand <jannik.brand@sap.com>
@JannikBrand JannikBrand marked this pull request as ready for review April 28, 2026 14:06
KarstenSchnitter
KarstenSchnitter reviewed Apr 28, 2026
View reviewed changes
Copy link
Copy Markdown
Collaborator

@KarstenSchnitter KarstenSchnitter left a comment

Choose a reason for hiding this comment

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

Thanks for providing this fix. Please check the @Nullable annotation.

Comment thread ...repper-core/src/main/java/org/opensearch/dataprepper/core/meter/EMFLoggingMeterRegistry.java
KarstenSchnitter
KarstenSchnitter approved these changes Apr 29, 2026
View reviewed changes
Copy link
Copy Markdown
Collaborator

@KarstenSchnitter KarstenSchnitter left a comment

Choose a reason for hiding this comment

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

Thanks, looks good to me.

dlvenable
dlvenable approved these changes Apr 29, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@dlvenable dlvenable left a comment

Choose a reason for hiding this comment

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

Thank you @JannikBrand for getting this fix in!

@KarstenSchnitter KarstenSchnitter merged commit cbba661 into opensearch-project:main Apr 29, 2026
118 of 129 checks passed
@JannikBrand JannikBrand deleted the 6271-armeria-fix branch April 29, 2026 17:11
simonelbaz pushed a commit to simonelbaz/data-prepper that referenced this pull request Apr 30, 2026
@JannikBrand @simonelbaz
Update Armeria to 1.32.6 (opensearch-project#6343)
1dfd0d3 
This Armeria patch version was requested explicitly:
line/armeria#6733

Fixes opensearch-project#6271 since the current Ameria version is affected by a couple
of bugs (see comment opensearch-project#6271 (comment)).

Furthermore, replace io.micrometer.core.lang annotation which is going
to be deprecated in Micrometer 1.16.0 - see release notes:
https://github.com/micrometer-metrics/micrometer/releases/tag/v1.16.0.

Signed-off-by: Jannik Brand <jannik.brand@sap.com>
@opensearch-trigger-bot opensearch-trigger-bot Bot mentioned this pull request May 4, 2026
Merged
dlvenable pushed a commit that referenced this pull request May 5, 2026
@opensearch-trigger-bot @JannikBrand
Update Armeria to 1.32.6 (#6343) (#6820)
39e5d68 
This Armeria patch version was requested explicitly:
line/armeria#6733

Fixes #6271 since the current Ameria version is affected by a couple
of bugs (see comment #6271 (comment)).

Furthermore, replace io.micrometer.core.lang annotation which is going
to be deprecated in Micrometer 1.16.0 - see release notes:
https://github.com/micrometer-metrics/micrometer/releases/tag/v1.16.0.


(cherry picked from commit cbba661)

Signed-off-by: Jannik Brand <jannik.brand@sap.com>
Co-authored-by: Jannik Brand <jannik.brand@sap.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dlvenable dlvenable dlvenable approved these changes

@KarstenSchnitter KarstenSchnitter KarstenSchnitter approved these changes

@sb2k16 sb2k16 Awaiting requested review from sb2k16 sb2k16 is a code owner

@engechas engechas Awaiting requested review from engechas

@san81 san81 Awaiting requested review from san81 san81 is a code owner

@srikanthjg srikanthjg Awaiting requested review from srikanthjg srikanthjg is a code owner

@graytaylor0 graytaylor0 Awaiting requested review from graytaylor0 graytaylor0 is a code owner

@dinujoh dinujoh Awaiting requested review from dinujoh dinujoh is a code owner

@kkondaka kkondaka Awaiting requested review from kkondaka kkondaka is a code owner

@oeyh oeyh Awaiting requested review from oeyh oeyh is a code owner

Assignees

No one assigned

Labels

backport 2.15

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[BUG] RST_STREAM non retryable error with version 2.12.2

3 participants

@JannikBrand @dlvenable @KarstenSchnitter