Skip to content

Commit

Permalink
*: upgrade grpc (#48057)
Browse files Browse the repository at this point in the history 
close #48060
  • Loading branch information
@hawkingrei
hawkingrei authored Oct 30, 2023
1 parent 528932c commit f135464
Show file tree
Hide file tree
Showing 7 changed files with 1,146 additions and 1,303 deletions.
2,120 changes: 1,008 additions & 1,112 deletions DEPS.bzl
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions br/pkg/streamhelper/integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ func runEtcd(t *testing.T) (*embed.Etcd, *clientv3.Client) {
cfg := embed.NewConfig()
cfg.Dir = t.TempDir()
clientURL := getRandomLocalAddr()
cfg.LCUrls = []url.URL{clientURL}
cfg.LPUrls = []url.URL{getRandomLocalAddr()}
cfg.ListenClientUrls = []url.URL{clientURL}
cfg.ListenPeerUrls = []url.URL{getRandomLocalAddr()}
cfg.LogLevel = "fatal"
etcd, err := embed.StartEtcd(cfg)
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions build/patches/com_github_grpc_ecosystem_grpc_gateway.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ index c4d18f624..41d5319fb 100644
- "@io_bazel_rules_go//proto/wkt:field_mask_go_proto",
- "@io_bazel_rules_go//proto/wkt:timestamp_go_proto",
- "@io_bazel_rules_go//proto/wkt:wrappers_go_proto",
+ "@com_github_golang_protobuf//protoc-gen-go/descriptor:go_default_library",
+ "@com_github_golang_protobuf//protoc-gen-go/descriptor:go_default_library",
+ "@com_github_golang_protobuf//ptypes:go_default_library",
+ "@com_github_golang_protobuf//ptypes/any: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",
+ "@org_golang_google_genproto//googleapis/api/httpbody:go_default_library",
+ "@org_golang_google_genproto_googleapis_api//httpbody",
+ "@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
72 changes: 36 additions & 36 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ require (
github.com/cockroachdb/errors v1.8.1
github.com/cockroachdb/pebble v0.0.0-20220415182917-06c9d3be25b3
github.com/coocood/freecache v1.2.1
github.com/coreos/go-semver v0.3.0
github.com/coreos/go-semver v0.3.1
github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548
github.com/daixiang0/gci v0.11.0
github.com/danjacques/gofslock v0.0.0-20191023191349-0a45f885bc37
Expand All @@ -53,7 +53,7 @@ require (
github.com/google/btree v1.1.2
github.com/google/pprof v0.0.0-20211122183932-1daafda22083
github.com/google/skylark v0.0.0-20181101142754-a5f7082aabed
github.com/google/uuid v1.3.0
github.com/google/uuid v1.3.1
github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601
github.com/gorilla/mux v1.8.0
github.com/gostaticanalysis/forcetypeassert v0.1.0
Expand Down Expand Up @@ -103,7 +103,7 @@ require (
github.com/stretchr/testify v1.8.4
github.com/tdakkota/asciicheck v0.2.0
github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2
github.com/tikv/client-go/v2 v2.0.8-0.20231025022411-cad314220659
github.com/tikv/client-go/v2 v2.0.8-0.20231030021533-3520f13fc074
github.com/tikv/pd/client v0.0.0-20230912103610-2f57a9f050eb
github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966
github.com/twmb/murmur3 v1.1.6
Expand All @@ -112,11 +112,11 @@ require (
github.com/wangjohn/quickselect v0.0.0-20161129230411-ed8402a42d5f
github.com/xitongsys/parquet-go v1.5.5-0.20201110004701-b09c49d6d457
github.com/xitongsys/parquet-go-source v0.0.0-20200817004010-026bad9b25d0
go.etcd.io/etcd/api/v3 v3.5.2
go.etcd.io/etcd/client/pkg/v3 v3.5.2
go.etcd.io/etcd/client/v3 v3.5.2
go.etcd.io/etcd/server/v3 v3.5.2
go.etcd.io/etcd/tests/v3 v3.5.2
go.etcd.io/etcd/api/v3 v3.5.10
go.etcd.io/etcd/client/pkg/v3 v3.5.10
go.etcd.io/etcd/client/v3 v3.5.10
go.etcd.io/etcd/server/v3 v3.5.10
go.etcd.io/etcd/tests/v3 v3.5.10
go.opencensus.io v0.24.0
go.uber.org/atomic v1.11.0
go.uber.org/automaxprocs v1.5.3
Expand All @@ -126,15 +126,15 @@ require (
go.uber.org/zap v1.26.0
golang.org/x/exp v0.0.0-20230711005742-c3f37128e5a4
golang.org/x/net v0.17.0
golang.org/x/oauth2 v0.8.0
golang.org/x/oauth2 v0.11.0
golang.org/x/sync v0.3.0
golang.org/x/sys v0.13.0
golang.org/x/term v0.13.0
golang.org/x/text v0.13.0
golang.org/x/time v0.3.0
golang.org/x/tools v0.10.0
google.golang.org/api v0.114.0
google.golang.org/grpc v1.54.0
google.golang.org/api v0.128.0
google.golang.org/grpc v1.59.0
gopkg.in/yaml.v2 v2.4.0
honnef.co/go/tools v0.4.5
k8s.io/api v0.27.2
Expand All @@ -143,20 +143,27 @@ require (
)

require (
github.com/cenkalti/backoff/v4 v4.1.1 // indirect
github.com/dolthub/maphash v0.1.0 // indirect
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
github.com/google/s2a-go v0.1.4 // indirect
github.com/jfcg/sixb v1.3.8 // indirect
github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 // indirect
github.com/segmentio/asm v1.2.0 // indirect
github.com/shabbyrobe/gocovmerge v0.0.0-20190829150210-3e036491d500 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.1 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.0.1 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
)

require (
cloud.google.com/go v0.110.0 // indirect
cloud.google.com/go/compute v1.19.0 // indirect
cloud.google.com/go v0.110.8 // indirect
cloud.google.com/go/compute v1.23.1 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v0.13.0 // indirect
cloud.google.com/go/pubsub v1.30.0 // indirect
cloud.google.com/go/iam v1.1.3 // indirect
cloud.google.com/go/pubsub v1.33.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v0.5.1 // indirect
Expand All @@ -179,7 +186,7 @@ require (
github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 // indirect
github.com/coocood/bbloom v0.0.0-20190830030839-58deb6228d64 // indirect
github.com/coocood/rtutil v0.0.0-20190304133409-c84515f646f2 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
Expand All @@ -188,22 +195,20 @@ require (
github.com/eapache/queue v1.1.0 // indirect
github.com/fatih/structtag v1.2.0
github.com/felixge/httpsnoop v1.0.2 // indirect
github.com/form3tech-oss/jwt-go v3.2.5+incompatible // indirect
github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
github.com/go-kit/kit v0.9.0 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/golang-jwt/jwt v3.2.1+incompatible // indirect
github.com/golang/glog v1.1.0 // indirect
github.com/golang/glog v1.1.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/licensecheck v0.3.1 // indirect
github.com/google/renameio/v2 v2.0.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
github.com/googleapis/gax-go/v2 v2.7.1 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
github.com/gorilla/handlers v1.5.1 // indirect
github.com/gorilla/websocket v1.4.2 // indirect
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
Expand Down Expand Up @@ -274,27 +279,22 @@ require (
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
github.com/yusufpapurcu/wmi v1.2.3 // indirect
go.etcd.io/bbolt v1.3.6 // indirect
go.etcd.io/etcd/client/v2 v2.305.2 // indirect
go.etcd.io/etcd/pkg/v3 v3.5.2 // indirect
go.etcd.io/etcd/raft/v3 v3.5.2 // indirect
go.opentelemetry.io/contrib v0.20.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
go.opentelemetry.io/otel v0.20.0 // indirect
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
go.opentelemetry.io/otel/metric v0.20.0 // indirect
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
go.opentelemetry.io/otel/trace v0.20.0 // indirect
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
go.etcd.io/bbolt v1.3.8 // indirect
go.etcd.io/etcd/client/v2 v2.305.10 // indirect
go.etcd.io/etcd/pkg/v3 v3.5.10 // indirect
go.etcd.io/etcd/raft/v3 v3.5.10 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0 // indirect
go.opentelemetry.io/otel v1.0.1 // indirect
go.opentelemetry.io/otel/sdk v1.0.1 // indirect
go.opentelemetry.io/otel/trace v1.0.1 // indirect
go.opentelemetry.io/proto/otlp v0.9.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/exp/typeparams v0.0.0-20230224173230-c95f2b4c22f2 // indirect
golang.org/x/mod v0.11.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
gonum.org/v1/gonum v0.8.2 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
Expand Down
Loading

0 comments on commit f135464

Please sign in to comment.