Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Apr 4, 2025

TestCancelWithGrace in sqs_test.go has a timer correctness margin of only 5ms. This is much too low for a reliable test, timers are not guaranteed to have that granularity (especially on CI nodes where there are often execution delays). I saw it "failing" a couple times because it expected a duration of 1.0 seconds and instead got 1.006. This PR increases the acceptable margin to 50ms instead of 5.

Closes #43668.


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

`TestCancelWithGrace` in `sqs_test.go` has a timer correctness margin of only 5ms. This is much too low for a reliable test, timers are not guaranteed to have that granularity (especially on CI nodes where there are often execution delays). I saw it "failing" a couple times because it expected a duration of 1.0 seconds and instead got 1.006. This PR increases the acceptable margin to 50ms instead of 5.

Closes #43668.

(cherry picked from commit 7a95d64)

# Conflicts:
#	x-pack/filebeat/input/awss3/sqs_test.go
@mergify mergify bot requested a review from a team as a code owner April 4, 2025 15:06
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Apr 4, 2025
@mergify mergify bot assigned faec Apr 4, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Apr 4, 2025

Cherry-pick of 7a95d64 has failed:

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

You are currently cherry-picking commit 7a95d64c1.
  (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:   x-pack/filebeat/input/awss3/sqs_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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Apr 4, 2025
@github-actions github-actions bot added flaky-test Unstable or unreliable test cases. Team:obs-ds-hosted-services Label for the Observability Hosted Services team Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team labels Apr 4, 2025
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Apr 4, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@elasticmachine
Copy link
Contributor

Pinging @elastic/obs-ds-hosted-services (Team:obs-ds-hosted-services)

@mergify
Copy link
Contributor Author

mergify bot commented Apr 7, 2025

This pull request has not been merged yet. Could you please review and merge it @faec? 🙏

1 similar comment
@mergify
Copy link
Contributor Author

mergify bot commented Apr 14, 2025

This pull request has not been merged yet. Could you please review and merge it @faec? 🙏

@mergify
Copy link
Contributor Author

mergify bot commented Apr 16, 2025

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/9.0/pr-43672 upstream/mergify/bp/9.0/pr-43672
git merge upstream/9.0
git push upstream mergify/bp/9.0/pr-43672

@mergify
Copy link
Contributor Author

mergify bot commented Apr 21, 2025

This pull request has not been merged yet. Could you please review and merge it @faec? 🙏

@pierrehilbert
Copy link
Contributor

@faec Could you please followup with that PR?

@mergify
Copy link
Contributor Author

mergify bot commented Apr 28, 2025

This pull request has not been merged yet. Could you please review and merge it @faec? 🙏

@pierrehilbert
Copy link
Contributor

@faec any news here?

@mergify
Copy link
Contributor Author

mergify bot commented May 5, 2025

This pull request has not been merged yet. Could you please review and merge it @faec? 🙏

@faec faec closed this May 8, 2025
@mergify mergify bot deleted the mergify/bp/9.0/pr-43672 branch May 8, 2025 20:59
@faec faec restored the mergify/bp/9.0/pr-43672 branch May 8, 2025 21:03
@faec faec reopened this May 8, 2025
@mergify
Copy link
Contributor Author

mergify bot commented May 8, 2025

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/9.0/pr-43672 upstream/mergify/bp/9.0/pr-43672
git merge upstream/9.0
git push upstream mergify/bp/9.0/pr-43672

@faec faec merged commit ad484d0 into 9.0 May 9, 2025
21 of 24 checks passed
@faec faec deleted the mergify/bp/9.0/pr-43672 branch May 9, 2025 13:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request flaky-test Unstable or unreliable test cases. Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team Team:obs-ds-hosted-services Label for the Observability Hosted Services team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants