Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 27, 2025

Proposed commit message

The otelbeat binary is not used anymore since we moved to an in-process testing collector in #47338, so remove the subcommand and all references to it in the build system. The otel subcommand was gated behind a build tag and only used in tests.

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.

Related issues

The otelbeat binary is not used anymore since we moved to an in-process testing collector in #47338, so remove the subcommand and all references to it in the build system. The otel subcommand was gated behind a build tag and only used in tests.

(cherry picked from commit f4b9ad1)

# Conflicts:
#	metricbeat/module/kubernetes/util/prometheus.go
#	x-pack/libbeat/common/otelbeat/otel.go
@mergify mergify bot added the backport label Nov 27, 2025
@mergify mergify bot requested a review from a team as a code owner November 27, 2025 15:23
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Nov 27, 2025
@mergify mergify bot requested review from mauri870 and rdner and removed request for a team November 27, 2025 15:23
@mergify
Copy link
Contributor Author

mergify bot commented Nov 27, 2025

Cherry-pick of f4b9ad1 has failed:

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

You are currently cherry-picking commit f4b9ad1dd.
  (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:   dev-tools/mage/build.go
	modified:   dev-tools/mage/gotest.go
	deleted:    libbeat/otelbeat/providers/fbprovider/fbprovider.go
	deleted:    libbeat/otelbeat/providers/fbprovider/fbprovider_test.go
	deleted:    libbeat/otelbeat/providers/mbprovider/mbprovider.go
	deleted:    libbeat/otelbeat/providers/mbprovider/mbprovider_test.go
	deleted:    libbeat/otelbeat/providers/providers.go
	deleted:    x-pack/filebeat/cmd/otelcmd_disabled.go
	deleted:    x-pack/filebeat/cmd/otelcmd_enabled.go
	modified:   x-pack/filebeat/cmd/root.go
	modified:   x-pack/filebeat/magefile.go
	deleted:    x-pack/metricbeat/cmd/otelcmd_disabled.go
	deleted:    x-pack/metricbeat/cmd/otelcmd_enabled.go
	modified:   x-pack/metricbeat/cmd/root.go
	modified:   x-pack/metricbeat/magefile.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: metricbeat/module/kubernetes/util/prometheus.go
	deleted by them: x-pack/libbeat/common/otelbeat/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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 27, 2025
@mergify mergify bot mentioned this pull request Nov 27, 2025
6 tasks
@github-actions github-actions bot added Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team skip-changelog labels Nov 27, 2025
@elasticmachine
Copy link
Contributor

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

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Nov 27, 2025
@mauri870 mauri870 enabled auto-merge (squash) November 27, 2025 19:32
@mauri870 mauri870 merged commit fc9026e into 8.19 Nov 27, 2025
203 of 206 checks passed
@mauri870 mauri870 deleted the mergify/bp/8.19/pr-47804 branch November 27, 2025 21:28
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 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