Skip to content

Commit 1655c00

Browse files
authored
[8.14](backport #4689) Replacing memory limiter processor with extension (#4980)
1 parent 14936f5 commit 1655c00

File tree

6 files changed

+653
-417
lines changed

6 files changed

+653
-417
lines changed

NOTICE.txt

+381-169
Large diffs are not rendered by default.

go.mod

+74-74
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ require (
7171
golang.org/x/tools v0.20.0
7272
golang.org/x/tools/go/vcs v0.1.0-deprecated
7373
google.golang.org/grpc v1.63.2
74-
google.golang.org/protobuf v1.33.0
74+
google.golang.org/protobuf v1.34.0
7575
gopkg.in/ini.v1 v1.67.0
7676
gopkg.in/yaml.v2 v2.4.0
7777
gopkg.in/yaml.v3 v3.0.1
@@ -85,31 +85,32 @@ require (
8585

8686
require (
8787
// open telemetry dependencies
88-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.97.0
89-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.97.0
90-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.97.0
91-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.97.0
92-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.97.0
93-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.97.0
94-
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.97.0
95-
go.opentelemetry.io/collector/component v0.97.0
96-
go.opentelemetry.io/collector/confmap v0.99.0
97-
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.97.0
98-
go.opentelemetry.io/collector/confmap/provider/envprovider v0.97.0
99-
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.97.0
100-
go.opentelemetry.io/collector/confmap/provider/httpprovider v0.97.0
101-
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.97.0
102-
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.97.0
103-
go.opentelemetry.io/collector/exporter v0.97.0
104-
go.opentelemetry.io/collector/exporter/debugexporter v0.97.0
105-
go.opentelemetry.io/collector/exporter/otlpexporter v0.97.0
106-
go.opentelemetry.io/collector/featuregate v1.6.0
107-
go.opentelemetry.io/collector/otelcol v0.97.0
108-
go.opentelemetry.io/collector/processor v0.97.0
109-
go.opentelemetry.io/collector/processor/batchprocessor v0.97.0
110-
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.97.0
111-
go.opentelemetry.io/collector/receiver v0.97.0
112-
go.opentelemetry.io/collector/receiver/otlpreceiver v0.97.0
88+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.100.0
89+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.100.0
90+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.100.0
91+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.100.0
92+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.100.0
93+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.100.0
94+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.100.0
95+
go.opentelemetry.io/collector/component v0.100.0
96+
go.opentelemetry.io/collector/confmap v0.100.0
97+
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.100.0
98+
go.opentelemetry.io/collector/confmap/provider/envprovider v0.100.0
99+
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.100.0
100+
go.opentelemetry.io/collector/confmap/provider/httpprovider v0.100.0
101+
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.100.0
102+
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.100.0
103+
go.opentelemetry.io/collector/exporter v0.100.0
104+
go.opentelemetry.io/collector/exporter/debugexporter v0.100.0
105+
go.opentelemetry.io/collector/exporter/otlpexporter v0.100.0
106+
go.opentelemetry.io/collector/extension v0.100.0
107+
go.opentelemetry.io/collector/extension/memorylimiterextension v0.100.0
108+
go.opentelemetry.io/collector/featuregate v1.7.0
109+
go.opentelemetry.io/collector/otelcol v0.100.0
110+
go.opentelemetry.io/collector/processor v0.100.0
111+
go.opentelemetry.io/collector/processor/batchprocessor v0.100.0
112+
go.opentelemetry.io/collector/receiver v0.100.0
113+
go.opentelemetry.io/collector/receiver/otlpreceiver v0.100.0
113114
)
114115

115116
require (
@@ -134,7 +135,7 @@ require (
134135
github.com/elastic/gosigar v0.14.2 // indirect
135136
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
136137
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
137-
github.com/expr-lang/expr v1.16.4 // indirect
138+
github.com/expr-lang/expr v1.16.5 // indirect
138139
github.com/felixge/httpsnoop v1.0.4 // indirect
139140
github.com/ghodss/yaml v1.0.0 // indirect
140141
github.com/go-logr/logr v1.4.1 // indirect
@@ -154,7 +155,7 @@ require (
154155
github.com/google/gofuzz v1.2.0 // indirect
155156
github.com/google/licenseclassifier v0.0.0-20221004142553-c1ed8fcf4bab // indirect
156157
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
157-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
158+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
158159
github.com/hashicorp/errwrap v1.1.0 // indirect
159160
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
160161
github.com/iancoleman/strcase v0.3.0 // indirect
@@ -188,20 +189,20 @@ require (
188189
github.com/mostynb/go-grpc-compression v1.2.2 // indirect
189190
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
190191
github.com/onsi/ginkgo/v2 v2.9.0 // indirect
191-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.97.0 // indirect
192-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.97.0 // indirect
193-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.97.0 // indirect
194-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.97.0 // indirect
195-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.97.0 // indirect
196-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.97.0 // indirect
197-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.97.0 // indirect
192+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.100.0 // indirect
193+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.100.0 // indirect
194+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.100.0 // indirect
195+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.100.0 // indirect
196+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.100.0 // indirect
197+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.100.0 // indirect
198+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.100.0 // indirect
198199
github.com/opencontainers/go-digest v1.0.0 // indirect
199200
github.com/opencontainers/image-spec v1.1.0 // indirect
200201
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
201202
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
202203
github.com/prometheus/client_golang v1.19.0 // indirect
203204
github.com/prometheus/client_model v0.6.1 // indirect
204-
github.com/prometheus/common v0.48.0 // indirect
205+
github.com/prometheus/common v0.53.0 // indirect
205206
github.com/prometheus/procfs v0.12.0 // indirect
206207
github.com/rivo/uniseg v0.4.4 // indirect
207208
github.com/rs/cors v1.10.1 // indirect
@@ -220,47 +221,46 @@ require (
220221
go.elastic.co/apm/v2 v2.0.0 // indirect
221222
go.elastic.co/fastjson v1.1.0 // indirect
222223
go.opencensus.io v0.24.0 // indirect
223-
go.opentelemetry.io/collector v0.97.0 // indirect
224-
go.opentelemetry.io/collector/config/configauth v0.97.0 // indirect
225-
go.opentelemetry.io/collector/config/configcompression v1.4.0 // indirect
226-
go.opentelemetry.io/collector/config/configgrpc v0.97.0 // indirect
227-
go.opentelemetry.io/collector/config/confighttp v0.97.0 // indirect
228-
go.opentelemetry.io/collector/config/confignet v0.97.0 // indirect
229-
go.opentelemetry.io/collector/config/configopaque v1.5.0 // indirect
230-
go.opentelemetry.io/collector/config/configretry v0.97.0 // indirect
231-
go.opentelemetry.io/collector/config/configtelemetry v0.97.0 // indirect
232-
go.opentelemetry.io/collector/config/configtls v0.97.0 // indirect
233-
go.opentelemetry.io/collector/config/internal v0.97.0 // indirect
234-
go.opentelemetry.io/collector/connector v0.97.0 // indirect
235-
go.opentelemetry.io/collector/consumer v0.97.0 // indirect
236-
go.opentelemetry.io/collector/extension v0.97.0 // indirect
237-
go.opentelemetry.io/collector/extension/auth v0.97.0 // indirect
238-
go.opentelemetry.io/collector/pdata v1.5.0 // indirect
239-
go.opentelemetry.io/collector/semconv v0.97.0 // indirect
240-
go.opentelemetry.io/collector/service v0.97.0 // indirect
241-
go.opentelemetry.io/contrib/config v0.4.0 // indirect
242-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
243-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
244-
go.opentelemetry.io/contrib/propagators/b3 v1.24.0 // indirect
245-
go.opentelemetry.io/otel v1.25.0 // indirect
246-
go.opentelemetry.io/otel/bridge/opencensus v1.24.0 // indirect
247-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.24.0 // indirect
248-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.24.0 // indirect
249-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
250-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 // indirect
251-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0 // indirect
252-
go.opentelemetry.io/otel/exporters/prometheus v0.47.0 // indirect
253-
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.24.0 // indirect
254-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.24.0 // indirect
255-
go.opentelemetry.io/otel/metric v1.25.0 // indirect
256-
go.opentelemetry.io/otel/sdk v1.25.0 // indirect
257-
go.opentelemetry.io/otel/sdk/metric v1.25.0 // indirect
258-
go.opentelemetry.io/otel/trace v1.25.0 // indirect
259-
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
224+
go.opentelemetry.io/collector v0.100.0 // indirect
225+
go.opentelemetry.io/collector/config/configauth v0.100.0 // indirect
226+
go.opentelemetry.io/collector/config/configcompression v1.7.0 // indirect
227+
go.opentelemetry.io/collector/config/configgrpc v0.100.0 // indirect
228+
go.opentelemetry.io/collector/config/confighttp v0.100.0 // indirect
229+
go.opentelemetry.io/collector/config/confignet v0.100.0 // indirect
230+
go.opentelemetry.io/collector/config/configopaque v1.7.0 // indirect
231+
go.opentelemetry.io/collector/config/configretry v0.100.0 // indirect
232+
go.opentelemetry.io/collector/config/configtelemetry v0.100.0 // indirect
233+
go.opentelemetry.io/collector/config/configtls v0.100.0 // indirect
234+
go.opentelemetry.io/collector/config/internal v0.100.0 // indirect
235+
go.opentelemetry.io/collector/connector v0.100.0 // indirect
236+
go.opentelemetry.io/collector/consumer v0.100.0 // indirect
237+
go.opentelemetry.io/collector/extension/auth v0.100.0 // indirect
238+
go.opentelemetry.io/collector/pdata v1.7.0 // indirect
239+
go.opentelemetry.io/collector/semconv v0.100.0 // indirect
240+
go.opentelemetry.io/collector/service v0.100.0 // indirect
241+
go.opentelemetry.io/contrib/config v0.6.0 // indirect
242+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 // indirect
243+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 // indirect
244+
go.opentelemetry.io/contrib/propagators/b3 v1.26.0 // indirect
245+
go.opentelemetry.io/otel v1.26.0 // indirect
246+
go.opentelemetry.io/otel/bridge/opencensus v1.26.0 // indirect
247+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.26.0 // indirect
248+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.26.0 // indirect
249+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0 // indirect
250+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.26.0 // indirect
251+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.26.0 // indirect
252+
go.opentelemetry.io/otel/exporters/prometheus v0.48.0 // indirect
253+
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.26.0 // indirect
254+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.26.0 // indirect
255+
go.opentelemetry.io/otel/metric v1.26.0 // indirect
256+
go.opentelemetry.io/otel/sdk v1.26.0 // indirect
257+
go.opentelemetry.io/otel/sdk/metric v1.26.0 // indirect
258+
go.opentelemetry.io/otel/trace v1.26.0 // indirect
259+
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
260260
go.uber.org/multierr v1.11.0 // indirect
261261
golang.org/x/mod v0.17.0 // indirect
262262
golang.org/x/net v0.24.0 // indirect
263-
golang.org/x/oauth2 v0.17.0 // indirect
263+
golang.org/x/oauth2 v0.18.0 // indirect
264264
gonum.org/v1/gonum v0.15.0 // indirect
265265
google.golang.org/appengine v1.6.8 // indirect
266266
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect

0 commit comments

Comments
 (0)