Skip to content

Commit 7488f83

Browse files
authored
Merge pull request #8553 from vinted/fixmemoryconsumption
grpc: fix memory consumption problems
2 parents 59a934b + 569d4e2 commit 7488f83

File tree

11 files changed

+3699
-308
lines changed

11 files changed

+3699
-308
lines changed

go.mod

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ require (
6767
github.com/redis/rueidis v1.0.61
6868
github.com/seiflotfy/cuckoofilter v0.0.0-20240715131351-a2f2c23f1771
6969
github.com/sony/gobreaker v1.0.0
70-
github.com/stretchr/testify v1.10.0
70+
github.com/stretchr/testify v1.11.1
7171
github.com/thanos-io/objstore v0.0.0-20250804093838-71d60dfee488
7272
github.com/thanos-io/promql-engine v0.0.0-20250731151205-1a520ea6a26d
7373
github.com/uber/jaeger-client-go v2.30.0+incompatible
@@ -77,26 +77,26 @@ require (
7777
go.elastic.co/apm/module/apmot v1.15.0
7878
go.opentelemetry.io/contrib/propagators/autoprop v0.61.0
7979
go.opentelemetry.io/contrib/samplers/jaegerremote v0.30.0
80-
go.opentelemetry.io/otel v1.36.0
80+
go.opentelemetry.io/otel v1.38.0
8181
go.opentelemetry.io/otel/bridge/opentracing v1.36.0
8282
go.opentelemetry.io/otel/exporters/jaeger v1.17.0
8383
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0
8484
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.36.0
8585
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.36.0
86-
go.opentelemetry.io/otel/sdk v1.36.0
87-
go.opentelemetry.io/otel/trace v1.36.0
86+
go.opentelemetry.io/otel/sdk v1.38.0
87+
go.opentelemetry.io/otel/trace v1.38.0
8888
go.uber.org/atomic v1.11.0
8989
go.uber.org/automaxprocs v1.6.0
9090
go.uber.org/goleak v1.3.0
9191
go4.org/intern v0.0.0-20230525184215-6c62f75575cb
92-
golang.org/x/crypto v0.39.0
93-
golang.org/x/net v0.41.0
94-
golang.org/x/sync v0.15.0
95-
golang.org/x/text v0.26.0
92+
golang.org/x/crypto v0.43.0
93+
golang.org/x/net v0.46.1-0.20251013234738-63d1a5100f82
94+
golang.org/x/sync v0.17.0
95+
golang.org/x/text v0.30.0
9696
golang.org/x/time v0.12.0
97-
google.golang.org/grpc v1.73.0
98-
google.golang.org/grpc/examples v0.0.0-20230224211313-3775f633ce20
99-
google.golang.org/protobuf v1.36.6
97+
google.golang.org/grpc v1.76.0
98+
google.golang.org/grpc/examples v0.0.0-20250407062114-b368379ef8f6
99+
google.golang.org/protobuf v1.36.10
100100
gopkg.in/yaml.v2 v2.4.0
101101
gopkg.in/yaml.v3 v3.0.1
102102
)
@@ -105,7 +105,7 @@ require (
105105
cloud.google.com/go v0.120.0 // indirect
106106
cloud.google.com/go/auth v0.16.2 // indirect
107107
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
108-
cloud.google.com/go/compute/metadata v0.7.0 // indirect
108+
cloud.google.com/go/compute/metadata v0.9.0 // indirect
109109
cloud.google.com/go/iam v1.5.2 // indirect
110110
cloud.google.com/go/storage v1.50.0 // indirect
111111
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.1 // indirect
@@ -150,18 +150,18 @@ require (
150150
go.opentelemetry.io/contrib/propagators/ot v1.36.0 // indirect
151151
go4.org/unsafe/assume-no-moving-gc v0.0.0-20231121144256-b99613f794b6 // indirect
152152
golang.org/x/lint v0.0.0-20241112194109-818c5a804067 // indirect
153-
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
154-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
153+
google.golang.org/genproto/googleapis/api v0.0.0-20251029180050-ab9386a59fda // indirect
154+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
155155
k8s.io/apimachinery v0.33.1 // indirect
156156
k8s.io/client-go v0.33.1 // indirect
157157
k8s.io/klog/v2 v2.130.1 // indirect
158158
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
159159
)
160160

161161
require (
162-
cel.dev/expr v0.23.1 // indirect
162+
cel.dev/expr v0.24.0 // indirect
163163
cloud.google.com/go/monitoring v1.24.2 // indirect
164-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
164+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 // indirect
165165
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.50.0 // indirect
166166
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.52.0 // indirect
167167
github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible // indirect
@@ -185,18 +185,18 @@ require (
185185
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
186186
github.com/chromedp/sysutil v1.0.0 // indirect
187187
github.com/clbanning/mxj v1.8.4 // indirect
188-
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
188+
github.com/cncf/xds/go v0.0.0-20251022180443-0feb69152e9f // indirect
189189
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
190190
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
191191
github.com/dennwc/varint v1.0.0 // indirect
192192
github.com/edsrzf/mmap-go v1.2.0 // indirect
193193
github.com/elastic/go-sysinfo v1.15.3 // indirect
194194
github.com/elastic/go-windows v1.0.2 // indirect
195-
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
195+
github.com/envoyproxy/go-control-plane/envoy v1.35.0 // indirect
196196
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
197197
github.com/fatih/color v1.18.0 // indirect
198198
github.com/felixge/httpsnoop v1.0.4 // indirect
199-
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
199+
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
200200
github.com/go-logfmt/logfmt v0.6.0 // indirect
201201
github.com/go-logr/logr v1.4.3 // indirect
202202
github.com/go-logr/stdr v1.2.2 // indirect
@@ -262,7 +262,7 @@ require (
262262
github.com/rs/xid v1.6.0 // indirect
263263
github.com/santhosh-tekuri/jsonschema v1.2.4 // indirect
264264
github.com/sirupsen/logrus v1.9.3 // indirect
265-
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
265+
github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
266266
github.com/stretchr/objx v0.5.2 // indirect
267267
github.com/tencentyun/cos-go-sdk-v5 v0.7.66 // indirect
268268
github.com/tinylib/msgp v1.3.0 // indirect
@@ -271,12 +271,11 @@ require (
271271
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
272272
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
273273
github.com/yuin/gopher-lua v1.1.1 // indirect
274-
github.com/zeebo/errs v1.4.0 // indirect
275274
go.elastic.co/apm/module/apmhttp v1.15.0 // indirect
276275
go.elastic.co/fastjson v1.5.1 // indirect
277276
go.mongodb.org/mongo-driver v1.17.4 // indirect
278277
go.opencensus.io v0.24.0 // indirect
279-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
278+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
280279
go.opentelemetry.io/collector/component v1.35.0 // indirect
281280
go.opentelemetry.io/collector/confmap v1.35.0 // indirect
282281
go.opentelemetry.io/collector/confmap/xconfmap v0.129.0 // indirect
@@ -286,23 +285,24 @@ require (
286285
go.opentelemetry.io/collector/pipeline v0.129.0 // indirect
287286
go.opentelemetry.io/collector/processor v1.35.0 // indirect
288287
go.opentelemetry.io/contrib/bridges/otelzap v0.11.0 // indirect
289-
go.opentelemetry.io/contrib/detectors/gcp v1.35.0 // indirect
288+
go.opentelemetry.io/contrib/detectors/gcp v1.38.0 // indirect
290289
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.61.0 // indirect
291290
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
292291
go.opentelemetry.io/contrib/propagators/aws v1.36.0 // indirect
293292
go.opentelemetry.io/contrib/propagators/b3 v1.36.0 // indirect
294293
go.opentelemetry.io/contrib/propagators/jaeger v1.36.0 // indirect
295294
go.opentelemetry.io/otel/log v0.12.2 // indirect
296-
go.opentelemetry.io/otel/metric v1.36.0 // indirect
297-
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
295+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
296+
go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
298297
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
299298
go.uber.org/multierr v1.11.0 // indirect
300299
go.uber.org/zap v1.27.0 // indirect
301300
golang.org/x/exp v0.0.0-20250606033433-dcc06ee1d476 // indirect
302-
golang.org/x/mod v0.25.0 // indirect
303-
golang.org/x/oauth2 v0.30.0 // indirect
304-
golang.org/x/sys v0.33.0 // indirect
305-
golang.org/x/tools v0.34.0 // indirect
301+
golang.org/x/mod v0.28.0 // indirect
302+
golang.org/x/oauth2 v0.32.0 // indirect
303+
golang.org/x/sys v0.37.0 // indirect
304+
golang.org/x/telemetry v0.0.0-20250908211612-aef8a434d053 // indirect
305+
golang.org/x/tools v0.37.0 // indirect
306306
gonum.org/v1/gonum v0.16.0 // indirect
307307
google.golang.org/api v0.239.0 // indirect
308308
google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 // indirect
@@ -324,6 +324,8 @@ replace (
324324

325325
github.com/vimeo/galaxycache => github.com/thanos-community/galaxycache v0.0.0-20211122094458-3a32041a1f1e
326326

327+
google.golang.org/grpc => github.com/thanos-community/grpc-go v0.0.0-20251106112228-b9020406f781
328+
327329
// Overriding to use latest commit.
328330
gopkg.in/alecthomas/kingpin.v2 => github.com/alecthomas/kingpin v1.3.8-0.20210301060133-17f40c25f497
329331

0 commit comments

Comments
 (0)