fix lint

Signed-off-by: Jan-Otto Kröpke <[email protected]>

.golangci.yaml

@@ -23,3 +23,6 @@ issues:
   - text: "don't use ALL_CAPS in Go names; use CamelCase"
     linters:
     - revive
+  - text: "exported: type name will be used as pdh.Pdh"
+    linters:
+    - revive

Makefile

@@ -1,6 +1,6 @@
 export GOOS=windows
 export DOCKER_IMAGE_NAME ?= windows-exporter
-export DOCKER_REPO ?= ghcr.io/prometheus-community
+export DOCKER_REPO ?= docker.io/prometheuscommunity ghcr.io/prometheus-community ghcr.io/prometheus-community
 
 VERSION?=$(shell cat VERSION)
 DOCKER?=docker

pkg/collector/perfdata/perfdata.go

@@ -5,6 +5,9 @@ package perfdata
 import (
 	"errors"
 	"fmt"
+	"strconv"
+	"strings"
+
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
@@ -13,8 +16,6 @@ import (
 	"github.com/prometheus-community/windows_exporter/pkg/types"
 	"github.com/prometheus/client_golang/prometheus"
 	"gopkg.in/yaml.v3"
-	"strconv"
-	"strings"
 )
 
 const (
@@ -131,7 +132,8 @@ func (c *collector) Build() error {
 		return fmt.Errorf("failed to initialize perf data: %w", err)
 	}
 
-	perfCounterInfos, err := c.perfCounters.GetInfo()
+	var perfCounterInfos map[string]pdh.CounterInfos
+	perfCounterInfos, err = c.perfCounters.GetInfo()
 
 	counterInfos, ok := perfCounterInfos["localhost"]
 	if !ok {

pkg/pdh/kernel32.go

@@ -1,4 +1,5 @@
-// Copyright (c) 2010 The win Authors. All rights reserved.
+// Copyright (c) 2010-2024 The win Authors. All rights reserved.
+// Copyright (c) 2024 The prometheus-community Authors. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions

pkg/pdh/pdh.go

@@ -1,4 +1,5 @@
-// Copyright (c) 2010 The win Authors. All rights reserved.
+// Copyright (c) 2010-2024 The win Authors. All rights reserved.
+// Copyright (c) 2024 The prometheus-community Authors. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions

pkg/pdh/pdh_386.go

@@ -1,4 +1,5 @@
-// Copyright (c) 2010 The win Authors. All rights reserved.
+// Copyright (c) 2010-2024 The win Authors. All rights reserved.
+// Copyright (c) 2024 The prometheus-community Authors. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions
@@ -39,14 +40,14 @@ type PdhFmtCountervalueDouble struct {
 	DoubleValue float64
 }
 
-// PdhFmtCountervalueLarge is a union specialization for 64-bit integer values
+// PdhFmtCounterValueLarge is a union specialization for 64-bit integer values
 type PdhFmtCountervalueLarge struct {
 	CStatus    uint32
 	padding    [4]byte //nolint:unused // Memory reservation
 	LargeValue int64
 }
 
-// PdhFmtCountervalueLong is a union specialization for long values
+// PdhFmtCounterValueLong is a union specialization for long values
 type PdhFmtCountervalueLong struct {
 	CStatus   uint32
 	LongValue int32
@@ -59,14 +60,14 @@ type PdhFmtCountervalueItemDouble struct {
 	FmtValue PdhFmtCountervalueDouble
 }
 
-// PdhFmtCountervalueItemLarge is a union specialization for 'large' values, used by PdhGetFormattedCounterArrayLarge()
+// PdhFmtCounterValueItemLarge is a union specialization for 'large' values, used by PdhGetFormattedCounterArrayLarge()
 type PdhFmtCountervalueItemLarge struct {
 	SzName   *uint16 // pointer to a string
 	padding  [4]byte //nolint:unused // Memory reservation
 	FmtValue PdhFmtCountervalueLarge
 }
 
-// PdhFmtCountervalueItemLong is a union specialization for long values, used by PdhGetFormattedCounterArrayLong()
+// PdhFmtCounterValueItemLong is a union specialization for long values, used by PdhGetFormattedCounterArrayLong()
 type PdhFmtCountervalueItemLong struct {
 	SzName   *uint16 // pointer to a string
 	padding  [4]byte //nolint:unused // Memory reservation

pkg/pdh/pdh_amd64.go

@@ -1,4 +1,5 @@
-// Copyright (c) 2010 The win Authors. All rights reserved.
+// Copyright (c) 2010-2024 The win Authors. All rights reserved.
+// Copyright (c) 2024 The prometheus-community Authors. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions
@@ -38,14 +39,14 @@ type PdhFmtCountervalueDouble struct {
 	DoubleValue float64
 }
 
-// PdhFmtCountervalueLarge is a union specialization for 64-bit integer values
-type PdhFmtCountervalueLarge struct {
+// PdhFmtCounterValueLarge is a union specialization for 64-bit integer values
+type PdhFmtCounterValueLarge struct {
 	CStatus    uint32
 	LargeValue int64
 }
 
-// PdhFmtCountervalueLong is a union specialization for long values
-type PdhFmtCountervalueLong struct {
+// PdhFmtCounterValueLong is a union specialization for long values
+type PdhFmtCounterValueLong struct {
 	CStatus   uint32
 	LongValue int32
 	padding   [4]byte //nolint:unused // Memory reservation
@@ -57,16 +58,16 @@ type PdhFmtCountervalueItemDouble struct {
 	FmtValue PdhFmtCountervalueDouble
 }
 
-// PdhFmtCountervalueItemLarge is a union specialization for 'large' values, used by PdhGetFormattedCounterArrayLarge()
-type PdhFmtCountervalueItemLarge struct {
+// PdhFmtCounterValueItemLarge is a union specialization for 'large' values, used by PdhGetFormattedCounterArrayLarge()
+type PdhFmtCounterValueItemLarge struct {
 	SzName   *uint16 // pointer to a string
-	FmtValue PdhFmtCountervalueLarge
+	FmtValue PdhFmtCounterValueLarge
 }
 
-// PdhFmtCountervalueItemLong is a union specialization for long values, used by PdhGetFormattedCounterArrayLong()
-type PdhFmtCountervalueItemLong struct {
+// PdhFmtCounterValueItemLong is a union specialization for long values, used by PdhGetFormattedCounterArrayLong()
+type PdhFmtCounterValueItemLong struct {
 	SzName   *uint16 // pointer to a string
-	FmtValue PdhFmtCountervalueLong
+	FmtValue PdhFmtCounterValueLong
 }
 
 // PdhCounterInfo structure contains information describing the properties of a counter. This information also includes the counter path.
@@ -132,6 +133,7 @@ type PdhRawCounter struct {
 	MultiCount uint32
 }
 
+//nolint:revive // Windows API names are in PascalCase
 type PdhRawCounterItem struct {
 	// Pointer to a null-terminated string that specifies the instance name of the counter. The string is appended to the end of this structure.
 	SzName *uint16

pkg/pdh/pdh_arm64.go

@@ -1,4 +1,5 @@
-// Copyright (c) 2010 The win Authors. All rights reserved.
+// Copyright (c) 2010-2024 The win Authors. All rights reserved.
+// Copyright (c) 2024 The prometheus-community Authors. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions
@@ -38,13 +39,13 @@ type PdhFmtCountervalueDouble struct {
 	DoubleValue float64
 }
 
-// PdhFmtCountervalueLarge is a union specialization for 64-bit integer values
+// PdhFmtCounterValueLarge is a union specialization for 64-bit integer values
 type PdhFmtCountervalueLarge struct {
 	CStatus    uint32
 	LargeValue int64
 }
 
-// PdhFmtCountervalueLong is a union specialization for long values
+// PdhFmtCounterValueLong is a union specialization for long values
 type PdhFmtCountervalueLong struct {
 	CStatus   uint32
 	LongValue int32
@@ -56,13 +57,13 @@ type PdhFmtCountervalueItemDouble struct {
 	FmtValue PdhFmtCountervalueDouble
 }
 
-// PdhFmtCountervalueItemLarge is a union specialization for 'large' values, used by PdhGetFormattedCounterArrayLarge()
+// PdhFmtCounterValueItemLarge is a union specialization for 'large' values, used by PdhGetFormattedCounterArrayLarge()
 type PdhFmtCountervalueItemLarge struct {
 	SzName   *uint16 // pointer to a string
 	FmtValue PdhFmtCountervalueLarge
 }
 
-// PdhFmtCountervalueItemLong is a union specialization for long values, used by PdhGetFormattedCounterArrayLong()
+// PdhFmtCounterValueItemLong is a union specialization for long values, used by PdhGetFormattedCounterArrayLong()
 type PdhFmtCountervalueItemLong struct {
 	SzName   *uint16 // pointer to a string
 	FmtValue PdhFmtCountervalueLong

pkg/pdh/win_perf_counters.go

@@ -6,12 +6,13 @@ import (
 	_ "embed"
 	"errors"
 	"fmt"
-	"golang.org/x/sys/windows"
 	"os"
 	"strings"
 	"sync"
 	"time"
 
+	"golang.org/x/sys/windows"
+
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 )
@@ -173,10 +174,6 @@ func newCounter(
 	includeTotal bool,
 	useRawValue bool,
 ) *counter {
-	newCounterName := counterName
-	if useRawValue {
-		newCounterName += "_Raw"
-	}
 	return &counter{counterPath, computer, objectName, counterName, instance, measurement,
 		includeTotal, useRawValue, counterHandle}
 }
@@ -296,10 +293,6 @@ func (m *WinPerfCounters) AddItem(counterPath, computer, objectName, instance, c
 			}
 
 			hostCounter.counters = append(hostCounter.counters, newItem)
-
-			if m.PrintValid {
-				level.Info(m.Log).Log("msg", fmt.Sprintf("Valid: %s", counterPath))
-			}
 		}
 	} else {
 		newItem := newCounter(
@@ -314,9 +307,6 @@ func (m *WinPerfCounters) AddItem(counterPath, computer, objectName, instance, c
 			useRawValue,
 		)
 		hostCounter.counters = append(hostCounter.counters, newItem)
-		if m.PrintValid {
-			level.Info(m.Log).Log("msg", fmt.Sprintf("Valid: %s", counterPath))
-		}
 	}
 
 	return nil
@@ -528,7 +518,7 @@ func (m *WinPerfCounters) gatherComputerCounters(hostCounterInfo *hostCountersIn
 				if !isKnownCounterDataError(err) {
 					return Accumulator{}, fmt.Errorf("error while getting value for counter %q: %w", metric.counterPath, err)
 				}
-				level.Warn(m.Log).Log("msg", fmt.Sprintf("Error while getting value for counter %q, instance: %s, will skip metric: %v", metric.counterPath, metric.instance, err))
+				_ = level.Warn(m.Log).Log("msg", fmt.Sprintf("Error while getting value for counter %q, instance: %s, will skip metric: %v", metric.counterPath, metric.instance, err))
 				continue
 			}