process: Use registry collector for V1 data (#1814)

Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
2026-03-06 10:36:36 +00:00 · 2024-12-21 22:58:47 +01:00
parent 39c929eefe
commit a9f8b3b722
158 changed files with 7793 additions and 7748 deletions
--- a/internal/collector/net/const.go
+++ b/internal/collector/net/const.go
@@ -1,32 +0,0 @@
-// Copyright 2024 The Prometheus Authors
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//go:build windows
-
-package net
-
-const (
-	bytesReceivedPerSec      = "Bytes Received/sec"
-	bytesSentPerSec          = "Bytes Sent/sec"
-	bytesTotalPerSec         = "Bytes Total/sec"
-	currentBandwidth         = "Current Bandwidth"
-	outputQueueLength        = "Output Queue Length"
-	packetsOutboundDiscarded = "Packets Outbound Discarded"
-	packetsOutboundErrors    = "Packets Outbound Errors"
-	packetsPerSec            = "Packets/sec"
-	packetsReceivedDiscarded = "Packets Received Discarded"
-	packetsReceivedErrors    = "Packets Received Errors"
-	packetsReceivedPerSec    = "Packets Received/sec"
-	packetsReceivedUnknown   = "Packets Received Unknown"
-	packetsSentPerSec        = "Packets Sent/sec"
-)
--- a/internal/collector/net/net.go
+++ b/internal/collector/net/net.go
@@ -27,7 +27,7 @@ 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/pdh"
 	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 	"golang.org/x/sys/windows"
@@ -55,7 +55,8 @@ var ConfigDefaults = Config{
 type Collector struct {
 	config Config

-	perfDataCollector *perfdata.Collector
+	perfDataCollector *pdh.Collector
+	perfDataObject    []perfDataCounterValues

 	bytesReceivedTotal       *prometheus.Desc
 	bytesSentTotal           *prometheus.Desc
@@ -158,23 +159,9 @@ func (c *Collector) Close() error {
 func (c *Collector) Build(logger *slog.Logger, _ *mi.Session) error {
 	var err error

-	c.perfDataCollector, err = perfdata.NewCollector("Network Interface", perfdata.InstancesAll, []string{
-		bytesReceivedPerSec,
-		bytesSentPerSec,
-		bytesTotalPerSec,
-		outputQueueLength,
-		packetsOutboundDiscarded,
-		packetsOutboundErrors,
-		packetsPerSec,
-		packetsReceivedDiscarded,
-		packetsReceivedErrors,
-		packetsReceivedPerSec,
-		packetsReceivedUnknown,
-		packetsSentPerSec,
-		currentBandwidth,
-	})
+	c.perfDataCollector, err = pdh.NewCollector[perfDataCounterValues]("Network Interface", pdh.InstancesAll)
 	if err != nil {
-		return fmt.Errorf("failed to create Processor Information collector: %w", err)
+		return fmt.Errorf("failed to create Network Interface collector: %w", err)
 	}

 	if slices.Contains(c.config.CollectorsEnabled, "addresses") {
@@ -298,13 +285,13 @@ func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
 }

 func (c *Collector) collect(ch chan<- prometheus.Metric) error {
-	data, err := c.perfDataCollector.Collect()
+	err := c.perfDataCollector.Collect(&c.perfDataObject)
 	if err != nil {
 		return fmt.Errorf("failed to collect Network Information metrics: %w", err)
 	}

-	for nicName, nicData := range data {
-		if c.config.NicExclude.MatchString(nicName) || !c.config.NicInclude.MatchString(nicName) {
+	for _, data := range c.perfDataObject {
+		if c.config.NicExclude.MatchString(data.Name) || !c.config.NicInclude.MatchString(data.Name) {
 			continue
 		}

@@ -312,80 +299,80 @@ func (c *Collector) collect(ch chan<- prometheus.Metric) error {
 		ch <- prometheus.MustNewConstMetric(
 			c.bytesReceivedTotal,
 			prometheus.CounterValue,
-			nicData[bytesReceivedPerSec].FirstValue,
-			nicName,
+			data.BytesReceivedPerSec,
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.bytesSentTotal,
 			prometheus.CounterValue,
-			nicData[bytesSentPerSec].FirstValue,
-			nicName,
+			data.BytesSentPerSec,
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.bytesTotal,
 			prometheus.CounterValue,
-			nicData[bytesTotalPerSec].FirstValue,
-			nicName,
+			data.BytesTotalPerSec,
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.outputQueueLength,
 			prometheus.GaugeValue,
-			nicData[outputQueueLength].FirstValue,
-			nicName,
+			data.OutputQueueLength,
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.packetsOutboundDiscarded,
 			prometheus.CounterValue,
-			nicData[packetsOutboundDiscarded].FirstValue,
-			nicName,
+			data.PacketsOutboundDiscarded,
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.packetsOutboundErrors,
 			prometheus.CounterValue,
-			nicData[packetsOutboundErrors].FirstValue,
-			nicName,
+			data.PacketsOutboundErrors,
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.packetsTotal,
 			prometheus.CounterValue,
-			nicData[packetsPerSec].FirstValue,
-			nicName,
+			data.PacketsPerSec,
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.packetsReceivedDiscarded,
 			prometheus.CounterValue,
-			nicData[packetsReceivedDiscarded].FirstValue,
-			nicName,
+			data.PacketsReceivedDiscarded,
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.packetsReceivedErrors,
 			prometheus.CounterValue,
-			nicData[packetsReceivedErrors].FirstValue,
-			nicName,
+			data.PacketsReceivedErrors,
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.packetsReceivedTotal,
 			prometheus.CounterValue,
-			nicData[packetsReceivedPerSec].FirstValue,
-			nicName,
+			data.PacketsReceivedPerSec,
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.packetsReceivedUnknown,
 			prometheus.CounterValue,
-			nicData[packetsReceivedUnknown].FirstValue,
-			nicName,
+			data.PacketsReceivedUnknown,
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.packetsSentTotal,
 			prometheus.CounterValue,
-			nicData[packetsSentPerSec].FirstValue,
-			nicName,
+			data.PacketsSentPerSec,
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.currentBandwidth,
 			prometheus.GaugeValue,
-			nicData[currentBandwidth].FirstValue/8,
-			nicName,
+			data.CurrentBandwidth/8,
+			data.Name,
 		)
 	}

--- a/internal/collector/net/net_bench_test.go
+++ b/internal/collector/net/net_bench_test.go
@@ -27,6 +27,7 @@ func BenchmarkCollector(b *testing.B) {
 	// PrinterInclude is not set in testing context (kingpin flags not parsed), causing the collector to skip all interfaces.
 	localNicInclude := ".+"

-	kingpin.CommandLine.GetArg("collector.net.nic-include").StringVar(&localNicInclude)
-	testutils.FuncBenchmarkCollector(b, net.Name, net.NewWithFlags)
+	testutils.FuncBenchmarkCollector(b, net.Name, net.NewWithFlags, func(app *kingpin.Application) {
+		app.GetFlag("collector.net.nic-include").StringVar(&localNicInclude)
+	})
 }
--- a/internal/collector/net/types.go
+++ b/internal/collector/net/types.go
@@ -0,0 +1,34 @@
+// Copyright 2024 The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package net
+
+type perfDataCounterValues struct {
+	Name string
+
+	BytesReceivedPerSec      float64 `perfdata:"Bytes Received/sec"`
+	BytesSentPerSec          float64 `perfdata:"Bytes Sent/sec"`
+	BytesTotalPerSec         float64 `perfdata:"Bytes Total/sec"`
+	CurrentBandwidth         float64 `perfdata:"Current Bandwidth"`
+	OutputQueueLength        float64 `perfdata:"Output Queue Length"`
+	PacketsOutboundDiscarded float64 `perfdata:"Packets Outbound Discarded"`
+	PacketsOutboundErrors    float64 `perfdata:"Packets Outbound Errors"`
+	PacketsPerSec            float64 `perfdata:"Packets/sec"`
+	PacketsReceivedDiscarded float64 `perfdata:"Packets Received Discarded"`
+	PacketsReceivedErrors    float64 `perfdata:"Packets Received Errors"`
+	PacketsReceivedPerSec    float64 `perfdata:"Packets Received/sec"`
+	PacketsReceivedUnknown   float64 `perfdata:"Packets Received Unknown"`
+	PacketsSentPerSec        float64 `perfdata:"Packets Sent/sec"`
+}