Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 11, 2025

Proposed commit message

Add add_cloud_metadata processor to the OTel Beat processor.

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

  1. Include the processor in Elastic Agent by adding it to https://github.com/elastic/elastic-agent/blob/89e0e9a5b0ebb376773de813a1fd2c0b2f30e74a/internal/pkg/otel/components.go.
  2. Build the Elastic Agent binary
  3. Run the Agent on a cloud instance, e.g. an AWS EC2 instance, with an OTel config that includes the Beat processor.

Example OTel config:

service:
  pipelines:
    logs:
      receivers:
        - filebeatreceiver
      processors:
        - beat
receivers:
  filebeatreceiver:
    filebeat:
      inputs:
        - type: filestream
          id: logs-from-files
          paths:
            - /var/log/*.log 
    processors: []
    output:
      otelconsumer:
    path.data: /tmp/1210/data
    path.logs: /tmp/1210/logs
    queue.mem:
      flush.timeout: 0
processors:
  beat:
    processors:
      - add_cloud_metadata:
exporters:
  debug:
    sending_queue:
      enabled: false
    use_internal_logger: false
    verbosity: detailed
```<hr>This is an automatic backport of pull request #48020 done by [Mergify](https://mergify.com).

* feat: add `add_cloud_metadata` processor to OTel Beat processor

* test: improve coverage in integration test

(cherry picked from commit e1630be)

# Conflicts:
#	x-pack/filebeat/tests/integration/otel_test.go
@mergify mergify bot requested a review from a team as a code owner December 11, 2025 14:18
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 11, 2025
@mergify mergify bot requested review from AndersonQ and khushijain21 and removed request for a team December 11, 2025 14:18
@mergify
Copy link
Contributor Author

mergify bot commented Dec 11, 2025

Cherry-pick of e1630be has failed:

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

You are currently cherry-picking commit e1630bed1.
  (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/otel/processor/beatprocessor/README.md
	modified:   x-pack/otel/processor/beatprocessor/processor.go
	modified:   x-pack/otel/processor/beatprocessor/processor_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	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 Dec 11, 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 enhancement release-note:skip The PR should be ignored when processing the changelog Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team skip-changelog labels Dec 11, 2025
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Dec 11, 2025
@elasticmachine
Copy link
Contributor

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

@mergify
Copy link
Contributor Author

mergify bot commented Dec 15, 2025

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

@andrzej-stencel andrzej-stencel merged commit fa9e782 into 9.1 Dec 15, 2025
16 of 17 checks passed
@andrzej-stencel andrzej-stencel deleted the mergify/bp/9.1/pr-48020 branch December 15, 2025 09:13
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 enhancement release-note:skip The PR should be ignored when processing the changelog 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