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.

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

GRPC dependencies updates #3075

Merged
merged 4 commits into from
May 24, 2023
Merged

GRPC dependencies updates #3075

merged 4 commits into from
May 24, 2023

Conversation

olegbespalov
Copy link
Contributor

What?

This PR brings updates of the dependencies with the fixes (see commits breakdown):

  • the first fix is to frizes the grpc testing proto as the k6 package, which removes the hard coupling to the dependency version and unlocks updating of the dependencies
  • second fix is also around the logic in tests that could cause the issue with newer versions of the github.com/jhump/protoreflect

Why?

Closes: #3069

@github-actions github-actions bot requested review from imiric and mstoykov May 17, 2023 12:55
@codecov-commenter
Copy link

codecov-commenter commented May 17, 2023

Codecov Report

Merging #3075 (2915d17) into master (bc11542) will decrease coverage by 1.45%.
The diff coverage is n/a.

❗ Current head 2915d17 differs from pull request most recent head 0573269. Consider uploading reports for the commit 0573269 to get more accurate results

@@            Coverage Diff             @@
##           master    #3075      +/-   ##
==========================================
- Coverage   76.76%   75.31%   -1.45%     
==========================================
  Files         230      232       +2     
  Lines       17179    17592     +413     
==========================================
+ Hits        13187    13249      +62     
- Misses       3145     3491     +346     
- Partials      847      852       +5     
Flag Coverage Δ
ubuntu 75.31% <ø> (-1.45%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
lib/testutils/httpmultibin/grpc_testing/test.pb.go 16.44% <ø> (ø)
...estutils/httpmultibin/grpc_testing/test_grpc.pb.go 6.42% <ø> (ø)
lib/testutils/httpmultibin/httpmultibin.go 92.64% <ø> (ø)

... and 2 files with indirect coverage changes

Copy link
Contributor

@mstoykov mstoykov left a comment

Choose a reason for hiding this comment

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

LGTM! although I feel like we now have 3 different packages with protosets and am not certain if we should have 3 different ones 🤷

Comment on lines +266 to +271
// a small hack to make sure we are parsing the right file
// otherwise the parser will try to parse "google/protobuf/descriptor.proto"
// with exactly the same name as the one we are trying to parse for testing
if filename != path {
return nil, nil
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is it trying to load a different file?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's coming from the library update bufbuild/protocompile@7c5114e

@mstoykov mstoykov added this to the v0.45.0 milestone May 18, 2023
Copy link
Contributor

@imiric imiric left a comment

Choose a reason for hiding this comment

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

I didn't go through the vendored changes, but the ones in our repo look good. 👍 Besides that hack that Mihail mentioned, which is not very clear.

Do you know what happened to the test.proto file after it was deleted in grpc/grpc-go#6164? Is it now embedded in the generated pb.go files? I couldn't figure out from the PR how they're testing with the new package.

It sucks that we now have to maintain grpc_testing ourselves, but it's better to have control over it, and we're forced to anyway :-/

@olegbespalov
Copy link
Contributor Author

Do you know what happened to the test.proto file after it was deleted in grpc/grpc-go#6164? Is it now embedded in the generated pb.go files? I couldn't figure out from the PR how they're testing with the new package.

Well, yeah, it seems like the source proto file was just deleted, we could maybe check with authors (or maybe just open the PR to them)

https://github.com/grpc/grpc-go/blob/master/interop/grpc_testing/test.pb.go#L22

@olegbespalov olegbespalov merged commit add1a5f into master May 24, 2023
@olegbespalov olegbespalov deleted the chore/grpc-dep-updates branch May 24, 2023 05:48
@olegbespalov olegbespalov added the dependencies Pull requests that update a dependency file label May 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update grpc lib to 1.55.0+
4 participants