Skip to content

[9.0](backport #45314) otel: update filebeat integration tests to run in isolation#45317

Closed
mergify[bot] wants to merge 1 commit into9.0from
mergify/bp/9.0/pr-45314
Closed

[9.0](backport #45314) otel: update filebeat integration tests to run in isolation#45317
mergify[bot] wants to merge 1 commit into9.0from
mergify/bp/9.0/pr-45314

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jul 11, 2025

Proposed commit message

As a leftover from #45093, the tests added reuse the index names which may cause issues when running the tests in sequence without cleaning up first. Additionally, the beats receivers should not use the same path.home.

Adjusted the existing tests to use unique indexes and individual home folders.

Checklist

  • 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.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

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

@mauri870 @mergify
otel: update filebeat integration tests to run in isolation (#45314)
5043e5e 
As a leftover from #45093, the
tests added reuse the index names which may cause issues when running
the tests in sequence without cleaning up first.

Adjusted the existing tests to use unique indexes.

(cherry picked from commit ea98564)

# Conflicts:
#	x-pack/filebeat/tests/integration/otel_test.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jul 11, 2025
@mergify mergify bot requested a review from a team as a code owner July 11, 2025 11:16
@mergify mergify bot added the backport label Jul 11, 2025
@mergify mergify bot requested review from AndersonQ and removed request for a team July 11, 2025 11:16
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jul 11, 2025
@mergify mergify bot requested a review from VihasMakwana July 11, 2025 11:16
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Jul 11, 2025

Cherry-pick of ea98564 has failed:

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

You are currently cherry-picking commit ea98564a4.
  (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/tests/integration/otel_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 Jul 11, 2025
@mergify mergify bot mentioned this pull request Jul 11, 2025
Merged
6 tasks
@github-actions github-actions bot added cleanup Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team labels Jul 11, 2025
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jul 11, 2025

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 Jul 11, 2025
@mauri870
Copy link
Copy Markdown
Member

mauri870 commented Jul 11, 2025

The tests changed here do not exist in 9.0, closing.

@mauri870 mauri870 closed this Jul 11, 2025
@mergify mergify bot deleted the mergify/bp/9.0/pr-45314 branch July 11, 2025 11:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

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

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

Assignees

@mauri870 mauri870

Labels

backport cleanup conflicts There is a conflict in the backported pull request Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@elasticmachine @mauri870