Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 10, 2025

What does this PR do?

This PR removes the manual hooks i.e. FileBeatRegistryTarGz , GetBeatJsonMetricsDiagnostics and GetBeatInputMetricsDiagnostics functions.
These diagnostics are already collected by EDOT Diagnostics Extension.

Why is it important?

This PR fixes a bug where you get prompted every-time to replace files when extracting diagnostics when using EDOT.

Checklist

  • I have read and understood the pull request guidelines of this project.
  • 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
  • I have added an entry in ./changelog/fragments using the changelog tool
  • I have added an integration test or an E2E test

Related issues

Screenshot

Screenshot 2025-10-08 at 4 09 21 PM
This is an automatic backport of pull request #10415 done by [Mergify](https://mergify.com).

* chore: remove otel diagnostics from manager

* test

* more testing and refactor

* fix tests

* refactor

(cherry picked from commit 7afb200)

# Conflicts:
#	internal/pkg/agent/application/actions/handlers/handler_action_diagnostics_test.go
#	internal/pkg/agent/application/actions/handlers/mock_server.go
#	internal/pkg/otel/manager/diagnostics.go
#	internal/pkg/otel/manager/diagnostics_test.go
#	testing/integration/ess/diagnostics_test.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 10, 2025
@mergify mergify bot requested a review from a team as a code owner October 10, 2025 09:48
@mergify mergify bot requested review from kaanyalti and ycombinator and removed request for a team October 10, 2025 09:48
Copy link
Contributor Author

mergify bot commented Oct 10, 2025

Cherry-pick of 7afb200 has failed:

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

You are currently cherry-picking commit 7afb20069.
  (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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   internal/pkg/agent/application/actions/handlers/handler_action_diagnostics_test.go
	deleted by us:   internal/pkg/agent/application/actions/handlers/mock_server.go
	deleted by us:   internal/pkg/otel/manager/diagnostics.go
	deleted by us:   internal/pkg/otel/manager/diagnostics_test.go
	both modified:   testing/integration/ess/diagnostics_test.go

no changes added to commit (use "git add" and/or "git commit -a")

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 github-actions bot added bug Something isn't working Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog labels Oct 10, 2025
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

Copy link
Contributor Author

mergify bot commented Oct 13, 2025

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

@pierrehilbert
Copy link
Contributor

@VihasMakwana could you please resolve the conflicts?

@VihasMakwana
Copy link
Contributor

not needed on 9.1

@mergify mergify bot deleted the mergify/bp/9.1/pr-10415 branch October 15, 2025 15:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport bug Something isn't working conflicts There is a conflict in the backported pull request skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants