chore: Remove registry based perfdata collector (#1742)

Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>

pkg/collector/collector.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"log/slog"
 	"slices"
-	"strings"
 	"sync"
 
 	"github.com/alecthomas/kingpin/v2"
@@ -60,8 +59,6 @@ import (
 	"github.com/prometheus-community/windows_exporter/internal/collector/update"
 	"github.com/prometheus-community/windows_exporter/internal/collector/vmware"
 	"github.com/prometheus-community/windows_exporter/internal/mi"
-	v1 "github.com/prometheus-community/windows_exporter/internal/perfdata/v1"
-	"github.com/prometheus-community/windows_exporter/internal/types"
 )
 
 // NewWithFlags To be called by the exporter for collector initialization before running kingpin.Parse.
@@ -139,35 +136,6 @@ func New(collectors Map) *MetricCollectors {
 	}
 }
 
-func (c *MetricCollectors) SetPerfCounterQuery(logger *slog.Logger) error {
-	var (
-		err error
-
-		perfCounterNames []string
-		perfIndicies     []string
-	)
-
-	perfCounterDependencies := make([]string, 0, len(c.Collectors))
-
-	for _, collector := range c.Collectors {
-		perfCounterNames, err = collector.GetPerfCounter(logger)
-		if err != nil {
-			return err
-		}
-
-		perfIndicies = make([]string, 0, len(perfCounterNames))
-		for _, cn := range perfCounterNames {
-			perfIndicies = append(perfIndicies, v1.MapCounterToIndex(cn))
-		}
-
-		perfCounterDependencies = append(perfCounterDependencies, strings.Join(perfIndicies, " "))
-	}
-
-	c.PerfCounterQuery = strings.Join(perfCounterDependencies, " ")
-
-	return nil
-}
-
 // Enable removes all collectors that not enabledCollectors.
 func (c *MetricCollectors) Enable(enabledCollectors []string) error {
 	for _, name := range enabledCollectors {
@@ -219,42 +187,27 @@ func (c *MetricCollectors) Build(logger *slog.Logger) error {
 	return errors.Join(errs...)
 }
 
-// PrepareScrapeContext creates a ScrapeContext to be used during a single scrape.
-func (c *MetricCollectors) PrepareScrapeContext() (*types.ScrapeContext, error) {
-	// If no perf counters to query, return an empty context.
-	if c.PerfCounterQuery == "" {
-		return &types.ScrapeContext{}, nil
-	}
-
-	perfObjects, err := v1.GetPerflibSnapshot(c.PerfCounterQuery)
-	if err != nil {
-		return nil, err
-	}
-
-	return &types.ScrapeContext{PerfObjects: perfObjects}, nil
-}
-
 // Close To be called by the exporter for collector cleanup.
-func (c *MetricCollectors) Close(logger *slog.Logger) error {
+func (c *MetricCollectors) Close() error {
 	errs := make([]error, 0, len(c.Collectors))
 
 	for _, collector := range c.Collectors {
-		if err := collector.Close(logger); err != nil {
-			errs = append(errs, err)
+		if err := collector.Close(); err != nil {
+			errs = append(errs, fmt.Errorf("error from close collector %s: %w", collector.GetName(), err))
 		}
 	}
 
 	app, err := c.MISession.GetApplication()
 	if err != nil && !errors.Is(err, mi.ErrNotInitialized) {
-		errs = append(errs, err)
+		errs = append(errs, fmt.Errorf("error from get MI application: %w", err))
 	}
 
 	if err := c.MISession.Close(); err != nil && !errors.Is(err, mi.ErrNotInitialized) {
-		errs = append(errs, err)
+		errs = append(errs, fmt.Errorf("error from close MI session: %w", err))
 	}
 
 	if err := app.Close(); err != nil && !errors.Is(err, mi.ErrNotInitialized) {
-		errs = append(errs, err)
+		errs = append(errs, fmt.Errorf("error from close MI application: %w", err))
 	}
 
 	return errors.Join(errs...)

pkg/collector/prometheus.go

@@ -92,21 +92,12 @@ func (p *Prometheus) Describe(_ chan<- *prometheus.Desc) {}
 func (p *Prometheus) Collect(ch chan<- prometheus.Metric) {
 	t := time.Now()
 
-	// Scrape Performance Counters for all collectors
-	scrapeContext, err := p.metricCollectors.PrepareScrapeContext()
-
 	ch <- prometheus.MustNewConstMetric(
 		p.snapshotDuration,
 		prometheus.GaugeValue,
 		time.Since(t).Seconds(),
 	)
 
-	if err != nil {
-		ch <- prometheus.NewInvalidMetric(p.collectorScrapeSuccessDesc, fmt.Errorf("failed to prepare scrape: %w", err))
-
-		return
-	}
-
 	// WaitGroup to wait for all collectors to finish
 	wg := sync.WaitGroup{}
 	wg.Add(len(p.metricCollectors.Collectors))
@@ -123,7 +114,7 @@ func (p *Prometheus) Collect(ch chan<- prometheus.Metric) {
 
 			collectorStatusCh <- collectorStatus{
 				name:       name,
-				statusCode: p.execute(name, metricsCollector, scrapeContext, ch),
+				statusCode: p.execute(name, metricsCollector, ch),
 			}
 		}(name, metricsCollector)
 	}
@@ -166,7 +157,7 @@ func (p *Prometheus) Collect(ch chan<- prometheus.Metric) {
 	)
 }
 
-func (p *Prometheus) execute(name string, c Collector, scrapeCtx *types.ScrapeContext, ch chan<- prometheus.Metric) collectorStatusCode {
+func (p *Prometheus) execute(name string, c Collector, ch chan<- prometheus.Metric) collectorStatusCode {
 	var (
 		err        error
 		numMetrics int
@@ -194,7 +185,7 @@ func (p *Prometheus) execute(name string, c Collector, scrapeCtx *types.ScrapeCo
 			close(bufCh)
 		}()
 
-		errCh <- c.Collect(scrapeCtx, p.logger, bufCh)
+		errCh <- c.Collect(bufCh)
 	}()
 
 	wg := sync.WaitGroup{}

pkg/collector/types.go

@@ -5,10 +5,11 @@ import (
 
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/prometheus-community/windows_exporter/internal/mi"
-	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
+const DefaultCollectors = "cpu,cs,memory,logical_disk,physical_disk,net,os,service,system"
+
 type MetricCollectors struct {
 	Collectors       Map
 	MISession        *mi.Session
@@ -22,13 +23,12 @@ type (
 
 // Collector interface that a collector has to implement.
 type Collector interface {
-	Build(logger *slog.Logger, miSession *mi.Session) error
-	// Close closes the collector
-	Close(logger *slog.Logger) error
 	// GetName get the name of the collector
 	GetName() string
-	// GetPerfCounter returns the perf counter required by the collector
-	GetPerfCounter(logger *slog.Logger) ([]string, error)
+	// Build build the collector
+	Build(logger *slog.Logger, miSession *mi.Session) error
 	// Collect Get new metrics and expose them via prometheus registry.
-	Collect(ctx *types.ScrapeContext, logger *slog.Logger, ch chan<- prometheus.Metric) (err error)
+	Collect(ch chan<- prometheus.Metric) (err error)
+	// Close closes the collector
+	Close() error
 }