chore(deps): update grpc and protobuf #11421

coryan · 2023-04-28T00:11:39Z

We need to update both of these at the same time. I merged the "Renovate Bot" PRs manually.

update grpc to v1.55.0-pre1
update protobuf to v23

This change is

codecov · 2023-05-01T14:25:49Z

Codecov Report

Patch coverage: 100.00% and project coverage change: -10.82 ⚠️

Comparison is base (d84ef9b) 93.75% compared to head (8aed86c) 82.94%.

Additional details and impacted files

@@             Coverage Diff             @@
##             main   #11421       +/-   ##
===========================================
- Coverage   93.75%   82.94%   -10.82%     
===========================================
  Files        1791     1791               
  Lines      161697   161559      -138     
===========================================
- Hits       151600   134004    -17596     
- Misses      10097    27555    +17458

Impacted Files	Coverage Δ
...v1/internal/golden_kitchen_sink_option_defaults.cc	`100.00% <100.00%> (ø)`
...en/v1/internal/golden_rest_only_option_defaults.cc	`100.00% <100.00%> (ø)`
.../v1/internal/golden_thing_admin_option_defaults.cc	`100.00% <100.00%> (ø)`

... and 262 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

We need to update both gRPC and Protobuf at the same time. gRPC >= 1.55.0 only compiles with Protobuf >= 23.1. gRPC < 1.55.0 only compiles with Protobuf < 23.0.

devbww · 2023-05-19T17:30:29Z

bazel/google_cloud_cpp_deps.bzl

-            "https://storage.googleapis.com/cloud-cpp-community-archive/com_google_protobuf/v21.12.tar.gz",
-            "https://github.com/protocolbuffers/protobuf/archive/v21.12.tar.gz",
+            "https://storage.googleapis.com/cloud-cpp-community-archive/com_google_protobuf/v23.1.tar.gz",
+            "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v23.1.tar.gz",


Should we drop the "refs/tags/" (et seq)?

Done. FWIW, I think it makes no difference. Both redirect to the same URL.

devbww · 2023-05-19T17:32:21Z

generator/integration_tests/golden/v1/internal/golden_kitchen_sink_option_defaults.cc

@@ -36,7 +36,7 @@ Options GoldenKitchenSinkDefaultOptions(Options options) {
  options = google::cloud::internal::PopulateCommonOptions(
      std::move(options), "GOLDEN_KITCHEN_SINK_ENDPOINT",
      "GOLDEN_KITCHEN_SINK_EMULATOR_HOST", "GOLDEN_KITCHEN_SINK_AUTHORITY",
-      "goldenkitchensink.googleapis.com");
+"goldenkitchensink.googleapis.com");


Q. Did the generator change in the meantime (x3)?

Not the generator: the Protobuf helpers that the generator depends on emit different output in this case.

OK, although I'm not sure I understand that given ...

google-cloud-cpp/generator/internal/option_defaults_generator.cc

Lines 128 to 144 in 721a63a

CcPrint(R"""(

options = google::cloud::internal::PopulateCommonOptions(

std::move(options), "$service_endpoint_env_var$",

"$emulator_endpoint_env_var$", "$service_authority_env_var$",

)""");

switch (endpoint_location_style) {

case ServiceConfiguration::LOCATION_DEPENDENT:

CcPrint(R"""(absl::StrCat(location, "-", "$service_endpoint$"))""");

break;

case ServiceConfiguration::LOCATION_DEPENDENT_COMPAT:

CcPrint(R"""(absl::StrCat(location, )"""

R"""(location.empty() ? "" : "-", "$service_endpoint$"))""");

break;

default:

CcPrint(R"""("$service_endpoint$")""");

break;

}

But I'll look later.

I am not sure I understand either. I just don't think it matters. These golden files will always be subject to changes in the Protobuf Printer class behavior. Fortunately we clang-format the generated libraries.

FWIW, the class in question when through a number of changes:

https://github.com/protocolbuffers/protobuf/blob/21.x/src/google/protobuf/io/printer.cc

https://github.com/protocolbuffers/protobuf/blob/23.x/src/google/protobuf/io/printer.cc

and continues to change at head:

https://github.com/protocolbuffers/protobuf/blame/main/src/google/protobuf/io/printer.cc

devbww · 2023-05-19T18:23:47Z

PS: A (probably unnecessary) reminder to update the "-pre1" part of the commit message.

This was referenced Apr 28, 2023

chore(deps): update grpc to v1.55.0-pre1 #11392

Closed

chore(deps): update protobuf to v23 (major) #11386

Closed

coryan force-pushed the chore-deps-update-protobuf-and-grpc branch from a6bb066 to 0b3a661 Compare April 29, 2023 19:22

coryan marked this pull request as ready for review April 30, 2023 02:01

coryan requested a review from a team as a code owner April 30, 2023 02:01

coryan marked this pull request as draft April 30, 2023 15:47

coryan force-pushed the chore-deps-update-protobuf-and-grpc branch 2 times, most recently from a1e21ad to fd2e8fc Compare May 1, 2023 12:56

coryan added the do not merge Indicates a pull request not ready for merge, due to either quality or timing. label May 1, 2023

coryan force-pushed the chore-deps-update-protobuf-and-grpc branch 6 times, most recently from 9f73fcb to 8ceee02 Compare May 8, 2023 13:47

coryan force-pushed the chore-deps-update-protobuf-and-grpc branch from 8ceee02 to c882ab2 Compare May 10, 2023 21:34

coryan mentioned this pull request May 10, 2023

chore(deps): update grpc to v1.55.0-pre2 #11561

Closed

1 task

coryan force-pushed the chore-deps-update-protobuf-and-grpc branch 2 times, most recently from e8d770d to a2c302f Compare May 12, 2023 16:50

coryan mentioned this pull request May 19, 2023

chore(deps): update grpc to v1.55.0 #11657

Closed

1 task

renovate-bot and others added 3 commits May 19, 2023 13:27

chore(deps): update gRPC and protobuf

904887e

We need to update both gRPC and Protobuf at the same time. gRPC >= 1.55.0 only compiles with Protobuf >= 23.1. gRPC < 1.55.0 only compiles with Protobuf < 23.0.

Update golden files with new protobuf output

4721227

Update ABI baselines

dbe3d0f

coryan force-pushed the chore-deps-update-protobuf-and-grpc branch from a2c302f to dbe3d0f Compare May 19, 2023 13:43

coryan removed the do not merge Indicates a pull request not ready for merge, due to either quality or timing. label May 19, 2023

coryan marked this pull request as ready for review May 19, 2023 16:37

devbww reviewed May 19, 2023

View reviewed changes

Address review comments

8aed86c

devbww approved these changes May 19, 2023

View reviewed changes

coryan enabled auto-merge (squash) May 19, 2023 18:34

coryan disabled auto-merge May 19, 2023 18:35

coryan enabled auto-merge (squash) May 19, 2023 18:37

coryan disabled auto-merge May 19, 2023 19:16

coryan enabled auto-merge (squash) May 19, 2023 20:10

coryan merged commit 5b5317d into googleapis:main May 19, 2023

coryan deleted the chore-deps-update-protobuf-and-grpc branch May 19, 2023 20:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore(deps): update grpc and protobuf #11421

chore(deps): update grpc and protobuf #11421

coryan commented Apr 28, 2023 •

edited

Loading

codecov bot commented May 1, 2023 •

edited

Loading

devbww May 19, 2023

coryan May 19, 2023

devbww May 19, 2023

coryan May 19, 2023 •

edited

Loading

devbww May 19, 2023

coryan May 19, 2023

devbww commented May 19, 2023

	CcPrint(R"""(
	options = google::cloud::internal::PopulateCommonOptions(
	std::move(options), "$service_endpoint_env_var$",
	"$emulator_endpoint_env_var$", "$service_authority_env_var$",
	)""");
	switch (endpoint_location_style) {
	case ServiceConfiguration::LOCATION_DEPENDENT:
	CcPrint(R"""(absl::StrCat(location, "-", "$service_endpoint$"))""");
	break;
	case ServiceConfiguration::LOCATION_DEPENDENT_COMPAT:
	CcPrint(R"""(absl::StrCat(location, )"""
	R"""(location.empty() ? "" : "-", "$service_endpoint$"))""");
	break;
	default:
	CcPrint(R"""("$service_endpoint$")""");
	break;
	}

chore(deps): update grpc and protobuf #11421

chore(deps): update grpc and protobuf #11421

Conversation

coryan commented Apr 28, 2023 • edited Loading

codecov bot commented May 1, 2023 • edited Loading

Codecov Report

devbww May 19, 2023

Choose a reason for hiding this comment

coryan May 19, 2023

Choose a reason for hiding this comment

devbww May 19, 2023

Choose a reason for hiding this comment

coryan May 19, 2023 • edited Loading

Choose a reason for hiding this comment

devbww May 19, 2023

Choose a reason for hiding this comment

coryan May 19, 2023

Choose a reason for hiding this comment

devbww commented May 19, 2023

coryan commented Apr 28, 2023 •

edited

Loading

codecov bot commented May 1, 2023 •

edited

Loading

coryan May 19, 2023 •

edited

Loading