Skip to content

Commit c4ca29e

Browse files
[9.1] (backport #10851) Allow different beats versions in integration tests (#10864)
* Allow different beats versions in integration tests (#10851) (cherry picked from commit 89c9b27) # Conflicts: # testing/integration/ess/otel_test.go * Fix conflicts --------- Co-authored-by: Mikołaj Świątek <[email protected]>
1 parent a87f490 commit c4ca29e

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

testing/integration/ess/beat_receivers_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ func TestClassicAndReceiverAgentMonitoring(t *testing.T) {
375375
"agent.ephemeral_id",
376376
// agent.id is different because it's the id of the underlying beat
377377
"agent.id",
378-
// agent.version is different because we force version 9.0.0 in CI
378+
// for short periods of time, the beats binary version can be out of sync with the beat receiver version
379379
"agent.version",
380380
"data_stream.namespace",
381381
"elastic_agent.id",
@@ -596,6 +596,9 @@ outputs:
596596
"event.ingested",
597597
"event.duration",
598598

599+
// for short periods of time, the beats binary version can be out of sync with the beat receiver version
600+
"agent.version",
601+
599602
// only in receiver doc
600603
"agent.otelcol",
601604
"agent.otelcol.component.id",

testing/integration/ess/otel_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1623,6 +1623,8 @@ service:
16231623
"@timestamp",
16241624
"agent.ephemeral_id",
16251625
"agent.id",
1626+
1627+
// for short periods of time, the beats binary version can be out of sync with the beat receiver version
16261628
"agent.version",
16271629

16281630
// Missing from fbreceiver doc
@@ -1983,7 +1985,7 @@ receivers:
19831985
- cpu
19841986
output:
19851987
otelconsumer:
1986-
queue.mem.flush.timeout: 0s
1988+
queue.mem.flush.timeout: 0s
19871989
exporters:
19881990
elasticsearch/log:
19891991
endpoints:

0 commit comments

Comments
 (0)