rebase: bump google.golang.org/grpc from 1.66.0 to 1.66.2

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.66.0 to 1.66.2.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](https://github.com/grpc/grpc-go/compare/v1.66.0...v1.66.2)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
dependabot[bot] 2024-09-16 20:52:15 +00:00 committed by mergify[bot]
parent a6d89542b6
commit 25d4186265
8 changed files with 21 additions and 20 deletions

2
go.mod
View File

@ -28,7 +28,7 @@ require (
golang.org/x/crypto v0.27.0 golang.org/x/crypto v0.27.0
golang.org/x/net v0.29.0 golang.org/x/net v0.29.0
golang.org/x/sys v0.25.0 golang.org/x/sys v0.25.0
google.golang.org/grpc v1.66.0 google.golang.org/grpc v1.66.2
google.golang.org/protobuf v1.34.2 google.golang.org/protobuf v1.34.2
// //
// when updating k8s.io/kubernetes, make sure to update the replace section too // when updating k8s.io/kubernetes, make sure to update the replace section too

4
go.sum
View File

@ -3362,8 +3362,8 @@ google.golang.org/grpc v1.63.0/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDom
google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg=
google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ=
google.golang.org/grpc v1.66.0 h1:DibZuoBznOxbDQxRINckZcUvnCEvrW9pcWIE2yF9r1c= google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo=
google.golang.org/grpc v1.66.0/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= 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-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=

View File

@ -20,7 +20,6 @@ package stats
import ( import (
"maps" "maps"
"testing"
"google.golang.org/grpc/grpclog" "google.golang.org/grpc/grpclog"
"google.golang.org/grpc/internal" "google.golang.org/grpc/internal"
@ -250,9 +249,9 @@ func RegisterInt64Gauge(descriptor MetricDescriptor) *Int64GaugeHandle {
} }
// snapshotMetricsRegistryForTesting snapshots the global data of the metrics // snapshotMetricsRegistryForTesting snapshots the global data of the metrics
// registry. Registers a cleanup function on the provided testing.T that sets // registry. Returns a cleanup function that sets the metrics registry to its
// the metrics registry to its original state. Only called in testing functions. // original state.
func snapshotMetricsRegistryForTesting(t *testing.T) { func snapshotMetricsRegistryForTesting() func() {
oldDefaultMetrics := DefaultMetrics oldDefaultMetrics := DefaultMetrics
oldRegisteredMetrics := registeredMetrics oldRegisteredMetrics := registeredMetrics
oldMetricsRegistry := metricsRegistry oldMetricsRegistry := metricsRegistry
@ -262,9 +261,9 @@ func snapshotMetricsRegistryForTesting(t *testing.T) {
maps.Copy(registeredMetrics, registeredMetrics) maps.Copy(registeredMetrics, registeredMetrics)
maps.Copy(metricsRegistry, metricsRegistry) maps.Copy(metricsRegistry, metricsRegistry)
t.Cleanup(func() { return func() {
DefaultMetrics = oldDefaultMetrics DefaultMetrics = oldDefaultMetrics
registeredMetrics = oldRegisteredMetrics registeredMetrics = oldRegisteredMetrics
metricsRegistry = oldMetricsRegistry metricsRegistry = oldMetricsRegistry
}) }
} }

View File

@ -217,10 +217,9 @@ var (
SetConnectedAddress any // func(scs *SubConnState, addr resolver.Address) SetConnectedAddress any // func(scs *SubConnState, addr resolver.Address)
// SnapshotMetricRegistryForTesting snapshots the global data of the metric // SnapshotMetricRegistryForTesting snapshots the global data of the metric
// registry. Registers a cleanup function on the provided testing.T that // registry. Returns a cleanup function that sets the metric registry to its
// sets the metric registry to its original state. Only called in testing // original state. Only called in testing functions.
// functions. SnapshotMetricRegistryForTesting func() func()
SnapshotMetricRegistryForTesting any // func(t *testing.T)
// SetDefaultBufferPoolForTesting updates the default buffer pool, for // SetDefaultBufferPoolForTesting updates the default buffer pool, for
// testing purposes. // testing purposes.

View File

@ -19,7 +19,6 @@
package mem package mem
import ( import (
"compress/flate"
"io" "io"
) )
@ -92,9 +91,11 @@ func (s BufferSlice) Materialize() []byte {
} }
// MaterializeToBuffer functions like Materialize except that it writes the data // MaterializeToBuffer functions like Materialize except that it writes the data
// to a single Buffer pulled from the given BufferPool. As a special case, if the // to a single Buffer pulled from the given BufferPool.
// input BufferSlice only actually has one Buffer, this function has nothing to //
// do and simply returns said Buffer. // As a special case, if the input BufferSlice only actually has one Buffer, this
// function simply increases the refcount before returning said Buffer. Freeing this
// buffer won't release it until the BufferSlice is itself released.
func (s BufferSlice) MaterializeToBuffer(pool BufferPool) Buffer { func (s BufferSlice) MaterializeToBuffer(pool BufferPool) Buffer {
if len(s) == 1 { if len(s) == 1 {
s[0].Ref() s[0].Ref()
@ -124,7 +125,8 @@ func (s BufferSlice) Reader() Reader {
// Remaining(), which returns the number of unread bytes remaining in the slice. // Remaining(), which returns the number of unread bytes remaining in the slice.
// Buffers will be freed as they are read. // Buffers will be freed as they are read.
type Reader interface { type Reader interface {
flate.Reader io.Reader
io.ByteReader
// Close frees the underlying BufferSlice and never returns an error. Subsequent // Close frees the underlying BufferSlice and never returns an error. Subsequent
// calls to Read will return (0, io.EOF). // calls to Read will return (0, io.EOF).
Close() error Close() error

View File

@ -1359,6 +1359,7 @@ func (s *Server) processUnaryRPC(ctx context.Context, t transport.ServerTranspor
} }
return err return err
} }
defer d.Free()
if channelz.IsOn() { if channelz.IsOn() {
t.IncrMsgRecv() t.IncrMsgRecv()
} }

View File

@ -19,4 +19,4 @@
package grpc package grpc
// Version is the current grpc version. // Version is the current grpc version.
const Version = "1.66.0" const Version = "1.66.2"

2
vendor/modules.txt vendored
View File

@ -834,7 +834,7 @@ google.golang.org/genproto/googleapis/api/httpbody
## explicit; go 1.20 ## explicit; go 1.20
google.golang.org/genproto/googleapis/rpc/errdetails google.golang.org/genproto/googleapis/rpc/errdetails
google.golang.org/genproto/googleapis/rpc/status google.golang.org/genproto/googleapis/rpc/status
# google.golang.org/grpc v1.66.0 # google.golang.org/grpc v1.66.2
## explicit; go 1.21 ## explicit; go 1.21
google.golang.org/grpc google.golang.org/grpc
google.golang.org/grpc/attributes google.golang.org/grpc/attributes