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

Migrate to google.golang.org/protobuf #35659

Merged
merged 2 commits into from Oct 19, 2021
Merged

Conversation

howardjohn
Copy link
Member

@howardjohn howardjohn commented Oct 19, 2021

Fixes #31666

This pr was WAY bigger than I expected.

It mostly consists of:

  • Boilerplate replacing imports/function names
  • Fixing instances where we mixed golang/protobuf and gogo/protobuf, which are now entirely incompatible
  • jsonpb changed a bit, both in the call signature and now the output is not deterministic so where we care we need to use caution
  • In istioctl we had some hacks to allow unknown Any which required copying some internal code from proto library into our own
  • Bumping cncf/xds and cncf/udpa libraries which had some breakages with importing a newer library

Benchmarks show no difference in perf

@howardjohn howardjohn added the release-notes-none Indicates a PR that does not require release notes. label Oct 19, 2021
@istio-testing istio-testing added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Oct 19, 2021
@google-cla google-cla bot added the cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. label Oct 19, 2021
@howardjohn howardjohn added the do-not-merge/hold Block automatic merging of a PR. label Oct 19, 2021
@jacob-delgado
Copy link
Contributor

Is the plan to also change istio/api too? Should we wait until we branch for 1.12? Simple enough change so I'm thinking we should if possible.

@howardjohn
Copy link
Member Author

howardjohn commented Oct 19, 2021 via email

Copy link
Contributor

@douglas-reid douglas-reid left a comment

Choose a reason for hiding this comment

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

approving for files owned by e&t

@howardjohn
Copy link
Member Author

Blocked by golang/protobuf#1374

Copy link
Contributor

@lei-tang lei-tang left a comment

Choose a reason for hiding this comment

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

Approve for security related changes.

@howardjohn howardjohn removed the do-not-merge/hold Block automatic merging of a PR. label Oct 19, 2021
@istio-testing istio-testing merged commit c017654 into istio:master Oct 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. release-notes-none Indicates a PR that does not require release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Migrate to google.golang.org/protobuf
7 participants