sendnrw/windows_exporter
2
0
Fork 0
mirror of https://github.com/prometheus-community/windows_exporter.git synced 2026-10-17 10:09:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

mi: correctness fixes for unmarshal, resource leak, and test robustness (#2501)

Browse Source 
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau
2026-10-07 17:59:40 +02:00
committed by GitHub
co-authored by Claude Opus 4.6
parent 049cab563b
commit 6cdc9db241
9 changed files with 711 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/utils/testutils/testutils.go
+23 -3
View File
@@ -92,7 +92,7 @@ func TestCollector[C collector.Collector, V any](t *testing.T, fn func(*V) C, co
t.Cleanup(func() { assert.NoError(t, c.Close()) })
if err := c.Build(logger, miSession); err != nil {
if !required && unsupportedCollector(err) {
if !required && unsupportedBuild(err) {
t.Skipf("collector %s is not supported: %v", c.GetName(), err)
}
@@ -111,7 +111,27 @@ func TestCollector[C collector.Collector, V any](t *testing.T, fn func(*V) C, co
return families
}
func unsupportedCollector(err error) bool {
// unsupportedBuild returns true for errors that indicate a collector's WMI
// class or PDH counter is not present on this system. MI_RESULT_INVALID_CLASS
// is only accepted here (Build path) so that a mistyped class in production
// code still fails Collect.
func unsupportedBuild(err error) bool {
return errors.Is(err, mi.MI_RESULT_INVALID_CLASS) ||
errors.Is(err, mi.MI_RESULT_INVALID_NAMESPACE) ||
errors.Is(err, mi.MI_RESULT_INVALID_QUERY) ||
errors.Is(err, pdh.NewPdhError(pdh.CstatusNoCounter)) ||
errors.Is(err, pdh.NewPdhError(pdh.CstatusNoObject)) ||
errors.Is(err, pdh.ErrPerformanceCounterNotInitialized) ||
errors.Is(err, pdh.ErrNoData) ||
errors.Is(err, update.ErrUpdateServiceDisabled) ||
errors.Is(err, os.ErrNotExist) ||
errors.Is(err, windows.Errno(2151088411))
}
// unsupportedCollect returns true for Collect-path errors that indicate a
// collector cannot run on this system. MI_RESULT_INVALID_CLASS is deliberately
// excluded: a class missing at collect time is a real bug, not an expected skip.
func unsupportedCollect(err error) bool {
return errors.Is(err, mi.MI_RESULT_INVALID_NAMESPACE) ||
errors.Is(err, mi.MI_RESULT_INVALID_QUERY) ||
errors.Is(err, pdh.NewPdhError(pdh.CstatusNoCounter)) ||
@@ -167,7 +187,7 @@ func collectMetrics(t *testing.T, c collector.Collector, required bool) map[stri
collectErr = nil
}
if !required && (unsupportedCollector(collectErr) || errors.Is(collectErr, update.ErrNoUpdates)) {
if !required && (unsupportedCollect(collectErr) || errors.Is(collectErr, update.ErrNoUpdates)) {
t.Skipf("collector %s is not supported: %v", c.GetName(), collectErr)
}