Skip to content

[9.1](backport #45242) otel: add otel-specific fields to ingested docs#46499

Merged
mauri870 merged 7 commits into9.1from
mergify/bp/9.1/pr-45242
Sep 10, 2025
Merged

[9.1](backport #45242) otel: add otel-specific fields to ingested docs#46499
mauri870 merged 7 commits into9.1from
mergify/bp/9.1/pr-45242

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Sep 10, 2025

Proposed commit message

This PR adds the otelcol.component.id and otelcol.component.kind to ingested beats receivers documents. These fields are exclusive to docs ingested by beats receivers and thus not present for standalone beats. In order to avoid conflicts with logs that already have these fields they are nested inside the beats event agent property.

See https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/component-universal-telemetry.md#receivers

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

@mauri870 @mergify
otel: add otel-specific fields to ingested docs (#45242)
0b43d4d 
* otel: add otelcol.component.id field to ingested docs

* adjust otelcol field name

* rename otelcol.component.id in beats event to otel.component.name

* add otel.component.type

* update metricbeatreceiver unit tests

* add integration test coverage

* update receiver name in test pipeline

* use filestream as receiver name

* revert to otelcol.component.id and otelcol.component.kind

* fix tests

* ignore fields

* ignore otel fields in gcppubsub test

* move assertion on otel fields to the up

* fix linter issues

* handle existing otelcol.component.id

* prevent otelcol fields from being replaced if they exist

* put otelcol fields nested inside agent property

* fix E2E tests

* use EventuallyWithTf

(cherry picked from commit fafbdcb)

# Conflicts:
#	x-pack/filebeat/input/gcppubsub/otel_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/tests/integration/otel_test.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 10, 2025
@mergify mergify bot requested review from a team as code owners September 10, 2025 11:05
@mergify mergify bot added the backport label Sep 10, 2025
@mergify mergify bot removed the request for review from a team September 10, 2025 11:05
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Sep 10, 2025
@mergify mergify bot requested a review from AndersonQ September 10, 2025 11:05
@mergify mergify bot requested a review from VihasMakwana September 10, 2025 11:05
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Sep 10, 2025

Cherry-pick of fafbdcb has failed:

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

You are currently cherry-picking commit fafbdcbd8.
  (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:   libbeat/beat/info.go
	modified:   libbeat/otelbeat/oteltest/oteltest.go
	modified:   x-pack/filebeat/fbreceiver/factory.go
	modified:   x-pack/filebeat/fbreceiver/receiver_test.go
	modified:   x-pack/libbeat/cmd/instance/beat.go
	modified:   x-pack/metricbeat/mbreceiver/factory.go
	modified:   x-pack/metricbeat/mbreceiver/receiver_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
	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/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

@mergify mergify bot mentioned this pull request Sep 10, 2025
Merged
6 tasks
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 10, 2025
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Sep 10, 2025

🤖 GitHub comments

Expand to view the 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 cleanup Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team Team:Security-Service Integrations Security Service Integrations Team labels Sep 10, 2025
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 10, 2025
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Sep 10, 2025

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

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Sep 10, 2025

Pinging @elastic/security-service-integrations (Team:Security-Service Integrations)

@mauri870 mauri870 mentioned this pull request Sep 10, 2025
Merged
6 tasks
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Sep 10, 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-45242 upstream/mergify/bp/9.1/pr-45242
git merge upstream/9.1
git push upstream mergify/bp/9.1/pr-45242

@mauri870 mauri870 enabled auto-merge (squash) September 10, 2025 17:10
@mauri870 mauri870 merged commit 0f4ba2c into 9.1 Sep 10, 2025
207 checks passed
@mauri870 mauri870 deleted the mergify/bp/9.1/pr-45242 branch September 10, 2025 17:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mauri870 mauri870 mauri870 approved these changes

@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 Team:Security-Service Integrations Security Service Integrations Team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@elasticmachine @mauri870