Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Oct 15, 2025

What does this PR do?

Split from #10052

This PR add a new elasticdiagnsotics extension. This new extension will be used in hybrid mode and will perform diagnostics for running otel collector. It will:

  • Acts as a registrar and keeps track of common diagnostic hooks.
  • Collects profiles using runtime/pprof.
  • Collects internal telemetry exposed by the OTeL Collector.
  • Implements the extensioncapabilities.ConfigWatcher interface and stores the latest configuration of the running collector.
  • Listens for diagnostic requests and provides diagnostic data.

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

How to test this PR locally

See #10052

Related issues


This is an automatic backport of pull request #10141 done by [Mergify](https://mergify.com).

* initial commit

* timeout

* fix tests

* comments

* error handling

* test case

* readme

* gofmt

* remove println

* test

* add cpu profile

* remove telemetry for now.

* remove redundant code

* doc

* fix npipe

* Update internal/pkg/otel/extension/elasticdiagnostics/extension.go

Co-authored-by: Craig MacKenzie <[email protected]>

* readme

* readme

* Update internal/pkg/otel/extension/elasticdiagnostics/extension.go

Co-authored-by: Panos Koutsovasilis <[email protected]>

* mutex

* comments

* Update generated_component_test.go

* Update generated_component_test.go

* comments

* test thorough

* use eventuallyWith

* test CI green

* remove platforms

---------

Co-authored-by: Craig MacKenzie <[email protected]>
Co-authored-by: Panos Koutsovasilis <[email protected]>
(cherry picked from commit cac88a4)

# Conflicts:
#	NOTICE-fips.txt
#	NOTICE.txt
#	go.mod
#	internal/pkg/otel/README.md
@mergify mergify bot requested a review from a team as a code owner October 15, 2025 15:36
@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 pchila and rubenruizdegauna and removed request for a team October 15, 2025 15:36
@mergify mergify bot added conflicts There is a conflict in the backported pull request backport labels Oct 15, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Oct 15, 2025

Cherry-pick of cac88a4 has failed:

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

You are currently cherry-picking commit cac88a467.
  (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:
	new file:   internal/pkg/otel/extension/elasticdiagnostics/README.md
	new file:   internal/pkg/otel/extension/elasticdiagnostics/config.go
	new file:   internal/pkg/otel/extension/elasticdiagnostics/extension.go
	new file:   internal/pkg/otel/extension/elasticdiagnostics/extension_test.go
	new file:   internal/pkg/otel/extension/elasticdiagnostics/factory.go
	new file:   internal/pkg/otel/extension/elasticdiagnostics/generated_component_test.go
	new file:   internal/pkg/otel/extension/elasticdiagnostics/internal/metadata/generated_status.go
	new file:   internal/pkg/otel/extension/elasticdiagnostics/metadata.yaml
	new file:   internal/pkg/otel/extension/elasticdiagnostics/response.go
	modified:   pkg/control/v2/client/dial.go
	modified:   pkg/control/v2/client/dial_windows.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   NOTICE-fips.txt
	both modified:   NOTICE.txt
	both modified:   go.mod
	both modified:   internal/pkg/otel/README.md

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 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)

@VihasMakwana VihasMakwana removed the conflicts There is a conflict in the backported pull request label Oct 15, 2025
@elasticmachine
Copy link
Collaborator

💛 Build succeeded, but was flaky

Failed CI Steps

History

cc @VihasMakwana

@VihasMakwana VihasMakwana merged commit 004118a into 8.19 Oct 16, 2025
17 checks passed
@VihasMakwana VihasMakwana deleted the mergify/bp/8.19/pr-10141 branch October 16, 2025 06:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants