chore: Remove registry based perfdata collector (#1742)

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

internal/collector/exchange/exchange.go

@@ -12,7 +12,6 @@ import (
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/prometheus-community/windows_exporter/internal/mi"
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
-	"github.com/prometheus-community/windows_exporter/internal/toggle"
 	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
@@ -54,16 +53,16 @@ var ConfigDefaults = Config{
 type Collector struct {
 	config Config
 
-	perfDataCollectorADAccessProcesses           perfdata.Collector
-	perfDataCollectorTransportQueues             perfdata.Collector
-	perfDataCollectorHttpProxy                   perfdata.Collector
-	perfDataCollectorActiveSync                  perfdata.Collector
-	perfDataCollectorAvailabilityService         perfdata.Collector
-	perfDataCollectorOWA                         perfdata.Collector
-	perfDataCollectorAutoDiscover                perfdata.Collector
-	perfDataCollectorWorkloadManagementWorkloads perfdata.Collector
-	perfDataCollectorRpcClientAccess             perfdata.Collector
-	perfDataCollectorMapiHttpEmsmdb              perfdata.Collector
+	perfDataCollectorADAccessProcesses           *perfdata.Collector
+	perfDataCollectorTransportQueues             *perfdata.Collector
+	perfDataCollectorHttpProxy                   *perfdata.Collector
+	perfDataCollectorActiveSync                  *perfdata.Collector
+	perfDataCollectorAvailabilityService         *perfdata.Collector
+	perfDataCollectorOWA                         *perfdata.Collector
+	perfDataCollectorAutoDiscover                *perfdata.Collector
+	perfDataCollectorWorkloadManagementWorkloads *perfdata.Collector
+	perfDataCollectorRpcClientAccess             *perfdata.Collector
+	perfDataCollectorMapiHttpEmsmdb              *perfdata.Collector
 
 	activeMailboxDeliveryQueueLength        *prometheus.Desc
 	activeSyncRequestsPerSec                *prometheus.Desc
@@ -184,48 +183,27 @@ func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *Collector) GetPerfCounter(_ *slog.Logger) ([]string, error) {
-	if toggle.IsPDHEnabled() {
-		return []string{}, nil
-	}
-
-	return []string{
-		"MSExchange ADAccess Processes",
-		"MSExchangeTransport Queues",
-		"MSExchange HttpProxy",
-		"MSExchange ActiveSync",
-		"MSExchange Availability Service",
-		"MSExchange OWA",
-		"MSExchangeAutodiscover",
-		"MSExchange WorkloadManagement Workloads",
-		"MSExchange RpcClientAccess",
-		"MSExchange MapiHttp Emsmdb",
-	}, nil
-}
-
-func (c *Collector) Close(_ *slog.Logger) error {
+func (c *Collector) Close() error {
 	return nil
 }
 
 func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
-	if toggle.IsPDHEnabled() {
-		collectorFuncs := map[string]func() error{
-			adAccessProcesses:   c.buildADAccessProcesses,
-			transportQueues:     c.buildTransportQueues,
-			httpProxy:           c.buildHTTPProxy,
-			activeSync:          c.buildActiveSync,
-			availabilityService: c.buildAvailabilityService,
-			outlookWebAccess:    c.buildOWA,
-			autoDiscover:        c.buildAutoDiscover,
-			workloadManagement:  c.buildWorkloadManagementWorkloads,
-			rpcClientAccess:     c.buildRPC,
-			mapiHttpEmsmdb:      c.buildMapiHttpEmsmdb,
-		}
+	collectorFuncs := map[string]func() error{
+		adAccessProcesses:   c.buildADAccessProcesses,
+		transportQueues:     c.buildTransportQueues,
+		httpProxy:           c.buildHTTPProxy,
+		activeSync:          c.buildActiveSync,
+		availabilityService: c.buildAvailabilityService,
+		outlookWebAccess:    c.buildOWA,
+		autoDiscover:        c.buildAutoDiscover,
+		workloadManagement:  c.buildWorkloadManagementWorkloads,
+		rpcClientAccess:     c.buildRPC,
+		mapiHttpEmsmdb:      c.buildMapiHttpEmsmdb,
+	}
 
-		for _, collectorName := range c.config.CollectorsEnabled {
-			if err := collectorFuncs[collectorName](); err != nil {
-				return err
-			}
+	for _, collectorName := range c.config.CollectorsEnabled {
+		if err := collectorFuncs[collectorName](); err != nil {
+			return err
 		}
 	}
 
@@ -282,13 +260,8 @@ func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
 }
 
 // Collect collects exchange metrics and sends them to prometheus.
-func (c *Collector) Collect(ctx *types.ScrapeContext, logger *slog.Logger, ch chan<- prometheus.Metric) error {
-	if toggle.IsPDHEnabled() {
-		return c.collectPDH(ch)
-	}
-
-	logger = logger.With(slog.String("collector", Name))
-	collectorFuncs := map[string]func(ctx *types.ScrapeContext, logger *slog.Logger, ch chan<- prometheus.Metric) error{
+func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
+	collectorFuncs := map[string]func(ch chan<- prometheus.Metric) error{
 		adAccessProcesses:   c.collectADAccessProcesses,
 		transportQueues:     c.collectTransportQueues,
 		httpProxy:           c.collectHTTPProxy,
@@ -301,34 +274,6 @@ func (c *Collector) Collect(ctx *types.ScrapeContext, logger *slog.Logger, ch ch
 		mapiHttpEmsmdb:      c.collectMapiHttpEmsmdb,
 	}
 
-	for _, collectorName := range c.config.CollectorsEnabled {
-		if err := collectorFuncs[collectorName](ctx, logger, ch); err != nil {
-			logger.Error("Error in "+collectorName,
-				slog.Any("err", err),
-			)
-
-			return err
-		}
-	}
-
-	return nil
-}
-
-// Collect collects exchange metrics and sends them to prometheus.
-func (c *Collector) collectPDH(ch chan<- prometheus.Metric) error {
-	collectorFuncs := map[string]func(ch chan<- prometheus.Metric) error{
-		adAccessProcesses:   c.collectPDHADAccessProcesses,
-		transportQueues:     c.collectPDHTransportQueues,
-		httpProxy:           c.collectPDHHTTPProxy,
-		activeSync:          c.collectPDHActiveSync,
-		availabilityService: c.collectPDHAvailabilityService,
-		outlookWebAccess:    c.collectPDHOWA,
-		autoDiscover:        c.collectPDHAutoDiscover,
-		workloadManagement:  c.collectPDHWorkloadManagementWorkloads,
-		rpcClientAccess:     c.collectPDHRPC,
-		mapiHttpEmsmdb:      c.collectPDHMapiHttpEmsmdb,
-	}
-
 	errs := make([]error, len(c.config.CollectorsEnabled))
 
 	for i, collectorName := range c.config.CollectorsEnabled {

internal/collector/exchange/exchange_active_sync.go

@@ -1,13 +1,12 @@
+//go:build windows
+
 package exchange
 
 import (
 	"errors"
 	"fmt"
-	"log/slog"
 
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
-	v1 "github.com/prometheus-community/windows_exporter/internal/perfdata/v1"
-	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -17,13 +16,6 @@ const (
 	syncCommandsPerSec  = "Sync Commands/sec"
 )
 
-// Perflib: [25138] MSExchange ActiveSync.
-type perflibActiveSync struct {
-	RequestsPerSec      float64 `perflib:"Requests/sec"`
-	PingCommandsPending float64 `perflib:"Ping Commands Pending"`
-	SyncCommandsPerSec  float64 `perflib:"Sync Commands/sec"`
-}
-
 func (c *Collector) buildActiveSync() error {
 	counters := []string{
 		requestsPerSec,
@@ -33,7 +25,7 @@ func (c *Collector) buildActiveSync() error {
 
 	var err error
 
-	c.perfDataCollectorActiveSync, err = perfdata.NewCollector(perfdata.V2, "MSExchange ActiveSync", perfdata.AllInstances, counters)
+	c.perfDataCollectorActiveSync, err = perfdata.NewCollector("MSExchange ActiveSync", perfdata.InstanceAll, counters)
 	if err != nil {
 		return fmt.Errorf("failed to create MSExchange ActiveSync collector: %w", err)
 	}
@@ -41,35 +33,7 @@ func (c *Collector) buildActiveSync() error {
 	return nil
 }
 
-func (c *Collector) collectActiveSync(ctx *types.ScrapeContext, logger *slog.Logger, ch chan<- prometheus.Metric) error {
-	var data []perflibActiveSync
-
-	if err := v1.UnmarshalObject(ctx.PerfObjects["MSExchange ActiveSync"], &data, logger); err != nil {
-		return err
-	}
-
-	for _, instance := range data {
-		ch <- prometheus.MustNewConstMetric(
-			c.activeSyncRequestsPerSec,
-			prometheus.CounterValue,
-			instance.RequestsPerSec,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.pingCommandsPending,
-			prometheus.GaugeValue,
-			instance.PingCommandsPending,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.syncCommandsPerSec,
-			prometheus.CounterValue,
-			instance.SyncCommandsPerSec,
-		)
-	}
-
-	return nil
-}
-
-func (c *Collector) collectPDHActiveSync(ch chan<- prometheus.Metric) error {
+func (c *Collector) collectActiveSync(ch chan<- prometheus.Metric) error {
 	perfData, err := c.perfDataCollectorActiveSync.Collect()
 	if err != nil {
 		return fmt.Errorf("failed to collect MSExchange ActiveSync metrics: %w", err)

internal/collector/exchange/exchange_ad_access_processes.go

@@ -1,14 +1,12 @@
+//go:build windows
+
 package exchange
 
 import (
 	"errors"
 	"fmt"
-	"log/slog"
-	"strings"
 
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
-	v1 "github.com/prometheus-community/windows_exporter/internal/perfdata/v1"
-	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -20,17 +18,6 @@ const (
 	longRunningLDAPOperationsPerMin = "Long Running LDAP Operations/min"
 )
 
-// Perflib: [19108] MSExchange ADAccess Processes.
-type perflibADAccessProcesses struct {
-	Name string
-
-	LDAPReadTime                    float64 `perflib:"LDAP Read Time"`
-	LDAPSearchTime                  float64 `perflib:"LDAP Search Time"`
-	LDAPWriteTime                   float64 `perflib:"LDAP Write Time"`
-	LDAPTimeoutErrorsPerSec         float64 `perflib:"LDAP Timeout Errors/sec"`
-	LongRunningLDAPOperationsPerMin float64 `perflib:"Long Running LDAP Operations/min"`
-}
-
 func (c *Collector) buildADAccessProcesses() error {
 	counters := []string{
 		ldapReadTime,
@@ -42,7 +29,7 @@ func (c *Collector) buildADAccessProcesses() error {
 
 	var err error
 
-	c.perfDataCollectorADAccessProcesses, err = perfdata.NewCollector(perfdata.V2, "MSExchange ADAccess Processes", perfdata.AllInstances, counters)
+	c.perfDataCollectorADAccessProcesses, err = perfdata.NewCollector("MSExchange ADAccess Processes", perfdata.InstanceAll, counters)
 	if err != nil {
 		return fmt.Errorf("failed to create MSExchange ADAccess Processes collector: %w", err)
 	}
@@ -50,63 +37,7 @@ func (c *Collector) buildADAccessProcesses() error {
 	return nil
 }
 
-func (c *Collector) collectADAccessProcesses(ctx *types.ScrapeContext, logger *slog.Logger, ch chan<- prometheus.Metric) error {
-	var data []perflibADAccessProcesses
-
-	if err := v1.UnmarshalObject(ctx.PerfObjects["MSExchange ADAccess Processes"], &data, logger); err != nil {
-		return err
-	}
-
-	labelUseCount := make(map[string]int)
-
-	for _, proc := range data {
-		labelName := c.toLabelName(proc.Name)
-		if strings.HasSuffix(labelName, "_total") {
-			continue
-		}
-
-		// Since we're not including the PID suffix from the instance names in the label names, we get an occasional duplicate.
-		// This seems to affect about 4 instances only of this object.
-		labelUseCount[labelName]++
-		if labelUseCount[labelName] > 1 {
-			labelName = fmt.Sprintf("%s_%d", labelName, labelUseCount[labelName])
-		}
-		ch <- prometheus.MustNewConstMetric(
-			c.ldapReadTime,
-			prometheus.CounterValue,
-			c.msToSec(proc.LDAPReadTime),
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.ldapSearchTime,
-			prometheus.CounterValue,
-			c.msToSec(proc.LDAPSearchTime),
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.ldapWriteTime,
-			prometheus.CounterValue,
-			c.msToSec(proc.LDAPWriteTime),
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.ldapTimeoutErrorsPerSec,
-			prometheus.CounterValue,
-			proc.LDAPTimeoutErrorsPerSec,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.longRunningLDAPOperationsPerMin,
-			prometheus.CounterValue,
-			proc.LongRunningLDAPOperationsPerMin*60,
-			labelName,
-		)
-	}
-
-	return nil
-}
-
-func (c *Collector) collectPDHADAccessProcesses(ch chan<- prometheus.Metric) error {
+func (c *Collector) collectADAccessProcesses(ch chan<- prometheus.Metric) error {
 	perfData, err := c.perfDataCollectorADAccessProcesses.Collect()
 	if err != nil {
 		return fmt.Errorf("failed to collect MSExchange ADAccess Processes metrics: %w", err)

internal/collector/exchange/exchange_autodiscover.go

@@ -1,21 +1,15 @@
+//go:build windows
+
 package exchange
 
 import (
 	"errors"
 	"fmt"
-	"log/slog"
 
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
-	v1 "github.com/prometheus-community/windows_exporter/internal/perfdata/v1"
-	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-// [29240] MSExchangeAutodiscover.
-type perflibAutodiscover struct {
-	RequestsPerSec float64 `perflib:"Requests/sec"`
-}
-
 func (c *Collector) buildAutoDiscover() error {
 	counters := []string{
 		requestsPerSec,
@@ -23,7 +17,7 @@ func (c *Collector) buildAutoDiscover() error {
 
 	var err error
 
-	c.perfDataCollectorAutoDiscover, err = perfdata.NewCollector(perfdata.V2, "MSExchange Autodiscover", perfdata.AllInstances, counters)
+	c.perfDataCollectorAutoDiscover, err = perfdata.NewCollector("MSExchange Autodiscover", perfdata.InstanceAll, counters)
 	if err != nil {
 		return fmt.Errorf("failed to create MSExchange Autodiscover collector: %w", err)
 	}
@@ -31,25 +25,7 @@ func (c *Collector) buildAutoDiscover() error {
 	return nil
 }
 
-func (c *Collector) collectAutoDiscover(ctx *types.ScrapeContext, logger *slog.Logger, ch chan<- prometheus.Metric) error {
-	var data []perflibAutodiscover
-
-	if err := v1.UnmarshalObject(ctx.PerfObjects["MSExchangeAutodiscover"], &data, logger); err != nil {
-		return err
-	}
-
-	for _, autodisc := range data {
-		ch <- prometheus.MustNewConstMetric(
-			c.autoDiscoverRequestsPerSec,
-			prometheus.CounterValue,
-			autodisc.RequestsPerSec,
-		)
-	}
-
-	return nil
-}
-
-func (c *Collector) collectPDHAutoDiscover(ch chan<- prometheus.Metric) error {
+func (c *Collector) collectAutoDiscover(ch chan<- prometheus.Metric) error {
 	perfData, err := c.perfDataCollectorAutoDiscover.Collect()
 	if err != nil {
 		return fmt.Errorf("failed to collect MSExchange Autodiscover metrics: %w", err)

internal/collector/exchange/exchange_availability_service.go

@@ -1,27 +1,21 @@
+//go:build windows
+
 package exchange
 
 import (
 	"errors"
 	"fmt"
-	"log/slog"
 
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
-	v1 "github.com/prometheus-community/windows_exporter/internal/perfdata/v1"
-	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-// Perflib: [24914] MSExchange Availability Service.
-type perflibAvailabilityService struct {
-	RequestsSec float64 `perflib:"Availability Requests (sec)"`
-}
-
 func (c *Collector) buildAvailabilityService() error {
 	counters := []string{}
 
 	var err error
 
-	c.perfDataCollectorAvailabilityService, err = perfdata.NewCollector(perfdata.V2, "MSExchange Availability Service", perfdata.AllInstances, counters)
+	c.perfDataCollectorAvailabilityService, err = perfdata.NewCollector("MSExchange Availability Service", perfdata.InstanceAll, counters)
 	if err != nil {
 		return fmt.Errorf("failed to create MSExchange Availability Service collector: %w", err)
 	}
@@ -29,25 +23,7 @@ func (c *Collector) buildAvailabilityService() error {
 	return nil
 }
 
-func (c *Collector) collectAvailabilityService(ctx *types.ScrapeContext, logger *slog.Logger, ch chan<- prometheus.Metric) error {
-	var data []perflibAvailabilityService
-
-	if err := v1.UnmarshalObject(ctx.PerfObjects["MSExchange Availability Service"], &data, logger); err != nil {
-		return err
-	}
-
-	for _, availservice := range data {
-		ch <- prometheus.MustNewConstMetric(
-			c.availabilityRequestsSec,
-			prometheus.CounterValue,
-			availservice.RequestsSec,
-		)
-	}
-
-	return nil
-}
-
-func (c *Collector) collectPDHAvailabilityService(ch chan<- prometheus.Metric) error {
+func (c *Collector) collectAvailabilityService(ch chan<- prometheus.Metric) error {
 	perfData, err := c.perfDataCollectorAvailabilityService.Collect()
 	if err != nil {
 		return fmt.Errorf("failed to collect MSExchange Availability Service metrics: %w", err)

internal/collector/exchange/exchange_http_proxy.go

@@ -1,13 +1,12 @@
+//go:build windows
+
 package exchange
 
 import (
 	"errors"
 	"fmt"
-	"log/slog"
 
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
-	v1 "github.com/prometheus-community/windows_exporter/internal/perfdata/v1"
-	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -20,18 +19,6 @@ const (
 	proxyRequestsPerSec                = "Proxy Requests/Sec"
 )
 
-// Perflib: [36934] MSExchange HttpProxy.
-type perflibHTTPProxy struct {
-	Name string
-
-	MailboxServerLocatorAverageLatency float64 `perflib:"MailboxServerLocator Average Latency (Moving Average)"`
-	AverageAuthenticationLatency       float64 `perflib:"Average Authentication Latency"`
-	AverageCASProcessingLatency        float64 `perflib:"Average ClientAccess Server Processing Latency"`
-	MailboxServerProxyFailureRate      float64 `perflib:"Mailbox Server Proxy Failure Rate"`
-	OutstandingProxyRequests           float64 `perflib:"Outstanding Proxy Requests"`
-	ProxyRequestsPerSec                float64 `perflib:"Proxy Requests/Sec"`
-}
-
 func (c *Collector) buildHTTPProxy() error {
 	counters := []string{
 		mailboxServerLocatorAverageLatency,
@@ -44,7 +31,7 @@ func (c *Collector) buildHTTPProxy() error {
 
 	var err error
 
-	c.perfDataCollectorHttpProxy, err = perfdata.NewCollector(perfdata.V2, "MSExchange HttpProxy", perfdata.AllInstances, counters)
+	c.perfDataCollectorHttpProxy, err = perfdata.NewCollector("MSExchange HttpProxy", perfdata.InstanceAll, counters)
 	if err != nil {
 		return fmt.Errorf("failed to create MSExchange HttpProxy collector: %w", err)
 	}
@@ -52,57 +39,7 @@ func (c *Collector) buildHTTPProxy() error {
 	return nil
 }
 
-func (c *Collector) collectHTTPProxy(ctx *types.ScrapeContext, logger *slog.Logger, ch chan<- prometheus.Metric) error {
-	var data []perflibHTTPProxy
-
-	if err := v1.UnmarshalObject(ctx.PerfObjects["MSExchange HttpProxy"], &data, logger); err != nil {
-		return err
-	}
-
-	for _, instance := range data {
-		labelName := c.toLabelName(instance.Name)
-		ch <- prometheus.MustNewConstMetric(
-			c.mailboxServerLocatorAverageLatency,
-			prometheus.GaugeValue,
-			c.msToSec(instance.MailboxServerLocatorAverageLatency),
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.averageAuthenticationLatency,
-			prometheus.GaugeValue,
-			instance.AverageAuthenticationLatency,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.averageCASProcessingLatency,
-			prometheus.GaugeValue,
-			c.msToSec(instance.AverageCASProcessingLatency),
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.mailboxServerProxyFailureRate,
-			prometheus.GaugeValue,
-			instance.MailboxServerProxyFailureRate,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.outstandingProxyRequests,
-			prometheus.GaugeValue,
-			instance.OutstandingProxyRequests,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.proxyRequestsPerSec,
-			prometheus.CounterValue,
-			instance.ProxyRequestsPerSec,
-			labelName,
-		)
-	}
-
-	return nil
-}
-
-func (c *Collector) collectPDHHTTPProxy(ch chan<- prometheus.Metric) error {
+func (c *Collector) collectHTTPProxy(ch chan<- prometheus.Metric) error {
 	perfData, err := c.perfDataCollectorHttpProxy.Collect()
 	if err != nil {
 		return fmt.Errorf("failed to collect MSExchange HttpProxy Service metrics: %w", err)

internal/collector/exchange/exchange_mapi_http_emsmdb.go

@@ -1,13 +1,12 @@
+//go:build windows
+
 package exchange
 
 import (
 	"errors"
 	"fmt"
-	"log/slog"
 
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
-	v1 "github.com/prometheus-community/windows_exporter/internal/perfdata/v1"
-	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -15,11 +14,6 @@ const (
 	activeUserCount = "Active User Count"
 )
 
-// perflib [26463] MSExchange MapiHttp Emsmdb.
-type perflibMapiHttpEmsmdb struct {
-	ActiveUserCount float64 `perflib:"Active User Count"`
-}
-
 func (c *Collector) buildMapiHttpEmsmdb() error {
 	counters := []string{
 		activeUserCount,
@@ -27,7 +21,7 @@ func (c *Collector) buildMapiHttpEmsmdb() error {
 
 	var err error
 
-	c.perfDataCollectorMapiHttpEmsmdb, err = perfdata.NewCollector(perfdata.V2, "MSExchange MapiHttp Emsmdb", perfdata.AllInstances, counters)
+	c.perfDataCollectorMapiHttpEmsmdb, err = perfdata.NewCollector("MSExchange MapiHttp Emsmdb", perfdata.InstanceAll, counters)
 	if err != nil {
 		return fmt.Errorf("failed to create MSExchange MapiHttp Emsmdb: %w", err)
 	}
@@ -35,25 +29,7 @@ func (c *Collector) buildMapiHttpEmsmdb() error {
 	return nil
 }
 
-func (c *Collector) collectMapiHttpEmsmdb(ctx *types.ScrapeContext, logger *slog.Logger, ch chan<- prometheus.Metric) error {
-	var data []perflibMapiHttpEmsmdb
-
-	if err := v1.UnmarshalObject(ctx.PerfObjects["MSExchange MapiHttp Emsmdb"], &data, logger); err != nil {
-		return err
-	}
-
-	for _, mapihttp := range data {
-		ch <- prometheus.MustNewConstMetric(
-			c.activeUserCountMapiHttpEmsMDB,
-			prometheus.GaugeValue,
-			mapihttp.ActiveUserCount,
-		)
-	}
-
-	return nil
-}
-
-func (c *Collector) collectPDHMapiHttpEmsmdb(ch chan<- prometheus.Metric) error {
+func (c *Collector) collectMapiHttpEmsmdb(ch chan<- prometheus.Metric) error {
 	perfData, err := c.perfDataCollectorMapiHttpEmsmdb.Collect()
 	if err != nil {
 		return fmt.Errorf("failed to collect MSExchange MapiHttp Emsmdb metrics: %w", err)

internal/collector/exchange/exchange_outlook_web_access.go

@@ -1,13 +1,12 @@
+//go:build windows
+
 package exchange
 
 import (
 	"errors"
 	"fmt"
-	"log/slog"
 
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
-	v1 "github.com/prometheus-community/windows_exporter/internal/perfdata/v1"
-	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -16,12 +15,6 @@ const (
 	// requestsPerSec     = "Requests/sec"
 )
 
-// Perflib: [24618] MSExchange OWA.
-type perflibOWA struct {
-	CurrentUniqueUsers float64 `perflib:"Current Unique Users"`
-	RequestsPerSec     float64 `perflib:"Requests/sec"`
-}
-
 func (c *Collector) buildOWA() error {
 	counters := []string{
 		currentUniqueUsers,
@@ -30,7 +23,7 @@ func (c *Collector) buildOWA() error {
 
 	var err error
 
-	c.perfDataCollectorOWA, err = perfdata.NewCollector(perfdata.V2, "MSExchange OWA", perfdata.AllInstances, counters)
+	c.perfDataCollectorOWA, err = perfdata.NewCollector("MSExchange OWA", perfdata.InstanceAll, counters)
 	if err != nil {
 		return fmt.Errorf("failed to create MSExchange OWA collector: %w", err)
 	}
@@ -38,30 +31,7 @@ func (c *Collector) buildOWA() error {
 	return nil
 }
 
-func (c *Collector) collectOWA(ctx *types.ScrapeContext, logger *slog.Logger, ch chan<- prometheus.Metric) error {
-	var data []perflibOWA
-
-	if err := v1.UnmarshalObject(ctx.PerfObjects["MSExchange OWA"], &data, logger); err != nil {
-		return err
-	}
-
-	for _, owa := range data {
-		ch <- prometheus.MustNewConstMetric(
-			c.currentUniqueUsers,
-			prometheus.GaugeValue,
-			owa.CurrentUniqueUsers,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.owaRequestsPerSec,
-			prometheus.CounterValue,
-			owa.RequestsPerSec,
-		)
-	}
-
-	return nil
-}
-
-func (c *Collector) collectPDHOWA(ch chan<- prometheus.Metric) error {
+func (c *Collector) collectOWA(ch chan<- prometheus.Metric) error {
 	perfData, err := c.perfDataCollectorOWA.Collect()
 	if err != nil {
 		return fmt.Errorf("failed to collect MSExchange OWA metrics: %w", err)

internal/collector/exchange/exchange_rpc_client_access.go

@@ -1,13 +1,12 @@
+//go:build windows
+
 package exchange
 
 import (
 	"errors"
 	"fmt"
-	"log/slog"
 
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
-	v1 "github.com/prometheus-community/windows_exporter/internal/perfdata/v1"
-	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -20,16 +19,6 @@ const (
 	userCount           = "User Count"
 )
 
-// Perflib: [29366] MSExchange RpcClientAccess.
-type perflibRPCClientAccess struct {
-	RPCAveragedLatency  float64 `perflib:"RPC Averaged Latency"`
-	RPCRequests         float64 `perflib:"RPC Requests"`
-	ActiveUserCount     float64 `perflib:"Active User Count"`
-	ConnectionCount     float64 `perflib:"Connection Count"`
-	RPCOperationsPerSec float64 `perflib:"RPC Operations/sec"`
-	UserCount           float64 `perflib:"User Count"`
-}
-
 func (c *Collector) buildRPC() error {
 	counters := []string{
 		rpcAveragedLatency,
@@ -42,7 +31,7 @@ func (c *Collector) buildRPC() error {
 
 	var err error
 
-	c.perfDataCollectorRpcClientAccess, err = perfdata.NewCollector(perfdata.V2, "MSExchange RpcClientAccess", perfdata.AllInstances, counters)
+	c.perfDataCollectorRpcClientAccess, err = perfdata.NewCollector("MSExchange RpcClientAccess", perfdata.InstanceAll, counters)
 	if err != nil {
 		return fmt.Errorf("failed to create MSExchange RpcClientAccess collector: %w", err)
 	}
@@ -50,50 +39,7 @@ func (c *Collector) buildRPC() error {
 	return nil
 }
 
-func (c *Collector) collectRPC(ctx *types.ScrapeContext, logger *slog.Logger, ch chan<- prometheus.Metric) error {
-	var data []perflibRPCClientAccess
-
-	if err := v1.UnmarshalObject(ctx.PerfObjects["MSExchange RpcClientAccess"], &data, logger); err != nil {
-		return err
-	}
-
-	for _, rpc := range data {
-		ch <- prometheus.MustNewConstMetric(
-			c.rpcAveragedLatency,
-			prometheus.GaugeValue,
-			c.msToSec(rpc.RPCAveragedLatency),
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.rpcRequests,
-			prometheus.GaugeValue,
-			rpc.RPCRequests,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.activeUserCount,
-			prometheus.GaugeValue,
-			rpc.ActiveUserCount,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.connectionCount,
-			prometheus.GaugeValue,
-			rpc.ConnectionCount,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.rpcOperationsPerSec,
-			prometheus.CounterValue,
-			rpc.RPCOperationsPerSec,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.userCount,
-			prometheus.GaugeValue,
-			rpc.UserCount,
-		)
-	}
-
-	return nil
-}
-
-func (c *Collector) collectPDHRPC(ch chan<- prometheus.Metric) error {
+func (c *Collector) collectRPC(ch chan<- prometheus.Metric) error {
 	perfData, err := c.perfDataCollectorRpcClientAccess.Collect()
 	if err != nil {
 		return fmt.Errorf("failed to collect MSExchange RpcClientAccess: %w", err)

internal/collector/exchange/exchange_test.go

@@ -1,10 +1,12 @@
+//go:build windows
+
 package exchange_test
 
 import (
 	"testing"
 
 	"github.com/prometheus-community/windows_exporter/internal/collector/exchange"
-	"github.com/prometheus-community/windows_exporter/internal/testutils"
+	"github.com/prometheus-community/windows_exporter/internal/utils/testutils"
 )
 
 func BenchmarkCollector(b *testing.B) {

internal/collector/exchange/exchange_transport_queues.go

@@ -1,14 +1,12 @@
+//go:build windows
+
 package exchange
 
 import (
 	"errors"
 	"fmt"
-	"log/slog"
-	"strings"
 
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
-	v1 "github.com/prometheus-community/windows_exporter/internal/perfdata/v1"
-	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -23,20 +21,6 @@ const (
 	poisonQueueLength                       = "Poison Queue Length"
 )
 
-// Perflib: [20524] MSExchangeTransport Queues.
-type perflibTransportQueues struct {
-	Name string
-
-	ExternalActiveRemoteDeliveryQueueLength float64 `perflib:"External Active Remote Delivery Queue Length"`
-	InternalActiveRemoteDeliveryQueueLength float64 `perflib:"Internal Active Remote Delivery Queue Length"`
-	ActiveMailboxDeliveryQueueLength        float64 `perflib:"Active Mailbox Delivery Queue Length"`
-	RetryMailboxDeliveryQueueLength         float64 `perflib:"Retry Mailbox Delivery Queue Length"`
-	UnreachableQueueLength                  float64 `perflib:"Unreachable Queue Length"`
-	ExternalLargestDeliveryQueueLength      float64 `perflib:"External Largest Delivery Queue Length"`
-	InternalLargestDeliveryQueueLength      float64 `perflib:"Internal Largest Delivery Queue Length"`
-	PoisonQueueLength                       float64 `perflib:"Poison Queue Length"`
-}
-
 func (c *Collector) buildTransportQueues() error {
 	counters := []string{
 		externalActiveRemoteDeliveryQueueLength,
@@ -51,7 +35,7 @@ func (c *Collector) buildTransportQueues() error {
 
 	var err error
 
-	c.perfDataCollectorTransportQueues, err = perfdata.NewCollector(perfdata.V2, "MSExchangeTransport Queues", perfdata.AllInstances, counters)
+	c.perfDataCollectorTransportQueues, err = perfdata.NewCollector("MSExchangeTransport Queues", perfdata.InstanceAll, counters)
 	if err != nil {
 		return fmt.Errorf("failed to create MSExchangeTransport Queues collector: %w", err)
 	}
@@ -59,72 +43,7 @@ func (c *Collector) buildTransportQueues() error {
 	return nil
 }
 
-func (c *Collector) collectTransportQueues(ctx *types.ScrapeContext, logger *slog.Logger, ch chan<- prometheus.Metric) error {
-	var data []perflibTransportQueues
-
-	if err := v1.UnmarshalObject(ctx.PerfObjects["MSExchangeTransport Queues"], &data, logger); err != nil {
-		return err
-	}
-
-	for _, queue := range data {
-		labelName := c.toLabelName(queue.Name)
-		if strings.HasSuffix(labelName, "_total") {
-			continue
-		}
-		ch <- prometheus.MustNewConstMetric(
-			c.externalActiveRemoteDeliveryQueueLength,
-			prometheus.GaugeValue,
-			queue.ExternalActiveRemoteDeliveryQueueLength,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.internalActiveRemoteDeliveryQueueLength,
-			prometheus.GaugeValue,
-			queue.InternalActiveRemoteDeliveryQueueLength,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.activeMailboxDeliveryQueueLength,
-			prometheus.GaugeValue,
-			queue.ActiveMailboxDeliveryQueueLength,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.retryMailboxDeliveryQueueLength,
-			prometheus.GaugeValue,
-			queue.RetryMailboxDeliveryQueueLength,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.unreachableQueueLength,
-			prometheus.GaugeValue,
-			queue.UnreachableQueueLength,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.externalLargestDeliveryQueueLength,
-			prometheus.GaugeValue,
-			queue.ExternalLargestDeliveryQueueLength,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.internalLargestDeliveryQueueLength,
-			prometheus.GaugeValue,
-			queue.InternalLargestDeliveryQueueLength,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.poisonQueueLength,
-			prometheus.GaugeValue,
-			queue.PoisonQueueLength,
-			labelName,
-		)
-	}
-
-	return nil
-}
-
-func (c *Collector) collectPDHTransportQueues(ch chan<- prometheus.Metric) error {
+func (c *Collector) collectTransportQueues(ch chan<- prometheus.Metric) error {
 	perfData, err := c.perfDataCollectorTransportQueues.Collect()
 	if err != nil {
 		return fmt.Errorf("failed to collect MSExchangeTransport Queues: %w", err)

internal/collector/exchange/exchange_workload_management.go

@@ -1,14 +1,12 @@
+//go:build windows
+
 package exchange
 
 import (
 	"errors"
 	"fmt"
-	"log/slog"
-	"strings"
 
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
-	v1 "github.com/prometheus-community/windows_exporter/internal/perfdata/v1"
-	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -20,17 +18,6 @@ const (
 	isActive       = "Active"
 )
 
-// Perflib: [19430] MSExchange WorkloadManagement Workloads.
-type perflibWorkloadManagementWorkloads struct {
-	Name string
-
-	ActiveTasks    float64 `perflib:"ActiveTasks"`
-	CompletedTasks float64 `perflib:"CompletedTasks"`
-	QueuedTasks    float64 `perflib:"QueuedTasks"`
-	YieldedTasks   float64 `perflib:"YieldedTasks"`
-	IsActive       float64 `perflib:"Active"`
-}
-
 func (c *Collector) buildWorkloadManagementWorkloads() error {
 	counters := []string{
 		activeTasks,
@@ -42,7 +29,7 @@ func (c *Collector) buildWorkloadManagementWorkloads() error {
 
 	var err error
 
-	c.perfDataCollectorWorkloadManagementWorkloads, err = perfdata.NewCollector(perfdata.V2, "MSExchange WorkloadManagement Workloads", perfdata.AllInstances, counters)
+	c.perfDataCollectorWorkloadManagementWorkloads, err = perfdata.NewCollector("MSExchange WorkloadManagement Workloads", perfdata.InstanceAll, counters)
 	if err != nil {
 		return fmt.Errorf("failed to create MSExchange WorkloadManagement Workloads collector: %w", err)
 	}
@@ -50,54 +37,7 @@ func (c *Collector) buildWorkloadManagementWorkloads() error {
 	return nil
 }
 
-func (c *Collector) collectWorkloadManagementWorkloads(ctx *types.ScrapeContext, logger *slog.Logger, ch chan<- prometheus.Metric) error {
-	var data []perflibWorkloadManagementWorkloads
-
-	if err := v1.UnmarshalObject(ctx.PerfObjects["MSExchange WorkloadManagement Workloads"], &data, logger); err != nil {
-		return err
-	}
-
-	for _, instance := range data {
-		labelName := c.toLabelName(instance.Name)
-		if strings.HasSuffix(labelName, "_total") {
-			continue
-		}
-		ch <- prometheus.MustNewConstMetric(
-			c.activeTasks,
-			prometheus.GaugeValue,
-			instance.ActiveTasks,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.completedTasks,
-			prometheus.CounterValue,
-			instance.CompletedTasks,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.queuedTasks,
-			prometheus.CounterValue,
-			instance.QueuedTasks,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.yieldedTasks,
-			prometheus.CounterValue,
-			instance.YieldedTasks,
-			labelName,
-		)
-		ch <- prometheus.MustNewConstMetric(
-			c.isActive,
-			prometheus.GaugeValue,
-			instance.IsActive,
-			labelName,
-		)
-	}
-
-	return nil
-}
-
-func (c *Collector) collectPDHWorkloadManagementWorkloads(ch chan<- prometheus.Metric) error {
+func (c *Collector) collectWorkloadManagementWorkloads(ch chan<- prometheus.Metric) error {
 	perfData, err := c.perfDataCollectorWorkloadManagementWorkloads.Collect()
 	if err != nil {
 		return fmt.Errorf("failed to collect MSExchange WorkloadManagement Workloads: %w", err)