Refactor collectors

Signed-off-by: Jan-Otto Kröpke <[email protected]>
prometheus-community · Nov 5, 2023 · e5ed61a · e5ed61a
1 parent 9c0be5f
commit e5ed61a
Show file tree

Hide file tree

Showing 206 changed files with 15,270 additions and 13,700 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -95,7 +95,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.51.2
+          version: v1.55.2
           args: "--timeout=5m"
 
       # golangci-lint action doesn't always provide helpful output, so re-run without the action for

diff --git a/.golangci.yaml b/.golangci.yaml
@@ -7,13 +7,13 @@ linters:
   - govet
   - gofmt
   - ineffassign
-  - structcheck
   - unconvert
   - varcheck
 
 issues:
   exclude:
   - don't use underscores in Go names
+  - don't use an underscore in package name
   - exported type .+ should have comment or be unexported
   exclude-rules:
   - # Golint has many capitalisation complaints on WMI class names

diff --git a/Makefile b/Makefile
@@ -13,14 +13,14 @@ BASE_IMAGE=mcr.microsoft.com/windows/nanoserver
 
 .PHONY: build
 build: windows_exporter.exe
-windows_exporter.exe: **/*.go
+windows_exporter.exe: pkg/**/*.go
 	promu build -v
 
 test:
 	go test -v ./...
 
 bench:
-	go test -v -bench='benchmark(cpu|logicaldisk|physicaldisk|logon|memory|net|process|service|system|tcp|time)collector' ./...
+	go test -v -bench='benchmarkcollector' ./pkg/collector/{cpu,logical_disk,physical_disk,logon,memory,net,process,service,system,tcp,time}
 
 lint:
 	golangci-lint -c .golangci.yaml run

diff --git a/collector/ad_test.go b/collector/ad_test.go
diff --git a/collector/adcs_test.go b/collector/adcs_test.go
diff --git a/collector/adfs_test.go b/collector/adfs_test.go
diff --git a/collector/collector.go b/collector/collector.go
diff --git a/collector/collector_test.go b/collector/collector_test.go