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

Hyper 1 upgrade #749

Merged
merged 18 commits into from
Dec 18, 2023
Merged

Hyper 1 upgrade #749

merged 18 commits into from
Dec 18, 2023

Conversation

calavera
Copy link
Contributor

@calavera calavera commented Dec 8, 2023 •
edited
Loading

Issue #, if available:

fixes #737
fixes #738

Description of changes:

Hyper 1 has moved many things around, and unfortunately how to implement things now is not very clear.

  • Upgrade lambda_runtime
  • Upgrade lambda_http
  • Upgrade lambda-extension
  • Axum compatibility
  • Streaming

By submitting this pull request

  • I confirm that my contribution is made under the terms of the Apache 2.0 license.
  • I confirm that I've made a best effort attempt to update all relevant documentation.

@awslabs awslabs deleted a comment from github-actions bot Dec 8, 2023
@calavera calavera changed the title Hyper1 upgrade Hyper 1 upgrade Dec 8, 2023
@awslabs awslabs deleted a comment from github-actions bot Dec 8, 2023
simbleau and others added 15 commits December 9, 2023 02:41
@simbleau @calavera
chore: update hyper/http
989991d
@simbleau @calavera
chore: update hyper with legacy
b15b954
@calavera
Create new workspace dependencies.
fe50257 
This makes tracking versions across packages easier.

Signed-off-by: David Calavera <david.calavera@gmail.com>
@calavera
Bring helpers to work with Hyper 1.
8b45bb6 
Copy some of the utils that Axum created to support Hyper 1.

Signed-off-by: David Calavera <david.calavera@gmail.com>
@calavera
Upgrade lambda_runtime to Hyper 1.
8e689a5 
Signed-off-by: David Calavera <david.calavera@gmail.com>
@calavera
Upgrade lambda_http to Hyper 1.
c570005 
Signed-off-by: David Calavera <david.calavera@gmail.com>
@calavera
Update Axum examples to version 0.7.
0ff88cc 
Signed-off-by: David Calavera <david.calavera@gmail.com>
@calavera
Make extensions compile.
4f4ce11 
Switch to use hyper::service::service_fn definitions.
Implement new Hyper's polling loop for http connections.

Signed-off-by: David Calavera <david.calavera@gmail.com>
@calavera
Update tower-http to make cors example work.
776b2ba 
Signed-off-by: David Calavera <david.calavera@gmail.com>
@calavera
Update tower-http to make tower-trace example work.
dc3dfea 
Signed-off-by: David Calavera <david.calavera@gmail.com>
@calavera
Make less copies of extension services.
ba920fb 
Signed-off-by: David Calavera <david.calavera@gmail.com>
@calavera
Bring Body::channel implementation from Hyper
96d0348 
Given the lack of a public implementation anymore, we don't have other choice but copying Hyper's private implementation.

Signed-off-by: David Calavera <david.calavera@gmail.com>
@calavera
Organize more dependencies.
8e7519a 
Signed-off-by: David Calavera <david.calavera@gmail.com>
@calavera
Cleanup commented code.
0638255 
Signed-off-by: David Calavera <david.calavera@gmail.com>
@calavera
Cleanup unused dependencies.
6f1a457 
Signed-off-by: David Calavera <david.calavera@gmail.com>
@calavera calavera marked this pull request as ready for review December 9, 2023 21:56
@calavera calavera mentioned this pull request Dec 9, 2023
Closed
2 tasks
This was referenced Dec 9, 2023
Closed
Closed
@calavera
Introduce a module to group all streaming functionality.
0b803db 
This makes the streaming functionallity more concise.
It aliases other functionality to keep backwards compatibility.

Signed-off-by: David Calavera <david.calavera@gmail.com>
@calavera
Remove unnecesary loop.
4403f50 
Signed-off-by: David Calavera <david.calavera@gmail.com>
@calavera
Don't re-export lambda_runtime_api_client::body.
92f1da4 
Signed-off-by: David Calavera <david.calavera@gmail.com>
@kcking kcking mentioned this pull request Dec 14, 2023
Merged
@calavera calavera requested a review from bnusunny December 15, 2023 23:20
bnusunny
bnusunny requested changes Dec 17, 2023
View reviewed changes
lambda-http/src/streaming.rs Outdated
Comment on lines 83 to 90
loop {
match futures_util::ready!(self.as_mut().project().body.poll_frame(cx)?) {
Some(frame) => match frame.into_data() {
Ok(data) => return Poll::Ready(Some(Ok(data))),
Err(_frame) => {}
},
None => return Poll::Ready(None),
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Instead of using loop, the following should also work.

        return match futures_util::ready!(self.as_mut().project().body.poll_frame(cx)?) {
            Some(frame) => match frame.into_data() {
                Ok(data) => Poll::Ready(Some(Ok(data))),
                Err(_frame) => Poll::Ready(None)
            },
            None => Poll::Ready(None),
        }

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've updated the code with this suggestion, thanks!

@bnusunny
Copy link
Contributor

Since we pull in 'Body' into this project, we probably need to use it across this project. It is re-exported in both lambda-runtime and lambda-http.

@calavera
Copy link
Contributor Author

Since we pull in 'Body' into this project, we probably need to use it across this project. It is re-exported in both lambda-runtime and lambda-http.

I understand that it can create confusion, that's why I re-exported the new body as streaming::Body. Both types are different, and I don't think it'd be possible to re-use the new type. The new type is pretty much what hyper::Body use to be, while lambda_http::Body represents the raw bytes that APIGW and ALB can send and receive through Lambda events.

@calavera calavera requested a review from bnusunny December 17, 2023 20:19
@calavera calavera merged commit 07430f1 into main Dec 18, 2023
12 checks passed
@calavera calavera deleted the hyper1_upgrade branch December 18, 2023 16:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bnusunny bnusunny bnusunny 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.

Axum 7.x causes compilation errors. Upgrade to hyper/http 1.0
3 participants
@calavera @bnusunny @simbleau