Skip to content

[8.19] (backport #10415) [edot][diagnostics] remove otel diagnostics from manager #10599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 5 commits into
base: 8.19
Choose a base branch
from
Open

[8.19] (backport #10415) [edot][diagnostics] remove otel diagnostics from manager #10599

wants to merge 5 commits into from
+56 −453

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 15, 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).

@VihasMakwana @mergify
[edot][diagnostics] remove otel diagnostics from manager (#10415)
af41b4a 
* 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
#	testing/integration/ess/diagnostics_test.go
@mergify mergify bot requested a review from a team as a code owner October 15, 2025 15:54
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 15, 2025
@mergify mergify bot requested review from blakerouse and swiatekm and removed request for a team October 15, 2025 15:54
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Oct 15, 2025

Cherry-pick of 7afb200 has failed:

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

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)

Changes to be committed:
	modified:   internal/pkg/otel/manager/diagnostics_test.go

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
	both modified:   internal/pkg/otel/manager/diagnostics.go
	both modified:   testing/integration/ess/diagnostics_test.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 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 15, 2025
@elasticmachine
Copy link
Collaborator

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

@mergify Mergify
Copy link
Contributor Author

mergify bot commented Oct 16, 2025

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

@mergify Mergify
Copy link
Contributor Author

mergify bot commented Oct 20, 2025

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 20, 2025 •
edited
Loading

💔 Build Failed

Failed CI Steps

History

cc @VihasMakwana

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@VihasMakwana VihasMakwana VihasMakwana approved these changes

@blakerouse blakerouse Awaiting requested review from blakerouse blakerouse is a code owner automatically assigned from elastic/elastic-agent-control-plane

@swiatekm swiatekm Awaiting requested review from swiatekm swiatekm is a code owner automatically assigned from elastic/elastic-agent-control-plane

Assignees

@VihasMakwana VihasMakwana

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@elasticmachine @VihasMakwana