diff --git a/src/go.mod b/src/go.mod index 161146c04..de4117a6f 100644 --- a/src/go.mod +++ b/src/go.mod @@ -5,10 +5,10 @@ go 1.22.0 toolchain go1.22.7 require ( - code.cloudfoundry.org/go-batching v0.0.0-20240826183250-00c4aeaff7d0 - code.cloudfoundry.org/go-diodes v0.0.0-20240813203737-5032edb05ceb + code.cloudfoundry.org/go-batching v0.0.0-20240911223457-d5519e55d3b9 + code.cloudfoundry.org/go-diodes v0.0.0-20240911205836-e7f77fdf9650 code.cloudfoundry.org/go-envstruct v1.7.0 - code.cloudfoundry.org/go-metric-registry v0.0.0-20240828184116-9710cd731bb8 + code.cloudfoundry.org/go-metric-registry v0.0.0-20240911230103-8810864fa5d2 code.cloudfoundry.org/tlsconfig v0.5.0 github.com/cloudfoundry/dropsonde v1.1.0 github.com/cloudfoundry/sonde-go v0.0.0-20240807231527-361c7ad33dc7 @@ -17,7 +17,7 @@ require ( github.com/prometheus/common v0.59.1 github.com/valyala/fasthttp v1.55.0 golang.org/x/net v0.29.0 - google.golang.org/grpc v1.66.1 + google.golang.org/grpc v1.66.2 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/src/go.sum b/src/go.sum index 76698eb41..b4d643421 100644 --- a/src/go.sum +++ b/src/go.sum @@ -1,14 +1,14 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -code.cloudfoundry.org/go-batching v0.0.0-20240826183250-00c4aeaff7d0 h1:qRqZJJqAMFUUcKJg0ffmVSuxW0Re59VlcC0zO9362OY= -code.cloudfoundry.org/go-batching v0.0.0-20240826183250-00c4aeaff7d0/go.mod h1:/4zvF8tCw/7ZD7oEKCO0fna7yfF+jANFiNEQBpNTTzs= -code.cloudfoundry.org/go-diodes v0.0.0-20240813203737-5032edb05ceb h1:Last39ehN2b866DrM0B5FPIbdBFouL9humzWTqVTEX4= -code.cloudfoundry.org/go-diodes v0.0.0-20240813203737-5032edb05ceb/go.mod h1:PfkH7ePa4EhyC6VRisbZJOaIHhas7ofB0heANM//Z6Y= +code.cloudfoundry.org/go-batching v0.0.0-20240911223457-d5519e55d3b9 h1:s0l/NZMR/D14NgrisDNyRjKuZ2BlnB6pXYUNhJi3fSA= +code.cloudfoundry.org/go-batching v0.0.0-20240911223457-d5519e55d3b9/go.mod h1:teaRR2hwpYVfZsLV/5xppXQxbKoAe6fwA9fVAC/2Wis= +code.cloudfoundry.org/go-diodes v0.0.0-20240911205836-e7f77fdf9650 h1:jtBjQDBcE2vSI7hTiPQ/7sOSQ+qwKaVOe08zJqsWL94= +code.cloudfoundry.org/go-diodes v0.0.0-20240911205836-e7f77fdf9650/go.mod h1:UswWmjC8YkMF7v0jCgMOWNRfqJoTTBbpRzX3Emk2HBU= code.cloudfoundry.org/go-envstruct v1.7.0 h1:6e90Z+lTPrI2jMJOoKErskL7a+Qm97GFiithcXeVWdk= code.cloudfoundry.org/go-envstruct v1.7.0/go.mod h1:xm6Eto/WB7Qq1iwEN29jUQXDeUCJ+nruwAnnrpY0s4E= code.cloudfoundry.org/go-loggregator/v9 v9.2.1 h1:S6Lgg5UJbhh2bt2TGQxs6R00CF8PrUA3GFPYDxy56Fk= code.cloudfoundry.org/go-loggregator/v9 v9.2.1/go.mod h1:FTFFruqGeOhVCDFvyLgl8EV8YW63NNwRzLhxJcporu8= -code.cloudfoundry.org/go-metric-registry v0.0.0-20240828184116-9710cd731bb8 h1:fMsu3rMA0cQxHBfC4Cc7bckZdcoeycS2+rn1ZJT69zU= -code.cloudfoundry.org/go-metric-registry v0.0.0-20240828184116-9710cd731bb8/go.mod h1:jYL1s2gRoRpXNZ77tPMsNgo3tzn8nVJ/OXDWEbQ7iJU= +code.cloudfoundry.org/go-metric-registry v0.0.0-20240911230103-8810864fa5d2 h1:W2VwC5aKh8zHys47wGrULci0mCI/MeQ96qLCThuH9Ro= +code.cloudfoundry.org/go-metric-registry v0.0.0-20240911230103-8810864fa5d2/go.mod h1:dcrSGyc9oIIjD6dkcNBOmOcvxTLaXNmdpHhSi9MsXbo= code.cloudfoundry.org/tlsconfig v0.5.0 h1:wkdwdVPMPUowUyR4jzl7EttWD6j3Y8uQKcc2VxBh+Nk= code.cloudfoundry.org/tlsconfig v0.5.0/go.mod h1:hwoQOMSbbpu1doDFFDK8h5EpM/cWREyWMXEo0H1MFeA= filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= @@ -259,8 +259,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.66.1 h1:hO5qAXR19+/Z44hmvIM4dQFMSYX9XcWsByfoxutBpAM= -google.golang.org/grpc v1.66.1/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= +google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo= +google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= diff --git a/src/vendor/code.cloudfoundry.org/go-diodes/many_to_one.go b/src/vendor/code.cloudfoundry.org/go-diodes/many_to_one.go index 6810b20f5..3acc9f30f 100644 --- a/src/vendor/code.cloudfoundry.org/go-diodes/many_to_one.go +++ b/src/vendor/code.cloudfoundry.org/go-diodes/many_to_one.go @@ -118,7 +118,7 @@ func (d *ManyToOne) TryNext() (data GenericDataType, ok bool) { if result.seq > d.readIndex { dropped := result.seq - d.readIndex d.readIndex = result.seq - d.alerter.Alert(int(dropped)) + d.alerter.Alert(int(dropped)) // nolint:gosec } // Only increment read index if a regular read occurred (where seq was diff --git a/src/vendor/code.cloudfoundry.org/go-diodes/one_to_one.go b/src/vendor/code.cloudfoundry.org/go-diodes/one_to_one.go index aaf66d155..9b628b5a2 100644 --- a/src/vendor/code.cloudfoundry.org/go-diodes/one_to_one.go +++ b/src/vendor/code.cloudfoundry.org/go-diodes/one_to_one.go @@ -118,7 +118,7 @@ func (d *OneToOne) TryNext() (data GenericDataType, ok bool) { if result.seq > d.readIndex { dropped := result.seq - d.readIndex d.readIndex = result.seq - d.alerter.Alert(int(dropped)) + d.alerter.Alert(int(dropped)) // nolint:gosec } // Only increment read index if a regular read occurred (where seq was diff --git a/src/vendor/google.golang.org/grpc/experimental/stats/metricregistry.go b/src/vendor/google.golang.org/grpc/experimental/stats/metricregistry.go index 930140f57..1d827dd5d 100644 --- a/src/vendor/google.golang.org/grpc/experimental/stats/metricregistry.go +++ b/src/vendor/google.golang.org/grpc/experimental/stats/metricregistry.go @@ -20,7 +20,6 @@ package stats import ( "maps" - "testing" "google.golang.org/grpc/grpclog" "google.golang.org/grpc/internal" @@ -250,9 +249,9 @@ func RegisterInt64Gauge(descriptor MetricDescriptor) *Int64GaugeHandle { } // snapshotMetricsRegistryForTesting snapshots the global data of the metrics -// registry. Registers a cleanup function on the provided testing.T that sets -// the metrics registry to its original state. Only called in testing functions. -func snapshotMetricsRegistryForTesting(t *testing.T) { +// registry. Returns a cleanup function that sets the metrics registry to its +// original state. +func snapshotMetricsRegistryForTesting() func() { oldDefaultMetrics := DefaultMetrics oldRegisteredMetrics := registeredMetrics oldMetricsRegistry := metricsRegistry @@ -262,9 +261,9 @@ func snapshotMetricsRegistryForTesting(t *testing.T) { maps.Copy(registeredMetrics, registeredMetrics) maps.Copy(metricsRegistry, metricsRegistry) - t.Cleanup(func() { + return func() { DefaultMetrics = oldDefaultMetrics registeredMetrics = oldRegisteredMetrics metricsRegistry = oldMetricsRegistry - }) + } } diff --git a/src/vendor/google.golang.org/grpc/internal/internal.go b/src/vendor/google.golang.org/grpc/internal/internal.go index 65f936a62..73fa407b6 100644 --- a/src/vendor/google.golang.org/grpc/internal/internal.go +++ b/src/vendor/google.golang.org/grpc/internal/internal.go @@ -217,10 +217,9 @@ var ( SetConnectedAddress any // func(scs *SubConnState, addr resolver.Address) // SnapshotMetricRegistryForTesting snapshots the global data of the metric - // registry. Registers a cleanup function on the provided testing.T that - // sets the metric registry to its original state. Only called in testing - // functions. - SnapshotMetricRegistryForTesting any // func(t *testing.T) + // registry. Returns a cleanup function that sets the metric registry to its + // original state. Only called in testing functions. + SnapshotMetricRegistryForTesting func() func() // SetDefaultBufferPoolForTesting updates the default buffer pool, for // testing purposes. diff --git a/src/vendor/google.golang.org/grpc/mem/buffer_slice.go b/src/vendor/google.golang.org/grpc/mem/buffer_slice.go index d7775cea6..228e9c2f2 100644 --- a/src/vendor/google.golang.org/grpc/mem/buffer_slice.go +++ b/src/vendor/google.golang.org/grpc/mem/buffer_slice.go @@ -19,7 +19,6 @@ package mem import ( - "compress/flate" "io" ) @@ -92,9 +91,11 @@ func (s BufferSlice) Materialize() []byte { } // 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 -// input BufferSlice only actually has one Buffer, this function has nothing to -// do and simply returns said Buffer. +// to a single Buffer pulled from the given BufferPool. +// +// 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 { if len(s) == 1 { s[0].Ref() @@ -124,7 +125,8 @@ func (s BufferSlice) Reader() Reader { // Remaining(), which returns the number of unread bytes remaining in the slice. // Buffers will be freed as they are read. type Reader interface { - flate.Reader + io.Reader + io.ByteReader // Close frees the underlying BufferSlice and never returns an error. Subsequent // calls to Read will return (0, io.EOF). Close() error diff --git a/src/vendor/google.golang.org/grpc/server.go b/src/vendor/google.golang.org/grpc/server.go index 457d27338..d1e1415a4 100644 --- a/src/vendor/google.golang.org/grpc/server.go +++ b/src/vendor/google.golang.org/grpc/server.go @@ -1359,6 +1359,7 @@ func (s *Server) processUnaryRPC(ctx context.Context, t transport.ServerTranspor } return err } + defer d.Free() if channelz.IsOn() { t.IncrMsgRecv() } diff --git a/src/vendor/google.golang.org/grpc/version.go b/src/vendor/google.golang.org/grpc/version.go index 03f931834..7c70005d0 100644 --- a/src/vendor/google.golang.org/grpc/version.go +++ b/src/vendor/google.golang.org/grpc/version.go @@ -19,4 +19,4 @@ package grpc // Version is the current grpc version. -const Version = "1.66.1" +const Version = "1.66.2" diff --git a/src/vendor/modules.txt b/src/vendor/modules.txt index 76beefcd7..c07f6e75a 100644 --- a/src/vendor/modules.txt +++ b/src/vendor/modules.txt @@ -1,7 +1,7 @@ -# code.cloudfoundry.org/go-batching v0.0.0-20240826183250-00c4aeaff7d0 -## explicit; go 1.21 +# code.cloudfoundry.org/go-batching v0.0.0-20240911223457-d5519e55d3b9 +## explicit; go 1.22 code.cloudfoundry.org/go-batching -# code.cloudfoundry.org/go-diodes v0.0.0-20240813203737-5032edb05ceb +# code.cloudfoundry.org/go-diodes v0.0.0-20240911205836-e7f77fdf9650 ## explicit; go 1.22 code.cloudfoundry.org/go-diodes # code.cloudfoundry.org/go-envstruct v1.7.0 @@ -13,8 +13,8 @@ code.cloudfoundry.org/go-loggregator/v9 code.cloudfoundry.org/go-loggregator/v9/conversion code.cloudfoundry.org/go-loggregator/v9/rfc5424 code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2 -# code.cloudfoundry.org/go-metric-registry v0.0.0-20240828184116-9710cd731bb8 -## explicit; go 1.21 +# code.cloudfoundry.org/go-metric-registry v0.0.0-20240911230103-8810864fa5d2 +## explicit; go 1.22 code.cloudfoundry.org/go-metric-registry code.cloudfoundry.org/go-metric-registry/testhelpers # code.cloudfoundry.org/tlsconfig v0.5.0 @@ -269,7 +269,7 @@ google.golang.org/genproto/googleapis/api/httpbody # google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 ## explicit; go 1.21 google.golang.org/genproto/googleapis/rpc/status -# google.golang.org/grpc v1.66.1 +# google.golang.org/grpc v1.66.2 ## explicit; go 1.21 google.golang.org/grpc google.golang.org/grpc/attributes