Skip to content

Commit 533a1e0

Browse files
authored
[receiver/hostmetrics] Migrate from vendored code to pkg/winperfcounters (#39916)
Completes the migration to `pkg/winperfcounters` and removes the vendored third party package, see #38858 (comment) for details.. Previous related changes: - #39690 - #39835 Fixes #38858 Memory and CPU usage by the collector went collect these metrics were not affected by this change, verified manually running the collector on Windows.
1 parent 1f430fe commit 533a1e0

30 files changed

+320
-1932
lines changed
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: receiver/hostmetricsreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Migrated `hostmetricsreceiver` to use `pkg/winperfcounters` when retrieving Windows performance counters.
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [38858]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [user]

connector/datadogconnector/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,3 +444,5 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog =>
444444
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../../pkg/core/xidutils
445445

446446
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog => ../../internal/datadog
447+
448+
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters => ../../pkg/winperfcounters

exporter/datadogexporter/go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,7 @@ require (
340340
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling v0.125.0 // indirect
341341
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.125.0 // indirect
342342
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.125.0 // indirect
343+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.125.0 // indirect
343344
github.com/opencontainers/go-digest v1.0.0 // indirect
344345
github.com/opencontainers/image-spec v1.1.1 // indirect
345346
github.com/opencontainers/runtime-spec v1.2.1 // indirect
@@ -516,6 +517,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza =>
516517

517518
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil
518519

520+
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters => ../../pkg/winperfcounters
521+
519522
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter => ../../internal/filter
520523

521524
retract (

exporter/datadogexporter/integrationtest/go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ require (
242242
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.125.0 // indirect
243243
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.125.0 // indirect
244244
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.125.0 // indirect
245+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.125.0 // indirect
245246
github.com/opencontainers/runtime-spec v1.2.1 // indirect
246247
github.com/openshift/api v3.9.0+incompatible // indirect
247248
github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect
@@ -451,6 +452,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/tran
451452

452453
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling => ../../../pkg/sampling
453454

455+
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters => ../../../pkg/winperfcounters
456+
454457
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil => ../../../internal/pdatautil
455458

456459
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata => ../../../pkg/experimentalmetricmetadata

internal/tidylist/tidylist.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ processor/transformprocessor
6767
internal/docker
6868
receiver/dockerstatsreceiver
6969
receiver/filelogreceiver
70+
pkg/winperfcounters
7071
receiver/hostmetricsreceiver
7172
internal/datadog
7273
pkg/datadog
@@ -201,7 +202,6 @@ internal/sqlquery
201202
internal/tools
202203
pkg/translator/azure
203204
pkg/translator/azurelogs
204-
pkg/winperfcounters
205205
processor/attributesprocessor
206206
processor/coralogixprocessor
207207
processor/cumulativetodeltaprocessor

receiver/hostmetricsreceiver/go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ require (
88
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.125.0
99
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.125.0
1010
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.125.0
11+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.125.0
1112
github.com/prometheus/procfs v0.16.1
1213
github.com/shirou/gopsutil/v4 v4.25.4
1314
github.com/stretchr/testify v1.10.0
@@ -136,3 +137,5 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden =>
136137
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata => ../../pkg/experimentalmetricmetadata
137138

138139
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl => ../../pkg/ottl
140+
141+
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters => ../../pkg/winperfcounters

receiver/hostmetricsreceiver/internal/perfcounters/doc.go

Lines changed: 0 additions & 8 deletions
This file was deleted.

receiver/hostmetricsreceiver/internal/perfcounters/package_test.go

Lines changed: 0 additions & 14 deletions
This file was deleted.

receiver/hostmetricsreceiver/internal/perfcounters/perfcounter_scraper.go

Lines changed: 0 additions & 198 deletions
This file was deleted.

receiver/hostmetricsreceiver/internal/perfcounters/perfcounter_scraper_errors.go

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)