Skip to content
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

Jump to bottom

ALPN H2 Support for Netty Client #5794

Merged
merged 24 commits into from
Jan 22, 2025
Merged

ALPN H2 Support for Netty Client #5794

merged 24 commits into from
Jan 22, 2025

Conversation

davidh44
Copy link
Contributor

Motivation and Context

Adds ALPN H2 support to Netty client. ALPN is required when using an ALB in order to negotiate H2 connection.
This can be enabled when using Netty client with h2 protocol.

ALPN support was backported to Java 8 , only works with 1.8.0_251 and newer

Modifications

Introduces new ProtocolNegotiation enum class:
ASSUME_PROTOCOL - Default existing setting, client uses prior knowledge
ALPN- Uses ALPN, without fallback. Only works with h2, throws error if set with Protocol.HTTP1_1

Testing

Added unit and integ tests

Screenshots (if appropriate)

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)

@davidh44 davidh44 requested a review from a team as a code owner January 14, 2025 21:02
zoewangg
zoewangg reviewed Jan 14, 2025
View reviewed changes
.changes/next-release/feature-AWSSDKforJavav2-abb9c7e.json Outdated Show resolved Hide resolved
...main/java/software/amazon/awssdk/codegen/model/config/customization/CustomizationConfig.java Outdated Show resolved Hide resolved
...ients/aws-crt-client/src/main/java/software/amazon/awssdk/http/crt/AwsCrtHttpClientBase.java Outdated Show resolved Hide resolved
...-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClient.java Outdated Show resolved Hide resolved
...src/main/java/software/amazon/awssdk/http/nio/netty/internal/ChannelPipelineInitializer.java Outdated Show resolved Hide resolved
...src/main/java/software/amazon/awssdk/http/nio/netty/internal/ChannelPipelineInitializer.java Outdated Show resolved Hide resolved
...src/main/java/software/amazon/awssdk/http/nio/netty/internal/ChannelPipelineInitializer.java Outdated Show resolved Hide resolved
...-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/SslContextProvider.java Outdated Show resolved Hide resolved
...io-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/NettyUtils.java Outdated Show resolved Hide resolved
@davidh44 davidh44 added this pull request to the merge queue Jan 22, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 22, 2025
zoewangg
zoewangg reviewed Jan 22, 2025
View reviewed changes
...io-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/NettyUtils.java Outdated Show resolved Hide resolved
...io-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/NettyUtils.java Outdated Show resolved Hide resolved
...io-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/NettyUtils.java Show resolved Hide resolved
...io-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/utils/NettyUtils.java Show resolved Hide resolved
...-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClient.java Outdated Show resolved Hide resolved
...src/main/java/software/amazon/awssdk/http/nio/netty/internal/ChannelPipelineInitializer.java Outdated Show resolved Hide resolved
...src/main/java/software/amazon/awssdk/http/nio/netty/internal/ChannelPipelineInitializer.java Show resolved Hide resolved
...-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClient.java Outdated Show resolved Hide resolved
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Failed Quality Gate failed

Failed conditions
70.1% Coverage on New Code (required ≥ 80%)

See analysis details on SonarQube Cloud

@davidh44 davidh44 enabled auto-merge January 22, 2025 19:29
@davidh44 davidh44 added this pull request to the merge queue Jan 22, 2025
Merged via the queue into master with commit 62be0c1 Jan 22, 2025
16 of 17 checks passed
@davidh44 davidh44 mentioned this pull request Feb 3, 2025
Merged
2 tasks
ghetelgb pushed a commit to ghetelgb/aws-sdk-java-v2 that referenced this pull request Feb 7, 2025
@davidh44 @ghetelgb
ALPN H2 Support for Netty Client (aws#5794)
cd4e9dc 
* ALPN H2 support in Netty client

* Add codegen customizations to skip ALPN for existing H2 services

* Add changelog

* Add benchmarks

* Add tests

* Update test

* Update test

* Address comments

* Update test file name

* Revert to checking Java version for ALPN support

* Update Kinesis integ tests

* Propagate exception and close channel

* Add tests and update ALPN support check for OpenSsl

* Set max streams when completing protocol future

* Add test dependencies

* Do not use FATAL_ALERT if OpenSSL is used

* Remove completing future in ALPN handler

* Remove import

* Update ALPN support check to check for getApplicationProtocol method in SSLEngine

* Address comments

* Use Lazy for alpn support check
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dagnir dagnir dagnir approved these changes

@zoewangg zoewangg zoewangg approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@davidh44 @dagnir @zoewangg