Skip to content

chore: update OTel Collector libraries to v1.41.0/v0.135.0 #46464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrzej-stencel merged 12 commits into from
Sep 18, 2025
Merged

chore: update OTel Collector libraries to v1.41.0/v0.135.0 #46464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c4744e7
chore: update OTel Collector libraries to `v1.41.0`/`v0.135.0`
andrzej-stencel Sep 9, 2025
4d167d8
Merge remote-tracking branch 'upstream/main' into update-otel-to-v0.1…
andrzej-stencel Sep 9, 2025
c9cc09d
Merge remote-tracking branch 'upstream/main' into update-otel-to-v0.1…
andrzej-stencel Sep 10, 2025
0535ee8
fix(auditbeat): update ebpfevents to `v0.8.0`
andrzej-stencel Sep 10, 2025
9984966
make notice
andrzej-stencel Sep 10, 2025
124af8b
Merge remote-tracking branch 'upstream/main' into update-otel-to-v0.1…
andrzej-stencel Sep 11, 2025
a072f80
Merge remote-tracking branch 'upstream/main' into update-otel-to-v0.1…
andrzej-stencel Sep 12, 2025
743f5eb
test: fix TestFilebeatOTelE2E integration test
andrzej-stencel Sep 12, 2025
90368dd
Merge branch 'main' into update-otel-to-v0.135.0
andrzej-stencel Sep 12, 2025
728bfae
test: fix unit tests
andrzej-stencel Sep 14, 2025
8560d2c
Merge remote-tracking branch 'upstream/main' into update-otel-to-v0.1…
andrzej-stencel Sep 14, 2025
ae9d4fe
Merge remote-tracking branch 'upstream/main' into update-otel-to-v0.1…
andrzej-stencel Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,575 changes: 1,229 additions & 346 deletions NOTICE.txt
View file
Open in desktop

Large diffs are not rendered by default.

173 changes: 87 additions & 86 deletions go.mod
View file
Open in desktop

Large diffs are not rendered by default.

393 changes: 200 additions & 193 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions libbeat/otelbeat/beatconverter/beatconverter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ exporters:
max_conns_per_host: 1
sending_queue:
batch:
flush_timeout: 10s
max_size: 1600
min_size: 0
sizer: items
Expand Down Expand Up @@ -197,6 +198,7 @@ exporters:
max_conns_per_host: 1
sending_queue:
batch:
flush_timeout: 10s
max_size: 1600
min_size: 0
sizer: items
Expand Down
7 changes: 4 additions & 3 deletions libbeat/otelbeat/oteltranslate/outputs/elasticsearch/config_otel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,10 @@ func ToOTelConfig(output *config.C, logger *logp.Logger) (map[string]any, error)

"sending_queue": map[string]any{
"batch": map[string]any{
"max_size": escfg.BulkMaxSize, // bulk_max_size
"min_size": 0, // 0 means immediately trigger a flush
"sizer": "items",
"flush_timeout": "10s",
Comment thread
VihasMakwana marked this conversation as resolved.
"max_size": escfg.BulkMaxSize, // bulk_max_size
"min_size": 0, // 0 means immediately trigger a flush
"sizer": "items",
},
"enabled": true,
"queue_size": getQueueSize(logger, output),
Expand Down
14 changes: 11 additions & 3 deletions libbeat/otelbeat/oteltranslate/outputs/elasticsearch/config_otel_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ retry:
max_retries: 3
sending_queue:
batch:
flush_timeout: 10s
max_size: 1600
min_size: 0
sizer: items
Expand Down Expand Up @@ -122,6 +123,7 @@ retry:
timeout: 1m30s
sending_queue:
batch:
flush_timeout: 10s
max_size: 1600
min_size: 0
sizer: items
Expand All @@ -131,7 +133,7 @@ sending_queue:
queue_size: 3200
wait_for_result: true
mapping:
mode: bodymap
mode: bodymap
max_conns_per_host: 1
api_key: VGlOQUdHNEJhYU1kYUgxdFJmdVU6S25SNnlFNDFSclNvd2Iwa1EwSFdvQQ==
compression: gzip
Expand Down Expand Up @@ -171,7 +173,7 @@ password: changeme
user: elastic
timeout: 1m30s
mapping:
mode: bodymap
mode: bodymap
compression: gzip
compression_params:
level: 1
Expand All @@ -188,6 +190,7 @@ idle_conn_timeout: 3s
max_conns_per_host: 1
sending_queue:
batch:
flush_timeout: 10s
max_size: 1600
min_size: 0
sizer: items
Expand All @@ -205,6 +208,7 @@ idle_conn_timeout: 15s
max_conns_per_host: 4
sending_queue:
batch:
flush_timeout: 10s
max_size: 1600
min_size: 0
sizer: items
Expand Down Expand Up @@ -233,6 +237,7 @@ idle_conn_timeout: 1s
max_conns_per_host: 1
sending_queue:
batch:
flush_timeout: 10s
max_size: 1600
min_size: 0
sizer: items
Expand All @@ -242,7 +247,7 @@ sending_queue:
queue_size: 3200
wait_for_result: true
mapping:
mode: bodymap
mode: bodymap
compression: gzip
compression_params:
level: 1
Expand All @@ -255,6 +260,7 @@ idle_conn_timeout: 1m0s
max_conns_per_host: 1
sending_queue:
batch:
flush_timeout: 10s
max_size: 50
min_size: 0
sizer: items
Expand All @@ -272,6 +278,7 @@ idle_conn_timeout: 3s
max_conns_per_host: 1
sending_queue:
batch:
flush_timeout: 10s
max_size: 1600
min_size: 0
sizer: items
Expand Down Expand Up @@ -327,6 +334,7 @@ max_conns_per_host: 1
user: elastic
sending_queue:
batch:
flush_timeout: 10s
max_size: 1600
min_size: 0
sizer: items
Expand Down
1 change: 1 addition & 0 deletions x-pack/filebeat/tests/integration/otel_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,6 +685,7 @@ processors:
max_retries: 3
sending_queue:
batch:
flush_timeout: 10s
max_size: 1600
min_size: 0
sizer: items
Expand Down
7 changes: 4 additions & 3 deletions x-pack/metricbeat/tests/integration/otel_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ metricbeat:
processes:
- '.*'
metricsets:
- cpu
- cpu
output:
elasticsearch:
hosts:
Expand All @@ -82,7 +82,7 @@ processors:
- add_docker_metadata: ~
- add_kubernetes_metadata: ~
http.host: localhost
http.port: {{.MonitoringPort}}
http.port: {{.MonitoringPort}}
`

// start metricbeat in otel mode
Expand Down Expand Up @@ -529,7 +529,7 @@ metricbeat:
processes:
- '.*'
metricsets:
- cpu
- cpu
output:
elasticsearch:
hosts:
Expand Down Expand Up @@ -565,6 +565,7 @@ processors:
max_retries: 3
sending_queue:
batch:
flush_timeout: 10s
max_size: 1600
min_size: 0
sizer: items
Expand Down
Loading