Skip to content
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.

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

[8.17](backport #7190) Increase timeout for assertions in TestSetLogLevelFleetManaged #7199

Merged
merged 2 commits into from
Mar 6, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 5, 2025

What does this PR do?

Fleet checkins may take up to 5 minutes so we need to increase timeouts for assertions in TestSetLogLevelFleetManaged to account for it as the agent may apply log level settings while there's already a Fleet check-in in progress.
Settings timeouts for retrieving the correct log level in Fleet to 6 minutes should give enough time to agent to set the log level and communicate it to Fleet in a new check-in request.

Why is it important?

This PR should remove flakiness coming from elastic-agent check-in timing in TestSetLogLevelFleetManaged.

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

Disruptive User Impact

How to test this PR locally

Related issues

Questions to ask yourself

  • How are we going to support this in production?
  • How are we going to measure its adoption?
  • How are we going to debug this?
  • What are the metrics I should take care of?
  • ...

This is an automatic backport of pull request #7190 done by [Mergify](https://mergify.com).

Fleet checkins may take up to 5 minutes so we need to increase timeouts
for assertions in TestSetLogLevelFleetManaged to account for it as the
agent may apply log level settings while there's already a Fleet
check-in in progress.
Settings timeouts for retrieving the correct log level in Fleet to 6
minutes should give enough time to agent to set the log level and
communicate it to Fleet in a new check-in request.

(cherry picked from commit 12fa557)

# Conflicts:
#	testing/integration/log_level_test.go
@mergify mergify bot requested a review from a team as a code owner March 5, 2025 11:27
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Mar 5, 2025
@mergify mergify bot requested review from blakerouse and kaanyalti and removed request for a team March 5, 2025 11:27
@mergify mergify bot assigned pchila Mar 5, 2025
Copy link
Contributor Author

mergify bot commented Mar 5, 2025

Cherry-pick of 12fa557 has failed:

On branch mergify/bp/8.17/pr-7190
Your branch is up to date with 'origin/8.17'.

You are currently cherry-picking commit 12fa5571a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   testing/integration/log_level_test.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Mar 5, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@pchila pchila self-requested a review March 5, 2025 12:53
@pchila pchila removed the conflicts There is a conflict in the backported pull request label Mar 5, 2025
Copy link

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

History

cc @pchila

@pchila pchila merged commit 096f433 into 8.17 Mar 6, 2025
15 checks passed
@pchila pchila deleted the mergify/bp/8.17/pr-7190 branch March 6, 2025 14:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants