Skip to content

Commit 16c4d9a

Browse files
chore: update OTel Collector libraries to v1.41.0/v0.135.0 (#46464)
* chore: update OTel Collector libraries to `v1.41.0`/`v0.135.0` * fix(auditbeat): update ebpfevents to `v0.8.0` Resolves dependency conflict on github.com/cilium/ebpf. * make notice * test: fix TestFilebeatOTelE2E integration test The property `flush_timeout` has been required since v0.134.0. I believe this is a result of fixing config validation in open-telemetry/opentelemetry-collector#13611. * test: fix unit tests
1 parent e69f817 commit 16c4d9a

File tree

8 files changed

+1538
-634
lines changed

8 files changed

+1538
-634
lines changed

NOTICE.txt

Lines changed: 1229 additions & 346 deletions
Large diffs are not rendered by default.

go.mod

Lines changed: 87 additions & 86 deletions
Large diffs are not rendered by default.

go.sum

Lines changed: 200 additions & 193 deletions
Large diffs are not rendered by default.

libbeat/otelbeat/beatconverter/beatconverter_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ exporters:
4646
max_conns_per_host: 1
4747
sending_queue:
4848
batch:
49+
flush_timeout: 10s
4950
max_size: 1600
5051
min_size: 0
5152
sizer: items
@@ -197,6 +198,7 @@ exporters:
197198
max_conns_per_host: 1
198199
sending_queue:
199200
batch:
201+
flush_timeout: 10s
200202
max_size: 1600
201203
min_size: 0
202204
sizer: items

libbeat/otelbeat/oteltranslate/outputs/elasticsearch/config_otel.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,10 @@ func ToOTelConfig(output *config.C, logger *logp.Logger) (map[string]any, error)
142142

143143
"sending_queue": map[string]any{
144144
"batch": map[string]any{
145-
"max_size": escfg.BulkMaxSize, // bulk_max_size
146-
"min_size": 0, // 0 means immediately trigger a flush
147-
"sizer": "items",
145+
"flush_timeout": "10s",
146+
"max_size": escfg.BulkMaxSize, // bulk_max_size
147+
"min_size": 0, // 0 means immediately trigger a flush
148+
"sizer": "items",
148149
},
149150
"enabled": true,
150151
"queue_size": getQueueSize(logger, output),

libbeat/otelbeat/oteltranslate/outputs/elasticsearch/config_otel_test.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ retry:
7474
max_retries: 3
7575
sending_queue:
7676
batch:
77+
flush_timeout: 10s
7778
max_size: 1600
7879
min_size: 0
7980
sizer: items
@@ -122,6 +123,7 @@ retry:
122123
timeout: 1m30s
123124
sending_queue:
124125
batch:
126+
flush_timeout: 10s
125127
max_size: 1600
126128
min_size: 0
127129
sizer: items
@@ -131,7 +133,7 @@ sending_queue:
131133
queue_size: 3200
132134
wait_for_result: true
133135
mapping:
134-
mode: bodymap
136+
mode: bodymap
135137
max_conns_per_host: 1
136138
api_key: VGlOQUdHNEJhYU1kYUgxdFJmdVU6S25SNnlFNDFSclNvd2Iwa1EwSFdvQQ==
137139
compression: gzip
@@ -171,7 +173,7 @@ password: changeme
171173
user: elastic
172174
timeout: 1m30s
173175
mapping:
174-
mode: bodymap
176+
mode: bodymap
175177
compression: gzip
176178
compression_params:
177179
level: 1
@@ -188,6 +190,7 @@ idle_conn_timeout: 3s
188190
max_conns_per_host: 1
189191
sending_queue:
190192
batch:
193+
flush_timeout: 10s
191194
max_size: 1600
192195
min_size: 0
193196
sizer: items
@@ -205,6 +208,7 @@ idle_conn_timeout: 15s
205208
max_conns_per_host: 4
206209
sending_queue:
207210
batch:
211+
flush_timeout: 10s
208212
max_size: 1600
209213
min_size: 0
210214
sizer: items
@@ -233,6 +237,7 @@ idle_conn_timeout: 1s
233237
max_conns_per_host: 1
234238
sending_queue:
235239
batch:
240+
flush_timeout: 10s
236241
max_size: 1600
237242
min_size: 0
238243
sizer: items
@@ -242,7 +247,7 @@ sending_queue:
242247
queue_size: 3200
243248
wait_for_result: true
244249
mapping:
245-
mode: bodymap
250+
mode: bodymap
246251
compression: gzip
247252
compression_params:
248253
level: 1
@@ -255,6 +260,7 @@ idle_conn_timeout: 1m0s
255260
max_conns_per_host: 1
256261
sending_queue:
257262
batch:
263+
flush_timeout: 10s
258264
max_size: 50
259265
min_size: 0
260266
sizer: items
@@ -272,6 +278,7 @@ idle_conn_timeout: 3s
272278
max_conns_per_host: 1
273279
sending_queue:
274280
batch:
281+
flush_timeout: 10s
275282
max_size: 1600
276283
min_size: 0
277284
sizer: items
@@ -327,6 +334,7 @@ max_conns_per_host: 1
327334
user: elastic
328335
sending_queue:
329336
batch:
337+
flush_timeout: 10s
330338
max_size: 1600
331339
min_size: 0
332340
sizer: items

x-pack/filebeat/tests/integration/otel_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -685,6 +685,7 @@ processors:
685685
max_retries: 3
686686
sending_queue:
687687
batch:
688+
flush_timeout: 10s
688689
max_size: 1600
689690
min_size: 0
690691
sizer: items

x-pack/metricbeat/tests/integration/otel_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ metricbeat:
6666
processes:
6767
- '.*'
6868
metricsets:
69-
- cpu
69+
- cpu
7070
output:
7171
elasticsearch:
7272
hosts:
@@ -82,7 +82,7 @@ processors:
8282
- add_docker_metadata: ~
8383
- add_kubernetes_metadata: ~
8484
http.host: localhost
85-
http.port: {{.MonitoringPort}}
85+
http.port: {{.MonitoringPort}}
8686
`
8787

8888
// start metricbeat in otel mode
@@ -529,7 +529,7 @@ metricbeat:
529529
processes:
530530
- '.*'
531531
metricsets:
532-
- cpu
532+
- cpu
533533
output:
534534
elasticsearch:
535535
hosts:
@@ -565,6 +565,7 @@ processors:
565565
max_retries: 3
566566
sending_queue:
567567
batch:
568+
flush_timeout: 10s
568569
max_size: 1600
569570
min_size: 0
570571
sizer: items

0 commit comments

Comments
 (0)