diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 61054464..1780b19c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -92,5 +92,6 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@4696ba8babb6127d732c3c6dde519db15edab9ea # v6 with: - version: v1.60 + # renovate: github=golangci/golangci-lint + version: v1.64.7 args: "--max-same-issues=0" diff --git a/.golangci.yaml b/.golangci.yaml index 1d6c733f..b1c9a9d6 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -5,17 +5,14 @@ linters: - depguard - dupl - err113 - - execinquery - exhaustive - exhaustruct - - exportloopref - fatcontext - funlen - gocognit - goconst - gocyclo - godot - - gomnd - paralleltest - lll - maintidx diff --git a/go.mod b/go.mod index cbb45297..bf9c6497 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/prometheus-community/windows_exporter -go 1.23.0 - -toolchain go1.23.4 +go 1.24 require ( github.com/Microsoft/hcsshim v0.12.9 diff --git a/internal/headers/iphlpapi/iphlpapi_test.go b/internal/headers/iphlpapi/iphlpapi_test.go index 6a73cf90..ac259dc8 100644 --- a/internal/headers/iphlpapi/iphlpapi_test.go +++ b/internal/headers/iphlpapi/iphlpapi_test.go @@ -43,7 +43,10 @@ func TestGetOwnerPIDOfTCPPort(t *testing.T) { require.NoError(t, lister.Close()) }) - pid, err := iphlpapi.GetOwnerPIDOfTCPPort(windows.AF_INET, uint16(lister.Addr().(*net.TCPAddr).Port)) + tcpAddr, ok := lister.Addr().(*net.TCPAddr) + require.True(t, ok) + + pid, err := iphlpapi.GetOwnerPIDOfTCPPort(windows.AF_INET, uint16(tcpAddr.Port)) require.NoError(t, err) require.EqualValues(t, os.Getpid(), pid) } diff --git a/internal/mi/mi_bench_test.go b/internal/mi/mi_bench_test.go index 02f4b816..0161b98f 100644 --- a/internal/mi/mi_bench_test.go +++ b/internal/mi/mi_bench_test.go @@ -38,7 +38,7 @@ func Benchmark_MI_Query_Unmarshal(b *testing.B) { query, err := mi.NewQuery("SELECT Name FROM Win32_Process WHERE Handle = 0 OR Handle = 4") require.NoError(b, err) - for i := 0; i < b.N; i++ { + for b.Loop() { err := session.QueryUnmarshal(&processes, mi.OperationFlagsStandardRTTI, nil, mi.NamespaceRootCIMv2, mi.QueryDialectWQL, query) require.NoError(b, err) require.Equal(b, []win32Process{{Name: "System Idle Process"}, {Name: "System"}}, processes) diff --git a/internal/pdh/collector_bench_test.go b/internal/pdh/collector_bench_test.go index 873f203e..7e70feed 100644 --- a/internal/pdh/collector_bench_test.go +++ b/internal/pdh/collector_bench_test.go @@ -61,7 +61,7 @@ func BenchmarkTestCollector(b *testing.B) { var data []processFull - for i := 0; i < b.N; i++ { + for b.Loop() { _ = performanceData.Collect(&data) } diff --git a/internal/pdh/registry/perflib_test.go b/internal/pdh/registry/perflib_test.go index b8798181..1a2c495d 100644 --- a/internal/pdh/registry/perflib_test.go +++ b/internal/pdh/registry/perflib_test.go @@ -5,7 +5,7 @@ import ( ) func BenchmarkQueryPerformanceData(b *testing.B) { - for n := 0; n < b.N; n++ { + for b.Loop() { _, _ = QueryPerformanceData("Global", "") } } diff --git a/internal/utils/testutils/testutils.go b/internal/utils/testutils/testutils.go index d35f30a0..8b764ace 100644 --- a/internal/utils/testutils/testutils.go +++ b/internal/utils/testutils/testutils.go @@ -57,7 +57,7 @@ func FuncBenchmarkCollector[C collector.Collector](b *testing.B, name string, co } }() - for i := 0; i < b.N; i++ { + for b.Loop() { require.NoError(b, c.Collect(metrics)) } }