Skip to content

Conversation

@leehinman
Copy link
Contributor

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

@leehinman leehinman added breaking change Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team labels Nov 19, 2025
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Nov 19, 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!)

@mergify
Copy link
Contributor

mergify bot commented Nov 19, 2025

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @leehinman? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit
  • backport-active-all is the label that automatically backports to all active branches.
  • backport-active-8 is the label that automatically backports to all active minor branches for the 8 major.
  • backport-active-9 is the label that automatically backports to all active minor branches for the 9 major.

@leehinman leehinman added backport-8.19 Automated backport to the 8.19 branch backport-9.1 Automated backport to the 9.1 branch backport-9.2 Automated backport to the 9.2 branch labels Nov 19, 2025
@leehinman leehinman marked this pull request as ready for review November 20, 2025 02:34
@leehinman leehinman requested review from a team as code owners November 20, 2025 02:34
@leehinman leehinman requested review from belimawr and rdner November 20, 2025 02:34
@elasticmachine
Copy link
Contributor

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

Copy link
Contributor

@khushijain21 khushijain21 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@pierrehilbert
Copy link
Contributor

@narph Could we have your approval here please?

@mergify
Copy link
Contributor

mergify bot commented Nov 20, 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 47600_remove_collector_fields upstream/47600_remove_collector_fields
git merge upstream/main
git push upstream 47600_remove_collector_fields

@pierrehilbert
Copy link
Contributor

@efd6 / @andrewkroh could you please take a look here?

@mauri870 mauri870 self-requested a review November 21, 2025 11:32
@mauri870
Copy link
Member

Thanks. The cost of having these fields turned out to be higher than I initially anticipated when I proposed them. Looking at it from a different perspective now, I believe that if we ever want something like this back, Elastic Agent should probably be the one responsible for adding them.

@cmacknz cmacknz merged commit ca1c17b into elastic:main Nov 25, 2025
112 checks passed
mergify bot pushed a commit that referenced this pull request Nov 25, 2025
…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/tests/integration/otel_lsexporter_test.go
#	x-pack/libbeat/outputs/otelconsumer/otelconsumer.go
#	x-pack/libbeat/outputs/otelconsumer/otelconsumer_test.go
mergify bot pushed a commit that referenced this pull request Nov 25, 2025
…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 bot pushed a commit that referenced this pull request Nov 25, 2025
…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)
cmacknz pushed a commit that referenced this pull request Nov 25, 2025
…nd fields from beat receivers (#47788)

* remove otel.component.id and otel.component.kind fields from beat receivers (#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)

* fix test case that wasn't on main

---------

Co-authored-by: Lee E Hinman <57081003+leehinman@users.noreply.github.com>
Co-authored-by: Lee E. Hinman <lee.e.hinman@elastic.co>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-8.19 Automated backport to the 8.19 branch backport-9.1 Automated backport to the 9.1 branch backport-9.2 Automated backport to the 9.2 branch breaking change 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.

[beats receivers] Remove collector component identifying fields

8 participants