Skip to content

vendor perflib in perfcounterscraper #38859

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.

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

Merged
merged 9 commits into from
Apr 7, 2025

Conversation

braydonk
Copy link
Contributor

Description

This PR vendors the perflib package from the latest commit of windows_exporter. Some constants had to be copied from related packages in windows_exporter to make it work. Original license attribution to Prometheus Authors under MIT license is included in this copy.

Link to tracking issue

#38858

Testing

Ran tests locally, running integration tests in CI.

Documentation

@braydonk braydonk marked this pull request as ready for review April 2, 2025 15:48
@braydonk braydonk added the Skip Changelog PRs that do not require a CHANGELOG.md entry label Apr 2, 2025
Copy link
Contributor

@dehaansa dehaansa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, I added windows build tags where appropriate and gotidy'd and it all looks good now. Should probably have review from someone other than me though 👀

@braydonk
Copy link
Contributor Author

braydonk commented Apr 4, 2025

Thank you @dehaansa for your help getting the CI passing!

}

if err != nil {
panic(fmt.Sprint("Invalid index ", index))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please remove this panic.

@atoulme atoulme merged commit 818b8d5 into open-telemetry:main Apr 7, 2025
170 checks passed
@github-actions github-actions bot added this to the next release milestone Apr 7, 2025
dmathieu pushed a commit to dmathieu/opentelemetry-collector-contrib that referenced this pull request Apr 8, 2025
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description
This PR vendors the `perflib` package from the latest commit of
[`windows_exporter`](https://github.com/prometheus-community/windows_exporter).
Some constants had to be copied from related packages in
`windows_exporter` to make it work. Original license attribution to
Prometheus Authors under MIT license is included in this copy.

<!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. -->
#### Link to tracking issue
open-telemetry#38858

<!--Describe what testing was performed and which tests were added.-->
#### Testing
Ran tests locally, running integration tests in CI.

<!--Describe the documentation added.-->
#### Documentation

<!--Please delete paragraphs that you did not use before submitting.-->

---------

Co-authored-by: Sam DeHaan <[email protected]>
LucianoGiannotti pushed a commit to LucianoGiannotti/opentelemetry-collector-contrib that referenced this pull request Apr 9, 2025
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description
This PR vendors the `perflib` package from the latest commit of
[`windows_exporter`](https://github.com/prometheus-community/windows_exporter).
Some constants had to be copied from related packages in
`windows_exporter` to make it work. Original license attribution to
Prometheus Authors under MIT license is included in this copy.

<!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. -->
#### Link to tracking issue
open-telemetry#38858

<!--Describe what testing was performed and which tests were added.-->
#### Testing
Ran tests locally, running integration tests in CI.

<!--Describe the documentation added.-->
#### Documentation

<!--Please delete paragraphs that you did not use before submitting.-->

---------

Co-authored-by: Sam DeHaan <[email protected]>
Fiery-Fenix pushed a commit to Fiery-Fenix/opentelemetry-collector-contrib that referenced this pull request Apr 24, 2025
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description
This PR vendors the `perflib` package from the latest commit of
[`windows_exporter`](https://github.com/prometheus-community/windows_exporter).
Some constants had to be copied from related packages in
`windows_exporter` to make it work. Original license attribution to
Prometheus Authors under MIT license is included in this copy.

<!-- Issue number (e.g. open-telemetry#1234) or full URL to issue, if applicable. -->
#### Link to tracking issue
open-telemetry#38858

<!--Describe what testing was performed and which tests were added.-->
#### Testing
Ran tests locally, running integration tests in CI.

<!--Describe the documentation added.-->
#### Documentation

<!--Please delete paragraphs that you did not use before submitting.-->

---------

Co-authored-by: Sam DeHaan <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
connector/datadog exporter/datadog Datadog components receiver/hostmetrics Skip Changelog PRs that do not require a CHANGELOG.md entry
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants