The very non-trivial upgrade of third_party/protobuf to 22.x
This PR strives to be as small as possible and many changes that were
compatible with protobuf 21.x and didn't have to be merged atomically
with the upgrade were already merged.
Due to the complexity of the upgrade, this PR wasn't created
automatically by a tool, but manually. Subsequent upgraded of
third_party/protobuf with our OSS release script should work again once
this change is merged.
This is best reviewed commit-by-commit, I tried to group changes in
logical areas.
Notable changes:
- the upgrade of third_party/protobuf submodule, the bazel protobuf
dependency itself
- upgrade of UPB dependency to 22.x (in the past, we used to always
upgrade upb to "main", but upb now has release branch as well). UPB
needs to be upgraded atomically with protobuf since there's a de-facto
circular dependency (new protobuf depends on new upb, which depends on
new protobuf for codegen).
- some protobuf and upb bazel rules are now aliases, so `
extract_metadata_from_bazel_xml.py` and `gen_upb_api_from_bazel_xml.py`
had to be modified to be able to follow aliases and reach the actual
aliased targets.
- some protobuf public headers were renamed, so especially
`src/compiler` needed to be updated to use the new headers.
- protobuf and upb now both depend on utf8_range project, so since we
bundle upb with grpc in some languages, we now have to bundle utf8_range
as well (hence changes in build for python, PHP, objC, cmake etc).
- protoc now depends on absl and utf8_range (previously protobuf had
absl dependency, but not for the codegen part), so python's
make_grpcio_tools.py required partial rewrite to be able to handle those
dependencies in the grpcio_tools build.
- many updates and fixes required for C++ distribtests (currently they
all pass, but we'll probably need to follow up, make protobuf's and
grpc's handling of dependencies more aligned and revisit the
distribtests)
- bunch of other changes mostly due to overhaul of protobuf's and upb's
internal build layout.
TODOs:
- [DONE] make sure IWYU and clang_tidy_code pass
- create a list of followups (e.g. work to reenable the few tests I had
to disable and to remove workaround I had to use)
- [DONE in cl/523706129] figure out problem(s) with internal import
---------
Co-authored-by: Craig Tiller <ctiller@google.com>
This directory used to contain the original C# implementation of gRPC based on the native gRPC Core library
(i.e. Grpc.Core nuget package). This implementation is currently in maintenance mode and its source code
has been moved (see below for details). Also, we plan to deprecate the implementation in the future
(see blogpost).
The source code that used to reside here has been moved as following:
The Grpc, Grpc.Core, Grpc.Core.Testing, Grpc.Core.NativeDebug and Grpc.Core.Xamarin packages will continue to live in maintenance mode on the v1.46.x branch, where they will get the necessary critical/security patches as needed and will be released from there (as usual for gRPC patch releases). All future releases of these packages will have their major/minor version fixed at 2.46 and only their patch version will be incremented (2.46.0,2.46.1, ...)
The Grpc.Core.Api, Grpc.Auth, Grpc.HealthCheck and Grpc.Reflection packages will be moved to the grpc-dotnet repository where their development will continue (note that all these packages are implementation-agnostic, and they are also used by grpc-dotnet, so it makes sense to move them there). Future releases of these packages (v2.47.x, v2.48.x, ...) will be released as part of the grpc-dotnet release.
The package Grpc.Tools (which provides the protobuf/grpc codegen build integration) will for now stay on the master branch of grpc/grpc (i.e. in this directory). From there it will continue to be released along with other gRPC languages that live in the grpc/grpc repository. The eventual goal is to also move Grpc.Tools to elsewhere (probably the grpc-dotnet repository), but more work is needed there (e.g. we need to figure out some technical and test-infrastructure related issues first).
Jan Tattermusch
0f1afec5a8
