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

Jump to bottom

Bump google.golang.org/grpc to v1.63.2 (2.x) #486

Merged
merged 1 commit into from
Apr 12, 2024
Merged

Bump google.golang.org/grpc to v1.63.2 (2.x) #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions src/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ require (
github.com/prometheus/prometheus v2.13.1+incompatible // pinned
github.com/shirou/gopsutil/v3 v3.24.3
golang.org/x/net v0.24.0
google.golang.org/grpc v1.62.1
google.golang.org/grpc v1.63.2
google.golang.org/protobuf v1.33.0
)

Expand All @@ -47,7 +47,6 @@ require (
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/pprof v0.0.0-20240402174815-29b9bb013b0f // indirect
Expand All @@ -71,7 +70,7 @@ require (
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.20.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240304212257-790db918fca8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240304212257-790db918fca8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
14 changes: 4 additions & 10 deletions src/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,6 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
Expand All @@ -207,7 +204,6 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
Expand Down Expand Up @@ -617,23 +613,21 @@ google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610/go.mod h1:DMBHOl98
google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
google.golang.org/genproto/googleapis/api v0.0.0-20240304212257-790db918fca8 h1:8eadJkXbwDEMNwcB5O0s5Y5eCfyuCLdvaiOIaGTrWmQ=
google.golang.org/genproto/googleapis/api v0.0.0-20240304212257-790db918fca8/go.mod h1:O1cOfN1Cy6QEYr7VxtjOyP5AdAuR0aJ/MYZaaof623Y=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240304212257-790db918fca8 h1:IR+hp6ypxjH24bkMfEJ0yHR21+gwPWdV+/IBrPQyn3k=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240304212257-790db918fca8/go.mod h1:UCOku4NytXMJuLQE5VuqA5lX3PcHCBo8pxNyvkf4xBs=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda h1:LI5DOvAxUPMv/50agcLLoo+AdWc1irS9Rzz4vPuD1V4=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
google.golang.org/grpc v1.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
Expand Down
2 changes: 1 addition & 1 deletion src/internal/cache/log_cache.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ func (c *LogCache) setupRouting(s *store.Store) {
// Register peers and current node
for i, addr := range c.nodeAddrs {
if i != c.nodeIndex {
conn, err := grpc.Dial(addr, c.dialOpts...)
conn, err := grpc.NewClient(addr, c.dialOpts...)
if err != nil {
log.Printf("failed to dial %s: %s", addr, err)
continue
Expand Down
22 changes: 11 additions & 11 deletions src/internal/cache/log_cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ var _ = Describe("LogCache", func() {
clientTlsConfig.MaxVersion = uint16(clientTLSVersion)
clientTlsConfig.CipherSuites = []uint16{tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384}

insecureConn, err := grpc.Dial(
insecureConn, err := grpc.NewClient(
cache.Addr(),
grpc.WithTransportCredentials(
credentials.NewTLS(clientTlsConfig),
Expand Down Expand Up @@ -115,7 +115,7 @@ var _ = Describe("LogCache", func() {
clientTlsConfig.MaxVersion = tls.VersionTLS12
clientTlsConfig.CipherSuites = []uint16{clientCipherSuite}

insecureConn, err := grpc.Dial(
insecureConn, err := grpc.NewClient(
cache.Addr(),
grpc.WithTransportCredentials(
credentials.NewTLS(clientTlsConfig),
Expand Down Expand Up @@ -171,7 +171,7 @@ var _ = Describe("LogCache", func() {
{Timestamp: 4, SourceId: "src-zero"},
})

conn, err := grpc.Dial(cache.Addr(),
conn, err := grpc.NewClient(cache.Addr(),
grpc.WithTransportCredentials(credentials.NewTLS(tlsConfig)),
)
Expect(err).ToNot(HaveOccurred())
Expand Down Expand Up @@ -230,7 +230,7 @@ var _ = Describe("LogCache", func() {
},
})

conn, err := grpc.Dial(cache.Addr(),
conn, err := grpc.NewClient(cache.Addr(),
grpc.WithTransportCredentials(credentials.NewTLS(tlsConfig)),
)
Expect(err).ToNot(HaveOccurred())
Expand Down Expand Up @@ -273,7 +273,7 @@ var _ = Describe("LogCache", func() {
},
})

conn, err := grpc.Dial(cache.Addr(),
conn, err := grpc.NewClient(cache.Addr(),
grpc.WithTransportCredentials(credentials.NewTLS(tlsConfig)),
)
Expect(err).ToNot(HaveOccurred())
Expand Down Expand Up @@ -341,7 +341,7 @@ var _ = Describe("LogCache", func() {
{SourceId: "src-zero", Timestamp: 1},
})

conn, err := grpc.Dial(cache.Addr(),
conn, err := grpc.NewClient(cache.Addr(),
grpc.WithTransportCredentials(credentials.NewTLS(tlsConfig)),
)
Expect(err).ToNot(HaveOccurred())
Expand Down Expand Up @@ -380,7 +380,7 @@ var _ = Describe("LogCache", func() {
}
}

conn, err := grpc.Dial(cache.Addr(),
conn, err := grpc.NewClient(cache.Addr(),
grpc.WithTransportCredentials(credentials.NewTLS(tlsConfig)),
)
Expect(err).ToNot(HaveOccurred())
Expand Down Expand Up @@ -426,7 +426,7 @@ var _ = Describe("LogCache", func() {
defer cache.Close()
peer.MetaResponses = map[string]*rpc.MetaInfo{}

conn, err := grpc.Dial(cache.Addr(),
conn, err := grpc.NewClient(cache.Addr(),
grpc.WithTransportCredentials(insecure.NewCredentials()),
)
Expect(err).ToNot(HaveOccurred())
Expand Down Expand Up @@ -480,7 +480,7 @@ var _ = Describe("LogCache", func() {
},
}

conn, err := grpc.Dial(cache.Addr(),
conn, err := grpc.NewClient(cache.Addr(),
grpc.WithTransportCredentials(credentials.NewTLS(tlsConfig)),
)
Expect(err).ToNot(HaveOccurred())
Expand Down Expand Up @@ -530,7 +530,7 @@ func writeEnvelopes(addr string, es []*loggregator_v2.Envelope) {
if err != nil {
panic(err)
}
conn, err := grpc.Dial(addr,
conn, err := grpc.NewClient(addr,
grpc.WithTransportCredentials(credentials.NewTLS(tlsConfig)),
)
if err != nil {
Expand Down Expand Up @@ -558,7 +558,7 @@ func writeEnvelopes(addr string, es []*loggregator_v2.Envelope) {
}

func writeEnvelopesNoTLS(addr string, es []*loggregator_v2.Envelope) {
conn, err := grpc.Dial(addr,
conn, err := grpc.NewClient(addr,
grpc.WithTransportCredentials(insecure.NewCredentials()),
)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion src/internal/end2end/log_cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ var _ = Describe("LogCache", func() {
})

func ingressClient(addr string) (client rpc.IngressClient, cleanup func()) {
conn, err := grpc.Dial(addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
conn, err := grpc.NewClient(addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
if err != nil {
panic(err)
}
Expand Down
8 changes: 4 additions & 4 deletions src/internal/gateway/gateway.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,16 +81,16 @@ func WithGatewayLogCacheDialOpts(opts ...grpc.DialOption) GatewayOption {
}
}

// WithGatewayLogCacheDialOpts returns a GatewayOption that the log-cache
// WithGatewayVersion returns a GatewayOption that sets the log-cache
// version returned by the info endpoint.
func WithGatewayVersion(version string) GatewayOption {
return func(g *Gateway) {
g.logCacheVersion = version
}
}

// WithGatewayLogCacheDialOpts returns a GatewayOption that the log-cache
// version returned by the info endpoint.
// WithGatewayVMUptimeFn returns a GatewayOption that sets the VM
// uptime function.
func WithGatewayVMUptimeFn(uptimeFn func() int64) GatewayOption {
return func(g *Gateway) {
g.uptimeFn = uptimeFn
Expand Down Expand Up @@ -136,7 +136,7 @@ func (g *Gateway) listenAndServe() {
runtime.WithErrorHandler(g.httpErrorHandler),
)

conn, err := grpc.Dial(g.logCacheAddr, g.logCacheDialOpts...)
conn, err := grpc.NewClient(g.logCacheAddr, g.logCacheDialOpts...)
if err != nil {
g.log.Fatalf("failed to dial Log Cache: %s", err)
}
Expand Down
2 changes: 1 addition & 1 deletion src/internal/nozzle/nozzle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ func WithSelectors(selectors ...string) NozzleOption {
func (n *Nozzle) Start() {
rx := n.s.Stream(context.Background(), n.buildBatchReq())

conn, err := grpc.Dial(n.addr, n.opts...)
conn, err := grpc.NewClient(n.addr, n.opts...)
if err != nil {
log.Fatalf("failed to dial %s: %s", n.addr, err)
}
Expand Down
3 changes: 0 additions & 3 deletions src/vendor/github.com/golang/protobuf/AUTHORS
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions src/vendor/github.com/golang/protobuf/CONTRIBUTORS
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions src/vendor/github.com/golang/protobuf/LICENSE
View file
Open in desktop

This file was deleted.

Loading
Loading