cleanup(otel): move otelbeat packages to x-pack/otel by mauri870 · Pull Request #47873 · elastic/beats

mauri870 · 2025-12-02T20:12:24Z

Proposed commit message

Move the remaining otelbeat packages to x-pack/otel so that all otel-related code is centralized.

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

cd x-pack/filebeat
mage goIntegTest

cd x-pack/metricbeat
mage goIntegTest

Related issues

github-actions · 2025-12-02T20:12:34Z

🤖 GitHub comments

Just comment with:

run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

mauri870 · 2025-12-03T11:43:13Z

/test

mauri870 · 2025-12-03T12:55:13Z

/test

elasticmachine · 2025-12-03T12:55:21Z

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

mauri870 · 2025-12-03T13:29:31Z

Some intermittent agent lost failures are occurring in CI. It seems to be a widespread issue on Buildkite.

mauri870 · 2025-12-03T14:18:27Z

/test

elasticmachine · 2025-12-04T07:25:41Z

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

pierrehilbert · 2025-12-04T07:26:01Z

@narph we will need someone from your team to review here please.

Move the remaining otelbeat packages to x-pack/otel so that all otel-related code is centralized. (cherry picked from commit 8a10df6) # Conflicts: # .buildkite/x-pack/pipeline.xpack.otel.yml # libbeat/common/net_test.go # libbeat/otelbeat/oteltest/helper.go # x-pack/filebeat/fbreceiver/receiver_test.go # x-pack/filebeat/input/gcppubsub/otel_test.go # x-pack/filebeat/tests/integration/otel_lsexporter_test.go # x-pack/libbeat/cmd/instance/receiver.go # x-pack/libbeat/outputs/otelconsumer/otelconsumer.go # x-pack/metricbeat/mbreceiver/receiver_test.go # x-pack/otel/beatconverter/beatconverter.go # x-pack/otel/exporter/logstashexporter/exporter.go # x-pack/otel/exporter/logstashexporter/exporter_test.go # x-pack/otel/exporter/logstashexporter/exporter_tls_test.go # x-pack/otel/exporter/logstashexporter/internal/batch_test.go # x-pack/otel/exporter/logstashexporter/internal/event.go # x-pack/otel/exporter/logstashexporter/internal/event_test.go # x-pack/otel/extension/beatsauthextension/beatsauth_test.go # x-pack/otel/otelctx/otelctx.go # x-pack/otel/otelctx/otelctx_test.go # x-pack/otel/oteltest/helper.go # x-pack/otel/oteltest/tls_helper.go # x-pack/otel/oteltranslate/outputs/logstash/config_otel.go

Move the remaining otelbeat packages to x-pack/otel so that all otel-related code is centralized. (cherry picked from commit 8a10df6)

Move the remaining otelbeat packages to x-pack/otel so that all otel-related code is centralized. (cherry picked from commit 8a10df6) Co-authored-by: Mauri de Souza Meneguzzo <mauri870@gmail.com>

…k/otel (#48340) * cleanup(otel): move otelbeat packages to x-pack/otel (#47873) Move the remaining otelbeat packages to x-pack/otel so that all otel-related code is centralized. (cherry picked from commit 8a10df6) * fix imports --------- Co-authored-by: Mauri de Souza Meneguzzo <mauri870@gmail.com>

PR #47873 moved some code to x-pack/otel, which increased the amount of code and dependencies required for the mage check call. After it was merged, we saw an increase in agent lost -1 errors from Buildkite agents, likely due to OOM conditions. This PR increases the amount of memory available to the agent for this stage.

PR #47873 moved some code to x-pack/otel, which increased the amount of code and dependencies required for the mage check call. After it was merged, we saw an increase in agent lost -1 errors from Buildkite agents, likely due to OOM conditions. This PR increases the amount of memory available to the agent for this stage. (cherry picked from commit be94b2a) # Conflicts: # .buildkite/x-pack/pipeline.xpack.otel.yml

PR #47873 moved some code to x-pack/otel, which increased the amount of code and dependencies required for the mage check call. After it was merged, we saw an increase in agent lost -1 errors from Buildkite agents, likely due to OOM conditions. This PR increases the amount of memory available to the agent for this stage. (cherry picked from commit be94b2a)

PR #47873 moved some code to x-pack/otel, which increased the amount of code and dependencies required for the mage check call. After it was merged, we saw an increase in agent lost -1 errors from Buildkite agents, likely due to OOM conditions. This PR increases the amount of memory available to the agent for this stage. (cherry picked from commit be94b2a) # Conflicts: # .buildkite/x-pack/pipeline.xpack.otel.yml

PR #47873 moved some code to x-pack/otel, which increased the amount of code and dependencies required for the mage check call. After it was merged, we saw an increase in agent lost -1 errors from Buildkite agents, likely due to OOM conditions. This PR increases the amount of memory available to the agent for this stage. (cherry picked from commit be94b2a)

… (#48391) PR #47873 moved some code to x-pack/otel, which increased the amount of code and dependencies required for the mage check call. After it was merged, we saw an increase in agent lost -1 errors from Buildkite agents, likely due to OOM conditions. This PR increases the amount of memory available to the agent for this stage. (cherry picked from commit be94b2a) Co-authored-by: Mauri de Souza Meneguzzo <mauri870@gmail.com>

… (#48393) PR #47873 moved some code to x-pack/otel, which increased the amount of code and dependencies required for the mage check call. After it was merged, we saw an increase in agent lost -1 errors from Buildkite agents, likely due to OOM conditions. This PR increases the amount of memory available to the agent for this stage. (cherry picked from commit be94b2a) Co-authored-by: Mauri de Souza Meneguzzo <mauri870@gmail.com>

…k/otel (#48339) * cleanup(otel): move otelbeat packages to x-pack/otel (#47873) Move the remaining otelbeat packages to x-pack/otel so that all otel-related code is centralized. (cherry picked from commit 8a10df6) # Conflicts: # .buildkite/x-pack/pipeline.xpack.otel.yml # libbeat/common/net_test.go # libbeat/otelbeat/oteltest/helper.go # x-pack/filebeat/fbreceiver/receiver_test.go # x-pack/filebeat/input/gcppubsub/otel_test.go # x-pack/filebeat/tests/integration/otel_lsexporter_test.go # x-pack/libbeat/cmd/instance/receiver.go # x-pack/libbeat/outputs/otelconsumer/otelconsumer.go # x-pack/metricbeat/mbreceiver/receiver_test.go # x-pack/otel/beatconverter/beatconverter.go # x-pack/otel/exporter/logstashexporter/exporter.go # x-pack/otel/exporter/logstashexporter/exporter_test.go # x-pack/otel/exporter/logstashexporter/exporter_tls_test.go # x-pack/otel/exporter/logstashexporter/internal/batch_test.go # x-pack/otel/exporter/logstashexporter/internal/event.go # x-pack/otel/exporter/logstashexporter/internal/event_test.go # x-pack/otel/extension/beatsauthextension/beatsauth_test.go # x-pack/otel/otelctx/otelctx.go # x-pack/otel/otelctx/otelctx_test.go # x-pack/otel/oteltest/helper.go # x-pack/otel/oteltest/tls_helper.go # x-pack/otel/oteltranslate/outputs/logstash/config_otel.go * fix imports * remove files not in 9.1 branch * remove unused oteltest import * remove otelctx package not in 9.1 branch --------- Co-authored-by: Mauri de Souza Meneguzzo <mauri870@gmail.com>

…el check pipeline (#48390) * ci: tentative fix for agent lost in x-pack otel check pipeline (#48387) PR #47873 moved some code to x-pack/otel, which increased the amount of code and dependencies required for the mage check call. After it was merged, we saw an increase in agent lost -1 errors from Buildkite agents, likely due to OOM conditions. This PR increases the amount of memory available to the agent for this stage. (cherry picked from commit be94b2a) # Conflicts: # .buildkite/x-pack/pipeline.xpack.otel.yml * fix conflicts --------- Co-authored-by: Mauri de Souza Meneguzzo <mauri870@gmail.com>

…ck/otel (#48338) * cleanup(otel): move otelbeat packages to x-pack/otel (#47873) Move the remaining otelbeat packages to x-pack/otel so that all otel-related code is centralized. (cherry picked from commit 8a10df6) # Conflicts: # x-pack/filebeat/tests/integration/otel_lsexporter_test.go # x-pack/libbeat/cmd/instance/beat_test.go # x-pack/libbeat/outputs/otelconsumer/otelconsumer.go # x-pack/otel/beatconverter/beatconverter.go # x-pack/otel/exporter/logstashexporter/exporter.go # x-pack/otel/exporter/logstashexporter/exporter_test.go # x-pack/otel/exporter/logstashexporter/exporter_tls_test.go # x-pack/otel/exporter/logstashexporter/internal/batch_test.go # x-pack/otel/exporter/logstashexporter/internal/event.go # x-pack/otel/exporter/logstashexporter/internal/event_test.go # x-pack/otel/otelctx/otelctx.go # x-pack/otel/otelctx/otelctx_test.go # x-pack/otel/oteltranslate/outputs/logstash/config_otel.go * fix conflicts * fix conflicts --------- Co-authored-by: Mauri de Souza Meneguzzo <mauri870@gmail.com>

Manually update Beats to elastic/beats@9c75eba. Incorporates the new import paths from elastic/beats#47873.

cleanup(otel): move otelbeat packages to x-pack/otel

29d40e1

mauri870 self-assigned this Dec 2, 2025

mauri870 added Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team backport-active-all Automated backport with mergify to all the active branches skip-changelog labels Dec 2, 2025

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 Dec 2, 2025

mauri870 added 2 commits December 2, 2025 17:21

fix license headers

964c00b

fix imports

38a3c97

mauri870 force-pushed the rellocate-xpack-otel branch from 61955a4 to 38a3c97 Compare December 3, 2025 11:20

Merge branch 'main' into rellocate-xpack-otel

6e1f032

mauri870 marked this pull request as ready for review December 3, 2025 12:55

mauri870 requested review from a team as code owners December 3, 2025 12:55

mauri870 requested review from VihasMakwana and faec December 3, 2025 12:55

mauri870 added 2 commits December 3, 2025 13:53

Merge branch 'main' into rellocate-xpack-otel

914f6b0

Merge branch 'main' into rellocate-xpack-otel

2c2ec4c

cmacknz reviewed Dec 3, 2025

View reviewed changes

Comment thread x-pack/otel/beatconverter/beatconverter.go

pierrehilbert added the Team:Security-Service Integrations Security Service Integrations Team label Dec 4, 2025

Merge branch 'main' into rellocate-xpack-otel

3353acd

mauri870 requested a review from cmacknz December 4, 2025 11:44

mergify Bot mentioned this pull request Jan 8, 2026

[9.1](backport #47873) cleanup(otel): move otelbeat packages to x-pack/otel #48339

Merged

6 tasks

mergify Bot pushed a commit that referenced this pull request Jan 8, 2026

cleanup(otel): move otelbeat packages to x-pack/otel (#47873)

f8aa3b3

Move the remaining otelbeat packages to x-pack/otel so that all otel-related code is centralized. (cherry picked from commit 8a10df6)

mergify Bot mentioned this pull request Jan 8, 2026

[9.2](backport #47873) cleanup(otel): move otelbeat packages to x-pack/otel #48340

Merged

6 tasks

mergify Bot pushed a commit that referenced this pull request Jan 8, 2026

cleanup(otel): move otelbeat packages to x-pack/otel (#47873)

e5bc79c

Move the remaining otelbeat packages to x-pack/otel so that all otel-related code is centralized. (cherry picked from commit 8a10df6)

mergify Bot mentioned this pull request Jan 8, 2026

[9.3](backport #47873) cleanup(otel): move otelbeat packages to x-pack/otel #48341

Merged

6 tasks

mauri870 mentioned this pull request Jan 12, 2026

ci: tentative fix for agent lost in x-pack otel check pipeline #48387

Merged

6 tasks

mergify Bot mentioned this pull request Jan 12, 2026

[8.19](backport #48387) ci: tentative fix for agent lost in x-pack otel check pipeline #48390

Merged

6 tasks

This was referenced Jan 12, 2026

[9.2](backport #48387) ci: tentative fix for agent lost in x-pack otel check pipeline #48391

Merged

[9.1](backport #48387) ci: tentative fix for agent lost in x-pack otel check pipeline #48392

Closed

mergify Bot mentioned this pull request Jan 12, 2026

[9.3](backport #48387) ci: tentative fix for agent lost in x-pack otel check pipeline #48393

Merged

6 tasks

mauri870 added a commit to mauri870/elastic-agent that referenced this pull request Jan 22, 2026

[8.19] Manually update Beats from 5ccf2d9de220 to 9c75ebab5594

d652c97

Manually update Beats to elastic/beats@9c75eba. Incorporates the new import paths from elastic/beats#47873.

mauri870 added a commit to mauri870/elastic-agent that referenced this pull request Jan 22, 2026

[8.19] Manually update Beats from 5ccf2d9de220 to 9c75ebab5594

6ea8e5d

Manually update Beats to elastic/beats@9c75eba. Incorporates the new import paths from elastic/beats#47873.

mauri870 mentioned this pull request Jan 22, 2026

[8.19] Manually update Beats from 5ccf2d9de220 to 9c75ebab5594 elastic/elastic-agent#12379

Merged

swiatekm pushed a commit to elastic/elastic-agent that referenced this pull request Jan 22, 2026

[8.19] Manually update Beats from 5ccf2d9de220 to 9c75ebab5594 (#12379)

d856a43

Manually update Beats to elastic/beats@9c75eba. Incorporates the new import paths from elastic/beats#47873.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

cleanup(otel): move otelbeat packages to x-pack/otel#47873

cleanup(otel): move otelbeat packages to x-pack/otel#47873
mauri870 merged 27 commits into
elastic:mainfrom
mauri870:rellocate-xpack-otel

mauri870 commented Dec 2, 2025 •

edited

Loading

Uh oh!

github-actions Bot commented Dec 2, 2025

Uh oh!

mauri870 commented Dec 3, 2025

Uh oh!

mauri870 commented Dec 3, 2025

Uh oh!

elasticmachine commented Dec 3, 2025

Uh oh!

mauri870 commented Dec 3, 2025

Uh oh!

mauri870 commented Dec 3, 2025

Uh oh!

Uh oh!

elasticmachine commented Dec 4, 2025

Uh oh!

pierrehilbert commented Dec 4, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Uh oh!

Conversation

mauri870 commented Dec 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Proposed commit message

Checklist

How to test this PR locally

Related issues

Uh oh!

github-actions Bot commented Dec 2, 2025

🤖 GitHub comments

Uh oh!

mauri870 commented Dec 3, 2025

Uh oh!

mauri870 commented Dec 3, 2025

Uh oh!

elasticmachine commented Dec 3, 2025

Uh oh!

mauri870 commented Dec 3, 2025

Uh oh!

mauri870 commented Dec 3, 2025

Uh oh!

Uh oh!

elasticmachine commented Dec 4, 2025

Uh oh!

pierrehilbert commented Dec 4, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

mauri870 commented Dec 2, 2025 •

edited

Loading