Skip to content

Commit 17df32d

Browse files
michalpristasmergify[bot]
michalpristas
authored and
mergify[bot]
committed
Replacing memory limiter processor with extension (#4689)
(cherry picked from commit 13a4157) # Conflicts: # NOTICE.txt # go.mod # go.sum # internal/pkg/otel/README.md
1 parent 14936f5 commit 17df32d

File tree

6 files changed

+612
-2
lines changed

6 files changed

+612
-2
lines changed

‎NOTICE.txt

+430
Large diffs are not rendered by default.

‎go.mod

+70
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ require (
8585

8686
require (
8787
// open telemetry dependencies
88+
<<<<<<< HEAD
8889
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.97.0
8990
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.97.0
9091
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.97.0
@@ -110,6 +111,36 @@ require (
110111
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.97.0
111112
go.opentelemetry.io/collector/receiver v0.97.0
112113
go.opentelemetry.io/collector/receiver/otlpreceiver v0.97.0
114+
=======
115+
// pinned to v0.97.0 due to issue with ports binding which causes our tests to fail
116+
// Do NOT upgrade the version beyond 0.97.0 until https://github.com/open-telemetry/opentelemetry-collector/issues/10031 is fixed!
117+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter v0.100.0
118+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.100.0
119+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.100.0
120+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.100.0
121+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.100.0
122+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.100.0
123+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.100.0
124+
go.opentelemetry.io/collector/component v0.100.0
125+
go.opentelemetry.io/collector/confmap v0.100.0
126+
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.100.0
127+
go.opentelemetry.io/collector/confmap/provider/envprovider v0.100.0
128+
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.100.0
129+
go.opentelemetry.io/collector/confmap/provider/httpprovider v0.100.0
130+
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.100.0
131+
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.100.0
132+
go.opentelemetry.io/collector/exporter v0.100.0
133+
go.opentelemetry.io/collector/exporter/debugexporter v0.100.0
134+
go.opentelemetry.io/collector/exporter/otlpexporter v0.100.0
135+
go.opentelemetry.io/collector/extension v0.100.0
136+
go.opentelemetry.io/collector/extension/memorylimiterextension v0.100.0
137+
go.opentelemetry.io/collector/featuregate v1.7.0
138+
go.opentelemetry.io/collector/otelcol v0.100.0
139+
go.opentelemetry.io/collector/processor v0.100.0
140+
go.opentelemetry.io/collector/processor/batchprocessor v0.100.0
141+
go.opentelemetry.io/collector/receiver v0.100.0
142+
go.opentelemetry.io/collector/receiver/otlpreceiver v0.100.0
143+
>>>>>>> 13a4157d11 (Replacing memory limiter processor with extension (#4689))
113144
)
114145

115146
require (
@@ -220,6 +251,7 @@ require (
220251
go.elastic.co/apm/v2 v2.0.0 // indirect
221252
go.elastic.co/fastjson v1.1.0 // indirect
222253
go.opencensus.io v0.24.0 // indirect
254+
<<<<<<< HEAD
223255
go.opentelemetry.io/collector v0.97.0 // indirect
224256
go.opentelemetry.io/collector/config/configauth v0.97.0 // indirect
225257
go.opentelemetry.io/collector/config/configcompression v1.4.0 // indirect
@@ -257,6 +289,44 @@ require (
257289
go.opentelemetry.io/otel/sdk/metric v1.25.0 // indirect
258290
go.opentelemetry.io/otel/trace v1.25.0 // indirect
259291
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
292+
=======
293+
go.opentelemetry.io/collector v0.100.0 // indirect
294+
go.opentelemetry.io/collector/config/configauth v0.100.0 // indirect
295+
go.opentelemetry.io/collector/config/configcompression v1.7.0 // indirect
296+
go.opentelemetry.io/collector/config/configgrpc v0.100.0 // indirect
297+
go.opentelemetry.io/collector/config/confighttp v0.100.0 // indirect
298+
go.opentelemetry.io/collector/config/confignet v0.100.0 // indirect
299+
go.opentelemetry.io/collector/config/configopaque v1.7.0 // indirect
300+
go.opentelemetry.io/collector/config/configretry v0.100.0 // indirect
301+
go.opentelemetry.io/collector/config/configtelemetry v0.100.0 // indirect
302+
go.opentelemetry.io/collector/config/configtls v0.100.0 // indirect
303+
go.opentelemetry.io/collector/config/internal v0.100.0 // indirect
304+
go.opentelemetry.io/collector/connector v0.100.0 // indirect
305+
go.opentelemetry.io/collector/consumer v0.100.0 // indirect
306+
go.opentelemetry.io/collector/extension/auth v0.100.0 // indirect
307+
go.opentelemetry.io/collector/pdata v1.7.0 // indirect
308+
go.opentelemetry.io/collector/semconv v0.100.0 // indirect
309+
go.opentelemetry.io/collector/service v0.100.0 // indirect
310+
go.opentelemetry.io/contrib/config v0.6.0 // indirect
311+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0 // indirect
312+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 // indirect
313+
go.opentelemetry.io/contrib/propagators/b3 v1.26.0 // indirect
314+
go.opentelemetry.io/otel v1.26.0 // indirect
315+
go.opentelemetry.io/otel/bridge/opencensus v1.26.0 // indirect
316+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.26.0 // indirect
317+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.26.0 // indirect
318+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0 // indirect
319+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.26.0 // indirect
320+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.26.0 // indirect
321+
go.opentelemetry.io/otel/exporters/prometheus v0.48.0 // indirect
322+
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.26.0 // indirect
323+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.26.0 // indirect
324+
go.opentelemetry.io/otel/metric v1.26.0 // indirect
325+
go.opentelemetry.io/otel/sdk v1.26.0 // indirect
326+
go.opentelemetry.io/otel/sdk/metric v1.26.0 // indirect
327+
go.opentelemetry.io/otel/trace v1.26.0 // indirect
328+
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
329+
>>>>>>> 13a4157d11 (Replacing memory limiter processor with extension (#4689))
260330
go.uber.org/multierr v1.11.0 // indirect
261331
golang.org/x/mod v0.17.0 // indirect
262332
golang.org/x/net v0.24.0 // indirect

‎go.sum

+79
Original file line numberDiff line numberDiff line change
@@ -1946,6 +1946,7 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
19461946
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
19471947
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
19481948
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
1949+
<<<<<<< HEAD
19491950
go.opentelemetry.io/collector v0.97.0 h1:qyOju13byHIKEK/JehmTiGMj4pFLa4kDyrOCtTmjHU0=
19501951
go.opentelemetry.io/collector v0.97.0/go.mod h1:V6xquYAaO2VHVu4DBK28JYuikRdZajh7DH5Vl/Y8NiA=
19511952
go.opentelemetry.io/collector/component v0.97.0 h1:vanKhXl5nptN8igRH4PqVYHOILif653vaPIKv6LCZCI=
@@ -2020,6 +2021,84 @@ go.opentelemetry.io/collector/semconv v0.97.0 h1:iF3nTfThbiOwz7o5Pocn0dDnDoffd18
20202021
go.opentelemetry.io/collector/semconv v0.97.0/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A=
20212022
go.opentelemetry.io/collector/service v0.97.0 h1:Nv/A41Ezot0lqMQwqJSRGV2PeQNcItaiDaQPudFXBOM=
20222023
go.opentelemetry.io/collector/service v0.97.0/go.mod h1:h9SwBe1yThExLAhgIErMtGsyBdEmSKGK8p/f+QcWyT0=
2024+
=======
2025+
go.opentelemetry.io/collector v0.100.0 h1:Q6IAGjMzjkZ7WepuwyCa6UytDPP0O88GemonQOUjP2s=
2026+
go.opentelemetry.io/collector v0.100.0/go.mod h1:QlVjQWlrPtBwVRm8tr+3P4FzNZSlYEfuUSaWoAwK+ko=
2027+
go.opentelemetry.io/collector/component v0.100.0 h1:3Y6dl3uDkDzilaikYrPxbZDOlzrDijrF1cIPzfyTwWA=
2028+
go.opentelemetry.io/collector/component v0.100.0/go.mod h1:HLEqEBFzPW2umagnVC3gY8yogOBhbzvuzTBFUqH54HY=
2029+
go.opentelemetry.io/collector/config/configauth v0.100.0 h1:5Q+XA7TO0umCVd6S3PBUXb8UDFGpPVSF/gVKkTEmftQ=
2030+
go.opentelemetry.io/collector/config/configauth v0.100.0/go.mod h1:ElXGLLnYZhfBH259KEY+ot6sso9aVNXTf2w7424DgU0=
2031+
go.opentelemetry.io/collector/config/configcompression v1.7.0 h1:OMsuJd5G1UXB09YCc33qvy9cMUYVkSQGLl6j87445GI=
2032+
go.opentelemetry.io/collector/config/configcompression v1.7.0/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M=
2033+
go.opentelemetry.io/collector/config/configgrpc v0.100.0 h1:+RuWrysXLbjaf/+I7dU965cQv2CJCw3+b5P0iNMKPl0=
2034+
go.opentelemetry.io/collector/config/configgrpc v0.100.0/go.mod h1:NDKPjtEVL7TJMfByR/D5MYyjveUU3D0GkM96jU0u494=
2035+
go.opentelemetry.io/collector/config/confighttp v0.100.0 h1:bkB8ZkkRL+N75QofuIosf2ZzkEYaBAA5C+eQpL4fOis=
2036+
go.opentelemetry.io/collector/config/confighttp v0.100.0/go.mod h1:AaugDfPoHeOmFT2BICuGNp3ja3Sq1AcTxxw4WysFZsI=
2037+
go.opentelemetry.io/collector/config/confignet v0.100.0 h1:SW8IMK+9GwFa1cNZdXw6wMkbCsqUaRtj0fgP8/yG6oI=
2038+
go.opentelemetry.io/collector/config/confignet v0.100.0/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k=
2039+
go.opentelemetry.io/collector/config/configopaque v1.7.0 h1:nZh5Hb1ofq9xP1wHLSt4obM85pRTccSeAjV0NbrJeTc=
2040+
go.opentelemetry.io/collector/config/configopaque v1.7.0/go.mod h1:vxoDKYYYUF/arrdQJxmfhlgkcsb0DpdzC9KPFP97uuE=
2041+
go.opentelemetry.io/collector/config/configretry v0.100.0 h1:jEswHFjNokqJ0U2iYSzUlDy8N6A6D+zaoHM9t1TB6yw=
2042+
go.opentelemetry.io/collector/config/configretry v0.100.0/go.mod h1:uRdmPeCkrW9Zsadh2WEbQ1AGXGYJ02vCfmmT+0g69nY=
2043+
go.opentelemetry.io/collector/config/configtelemetry v0.100.0 h1:unlhNrFFXCinxk6iPHPYwANO+eFY4S1NTb5knSxteW4=
2044+
go.opentelemetry.io/collector/config/configtelemetry v0.100.0/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o=
2045+
go.opentelemetry.io/collector/config/configtls v0.100.0 h1:qcx8EXW4u+IQvyt8ZH5ld2dEns1zp8sugyM+s7RuiKY=
2046+
go.opentelemetry.io/collector/config/configtls v0.100.0/go.mod h1:f8KZu6P8hIzTfybLKG3xMIzkCmXyjxVUfDTVUp2CmhA=
2047+
go.opentelemetry.io/collector/config/internal v0.100.0 h1:XSbedIpdXOxIEGnnzCZnulTmWPSGWfXTH18ZMxuqt8s=
2048+
go.opentelemetry.io/collector/config/internal v0.100.0/go.mod h1:QiG0fNuQ3GxNcF8stKHRUpHRKgyaKjM3G9re9f+dV70=
2049+
go.opentelemetry.io/collector/confmap v0.100.0 h1:r70znwLWUMFRWL4LRcWLhdFfzmTvehXgbnlHFCDm0Tc=
2050+
go.opentelemetry.io/collector/confmap v0.100.0/go.mod h1:BWKPIpYeUzSG6ZgCJMjF7xsLvyrvJCfYURl57E5vhiQ=
2051+
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.100.0 h1:xXPI9QzvwhefmVHNlSuq3WqmgXOrAVdaQAAdkAoMaEU=
2052+
go.opentelemetry.io/collector/confmap/converter/expandconverter v0.100.0/go.mod h1:zkADuTzmkmbsr281Xxw1jTy+YFrWr28pPIStt4nTZpo=
2053+
go.opentelemetry.io/collector/confmap/provider/envprovider v0.100.0 h1:ORj/EN7HCuTl5MD8GoirShtz7ieIbAdseGroeRdgNDM=
2054+
go.opentelemetry.io/collector/confmap/provider/envprovider v0.100.0/go.mod h1:MMrNqxsveOPN/l6xifY8KK3kqfXdFOANIJQ4hkgNxN0=
2055+
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.100.0 h1:H2YtC6mOFuaY7/ht16iUDYSHS6jM2ufNqQatmKAbf7U=
2056+
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.100.0/go.mod h1:JEYr74rqYYsgKc5bDtsqy8TFHmmhHnEc0Hm5ekZSj/8=
2057+
go.opentelemetry.io/collector/confmap/provider/httpprovider v0.100.0 h1:GPFfS9BmuF0bzeW/lUElvI2NzHjAKq5U1E/lXLy/7pc=
2058+
go.opentelemetry.io/collector/confmap/provider/httpprovider v0.100.0/go.mod h1:s8YCUcFOOnY4NKeQjVTup6XiA3Oj3yqs8NB10kbwuAU=
2059+
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.100.0 h1:vcOsDXQRdf/TUcD0vYTGkzvaPmoplG8Fkv8IoJ5cB58=
2060+
go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.100.0/go.mod h1:GQ7LqkJKOcUFm8nxdV0P7eHPjLzVtNoBgqnwBGL4RCc=
2061+
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.100.0 h1:a7qqKfczlB8wGQNeiGiSMiwCYRwTVdlIIUG98Jn5ydY=
2062+
go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.100.0/go.mod h1:IlcEhPYl3JDbl+5Bd9kWeDACHnvctdEnA7zlZCdtWk8=
2063+
go.opentelemetry.io/collector/connector v0.100.0 h1:6LN8LXhv553SjipKl7EbvlAECIZ9/v+vNxGiePp8dDQ=
2064+
go.opentelemetry.io/collector/connector v0.100.0/go.mod h1:yF4fkEtDrZOpwGOcnDTjkGjMCCQTPL2VCCBe9R43Jbg=
2065+
go.opentelemetry.io/collector/consumer v0.100.0 h1:8sALAcWvizSyrZJCF+zTqD2RLmZAyeCuaQrNS2q6ti0=
2066+
go.opentelemetry.io/collector/consumer v0.100.0/go.mod h1:JOPOq8nSTdnQwc2xdHl4hcuYBYV8gjN2SlFqlqBe/Nc=
2067+
go.opentelemetry.io/collector/exporter v0.100.0 h1:eyPb93tQwdft5Eboo8O5LDdaM1eXAQbtbXKBEYQlwh4=
2068+
go.opentelemetry.io/collector/exporter v0.100.0/go.mod h1:5UrDewyFp5yIQHyV7HUFAPdhHKJGbz1/uaTunm7X54I=
2069+
go.opentelemetry.io/collector/exporter/debugexporter v0.100.0 h1:9y+6FxuwbjQA7osZ1ywNJ7baV+PXOBges2RPmv2Xs20=
2070+
go.opentelemetry.io/collector/exporter/debugexporter v0.100.0/go.mod h1:/BG6XIU3qHHZKQXJygJXtSPpF03IKnU0j+PudmTea8I=
2071+
go.opentelemetry.io/collector/exporter/otlpexporter v0.100.0 h1:mafUk/1VLhPyGgCeGHDNNbpSOqE14ijy4S3oYL8vDMA=
2072+
go.opentelemetry.io/collector/exporter/otlpexporter v0.100.0/go.mod h1:j9b9/HTwRR4VEPEnhoV9hiXf4tyUekz8d0KOlY2XqzE=
2073+
go.opentelemetry.io/collector/extension v0.100.0 h1:HT3h5JE+5xK3CCwF7VJKCOuZkLBMaUtm4T/BnEMpdWc=
2074+
go.opentelemetry.io/collector/extension v0.100.0/go.mod h1:B7jsEl6HAZB79NU41AdoMwLgXn4yTTO5NTlxRrsORoo=
2075+
go.opentelemetry.io/collector/extension/auth v0.100.0 h1:Z8QVtntWiORnbVSCQfOxtnOOv9baqTlL8mTOaKi/9nc=
2076+
go.opentelemetry.io/collector/extension/auth v0.100.0/go.mod h1:nkqaVzUAdqqkUGdMqoIqH/xlGU0rCxRZy1Altyz0gQk=
2077+
go.opentelemetry.io/collector/extension/memorylimiterextension v0.100.0 h1:MICgwhqSuV3DyhKOG+FzDKyG5wSwzwSi+JiI6Je7pUA=
2078+
go.opentelemetry.io/collector/extension/memorylimiterextension v0.100.0/go.mod h1:54ubyU8V3YKIVpQk7+0FpmMpmfoWHpLkR6i8Wk2nXGM=
2079+
go.opentelemetry.io/collector/extension/zpagesextension v0.100.0 h1:4bHq1NBg8hU+NSd9DBVFAl4vxi40J0tqClmU3IknrEg=
2080+
go.opentelemetry.io/collector/extension/zpagesextension v0.100.0/go.mod h1:mcLfCcjq0/yZoieuyO0H5rVL3u7Why0/MRezNV2E7AU=
2081+
go.opentelemetry.io/collector/featuregate v1.7.0 h1:8tNgX2VaiR9jrpZevRSvStuJrvvL6WwScT264HNLk7U=
2082+
go.opentelemetry.io/collector/featuregate v1.7.0/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w=
2083+
go.opentelemetry.io/collector/otelcol v0.100.0 h1:5NWoo9T5tHP0oWt3OHetYpTRaQCJuef8KDDe5tLi+BA=
2084+
go.opentelemetry.io/collector/otelcol v0.100.0/go.mod h1:pdPObjfQqP2pdE70jqQiJlZdEyZ0jA1euoRdHtgZjiA=
2085+
go.opentelemetry.io/collector/pdata v1.7.0 h1:/WNsBbE6KM3TTPUb9v/5B7IDqnDkgf8GyFhVJJqu7II=
2086+
go.opentelemetry.io/collector/pdata v1.7.0/go.mod h1:ehCBBA5GoFrMZkwyZAKGY/lAVSgZf6rzUt3p9mddmPU=
2087+
go.opentelemetry.io/collector/pdata/testdata v0.100.0 h1:pliojioiAv+CuLNTK+8tnCD2UgiJbKX9q8bDnpHkV1U=
2088+
go.opentelemetry.io/collector/pdata/testdata v0.100.0/go.mod h1:01BHOXvXaQaLLt5J34S093u3e+j//RhbfmEujpFJ/ME=
2089+
go.opentelemetry.io/collector/processor v0.100.0 h1:8Zcd3v77SCSM5mAJbGes5aR/Yof3aY1csiwFhKFpLEQ=
2090+
go.opentelemetry.io/collector/processor v0.100.0/go.mod h1:ZqUC8WWVYyPkaLUT1JXUCNpCpde8zXgSaFfJq2FXuVU=
2091+
go.opentelemetry.io/collector/processor/batchprocessor v0.100.0 h1:N94WWv+o9yt4HqvFeRUjL8VNEhY8mCym+2XPKUWxjmo=
2092+
go.opentelemetry.io/collector/processor/batchprocessor v0.100.0/go.mod h1:svXHN23yozQ+GLt04dKXHiZRYipWONt4blJifu2bloY=
2093+
go.opentelemetry.io/collector/receiver v0.100.0 h1:RFeOVhS7o39G562w0H0hqfh1o2QvK71ViHQuWnnfglI=
2094+
go.opentelemetry.io/collector/receiver v0.100.0/go.mod h1:Qo3xkorbUy0VXHh7WxMQyphIWiqxI3ZOG0O4YqQ2mCE=
2095+
go.opentelemetry.io/collector/receiver/otlpreceiver v0.100.0 h1:JuTBkWQ0xc8FargDe5aE6wCoAEk1gxLnBzfdIi8NOL8=
2096+
go.opentelemetry.io/collector/receiver/otlpreceiver v0.100.0/go.mod h1:X2xzbz9K4Kz0i3c1IKa1gcwf7rpoJDidyp28A1AuHFs=
2097+
go.opentelemetry.io/collector/semconv v0.100.0 h1:QArUvWcbmsMjM4PV0zngUHRizZeUXibsPBWjDuNJXAs=
2098+
go.opentelemetry.io/collector/semconv v0.100.0/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A=
2099+
go.opentelemetry.io/collector/service v0.100.0 h1:2LFvNQNSs2NnwElyqkyhAiqaGoDdiMnTQeFPCLZNgg0=
2100+
go.opentelemetry.io/collector/service v0.100.0/go.mod h1:65NPZ6THkR/e7fd8vh+tw4Lh6iDJ1twNXVzL76a3VNk=
2101+
>>>>>>> 13a4157d11 (Replacing memory limiter processor with extension (#4689))
20232102
go.opentelemetry.io/contrib v0.20.0 h1:ubFQUn0VCZ0gPwIoJfBJVpeBlyRMxu8Mm/huKWYd9p0=
20242103
go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc=
20252104
go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs=

‎internal/pkg/otel/README.md

+15
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,27 @@ This section provides a summary of components included in the Elastic Distributi
5353

5454
| Component | Version |
5555
|---|---|
56+
<<<<<<< HEAD
5657
| attributesprocessor | v0.97.0|
5758
| filterprocessor | v0.97.0|
5859
| resourceprocessor | v0.97.0|
5960
| transformprocessor | v0.97.0|
6061
| batchprocessor | v0.97.0|
6162
| memorylimiterprocessor | v0.97.0|
63+
=======
64+
| attributesprocessor | v0.100.0|
65+
| filterprocessor | v0.100.0|
66+
| resourceprocessor | v0.100.0|
67+
| transformprocessor | v0.100.0|
68+
| batchprocessor | v0.100.0|
69+
>>>>>>> 13a4157d11 (Replacing memory limiter processor with extension (#4689))
6270
6371

6472

73+
74+
### Extensions
75+
76+
| Component | Version |
77+
|---|---|
78+
| memorylimiterextension | v0.100.0|
79+

‎internal/pkg/otel/components.go

+11-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package otel
66

77
import (
88
"go.opentelemetry.io/collector/exporter"
9+
"go.opentelemetry.io/collector/extension"
910
"go.opentelemetry.io/collector/otelcol"
1011
"go.opentelemetry.io/collector/processor"
1112
"go.opentelemetry.io/collector/receiver"
@@ -20,13 +21,15 @@ import (
2021
resourceprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor" // for modifying resource attributes
2122
transformprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor" // for OTTL processing on logs
2223
"go.opentelemetry.io/collector/processor/batchprocessor" // for batching events
23-
"go.opentelemetry.io/collector/processor/memorylimiterprocessor" // for putting backpressure when approach a memory limit
2424

2525
// Exporters:
2626
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter"
2727
fileexporter "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter" // for e2e tests
2828
debugexporter "go.opentelemetry.io/collector/exporter/debugexporter" // for dev
2929
"go.opentelemetry.io/collector/exporter/otlpexporter"
30+
31+
// Extensions
32+
"go.opentelemetry.io/collector/extension/memorylimiterextension" // for putting backpressure when approach a memory limit
3033
)
3134

3235
func components() (otelcol.Factories, error) {
@@ -45,7 +48,6 @@ func components() (otelcol.Factories, error) {
4548
// Processors
4649
factories.Processors, err = processor.MakeFactoryMap(
4750
batchprocessor.NewFactory(),
48-
memorylimiterprocessor.NewFactory(),
4951
resourceprocessor.NewFactory(),
5052
attributesprocessor.NewFactory(),
5153
transformprocessor.NewFactory(),
@@ -66,5 +68,12 @@ func components() (otelcol.Factories, error) {
6668
return otelcol.Factories{}, err
6769
}
6870

71+
factories.Extensions, err = extension.MakeFactoryMap(
72+
memorylimiterextension.NewFactory(),
73+
)
74+
if err != nil {
75+
return otelcol.Factories{}, err
76+
}
77+
6978
return factories, err
7079
}

‎otel.yml

+7
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,14 @@ exporters:
1616
sampling_initial: 10000
1717
sampling_thereafter: 10000
1818

19+
extensions:
20+
memory_limiter:
21+
check_interval: 1s
22+
limit_mib: 700
23+
spike_limit_mib: 180
24+
1925
service:
26+
extensions: [memory_limiter]
2027
pipelines:
2128
logs:
2229
receivers: [filelog]

0 commit comments

Comments
 (0)