Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented May 2, 2025

fbreceiver.TestMultipleReceivers created two Filebeat receivers using the same config, which meant they both had the same home directory. This can cause conflicts that prevent a beat from starting, which is likely the cause of this test's recent flakiness. This PR wraps the config in a helper function so the two receivers get different temporary directories.


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

`fbreceiver.TestMultipleReceivers` created two Filebeat receivers using the same config, which meant they both had the same home directory. This can cause conflicts that prevent a beat from starting, which is likely the cause of this test's [recent flakiness](https://buildkite.com/elastic/beats-xpack-filebeat/builds/14573#019691c7-e3d0-430b-83a1-334343b57ef0/97-593). This PR wraps the config in a helper function so the two receivers get different temporary directories.

(cherry picked from commit d052026)

# Conflicts:
#	x-pack/filebeat/fbreceiver/receiver_test.go
@mergify mergify bot requested a review from a team as a code owner May 2, 2025 22:25
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 2, 2025
@mergify mergify bot requested review from mauri870 and rdner and removed request for a team May 2, 2025 22:25
@mergify mergify bot assigned faec May 2, 2025
@mergify
Copy link
Contributor Author

mergify bot commented May 2, 2025

Cherry-pick of d052026 has failed:

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

You are currently cherry-picking commit d0520260a.
  (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/fbreceiver/receiver_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 May 2, 2025
@github-actions github-actions bot added flaky-test Unstable or unreliable test cases. Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team labels May 2, 2025
@elasticmachine
Copy link
Contributor

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

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label May 2, 2025
@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? 🙏

@mauri870 mauri870 merged commit 63bd037 into 9.0 May 5, 2025
24 checks passed
@mauri870 mauri870 deleted the mergify/bp/9.0/pr-44188 branch May 5, 2025 12:09
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants