[9.1](backport #47873) cleanup(otel): move otelbeat packages to x-pack/otel by mergify[bot] · Pull Request #48339 · elastic/beats

mergify · 2026-01-08T12:52:17Z

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

Relates otel: update integration tests to use an in-process testing collector #47338
Relates otel: fix remaining tests to use in process testing collector #47772
Relates chore(otel): remove otelbeat #47804
Closes https://github.com/elastic/ingest-dev/issues/6207
This is an automatic backport of pull request cleanup(otel): move otelbeat packages to x-pack/otel #47873 done by Mergify.

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

mergify · 2026-01-08T12:52:20Z

Cherry-pick of 8a10df6 has failed:

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

You are currently cherry-picking commit 8a10df6d5.
  (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:
	deleted:    libbeat/otelbeat/beatconverter/beatconverter.go
	deleted:    libbeat/otelbeat/beatconverter/logging.go
	modified:   x-pack/filebeat/fbreceiver/receiver_leak_test.go
	modified:   x-pack/filebeat/tests/integration/otel_test.go
	modified:   x-pack/libbeat/cmd/instance/beat.go
	modified:   x-pack/libbeat/cmd/instance/beat_test.go
	modified:   x-pack/libbeat/outputs/otelconsumer/otelconsumer_test.go
	modified:   x-pack/metricbeat/mbreceiver/receiver_leak_test.go
	modified:   x-pack/metricbeat/tests/integration/otel_test.go
	renamed:    libbeat/otelbeat/beatconverter/beatconverter_test.go -> x-pack/otel/beatconverter/beatconverter_test.go
	new file:   x-pack/otel/beatconverter/logging.go
	renamed:    x-pack/libbeat/common/otelbeat/otelmanager/manager.go -> x-pack/otel/otelmanager/manager.go
	renamed:    libbeat/otelbeat/otelmap/otelmap.go -> x-pack/otel/otelmap/otelmap.go
	renamed:    libbeat/otelbeat/otelmap/otelmap_test.go -> x-pack/otel/otelmap/otelmap_test.go
	renamed:    libbeat/otelbeat/oteltest/oteltest.go -> x-pack/otel/oteltest/oteltest.go
	renamed:    x-pack/libbeat/common/otelbeat/oteltestcol/collector.go -> x-pack/otel/oteltestcol/collector.go
	renamed:    x-pack/libbeat/common/otelbeat/oteltestcol/collector_test.go -> x-pack/otel/oteltestcol/collector_test.go
	renamed:    libbeat/otelbeat/oteltranslate/outputs/elasticsearch/config_otel.go -> x-pack/otel/oteltranslate/outputs/elasticsearch/config_otel.go
	renamed:    libbeat/otelbeat/oteltranslate/outputs/elasticsearch/config_otel_test.go -> x-pack/otel/oteltranslate/outputs/elasticsearch/config_otel_test.go
	renamed:    libbeat/otelbeat/oteltranslate/testdata/certs/client.crt -> x-pack/otel/oteltranslate/testdata/certs/client.crt
	renamed:    libbeat/otelbeat/oteltranslate/testdata/certs/client.key -> x-pack/otel/oteltranslate/testdata/certs/client.key
	renamed:    libbeat/otelbeat/oteltranslate/testdata/certs/rootCA.crt -> x-pack/otel/oteltranslate/testdata/certs/rootCA.crt
	renamed:    libbeat/otelbeat/oteltranslate/tls_otel.go -> x-pack/otel/oteltranslate/tls_otel.go
	renamed:    libbeat/otelbeat/oteltranslate/tls_otel_fips_test.go -> x-pack/otel/oteltranslate/tls_otel_fips_test.go
	renamed:    libbeat/otelbeat/oteltranslate/tls_otel_nofips_test.go -> x-pack/otel/oteltranslate/tls_otel_nofips_test.go
	renamed:    libbeat/otelbeat/oteltranslate/tls_otel_test.go -> x-pack/otel/oteltranslate/tls_otel_test.go
	modified:   x-pack/otel/processor/beatprocessor/processor.go
	renamed:    x-pack/libbeat/common/otelbeat/status/reporter.go -> x-pack/otel/status/reporter.go
	renamed:    x-pack/libbeat/common/otelbeat/status/reporter_test.go -> x-pack/otel/status/reporter_test.go
	renamed:    x-pack/libbeat/common/otelbeat/status/runner.go -> x-pack/otel/status/runner.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .buildkite/x-pack/pipeline.xpack.otel.yml
	added by us:     libbeat/common/net_test.go
	both deleted:    libbeat/otelbeat/oteltest/helper.go
	both modified:   x-pack/filebeat/fbreceiver/receiver_test.go
	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/libbeat/cmd/instance/receiver.go
	both modified:   x-pack/libbeat/outputs/otelconsumer/otelconsumer.go
	both modified:   x-pack/metricbeat/mbreceiver/receiver_test.go
	both modified:   x-pack/otel/beatconverter/beatconverter.go
	deleted by us:   x-pack/otel/exporter/logstashexporter/exporter.go
	deleted by us:   x-pack/otel/exporter/logstashexporter/exporter_test.go
	deleted by us:   x-pack/otel/exporter/logstashexporter/exporter_tls_test.go
	deleted by us:   x-pack/otel/exporter/logstashexporter/internal/batch_test.go
	deleted by us:   x-pack/otel/exporter/logstashexporter/internal/event.go
	deleted by us:   x-pack/otel/exporter/logstashexporter/internal/event_test.go
	deleted by us:   x-pack/otel/extension/beatsauthextension/beatsauth_test.go
	deleted by us:   x-pack/otel/otelctx/otelctx.go
	deleted by us:   x-pack/otel/otelctx/otelctx_test.go
	added by them:   x-pack/otel/oteltest/helper.go
	deleted by us:   x-pack/otel/oteltest/tls_helper.go
	deleted by us:   x-pack/otel/oteltranslate/outputs/logstash/config_otel.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

github-actions · 2026-01-08T12:52:27Z

🤖 GitHub comments

Just comment with:

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

elasticmachine · 2026-01-08T12:52:32Z

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

elasticmachine · 2026-01-08T12:52:32Z

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

mauri870 · 2026-01-08T17:08:48Z

/test

mauri870 · 2026-01-08T19:42:30Z

/test

mauri870 · 2026-01-09T11:31:47Z

/test

mauri870 · 2026-01-09T16:32:00Z

/test

mergify · 2026-01-12T05:02:14Z

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

mauri870 · 2026-01-12T11:56:10Z

/test

mauri870 · 2026-01-12T13:30:02Z

/test

mauri870 · 2026-01-12T14:43:41Z

/test

mergify Bot added backport conflicts There is a conflict in the backported pull request labels Jan 8, 2026

mergify Bot requested review from a team as code owners January 8, 2026 12:52

mergify Bot requested review from VihasMakwana and orestisfl and removed request for a team January 8, 2026 12:52

mergify Bot assigned mauri870 Jan 8, 2026

botelastic Bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jan 8, 2026

mergify Bot mentioned this pull request Jan 8, 2026

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

Merged

6 tasks

github-actions Bot added Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team Team:Security-Service Integrations Security Service Integrations Team skip-changelog labels Jan 8, 2026

botelastic Bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jan 8, 2026

mauri870 added 3 commits January 8, 2026 12:13

fix imports

453f3ac

remove files not in 9.1 branch

fc16ed2

remove unused oteltest import

4e845a3

remove otelctx package not in 9.1 branch

c66c89b

Merge branch '9.1' into mergify/bp/9.1/pr-47873

a0f2670

mauri870 approved these changes Jan 13, 2026

View reviewed changes

mauri870 merged commit 41e41e5 into 9.1 Jan 13, 2026
208 checks passed

mauri870 deleted the mergify/bp/9.1/pr-47873 branch January 13, 2026 11:26

Uh oh!

Conversation

mergify Bot commented Jan 8, 2026

Proposed commit message

Checklist

How to test this PR locally

Related issues

Uh oh!

mergify Bot commented Jan 8, 2026

Uh oh!

github-actions Bot commented Jan 8, 2026

🤖 GitHub comments

Uh oh!

elasticmachine commented Jan 8, 2026

Uh oh!

elasticmachine commented Jan 8, 2026

Uh oh!

mauri870 commented Jan 8, 2026

Uh oh!

mauri870 commented Jan 8, 2026

Uh oh!

mauri870 commented Jan 9, 2026

Uh oh!

mauri870 commented Jan 9, 2026

Uh oh!

mergify Bot commented Jan 12, 2026

Uh oh!

mauri870 commented Jan 12, 2026

Uh oh!

mauri870 commented Jan 12, 2026

Uh oh!

mauri870 commented Jan 12, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants