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

DEPS: upgrade grpc to v1.68.0 #136278

Draft
wants to merge 15 commits into
base: master
Choose a base branch
from
Draft

DEPS: upgrade grpc to v1.68.0 #136278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
04598f2
rpc: add BenchmarkGRPCPing
tbg Nov 29, 2024
4e53233
rpc: improve BenchmarkGRPCPing
tbg Dec 2, 2024
11aed7d
*: silence deprecation warnings
tbg Nov 27, 2024
971f138
go.mod: upgrade gRPC to v.1.68.0
tbg Nov 12, 2024
2febd08
BUILD.bazel: different package path for annotations pkg
tbg Nov 12, 2024
9d4d62b
also replace annotation refs in patch files
tbg Nov 12, 2024
e3b137c
go.mod: go get google.golang.org/genproto@v0.0.0-20230526161137-0005a…
tbg Nov 12, 2024
91eaa33
build: update patches to be consistent with new version of pkgs
rickystewart Nov 26, 2024
003514d
go mod tidy
tbg Nov 27, 2024
e819993
DEPS: switch to grpc fork at v1.68.0-noalpncheck
tbg Nov 28, 2024
8030eb3
go.mod: add comments about `replace`d deps
tbg Nov 28, 2024
e122511
go.mod: explain gRPC replace directive
tbg Nov 28, 2024
61086c9
go.mod: remove replace directive for unused dep
tbg Nov 28, 2024
30c2d90
rpc: adopt io.Reader in snappyCompressor.DecompressedSize
tbg Nov 29, 2024
1301656
DEPS: bump grpc to pick up Decompressor patch
tbg Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ exports_files([
# gazelle:resolve proto proto gogoproto/gogo.proto @com_github_gogo_protobuf//gogoproto:gogo_proto
# gazelle:resolve proto go gogoproto/gogo.proto @com_github_gogo_protobuf//gogoproto
# gazelle:resolve proto proto google/api/annotations.proto @go_googleapis//google/api:annotations_proto
# gazelle:resolve proto go google/api/annotations.proto @org_golang_google_genproto//googleapis/api/annotations:go_default_library
# gazelle:resolve proto go google/api/annotations.proto @org_golang_google_genproto_googleapis_api//annotations:go_default_library
# gazelle:resolve proto io/prometheus/client/metrics.proto @com_github_prometheus_client_model//io/prometheus/client:io_prometheus_client_proto
# gazelle:resolve proto go io/prometheus/client/metrics.proto @com_github_prometheus_client_model//go
# gazelle:resolve go github.com/prometheus/client_model/go @com_github_prometheus_client_model//go
Expand Down
204 changes: 107 additions & 97 deletions DEPS.bzl
View file
Open in desktop

Large diffs are not rendered by default.

47 changes: 24 additions & 23 deletions build/bazelutil/distdir_files.bzl
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions build/patches/com_github_buchgr_bazel_remote.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ diff -urN a/genproto/build/bazel/remote/asset/v1/BUILD.bazel b/genproto/build/ba
- "@go_googleapis//google/rpc:status_go_proto",
- "@io_bazel_rules_go//proto/wkt:duration_go_proto",
- "@io_bazel_rules_go//proto/wkt:timestamp_go_proto",
+ "@org_golang_google_genproto//googleapis/api/annotations:go_default_library",
+ "@org_golang_google_genproto//googleapis/rpc/status:go_default_library",
+ "@org_golang_google_genproto_googleapis_api//annotations:go_default_library",
+ "@org_golang_google_genproto_googleapis_rpc//status:go_default_library",
+ "@com_github_golang_protobuf//ptypes/duration:go_default_library",
+ "@com_github_golang_protobuf//ptypes/timestamp:go_default_library",
"@org_golang_google_grpc//:go_default_library",
Expand All @@ -133,9 +133,9 @@ diff -urN a/genproto/build/bazel/remote/execution/v2/BUILD.bazel b/genproto/buil
- "@io_bazel_rules_go//proto/wkt:duration_go_proto",
- "@io_bazel_rules_go//proto/wkt:timestamp_go_proto",
- "@io_bazel_rules_go//proto/wkt:wrappers_go_proto",
+ "@org_golang_google_genproto//googleapis/api/annotations:go_default_library",
+ "@org_golang_google_genproto_googleapis_api//annotations:go_default_library",
+ "@org_golang_google_genproto//googleapis/longrunning:go_default_library",
+ "@org_golang_google_genproto//googleapis/rpc/status:go_default_library",
+ "@org_golang_google_genproto_googleapis_rpc//status:go_default_library",
+ "@com_github_golang_protobuf//ptypes/duration:go_default_library",
+ "@com_github_golang_protobuf//ptypes/timestamp:go_default_library",
+ "@com_github_golang_protobuf//ptypes/wrappers:go_default_library",
Expand All @@ -153,9 +153,9 @@ index f60cf80..ba707d3 100644
- "@go_googleapis//google/bytestream:bytestream_go_proto",
- "@go_googleapis//google/rpc:code_go_proto",
- "@go_googleapis//google/rpc:status_go_proto",
+ "@org_golang_google_genproto//googleapis/bytestream:go_default_library",
+ "@org_golang_google_genproto//googleapis/rpc/code:go_default_library",
+ "@org_golang_google_genproto//googleapis/rpc/status:go_default_library",
+ "@org_golang_google_genproto_googleapis_bytestream//:go_default_library",
+ "@org_golang_google_genproto_googleapis_rpc//code:go_default_library",
+ "@org_golang_google_genproto_googleapis_rpc//status:go_default_library",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//codes:go_default_library",
"@org_golang_google_grpc//encoding/gzip:go_default_library",
Expand All @@ -164,7 +164,7 @@ index f60cf80..ba707d3 100644
"@com_github_golang_protobuf//proto:go_default_library",
"@com_github_google_uuid//:go_default_library",
- "@go_googleapis//google/bytestream:bytestream_go_proto",
+ "@org_golang_google_genproto//googleapis/bytestream:go_default_library",
+ "@org_golang_google_genproto_googleapis_bytestream//:go_default_library",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//codes:go_default_library",
"@org_golang_google_grpc//status:go_default_library",
4 changes: 2 additions & 2 deletions build/patches/com_github_grpc_ecosystem_grpc_gateway.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ index 02aa7d2a8..fd922a156 100644
+ "@com_github_golang_protobuf//protoc-gen-go/descriptor:go_default_library",
"@io_bazel_rules_go//proto/wkt:compiler_plugin_go_proto",
- "@io_bazel_rules_go//proto/wkt:descriptor_go_proto",
+ "@org_golang_google_genproto//googleapis/api/annotations:go_default_library",
+ "@org_golang_google_genproto_googleapis_api//annotations:go_default_library",
],
)

Expand All @@ -65,7 +65,7 @@ index c4d18f624..41d5319fb 100644
+ "@com_github_golang_protobuf//ptypes/duration:go_default_library",
+ "@com_github_golang_protobuf//ptypes/timestamp:go_default_library",
+ "@com_github_golang_protobuf//ptypes/wrappers:go_default_library",
+ "@org_golang_google_genproto//googleapis/api/httpbody:go_default_library",
+ "@org_golang_google_genproto_googleapis_api//httpbody:go_default_library",
+ "@org_golang_google_genproto//protobuf/field_mask:go_default_library",
"@org_golang_google_grpc//codes:go_default_library",
"@org_golang_google_grpc//grpclog:go_default_library",
Expand Down
4 changes: 2 additions & 2 deletions build/patches/go_googleapis.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ diff -urN a/google/cloud/kms/v1/BUILD.bazel b/google/cloud/kms/v1/BUILD.bazel
+ "@com_github_golang_protobuf//ptypes/duration:go_default_library",
+ "@com_github_golang_protobuf//ptypes/timestamp:go_default_library",
+ "@com_github_golang_protobuf//ptypes/wrappers:go_default_library",
+ "@org_golang_google_genproto//googleapis/api/annotations:go_default_library",
+ "@org_golang_google_genproto_googleapis_api//annotations:go_default_library",
+ "@org_golang_google_genproto//protobuf/field_mask:go_default_library",
],
)
Expand All @@ -28,7 +28,7 @@ diff -urN a/google/devtools/build/v1/BUILD.bazel a/google/devtools/build/v1/BUIL
+ "@com_github_golang_protobuf//ptypes/empty:go_default_library",
+ "@com_github_golang_protobuf//ptypes/timestamp:go_default_library",
+ "@com_github_golang_protobuf//ptypes/wrappers:go_default_library",
+ "@org_golang_google_genproto//googleapis/api/annotations:go_default_library",
+ "@org_golang_google_genproto_googleapis_api//annotations:go_default_library",
+ "@org_golang_google_genproto//protobuf/field_mask:go_default_library",
],
)
50 changes: 34 additions & 16 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@ go 1.22.8
// merge of any upgrades we should communicate to all teams to be on the lookout
// for behavior changes, just like we would after a go upgrade.
require (
golang.org/x/crypto v0.26.0
golang.org/x/crypto v0.27.0
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a // indirect
golang.org/x/mod v0.20.0 // indirect
golang.org/x/net v0.28.0
golang.org/x/oauth2 v0.7.0
golang.org/x/net v0.29.0
golang.org/x/oauth2 v0.23.0
golang.org/x/sync v0.8.0
golang.org/x/sys v0.23.0
golang.org/x/sys v0.25.0
golang.org/x/text v0.19.0
// NOTE: `replace` directive in effect!
golang.org/x/time v0.3.0
golang.org/x/tools v0.24.0
)
Expand All @@ -29,6 +30,7 @@ require (
// reviewers.
require (
github.com/gogo/googleapis v1.4.1 // indirect
// NOTE: `replace` directive in effect!
github.com/gogo/protobuf v1.3.2
github.com/golang/geo v0.0.0-20200319012246-673a6f80352d
github.com/golang/mock v1.6.0
Expand All @@ -38,9 +40,10 @@ require (
github.com/google/pprof v0.0.0-20210827144239-02619b876842
github.com/google/uuid v1.6.0 // indirect
google.golang.org/api v0.114.0
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1
google.golang.org/grpc v1.56.3
google.golang.org/protobuf v1.35.1
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54
// NOTE: `replace` directive in effect.
google.golang.org/grpc v1.68.0
google.golang.org/protobuf v1.35.2
)

// If any of the following dependencies get updated as a side-effect
Expand Down Expand Up @@ -147,6 +150,7 @@ require (
github.com/dave/dst v0.24.0
github.com/davecgh/go-spew v1.1.1
github.com/docker/distribution v2.7.1+incompatible
// NOTE: `replace` directive in effect!
github.com/docker/docker v24.0.6+incompatible
github.com/docker/go-connections v0.4.0
github.com/dustin/go-humanize v1.0.0
Expand Down Expand Up @@ -206,6 +210,7 @@ require (
github.com/montanaflynn/stats v0.7.0
github.com/mozillazg/go-slugify v0.2.0
github.com/nightlyone/lockfile v1.0.0
// NOTE: `replace` directive in effect!
github.com/olekukonko/tablewriter v0.0.5-0.20200416053754-163badb3bac6
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799
github.com/otan/gopgkrb5 v1.0.3
Expand All @@ -228,7 +233,7 @@ require (
github.com/shirou/gopsutil/v3 v3.21.12
github.com/slack-go/slack v0.9.5
github.com/snowflakedb/gosnowflake v1.3.4
github.com/spf13/afero v1.9.2
github.com/spf13/afero v1.10.0
github.com/spf13/cobra v1.6.1
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.9.0
Expand All @@ -248,19 +253,21 @@ require (
go.opentelemetry.io/otel/trace v1.17.0
go.opentelemetry.io/proto/otlp v0.11.0
golang.org/x/perf v0.0.0-20230113213139-801c7ef9e5c5
golang.org/x/term v0.23.0
golang.org/x/term v0.24.0
golang.org/x/tools/go/vcs v0.1.0-deprecated
gonum.org/v1/gonum v0.15.1
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1
// NOTE: `replace` directive in effect!
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
honnef.co/go/tools v0.4.5
// NOTE: `replace` directive in effect!
vitess.io/vitess v0.0.0-00010101000000-000000000000
)

require (
cloud.google.com/go v0.110.0 // indirect
cloud.google.com/go/compute v1.19.1 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/compute/metadata v0.5.0 // indirect
cloud.google.com/go/iam v0.13.0 // indirect
cloud.google.com/go/longrunning v0.4.1 // indirect
git.sr.ht/~sbinet/gg v0.6.0 // indirect
Expand Down Expand Up @@ -304,7 +311,8 @@ require (
github.com/bits-and-blooms/bitset v1.4.0 // indirect
github.com/campoy/embedmd v1.0.0 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
// NOTE: `replace` directive in effect!
github.com/charmbracelet/bubbletea v0.23.1 // indirect
github.com/charmbracelet/lipgloss v0.6.0 // indirect
github.com/cockroachdb/swiss v0.0.0-20240612210725-f4de07ae6964 // indirect
Expand Down Expand Up @@ -445,6 +453,8 @@ require (
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
gonum.org/v1/plot v0.14.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto/googleapis/bytestream v0.0.0-20241118233622-e639e219e697 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
)

Expand All @@ -454,8 +464,8 @@ require (
github.com/containerd/console v1.0.3 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc // indirect
github.com/envoyproxy/protoc-gen-validate v0.10.1 // indirect
github.com/golang/glog v1.1.0 // indirect
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
github.com/golang/glog v1.2.2 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
github.com/mattn/go-zglob v0.0.3 // indirect
github.com/muesli/ansi v0.0.0-20211031195517-c9f0611b6c70 // indirect
Expand All @@ -473,8 +483,6 @@ replace github.com/charmbracelet/bubbletea => github.com/cockroachdb/bubbletea v

replace github.com/olekukonko/tablewriter => github.com/cockroachdb/tablewriter v0.0.5-0.20200105123400-bd15540e8847

replace github.com/abourget/teamcity => github.com/cockroachdb/teamcity v0.0.0-20180905144921-8ca25c33eb11

replace vitess.io/vitess => github.com/cockroachdb/vitess v0.0.0-20210218160543-54524729cc82

replace gopkg.in/yaml.v2 => github.com/cockroachdb/yaml v0.0.0-20210825132133-2d6955c8edbc
Expand All @@ -484,3 +492,13 @@ replace github.com/docker/docker => github.com/moby/moby v24.0.6+incompatible
replace golang.org/x/time => github.com/cockroachdb/x-time v0.3.1-0.20230525123634-71747adb5d5c

replace github.com/gogo/protobuf => github.com/cockroachdb/gogoproto v1.3.3-0.20241118145159-46874edb1b83

// We must use the noalpncheck version of grpc-go until the MinSupportedVersion
// also uses gRPC at v1.68.0 or above. Also, v1.68.0 lost an optimization that
// allowed the Decompressor (snappyDecompressor) in our case to announce how many
// bytes the decompressed data will occupy. This led to a blow-up in allocated bytes
// for workloads in which requests weigh in at less than 32KiB, which is common.
//
// See https://github.com/cockroachdb/cockroach/issues/136367 for `noalpncheck`.
// See https://github.com/cockroachdb/cockroach/pull/136278#issuecomment-2506494078 for `decompsize`.
replace google.golang.org/grpc v1.68.0 => github.com/cockroachdb/grpc-go v1.68.0-noalpncheck.0.20241129124825-5710e83f714e
Loading
Loading