Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 26, 2025

Proposed commit message

This PR is a follow up to #47338 and updates the remaining tests that still used otelbeat to use the in-process OTel testing collector. To avoid cyclic dependency issues, some tests were relocated and parts of the code were moved into a shared package.

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. Where relevant, I have used the stresstest.sh script to run them under stress conditions and race detector to verify their stability.
  • I have added an entry in ./changelog/fragments using the changelog tool.

How to test this PR locally

cd x-pack/filebeat
mage goIntegTest

Related issues

(cherry picked from commit 7577d59)

# Conflicts:
#	x-pack/filebeat/input/gcppubsub/otel_test.go
#	x-pack/filebeat/input/gcppubsub/pubsub_test.go
#	x-pack/filebeat/tests/integration/otel_test.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 26, 2025
@mergify mergify bot requested review from a team as code owners November 26, 2025 11:04
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 26, 2025
@mergify mergify bot requested review from faec and mauri870 and removed request for a team November 26, 2025 11:04
@mergify
Copy link
Contributor Author

mergify bot commented Nov 26, 2025

Cherry-pick of 7577d59 has failed:

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

You are currently cherry-picking commit 7577d5964.
  (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)

Changes to be committed:
	new file:   x-pack/filebeat/input/gcppubsub/testutil/testutil.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   x-pack/filebeat/input/gcppubsub/otel_test.go
	both modified:   x-pack/filebeat/input/gcppubsub/pubsub_test.go
	both modified:   x-pack/filebeat/tests/integration/otel_test.go

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 Nov 26, 2025
@github-actions
Copy link
Contributor

🤖 GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@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 Nov 26, 2025
@mauri870
Copy link
Member

These tests are not supported in 9.1 due to missing features.

@mauri870 mauri870 closed this Nov 26, 2025
@mergify mergify bot deleted the mergify/bp/9.1/pr-47772 branch November 26, 2025 19:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport cleanup conflicts There is a conflict in the backported pull request skip-changelog 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.

3 participants