Skip to content

Fix tests in preparation for making otel self monitoring default #10537

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

Jump to bottom
Merged
swiatekm merged 5 commits into from
Oct 14, 2025
Merged

Fix tests in preparation for making otel self monitoring default #10537

swiatekm merged 5 commits into from
Oct 14, 2025

Conversation

@swiatekm
Copy link
Contributor

@swiatekm swiatekm commented Oct 14, 2025 •
edited
Loading

What does this PR do?

Fixes tests which implicitly assume beats are running as processes as opposed to otel receivers. More specifically:

  • 2952a12 makes the runtime leak test only look at beats running as processes.
  • c0d8385 makes integration tests check for running agent processes by only looking at processes without parents which are also elastic agents.
  • 72855e5 explicitly sets the runtime in tests where it matters.
  • 9d8cc7a checks for beats metrics in a more generic way.
  • 1c1a0c3 checks for the component build hash in a way that covers beats receivers as well.

Why is it important?

We want to enable beats receivers for self-monitoring by default. This PR makes the test adjustments separately to show they all pass for beats processes as well.

Checklist

  • I have read and understood the pull request guidelines of this project.
  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • [ ] I have made corresponding changes to the documentation
  • [ ] I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • [ ] I have added an entry in ./changelog/fragments using the changelog tool
  • I have added an integration test or an E2E test

Related issues

@swiatekm swiatekm added skip-changelog chore Tasks that just need to be done, they are neither bug, nor enhancements backport-9.2 Automated backport to the 9.2 branch labels Oct 14, 2025
@elasticmachine
Copy link
Contributor

elasticmachine commented Oct 14, 2025

💛 Build succeeded, but was flaky

Failed CI Steps

cc @swiatekm

@swiatekm swiatekm marked this pull request as ready for review October 14, 2025 16:22
@swiatekm swiatekm requested a review from a team as a code owner October 14, 2025 16:22
@swiatekm swiatekm requested review from blakerouse and pchila October 14, 2025 16:22
@swiatekm swiatekm added backport-active-all Automated backport with mergify to all the active branches and removed backport-9.2 Automated backport to the 9.2 branch labels Oct 14, 2025
@swiatekm swiatekm requested a review from cmacknz October 14, 2025 16:23
cmacknz
cmacknz reviewed Oct 14, 2025
View reviewed changes
@swiatekm swiatekm merged commit 3ccf28d into main Oct 14, 2025
31 checks passed
@swiatekm swiatekm deleted the test/fix-tests-for-otel-self-monitoring branch October 14, 2025 18:36
@github-actions
Copy link
Contributor

github-actions bot commented Oct 14, 2025

@Mergifyio backport 8.18 8.19 9.0 9.1 9.2

@mergify
Copy link
Contributor

mergify bot commented Oct 14, 2025 •
edited
Loading

backport 8.18 8.19 9.0 9.1 9.2

✅ Backports have been created

Details

mergify bot pushed a commit that referenced this pull request Oct 14, 2025
@swiatekm @mergify
Fix tests in preparation for making otel self monitoring default (#10537
42624bd 
)

* Fix leak integration test

* Improve detection of agent processes in integration tests

* Explicitly set the runtime in monitoring integration test

* Make the check for component metrics more generic

* Check the right build hash in integration tests

(cherry picked from commit 3ccf28d)

# Conflicts:
#	testing/integration/ess/beat_receivers_test.go
#	testing/integration/ess/metrics_monitoring_test.go
@mergify mergify bot mentioned this pull request Oct 14, 2025
Closed
5 tasks
mergify bot pushed a commit that referenced this pull request Oct 14, 2025
@swiatekm @mergify
Fix tests in preparation for making otel self monitoring default (#10537
5686c0f 
)

* Fix leak integration test

* Improve detection of agent processes in integration tests

* Explicitly set the runtime in monitoring integration test

* Make the check for component metrics more generic

* Check the right build hash in integration tests

(cherry picked from commit 3ccf28d)

# Conflicts:
#	testing/integration/ess/metrics_monitoring_test.go
@mergify mergify bot mentioned this pull request Oct 14, 2025
Merged
5 tasks
mergify bot pushed a commit that referenced this pull request Oct 14, 2025
@swiatekm @mergify
Fix tests in preparation for making otel self monitoring default (#10537
d03173b 
)

* Fix leak integration test

* Improve detection of agent processes in integration tests

* Explicitly set the runtime in monitoring integration test

* Make the check for component metrics more generic

* Check the right build hash in integration tests

(cherry picked from commit 3ccf28d)

# Conflicts:
#	testing/integration/ess/beat_receivers_test.go
@mergify mergify bot mentioned this pull request Oct 14, 2025
Closed
5 tasks
mergify bot pushed a commit that referenced this pull request Oct 14, 2025
@swiatekm @mergify
Fix tests in preparation for making otel self monitoring default (#10537
40238d1 
)

* Fix leak integration test

* Improve detection of agent processes in integration tests

* Explicitly set the runtime in monitoring integration test

* Make the check for component metrics more generic

* Check the right build hash in integration tests

(cherry picked from commit 3ccf28d)
@mergify mergify bot mentioned this pull request Oct 14, 2025
Merged
5 tasks
mergify bot pushed a commit that referenced this pull request Oct 14, 2025
@swiatekm @mergify
Fix tests in preparation for making otel self monitoring default (#10537
76f120e 
)

* Fix leak integration test

* Improve detection of agent processes in integration tests

* Explicitly set the runtime in monitoring integration test

* Make the check for component metrics more generic

* Check the right build hash in integration tests

(cherry picked from commit 3ccf28d)
@mergify mergify bot mentioned this pull request Oct 14, 2025
Merged
5 tasks
swiatekm added a commit that referenced this pull request Oct 14, 2025
@mergify @swiatekm
Fix tests in preparation for making otel self monitoring default (#10537
d72a0c1 
) (#10552)

* Fix leak integration test

* Improve detection of agent processes in integration tests

* Explicitly set the runtime in monitoring integration test

* Make the check for component metrics more generic

* Check the right build hash in integration tests

(cherry picked from commit 3ccf28d)

Co-authored-by: Mikołaj Świątek <mail@mikolajswiatek.com>
swiatekm added a commit that referenced this pull request Oct 14, 2025
@mergify @swiatekm
Fix tests in preparation for making otel self monitoring default (#10537
61ab378 
) (#10553)

* Fix leak integration test

* Improve detection of agent processes in integration tests

* Explicitly set the runtime in monitoring integration test

* Make the check for component metrics more generic

* Check the right build hash in integration tests

(cherry picked from commit 3ccf28d)

Co-authored-by: Mikołaj Świątek <mail@mikolajswiatek.com>
swiatekm added a commit that referenced this pull request Oct 15, 2025
@mergify @swiatekm
[8.19] (backport #10537) Fix tests in preparation for making otel sel…
b0fbb2e 
…f monitoring default (#10550)

* Fix tests in preparation for making otel self monitoring default (#10537)

* Fix leak integration test

* Improve detection of agent processes in integration tests

* Explicitly set the runtime in monitoring integration test

* Make the check for component metrics more generic

* Check the right build hash in integration tests

(cherry picked from commit 3ccf28d)

# Conflicts:
#	testing/integration/ess/metrics_monitoring_test.go

* Fix conflicts

---------

Co-authored-by: Mikołaj Świątek <mail@mikolajswiatek.com>
hayotbisonai pushed a commit to hayotbisonai/elastic-agent that referenced this pull request Nov 23, 2025
@swiatekm @hayotbisonai
Fix tests in preparation for making otel self monitoring default (ela…
b147189 
…stic#10537)

* Fix leak integration test

* Improve detection of agent processes in integration tests

* Explicitly set the runtime in monitoring integration test

* Make the check for component metrics more generic

* Check the right build hash in integration tests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cmacknz cmacknz cmacknz approved these changes

@blakerouse blakerouse Awaiting requested review from blakerouse blakerouse is a code owner automatically assigned from elastic/elastic-agent-control-plane

@pchila pchila Awaiting requested review from pchila pchila is a code owner automatically assigned from elastic/elastic-agent-control-plane

Assignees

@swiatekm swiatekm

Labels

backport-active-all Automated backport with mergify to all the active branches chore Tasks that just need to be done, they are neither bug, nor enhancements skip-changelog

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@swiatekm @elasticmachine @cmacknz