Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 25, 2025

Proposed commit message

remove otel.component.id and otel.component.kind from events that were generated by beat receivers.

The cost of sending the extra data in every event was found to be not worth the value of having the fields.

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

If anyone was using the fields to track beat receiver events, they won't be available anymore. However, the fields we not documented publicly and were not part of an API.

Author's Checklist

  • [ ]

How to test this PR locally

cd x-pack/filebeat/fbreceiver
go test .
cd x-pack/metricbeat/mbreceiver
go test .
cd x-pack/libbeat/outputs/otelconsumer
go test .

Related issues

Use cases

Screenshots

Logs


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

…eivers (#47729)

* remove component id and component kind fields from beat receivers

* add real PR link

* update integration tests

* fix merge mistake

(cherry picked from commit ca1c17b)

# Conflicts:
#	x-pack/filebeat/input/gcppubsub/otel_test.go
#	x-pack/filebeat/tests/integration/otel_lsexporter_test.go
#	x-pack/filebeat/tests/integration/otel_test.go
#	x-pack/libbeat/outputs/otelconsumer/otelconsumer.go
#	x-pack/libbeat/outputs/otelconsumer/otelconsumer_test.go
#	x-pack/metricbeat/mbreceiver/receiver_test.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 25, 2025
@mergify mergify bot requested review from a team as code owners November 25, 2025 20:40
@mergify mergify bot requested review from faec and mauri870 and removed request for a team November 25, 2025 20:40
@mergify
Copy link
Contributor Author

mergify bot commented Nov 25, 2025

Cherry-pick of ca1c17b has failed:

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

You are currently cherry-picking commit ca1c17bca.
  (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:   changelog/fragments/1763578431-remove-otel.component.id-and-otel.component.kind-from-beat-receiver-events.yaml
	modified:   x-pack/filebeat/fbreceiver/receiver_test.go
	modified:   x-pack/metricbeat/tests/integration/otel_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   x-pack/filebeat/input/gcppubsub/otel_test.go
	deleted by us:   x-pack/filebeat/tests/integration/otel_lsexporter_test.go
	both modified:   x-pack/filebeat/tests/integration/otel_test.go
	both modified:   x-pack/libbeat/outputs/otelconsumer/otelconsumer.go
	both modified:   x-pack/libbeat/outputs/otelconsumer/otelconsumer_test.go
	both modified:   x-pack/metricbeat/mbreceiver/receiver_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 25, 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!)

@github-actions github-actions bot added breaking change Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team labels Nov 25, 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 Nov 25, 2025
@mauri870
Copy link
Member

@leehinman I see the build is green, can we merge this?

@mergify
Copy link
Contributor Author

mergify bot commented Nov 27, 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.1/pr-47729 upstream/mergify/bp/9.1/pr-47729
git merge upstream/9.1
git push upstream mergify/bp/9.1/pr-47729

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport breaking change 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

Development

Successfully merging this pull request may close these issues.

4 participants