process: fix metric labels for multiple process instances

Signed-off-by: Jan-Otto Kröpke <[email protected]>
prometheus-community · Dec 9, 2024 · d68a164 · d68a164
1 parent dd9695b
commit d68a164
Show file tree

Hide file tree

Showing 39 changed files with 70 additions and 115 deletions.
diff --git a/.run/all.run.xml b/.run/all.run.xml
@@ -2,12 +2,12 @@
   <configuration default="false" name="all" type="GoApplicationRunConfiguration" factoryName="Go Application" folderName="run">
     <module name="windows_exporter" />
     <working_directory value="$PROJECT_DIR$" />
-    <parameters value="--web.listen-address=127.0.0.1:9182 --log.level=info --collectors.enabled=ad,adcs,adfs,cache,container,cpu,cpu_info,cs,dfsr,dhcp,diskdrive,dns,exchange,filetime,fsrmquota,hyperv,iis,license,logical_disk,logon,memory,mscluster,msmq,mssql,net,netframework,nps,os,pagefile,performancecounter,physical_disk,printer,process,remote_fx,scheduled_task,service,smb,smbclient,smtp,system,tcp,terminal_services,thermalzone,time,udp,update,vmware --debug.enabled" />
+    <parameters value="--web.listen-address=127.0.0.1:9182 --log.level=info --collectors.enabled=ad,adcs,adfs,cache,container,cpu,cpu_info,cs,dfsr,dhcp,diskdrive,dns,exchange,filetime,fsrmquota,hyperv,iis,license,logical_disk,logon,memory,mscluster,msmq,mssql,net,netframework,nps,os,pagefile,performancecounter,physical_disk,printer,process,remote_fx,scheduled_task,service,smb,smbclient,smtp,system,tcp,terminal_services,thermalzone,time,udp,update,vmware,performancecounter --debug.enabled --collector.performancecounter.objects='[{ &quot;name&quot;: &quot;memory&quot;, &quot;object&quot;: &quot;Memory&quot;, &quot;counters&quot;: [{ &quot;name&quot;:&quot;Cache Faults/sc&quot;, &quot;type&quot;:&quot;counter&quot; }]}]'" />
     <sudo value="true" />
     <kind value="PACKAGE" />
     <package value="github.com/prometheus-community/windows_exporter/cmd/windows_exporter" />
     <directory value="$PROJECT_DIR$" />
     <filePath value="$PROJECT_DIR$/exporter.go" />
     <method v="2" />
   </configuration>
-</component>
+</component>
diff --git a/cmd/windows_exporter/main.go b/cmd/windows_exporter/main.go
@@ -20,10 +20,6 @@ package main
 //goland:noinspection GoUnsortedImport
 //nolint:gofumpt
 import (
-	// Its important that we do these first so that we can register with the Windows service control ASAP to avoid timeouts.
-	"github.com/prometheus-community/windows_exporter/internal/windowsservice"
-	"github.com/prometheus-community/windows_exporter/pkg/public"
-
 	"context"
 	"errors"
 	"fmt"
@@ -38,6 +34,9 @@ import (
 	"strings"
 	"time"
 
+	// Its important that we do these first so that we can register with the Windows service control ASAP to avoid timeouts.
+	"github.com/prometheus-community/windows_exporter/internal/windowsservice"
+
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/prometheus-community/windows_exporter/internal/config"
 	"github.com/prometheus-community/windows_exporter/internal/httphandler"
@@ -208,19 +207,11 @@ func run() int {
 	// Initialize collectors before loading
 	if err = collectors.Build(logger); err != nil {
 		for _, err := range utils.SplitError(err) {
-			for _, ignoreErr := range public.ErrsBuildCanIgnored {
-				if errors.Is(err, ignoreErr) {
-					logger.Warn("couldn't initialize collector",
-						slog.Any("err", err),
-					)
-				} else {
-					logger.Error("couldn't initialize collector",
-						slog.Any("err", err),
-					)
-
-					return 1
-				}
-			}
+			logger.Error("couldn't initialize collector",
+				slog.Any("err", err),
+			)
+
+			return 1
 		}
 	}
 

diff --git a/internal/collector/ad/ad.go b/internal/collector/ad/ad.go
@@ -23,7 +23,6 @@ import (
 	"github.com/prometheus-community/windows_exporter/internal/mi"
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
 	"github.com/prometheus-community/windows_exporter/internal/types"
-	"github.com/prometheus-community/windows_exporter/pkg/public"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -672,7 +671,7 @@ func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
 	data, ok := perfData["NTDS"]
 
 	if !ok {
-		return fmt.Errorf("failed to collect DirectoryServices (AD) metrics: %w", public.ErrNoData)
+		return fmt.Errorf("failed to collect DirectoryServices (AD) metrics: %w", types.ErrNoData)
 	}
 
 	ch <- prometheus.MustNewConstMetric(

diff --git a/internal/collector/adcs/adcs.go b/internal/collector/adcs/adcs.go
@@ -24,7 +24,6 @@ import (
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
 	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus-community/windows_exporter/internal/utils"
-	"github.com/prometheus-community/windows_exporter/pkg/public"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -192,7 +191,7 @@ func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
 	}
 
 	if len(perfData) == 0 {
-		return fmt.Errorf("failed to collect Certification Authority (ADCS) metrics: %w", public.ErrNoData)
+		return fmt.Errorf("failed to collect Certification Authority (ADCS) metrics: %w", types.ErrNoData)
 	}
 
 	for name, data := range perfData {

diff --git a/internal/collector/adfs/adfs.go b/internal/collector/adfs/adfs.go
@@ -26,7 +26,6 @@ import (
 	"github.com/prometheus-community/windows_exporter/internal/mi"
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
 	"github.com/prometheus-community/windows_exporter/internal/types"
-	"github.com/prometheus-community/windows_exporter/pkg/public"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -436,13 +435,13 @@ func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
 	instanceKey := slices.Collect(maps.Keys(data))
 
 	if len(instanceKey) == 0 {
-		return fmt.Errorf("failed to collect ADFS metrics: %w", public.ErrNoData)
+		return fmt.Errorf("failed to collect ADFS metrics: %w", types.ErrNoData)
 	}
 
 	adfsData, ok := data[instanceKey[0]]
 
 	if !ok {
-		return fmt.Errorf("failed to collect ADFS metrics: %w", public.ErrNoData)
+		return fmt.Errorf("failed to collect ADFS metrics: %w", types.ErrNoData)
 	}
 
 	ch <- prometheus.MustNewConstMetric(

diff --git a/internal/collector/cache/cache.go b/internal/collector/cache/cache.go
@@ -23,7 +23,6 @@ import (
 	"github.com/prometheus-community/windows_exporter/internal/mi"
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
 	"github.com/prometheus-community/windows_exporter/internal/types"
-	"github.com/prometheus-community/windows_exporter/pkg/public"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -323,7 +322,7 @@ func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
 	cacheData, ok := data[perfdata.InstanceEmpty]
 
 	if !ok {
-		return fmt.Errorf("failed to collect Cache metrics: %w", public.ErrNoData)
+		return fmt.Errorf("failed to collect Cache metrics: %w", types.ErrNoData)
 	}
 
 	ch <- prometheus.MustNewConstMetric(

diff --git a/internal/collector/dfsr/dfsr.go b/internal/collector/dfsr/dfsr.go
@@ -26,7 +26,6 @@ import (
 	"github.com/prometheus-community/windows_exporter/internal/mi"
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
 	"github.com/prometheus-community/windows_exporter/internal/types"
-	"github.com/prometheus-community/windows_exporter/pkg/public"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -544,7 +543,7 @@ func (c *Collector) collectPDHConnection(ch chan<- prometheus.Metric) error {
 	}
 
 	if len(perfData) == 0 {
-		return fmt.Errorf("failed to collect DFS Replication Connections metrics: %w", public.ErrNoData)
+		return fmt.Errorf("failed to collect DFS Replication Connections metrics: %w", types.ErrNoData)
 	}
 
 	for name, connection := range perfData {
@@ -622,7 +621,7 @@ func (c *Collector) collectPDHFolder(ch chan<- prometheus.Metric) error {
 	}
 
 	if len(perfData) == 0 {
-		return fmt.Errorf("failed to collect DFS Replicated Folders metrics: %w", public.ErrNoData)
+		return fmt.Errorf("failed to collect DFS Replicated Folders metrics: %w", types.ErrNoData)
 	}
 
 	for name, folder := range perfData {
@@ -826,7 +825,7 @@ func (c *Collector) collectPDHVolume(ch chan<- prometheus.Metric) error {
 	}
 
 	if len(perfData) == 0 {
-		return fmt.Errorf("failed to collect DFS Replication Volumes metrics: %w", public.ErrNoData)
+		return fmt.Errorf("failed to collect DFS Replication Volumes metrics: %w", types.ErrNoData)
 	}
 
 	for name, volume := range perfData {

diff --git a/internal/collector/dhcp/dhcp.go b/internal/collector/dhcp/dhcp.go
@@ -23,7 +23,6 @@ import (
 	"github.com/prometheus-community/windows_exporter/internal/mi"
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
 	"github.com/prometheus-community/windows_exporter/internal/types"
-	"github.com/prometheus-community/windows_exporter/pkg/public"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -289,7 +288,7 @@ func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
 
 	data, ok := perfData[perfdata.InstanceEmpty]
 	if !ok {
-		return fmt.Errorf("failed to collect DHCP Server metrics: %w", public.ErrNoData)
+		return fmt.Errorf("failed to collect DHCP Server metrics: %w", types.ErrNoData)
 	}
 
 	ch <- prometheus.MustNewConstMetric(

diff --git a/internal/collector/dns/dns.go b/internal/collector/dns/dns.go
@@ -23,7 +23,6 @@ import (
 	"github.com/prometheus-community/windows_exporter/internal/mi"
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
 	"github.com/prometheus-community/windows_exporter/internal/types"
-	"github.com/prometheus-community/windows_exporter/pkg/public"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -285,7 +284,7 @@ func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
 
 	data, ok := perfData[perfdata.InstanceEmpty]
 	if !ok {
-		return fmt.Errorf("failed to collect DNS metrics: %w", public.ErrNoData)
+		return fmt.Errorf("failed to collect DNS metrics: %w", types.ErrNoData)
 	}
 
 	ch <- prometheus.MustNewConstMetric(

diff --git a/internal/collector/exchange/exchange_active_sync.go b/internal/collector/exchange/exchange_active_sync.go
@@ -20,7 +20,6 @@ import (
 
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
 	"github.com/prometheus-community/windows_exporter/internal/types"
-	"github.com/prometheus-community/windows_exporter/pkg/public"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -73,7 +72,7 @@ func (c *Collector) collectActiveSync(ch chan<- prometheus.Metric) error {
 	}
 
 	if len(perfData) == 0 {
-		return fmt.Errorf("failed to collect MSExchange ActiveSync metrics: %w", public.ErrNoData)
+		return fmt.Errorf("failed to collect MSExchange ActiveSync metrics: %w", types.ErrNoData)
 	}
 
 	for _, data := range perfData {

diff --git a/internal/collector/exchange/exchange_ad_access_processes.go b/internal/collector/exchange/exchange_ad_access_processes.go
@@ -20,7 +20,6 @@ import (
 
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
 	"github.com/prometheus-community/windows_exporter/internal/types"
-	"github.com/prometheus-community/windows_exporter/pkg/public"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -89,7 +88,7 @@ func (c *Collector) collectADAccessProcesses(ch chan<- prometheus.Metric) error
 	}
 
 	if len(perfData) == 0 {
-		return fmt.Errorf("failed to collect MSExchange ADAccess Processes metrics: %w", public.ErrNoData)
+		return fmt.Errorf("failed to collect MSExchange ADAccess Processes metrics: %w", types.ErrNoData)
 	}
 
 	labelUseCount := make(map[string]int)

diff --git a/internal/collector/exchange/exchange_autodiscover.go b/internal/collector/exchange/exchange_autodiscover.go
@@ -20,7 +20,6 @@ import (
 
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
 	"github.com/prometheus-community/windows_exporter/internal/types"
-	"github.com/prometheus-community/windows_exporter/pkg/public"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -53,7 +52,7 @@ func (c *Collector) collectAutoDiscover(ch chan<- prometheus.Metric) error {
 	}
 
 	if len(perfData) == 0 {
-		return fmt.Errorf("failed to collect MSExchange Autodiscover metrics: %w", public.ErrNoData)
+		return fmt.Errorf("failed to collect MSExchange Autodiscover metrics: %w", types.ErrNoData)
 	}
 
 	for _, data := range perfData {

diff --git a/internal/collector/exchange/exchange_availability_service.go b/internal/collector/exchange/exchange_availability_service.go
@@ -20,7 +20,6 @@ import (
 
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
 	"github.com/prometheus-community/windows_exporter/internal/types"
-	"github.com/prometheus-community/windows_exporter/pkg/public"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -53,7 +52,7 @@ func (c *Collector) collectAvailabilityService(ch chan<- prometheus.Metric) erro
 	}
 
 	if len(perfData) == 0 {
-		return fmt.Errorf("failed to collect MSExchange Availability Service metrics: %w", public.ErrNoData)
+		return fmt.Errorf("failed to collect MSExchange Availability Service metrics: %w", types.ErrNoData)
 	}
 
 	for _, data := range perfData {

diff --git a/internal/collector/exchange/exchange_http_proxy.go b/internal/collector/exchange/exchange_http_proxy.go
@@ -20,7 +20,6 @@ import (
 
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
 	"github.com/prometheus-community/windows_exporter/internal/types"
-	"github.com/prometheus-community/windows_exporter/pkg/public"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -97,7 +96,7 @@ func (c *Collector) collectHTTPProxy(ch chan<- prometheus.Metric) error {
 	}
 
 	if len(perfData) == 0 {
-		return fmt.Errorf("failed to collect MSExchange HttpProxy Service metrics: %w", public.ErrNoData)
+		return fmt.Errorf("failed to collect MSExchange HttpProxy Service metrics: %w", types.ErrNoData)
 	}
 
 	for name, data := range perfData {

diff --git a/internal/collector/exchange/exchange_mapi_http_emsmdb.go b/internal/collector/exchange/exchange_mapi_http_emsmdb.go
@@ -20,7 +20,6 @@ import (
 
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
 	"github.com/prometheus-community/windows_exporter/internal/types"
-	"github.com/prometheus-community/windows_exporter/pkg/public"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -57,7 +56,7 @@ func (c *Collector) collectMapiHttpEmsmdb(ch chan<- prometheus.Metric) error {
 	}
 
 	if len(perfData) == 0 {
-		return fmt.Errorf("failed to collect MSExchange MapiHttp Emsmdb metrics: %w", public.ErrNoData)
+		return fmt.Errorf("failed to collect MSExchange MapiHttp Emsmdb metrics: %w", types.ErrNoData)
 	}
 
 	for _, data := range perfData {

diff --git a/internal/collector/exchange/exchange_outlook_web_access.go b/internal/collector/exchange/exchange_outlook_web_access.go
@@ -20,7 +20,6 @@ import (
 
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
 	"github.com/prometheus-community/windows_exporter/internal/types"
-	"github.com/prometheus-community/windows_exporter/pkg/public"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -65,7 +64,7 @@ func (c *Collector) collectOWA(ch chan<- prometheus.Metric) error {
 	}
 
 	if len(perfData) == 0 {
-		return fmt.Errorf("failed to collect MSExchange OWA metrics: %w", public.ErrNoData)
+		return fmt.Errorf("failed to collect MSExchange OWA metrics: %w", types.ErrNoData)
 	}
 
 	for _, data := range perfData {

diff --git a/internal/collector/exchange/exchange_rpc_client_access.go b/internal/collector/exchange/exchange_rpc_client_access.go
@@ -20,7 +20,6 @@ import (
 
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
 	"github.com/prometheus-community/windows_exporter/internal/types"
-	"github.com/prometheus-community/windows_exporter/pkg/public"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -97,7 +96,7 @@ func (c *Collector) collectRPC(ch chan<- prometheus.Metric) error {
 	}
 
 	if len(perfData) == 0 {
-		return fmt.Errorf("failed to collect MSExchange RpcClientAccess metrics: %w", public.ErrNoData)
+		return fmt.Errorf("failed to collect MSExchange RpcClientAccess metrics: %w", types.ErrNoData)
 	}
 
 	for _, data := range perfData {

diff --git a/internal/collector/exchange/exchange_transport_queues.go b/internal/collector/exchange/exchange_transport_queues.go
@@ -20,7 +20,6 @@ import (
 
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
 	"github.com/prometheus-community/windows_exporter/internal/types"
-	"github.com/prometheus-community/windows_exporter/pkg/public"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -201,7 +200,7 @@ func (c *Collector) collectTransportQueues(ch chan<- prometheus.Metric) error {
 	}
 
 	if len(perfData) == 0 {
-		return fmt.Errorf("failed to collect MSExchangeTransport Queues metrics: %w", public.ErrNoData)
+		return fmt.Errorf("failed to collect MSExchangeTransport Queues metrics: %w", types.ErrNoData)
 	}
 
 	for name, data := range perfData {

diff --git a/internal/collector/exchange/exchange_workload_management.go b/internal/collector/exchange/exchange_workload_management.go
@@ -20,7 +20,6 @@ import (
 
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
 	"github.com/prometheus-community/windows_exporter/internal/types"
-	"github.com/prometheus-community/windows_exporter/pkg/public"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -89,7 +88,7 @@ func (c *Collector) collectWorkloadManagementWorkloads(ch chan<- prometheus.Metr
 	}
 
 	if len(perfData) == 0 {
-		return fmt.Errorf("failed to collect MSExchange WorkloadManagement Workloads metrics: %w", public.ErrNoData)
+		return fmt.Errorf("failed to collect MSExchange WorkloadManagement Workloads metrics: %w", types.ErrNoData)
 	}
 
 	for name, data := range perfData {

diff --git a/internal/collector/memory/memory.go b/internal/collector/memory/memory.go
@@ -28,7 +28,6 @@ import (
 	"github.com/prometheus-community/windows_exporter/internal/mi"
 	"github.com/prometheus-community/windows_exporter/internal/perfdata"
 	"github.com/prometheus-community/windows_exporter/internal/types"
-	"github.com/prometheus-community/windows_exporter/pkg/public"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -432,7 +431,7 @@ func (c *Collector) collectPDH(ch chan<- prometheus.Metric) error {
 	data, ok := perfData[perfdata.InstanceEmpty]
 
 	if !ok {
-		return fmt.Errorf("failed to collect Memory metrics: %w", public.ErrNoData)
+		return fmt.Errorf("failed to collect Memory metrics: %w", types.ErrNoData)
 	}
 
 	ch <- prometheus.MustNewConstMetric(