Skip to content

[9.2] (backport #11418) [edot] add windowsperfcounters receiver #11579

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 1 commit into
base: 9.2
Choose a base branch
from
Open

[9.2] (backport #11418) [edot] add windowsperfcounters receiver #11579

wants to merge 1 commit into from

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Dec 3, 2025

What does this PR do?

This PR adds windowsperfcounters receiver to 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
This is an automatic backport of pull request #11418 done by [Mergify](https://mergify.com).

@VihasMakwana @mergify
[edot] add windowsperfcounters receiver (#11418)
e8f9611 
* add windowsperfcounters receiver

* chlog

* test

* Revert "add windowsperfcounters receiver"

This reverts commit 272650c.

* change go.mod

* readme

* Update changelog/fragments/1764082001-add-winperf.yaml

Co-authored-by: Mykola Kmet <[email protected]>

* comments

---------

Co-authored-by: Mykola Kmet <[email protected]>
(cherry picked from commit 097f2b3)

# Conflicts:
#	internal/edot/otelcol/components.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Dec 3, 2025
@mergify mergify bot requested a review from a team as a code owner December 3, 2025 18:59
@mergify mergify bot requested review from michel-laterman and ycombinator and removed request for a team December 3, 2025 18:59
@mergify
Copy link
Contributor Author

mergify bot commented Dec 3, 2025

Cherry-pick of 097f2b3 has failed:

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

You are currently cherry-picking commit 097f2b381.
  (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:   NOTICE-fips.txt
	modified:   NOTICE.txt
	new file:   changelog/fragments/1764082001-add-winperf.yaml
	modified:   go.mod
	modified:   go.sum
	modified:   internal/edot/go.mod
	modified:   internal/edot/go.sum
	modified:   internal/pkg/otel/README.md
	modified:   internal/pkg/otel/testdata/all-components.windows.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   internal/edot/otelcol/components.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 the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Dec 3, 2025
@elasticmachine
Copy link
Contributor

elasticmachine commented Dec 3, 2025

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

@elasticmachine
Copy link
Contributor

elasticmachine commented Dec 3, 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

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

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

At least 1 approving review is required to merge this pull request.

Assignees

@VihasMakwana VihasMakwana

Labels

backport conflicts There is a conflict in the backported pull request 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.

3 participants

@elasticmachine @VihasMakwana