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

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

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: # 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

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

Cherry-pick of 8a10df6 has failed:

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

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:
	modified:   .buildkite/x-pack/pipeline.xpack.otel.yml
	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/fbreceiver/receiver_test.go
	modified:   x-pack/filebeat/input/gcppubsub/otel_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/receiver.go
	modified:   x-pack/libbeat/outputs/otelconsumer/otelconsumer_test.go
	modified:   x-pack/metricbeat/mbreceiver/receiver_leak_test.go
	modified:   x-pack/metricbeat/mbreceiver/receiver_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/beatsuth_test.go -> x-pack/otel/extension/beatsauthextension/beatsauth_test.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/helper.go -> x-pack/otel/oteltest/helper.go
	renamed:    libbeat/otelbeat/oteltest/oteltest.go -> x-pack/otel/oteltest/oteltest.go
	renamed:    libbeat/otelbeat/oteltest/tls_helper.go -> x-pack/otel/oteltest/tls_helper.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:   x-pack/filebeat/tests/integration/otel_lsexporter_test.go
	both modified:   x-pack/libbeat/cmd/instance/beat_test.go
	both modified:   x-pack/libbeat/outputs/otelconsumer/otelconsumer.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/otelctx/otelctx.go
	deleted by us:   x-pack/otel/otelctx/otelctx_test.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:14Z

🤖 GitHub comments

Just comment with:

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

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

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

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

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

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

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

mergify · 2026-01-13T11:27:56Z

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/8.19/pr-47873 upstream/mergify/bp/8.19/pr-47873
git merge upstream/8.19
git push upstream mergify/bp/8.19/pr-47873

mauri870 · 2026-01-13T12:53:35Z

/test

mauri870 · 2026-01-13T14:09:11Z

/test

mergify · 2026-01-15T19:20:45Z

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/8.19/pr-47873 upstream/mergify/bp/8.19/pr-47873
git merge upstream/8.19
git push upstream mergify/bp/8.19/pr-47873

…47873

mauri870 · 2026-01-16T15:11:48Z

/test

mergify · 2026-01-19T05:02:20Z

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

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 added the backport label Jan 8, 2026

mergify Bot assigned mauri870 Jan 8, 2026

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

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

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 17:02

fix conflicts

d2434dc

fix conflicts

9786de8

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

c25e345

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

3626b34

fix conflicts

3513c0f

mauri870 approved these changes Jan 13, 2026

View reviewed changes

mauri870 enabled auto-merge (squash) January 13, 2026 11:36

mauri870 added 3 commits January 13, 2026 13:20

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

066b94b

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

9a3252b

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

ebdba61

Merge remote-tracking branch 'upstream/8.19' into mergify/bp/8.19/pr-…

bfe08a3

…47873

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

72beb8e

mauri870 merged commit 8e448b0 into 8.19 Jan 19, 2026
210 checks passed

mauri870 deleted the mergify/bp/8.19/pr-47873 branch January 19, 2026 12:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

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

[8.19](backport #47873) cleanup(otel): move otelbeat packages to x-pack/otel#48338
mauri870 merged 11 commits into
8.19from
mergify/bp/8.19/pr-47873

mergify Bot commented Jan 8, 2026

Uh oh!

mergify Bot commented Jan 8, 2026

Uh oh!

github-actions Bot commented Jan 8, 2026

Uh oh!

elasticmachine commented Jan 8, 2026

Uh oh!

elasticmachine commented Jan 8, 2026

Uh oh!

mergify Bot commented Jan 12, 2026

Uh oh!

mergify Bot commented Jan 13, 2026

Uh oh!

mauri870 commented Jan 13, 2026

Uh oh!

mauri870 commented Jan 13, 2026

Uh oh!

mergify Bot commented Jan 15, 2026

Uh oh!

mauri870 commented Jan 16, 2026

Uh oh!

mergify Bot commented Jan 19, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

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!

mergify Bot commented Jan 12, 2026

Uh oh!

mergify Bot commented Jan 13, 2026

Uh oh!

mauri870 commented Jan 13, 2026

Uh oh!

mauri870 commented Jan 13, 2026

Uh oh!

mergify Bot commented Jan 15, 2026

Uh oh!

mauri870 commented Jan 16, 2026

Uh oh!

mergify Bot commented Jan 19, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants