Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 19, 2025

Proposed commit message

All beatreceivers will use otelconsumer output by default and it does not require us to specify this explicitly.

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.

Disruptive User Impact

None

Related issues


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

* do not require explicit config

(cherry picked from commit b80d1e9)

# Conflicts:
#	x-pack/filebeat/fbreceiver/receiver_test.go
#	x-pack/filebeat/tests/integration/otel_lsexporter_test.go
#	x-pack/libbeat/cmd/instance/beat.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 19, 2025
@mergify mergify bot requested a review from a team as a code owner November 19, 2025 14:14
@mergify mergify bot requested review from andrzej-stencel and khushijain21 and removed request for a team November 19, 2025 14:14
@mergify
Copy link
Contributor Author

mergify bot commented Nov 19, 2025

Cherry-pick of b80d1e9 has failed:

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

You are currently cherry-picking commit b80d1e914.
  (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:
	modified:   x-pack/filebeat/fbreceiver/receiver_leak_test.go
	modified:   x-pack/filebeat/tests/integration/otel_test.go
	modified:   x-pack/libbeat/cmd/instance/beat_test.go
	modified:   x-pack/libbeat/common/otelbeat/oteltestcol/collector_test.go
	modified:   x-pack/metricbeat/mbreceiver/receiver_leak_test.go
	modified:   x-pack/metricbeat/mbreceiver/receiver_test.go
	modified:   x-pack/metricbeat/tests/integration/otel_test.go
	modified:   x-pack/otel/processor/beatprocessor/README.md
	modified:   x-pack/otel/processor/beatprocessor/integration_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   x-pack/filebeat/fbreceiver/receiver_test.go
	deleted by us:   x-pack/filebeat/tests/integration/otel_lsexporter_test.go
	both modified:   x-pack/libbeat/cmd/instance/beat.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 19, 2025
@github-actions github-actions bot added Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team skip-changelog labels Nov 19, 2025
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Nov 19, 2025
@elasticmachine
Copy link
Contributor

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

@pierrehilbert
Copy link
Contributor

@khushijain21 could you please fix the conflict?

@mergify
Copy link
Contributor Author

mergify bot commented Nov 24, 2025

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

@khushijain21 khushijain21 requested a review from a team as a code owner November 27, 2025 08:28
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 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.

4 participants