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.

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

Bump google.golang.org/grpc to v1.63.2 #485

Merged
merged 1 commit into from
Apr 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 src/internal/cache/log_cache.go
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
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,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 @@ -121,7 +121,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 @@ -177,7 +177,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 @@ -236,7 +236,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 @@ -279,7 +279,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 @@ -347,7 +347,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 @@ -386,7 +386,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 @@ -432,7 +432,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 @@ -486,7 +486,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 @@ -536,7 +536,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 @@ -564,7 +564,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
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
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
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
Loading