Skip to content

Commit 0c05ac1

Browse files
andrzej-stencelmergify[bot]
authored andcommitted
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 (cherry picked from commit 16c4d9a) # Conflicts: # NOTICE.txt # go.mod # go.sum # x-pack/filebeat/tests/integration/otel_test.go # x-pack/metricbeat/tests/integration/otel_test.go
1 parent 6451184 commit 0c05ac1

File tree

8 files changed

+5050
-1878
lines changed

8 files changed

+5050
-1878
lines changed

NOTICE.txt

Lines changed: 4227 additions & 1775 deletions
Large diffs are not rendered by default.

go.mod

Lines changed: 119 additions & 36 deletions
Large diffs are not rendered by default.

go.sum

Lines changed: 225 additions & 59 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
@@ -73,6 +73,7 @@ retry:
7373
max_retries: 3
7474
sending_queue:
7575
batch:
76+
flush_timeout: 10s
7677
max_size: 1600
7778
min_size: 0
7879
sizer: items
@@ -121,6 +122,7 @@ retry:
121122
timeout: 1m30s
122123
sending_queue:
123124
batch:
125+
flush_timeout: 10s
124126
max_size: 1600
125127
min_size: 0
126128
sizer: items
@@ -130,7 +132,7 @@ sending_queue:
130132
queue_size: 3200
131133
wait_for_result: true
132134
mapping:
133-
mode: bodymap
135+
mode: bodymap
134136
max_conns_per_host: 1
135137
api_key: VGlOQUdHNEJhYU1kYUgxdFJmdVU6S25SNnlFNDFSclNvd2Iwa1EwSFdvQQ==
136138
compression: gzip
@@ -170,7 +172,7 @@ password: changeme
170172
user: elastic
171173
timeout: 1m30s
172174
mapping:
173-
mode: bodymap
175+
mode: bodymap
174176
compression: gzip
175177
compression_params:
176178
level: 1
@@ -187,6 +189,7 @@ idle_conn_timeout: 3s
187189
max_conns_per_host: 1
188190
sending_queue:
189191
batch:
192+
flush_timeout: 10s
190193
max_size: 1600
191194
min_size: 0
192195
sizer: items
@@ -204,6 +207,7 @@ idle_conn_timeout: 15s
204207
max_conns_per_host: 4
205208
sending_queue:
206209
batch:
210+
flush_timeout: 10s
207211
max_size: 1600
208212
min_size: 0
209213
sizer: items
@@ -232,6 +236,7 @@ idle_conn_timeout: 1s
232236
max_conns_per_host: 1
233237
sending_queue:
234238
batch:
239+
flush_timeout: 10s
235240
max_size: 1600
236241
min_size: 0
237242
sizer: items
@@ -241,7 +246,7 @@ sending_queue:
241246
queue_size: 3200
242247
wait_for_result: true
243248
mapping:
244-
mode: bodymap
249+
mode: bodymap
245250
compression: gzip
246251
compression_params:
247252
level: 1
@@ -254,6 +259,7 @@ idle_conn_timeout: 1m0s
254259
max_conns_per_host: 1
255260
sending_queue:
256261
batch:
262+
flush_timeout: 10s
257263
max_size: 50
258264
min_size: 0
259265
sizer: items
@@ -271,6 +277,7 @@ idle_conn_timeout: 3s
271277
max_conns_per_host: 1
272278
sending_queue:
273279
batch:
280+
flush_timeout: 10s
274281
max_size: 1600
275282
min_size: 0
276283
sizer: items
@@ -326,6 +333,7 @@ max_conns_per_host: 1
326333
user: elastic
327334
sending_queue:
328335
batch:
336+
flush_timeout: 10s
329337
max_size: 1600
330338
min_size: 0
331339
sizer: items

0 commit comments

Comments
 (0)