chore: Remove registry based perfdata collector (#1742)

Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
2026-03-09 12:06:35 +00:00 · 2024-11-17 21:51:12 +01:00
parent 6206b695c6
commit e6a15d4ec4
213 changed files with 8079 additions and 12405 deletions
--- a/internal/collector/dhcp/const.go
+++ b/internal/collector/dhcp/const.go
@@ -1,3 +1,5 @@
+//go:build windows
+
 package dhcp

 const (
@@ -27,34 +29,3 @@ const (
 	releasesTotal                                    = "Releases/sec"
 	requestsTotal                                    = "Requests/sec"
 )
-
-// represents perflib metrics from the DHCP Server class.
-// While the name of a number of perflib metrics would indicate a rate is being returned (E.G. Packets Received/sec),
-// perflib instead returns a counter, hence the "Total" suffix in some of the variable names.
-type dhcpPerf struct {
-	AcksTotal                                        float64 `perflib:"Acks/sec"`
-	ActiveQueueLength                                float64 `perflib:"Active Queue Length"`
-	ConflictCheckQueueLength                         float64 `perflib:"Conflict Check Queue Length"`
-	DeclinesTotal                                    float64 `perflib:"Declines/sec"`
-	DeniedDueToMatch                                 float64 `perflib:"Denied due to match."`
-	DeniedDueToNonMatch                              float64 `perflib:"Denied due to match."`
-	DiscoversTotal                                   float64 `perflib:"Discovers/sec"`
-	DuplicatesDroppedTotal                           float64 `perflib:"Duplicates Dropped/sec"`
-	FailoverBndAckReceivedTotal                      float64 `perflib:"Failover: BndAck received/sec."`
-	FailoverBndAckSentTotal                          float64 `perflib:"Failover: BndAck sent/sec."`
-	FailoverBndUpdDropped                            float64 `perflib:"Failover: BndUpd Dropped."`
-	FailoverBndUpdPendingOutboundQueue               float64 `perflib:"Failover: BndUpd pending in outbound queue."`
-	FailoverBndUpdReceivedTotal                      float64 `perflib:"Failover: BndUpd received/sec."`
-	FailoverBndUpdSentTotal                          float64 `perflib:"Failover: BndUpd sent/sec."`
-	FailoverTransitionsCommunicationInterruptedState float64 `perflib:"Failover: Transitions to COMMUNICATION-INTERRUPTED state."`
-	FailoverTransitionsPartnerDownState              float64 `perflib:"Failover: Transitions to PARTNER-DOWN state."`
-	FailoverTransitionsRecoverState                  float64 `perflib:"Failover: Transitions to RECOVER state."`
-	InformsTotal                                     float64 `perflib:"Informs/sec"`
-	NacksTotal                                       float64 `perflib:"Nacks/sec"`
-	OfferQueueLength                                 float64 `perflib:"Offer Queue Length"`
-	OffersTotal                                      float64 `perflib:"Offers/sec"`
-	PacketsExpiredTotal                              float64 `perflib:"Packets Expired/sec"`
-	PacketsReceivedTotal                             float64 `perflib:"Packets Received/sec"`
-	ReleasesTotal                                    float64 `perflib:"Releases/sec"`
-	RequestsTotal                                    float64 `perflib:"Requests/sec"`
-}
--- a/internal/collector/dhcp/dhcp.go
+++ b/internal/collector/dhcp/dhcp.go
@@ -10,9 +10,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/perfdata/perftypes"
-	v1 "github.com/prometheus-community/windows_exporter/internal/perfdata/v1"
-	"github.com/prometheus-community/windows_exporter/internal/toggle"
 	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
@@ -27,7 +24,7 @@ var ConfigDefaults = Config{}
 type Collector struct {
 	config Config

-	perfDataCollector perfdata.Collector
+	perfDataCollector *perfdata.Collector

 	acksTotal                                        *prometheus.Desc
 	activeQueueLength                                *prometheus.Desc
@@ -76,56 +73,44 @@ func (c *Collector) GetName() string {
 	return Name
 }

-func (c *Collector) GetPerfCounter(_ *slog.Logger) ([]string, error) {
-	if toggle.IsPDHEnabled() {
-		return []string{}, nil
-	}
-
-	return []string{"DHCP Server"}, nil
-}
-
-func (c *Collector) Close(_ *slog.Logger) error {
-	if toggle.IsPDHEnabled() {
-		c.perfDataCollector.Close()
-	}
+func (c *Collector) Close() error {
+	c.perfDataCollector.Close()

 	return nil
 }

 func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
-	if toggle.IsPDHEnabled() {
-		var err error
+	var err error

-		c.perfDataCollector, err = perfdata.NewCollector(perfdata.V2, "DHCP Server", perfdata.AllInstances, []string{
-			acksTotal,
-			activeQueueLength,
-			conflictCheckQueueLength,
-			declinesTotal,
-			deniedDueToMatch,
-			deniedDueToNonMatch,
-			discoversTotal,
-			duplicatesDroppedTotal,
-			failoverBndAckReceivedTotal,
-			failoverBndAckSentTotal,
-			failoverBndUpdDropped,
-			failoverBndUpdPendingOutboundQueue,
-			failoverBndUpdReceivedTotal,
-			failoverBndUpdSentTotal,
-			failoverTransitionsCommunicationInterruptedState,
-			failoverTransitionsPartnerDownState,
-			failoverTransitionsRecoverState,
-			informsTotal,
-			nacksTotal,
-			offerQueueLength,
-			offersTotal,
-			packetsExpiredTotal,
-			packetsReceivedTotal,
-			releasesTotal,
-			requestsTotal,
-		})
-		if err != nil {
-			return fmt.Errorf("failed to create DHCP Server collector: %w", err)
-		}
+	c.perfDataCollector, err = perfdata.NewCollector("DHCP Server", perfdata.InstanceAll, []string{
+		acksTotal,
+		activeQueueLength,
+		conflictCheckQueueLength,
+		declinesTotal,
+		deniedDueToMatch,
+		deniedDueToNonMatch,
+		discoversTotal,
+		duplicatesDroppedTotal,
+		failoverBndAckReceivedTotal,
+		failoverBndAckSentTotal,
+		failoverBndUpdDropped,
+		failoverBndUpdPendingOutboundQueue,
+		failoverBndUpdReceivedTotal,
+		failoverBndUpdSentTotal,
+		failoverTransitionsCommunicationInterruptedState,
+		failoverTransitionsPartnerDownState,
+		failoverTransitionsRecoverState,
+		informsTotal,
+		nacksTotal,
+		offerQueueLength,
+		offersTotal,
+		packetsExpiredTotal,
+		packetsReceivedTotal,
+		releasesTotal,
+		requestsTotal,
+	})
+	if err != nil {
+		return fmt.Errorf("failed to create DHCP Server collector: %w", err)
 	}

 	c.packetsReceivedTotal = prometheus.NewDesc(
@@ -282,183 +267,13 @@ func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
 	return nil
 }

-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))
-
-	return c.collect(ctx, logger, ch)
-}
-
-func (c *Collector) collect(ctx *types.ScrapeContext, logger *slog.Logger, ch chan<- prometheus.Metric) error {
-	var dhcpPerfs []dhcpPerf
-
-	if err := v1.UnmarshalObject(ctx.PerfObjects["DHCP Server"], &dhcpPerfs, logger); err != nil {
-		return err
-	}
-
-	ch <- prometheus.MustNewConstMetric(
-		c.packetsReceivedTotal,
-		prometheus.CounterValue,
-		dhcpPerfs[0].PacketsReceivedTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.duplicatesDroppedTotal,
-		prometheus.CounterValue,
-		dhcpPerfs[0].DuplicatesDroppedTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.packetsExpiredTotal,
-		prometheus.CounterValue,
-		dhcpPerfs[0].PacketsExpiredTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.activeQueueLength,
-		prometheus.GaugeValue,
-		dhcpPerfs[0].ActiveQueueLength,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.conflictCheckQueueLength,
-		prometheus.GaugeValue,
-		dhcpPerfs[0].ConflictCheckQueueLength,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.discoversTotal,
-		prometheus.CounterValue,
-		dhcpPerfs[0].DiscoversTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.offersTotal,
-		prometheus.CounterValue,
-		dhcpPerfs[0].OffersTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.requestsTotal,
-		prometheus.CounterValue,
-		dhcpPerfs[0].RequestsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.informsTotal,
-		prometheus.CounterValue,
-		dhcpPerfs[0].InformsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.acksTotal,
-		prometheus.CounterValue,
-		dhcpPerfs[0].AcksTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.nACKsTotal,
-		prometheus.CounterValue,
-		dhcpPerfs[0].NacksTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.declinesTotal,
-		prometheus.CounterValue,
-		dhcpPerfs[0].DeclinesTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.releasesTotal,
-		prometheus.CounterValue,
-		dhcpPerfs[0].ReleasesTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.offerQueueLength,
-		prometheus.GaugeValue,
-		dhcpPerfs[0].OfferQueueLength,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.deniedDueToMatch,
-		prometheus.CounterValue,
-		dhcpPerfs[0].DeniedDueToMatch,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.deniedDueToNonMatch,
-		prometheus.CounterValue,
-		dhcpPerfs[0].DeniedDueToNonMatch,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.failoverBndUpdSentTotal,
-		prometheus.CounterValue,
-		dhcpPerfs[0].FailoverBndUpdSentTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.failoverBndUpdReceivedTotal,
-		prometheus.CounterValue,
-		dhcpPerfs[0].FailoverBndUpdReceivedTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.failoverBndAckSentTotal,
-		prometheus.CounterValue,
-		dhcpPerfs[0].FailoverBndAckSentTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.failoverBndAckReceivedTotal,
-		prometheus.CounterValue,
-		dhcpPerfs[0].FailoverBndAckReceivedTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.failoverBndUpdPendingOutboundQueue,
-		prometheus.GaugeValue,
-		dhcpPerfs[0].FailoverBndUpdPendingOutboundQueue,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.failoverTransitionsCommunicationInterruptedState,
-		prometheus.CounterValue,
-		dhcpPerfs[0].FailoverTransitionsCommunicationInterruptedState,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.failoverTransitionsPartnerDownState,
-		prometheus.CounterValue,
-		dhcpPerfs[0].FailoverTransitionsPartnerDownState,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.failoverTransitionsRecoverState,
-		prometheus.CounterValue,
-		dhcpPerfs[0].FailoverTransitionsRecoverState,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.failoverBndUpdDropped,
-		prometheus.CounterValue,
-		dhcpPerfs[0].FailoverBndUpdDropped,
-	)
-
-	return nil
-}
-
-func (c *Collector) collectPDH(ch chan<- prometheus.Metric) error {
+func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
 	perfData, err := c.perfDataCollector.Collect()
 	if err != nil {
 		return fmt.Errorf("failed to collect DHCP Server metrics: %w", err)
 	}

-	data, ok := perfData[perftypes.EmptyInstance]
+	data, ok := perfData[perfdata.EmptyInstance]
 	if !ok {
 		return errors.New("perflib query for DHCP Server returned empty result set")
 	}
--- a/internal/collector/dhcp/dhcp_test.go
+++ b/internal/collector/dhcp/dhcp_test.go
@@ -1,10 +1,12 @@
+//go:build windows
+
 package dhcp_test

 import (
 	"testing"

 	"github.com/prometheus-community/windows_exporter/internal/collector/dhcp"
-	"github.com/prometheus-community/windows_exporter/internal/testutils"
+	"github.com/prometheus-community/windows_exporter/internal/utils/testutils"
 )

 func BenchmarkCollector(b *testing.B) {