exchange: enable all collectors as default (#1572)

Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>

.gitattributes

@@ -0,0 +1,3 @@
+*.go text eol=lf
+*.sh text eol=lf
+Makefile text eol=lf

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -0,0 +1,71 @@
+name: 🐞 Bug
+description: Something is not working as indended.
+labels: [ 🐞 bug ]
+body:
+  - type: markdown
+    attributes:
+      value: Thanks for taking the time to fill out this bug report!
+  
+  - type: textarea
+    attributes:
+      label: Current Behavior
+      description: A concise description of what you're experiencing.
+      placeholder: |
+        When I do <X>, <Y> happens and I see the error message attached below:
+        ```...```
+    validations:
+      required: true
+  
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: A concise description of what you expected to happen.
+      placeholder: When I do <X>, <Z> should happen instead.
+    validations:
+      required: true
+  
+  - type: textarea
+    attributes:
+      label: Steps To Reproduce
+      description: Steps to reproduce the behavior.
+      placeholder: |
+        1. In this environment...
+        2. With this config...
+        3. Run '...'
+        4. See error...
+      render: Markdown
+    validations:
+      required: false
+  
+  - type: textarea
+    attributes:
+      label: Environment
+      description: |
+        examples:
+        - **windows_exporter Version**: 0.26
+        - **Windows Server Version**: 2019
+      value: |
+        - windows_exporter Version:
+        - Windows Server Version:
+    validations:
+      required: true
+  
+  - type: textarea
+    attributes:
+      label: windows_exporter logs
+      description: |
+        Log of windows_exporter.
+        ⚠️ Without proving logs, we unable to assist here. ⚠️
+      render: shell
+    validations:
+      required: true
+      
+  - type: textarea
+    attributes:
+      label: Anything else?
+      description: |
+        Links? References? Anything that will give us more context about the issue you are encountering!
+
+        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/enhancement.yaml

@@ -0,0 +1,41 @@
+name: ✨ Enhancement / Feature / Task
+description: Some feature is missing or incomplete.
+labels: [ ✨ enhancement ]
+body:
+  - type: textarea
+    attributes:
+      label: Problem Statement
+      description: Without specifying a solution, describe what the project is missing today.
+      placeholder: |
+        The rotating project logo has a fixed size and color.
+        There is no way to make it larger and more shiny.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Proposed Solution
+      description: Describe the proposed solution to the problem above.
+      placeholder: |
+        - Implement 2 new flags CLI: ```--logo-color=FFD700``` and ```--logo-size=100```
+        - Let these flags control the size of the rotating project logo.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Additional information
+      placeholder: |
+        We considered adjusting the logo size to the phase of the moon, but there was no
+        reliable data source in air-gapped environments.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Acceptance Criteria
+      placeholder: |
+        - [ ] As a user, I can control the size of the rotating logo using a CLI flag.
+        - [ ] As a user, I can control the color of the rotating logo using a CLI flag.
+        - [ ] Defaults are reasonably set.
+        - [ ] New settings are appropriately documented.
+        - [ ] No breaking change for current users of the rotating logo feature.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/question.yaml

@@ -0,0 +1,27 @@
+name: ❓ Question
+description: Something is not clear.
+labels: [ ❓ question ]
+body:
+  - type: textarea
+    attributes:
+      label: Problem Statement
+      description: Without specifying a solution, describe what the project is missing today.
+      placeholder: |
+        The rotating project logo has a fixed size and color.
+        There is no way to make it larger and more shiny.
+    validations:
+      required: false
+
+  - type: textarea
+    attributes:
+      label: Environment
+      description: |
+        examples:
+        - **windows_exporter Version**: 0.26
+        - **Windows Server Version**: 2019
+      value: |
+        - windows_exporter Version:
+        - Windows Server Version:
+    validations:
+      required: true
+

.github/dependabot.yml

@@ -1,6 +1,15 @@
 version: 2
 updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "🛠️ dependencies"
+
   - package-ecosystem: "gomod"
     directory: "/"
     schedule:
       interval: "weekly"
+    labels:
+      - "🛠️ dependencies"

.github/release.yml

@@ -0,0 +1,23 @@
+changelog:
+  exclude:
+    labels:
+      - chore
+  categories:
+    - title: 💥 Breaking Changes
+      labels:
+        - 💥 breaking-change
+    - title: ✨ Exciting New Features
+      labels:
+        - ✨ enhancement
+    - title: 🐞 Bug Fixes
+      labels:
+        - 🐞 bug
+    - title: 🛠️ Dependencies
+      labels:
+        - 🛠️ dependencies
+    - title: 📖 Documentation
+      labels:
+        - 📖 docs
+    - title: Other Changes
+      labels:
+        - "*"

.github/workflows/container_description.yml

@@ -0,0 +1,57 @@
+---
+name: Push README to Docker Hub
+on:
+  push:
+    paths:
+      - "README.md"
+      - "README-containers.md"
+      - ".github/workflows/container_description.yml"
+    branches: [ main, master ]
+
+permissions:
+  contents: read
+
+jobs:
+  PushDockerHubReadme:
+    runs-on: ubuntu-latest
+    name: Push README to Docker Hub
+    if: github.repository_owner == 'prometheus' || github.repository_owner == 'prometheus-community' # Don't run this workflow on forks.
+    steps:
+      - name: git checkout
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - name: Set docker hub repo name
+        run: echo "DOCKER_REPO_NAME=$(make docker-repo-name)" >> $GITHUB_ENV
+      - name: Push README to Dockerhub
+        uses: christian-korneck/update-container-description-action@d36005551adeaba9698d8d67a296bd16fa91f8e8 # v1
+        env:
+          DOCKER_USER: ${{ secrets.DOCKER_HUB_LOGIN }}
+          DOCKER_PASS: ${{ secrets.DOCKER_HUB_PASSWORD }}
+        with:
+          destination_container_repo: ${{ env.DOCKER_REPO_NAME }}
+          provider: dockerhub
+          short_description: ${{ env.DOCKER_REPO_NAME }}
+          # Empty string results in README-containers.md being pushed if it
+          # exists. Otherwise, README.md is pushed.
+          readme_file: ''
+
+  PushQuayIoReadme:
+    runs-on: ubuntu-latest
+    name: Push README to quay.io
+    if: github.repository_owner == 'prometheus' || github.repository_owner == 'prometheus-community' # Don't run this workflow on forks.
+    steps:
+      - name: git checkout
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - name: Set quay.io org name
+        run: echo "DOCKER_REPO=$(echo quay.io/${GITHUB_REPOSITORY_OWNER} | tr -d '-')" >> $GITHUB_ENV
+      - name: Set quay.io repo name
+        run: echo "DOCKER_REPO_NAME=$(make docker-repo-name)" >> $GITHUB_ENV
+      - name: Push README to quay.io
+        uses: christian-korneck/update-container-description-action@d36005551adeaba9698d8d67a296bd16fa91f8e8 # v1
+        env:
+          DOCKER_APIKEY: ${{ secrets.QUAY_IO_API_TOKEN }}
+        with:
+          destination_container_repo: ${{ env.DOCKER_REPO_NAME }}
+          provider: quay
+          # Empty string results in README-containers.md being pushed if it
+          # exists. Otherwise, README.md is pushed.
+          readme_file: ''

.github/workflows/lint.yml

@@ -30,8 +30,8 @@ jobs:
   test:
     runs-on: windows-2019
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
 
@@ -44,7 +44,6 @@ jobs:
           Expand-Archive -Path promu-$($Env:PROMU_VER).windows-amd64.zip -DestinationPath .
           Copy-Item -Path promu-$($Env:PROMU_VER).windows-amd64\promu.exe -Destination "$(go env GOPATH)\bin"
 
-          go install github.com/josephspurrier/goversioninfo/cmd/goversioninfo@v1.2.0
           # GOPATH\bin dir must be appended to PATH else the `promu` command won't be found
           echo "$(go env GOPATH)\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
@@ -54,8 +53,8 @@ jobs:
   promtool:
     runs-on: windows-2019
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
 
@@ -69,8 +68,6 @@ jobs:
           Expand-Archive -Path promu-$($Env:PROMU_VER).windows-amd64.zip -DestinationPath .
           Copy-Item -Path promu-$($Env:PROMU_VER).windows-amd64\promu.exe -Destination "$(go env GOPATH)\bin"
 
-          # No binaries available so build from source
-          go install github.com/josephspurrier/goversioninfo/cmd/goversioninfo@v1.2.0
           # GOPATH\bin dir must be appended to PATH else the `promu` command won't be found
           echo "$(go env GOPATH)\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
@@ -95,20 +92,13 @@ jobs:
           git config --global core.autocrlf false
           git config --global core.eol lf
 
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version-file: 'go.mod'
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.55.2
-          args: "--timeout=5m"
-
-      # golangci-lint action doesn't always provide helpful output, so re-run without the action for
-      # better output of the problem.
-      # The cache from the golangci-lint step is re-used here, so this step should finish quickly.
-      - name: errors
-        if: ${{ failure() }}
-        run: golangci-lint run --timeout=5m -c .golangci.yaml
+          version: v1.59
+          args: "--timeout=5m"

.github/workflows/pr-check.yaml

@@ -0,0 +1,48 @@
+name: Validate Pull Request
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - labeled
+      - unlabeled
+
+jobs:
+  required-labels-missing:
+    name: required labels missing
+    runs-on: ubuntu-latest
+    steps:
+      - name: check
+        if: >-
+          !contains(github.event.pull_request.labels.*.name, '💥 breaking-change')
+          && !contains(github.event.pull_request.labels.*.name, '✨ enhancement')
+          && !contains(github.event.pull_request.labels.*.name, '🐞 bug')
+          && !contains(github.event.pull_request.labels.*.name, '📖 docs')
+          && !contains(github.event.pull_request.labels.*.name, 'chore')
+          && !contains(github.event.pull_request.labels.*.name, '🛠️ dependencies')
+        run: >-
+          echo One of the following labels is missing on this PR:
+          breaking-change
+          enhancement
+          bug
+          docs
+          chore
+          && exit 1
+  title:
+    name: check title prefix
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: check
+        run: |
+          PR_TITLE_PREFIX=$(echo "$PR_TITLE" | cut -d':' -f1)
+          if [[ -d "pkg/collector/$PR_TITLE_PREFIX" ]] || [[ -d "$PR_TITLE_PREFIX" ]] || [[ "$PR_TITLE_PREFIX" == "chore" ]] || [[ "$PR_TITLE_PREFIX" == "chore(deps)" ]] || [[ "$PR_TITLE_PREFIX" == "*" ]] || [[ "$PR_TITLE_PREFIX" == "Synchronize common files from prometheus/prometheus" ]]; then
+            exit 0
+          fi
+
+          echo "PR title must start with an name of an collector package"
+          echo "Example: 'logical_disk: description'"
+          exit 1
+        env:
+          PR_TITLE: ${{ github.event.pull_request.title }}

.github/workflows/release.yml

@@ -2,6 +2,10 @@ name: Releases
 
 # Trigger on releases.
 on:
+  push:
+    branches:
+      - master
+  pull_request:
   release:
     types:
       - published
@@ -27,6 +31,31 @@ jobs:
         with:
           go-version-file: 'go.mod'
 
+      # https://github.com/pl4nty/Windows-Containers/blob/Main/helpful_tools/Install-BuildKit-GitHubActions/workflow.yaml
+      - name: Setup containerd
+        run: |
+          $version = "1.7.20"
+          curl.exe -L https://github.com/containerd/containerd/releases/download/v$version/containerd-$version-windows-amd64.tar.gz -o containerd.tar.gz
+          tar.exe xvf containerd.tar.gz
+          .\bin\containerd.exe --register-service
+          Start-Service containerd
+      - name: Setup BuildKit
+        run: |
+          $version = "v0.15.0"
+          curl.exe -L https://github.com/moby/buildkit/releases/download/$version/buildkit-$version.windows-amd64.tar.gz -o buildkit.tar.gz
+          tar.exe xvf buildkit.tar.gz
+          
+          .\bin\buildkitd.exe --register-service
+          Start-Service buildkitd
+      - name: Setup Docker Buildx
+        run: |
+          $version = "v0.16.1"
+          curl.exe -L https://github.com/docker/buildx/releases/download/$version/buildx-$version.windows-amd64.exe -o $env:ProgramData\Docker\cli-plugins\docker-buildx.exe
+      - uses: docker/setup-buildx-action@v3
+        with:
+          driver: remote
+          endpoint: npipe:////./pipe/buildkitd
+
       - name: Install WiX
         run: dotnet tool install --global wix
 
@@ -37,7 +66,6 @@ jobs:
 
       - name: Install Build deps
         run: |
-          dotnet tool install --global GitVersion.Tool --version 5.*
           Invoke-WebRequest -Uri https://github.com/prometheus/promu/releases/download/v$($Env:PROMU_VER)/promu-$($Env:PROMU_VER).windows-amd64.zip -OutFile promu-$($Env:PROMU_VER).windows-amd64.zip
           Expand-Archive -Path promu-$($Env:PROMU_VER).windows-amd64.zip -DestinationPath .
           Copy-Item -Path promu-$($Env:PROMU_VER).windows-amd64\promu.exe -Destination "$(go env GOPATH)\bin"
@@ -48,18 +76,21 @@ jobs:
       - name: Build
         run: |
           $ErrorActionPreference = "Stop"
-
-          dotnet-gitversion /output json /showvariable FullSemVer | Set-Content VERSION -PassThru
-          $Version = Get-Content VERSION
           
-          make crossbuild
+          $Version = git describe --tags --always
+          $Version = $Version -replace 'v', ''
           # '+' symbols are invalid characters in image tags
-          (Get-Content -Path VERSION) -replace '\+', '_' | Set-Content -Path VERSION
+          $Version = $Version -replace '\+', '_'
+          $Version | Set-Content VERSION -PassThru
+          
           make build-all
+          
           # GH requires all files to have different names, so add version/arch to differentiate
           foreach($Arch in "amd64", "arm64") {
             Move-Item output\$Arch\windows_exporter.exe output\windows_exporter-$Version-$Arch.exe
           }
+          
+          Get-ChildItem -Path output
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
@@ -68,21 +99,46 @@ jobs:
           path: output\windows_exporter-*.exe
 
       - name: Build Release Artifacts
-        if: startsWith(github.ref, 'refs/tags/')
         run: |
           $ErrorActionPreference = "Stop"
-          $BuildVersion = Get-Content VERSION
-          $TagName = $env:GITHUB_REF -replace 'refs/tags/', ''
-          # The MSI version is not semver compliant, so just take the numerical parts
-          $MSIVersion = $TagName -replace '^v?([0-9\.]+).*$','$1'
+          $Version = Get-Content VERSION
+          
           foreach($Arch in "amd64", "arm64") {
-            Write-Verbose "Building windows_exporter $MSIVersion msi for $Arch"
-            .\installer\build.ps1 -PathToExecutable .\output\windows_exporter-$BuildVersion-$Arch.exe -Version $MSIVersion -Arch "$Arch"
-            Move-Item installer\windows_exporter-$MSIVersion-$Arch.msi output\
+            Write-Host "Building windows_exporter $Version msi for $Arch"
+            .\installer\build.ps1 -PathToExecutable .\output\windows_exporter-$Version-$Arch.exe -Version $Version -Arch "$Arch"
           }
+          
+          Move-Item installer\*.msi output\
+          Get-ChildItem -Path output\
 
           promu checksum output\
 
+      - name: Build Docker Artifacts
+        run: make build-all
+        env:
+          VERSION: >-
+            ${{
+              startsWith(github.ref, 'refs/tags/') && 'latest' || 
+              (
+                github.event_name == 'pull_request' && format('pr-{0}', github.event.number) || github.ref_name
+              )
+            }}
+
+      - name: Login to Docker Hub
+        if: ${{ github.event_name != 'pull_request' }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_HUB_LOGIN }}
+          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+
+      #- name: Login to quay.io
+      #  if: ${{ github.event_name != 'pull_request' }}
+      #  uses: docker/login-action@v3
+      #  with:
+      #    registry: quay.io
+      #    username: 'robot'
+      #    password: ${{ secrets.QUAY_IO_API_TOKEN }}
+
       - name: Login to GitHub container registry
         if: ${{ github.event_name != 'pull_request' }}
         uses: docker/login-action@v3
@@ -95,8 +151,8 @@ jobs:
         if: ${{ github.event_name != 'pull_request' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          VERSION: ${{ startsWith(github.ref, 'refs/tags/') && 'latest' || github.ref_name }}
         run: |
-          $Env:VERSION = 'latest'
           make push-all
 
       - name: Release

.github/workflows/spelling.yml

@@ -17,7 +17,7 @@ jobs:
     name: Check for spelling errors
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: codespell-project/actions-codespell@master
         with:
           check_filenames: true

.github/workflows/stale.yml

@@ -11,7 +11,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         with:
           stale-issue-message: 'This issue has been marked as stale because it has been open for 90 days with no activity. This thread will be automatically closed in 30 days if no further activity occurs.'
           exempt-issue-labels: 'lifecycle/frozen'

.gitignore

@@ -8,3 +8,4 @@ output/
 *.syso
 installer/*.msi
 installer/*.wixpdb
+local/

.golangci.yaml

@@ -1,14 +1,52 @@
 linters:
-  disable-all: true
-  enable:
-  - deadcode
-  - errcheck
-  - revive
-  - govet
-  - gofmt
-  - ineffassign
-  - unconvert
-  - varcheck
+  enable-all: true
+  disable:
+    - containedctx
+    - contextcheck
+    - cyclop
+    - depguard
+    - dogsled
+    - dupl
+    - err113
+    - exhaustive
+    - exhaustruct
+    - fatcontext
+    - funlen
+    - gochecknoglobals
+    - gocognit
+    - goconst
+    - gocyclo
+    - godox
+    - inamedparam
+    - ireturn
+    - lll
+    - mnd
+    - nlreturn
+    - noctx
+    - testpackage
+    - varnamelen
+    - wrapcheck
+    - wsl
+    - execinquery
+    - gomnd
+    - stylecheck
+    - maintidx
+
+linters-settings:
+  gci:
+    sections:
+      - prefix(github.com/prometheus-community/windows_exporter/pkg/initiate)
+      - standard # Standard section: captures all standard packages.
+      - default # Default section: contains all imports that could not be matched to another section type.
+    custom-order: true
+  tagliatelle:
+    case:
+      use-field-name: true
+      rules:
+        # Any struct tag type can be used.
+        # Support string case: `camel`, `pascal`, `kebab`, `snake`, `upperSnake`, `goCamel`, `goPascal`, `goKebab`, `goSnake`, `upper`, `lower`, `header`
+        json: camel
+        yaml: snake
 
 issues:
   exclude:

Dockerfile

@@ -1,7 +1,7 @@
 # Note this image doesn't really matter for hostprocess but it is good to build per OS version
 # the files in the image are copied to $env:CONTAINER_SANDBOX_MOUNT_POINT on the host
 # but the file system is the Host NOT the container
-ARG BASE="mcr.microsoft.com/windows/nanoserver:1809"
+ARG BASE="mcr.microsoft.com/windows/nanoserver:ltsc2022"
 FROM $BASE
 
 ENV PATH="C:\Windows\system32;C:\Windows;"

Makefile

@@ -1,15 +1,19 @@
-export GOOS=windows
-export DOCKER_IMAGE_NAME ?= windows-exporter
-export DOCKER_REPO ?= ghcr.io/prometheus-community
+GOOS    ?= windows
+VERSION ?= $(shell cat VERSION)
+DOCKER  ?= docker
 
-VERSION?=$(shell cat VERSION)
-DOCKER?=docker
+# DOCKER_REPO is the official image repository name at docker.io, quay.io.
+DOCKER_REPO       ?= prometheuscommunity
+DOCKER_IMAGE_NAME ?= windows-exporter
 
-# Image Variables for Hostprocess Container
+# ALL_DOCKER_REPOS is the list of repositories to push the image to. ghcr.io requires that org name be the same as the image repo name.
+ALL_DOCKER_REPOS  ?= docker.io/$(DOCKER_REPO) ghcr.io/prometheus-community # quay.io/$(DOCKER_REPO) 
+
+# Image Variables for host process Container
 # Windows image build is heavily influenced by https://github.com/kubernetes/kubernetes/blob/master/cluster/images/etcd/Makefile
-OS=1809
-ALL_OS:= 1809 ltsc2022
-BASE_IMAGE=mcr.microsoft.com/windows/nanoserver
+OS                ?= ltsc2019
+ALL_OS            ?= ltsc2019 ltsc2022
+BASE_IMAGE        ?= mcr.microsoft.com/windows/nanoserver
 
 .PHONY: build
 build: generate windows_exporter.exe
@@ -25,7 +29,7 @@ test:
 	go test -v ./...
 
 bench:
-	go test -v -bench='benchmarkcollector' ./pkg/collector/{cpu,logical_disk,physical_disk,logon,memory,net,process,service,system,tcp,time}
+	go test -v -bench='benchmarkcollector' ./pkg/collector/{cpu,logical_disk,physical_disk,logon,memory,net,printer,process,service,system,tcp,time}
 
 lint:
 	golangci-lint -c .golangci.yaml run
@@ -47,22 +51,46 @@ crossbuild: generate
 	GOARCH=amd64 promu build --prefix=output/amd64
 	GOARCH=arm64 promu build --prefix=output/arm64
 
+.PHONY: package
+package: crossbuild
+	powershell -NonInteractive -ExecutionPolicy Bypass -File .\installer\build.ps1 -PathToExecutable .\output\amd64\windows_exporter.exe -Version $(shell git describe --tags --abbrev=0)
+
 build-image: crossbuild
-	$(DOCKER) build --build-arg=BASE=$(BASE_IMAGE):$(OS) -f Dockerfile -t $(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(VERSION)-$(OS) .
+	$(DOCKER) build --build-arg=BASE=$(BASE_IMAGE):$(OS) -f Dockerfile -t local/$(DOCKER_IMAGE_NAME):$(VERSION)-$(OS) .
+
+build-hostprocess:
+	$(DOCKER) buildx build --build-arg=BASE=mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0 -f Dockerfile -t local/$(DOCKER_IMAGE_NAME):$(VERSION)-hostprocess .
 
 sub-build-%:
 	$(MAKE) OS=$* build-image
 
-build-all: $(addprefix sub-build-,$(ALL_OS))
+build-all: $(addprefix sub-build-,$(ALL_OS)) build-hostprocess
 
 push:
 	set -x; \
-	for osversion in ${ALL_OS}; do \
-		$(DOCKER) push $(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(VERSION)-$${osversion}; \
-		$(DOCKER) manifest create --amend $(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(VERSION) $(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(VERSION)-$${osversion}; \
-		full_version=`$(DOCKER) manifest inspect $(BASE_IMAGE):$${osversion} | grep "os.version" | head -n 1 | awk -F\" '{print $$4}'` || true; \
-		$(DOCKER) manifest annotate --os windows --arch amd64 --os-version $${full_version} $(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(VERSION)  $(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(VERSION)-$${osversion}; \
+	for docker_repo in ${DOCKER_REPO}; do \
+		for osversion in ${ALL_OS}; do \
+			$(DOCKER) tag local/$(DOCKER_IMAGE_NAME):$(VERSION)-$${osversion} $${docker_repo}/$(DOCKER_IMAGE_NAME):$(VERSION)-$${osversion}; \
+			$(DOCKER) push $${docker_repo}/$(DOCKER_IMAGE_NAME):$(VERSION)-$${osversion}; \
+			$(DOCKER) manifest create --amend $${docker_repo}/$(DOCKER_IMAGE_NAME):$(VERSION) $${docker_repo}/$(DOCKER_IMAGE_NAME):$(VERSION)-$${osversion}; \
+			full_version=`$(DOCKER) manifest inspect $(BASE_IMAGE):$${osversion} | grep "os.version" | head -n 1 | awk -F\" '{print $$4}'` || true; \
+			$(DOCKER) manifest annotate --os windows --arch amd64 --os-version $${full_version} $${docker_repo}/$(DOCKER_IMAGE_NAME):$(VERSION) $${docker_repo}/$(DOCKER_IMAGE_NAME):$(VERSION)-$${osversion}; \
+		done; \
+		$(DOCKER) manifest push --purge $${docker_repo}/$(DOCKER_IMAGE_NAME):$(VERSION); \
 	done
-	$(DOCKER) manifest push --purge $(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(VERSION)
 
-push-all: build-all push
+# We can't load the image into the local docker store, so we have to build and push it in one go
+push-hostprocess:
+	set -x; \
+	for docker_repo in ${DOCKER_REPO}; do \
+		$(DOCKER) buildx build --push --build-arg=BASE=mcr.microsoft.com/oss/kubernetes/windows-host-process-containers-base-image:v1.0.0 -f Dockerfile -t $${docker_repo}/$(DOCKER_IMAGE_NAME):$(VERSION)-hostprocess .; \
+	done
+
+.PHONY: push-all
+push-all: build-all
+	$(MAKE) DOCKER_REPO="$(ALL_DOCKER_REPOS)" push # push-hostprocess - disabled until it works on Windows
+
+# Mandatory target for container description sync action
+.PHONY: docker-repo-name
+docker-repo-name:
+	@echo "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)"

README.md

@@ -4,7 +4,6 @@
 
 A Prometheus exporter for Windows machines.
 
-
 ## Collectors
 
 Name     | Description | Enabled by default
@@ -17,6 +16,7 @@ Name     | Description | Enabled by default
 [cpu_info](docs/collector.cpu_info.md) | CPU Information |
 [cs](docs/collector.cs.md) | "Computer System" metrics (system properties, num cpus/total memory) | ✓
 [container](docs/collector.container.md) | Container metrics |
+[diskdrive](docs/collector.diskdrive.md) | Diskdrive metrics |
 [dfsr](docs/collector.dfsr.md) | DFSR metrics |
 [dhcp](docs/collector.dhcp.md) | DHCP Server |
 [dns](docs/collector.dns.md) | DNS Server |
@@ -24,6 +24,7 @@ Name     | Description | Enabled by default
 [fsrmquota](docs/collector.fsrmquota.md) | Microsoft File Server Resource Manager (FSRM) Quotas collector |
 [hyperv](docs/collector.hyperv.md) | Hyper-V hosts |
 [iis](docs/collector.iis.md) | IIS sites and applications |
+[license](docs/collector.license.md) | Windows license status | 
 [logical_disk](docs/collector.logical_disk.md) | Logical disks, disk I/O | ✓
 [logon](docs/collector.logon.md) | User logon sessions |
 [memory](docs/collector.memory.md) | Memory usage metrics |
@@ -44,11 +45,14 @@ Name     | Description | Enabled by default
 [netframework_clrsecurity](docs/collector.netframework_clrsecurity.md) | .NET Framework Security Check metrics |
 [net](docs/collector.net.md) | Network interface I/O | ✓
 [os](docs/collector.os.md) | OS metrics (memory, processes, users) | ✓
+[physical_disk](docs/collector.physical_disk.md) | physical disk metrics | ✓
+[printer](docs/collector.printer.md) | Printer metrics | 
 [process](docs/collector.process.md) | Per-process metrics |
 [remote_fx](docs/collector.remote_fx.md) | RemoteFX protocol (RDP) metrics |
 [scheduled_task](docs/collector.scheduled_task.md) | Scheduled Tasks metrics |
 [service](docs/collector.service.md) | Service state metrics | ✓
 [smb](docs/collector.smb.md) | SMB Server |
+[smbclient](docs/collector.smbclient.md) | SMB Client |
 [smtp](docs/collector.smtp.md) | IIS SMTP Server |
 [system](docs/collector.system.md) | System calls | ✓
 [tcp](docs/collector.tcp.md) | TCP connections |
@@ -56,7 +60,7 @@ Name     | Description | Enabled by default
 [time](docs/collector.time.md) | Windows Time Service |
 [thermalzone](docs/collector.thermalzone.md) | Thermal information
 [terminal_services](docs/collector.terminal_services.md) | Terminal services (RDS)
-[textfile](docs/collector.textfile.md) | Read prometheus metrics from a text file | ✓
+[textfile](docs/collector.textfile.md) | Read prometheus metrics from a text file |
 [vmware_blast](docs/collector.vmware_blast.md) | VMware Blast session metrics |
 [vmware](docs/collector.vmware.md) | Performance counters installed by the Vmware Guest agent |
 
@@ -81,17 +85,17 @@ This can be useful for having different Prometheus servers collect specific metr
 
 windows_exporter accepts flags to configure certain behaviours. The ones configuring the global behaviour of the exporter are listed below, while collector-specific ones are documented in the respective collector documentation above.
 
-Flag     | Description | Default value
----------|-------------|--------------------
-`--web.listen-address` | host:port for exporter. | `:9182`
-`--telemetry.path` | URL path for surfacing collected metrics. | `/metrics`
-`--telemetry.max-requests` | Maximum number of concurrent requests. 0 to disable. | `5`
-`--collectors.enabled` | Comma-separated list of collectors to use. Use `[defaults]` as a placeholder which gets expanded containing all the collectors enabled by default." | `[defaults]`
-`--collectors.print` | If true, print available collectors and exit. |
-`--scrape.timeout-margin` | Seconds to subtract from the timeout allowed by the client. Tune to allow for overhead or high loads. | `0.5`
-`--web.config.file` | A [web config][web_config] for setting up TLS and Auth | None
-`--config.file` | [Using a config file](#using-a-configuration-file) from path or URL | None
-`--config.file.insecure-skip-verify` | Skip TLS when loading config file from URL | false
+| Flag                                 | Description                                                                                                                                         | Default value |
+|--------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------|---------------|
+| `--web.listen-address`               | host:port for exporter.                                                                                                                             | `:9182`       |
+| `--telemetry.path`                   | URL path for surfacing collected metrics.                                                                                                           | `/metrics`    |
+| `--telemetry.max-requests`           | Maximum number of concurrent requests. 0 to disable.                                                                                                | `5`           |
+| `--collectors.enabled`               | Comma-separated list of collectors to use. Use `[defaults]` as a placeholder which gets expanded containing all the collectors enabled by default." | `[defaults]`  |
+| `--collectors.print`                 | If true, print available collectors and exit.                                                                                                       |               |
+| `--scrape.timeout-margin`            | Seconds to subtract from the timeout allowed by the client. Tune to allow for overhead or high loads.                                               | `0.5`         |
+| `--web.config.file`                  | A [web config][web_config] for setting up TLS and Auth                                                                                              | None          |
+| `--config.file`                      | [Using a config file](#using-a-configuration-file) from path or URL                                                                                 | None          |
+| `--config.file.insecure-skip-verify` | Skip TLS when loading config file from URL                                                                                                          | false         |
 
 ## Installation
 The latest release can be downloaded from the [releases page](https://github.com/prometheus-community/windows_exporter/releases).
@@ -100,15 +104,17 @@ Each release provides a .msi installer. The installer will setup the windows_exp
 
 If the installer is run without any parameters, the exporter will run with default settings for enabled collectors, ports, etc. The following parameters are available:
 
-Name | Description
------|------------
-`ENABLED_COLLECTORS` | As the `--collectors.enabled` flag, provide a comma-separated list of enabled collectors
-`LISTEN_ADDR` | The IP address to bind to. Defaults to 0.0.0.0
-`LISTEN_PORT` | The port to bind to. Defaults to 9182.
-`METRICS_PATH` | The path at which to serve metrics. Defaults to `/metrics`
-`TEXTFILE_DIRS` | As the `--collector.textfile.directories` flag, provide a directory to read text files with metrics from
-`REMOTE_ADDR` | Allows setting comma separated remote IP addresses for the Windows Firewall exception (allow list). Defaults to an empty string (any remote address).
-`EXTRA_FLAGS` | Allows passing full CLI flags. Defaults to an empty string.
+| Name                             | Description                                                                                                                                           |
+|----------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `ENABLED_COLLECTORS`             | As the `--collectors.enabled` flag, provide a comma-separated list of enabled collectors                                                              |
+| `LISTEN_ADDR`                    | The IP address to bind to. Defaults to an empty string. (any local address)                                                                           |
+| `LISTEN_PORT`                    | The port to bind to. Defaults to `9182`.                                                                                                              |
+| `METRICS_PATH`                   | The path at which to serve metrics. Defaults to `/metrics`                                                                                            |
+| `TEXTFILE_DIRS`                  | As the `--collector.textfile.directories` flag, provide a directory to read text files with metrics from                                              |
+| `REMOTE_ADDR`                    | Allows setting comma separated remote IP addresses for the Windows Firewall exception (allow list). Defaults to an empty string (any remote address). |
+| `EXTRA_FLAGS`                    | Allows passing full CLI flags. Defaults to an empty string.                                                                                           |
+| `ADD_FIREWALL_EXCEPTION`         | Setup an firewall exception for windows_exporter. Defaults to `yes`.                                                                                  |
+| `ENABLE_V1_PERFORMANCE_COUNTERS` | Enables V1 performance counter on modern systems. Defaults to `yes`.                                                                                  |
 
 Parameters are sent to the installer via `msiexec`. Example invocations:
 
@@ -133,6 +139,12 @@ To install the exporter with creating a firewall exception, use the following co
 msiexec /i <path-to-msi-file> ADD_FIREWALL_EXCEPTION=yes
 ```
 
+To repair an installation, e.g force re-creating Windows service:
+
+```powershell
+msiexec /fa <path-to-msi-file>
+```
+
 
 Powershell versions 7.3 and above require [PSNativeCommandArgumentPassing](https://learn.microsoft.com/en-us/powershell/scripting/learn/experimental-features?view=powershell-7.3) to be set to `Legacy` when using `--% EXTRA_FLAGS`:
 
@@ -141,6 +153,21 @@ $PSNativeCommandArgumentPassing = 'Legacy'
 msiexec /i <path-to-msi-file> ENABLED_COLLECTORS=os,service --% EXTRA_FLAGS="--collector.service.services-where ""Name LIKE 'sql%'"""
 ```
 
+## Docker Implementation
+
+The windows_exporter can be run as a Docker container. The Docker image is available on 
+
+* [Docker Hub](https://hub.docker.com/r/prometheuscommunity/windows-exporter): `docker.io/prometheuscommunity/windows-exporter`
+* [GitHub Container Registry](https://github.com/prometheus-community/windows_exporter/pkgs/container/windows-exporter): `ghcr.io/prometheus-community/windows-exporter`
+<!-- * [quay.io Registry](https://quay.io/repository/prometheuscommunity/windows-exporter): `quay.io/prometheuscommunity/windows-exporter` -->
+
+### Tags
+
+The Docker image is tagged with the version of the exporter. The `latest` tag is also available and points to the latest release.
+
+Additionally, a flavor `hostprocess` with `-hostprocess` as suffix is based on the https://github.com/microsoft/windows-host-process-containers-base-image
+which is designed to run as a Windows host process container. The size of that images is smaller than the default one.
+
 ## Kubernetes Implementation
 
 See detailed steps to install on Windows Kubernetes [here](./kubernetes/kubernetes.md).

config.yaml

@@ -0,0 +1,7 @@
+collectors:
+  enabled: cpu,cpu_info,cs,exchange,iis,logical_disk,logon,memory,net,os,process,remote_fx,service,system,tcp,time,terminal_services,textfile
+collector:
+  service:
+    services-where: "Name='windows_exporter'"
+log:
+  level: warn

docs/collector.cpu.md

@@ -35,7 +35,7 @@ Name | Description | Type | Labels
 `windows_cpu_processor_mperf_total` | Processor MPerf Total is proportioanl to the number of TSC ticks each core has accumulated while executing instructions. Due to the manner in which it is presented, it should be scaled by 1e2 to properly line up with Processor Performance Total. As above, it is believed to be closely related to the MPERF MSR. | counter | `core`
 `windows_cpu_processor_rtc_total` | RTC total is assumed to represent the 64Hz tick rate in Windows. It is not by itself useful, but can be used with `windows_cpu_processor_utility_total` to more accurately measure CPU utilisation than with `windows_cpu_time_total` | counter | `core`
 `windows_cpu_processor_utility_total` | Processor Utility Total is a newer, more accurate measure of CPU utilization, in particular handling modern CPUs with variant CPU frequencies. The rate of this counter divided by the rate of `windows_cpu_processor_rtc_total` should provide an accurate view of CPU utilisation on modern systems, as observed in Task Manager. | counter | `core`
-`windows_cpu_processor_privileged_utility_total` | Processor Privilged Utility Total, when used in a similar fashion to `windows_cpu_processor_utility_total` will show the portion of CPU utilization which is happening in privileged mode. | counter | `core`
+`windows_cpu_processor_privileged_utility_total` | Processor Privileged Utility Total, when used in a similar fashion to `windows_cpu_processor_utility_total` will show the portion of CPU utilization which is happening in privileged mode. | counter | `core`
 
 ### Example metric
 Show frequency of host CPU cores

docs/collector.diskdrive.md

@@ -5,7 +5,7 @@ The diskdrive collector exposes metrics about physical disks
 |                     |                                                                                                                                                              |
 | ------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |
 | Metric name prefix  | `diskdrive`                                                                                                                                                  |
-| Classes             | [`Win32_PerfRawData_DNS_DNS`](https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-diskdrive)                                                  |
+| Classes             | [`Win32_DiskDrive`](https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-diskdrive)                                                            |
 | Enabled by default? | No                                                                                                                                                           |
 
 ## Flags
@@ -16,11 +16,11 @@ None
 
 | Name                      | Description                                                                                                                                                      | Type    | Labels |
 | ------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- | ------ |
-| `disk_drive_info`         | General identifiable information about the disk drive                                                                                                            | gauge   | name,caption,device_id,model |
-| `disk_drive_availability` | The disk drive's current availability                                                                                                                            | gauge   | name,availability            |
-| `disk_drive_partitions`   | Number of partitions on the drive                                                                                                                                | gauge   | name                         |
-| `disk_drive_size`         | Size of the disk drive. It is calculated by multiplying the total number of cylinders, tracks in each cylinder, sectors in each track, and bytes in each sector. | gauge   | name                         |
-| `disk_drive_status`       | Operational status of the drive                                                                                                                                  | gauge   | name,status                  |
+| `diskdrive_info`         | General identifiable information about the disk drive                                                                                                            | gauge   | name,caption,device_id,model |
+| `diskdrive_availability` | The disk drive's current availability                                                                                                                            | gauge   | name,availability            |
+| `diskdrive_partitions`   | Number of partitions on the drive                                                                                                                                | gauge   | name                         |
+| `diskdrive_size`         | Size of the disk drive. It is calculated by multiplying the total number of cylinders, tracks in each cylinder, sectors in each track, and bytes in each sector. | gauge   | name                         |
+| `diskdrive_status`       | Operational status of the drive                                                                                                                                  | gauge   | name,status                  |
 
 ## Alerting examples
 **prometheus.rules**

docs/collector.license.md

@@ -0,0 +1,53 @@
+# license collector
+
+The license collector exposes metrics about the Windows license status.
+
+|||
+-|-
+Metric name prefix  | `license`
+Data source         | Win32
+Enabled by default? | No
+
+## Flags
+
+None
+
+## Metrics
+
+| Name                     | Description    | Type  | Labels  |
+|--------------------------|----------------|-------|---------|
+| `windows_license_status` | license status | gauge | `state` |
+
+### Example metric
+
+```
+# HELP windows_license_status Status of windows license
+# TYPE windows_license_status gauge
+windows_license_status{state="genuine"} 1
+windows_license_status{state="invalid_license"} 0
+windows_license_status{state="last"} 0
+windows_license_status{state="offline"} 0
+windows_license_status{state="tampered"} 0
+```
+
+
+## Useful queries
+
+Show if the license is genuine
+
+```
+windows_license_status{state="genuine"}
+```
+
+## Alerting examples
+**prometheus.rules**
+```yaml
+  - alert: "WindowsLicense"
+    expr: 'windows_license_status{state="genuine"} == 0'
+    for: "10m"
+    labels:
+      severity: "high"
+    annotations:
+      summary: "Windows system license is not genuine"
+      description: "The Windows system license is not genuine. Please check the license status."
+```

docs/collector.logical_disk.md

@@ -23,6 +23,7 @@ If given, a disk needs to *not* match the exclude regexp in order for the corres
 
 Name | Description | Type | Labels
 -----|-------------|------|-------
+`windows_logical_disk_info` | A metric with a constant '1' value labeled with logical disk information | gauge | `disk`,`filesystem`,`serial_number`,`volume`,`volume_name`,`type`
 `windows_logical_disk_requests_queued` | Number of requests outstanding on the disk at the time the performance data is collected | gauge | `volume`
 `windows_logical_disk_avg_read_requests_queued` | Average number of read requests that were queued for the selected disk during the sample interval | gauge | `volume`
 `windows_logical_disk_avg_write_requests_queued` | Average number of write requests that were queued for the selected disk during the sample interval | gauge | `volume`
@@ -36,6 +37,7 @@ Name | Description | Type | Labels
 `windows_logical_disk_size_bytes` | Total size of the disk in bytes (not real time, updates every 10-15 min) | gauge | `volume`
 `windows_logical_disk_idle_seconds_total` | Seconds the disk was idle (not servicing read/write requests) | counter | `volume`
 `windows_logical_disk_split_ios_total` | Number of I/Os to the disk split into multiple I/Os | counter | `volume`
+`windows_logical_disk_readonly` | Whether the logical disk is read-only | gauge | `volume`
 
 ### Warning about size metrics
 The `free_bytes` and `size_bytes` metrics are not updated in real time and might have a delay of 10-15min.
@@ -47,6 +49,15 @@ Query the rate of write operations to a disk
 rate(windows_logical_disk_read_bytes_total{instance="localhost", volume=~"C:"}[2m])
 ```
 
+Logical Volume information
+```
+windows_logical_disk_info{disk_id="0",filesystem="",serial_number="",type="",volume="HarddiskVolume2",volume_name=""} 1
+windows_logical_disk_info{disk_id="0",filesystem="",serial_number="",type="",volume="HarddiskVolume3",volume_name=""} 1
+windows_logical_disk_info{disk_id="0",filesystem="NTFS",serial_number="668EEC37",type="fixed",volume="C:",volume_name="Windows"} 1
+windows_logical_disk_info{disk_id="1",filesystem="NTFS",serial_number="50AE953B",type="fixed",volume="D:",volume_name="Temporary Storage"} 1
+windows_logical_disk_info{disk_id="1",filesystem="ReFS",serial_number="C69B59AD",type="fixed",volume="G:",volume_name="Volume"} 1
+```
+
 ## Useful queries
 Calculate rate of total IOPS for disk
 ```

docs/collector.printer.md

@@ -0,0 +1,28 @@
+# printer collector
+
+The printer collector exposes metrics about printers and their jobs.
+
+|                     |                                                                                                                                                                                                |
+|---------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Metric name prefix  | `printer`                                                                                                                                                                                      | 
+| Data source         | WMI                                                                                                                                                                                            |
+| Classes             | [Win32_Printer](https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-printer) <br> [Win32_PrintJob](https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-printjob) |
+| Enabled by default? | false                                                                                                                                                                                          |
+
+## Flags
+
+### `--collector.printer.include`
+
+If given, a printer needs to match the include regexp in order for the corresponding printer metrics to be reported
+
+### `--collector.printer.exclude`
+
+If given, a printer needs to *not* match the exclude regexp in order for the corresponding printer metrics to be reported
+
+## Metrics
+
+Name | Description | Type    | Labels
+-----|-------------|---------|-------
+`windows_printer_status` | Status of the printer at the time the performance data is collected | counter | `printer`, `status`
+`windows_printer_job_count` | Number of jobs processed by the printer since the last reset | gauge   | `printer`
+`windows_printer_job_status` | A counter of printer jobs by status | gauge   | `printer`, `status`

docs/collector.process.md

@@ -2,16 +2,23 @@
 
 The process collector exposes metrics about processes.
 
-|||
--|-
-Metric name prefix  | `process`
-Data source         | Perflib
-Counters            | `Process`
-Enabled by default? | No
+Note, on Windows Server 2022, the `Process` counter set is disabled by default. To enable it, run the following command in an elevated PowerShell session:
+
+```powershell
+lodctr.exe /E:Lsa
+lodctr.exe /E:PerfProc
+lodctr.exe /R
+```
+
+|                     |           |
+|---------------------|-----------|
+| Metric name prefix  | `process` |
+| Data source         | Perflib   |
+| Counters            | `Process` |
+| Enabled by default? | No        |
 
 ## Flags
 
-<<<<<<< HEAD
 ### `--collector.process.include`
 
 Regexp of processes to include. Process name must both match `include` and not
@@ -30,6 +37,12 @@ Enables IIS process name queries. IIS process names are combined with their app
 
 Disabled by default, and can be enabled with `--collector.process.iis=true`.
 
+### `--collector.process.report-owner`
+
+Enables reporting of the process owner. This is a potentially expensive operation.
+
+Disabled by default, and can be enabled with `--collector.process.report-owner`.
+
 ### Example
 To match all firefox processes: `--collector.process.include="firefox.*"`.
 Note that multiple processes with the same name will be disambiguated by
@@ -61,23 +74,23 @@ w3wp_Test
 
 ## Metrics
 
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_process_start_time` | Time of process start | gauge | `process`, `process_id`, `creating_process_id`
-`windows_process_cpu_time_total` | Returns elapsed time that all of the threads of this process used the processor to execute instructions by mode (privileged, user). An instruction is the basic unit of execution in a computer, a thread is the object that executes instructions, and a process is the object created when a program is run. Code executed to handle some hardware interrupts and trap conditions is included in this count. | counter | `process`, `process_id`, `creating_process_id`
-`windows_process_handles` | Total number of handles the process has open. This number is the sum of the handles currently open by each thread in the process. | gauge | `process`, `process_id`, `creating_process_id`
-`windows_process_io_bytes_total` | Bytes issued to I/O operations in different modes (read, write, other). This property counts all I/O activity generated by the process to include file, network, and device I/Os. Read and write mode includes data operations; other mode includes those that do not involve data, such as control operations. | counter | `process`, `process_id`, `creating_process_id`
-`windows_process_io_operations_total` | I/O operations issued in different modes (read, write, other). This property counts all I/O activity generated by the process to include file, network, and device I/Os. Read and write mode includes data operations; other mode includes those that do not involve data, such as control operations. | counter | `process`, `process_id`, `creating_process_id`
-`windows_process_page_faults_total` | Page faults by the threads executing in this process. A page fault occurs when a thread refers to a virtual memory page that is not in its working set in main memory. This can cause the page not to be fetched from disk if it is on the standby list and hence already in main memory, or if it is in use by another process with which the page is shared. | counter | `process`, `process_id`, `creating_process_id`
-`windows_process_page_file_bytes` | Current number of bytes this process has used in the paging file(s). Paging files are used to store pages of memory used by the process that are not contained in other files. Paging files are shared by all processes, and lack of space in paging files can prevent other processes from allocating memory. | gauge | `process`, `process_id`, `creating_process_id`
-`windows_process_pool_bytes` | Pool Bytes is the last observed number of bytes in the paged or nonpaged pool. The nonpaged pool is an area of system memory (physical memory used by the operating system) for objects that cannot be written to disk, but must remain in physical memory as long as they are allocated. The paged pool is an area of system memory (physical memory used by the operating system) for objects that can be written to disk when they are not being used. Nonpaged pool bytes is calculated differently than paged pool bytes, so it might not equal the total of paged pool bytes. | gauge | `process`, `process_id`, `creating_process_id`
-`windows_process_priority_base` | Current base priority of this process. Threads within a process can raise and lower their own base priority relative to the process base priority of the process. | gauge | `process`, `process_id`, `creating_process_id`
-`windows_process_private_bytes` | Current number of bytes this process has allocated that cannot be shared with other processes. | gauge | `process`, `process_id`, `creating_process_id`
-`windows_process_threads` | Number of threads currently active in this process. An instruction is the basic unit of execution in a processor, and a thread is the object that executes instructions. Every running process has at least one thread. | gauge | `process`, `process_id`, `creating_process_id`
-`windows_process_virtual_bytes` | Current size, in bytes, of the virtual address space that the process is using. Use of virtual address space does not necessarily imply corresponding use of either disk or main memory pages. Virtual space is finite and, by using too much, the process can limit its ability to load libraries. | gauge | `process`, `process_id`, `creating_process_id`
-`windows_process_working_set_private_bytes` | Size of the working set, in bytes, that is use for this process only and not shared nor shareable by other processes. | gauge | `process`, `process_id`, `creating_process_id`
-`windows_process_working_set_peak_bytes` | Maximum size, in bytes, of the Working Set of this process at any point in time. The Working Set is the set of memory pages touched recently by the threads in the process. If free memory in the computer is above a threshold, pages are left in the Working Set of a process even if they are not in use. When free memory falls below a threshold, pages are trimmed from Working Sets. If they are needed they will then be soft-faulted back into the Working Set before they leave main memory. | gauge | `process`, `process_id`, `creating_process_id`
-`windows_process_working_set_bytes` | Maximum number of bytes in the working set of this process at any point in time. The working set is the set of memory pages touched recently by the threads in the process. If free memory in the computer is above a threshold, pages are left in the working set of a process even if they are not in use. When free memory falls below a threshold, pages are trimmed from working sets. If they are needed, they are then soft-faulted back into the working set before they leave main memory. | gauge | `process`, `process_id`, `creating_process_id`
+| Name                                        | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Type    | Labels                                                          |
+|---------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|-----------------------------------------------------------------|
+| `windows_process_start_time`                | Time of process start                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | gauge   | `process`, `process_id`, `creating_process_id`, `owner`         |
+| `windows_process_cpu_time_total`            | Returns elapsed time that all of the threads of this process used the processor to execute instructions by mode (privileged, user). An instruction is the basic unit of execution in a computer, a thread is the object that executes instructions, and a process is the object created when a program is run. Code executed to handle some hardware interrupts and trap conditions is included in this count.                                                                                                                                                                      | counter | `process`, `process_id`, `creating_process_id`, `owner`, `mode` |
+| `windows_process_handles`                   | Total number of handles the process has open. This number is the sum of the handles currently open by each thread in the process.                                                                                                                                                                                                                                                                                                                                                                                                                                                   | gauge   | `process`, `process_id`, `creating_process_id`, `owner`         |
+| `windows_process_io_bytes_total`            | Bytes issued to I/O operations in different modes (read, write, other). This property counts all I/O activity generated by the process to include file, network, and device I/Os. Read and write mode includes data operations; other mode includes those that do not involve data, such as control operations.                                                                                                                                                                                                                                                                     | counter | `process`, `process_id`, `creating_process_id`, `owner`, `mode` |
+| `windows_process_io_operations_total`       | I/O operations issued in different modes (read, write, other). This property counts all I/O activity generated by the process to include file, network, and device I/Os. Read and write mode includes data operations; other mode includes those that do not involve data, such as control operations.                                                                                                                                                                                                                                                                              | counter | `process`, `process_id`, `creating_process_id`, `owner`, `mode` |
+| `windows_process_page_faults_total`         | Page faults by the threads executing in this process. A page fault occurs when a thread refers to a virtual memory page that is not in its working set in main memory. This can cause the page not to be fetched from disk if it is on the standby list and hence already in main memory, or if it is in use by another process with which the page is shared.                                                                                                                                                                                                                      | counter | `process`, `process_id`, `creating_process_id`, `owner`         |
+| `windows_process_page_file_bytes`           | Current number of bytes this process has used in the paging file(s). Paging files are used to store pages of memory used by the process that are not contained in other files. Paging files are shared by all processes, and lack of space in paging files can prevent other processes from allocating memory.                                                                                                                                                                                                                                                                      | gauge   | `process`, `process_id`, `creating_process_id`, `owner`         |
+| `windows_process_pool_bytes`                | Pool Bytes is the last observed number of bytes in the paged or nonpaged pool. The nonpaged pool is an area of system memory (physical memory used by the operating system) for objects that cannot be written to disk, but must remain in physical memory as long as they are allocated. The paged pool is an area of system memory (physical memory used by the operating system) for objects that can be written to disk when they are not being used. Nonpaged pool bytes is calculated differently than paged pool bytes, so it might not equal the total of paged pool bytes. | gauge   | `process`, `process_id`, `creating_process_id`, `owner`, `pool` |
+| `windows_process_priority_base`             | Current base priority of this process. Threads within a process can raise and lower their own base priority relative to the process base priority of the process.                                                                                                                                                                                                                                                                                                                                                                                                                   | gauge   | `process`, `process_id`, `creating_process_id`, `owner`         |
+| `windows_process_private_bytes`             | Current number of bytes this process has allocated that cannot be shared with other processes.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | gauge   | `process`, `process_id`, `creating_process_id`, `owner`         |
+| `windows_process_threads`                   | Number of threads currently active in this process. An instruction is the basic unit of execution in a processor, and a thread is the object that executes instructions. Every running process has at least one thread.                                                                                                                                                                                                                                                                                                                                                             | gauge   | `process`, `process_id`, `creating_process_id`, `owner`         |
+| `windows_process_virtual_bytes`             | Current size, in bytes, of the virtual address space that the process is using. Use of virtual address space does not necessarily imply corresponding use of either disk or main memory pages. Virtual space is finite and, by using too much, the process can limit its ability to load libraries.                                                                                                                                                                                                                                                                                 | gauge   | `process`, `process_id`, `creating_process_id`, `owner`         |
+| `windows_process_working_set_private_bytes` | Size of the working set, in bytes, that is use for this process only and not shared nor shareable by other processes.                                                                                                                                                                                                                                                                                                                                                                                                                                                               | gauge   | `process`, `process_id`, `creating_process_id`, `owner`         |
+| `windows_process_working_set_peak_bytes`    | Maximum size, in bytes, of the Working Set of this process at any point in time. The Working Set is the set of memory pages touched recently by the threads in the process. If free memory in the computer is above a threshold, pages are left in the Working Set of a process even if they are not in use. When free memory falls below a threshold, pages are trimmed from Working Sets. If they are needed they will then be soft-faulted back into the Working Set before they leave main memory.                                                                              | gauge   | `process`, `process_id`, `creating_process_id`, `owner`         |
+| `windows_process_working_set_bytes`         | Maximum number of bytes in the working set of this process at any point in time. The working set is the set of memory pages touched recently by the threads in the process. If free memory in the computer is above a threshold, pages are left in the working set of a process even if they are not in use. When free memory falls below a threshold, pages are trimmed from working sets. If they are needed, they are then soft-faulted back into the working set before they leave main memory.                                                                                 | gauge   | `process`, `process_id`, `creating_process_id`, `owner`         |
 
 ### Example metric
 _This collector does not yet have explained examples, we would appreciate your help adding them!_

docs/collector.remote_fx.md

@@ -24,10 +24,15 @@ Name | Description | Type | Labels
 `windows_remote_fx_net_current_tcp_rtt_seconds` | Average TCP round-trip time (RTT) detected in seconds. | gauge | `session_name`
 `windows_remote_fx_net_current_udp_bandwidth` | UDP Bandwidth detected in bytes per second. | gauge | `session_name`
 `windows_remote_fx_net_current_udp_rtt_seconds` | Average UDP round-trip time (RTT) detected in seconds. | gauge | `session_name`
-`windows_remote_fx_net_received_bytes_total` | _Not yet documented_ | counter | `session_name`
-`windows_remote_fx_net_sent_bytes_total` | _Not yet documented_ | counter | `session_name`
+`windows_remote_fx_net_received_bytes_total` | Total bytes received over the network session. | counter | `session_name`
+`windows_remote_fx_net_sent_bytes_total` | Total bytes sent over the network session. | counter | `session_name`
 `windows_remote_fx_net_udp_packets_received_total` | Rate in packets per second at which packets are received over UDP. | counter | `session_name`
 `windows_remote_fx_net_udp_packets_sent_total` | Rate in packets per second at which packets are sent over UDP. | counter | `session_name`
+`windows_remote_fx_net_loss_rate` | Network packet loss rate detected over the RemoteFX session, expressed as a percentage. | counter | `session_name`
+`windows_remote_fx_net_fec_rate` | Forward Error Correction (FEC) rate applied to packets sent over the RemoteFX session, expressed as a percentage. | counter | `session_name`
+`windows_remote_fx_net_retransmission_rate` Rate of packets retransmitted over the RemoteFX session, expressed as a percentage. | counter | `session_name`
+
+
 
 ## Metrics (Graphics)
 

docs/collector.service.md

@@ -2,11 +2,9 @@
 
 The service collector exposes metrics about Windows Services
 
-|||
--|-
-Metric name prefix  | `service`
-Classes             | [`Win32_Service`](https://msdn.microsoft.com/en-us/library/aa394418(v=vs.85).aspx)
-Enabled by default? | Yes
+The collector exists in 2 different version. Version 1 is using WMI to query all services and is able to provide additional
+information. Version 2 is a more efficient solution by directly connecting to the service manager, but is not able to
+provide additional information like `run_as` or start configuration
 
 ## Flags
 
@@ -22,6 +20,19 @@ Example config win_exporter.yml for multiple services: `services-where: Name='SQ
 
 Uses API calls instead of WMI for performance optimization. **Note** the previous flag (`--collector.service.services-where`) won't have any effect on this mode.
 
+### `--collector.service.v2`
+
+Version 2 of the service collector. Is using API calls for performance optimization. **Note** the previous flag (`--collector.service.services-where`) won't have any effect on this mode.
+For additional performance reasons, it doesn't provide any additional information like `run_as` or start configuration.
+
+# collector V1
+
+|||
+-|-
+Metric name prefix  | `service`
+Classes             | [`Win32_Service`](https://msdn.microsoft.com/en-us/library/aa394418(v=vs.85).aspx)
+Enabled by default? | Yes
+
 ## Metrics
 
 Name | Description | Type | Labels
@@ -91,6 +102,53 @@ Counts the number of Microsoft SQL Server/Agent Processes
 count(windows_service_state{exported_name=~"(sqlserveragent|mssqlserver)",state="running"})
 ```
 
+# collector V2
+
+
+|||
+-|-
+Metric name prefix  | `service`
+Classes             | none
+Enabled by default? | No
+
+
+## Metrics
+
+Name | Description | Type | Labels
+-----|-------------|------|-------
+`windows_service_state` | The state of the service, 1 if the current state, 0 otherwise | gauge | name, display_name, state
+
+### States
+
+A service can be in the following states:
+- `stopped`
+- `start pending`
+- `stop pending`
+- `running`
+- `continue pending`
+- `pause pending`
+- `paused`
+- `unknown`
+
+### Example metric
+
+```
+windows_service_state{display_name="Declared Configuration(DC) service",name="dcsvc",status="continue pending"} 0
+windows_service_state{display_name="Declared Configuration(DC) service",name="dcsvc",status="pause pending"} 0
+windows_service_state{display_name="Declared Configuration(DC) service",name="dcsvc",status="paused"} 0
+windows_service_state{display_name="Declared Configuration(DC) service",name="dcsvc",status="running"} 0
+windows_service_state{display_name="Declared Configuration(DC) service",name="dcsvc",status="start pending"} 0
+windows_service_state{display_name="Declared Configuration(DC) service",name="dcsvc",status="stop pending"} 0
+windows_service_state{display_name="Declared Configuration(DC) service",name="dcsvc",status="stopped"} 1
+```
+
+## Useful queries
+Counts the number of Microsoft SQL Server/Agent Processes
+
+```
+count(windows_service_state{name=~"(sqlserveragent|mssqlserver)",state="running"})
+```
+
 ## Alerting examples
 **prometheus.rules**
 ```yaml
@@ -100,7 +158,7 @@ groups:
 
   # Sends an alert when the 'sqlserveragent' service is not in the running state for 3 minutes.
   - alert: SQL Server Agent DOWN
-    expr: windows_service_state{instance="SQL",exported_name="sqlserveragent",state="running"} == 0
+    expr: windows_service_state{instance="SQL",name="sqlserveragent",state="running"} == 0
     for: 3m
     labels:
       severity: high
@@ -110,7 +168,7 @@ groups:
 
   # Sends an alert when the 'mssqlserver' service is not in the running state for 3 minutes.
   - alert: SQL Server DOWN
-    expr: windows_service_state{instance="SQL",exported_name="mssqlserver",state="running"} == 0
+    expr: windows_service_state{instance="SQL",name="mssqlserver",state="running"} == 0
     for: 3m
     labels:
       severity: high

docs/collector.smbclient.md

@@ -0,0 +1,50 @@
+# smbclient collector
+The smbclient collector collects metrics from MS SmbClient hosts through perflib
+|||
+-|-
+Metric name prefix  | `windows_smbclient`
+Classes 			| [Win32_PerfRawData_SMB](https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-smb/)<br/> 
+Enabled by default? | No
+
+## Flags
+
+### `--collectors.smbclient.list`
+Lists the Perflib Objects that are queried for data along with the perlfib object id
+
+### `--collectors.smbclient.enabled`
+Comma-separated list of collectors to use, for example: `--collectors.smbclient.enabled=ServerShares`. Matching is case-sensitive. Depending on the smb protocol version not all performance counters may be available. Use `--collectors.smbclient.list` to obtain a list of supported collectors.
+
+## Metrics
+Name | Description | Type | Labels
+-----|-------------|------|-------
+`windows_smbclient_data_queue_seconds_total` | Seconds requests waited on queue on this share | counter | `server`, `share`|
+`windows_smbclient_read_queue_seconds_total` | Seconds read requests waited on queue on this share | counter | `server`, `share`|
+`windows_smbclient_write_queue_seconds_total` | Seconds write requests waited on queue on this share | counter | `server`, `share`|
+`windows_smbclient_request_seconds_total` | Seconds waiting for requests on this share | counter | `server`, `share`|
+`windows_smbclient_stalls_total` | The number of requests delayed based on insufficient credits on this share | counter | `server`, `share`|
+`windows_smbclient_requests_queued` | The point in time (current) number of requests outstanding on this share | counter | `server`, `share`|
+`windows_smbclient_data_bytes_total` | The bytes read or written on this share | counter | `server`, `share`|
+`windows_smbclient_requests_total` | The requests on this share | counter | `server`, `share`|
+`windows_smbclient_metadata_requests_total` | The metadata requests on this share | counter | `server`, `share`|
+`windows_smbclient_read_bytes_via_smbdirect_total` | The bytes read from this share via RDMA direct placement | TBD | `server`, `share`|
+`windows_smbclient_read_bytes_total` | The bytes read on this share | counter | `server`, `share`|
+`windows_smbclient_read_requests_via_smbdirect_total` | The read requests on this share via RDMA direct placement | TBD | `server`, `share`|
+`windows_smbclient_read_requests_total` | The read requests on this share | counter | `server`, `share`|
+`windows_smbclient_turbo_io_reads_total` | The read requests that go through Turbo I/O | TBD | `server`, `share`|
+`windows_smbclient_turbo_io_writes_total` | The write requests that go through Turbo I/O | TBD | `server`, `share`|
+`windows_smbclient_write_bytes_via_smbdirect_total` | The written bytes to this share via RDMA direct placement | TBD | `server`, `share`|
+`windows_smbclient_write_bytes_total` | The bytes written on this share | counter | `server`, `share`|
+`windows_smbclient_write_requests_via_smbdirect_total` | The write requests to this share via RDMA direct placement | TBD | `server`, `share`|
+`windows_smbclient_write_requests_total` | The write requests on this share | counter | `server`, `share`|
+`windows_smbclient_read_seconds_total` | Seconds waiting for read requests on this share | counter | `server`, `share`|
+`windows_smbclient_write_seconds_total` | Seconds waiting for write requests on this share | counter | `server`, `share`|
+## Useful queries
+```
+# Average request queue length (includes read and write).
+irate(windows_smbclient_data_queue_seconds_total)
+# Request latency milliseconds (includes read and write).
+irate(windows_smbclient_request_seconds_total) / irate(windows_smbclient_requests_total) * 1000
+```
+## Alerting examples
+_This collector does not yet have alerting examples, we would appreciate your help adding them!_
+

docs/collector.terminal_services.md

@@ -2,12 +2,13 @@
 
 The terminal_services collector exposes terminal services (Remote Desktop Services) performance metrics.
 
-|||
--|-
-Metric name prefix  | `terminal_services`
-Data source         | Perflib/WMI
-Classes             | [`Win32_PerfRawData_LocalSessionManager_TerminalServices`](https://wutils.com/wmi/root/cimv2/win32_perfrawdata_localsessionmanager_terminalservices/), [`Win32_PerfRawData_TermService_TerminalServicesSession`](https://docs.microsoft.com/en-us/previous-versions/aa394344(v%3Dvs.85)), [`Win32_PerfRawData_RemoteDesktopConnectionBrokerPerformanceCounterProvider_RemoteDesktopConnectionBrokerCounterset`](https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2012-r2-and-2012/mt729067(v%3Dws.11))
-Enabled by default? | No
+|                         |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
+|-------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| __Metric name prefix__  | `terminal_services`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
+| __Data source__         | Perflib/WMI, Win32                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| __Classes__             | [`Win32_PerfRawData_LocalSessionManager_TerminalServices`](https://wutils.com/wmi/root/cimv2/win32_perfrawdata_localsessionmanager_terminalservices/), [`Win32_PerfRawData_TermService_TerminalServicesSession`](https://docs.microsoft.com/en-us/previous-versions/aa394344(v%3Dvs.85)), [`Win32_PerfRawData_RemoteDesktopConnectionBrokerPerformanceCounterProvider_RemoteDesktopConnectionBrokerCounterset`](https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2012-r2-and-2012/mt729067(v%3Dws.11)) |
+| __Win32 API__           | [WTSEnumerateSessionsEx](https://learn.microsoft.com/en-us/windows/win32/api/wtsapi32/nf-wtsapi32-wtsenumeratesessionsexw)                                                                                                                                                                                                                                                                                                                                                                                                             |
+| __Enabled by default?__ | No                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
 
 ## Flags
 
@@ -15,34 +16,116 @@ None
 
 ## Metrics
 
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_terminal_services_local_session_count` | Number of local Terminal Services sessions. | gauge | `session`
-`windows_terminal_services_connection_broker_performance_total`* | The total number of connections handled by the Connection Brokers since the service started. | counter | `connection`
-`windows_terminal_services_handles` | Total number of handles currently opened by this process. This number is the sum of the handles currently opened by each thread in this process. | gauge | `session_name`
-`windows_terminal_services_page_fault_total` | Rate at which page faults occur in the threads executing in this process. A page fault occurs when a thread refers to a virtual memory page that is not in its working set in main memory. The page may not be retrieved from disk if it is on the standby list and therefore already in main memory. The page also may not be retrieved if it is in use by another process which shares the page. | counter | `session_name`
-`windows_terminal_services_page_file_bytes` | Current number of bytes this process has used in the paging file(s). Paging files are used to store pages of memory used by the process that are not contained in other files. Paging files are shared by all processes, and lack of space in paging files can prevent other processes from allocating memory. | gauge | `session_name`
-`windows_terminal_services_page_file_bytes_peak` | Maximum number of bytes this process has used in the paging file(s). Paging files are used to store pages of memory used by the process that are not contained in other files. Paging files are shared by all processes, and lack of space in paging files can prevent other processes from allocating memory. | gauge | `session_name`
-`windows_terminal_services_privileged_time_seconds_total` | total elapsed time that the threads of the process have spent executing code in privileged mode. | Counter | `session_name`
-`windows_terminal_services_processor_time_seconds_total` | total elapsed time that all of the threads of this process used the processor to execute instructions. | Counter | `session_name`
-`windows_terminal_services_user_time_seconds_total` | total elapsed time that this process's threads have spent executing code in user mode. Applications, environment subsystems, and integral subsystems execute in user mode. | Counter | `session_name`
-`windows_terminal_services_pool_non_paged_bytes` | Number of bytes in the non-paged pool, an area of system memory (physical memory used by the operating system) for objects that cannot be written to disk, but must remain in physical memory as long as they are allocated. This property displays the last observed value only; it is not an average. | gauge | `session_name`
-`windows_terminal_services_pool_paged_bytes` | Number of bytes in the paged pool, an area of system memory (physical memory used by the operating system) for objects that can be written to disk when they are not being used. This property displays the last observed value only; it is not an average. | gauge | `session_name`
-`windows_terminal_services_private_bytes` | Current number of bytes this process has allocated that cannot be shared with other processes. | gauge | `session_name`
-`windows_terminal_services_threads` | Number of threads currently active in this process. An instruction is the basic unit of execution in a processor, and a thread is the object that executes instructions. Every running process has at least one thread. | gauge | `session_name`
-`windows_terminal_services_virtual_bytes` | Current size, in bytes, of the virtual address space the process is using. Use of virtual address space does not necessarily imply corresponding use of either disk or main memory pages. Virtual space is finite and, by using too much, the process can limit its ability to load libraries. | gauge | `session_name`
-`windows_terminal_services_virtual_bytes_peak` | Maximum number of bytes of virtual address space the process has used at any one time. Use of virtual address space does not necessarily imply corresponding use of either disk or main memory pages. Virtual space is finite and, by using too much, the process might limit its ability to load libraries. | gauge | `session_name`
-`windows_terminal_services_working_set_bytes` | Current number of bytes in the working set of this process. The working set is the set of memory pages touched recently by the threads in the process. If free memory in the computer is above a threshold, pages are left in the working set of a process even if they are not in use. When free memory falls below a threshold, pages are trimmed from working sets. If they are needed, they are then soft-faulted back into the working set before they leave main memory. | gauge | `session_name`
-`windows_terminal_services_working_set_bytes_peak` | Maximum number of bytes in the working set of this process at any point in time. The working set is the set of memory pages touched recently by the threads in the process. If free memory in the computer is above a threshold, pages are left in the working set of a process even if they are not in use. When free memory falls below a threshold, pages are trimmed from working sets. If they are needed, they are then soft-faulted back into the working set before they leave main memory. | gauge | `session_name`
+| Name                                                             | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Type    | Labels          |
+|------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|-----------------|
+| `windows_terminal_services_session_info`                         | Info about active WTS sessions                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | gauge   | host,user,state |
+| `windows_terminal_services_local_session_count`                  | Number of local Terminal Services sessions.                                                                                                                                                                                                                                                                                                                                                                                                                                                         | gauge   | `session`       |
+| `windows_terminal_services_connection_broker_performance_total`* | The total number of connections handled by the Connection Brokers since the service started.                                                                                                                                                                                                                                                                                                                                                                                                        | counter | `connection`    |
+| `windows_terminal_services_handles`                              | Total number of handles currently opened by this process. This number is the sum of the handles currently opened by each thread in this process.                                                                                                                                                                                                                                                                                                                                                    | gauge   | `session_name`  |
+| `windows_terminal_services_page_fault_total`                     | Rate at which page faults occur in the threads executing in this process. A page fault occurs when a thread refers to a virtual memory page that is not in its working set in main memory. The page may not be retrieved from disk if it is on the standby list and therefore already in main memory. The page also may not be retrieved if it is in use by another process which shares the page.                                                                                                  | counter | `session_name`  |
+| `windows_terminal_services_page_file_bytes`                      | Current number of bytes this process has used in the paging file(s). Paging files are used to store pages of memory used by the process that are not contained in other files. Paging files are shared by all processes, and lack of space in paging files can prevent other processes from allocating memory.                                                                                                                                                                                      | gauge   | `session_name`  |
+| `windows_terminal_services_page_file_bytes_peak`                 | Maximum number of bytes this process has used in the paging file(s). Paging files are used to store pages of memory used by the process that are not contained in other files. Paging files are shared by all processes, and lack of space in paging files can prevent other processes from allocating memory.                                                                                                                                                                                      | gauge   | `session_name`  |
+| `windows_terminal_services_privileged_time_seconds_total`        | total elapsed time that the threads of the process have spent executing code in privileged mode.                                                                                                                                                                                                                                                                                                                                                                                                    | Counter | `session_name`  |
+| `windows_terminal_services_processor_time_seconds_total`         | total elapsed time that all of the threads of this process used the processor to execute instructions.                                                                                                                                                                                                                                                                                                                                                                                              | Counter | `session_name`  |
+| `windows_terminal_services_user_time_seconds_total`              | total elapsed time that this process's threads have spent executing code in user mode. Applications, environment subsystems, and integral subsystems execute in user mode.                                                                                                                                                                                                                                                                                                                          | Counter | `session_name`  |
+| `windows_terminal_services_pool_non_paged_bytes`                 | Number of bytes in the non-paged pool, an area of system memory (physical memory used by the operating system) for objects that cannot be written to disk, but must remain in physical memory as long as they are allocated. This property displays the last observed value only; it is not an average.                                                                                                                                                                                             | gauge   | `session_name`  |
+| `windows_terminal_services_pool_paged_bytes`                     | Number of bytes in the paged pool, an area of system memory (physical memory used by the operating system) for objects that can be written to disk when they are not being used. This property displays the last observed value only; it is not an average.                                                                                                                                                                                                                                         | gauge   | `session_name`  |
+| `windows_terminal_services_private_bytes`                        | Current number of bytes this process has allocated that cannot be shared with other processes.                                                                                                                                                                                                                                                                                                                                                                                                      | gauge   | `session_name`  |
+| `windows_terminal_services_threads`                              | Number of threads currently active in this process. An instruction is the basic unit of execution in a processor, and a thread is the object that executes instructions. Every running process has at least one thread.                                                                                                                                                                                                                                                                             | gauge   | `session_name`  |
+| `windows_terminal_services_virtual_bytes`                        | Current size, in bytes, of the virtual address space the process is using. Use of virtual address space does not necessarily imply corresponding use of either disk or main memory pages. Virtual space is finite and, by using too much, the process can limit its ability to load libraries.                                                                                                                                                                                                      | gauge   | `session_name`  |
+| `windows_terminal_services_virtual_bytes_peak`                   | Maximum number of bytes of virtual address space the process has used at any one time. Use of virtual address space does not necessarily imply corresponding use of either disk or main memory pages. Virtual space is finite and, by using too much, the process might limit its ability to load libraries.                                                                                                                                                                                        | gauge   | `session_name`  |
+| `windows_terminal_services_working_set_bytes`                    | Current number of bytes in the working set of this process. The working set is the set of memory pages touched recently by the threads in the process. If free memory in the computer is above a threshold, pages are left in the working set of a process even if they are not in use. When free memory falls below a threshold, pages are trimmed from working sets. If they are needed, they are then soft-faulted back into the working set before they leave main memory.                      | gauge   | `session_name`  |
+| `windows_terminal_services_working_set_bytes_peak`               | Maximum number of bytes in the working set of this process at any point in time. The working set is the set of memory pages touched recently by the threads in the process. If free memory in the computer is above a threshold, pages are left in the working set of a process even if they are not in use. When free memory falls below a threshold, pages are trimmed from working sets. If they are needed, they are then soft-faulted back into the working set before they leave main memory. | gauge   | `session_name`  |
 
 `* windows_terminal_services_connection_broker_performance_total` only collected if server has `Remote Desktop Connection Broker` role.
 
 
 ### Example metric
-_This collector does not yet have explained examples, we would appreciate your help adding them!_
+
+```
+windows_remote_fx_net_udp_packets_sent_total{session_name="RDP-Tcp 0"} 0
+# HELP windows_terminal_services_cpu_time_seconds_total Total elapsed time that this process's threads have spent executing code.
+# TYPE windows_terminal_services_cpu_time_seconds_total counter
+windows_terminal_services_cpu_time_seconds_total{mode="RDP-Tcp 0",session_name="privileged"} 98.4843739
+windows_terminal_services_cpu_time_seconds_total{mode="RDP-Tcp 0",session_name="processor"} 620.4687488999999
+windows_terminal_services_cpu_time_seconds_total{mode="RDP-Tcp 0",session_name="user"} 521.9843741
+# HELP windows_terminal_services_handles Total number of handles currently opened by this process. This number is the sum of the handles currently opened by each thread in this process.
+# TYPE windows_terminal_services_handles gauge
+windows_terminal_services_handles{session_name="RDP-Tcp 0"} 20999
+# HELP windows_terminal_services_page_fault_total Rate at which page faults occur in the threads executing in this process. A page fault occurs when a thread refers to a virtual memory page that is not in its working set in main memory. The page may not be retrieved from disk if it is on the standby list and therefore already in main memory. The page also may not be retrieved if it is in use by another process which shares the page.
+# TYPE windows_terminal_services_page_fault_total counter
+windows_terminal_services_page_fault_total{session_name="RDP-Tcp 0"} 1.0436271e+07
+# HELP windows_terminal_services_page_file_bytes Current number of bytes this process has used in the paging file(s). Paging files are used to store pages of memory used by the process that are not contained in other files. Paging files are shared by all processes, and lack of space in paging files can prevent other processes from allocating memory.
+# TYPE windows_terminal_services_page_file_bytes gauge
+windows_terminal_services_page_file_bytes{session_name="RDP-Tcp 0"} 4.310188032e+09
+# HELP windows_terminal_services_page_file_bytes_peak Maximum number of bytes this process has used in the paging file(s). Paging files are used to store pages of memory used by the process that are not contained in other files. Paging files are shared by all processes, and lack of space in paging files can prevent other processes from allocating memory.
+# TYPE windows_terminal_services_page_file_bytes_peak gauge
+windows_terminal_services_page_file_bytes_peak{session_name="RDP-Tcp 0"} 4.817412096e+09
+# HELP windows_terminal_services_pool_non_paged_bytes Number of bytes in the non-paged pool, an area of system memory (physical memory used by the operating system) for objects that cannot be written to disk, but must remain in physical memory as long as they are allocated. This property displays the last observed value only; it is not an average.
+# TYPE windows_terminal_services_pool_non_paged_bytes gauge
+windows_terminal_services_pool_non_paged_bytes{session_name="RDP-Tcp 0"} 1.325456e+06
+# HELP windows_terminal_services_pool_paged_bytes Number of bytes in the paged pool, an area of system memory (physical memory used by the operating system) for objects that can be written to disk when they are not being used. This property displays the last observed value only; it is not an average.
+# TYPE windows_terminal_services_pool_paged_bytes gauge
+windows_terminal_services_pool_paged_bytes{session_name="RDP-Tcp 0"} 2.4651264e+07
+# HELP windows_terminal_services_private_bytes Current number of bytes this process has allocated that cannot be shared with other processes.
+# TYPE windows_terminal_services_private_bytes gauge
+windows_terminal_services_private_bytes{session_name="RDP-Tcp 0"} 4.310188032e+09
+# HELP windows_terminal_services_session_info Terminal Services sessions info
+# TYPE windows_terminal_services_session_info gauge
+windows_terminal_services_session_info{host="",session_name="RDP-Tcp 0",state="active",user="domain\\user"} 1
+windows_terminal_services_session_info{host="",session_name="RDP-Tcp 0",state="connect_query",user="domain\\user"} 0
+windows_terminal_services_session_info{host="",session_name="RDP-Tcp 0",state="connected",user="domain\\user"} 0
+windows_terminal_services_session_info{host="",session_name="RDP-Tcp 0",state="disconnected",user="domain\\user"} 0
+windows_terminal_services_session_info{host="",session_name="RDP-Tcp 0",state="down",user="domain\\user"} 0
+windows_terminal_services_session_info{host="",session_name="RDP-Tcp 0",state="idle",user="domain\\user"} 0
+windows_terminal_services_session_info{host="",session_name="RDP-Tcp 0",state="init",user="domain\\user"} 0
+windows_terminal_services_session_info{host="",session_name="RDP-Tcp 0",state="listen",user="domain\\user"} 0
+windows_terminal_services_session_info{host="",session_name="RDP-Tcp 0",state="reset",user="domain\\user"} 0
+windows_terminal_services_session_info{host="",session_name="RDP-Tcp 0",state="shadow",user="domain\\user"} 0
+windows_terminal_services_session_info{host="",session_name="console",state="active",user=""} 0
+windows_terminal_services_session_info{host="",session_name="console",state="connect_query",user=""} 0
+windows_terminal_services_session_info{host="",session_name="console",state="connected",user=""} 1
+windows_terminal_services_session_info{host="",session_name="console",state="disconnected",user=""} 0
+windows_terminal_services_session_info{host="",session_name="console",state="down",user=""} 0
+windows_terminal_services_session_info{host="",session_name="console",state="idle",user=""} 0
+windows_terminal_services_session_info{host="",session_name="console",state="init",user=""} 0
+windows_terminal_services_session_info{host="",session_name="console",state="listen",user=""} 0
+windows_terminal_services_session_info{host="",session_name="console",state="reset",user=""} 0
+windows_terminal_services_session_info{host="",session_name="console",state="shadow",user=""} 0
+windows_terminal_services_session_info{host="",session_name="services",state="active",user=""} 0
+windows_terminal_services_session_info{host="",session_name="services",state="connect_query",user=""} 0
+windows_terminal_services_session_info{host="",session_name="services",state="connected",user=""} 0
+windows_terminal_services_session_info{host="",session_name="services",state="disconnected",user=""} 1
+windows_terminal_services_session_info{host="",session_name="services",state="down",user=""} 0
+windows_terminal_services_session_info{host="",session_name="services",state="idle",user=""} 0
+windows_terminal_services_session_info{host="",session_name="services",state="init",user=""} 0
+windows_terminal_services_session_info{host="",session_name="services",state="listen",user=""} 0
+windows_terminal_services_session_info{host="",session_name="services",state="reset",user=""} 0
+windows_terminal_services_session_info{host="",session_name="services",state="shadow",user=""} 0
+# HELP windows_terminal_services_threads Number of threads currently active in this process. An instruction is the basic unit of execution in a processor, and a thread is the object that executes instructions. Every running process has at least one thread.
+# TYPE windows_terminal_services_threads gauge
+windows_terminal_services_threads{session_name="RDP-Tcp 0"} 676
+# HELP windows_terminal_services_virtual_bytes Current size, in bytes, of the virtual address space the process is using. Use of virtual address space does not necessarily imply corresponding use of either disk or main memory pages. Virtual space is finite and, by using too much, the process can limit its ability to load libraries.
+# TYPE windows_terminal_services_virtual_bytes gauge
+windows_terminal_services_virtual_bytes{session_name="RDP-Tcp 0"} 9.3228347629568e+13
+# HELP windows_terminal_services_virtual_bytes_peak Maximum number of bytes of virtual address space the process has used at any one time. Use of virtual address space does not necessarily imply corresponding use of either disk or main memory pages. Virtual space is finite and, by using too much, the process might limit its ability to load libraries.
+# TYPE windows_terminal_services_virtual_bytes_peak gauge
+windows_terminal_services_virtual_bytes_peak{session_name="RDP-Tcp 0"} 9.323192164352e+13
+# HELP windows_terminal_services_working_set_bytes Current number of bytes in the working set of this process. The working set is the set of memory pages touched recently by the threads in the process. If free memory in the computer is above a threshold, pages are left in the working set of a process even if they are not in use. When free memory falls below a threshold, pages are trimmed from working sets. If they are needed, they are then soft-faulted back into the working set before they leave main memory.
+# TYPE windows_terminal_services_working_set_bytes gauge
+windows_terminal_services_working_set_bytes{session_name="RDP-Tcp 0"} 6.0632064e+09
+# HELP windows_terminal_services_working_set_bytes_peak Maximum number of bytes in the working set of this process at any point in time. The working set is the set of memory pages touched recently by the threads in the process. If free memory in the computer is above a threshold, pages are left in the working set of a process even if they are not in use. When free memory falls below a threshold, pages are trimmed from working sets. If they are needed, they are then soft-faulted back into the working set before they leave main memory.
+# TYPE windows_terminal_services_working_set_bytes_peak gauge
+windows_terminal_services_working_set_bytes_peak{session_name="RDP-Tcp 0"} 6.74854912e+09
+```
 
 ## Useful queries
-_This collector does not yet have any useful queries added, we would appreciate your help adding them!_
+
+Use metrics can be combined with other metrics to create useful queries. For example, with remote_fx metrics:
+
+```
+windows_remote_fx_net_loss_rate * on(session_name) group_left(user) (windows_terminal_services_session_info == 1)
+```
 
 ## Alerting examples
 _This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/collector.time.md

@@ -5,11 +5,11 @@ If the Windows Time Service is stopped after collection has started, collector m
 
 Please note the Time Service perflib counters are only available on [Windows Server 2016 or newer](https://docs.microsoft.com/en-us/windows-server/networking/windows-time-service/windows-server-2016-improvements).
 
-|||
--|-
-Metric name prefix  | `time`
-Data source         | Perflib
-Enabled by default? | No
+|                     |         |
+|---------------------|---------|
+| Metric name prefix  | `time`  |
+| Data source         | Perflib |
+| Enabled by default? | No      |
 
 ## Flags
 
@@ -17,14 +17,14 @@ None
 
 ## Metrics
 
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_time_clock_frequency_Adjustment_ppb_total` | Total adjustment made to the local system clock frequency by W32Time in parts per billion (PPB) units. 1 PPB adjustment implies the system clock was adjusted at a rate of 1 nanosecond per second (1 ns/s). The smallest possible adjustment can vary and is expected to be in the order of 100's of PPB. | counter | None
-`windows_time_computed_time_offset_seconds` | Absolute time offset between the system clock and the chosen time source, in seconds. | counter | None
-`windows_time_ntp_client_time_sources` | Active number of NTP Time sources being used by the client. This is a count of active, distinct IP addresses of time servers that are responding to this client's requests. | gauge | None
-`windows_time_ntp_round_trip_delay_seconds` | Total roundtrip delay experienced by the NTP client in receiving a response from the server for the most recent request, in seconds. This is the time elapsed on the NTP client between transmitting a request to the NTP server and receiving a valid response from the server. | gauge | None
-`windows_time_ntp_server_outgoing_responses_total` | Total number of requests responded to by the NTP server. | counter | None
-`windows_time_ntp_server_incoming_requests_total` | Total number of requests received by the NTP server. | counter | None
+| Name                                                | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | Type    | Labels |
+|-----------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|--------|
+| `windows_time_clock_frequency_adjustment_ppb_total` | Total adjustment made to the local system clock frequency by W32Time in parts per billion (PPB) units. 1 PPB adjustment implies the system clock was adjusted at a rate of 1 nanosecond per second (1 ns/s). The smallest possible adjustment can vary and is expected to be in the order of 100's of PPB.                                                                                                                                                                                                                                                                                                                                                                                                            | counter | None   |
+| `windows_time_computed_time_offset_seconds`         | The absolute time offset between the system clock and the chosen time source, as computed by the W32Time service in microseconds. When a new valid sample is available, the computed time is updated with the time offset indicated by the sample. This time is the actual time offset of the local clock. W32Time initiates clock correction by using this offset and updates the computed time in between samples with the remaining time offset that needs to be applied to the local clock. Clock accuracy can be tracked by using this performance counter with a low polling interval (for example, 256 seconds or less) and looking for the counter value to be smaller than the desired clock accuracy limit. | gauge   | None   |
+| `windows_time_ntp_client_time_sources`              | Active number of NTP Time sources being used by the client. This is a count of active, distinct IP addresses of time servers that are responding to this client's requests.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | gauge   | None   |
+| `windows_time_ntp_round_trip_delay_seconds`         | Total roundtrip delay experienced by the NTP client in receiving a response from the server for the most recent request, in seconds. This is the time elapsed on the NTP client between transmitting a request to the NTP server and receiving a valid response from the server.                                                                                                                                                                                                                                                                                                                                                                                                                                      | gauge   | None   |
+| `windows_time_ntp_server_outgoing_responses_total`  | Total number of requests responded to by the NTP server.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | counter | None   |
+| `windows_time_ntp_server_incoming_requests_total`   | Total number of requests received by the NTP server.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | counter | None   |
 
 ### Example metric
 _This collector does not yet have explained examples, we would appreciate your help adding them!_

docs/example_config.yml

@@ -1,7 +1,7 @@
 ---
 # Note this is not an exhaustive list of all configuration values
 collectors:
-  enabled: cpu,cs,logical_disk,net,os,service,system,textfile
+  enabled: cpu,cs,logical_disk,net,os,service,system
 collector:
   service:
     services-where: Name='windows_exporter'

exporter.go

@@ -4,37 +4,42 @@
 
 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
+	// 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/pkg/initiate"
 
+	"context"
 	"encoding/json"
 	"fmt"
 	"net/http"
 	"net/http/pprof"
 	"os"
+	"os/signal"
 	"os/user"
 	"runtime"
 	"sort"
 	"strings"
-
-	winlog "github.com/prometheus-community/windows_exporter/pkg/log"
-	"github.com/prometheus-community/windows_exporter/pkg/types"
-	"github.com/prometheus-community/windows_exporter/pkg/utils"
-	"github.com/prometheus-community/windows_exporter/pkg/wmi"
+	"time"
 
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/go-kit/log/level"
 	"github.com/prometheus-community/windows_exporter/pkg/collector"
 	"github.com/prometheus-community/windows_exporter/pkg/config"
+	winlog "github.com/prometheus-community/windows_exporter/pkg/log"
 	"github.com/prometheus-community/windows_exporter/pkg/log/flag"
+	"github.com/prometheus-community/windows_exporter/pkg/types"
+	"github.com/prometheus-community/windows_exporter/pkg/utils"
+	"github.com/prometheus-community/windows_exporter/pkg/wmi"
 	"github.com/prometheus/common/version"
 	"github.com/prometheus/exporter-toolkit/web"
 	webflag "github.com/prometheus/exporter-toolkit/web/kingpinflag"
+	"golang.org/x/sys/windows"
 )
 
 // Same struct prometheus uses for their /version endpoint.
-// Separate copy to avoid pulling all of prometheus as a dependency
+// Separate copy to avoid pulling all of prometheus as a dependency.
 type prometheusVersion struct {
 	Version   string `json:"version"`
 	Revision  string `json:"revision"`
@@ -44,6 +49,37 @@ type prometheusVersion struct {
 	GoVersion string `json:"goVersion"`
 }
 
+// Mapping of priority names to uin32 values required by windows.SetPriorityClass.
+var priorityStringToInt = map[string]uint32{
+	"realtime":    windows.REALTIME_PRIORITY_CLASS,
+	"high":        windows.HIGH_PRIORITY_CLASS,
+	"abovenormal": windows.ABOVE_NORMAL_PRIORITY_CLASS,
+	"normal":      windows.NORMAL_PRIORITY_CLASS,
+	"belownormal": windows.BELOW_NORMAL_PRIORITY_CLASS,
+	"low":         windows.IDLE_PRIORITY_CLASS,
+}
+
+func setPriorityWindows(pid int, priority uint32) error {
+	// https://learn.microsoft.com/en-us/windows/win32/procthread/process-security-and-access-rights
+	handle, err := windows.OpenProcess(
+		windows.STANDARD_RIGHTS_REQUIRED|windows.SYNCHRONIZE|windows.SPECIFIC_RIGHTS_ALL,
+		false, uint32(pid),
+	)
+	if err != nil {
+		return err
+	}
+
+	if err = windows.SetPriorityClass(handle, priority); err != nil {
+		return err
+	}
+
+	if err = windows.CloseHandle(handle); err != nil {
+		return fmt.Errorf("failed to close handle: %w", err)
+	}
+
+	return nil
+}
+
 func main() {
 	app := kingpin.New("windows_exporter", "A metrics collector for Windows.")
 	var (
@@ -84,6 +120,10 @@ func main() {
 			"debug.enabled",
 			"If true, windows_exporter will expose debug endpoints under /debug/pprof.",
 		).Default("false").Bool()
+		processPriority = app.Flag(
+			"process.priority",
+			"Priority of the exporter process. Higher priorities may improve exporter responsiveness during periods of system load. Can be one of [\"realtime\", \"high\", \"abovenormal\", \"normal\", \"belownormal\", \"low\"]",
+		).Default("normal").String()
 	)
 
 	winlogConfig := &winlog.Config{}
@@ -137,14 +177,24 @@ func main() {
 		collectorNames := collector.Available()
 		sort.Strings(collectorNames)
 
-		fmt.Printf("Available collectors:\n")
+		fmt.Printf("Available collectors:\n") //nolint:forbidigo
 		for _, n := range collectorNames {
-			fmt.Printf(" - %s\n", n)
+			fmt.Printf(" - %s\n", n) //nolint:forbidigo
 		}
 
 		return
 	}
 
+	// Only set process priority if a non-default and valid value has been set
+	if *processPriority != "normal" && priorityStringToInt[*processPriority] != 0 {
+		_ = level.Debug(logger).Log("msg", "setting process priority to "+*processPriority)
+		err = setPriorityWindows(os.Getpid(), priorityStringToInt[*processPriority])
+		if err != nil {
+			_ = level.Error(logger).Log("msg", "failed to set process priority", "err", err)
+			os.Exit(1)
+		}
+	}
+
 	if err = wmi.InitWbem(logger); err != nil {
 		_ = level.Error(logger).Log("err", err)
 		os.Exit(1)
@@ -180,14 +230,14 @@ func main() {
 
 	mux := http.NewServeMux()
 	mux.HandleFunc(*metricsPath, withConcurrencyLimit(*maxRequests, collectors.BuildServeHTTP(*disableExporterMetrics, *timeoutMargin)))
-	mux.HandleFunc("/health", func(w http.ResponseWriter, r *http.Request) {
+	mux.HandleFunc("/health", func(w http.ResponseWriter, _ *http.Request) {
 		w.Header().Set("Content-Type", "application/json")
 		_, err := fmt.Fprintln(w, `{"status":"ok"}`)
 		if err != nil {
-			_ = level.Debug(logger).Log("Failed to write to stream", "err", err)
+			_ = level.Debug(logger).Log("msg", "Failed to write to stream", "err", err)
 		}
 	})
-	mux.HandleFunc("/version", func(w http.ResponseWriter, r *http.Request) {
+	mux.HandleFunc("/version", func(w http.ResponseWriter, _ *http.Request) {
 		// we can't use "version" directly as it is a package, and not an object that
 		// can be serialized.
 		err := json.NewEncoder(w).Encode(prometheusVersion{
@@ -211,52 +261,41 @@ func main() {
 		mux.HandleFunc("/debug/pprof/trace", pprof.Trace)
 	}
 
-	if *metricsPath != "/" && *metricsPath != "" {
-		landingConfig := web.LandingConfig{
-			Name:        "Windows Exporter",
-			Description: "Prometheus Exporter for Windows servers",
-			Version:     version.Info(),
-			Links: []web.LandingLinks{
-				{
-					Address: *metricsPath,
-					Text:    "Metrics",
-				},
-				{
-					Address: "/health",
-					Text:    "Health Check",
-				},
-				{
-					Address: "/version",
-					Text:    "Version Info",
-				},
-			},
-		}
-		landingPage, err := web.NewLandingPage(landingConfig)
-		if err != nil {
-			_ = level.Error(logger).Log("msg", "failed to generate landing page", "err", err)
-			os.Exit(1)
-		}
-		mux.Handle("/", landingPage)
-	}
-
 	_ = level.Info(logger).Log("msg", "Starting windows_exporter", "version", version.Info())
 	_ = level.Info(logger).Log("msg", "Build context", "build_context", version.BuildContext())
 	_ = level.Debug(logger).Log("msg", "Go MAXPROCS", "procs", runtime.GOMAXPROCS(0))
 
+	server := &http.Server{
+		ReadHeaderTimeout: 5 * time.Second,
+		IdleTimeout:       60 * time.Second,
+		ReadTimeout:       5 * time.Second,
+		WriteTimeout:      10 * time.Minute,
+		Handler:           mux,
+	}
+
 	go func() {
-		server := &http.Server{Handler: mux}
 		if err := web.ListenAndServe(server, webConfig, logger); err != nil {
 			_ = level.Error(logger).Log("msg", "cannot start windows_exporter", "err", err)
 			os.Exit(1)
 		}
 	}()
 
-	for {
-		if <-initiate.StopCh {
-			_ = level.Info(logger).Log("msg", "Shutting down windows_exporter")
-			break
-		}
+	ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, os.Kill)
+	defer stop()
+
+	select {
+	case <-ctx.Done():
+		_ = level.Info(logger).Log("msg", "Shutting down windows_exporter via kill signal")
+	case <-initiate.StopCh:
+		_ = level.Info(logger).Log("msg", "Shutting down windows_exporter via service control")
 	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+
+	_ = server.Shutdown(ctx)
+
+	_ = level.Info(logger).Log("msg", "windows_exporter has shut down")
 }
 
 func withConcurrencyLimit(n int, next http.HandlerFunc) http.HandlerFunc {

go.mod

@@ -1,26 +1,28 @@
 module github.com/prometheus-community/windows_exporter
 
-go 1.21
+go 1.22
 
 require (
-	github.com/Microsoft/hcsshim v0.12.3
+	github.com/Microsoft/hcsshim v0.12.5
 	github.com/alecthomas/kingpin/v2 v2.4.0
 	github.com/dimchansky/utfbom v1.1.1
 	github.com/go-kit/log v0.2.1
 	github.com/go-ole/go-ole v1.3.0
-	github.com/prometheus/client_golang v1.19.0
+	github.com/prometheus/client_golang v1.19.1
 	github.com/prometheus/client_model v0.6.1
-	github.com/prometheus/common v0.53.0
+	github.com/prometheus/common v0.55.0
 	github.com/prometheus/exporter-toolkit v0.11.0
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/stretchr/testify v1.9.0
 	github.com/yusufpapurcu/wmi v1.2.4
 	go.opencensus.io v0.24.0 // indirect
 	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
-	golang.org/x/sys v0.20.0
+	golang.org/x/sys v0.24.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
+require github.com/pkg/errors v0.9.1
+
 require (
 	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
@@ -32,21 +34,20 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-logfmt/logfmt v0.5.1 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/jpillora/backoff v1.0.0 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
-	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/procfs v0.12.0 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
-	golang.org/x/crypto v0.21.0 // indirect
-	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/oauth2 v0.18.0 // indirect
-	golang.org/x/sync v0.6.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	google.golang.org/appengine v1.6.8 // indirect
+	golang.org/x/crypto v0.24.0 // indirect
+	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/oauth2 v0.21.0 // indirect
+	golang.org/x/sync v0.7.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
 	google.golang.org/grpc v1.62.0 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )

go.sum

@@ -2,8 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
-github.com/Microsoft/hcsshim v0.12.3 h1:LS9NXqXhMoqNCplK1ApmVSfB4UnVLRDWRapB6EIlxE0=
-github.com/Microsoft/hcsshim v0.12.3/go.mod h1:Iyl1WVpZzr+UkzjekHZbV8o5Z9ZkxNGx6CtY2Qg/JVQ=
+github.com/Microsoft/hcsshim v0.12.5 h1:bpTInLlDy/nDRWFVcefDZZ1+U8tS+rz3MxjKgu9boo0=
+github.com/Microsoft/hcsshim v0.12.5/go.mod h1:tIUGego4G1EN5Hb6KC90aDYiUI2dqLSTTOCjVNpOgZ8=
 github.com/alecthomas/kingpin/v2 v2.4.0 h1:f48lwail6p8zpO1bC4TxtqACaGqHYA22qkHjHpqDjYY=
 github.com/alecthomas/kingpin/v2 v2.4.0/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE=
 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=
@@ -52,17 +52,14 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -72,23 +69,25 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU=
-github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k=
+github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE=
+github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
 github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
-github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE=
-github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U=
+github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc=
+github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
 github.com/prometheus/exporter-toolkit v0.11.0 h1:yNTsuZ0aNCNFQ3aFTD2uhPOvr4iD7fdBvKPAEGkNf+g=
 github.com/prometheus/exporter-toolkit v0.11.0/go.mod h1:BVnENhnNecpwoTLiABx7mrPB/OLRIgN74qlQbV+FK1Q=
-github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
-github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
+github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
+github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
@@ -105,77 +104,57 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc=
 github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
 github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
-golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
+golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
+golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ=
 golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
-golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
+golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
+golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI=
-golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8=
+golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
+golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
+golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
-google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
@@ -197,10 +176,8 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
+google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

installer/build.ps1

@@ -10,6 +10,9 @@ Param (
 )
 $ErrorActionPreference = "Stop"
 
+# The MSI version is not semver compliant, so just take the numerical parts
+$MsiVersion = $Version -replace '^v?([0-9\.]+).*$','$1'
+
 # Get absolute path to executable before switching directories
 $PathToExecutable = Resolve-Path $PathToExecutable
 # Set working dir to this directory, reset previous on exit
@@ -25,7 +28,7 @@ Copy-Item -Force $PathToExecutable Work/windows_exporter.exe
 Write-Verbose "Creating windows_exporter-${Version}-${Arch}.msi"
 $wixArch = @{"amd64" = "x64"; "arm64" = "arm64"}[$Arch]
 
-Invoke-Expression "wix build -arch $wixArch -o .\windows_exporter-$($Version)-$($Arch).msi .\windows_exporter.wxs -d Version=$($Version) -ext WixToolset.Firewall.wixext -ext WixToolset.Util.wixext"
+Invoke-Expression "wix build -arch $wixArch -o .\windows_exporter-$($Version)-$($Arch).msi .\windows_exporter.wxs -d Version=$($MsiVersion) -ext WixToolset.Firewall.wixext -ext WixToolset.Util.wixext"
 
 Write-Verbose "Done!"
 Pop-Location

installer/windows_exporter.wxs

@@ -5,7 +5,9 @@
     <?define PlatformProgramFiles = "ProgramFilesFolder" ?>
   <?endif?>
 
-  <Package UpgradeCode="66a6eb5b-1fc2-4b14-a362-5ceec6413308" Name="windows_exporter" Version="$(var.Version)" Manufacturer="prometheus-community" Language="1033" Codepage="1252"><SummaryInformation Manufacturer="prometheus-community" Description="windows_exporter $(var.Version) installer" />
+  <Package UpgradeCode="66a6eb5b-1fc2-4b14-a362-5ceec6413308" Name="windows_exporter" Version="$(var.Version)" Manufacturer="prometheus-community" Language="1033" Codepage="1252">
+    <SummaryInformation Manufacturer="prometheus-community" Description="windows_exporter $(var.Version) installer" />
+
     <Media Id="1" Cabinet="windows_exporter.cab" EmbedCab="yes" />
     <MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." />
 
@@ -16,7 +18,8 @@
     <SetProperty Id="ExtraFlags" After="InstallFiles" Sequence="execute" Value="[EXTRA_FLAGS]" Condition="EXTRA_FLAGS" />
 
     <Property Id="ADD_FIREWALL_EXCEPTION" Secure="yes" />
-    <SetProperty Id="FirewallException" After="InstallFiles" Sequence="execute" Value="[ADD_FIREWALL_EXCEPTION]" Condition="ADD_FIREWALL_EXCEPTION" />
+
+    <Property Id="ENABLE_V1_PERFORMANCE_COUNTERS" Secure="yes" />
 
     <Property Id="LISTEN_PORT" Secure="yes" Value="9182" />
     <SetProperty Id="ListenFlag" After="InstallFiles" Sequence="execute" Value="--web.listen-address [LISTEN_ADDR]:[LISTEN_PORT]" Condition="LISTEN_ADDR&lt;&gt;&quot;&quot; OR LISTEN_PORT&lt;&gt;9182" />
@@ -47,6 +50,25 @@
       <Custom Action="RemoveEventSource" After="InstallInitialize" />
     </InstallExecuteSequence>
 
+    <SetProperty
+            Id="EnableV1PerformanceCounters"
+            Value="&quot;[%ComSpec]&quot; /c lodctr.exe /E:Lsa &amp; lodctr.exe /E:PerfProc &amp; lodctr.exe /R"
+            Before="EnableV1PerformanceCounters"
+            Sequence="execute"
+    />
+    <CustomAction
+            Id="EnableV1PerformanceCounters"
+            BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)"
+            DllEntry="WixSilentExec"
+            Execute="deferred"
+            Impersonate="no"
+            Return="check"
+    />
+
+    <InstallExecuteSequence>
+      <Custom Action="EnableV1PerformanceCounters" Before="InstallFinalize" Condition="ENABLE_V1_PERFORMANCE_COUNTERS=&quot;yes&quot;"/>
+    </InstallExecuteSequence>
+
     <Property Id="TEXTFILE_DIRS" Secure="yes" />
     <SetProperty Id="TextfileDirsFlag" After="InstallFiles" Sequence="execute" Value="--collector.textfile.directories [TEXTFILE_DIRS]" Condition="TEXTFILE_DIRS" />
 

pkg/collector/adcs/adcs.go

@@ -21,120 +21,133 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-type collector struct {
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	RequestsPerSecond                            *prometheus.Desc
-	RequestProcessingTime                        *prometheus.Desc
-	RetrievalsPerSecond                          *prometheus.Desc
-	RetrievalProcessingTime                      *prometheus.Desc
-	FailedRequestsPerSecond                      *prometheus.Desc
-	IssuedRequestsPerSecond                      *prometheus.Desc
-	PendingRequestsPerSecond                     *prometheus.Desc
-	RequestCryptographicSigningTime              *prometheus.Desc
-	RequestPolicyModuleProcessingTime            *prometheus.Desc
-	ChallengeResponsesPerSecond                  *prometheus.Desc
-	ChallengeResponseProcessingTime              *prometheus.Desc
-	SignedCertificateTimestampListsPerSecond     *prometheus.Desc
-	SignedCertificateTimestampListProcessingTime *prometheus.Desc
+	challengeResponseProcessingTime              *prometheus.Desc
+	challengeResponsesPerSecond                  *prometheus.Desc
+	failedRequestsPerSecond                      *prometheus.Desc
+	issuedRequestsPerSecond                      *prometheus.Desc
+	pendingRequestsPerSecond                     *prometheus.Desc
+	requestCryptographicSigningTime              *prometheus.Desc
+	requestPolicyModuleProcessingTime            *prometheus.Desc
+	requestProcessingTime                        *prometheus.Desc
+	requestsPerSecond                            *prometheus.Desc
+	retrievalProcessingTime                      *prometheus.Desc
+	retrievalsPerSecond                          *prometheus.Desc
+	signedCertificateTimestampListProcessingTime *prometheus.Desc
+	signedCertificateTimestampListsPerSecond     *prometheus.Desc
 }
 
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{"Certification Authority"}, nil
 }
 
-func (c *collector) Build() error {
-	c.RequestsPerSecond = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.requestsPerSecond = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "requests_total"),
 		"Total certificate requests processed",
 		[]string{"cert_template"},
 		nil,
 	)
-	c.RequestProcessingTime = prometheus.NewDesc(
+	c.requestProcessingTime = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "request_processing_time_seconds"),
 		"Last time elapsed for certificate requests",
 		[]string{"cert_template"},
 		nil,
 	)
-	c.RetrievalsPerSecond = prometheus.NewDesc(
+	c.retrievalsPerSecond = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "retrievals_total"),
 		"Total certificate retrieval requests processed",
 		[]string{"cert_template"},
 		nil,
 	)
-	c.RetrievalProcessingTime = prometheus.NewDesc(
+	c.retrievalProcessingTime = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "retrievals_processing_time_seconds"),
 		"Last time elapsed for certificate retrieval request",
 		[]string{"cert_template"},
 		nil,
 	)
-	c.FailedRequestsPerSecond = prometheus.NewDesc(
+	c.failedRequestsPerSecond = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "failed_requests_total"),
 		"Total failed certificate requests processed",
 		[]string{"cert_template"},
 		nil,
 	)
-	c.IssuedRequestsPerSecond = prometheus.NewDesc(
+	c.issuedRequestsPerSecond = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "issued_requests_total"),
 		"Total issued certificate requests processed",
 		[]string{"cert_template"},
 		nil,
 	)
-	c.PendingRequestsPerSecond = prometheus.NewDesc(
+	c.pendingRequestsPerSecond = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "pending_requests_total"),
 		"Total pending certificate requests processed",
 		[]string{"cert_template"},
 		nil,
 	)
-	c.RequestCryptographicSigningTime = prometheus.NewDesc(
+	c.requestCryptographicSigningTime = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "request_cryptographic_signing_time_seconds"),
 		"Last time elapsed for signing operation request",
 		[]string{"cert_template"},
 		nil,
 	)
-	c.RequestPolicyModuleProcessingTime = prometheus.NewDesc(
+	c.requestPolicyModuleProcessingTime = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "request_policy_module_processing_time_seconds"),
 		"Last time elapsed for policy module processing request",
 		[]string{"cert_template"},
 		nil,
 	)
-	c.ChallengeResponsesPerSecond = prometheus.NewDesc(
+	c.challengeResponsesPerSecond = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "challenge_responses_total"),
 		"Total certificate challenge responses processed",
 		[]string{"cert_template"},
 		nil,
 	)
-	c.ChallengeResponseProcessingTime = prometheus.NewDesc(
+	c.challengeResponseProcessingTime = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "challenge_response_processing_time_seconds"),
 		"Last time elapsed for challenge response",
 		[]string{"cert_template"},
 		nil,
 	)
-	c.SignedCertificateTimestampListsPerSecond = prometheus.NewDesc(
+	c.signedCertificateTimestampListsPerSecond = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "signed_certificate_timestamp_lists_total"),
 		"Total Signed Certificate Timestamp Lists processed",
 		[]string{"cert_template"},
 		nil,
 	)
-	c.SignedCertificateTimestampListProcessingTime = prometheus.NewDesc(
+	c.signedCertificateTimestampListProcessingTime = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "signed_certificate_timestamp_list_processing_time_seconds"),
 		"Last time elapsed for Signed Certificate Timestamp List",
 		[]string{"cert_template"},
@@ -144,9 +157,9 @@ func (c *collector) Build() error {
 	return nil
 }
 
-func (c *collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collectADCSCounters(ctx, ch); err != nil {
-		_ = level.Error(c.logger).Log("msg", "failed collecting ADCS metrics", "desc", desc, "err", err)
+func (c *Collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collectADCSCounters(ctx, ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed collecting ADCS metrics", "err", err)
 		return err
 	}
 	return nil
@@ -169,17 +182,17 @@ type perflibADCS struct {
 	SignedCertificateTimestampListProcessingTime float64 `perflib:"Signed Certificate Timestamp List processing time (ms)"`
 }
 
-func (c *collector) collectADCSCounters(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *Collector) collectADCSCounters(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	dst := make([]perflibADCS, 0)
 	if _, ok := ctx.PerfObjects["Certification Authority"]; !ok {
-		return nil, errors.New("perflib did not contain an entry for Certification Authority")
+		return errors.New("perflib did not contain an entry for Certification Authority")
 	}
 	err := perflib.UnmarshalObject(ctx.PerfObjects["Certification Authority"], &dst, c.logger)
 	if err != nil {
-		return nil, err
+		return err
 	}
 	if len(dst) == 0 {
-		return nil, errors.New("perflib query for Certification Authority (ADCS) returned empty result set")
+		return errors.New("perflib query for Certification Authority (ADCS) returned empty result set")
 	}
 
 	for _, d := range dst {
@@ -188,84 +201,84 @@ func (c *collector) collectADCSCounters(ctx *types.ScrapeContext, ch chan<- prom
 			continue
 		}
 		ch <- prometheus.MustNewConstMetric(
-			c.RequestsPerSecond,
+			c.requestsPerSecond,
 			prometheus.CounterValue,
 			d.RequestsPerSecond,
 			d.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.RequestProcessingTime,
+			c.requestProcessingTime,
 			prometheus.GaugeValue,
 			utils.MilliSecToSec(d.RequestProcessingTime),
 			d.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.RetrievalsPerSecond,
+			c.retrievalsPerSecond,
 			prometheus.CounterValue,
 			d.RetrievalsPerSecond,
 			d.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.RetrievalProcessingTime,
+			c.retrievalProcessingTime,
 			prometheus.GaugeValue,
 			utils.MilliSecToSec(d.RetrievalProcessingTime),
 			d.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.FailedRequestsPerSecond,
+			c.failedRequestsPerSecond,
 			prometheus.CounterValue,
 			d.FailedRequestsPerSecond,
 			d.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.IssuedRequestsPerSecond,
+			c.issuedRequestsPerSecond,
 			prometheus.CounterValue,
 			d.IssuedRequestsPerSecond,
 			d.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.PendingRequestsPerSecond,
+			c.pendingRequestsPerSecond,
 			prometheus.CounterValue,
 			d.PendingRequestsPerSecond,
 			d.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.RequestCryptographicSigningTime,
+			c.requestCryptographicSigningTime,
 			prometheus.GaugeValue,
 			utils.MilliSecToSec(d.RequestCryptographicSigningTime),
 			d.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.RequestPolicyModuleProcessingTime,
+			c.requestPolicyModuleProcessingTime,
 			prometheus.GaugeValue,
 			utils.MilliSecToSec(d.RequestPolicyModuleProcessingTime),
 			d.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.ChallengeResponsesPerSecond,
+			c.challengeResponsesPerSecond,
 			prometheus.CounterValue,
 			d.ChallengeResponsesPerSecond,
 			d.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.ChallengeResponseProcessingTime,
+			c.challengeResponseProcessingTime,
 			prometheus.GaugeValue,
 			utils.MilliSecToSec(d.ChallengeResponseProcessingTime),
 			d.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.SignedCertificateTimestampListsPerSecond,
+			c.signedCertificateTimestampListsPerSecond,
 			prometheus.CounterValue,
 			d.SignedCertificateTimestampListsPerSecond,
 			d.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.SignedCertificateTimestampListProcessingTime,
+			c.signedCertificateTimestampListProcessingTime,
 			prometheus.GaugeValue,
 			utils.MilliSecToSec(d.SignedCertificateTimestampListProcessingTime),
 			d.Name,
 		)
 	}
 
-	return nil, nil
+	return nil
 }

pkg/collector/adfs/adfs.go

@@ -18,20 +18,22 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-type collector struct {
+type Collector struct {
+	config Config
 	logger log.Logger
 
 	adLoginConnectionFailures                          *prometheus.Desc
+	artifactDBFailures                                 *prometheus.Desc
+	avgArtifactDBQueryTime                             *prometheus.Desc
+	avgConfigDBQueryTime                               *prometheus.Desc
 	certificateAuthentications                         *prometheus.Desc
+	configDBFailures                                   *prometheus.Desc
 	deviceAuthentications                              *prometheus.Desc
+	externalAuthenticationFailures                     *prometheus.Desc
+	externalAuthentications                            *prometheus.Desc
 	extranetAccountLockouts                            *prometheus.Desc
 	federatedAuthentications                           *prometheus.Desc
-	passportAuthentications                            *prometheus.Desc
-	passiveRequests                                    *prometheus.Desc
-	passwordChangeFailed                               *prometheus.Desc
-	passwordChangeSucceeded                            *prometheus.Desc
-	tokenRequests                                      *prometheus.Desc
-	windowsIntegratedAuthentications                   *prometheus.Desc
+	federationMetadataRequests                         *prometheus.Desc
 	oAuthAuthZRequests                                 *prometheus.Desc
 	oAuthClientAuthentications                         *prometheus.Desc
 	oAuthClientAuthenticationsFailures                 *prometheus.Desc
@@ -50,45 +52,56 @@ type collector struct {
 	oAuthPasswordGrantRequestFailures                  *prometheus.Desc
 	oAuthPasswordGrantRequests                         *prometheus.Desc
 	oAuthTokenRequests                                 *prometheus.Desc
+	passiveRequests                                    *prometheus.Desc
+	passportAuthentications                            *prometheus.Desc
+	passwordChangeFailed                               *prometheus.Desc
+	passwordChangeSucceeded                            *prometheus.Desc
 	samlPTokenRequests                                 *prometheus.Desc
 	ssoAuthenticationFailures                          *prometheus.Desc
 	ssoAuthentications                                 *prometheus.Desc
-	wsfedTokenRequests                                 *prometheus.Desc
-	wstrustTokenRequests                               *prometheus.Desc
+	tokenRequests                                      *prometheus.Desc
 	upAuthenticationFailures                           *prometheus.Desc
 	upAuthentications                                  *prometheus.Desc
-	externalAuthenticationFailures                     *prometheus.Desc
-	externalAuthentications                            *prometheus.Desc
-	artifactDBFailures                                 *prometheus.Desc
-	avgArtifactDBQueryTime                             *prometheus.Desc
-	configDBFailures                                   *prometheus.Desc
-	avgConfigDBQueryTime                               *prometheus.Desc
-	federationMetadataRequests                         *prometheus.Desc
+	windowsIntegratedAuthentications                   *prometheus.Desc
+	wsfedTokenRequests                                 *prometheus.Desc
+	wstrustTokenRequests                               *prometheus.Desc
 }
 
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{"AD FS"}, nil
 }
 
-func (c *collector) Build() error {
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
 	c.adLoginConnectionFailures = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "ad_login_connection_failures_total"),
 		"Total number of connection failures to an Active Directory domain controller",
@@ -397,7 +410,7 @@ type perflibADFS struct {
 	FederationMetadataRequests           float64 `perflib:"Federation Metadata Requests"`
 }
 
-func (c *collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+func (c *Collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	var adfsData []perflibADFS
 	err := perflib.UnmarshalObject(ctx.PerfObjects["AD FS"], &adfsData, c.logger)
 	if err != nil {

pkg/collector/cache/cache.go

@@ -6,6 +6,7 @@ import (
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
+	"github.com/pkg/errors"
 	"github.com/prometheus-community/windows_exporter/pkg/perflib"
 	"github.com/prometheus-community/windows_exporter/pkg/types"
 	"github.com/prometheus/client_golang/prometheus"
@@ -17,233 +18,246 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-// A collector is a Prometheus collector for Perflib Cache metrics
-type collector struct {
+// A Collector is a Prometheus Collector for Perflib Cache metrics.
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	AsyncCopyReadsTotal         *prometheus.Desc
-	AsyncDataMapsTotal          *prometheus.Desc
-	AsyncFastReadsTotal         *prometheus.Desc
-	AsyncMDLReadsTotal          *prometheus.Desc
-	AsyncPinReadsTotal          *prometheus.Desc
-	CopyReadHitsTotal           *prometheus.Desc
-	CopyReadsTotal              *prometheus.Desc
-	DataFlushesTotal            *prometheus.Desc
-	DataFlushPagesTotal         *prometheus.Desc
-	DataMapHitsPercent          *prometheus.Desc
-	DataMapPinsTotal            *prometheus.Desc
-	DataMapsTotal               *prometheus.Desc
-	DirtyPages                  *prometheus.Desc
-	DirtyPageThreshold          *prometheus.Desc
-	FastReadNotPossiblesTotal   *prometheus.Desc
-	FastReadResourceMissesTotal *prometheus.Desc
-	FastReadsTotal              *prometheus.Desc
-	LazyWriteFlushesTotal       *prometheus.Desc
-	LazyWritePagesTotal         *prometheus.Desc
-	MDLReadHitsTotal            *prometheus.Desc
-	MDLReadsTotal               *prometheus.Desc
-	PinReadHitsTotal            *prometheus.Desc
-	PinReadsTotal               *prometheus.Desc
-	ReadAheadsTotal             *prometheus.Desc
-	SyncCopyReadsTotal          *prometheus.Desc
-	SyncDataMapsTotal           *prometheus.Desc
-	SyncFastReadsTotal          *prometheus.Desc
-	SyncMDLReadsTotal           *prometheus.Desc
-	SyncPinReadsTotal           *prometheus.Desc
+	asyncCopyReadsTotal         *prometheus.Desc
+	asyncDataMapsTotal          *prometheus.Desc
+	asyncFastReadsTotal         *prometheus.Desc
+	asyncMDLReadsTotal          *prometheus.Desc
+	asyncPinReadsTotal          *prometheus.Desc
+	copyReadHitsTotal           *prometheus.Desc
+	copyReadsTotal              *prometheus.Desc
+	dataFlushesTotal            *prometheus.Desc
+	dataFlushPagesTotal         *prometheus.Desc
+	dataMapHitsPercent          *prometheus.Desc
+	dataMapPinsTotal            *prometheus.Desc
+	dataMapsTotal               *prometheus.Desc
+	dirtyPages                  *prometheus.Desc
+	dirtyPageThreshold          *prometheus.Desc
+	fastReadNotPossiblesTotal   *prometheus.Desc
+	fastReadResourceMissesTotal *prometheus.Desc
+	fastReadsTotal              *prometheus.Desc
+	lazyWriteFlushesTotal       *prometheus.Desc
+	lazyWritePagesTotal         *prometheus.Desc
+	mdlReadHitsTotal            *prometheus.Desc
+	mdlReadsTotal               *prometheus.Desc
+	pinReadHitsTotal            *prometheus.Desc
+	pinReadsTotal               *prometheus.Desc
+	readAheadsTotal             *prometheus.Desc
+	syncCopyReadsTotal          *prometheus.Desc
+	syncDataMapsTotal           *prometheus.Desc
+	syncFastReadsTotal          *prometheus.Desc
+	syncMDLReadsTotal           *prometheus.Desc
+	syncPinReadsTotal           *prometheus.Desc
 }
 
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{"Cache"}, nil
 }
 
-func (c *collector) Build() error {
-	c.AsyncCopyReadsTotal = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.asyncCopyReadsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "async_copy_reads_total"),
 		"(AsyncCopyReadsTotal)",
 		nil,
 		nil,
 	)
-	c.AsyncDataMapsTotal = prometheus.NewDesc(
+	c.asyncDataMapsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "async_data_maps_total"),
 		"(AsyncDataMapsTotal)",
 		nil,
 		nil,
 	)
-	c.AsyncFastReadsTotal = prometheus.NewDesc(
+	c.asyncFastReadsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "async_fast_reads_total"),
 		"(AsyncFastReadsTotal)",
 		nil,
 		nil,
 	)
-	c.AsyncMDLReadsTotal = prometheus.NewDesc(
+	c.asyncMDLReadsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "async_mdl_reads_total"),
 		"(AsyncMDLReadsTotal)",
 		nil,
 		nil,
 	)
-	c.AsyncPinReadsTotal = prometheus.NewDesc(
+	c.asyncPinReadsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "async_pin_reads_total"),
 		"(AsyncPinReadsTotal)",
 		nil,
 		nil,
 	)
-	c.CopyReadHitsTotal = prometheus.NewDesc(
+	c.copyReadHitsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "copy_read_hits_total"),
 		"(CopyReadHitsTotal)",
 		nil,
 		nil,
 	)
-	c.CopyReadsTotal = prometheus.NewDesc(
+	c.copyReadsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "copy_reads_total"),
 		"(CopyReadsTotal)",
 		nil,
 		nil,
 	)
-	c.DataFlushesTotal = prometheus.NewDesc(
+	c.dataFlushesTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "data_flushes_total"),
 		"(DataFlushesTotal)",
 		nil,
 		nil,
 	)
-	c.DataFlushPagesTotal = prometheus.NewDesc(
+	c.dataFlushPagesTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "data_flush_pages_total"),
 		"(DataFlushPagesTotal)",
 		nil,
 		nil,
 	)
-	c.DataMapHitsPercent = prometheus.NewDesc(
+	c.dataMapHitsPercent = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "data_map_hits_percent"),
 		"(DataMapHitsPercent)",
 		nil,
 		nil,
 	)
-	c.DataMapPinsTotal = prometheus.NewDesc(
+	c.dataMapPinsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "data_map_pins_total"),
 		"(DataMapPinsTotal)",
 		nil,
 		nil,
 	)
-	c.DataMapsTotal = prometheus.NewDesc(
+	c.dataMapsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "data_maps_total"),
 		"(DataMapsTotal)",
 		nil,
 		nil,
 	)
-	c.DirtyPages = prometheus.NewDesc(
+	c.dirtyPages = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "dirty_pages"),
 		"(DirtyPages)",
 		nil,
 		nil,
 	)
-	c.DirtyPageThreshold = prometheus.NewDesc(
+	c.dirtyPageThreshold = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "dirty_page_threshold"),
 		"(DirtyPageThreshold)",
 		nil,
 		nil,
 	)
-	c.FastReadNotPossiblesTotal = prometheus.NewDesc(
+	c.fastReadNotPossiblesTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "fast_read_not_possibles_total"),
 		"(FastReadNotPossiblesTotal)",
 		nil,
 		nil,
 	)
-	c.FastReadResourceMissesTotal = prometheus.NewDesc(
+	c.fastReadResourceMissesTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "fast_read_resource_misses_total"),
 		"(FastReadResourceMissesTotal)",
 		nil,
 		nil,
 	)
-	c.FastReadsTotal = prometheus.NewDesc(
+	c.fastReadsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "fast_reads_total"),
 		"(FastReadsTotal)",
 		nil,
 		nil,
 	)
-	c.LazyWriteFlushesTotal = prometheus.NewDesc(
+	c.lazyWriteFlushesTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "lazy_write_flushes_total"),
 		"(LazyWriteFlushesTotal)",
 		nil,
 		nil,
 	)
-	c.LazyWritePagesTotal = prometheus.NewDesc(
+	c.lazyWritePagesTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "lazy_write_pages_total"),
 		"(LazyWritePagesTotal)",
 		nil,
 		nil,
 	)
-	c.MDLReadHitsTotal = prometheus.NewDesc(
+	c.mdlReadHitsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "mdl_read_hits_total"),
 		"(MDLReadHitsTotal)",
 		nil,
 		nil,
 	)
-	c.MDLReadsTotal = prometheus.NewDesc(
+	c.mdlReadsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "mdl_reads_total"),
 		"(MDLReadsTotal)",
 		nil,
 		nil,
 	)
-	c.PinReadHitsTotal = prometheus.NewDesc(
+	c.pinReadHitsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "pin_read_hits_total"),
 		"(PinReadHitsTotal)",
 		nil,
 		nil,
 	)
-	c.PinReadsTotal = prometheus.NewDesc(
+	c.pinReadsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "pin_reads_total"),
 		"(PinReadsTotal)",
 		nil,
 		nil,
 	)
-	c.ReadAheadsTotal = prometheus.NewDesc(
+	c.readAheadsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "read_aheads_total"),
 		"(ReadAheadsTotal)",
 		nil,
 		nil,
 	)
-	c.SyncCopyReadsTotal = prometheus.NewDesc(
+	c.syncCopyReadsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "sync_copy_reads_total"),
 		"(SyncCopyReadsTotal)",
 		nil,
 		nil,
 	)
-	c.SyncDataMapsTotal = prometheus.NewDesc(
+	c.syncDataMapsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "sync_data_maps_total"),
 		"(SyncDataMapsTotal)",
 		nil,
 		nil,
 	)
-	c.SyncFastReadsTotal = prometheus.NewDesc(
+	c.syncFastReadsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "sync_fast_reads_total"),
 		"(SyncFastReadsTotal)",
 		nil,
 		nil,
 	)
-	c.SyncMDLReadsTotal = prometheus.NewDesc(
+	c.syncMDLReadsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "sync_mdl_reads_total"),
 		"(SyncMDLReadsTotal)",
 		nil,
 		nil,
 	)
-	c.SyncPinReadsTotal = prometheus.NewDesc(
+	c.syncPinReadsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "sync_pin_reads_total"),
 		"(SyncPinReadsTotal)",
 		nil,
@@ -252,12 +266,14 @@ func (c *collector) Build() error {
 	return nil
 }
 
-// Collect implements the Collector interface
-func (c *collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ctx, ch); err != nil {
-		_ = level.Error(c.logger).Log("msg", "failed collecting cache metrics", "desc", desc, "err", err)
+// Collect implements the Collector interface.
+func (c *Collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collect(ctx, ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed collecting cache metrics", "err", err)
+
 		return err
 	}
+
 	return nil
 }
 
@@ -269,23 +285,20 @@ type perflibCache struct {
 	AsyncFastReadsTotal         float64 `perflib:"Async Fast Reads/sec"`
 	AsyncMDLReadsTotal          float64 `perflib:"Async MDL Reads/sec"`
 	AsyncPinReadsTotal          float64 `perflib:"Async Pin Reads/sec"`
-	CopyReadHitsTotal           float64 `perflib:"Copy Read Hits %"`
+	CopyReadHitsTotal           float64 `perflib:"Copy Read Hits/sec"`
 	CopyReadsTotal              float64 `perflib:"Copy Reads/sec"`
 	DataFlushesTotal            float64 `perflib:"Data Flushes/sec"`
 	DataFlushPagesTotal         float64 `perflib:"Data Flush Pages/sec"`
-	DataMapHitsPercent          float64 `perflib:"Data Map Hits %"`
 	DataMapPinsTotal            float64 `perflib:"Data Map Pins/sec"`
 	DataMapsTotal               float64 `perflib:"Data Maps/sec"`
-	DirtyPages                  float64 `perflib:"Dirty Pages"`
-	DirtyPageThreshold          float64 `perflib:"Dirty Page Threshold"`
 	FastReadNotPossiblesTotal   float64 `perflib:"Fast Read Not Possibles/sec"`
 	FastReadResourceMissesTotal float64 `perflib:"Fast Read Resource Misses/sec"`
 	FastReadsTotal              float64 `perflib:"Fast Reads/sec"`
 	LazyWriteFlushesTotal       float64 `perflib:"Lazy Write Flushes/sec"`
 	LazyWritePagesTotal         float64 `perflib:"Lazy Write Pages/sec"`
-	MDLReadHitsTotal            float64 `perflib:"MDL Read Hits %"`
+	MDLReadHitsTotal            float64 `perflib:"MDL Read Hits/sec"`
 	MDLReadsTotal               float64 `perflib:"MDL Reads/sec"`
-	PinReadHitsTotal            float64 `perflib:"Pin Read Hits %"`
+	PinReadHitsTotal            float64 `perflib:"Pin Read Hits/sec"`
 	PinReadsTotal               float64 `perflib:"Pin Reads/sec"`
 	ReadAheadsTotal             float64 `perflib:"Read Aheads/sec"`
 	SyncCopyReadsTotal          float64 `perflib:"Sync Copy Reads/sec"`
@@ -293,187 +306,166 @@ type perflibCache struct {
 	SyncFastReadsTotal          float64 `perflib:"Sync Fast Reads/sec"`
 	SyncMDLReadsTotal           float64 `perflib:"Sync MDL Reads/sec"`
 	SyncPinReadsTotal           float64 `perflib:"Sync Pin Reads/sec"`
+	DirtyPages                  float64 `perflib:"Dirty Pages"`
+	DirtyPageThreshold          float64 `perflib:"Dirty Page Threshold"`
+	DataMapHitsPercent          float64 `perflib:"Data Map Hits %"`
 }
 
-func (c *collector) collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *Collector) collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	var dst []perflibCache // Single-instance class, array is required but will have single entry.
 	if err := perflib.UnmarshalObject(ctx.PerfObjects["Cache"], &dst, c.logger); err != nil {
-		return nil, err
+		return err
+	}
+
+	if len(dst) != 1 {
+		return errors.New("expected single instance of Cache")
 	}
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AsyncCopyReadsTotal,
+		c.asyncCopyReadsTotal,
 		prometheus.CounterValue,
 		dst[0].AsyncCopyReadsTotal,
 	)
-
 	ch <- prometheus.MustNewConstMetric(
-		c.AsyncDataMapsTotal,
+		c.asyncDataMapsTotal,
 		prometheus.CounterValue,
 		dst[0].AsyncDataMapsTotal,
 	)
-
 	ch <- prometheus.MustNewConstMetric(
-		c.AsyncFastReadsTotal,
+		c.asyncFastReadsTotal,
 		prometheus.CounterValue,
 		dst[0].AsyncFastReadsTotal,
 	)
-
 	ch <- prometheus.MustNewConstMetric(
-		c.AsyncMDLReadsTotal,
+		c.asyncMDLReadsTotal,
 		prometheus.CounterValue,
 		dst[0].AsyncMDLReadsTotal,
 	)
-
 	ch <- prometheus.MustNewConstMetric(
-		c.AsyncPinReadsTotal,
+		c.asyncPinReadsTotal,
 		prometheus.CounterValue,
 		dst[0].AsyncPinReadsTotal,
 	)
-
 	ch <- prometheus.MustNewConstMetric(
-		c.CopyReadHitsTotal,
-		prometheus.GaugeValue,
+		c.copyReadHitsTotal,
+		prometheus.CounterValue,
 		dst[0].CopyReadHitsTotal,
 	)
-
 	ch <- prometheus.MustNewConstMetric(
-		c.CopyReadsTotal,
+		c.copyReadsTotal,
 		prometheus.CounterValue,
 		dst[0].CopyReadsTotal,
 	)
-
 	ch <- prometheus.MustNewConstMetric(
-		c.DataFlushesTotal,
+		c.dataFlushesTotal,
 		prometheus.CounterValue,
 		dst[0].DataFlushesTotal,
 	)
-
 	ch <- prometheus.MustNewConstMetric(
-		c.DataFlushPagesTotal,
+		c.dataFlushPagesTotal,
 		prometheus.CounterValue,
 		dst[0].DataFlushPagesTotal,
 	)
-
 	ch <- prometheus.MustNewConstMetric(
-		c.DataMapHitsPercent,
+		c.dataMapPinsTotal,
+		prometheus.CounterValue,
+		dst[0].DataMapPinsTotal,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.dataMapsTotal,
+		prometheus.CounterValue,
+		dst[0].DataMapsTotal,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.fastReadNotPossiblesTotal,
+		prometheus.CounterValue,
+		dst[0].FastReadNotPossiblesTotal,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.fastReadResourceMissesTotal,
+		prometheus.CounterValue,
+		dst[0].FastReadResourceMissesTotal,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.fastReadsTotal,
+		prometheus.CounterValue,
+		dst[0].FastReadsTotal,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.lazyWriteFlushesTotal,
+		prometheus.CounterValue,
+		dst[0].LazyWriteFlushesTotal,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.lazyWritePagesTotal,
+		prometheus.CounterValue,
+		dst[0].LazyWritePagesTotal,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.mdlReadHitsTotal,
+		prometheus.CounterValue,
+		dst[0].MDLReadHitsTotal,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.mdlReadsTotal,
+		prometheus.CounterValue,
+		dst[0].MDLReadsTotal,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.pinReadHitsTotal,
+		prometheus.CounterValue,
+		dst[0].PinReadHitsTotal,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.pinReadsTotal,
+		prometheus.CounterValue,
+		dst[0].PinReadsTotal,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.readAheadsTotal,
+		prometheus.CounterValue,
+		dst[0].ReadAheadsTotal,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.syncCopyReadsTotal,
+		prometheus.CounterValue,
+		dst[0].SyncCopyReadsTotal,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.syncDataMapsTotal,
+		prometheus.CounterValue,
+		dst[0].SyncDataMapsTotal,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.syncFastReadsTotal,
+		prometheus.CounterValue,
+		dst[0].SyncFastReadsTotal,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.syncMDLReadsTotal,
+		prometheus.CounterValue,
+		dst[0].SyncMDLReadsTotal,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.syncPinReadsTotal,
+		prometheus.CounterValue,
+		dst[0].SyncPinReadsTotal,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.dirtyPages,
+		prometheus.GaugeValue,
+		dst[0].DirtyPages,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.dirtyPageThreshold,
+		prometheus.GaugeValue,
+		dst[0].DirtyPageThreshold,
+	)
+	ch <- prometheus.MustNewConstMetric(
+		c.dataMapHitsPercent,
 		prometheus.GaugeValue,
 		dst[0].DataMapHitsPercent,
 	)
 
-	ch <- prometheus.MustNewConstMetric(
-		c.DataMapPinsTotal,
-		prometheus.CounterValue,
-		dst[0].DataMapPinsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.DataMapsTotal,
-		prometheus.CounterValue,
-		dst[0].DataMapsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.DirtyPages,
-		prometheus.GaugeValue,
-		dst[0].DirtyPages,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.DirtyPageThreshold,
-		prometheus.GaugeValue,
-		dst[0].DirtyPageThreshold,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.FastReadNotPossiblesTotal,
-		prometheus.CounterValue,
-		dst[0].FastReadNotPossiblesTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.FastReadResourceMissesTotal,
-		prometheus.CounterValue,
-		dst[0].FastReadResourceMissesTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.FastReadsTotal,
-		prometheus.CounterValue,
-		dst[0].FastReadsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.LazyWriteFlushesTotal,
-		prometheus.CounterValue,
-		dst[0].LazyWriteFlushesTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.LazyWritePagesTotal,
-		prometheus.CounterValue,
-		dst[0].LazyWritePagesTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.MDLReadHitsTotal,
-		prometheus.CounterValue,
-		dst[0].MDLReadHitsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.MDLReadsTotal,
-		prometheus.CounterValue,
-		dst[0].MDLReadsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.PinReadHitsTotal,
-		prometheus.CounterValue,
-		dst[0].PinReadHitsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.PinReadsTotal,
-		prometheus.CounterValue,
-		dst[0].PinReadsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.ReadAheadsTotal,
-		prometheus.CounterValue,
-		dst[0].ReadAheadsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.SyncCopyReadsTotal,
-		prometheus.CounterValue,
-		dst[0].SyncCopyReadsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.SyncDataMapsTotal,
-		prometheus.CounterValue,
-		dst[0].SyncDataMapsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.SyncFastReadsTotal,
-		prometheus.CounterValue,
-		dst[0].SyncFastReadsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.SyncMDLReadsTotal,
-		prometheus.CounterValue,
-		dst[0].SyncMDLReadsTotal,
-	)
-
-	ch <- prometheus.MustNewConstMetric(
-		c.SyncPinReadsTotal,
-		prometheus.CounterValue,
-		dst[0].SyncPinReadsTotal,
-	)
-
-	return nil, nil
+	return nil
 }

pkg/collector/cache/cache_test.go

@@ -0,0 +1,12 @@
+package cache_test
+
+import (
+	"testing"
+
+	"github.com/prometheus-community/windows_exporter/pkg/collector/cache"
+	"github.com/prometheus-community/windows_exporter/pkg/testutils"
+)
+
+func BenchmarkCollector(b *testing.B) {
+	testutils.FuncBenchmarkCollector(b, cache.Name, cache.NewWithFlags)
+}

pkg/collector/collector.go

@@ -3,6 +3,7 @@
 package collector
 
 import (
+	"errors"
 	"slices"
 	"strings"
 
@@ -21,8 +22,10 @@ import (
 	"github.com/prometheus-community/windows_exporter/pkg/collector/diskdrive"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/dns"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/exchange"
+	"github.com/prometheus-community/windows_exporter/pkg/collector/fsrmquota"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/hyperv"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/iis"
+	"github.com/prometheus-community/windows_exporter/pkg/collector/license"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/logical_disk"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/logon"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/memory"
@@ -45,11 +48,13 @@ import (
 	"github.com/prometheus-community/windows_exporter/pkg/collector/nps"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/os"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/physical_disk"
+	"github.com/prometheus-community/windows_exporter/pkg/collector/printer"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/process"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/remote_fx"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/scheduled_task"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/service"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/smb"
+	"github.com/prometheus-community/windows_exporter/pkg/collector/smbclient"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/smtp"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/system"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/tcp"
@@ -64,43 +69,45 @@ import (
 	"github.com/prometheus-community/windows_exporter/pkg/types"
 )
 
-type Collectors struct {
-	logger log.Logger
-
-	collectors       map[string]types.Collector
-	perfCounterQuery string
-}
-
-// NewWithFlags To be called by the exporter for collector initialization before running kingpin.Parse
+// NewWithFlags To be called by the exporter for collector initialization before running kingpin.Parse.
 func NewWithFlags(app *kingpin.Application) Collectors {
-	collectors := map[string]types.Collector{}
+	collectors := map[string]Collector{}
 
-	for name, builder := range Map {
+	for name, builder := range BuildersWithFlags {
 		collectors[name] = builder(app)
 	}
 
 	return New(collectors)
 }
 
+func NewBuilderWithFlags[C Collector](fn BuilderWithFlags[C]) BuilderWithFlags[Collector] {
+	return func(app *kingpin.Application) Collector {
+		return fn(app)
+	}
+}
+
 // NewWithConfig To be called by the external libraries for collector initialization without running kingpin.Parse
+//
+//goland:noinspection GoUnusedExportedFunction
 func NewWithConfig(logger log.Logger, config Config) Collectors {
-	collectors := map[string]types.Collector{}
-	collectors[ad.Name] = ad.New(logger, &config.Ad)
-	collectors[adcs.Name] = adcs.New(logger, &config.Adcs)
-	collectors[adfs.Name] = adfs.New(logger, &config.Adfs)
+	collectors := map[string]Collector{}
+	collectors[ad.Name] = ad.New(logger, &config.AD)
+	collectors[adcs.Name] = adcs.New(logger, &config.ADCS)
+	collectors[adfs.Name] = adfs.New(logger, &config.ADFS)
 	collectors[cache.Name] = cache.New(logger, &config.Cache)
 	collectors[container.Name] = container.New(logger, &config.Container)
-	collectors[cpu.Name] = cpu.New(logger, &config.Cpu)
-	collectors[cpu_info.Name] = cpu_info.New(logger, &config.CpuInfo)
+	collectors[cpu.Name] = cpu.New(logger, &config.CPU)
+	collectors[cpu_info.Name] = cpu_info.New(logger, &config.CPUInfo)
 	collectors[cs.Name] = cs.New(logger, &config.Cs)
-	collectors[dfsr.Name] = dfsr.New(logger, &config.Dfsr)
+	collectors[dfsr.Name] = dfsr.New(logger, &config.DFSR)
 	collectors[dhcp.Name] = dhcp.New(logger, &config.Dhcp)
-	collectors[diskdrive.Name] = diskdrive.New(logger, &config.Diskdrive)
-	collectors[dns.Name] = dns.New(logger, &config.Dns)
+	collectors[diskdrive.Name] = diskdrive.New(logger, &config.DiskDrive)
+	collectors[dns.Name] = dns.New(logger, &config.DNS)
 	collectors[exchange.Name] = exchange.New(logger, &config.Exchange)
-	collectors[exchange.Name] = exchange.New(logger, &config.Fsrmquota)
+	collectors[fsrmquota.Name] = fsrmquota.New(logger, &config.Fsrmquota)
 	collectors[hyperv.Name] = hyperv.New(logger, &config.Hyperv)
-	collectors[iis.Name] = iis.New(logger, &config.Iis)
+	collectors[iis.Name] = iis.New(logger, &config.IIS)
+	collectors[license.Name] = license.New(logger, &config.License)
 	collectors[logical_disk.Name] = logical_disk.New(logger, &config.LogicalDisk)
 	collectors[logon.Name] = logon.New(logger, &config.Logon)
 	collectors[memory.Name] = memory.New(logger, &config.Memory)
@@ -123,15 +130,17 @@ func NewWithConfig(logger log.Logger, config Config) Collectors {
 	collectors[nps.Name] = nps.New(logger, &config.Nps)
 	collectors[os.Name] = os.New(logger, &config.Os)
 	collectors[physical_disk.Name] = physical_disk.New(logger, &config.PhysicalDisk)
+	collectors[printer.Name] = printer.New(logger, &config.Printer)
 	collectors[process.Name] = process.New(logger, &config.Process)
 	collectors[remote_fx.Name] = remote_fx.New(logger, &config.RemoteFx)
 	collectors[scheduled_task.Name] = scheduled_task.New(logger, &config.ScheduledTask)
 	collectors[service.Name] = service.New(logger, &config.Service)
-	collectors[smb.Name] = smb.New(logger, &config.Smb)
-	collectors[smtp.Name] = smtp.New(logger, &config.Smtp)
+	collectors[smb.Name] = smb.New(logger, &config.SMB)
+	collectors[smbclient.Name] = smbclient.New(logger, &config.SMBClient)
+	collectors[smtp.Name] = smtp.New(logger, &config.SMTP)
 	collectors[system.Name] = system.New(logger, &config.System)
 	collectors[teradici_pcoip.Name] = teradici_pcoip.New(logger, &config.TeradiciPcoip)
-	collectors[tcp.Name] = tcp.New(logger, &config.Tcp)
+	collectors[tcp.Name] = tcp.New(logger, &config.TCP)
 	collectors[terminal_services.Name] = terminal_services.New(logger, &config.TerminalServices)
 	collectors[textfile.Name] = textfile.New(logger, &config.Textfile)
 	collectors[thermalzone.Name] = thermalzone.New(logger, &config.Thermalzone)
@@ -142,8 +151,8 @@ func NewWithConfig(logger log.Logger, config Config) Collectors {
 	return New(collectors)
 }
 
-// New To be called by the external libraries for collector initialization
-func New(collectors map[string]types.Collector) Collectors {
+// New To be called by the external libraries for collector initialization.
+func New(collectors Map) Collectors {
 	return Collectors{
 		collectors: collectors,
 	}
@@ -161,11 +170,12 @@ func (c *Collectors) SetPerfCounterQuery() error {
 	var (
 		err error
 
-		perfCounterDependencies []string
-		perfCounterNames        []string
-		perfIndicies            []string
+		perfCounterNames []string
+		perfIndicies     []string
 	)
 
+	perfCounterDependencies := make([]string, 0, len(c.collectors))
+
 	for _, collector := range c.collectors {
 		perfCounterNames, err = collector.GetPerfCounter()
 		if err != nil {
@@ -185,7 +195,7 @@ func (c *Collectors) SetPerfCounterQuery() error {
 	return nil
 }
 
-// Enable removes all collectors that not enabledCollectors
+// Enable removes all collectors that not enabledCollectors.
 func (c *Collectors) Enable(enabledCollectors []string) {
 	for name := range c.collectors {
 		if !slices.Contains(enabledCollectors, name) {
@@ -194,9 +204,10 @@ func (c *Collectors) Enable(enabledCollectors []string) {
 	}
 }
 
-// Build To be called by the exporter for collector initialization
+// Build To be called by the exporter for collector initialization.
 func (c *Collectors) Build() error {
 	var err error
+
 	for _, collector := range c.collectors {
 		if err = collector.Build(); err != nil {
 			return err
@@ -206,7 +217,7 @@ func (c *Collectors) Build() error {
 	return nil
 }
 
-// PrepareScrapeContext creates a ScrapeContext to be used during a single scrape
+// PrepareScrapeContext creates a ScrapeContext to be used during a single scrape.
 func (c *Collectors) PrepareScrapeContext() (*types.ScrapeContext, error) {
 	objs, err := perflib.GetPerflibSnapshot(c.perfCounterQuery)
 	if err != nil {
@@ -215,3 +226,16 @@ func (c *Collectors) PrepareScrapeContext() (*types.ScrapeContext, error) {
 
 	return &types.ScrapeContext{PerfObjects: objs}, nil
 }
+
+// Close To be called by the exporter for collector cleanup.
+func (c *Collectors) Close() error {
+	errs := make([]error, 0, len(c.collectors))
+
+	for _, collector := range c.collectors {
+		if err := collector.Build(); err != nil {
+			errs = append(errs, err)
+		}
+	}
+
+	return errors.Join(errs...)
+}

pkg/collector/config.go

@@ -14,8 +14,10 @@ import (
 	"github.com/prometheus-community/windows_exporter/pkg/collector/diskdrive"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/dns"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/exchange"
+	"github.com/prometheus-community/windows_exporter/pkg/collector/fsrmquota"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/hyperv"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/iis"
+	"github.com/prometheus-community/windows_exporter/pkg/collector/license"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/logical_disk"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/logon"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/memory"
@@ -38,11 +40,13 @@ import (
 	"github.com/prometheus-community/windows_exporter/pkg/collector/nps"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/os"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/physical_disk"
+	"github.com/prometheus-community/windows_exporter/pkg/collector/printer"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/process"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/remote_fx"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/scheduled_task"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/service"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/smb"
+	"github.com/prometheus-community/windows_exporter/pkg/collector/smbclient"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/smtp"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/system"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/tcp"
@@ -56,22 +60,23 @@ import (
 )
 
 type Config struct {
-	Ad                             ad.Config                              `yaml:"ad"`
-	Adcs                           adcs.Config                            `yaml:"adcs"`
-	Adfs                           adfs.Config                            `yaml:"adfs"`
+	AD                             ad.Config                              `yaml:"ad"`
+	ADCS                           adcs.Config                            `yaml:"adcs"`
+	ADFS                           adfs.Config                            `yaml:"adfs"`
 	Cache                          cache.Config                           `yaml:"cache"`
 	Container                      container.Config                       `yaml:"container"`
-	Cpu                            cpu.Config                             `yaml:"cpu"`
-	CpuInfo                        cpu_info.Config                        `yaml:"cpu_info"`
+	CPU                            cpu.Config                             `yaml:"cpu"`
+	CPUInfo                        cpu_info.Config                        `yaml:"cpu_info"`
 	Cs                             cs.Config                              `yaml:"cs"`
-	Dfsr                           dfsr.Config                            `yaml:"dfsr"`
+	DFSR                           dfsr.Config                            `yaml:"dfsr"`
 	Dhcp                           dhcp.Config                            `yaml:"dhcp"`
-	Diskdrive                      diskdrive.Config                       `yaml:"diskdrive"`
-	Dns                            dns.Config                             `yaml:"dns"`
+	DiskDrive                      diskdrive.Config                       `yaml:"diskdrive"` //nolint:tagliatelle
+	DNS                            dns.Config                             `yaml:"dns"`
 	Exchange                       exchange.Config                        `yaml:"exchange"`
-	Fsrmquota                      exchange.Config                        `yaml:"fsrmquota"`
+	Fsrmquota                      fsrmquota.Config                       `yaml:"fsrmquota"`
 	Hyperv                         hyperv.Config                          `yaml:"hyperv"`
-	Iis                            iis.Config                             `yaml:"iis"`
+	IIS                            iis.Config                             `yaml:"iis"`
+	License                        license.Config                         `yaml:"license"`
 	LogicalDisk                    logical_disk.Config                    `yaml:"logical_disk"`
 	Logon                          logon.Config                           `yaml:"logon"`
 	Memory                         memory.Config                          `yaml:"memory"`
@@ -79,7 +84,7 @@ type Config struct {
 	MsclusterNetwork               mscluster_network.Config               `yaml:"mscluster_network"`
 	MsclusterNode                  mscluster_node.Config                  `yaml:"mscluster_node"`
 	MsclusterResource              mscluster_resource.Config              `yaml:"mscluster_resource"`
-	MsclusterResourceGroup         mscluster_resourcegroup.Config         `yaml:"mscluster_resourcegroup"`
+	MsclusterResourceGroup         mscluster_resourcegroup.Config         `yaml:"mscluster_resourcegroup"` //nolint:tagliatelle
 	Msmq                           msmq.Config                            `yaml:"msmq"`
 	Mssql                          mssql.Config                           `yaml:"mssql"`
 	Net                            net.Config                             `yaml:"net"`
@@ -94,15 +99,17 @@ type Config struct {
 	Nps                            nps.Config                             `yaml:"nps"`
 	Os                             os.Config                              `yaml:"os"`
 	PhysicalDisk                   physical_disk.Config                   `yaml:"physical_disk"`
+	Printer                        printer.Config                         `yaml:"printer"`
 	Process                        process.Config                         `yaml:"process"`
 	RemoteFx                       remote_fx.Config                       `yaml:"remote_fx"`
 	ScheduledTask                  scheduled_task.Config                  `yaml:"scheduled_task"`
 	Service                        service.Config                         `yaml:"service"`
-	Smb                            smb.Config                             `yaml:"smb"`
-	Smtp                           smtp.Config                            `yaml:"smtp"`
+	SMB                            smb.Config                             `yaml:"smb"`
+	SMBClient                      smbclient.Config                       `yaml:"smbclient"` //nolint:tagliatelle
+	SMTP                           smtp.Config                            `yaml:"smtp"`
 	System                         system.Config                          `yaml:"system"`
 	TeradiciPcoip                  teradici_pcoip.Config                  `yaml:"teradici_pcoip"`
-	Tcp                            tcp.Config                             `yaml:"tcp"`
+	TCP                            tcp.Config                             `yaml:"tcp"`
 	TerminalServices               terminal_services.Config               `yaml:"terminal_services"`
 	Textfile                       textfile.Config                        `yaml:"textfile"`
 	Thermalzone                    thermalzone.Config                     `yaml:"thermalzone"`
@@ -112,23 +119,26 @@ type Config struct {
 }
 
 // ConfigDefaults Is an interface to be used by the external libraries. It holds all ConfigDefaults form all collectors
+//
+//goland:noinspection GoUnusedGlobalVariable
 var ConfigDefaults = Config{
-	Ad:                             ad.ConfigDefaults,
-	Adcs:                           adcs.ConfigDefaults,
-	Adfs:                           adfs.ConfigDefaults,
+	AD:                             ad.ConfigDefaults,
+	ADCS:                           adcs.ConfigDefaults,
+	ADFS:                           adfs.ConfigDefaults,
 	Cache:                          cache.ConfigDefaults,
 	Container:                      container.ConfigDefaults,
-	Cpu:                            cpu.ConfigDefaults,
-	CpuInfo:                        cpu_info.ConfigDefaults,
+	CPU:                            cpu.ConfigDefaults,
+	CPUInfo:                        cpu_info.ConfigDefaults,
 	Cs:                             cs.ConfigDefaults,
-	Dfsr:                           dfsr.ConfigDefaults,
+	DFSR:                           dfsr.ConfigDefaults,
 	Dhcp:                           dhcp.ConfigDefaults,
-	Diskdrive:                      diskdrive.ConfigDefaults,
-	Dns:                            dns.ConfigDefaults,
+	DiskDrive:                      diskdrive.ConfigDefaults,
+	DNS:                            dns.ConfigDefaults,
 	Exchange:                       exchange.ConfigDefaults,
-	Fsrmquota:                      exchange.ConfigDefaults,
+	Fsrmquota:                      fsrmquota.ConfigDefaults,
 	Hyperv:                         hyperv.ConfigDefaults,
-	Iis:                            iis.ConfigDefaults,
+	IIS:                            iis.ConfigDefaults,
+	License:                        license.ConfigDefaults,
 	LogicalDisk:                    logical_disk.ConfigDefaults,
 	Logon:                          logon.ConfigDefaults,
 	Memory:                         memory.ConfigDefaults,
@@ -151,15 +161,17 @@ var ConfigDefaults = Config{
 	Nps:                            nps.ConfigDefaults,
 	Os:                             os.ConfigDefaults,
 	PhysicalDisk:                   physical_disk.ConfigDefaults,
+	Printer:                        printer.ConfigDefaults,
 	Process:                        process.ConfigDefaults,
 	RemoteFx:                       remote_fx.ConfigDefaults,
 	ScheduledTask:                  scheduled_task.ConfigDefaults,
 	Service:                        service.ConfigDefaults,
-	Smb:                            smb.ConfigDefaults,
-	Smtp:                           smtp.ConfigDefaults,
+	SMB:                            smb.ConfigDefaults,
+	SMBClient:                      smbclient.ConfigDefaults,
+	SMTP:                           smtp.ConfigDefaults,
 	System:                         system.ConfigDefaults,
 	TeradiciPcoip:                  teradici_pcoip.ConfigDefaults,
-	Tcp:                            tcp.ConfigDefaults,
+	TCP:                            tcp.ConfigDefaults,
 	TerminalServices:               terminal_services.ConfigDefaults,
 	Textfile:                       textfile.ConfigDefaults,
 	Thermalzone:                    thermalzone.ConfigDefaults,

pkg/collector/container/container.go

@@ -3,7 +3,6 @@
 package container
 
 import (
-	"fmt"
 	"strings"
 
 	"github.com/Microsoft/hcsshim"
@@ -21,167 +20,181 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-// A collector is a Prometheus collector for containers metrics
-type collector struct {
+// A Collector is a Prometheus Collector for containers metrics.
+type Collector struct {
+	config Config
 	logger log.Logger
 
 	// Presence
-	ContainerAvailable *prometheus.Desc
+	containerAvailable *prometheus.Desc
 
 	// Number of containers
-	ContainersCount *prometheus.Desc
-	// memory
-	UsageCommitBytes            *prometheus.Desc
-	UsageCommitPeakBytes        *prometheus.Desc
-	UsagePrivateWorkingSetBytes *prometheus.Desc
+	containersCount *prometheus.Desc
+
+	// Memory
+	usageCommitBytes            *prometheus.Desc
+	usageCommitPeakBytes        *prometheus.Desc
+	usagePrivateWorkingSetBytes *prometheus.Desc
 
 	// CPU
-	RuntimeTotal  *prometheus.Desc
-	RuntimeUser   *prometheus.Desc
-	RuntimeKernel *prometheus.Desc
+	runtimeTotal  *prometheus.Desc
+	runtimeUser   *prometheus.Desc
+	runtimeKernel *prometheus.Desc
 
 	// Network
-	BytesReceived          *prometheus.Desc
-	BytesSent              *prometheus.Desc
-	PacketsReceived        *prometheus.Desc
-	PacketsSent            *prometheus.Desc
-	DroppedPacketsIncoming *prometheus.Desc
-	DroppedPacketsOutgoing *prometheus.Desc
+	bytesReceived          *prometheus.Desc
+	bytesSent              *prometheus.Desc
+	packetsReceived        *prometheus.Desc
+	packetsSent            *prometheus.Desc
+	droppedPacketsIncoming *prometheus.Desc
+	droppedPacketsOutgoing *prometheus.Desc
 
 	// Storage
-	ReadCountNormalized  *prometheus.Desc
-	ReadSizeBytes        *prometheus.Desc
-	WriteCountNormalized *prometheus.Desc
-	WriteSizeBytes       *prometheus.Desc
+	readCountNormalized  *prometheus.Desc
+	readSizeBytes        *prometheus.Desc
+	writeCountNormalized *prometheus.Desc
+	writeSizeBytes       *prometheus.Desc
 }
 
-// New constructs a new collector
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+// New constructs a new Collector.
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{}, nil
 }
 
-func (c *collector) Build() error {
-	c.ContainerAvailable = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.containerAvailable = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "available"),
 		"Available",
 		[]string{"container_id"},
 		nil,
 	)
-	c.ContainersCount = prometheus.NewDesc(
+	c.containersCount = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "count"),
 		"Number of containers",
 		nil,
 		nil,
 	)
-	c.UsageCommitBytes = prometheus.NewDesc(
+	c.usageCommitBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "memory_usage_commit_bytes"),
 		"Memory Usage Commit Bytes",
 		[]string{"container_id"},
 		nil,
 	)
-	c.UsageCommitPeakBytes = prometheus.NewDesc(
+	c.usageCommitPeakBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "memory_usage_commit_peak_bytes"),
 		"Memory Usage Commit Peak Bytes",
 		[]string{"container_id"},
 		nil,
 	)
-	c.UsagePrivateWorkingSetBytes = prometheus.NewDesc(
+	c.usagePrivateWorkingSetBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "memory_usage_private_working_set_bytes"),
 		"Memory Usage Private Working Set Bytes",
 		[]string{"container_id"},
 		nil,
 	)
-	c.RuntimeTotal = prometheus.NewDesc(
+	c.runtimeTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "cpu_usage_seconds_total"),
 		"Total Run time in Seconds",
 		[]string{"container_id"},
 		nil,
 	)
-	c.RuntimeUser = prometheus.NewDesc(
+	c.runtimeUser = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "cpu_usage_seconds_usermode"),
 		"Run Time in User mode in Seconds",
 		[]string{"container_id"},
 		nil,
 	)
-	c.RuntimeKernel = prometheus.NewDesc(
+	c.runtimeKernel = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "cpu_usage_seconds_kernelmode"),
 		"Run time in Kernel mode in Seconds",
 		[]string{"container_id"},
 		nil,
 	)
-	c.BytesReceived = prometheus.NewDesc(
+	c.bytesReceived = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "network_receive_bytes_total"),
 		"Bytes Received on Interface",
 		[]string{"container_id", "interface"},
 		nil,
 	)
-	c.BytesSent = prometheus.NewDesc(
+	c.bytesSent = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "network_transmit_bytes_total"),
 		"Bytes Sent on Interface",
 		[]string{"container_id", "interface"},
 		nil,
 	)
-	c.PacketsReceived = prometheus.NewDesc(
+	c.packetsReceived = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "network_receive_packets_total"),
 		"Packets Received on Interface",
 		[]string{"container_id", "interface"},
 		nil,
 	)
-	c.PacketsSent = prometheus.NewDesc(
+	c.packetsSent = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "network_transmit_packets_total"),
 		"Packets Sent on Interface",
 		[]string{"container_id", "interface"},
 		nil,
 	)
-	c.DroppedPacketsIncoming = prometheus.NewDesc(
+	c.droppedPacketsIncoming = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "network_receive_packets_dropped_total"),
 		"Dropped Incoming Packets on Interface",
 		[]string{"container_id", "interface"},
 		nil,
 	)
-	c.DroppedPacketsOutgoing = prometheus.NewDesc(
+	c.droppedPacketsOutgoing = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "network_transmit_packets_dropped_total"),
 		"Dropped Outgoing Packets on Interface",
 		[]string{"container_id", "interface"},
 		nil,
 	)
-	c.ReadCountNormalized = prometheus.NewDesc(
+	c.readCountNormalized = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "storage_read_count_normalized_total"),
 		"Read Count Normalized",
 		[]string{"container_id"},
 		nil,
 	)
-	c.ReadSizeBytes = prometheus.NewDesc(
+	c.readSizeBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "storage_read_size_bytes_total"),
 		"Read Size Bytes",
 		[]string{"container_id"},
 		nil,
 	)
-	c.WriteCountNormalized = prometheus.NewDesc(
+	c.writeCountNormalized = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "storage_write_count_normalized_total"),
 		"Write Count Normalized",
 		[]string{"container_id"},
 		nil,
 	)
-	c.WriteSizeBytes = prometheus.NewDesc(
+	c.writeSizeBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "storage_write_size_bytes_total"),
 		"Write Size Bytes",
 		[]string{"container_id"},
@@ -192,39 +205,39 @@ func (c *collector) Build() error {
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ch); err != nil {
-		_ = level.Error(c.logger).Log("msg", "failed collecting collector metrics", "desc", desc, "err", err)
+func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collect(ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed collecting collector metrics", "err", err)
 		return err
 	}
 	return nil
 }
 
-// containerClose closes the container resource
-func (c *collector) containerClose(container hcsshim.Container) {
+// containerClose closes the container resource.
+func (c *Collector) containerClose(container hcsshim.Container) {
 	err := container.Close()
 	if err != nil {
 		_ = level.Error(c.logger).Log("err", err)
 	}
 }
 
-func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *Collector) collect(ch chan<- prometheus.Metric) error {
 	// Types Container is passed to get the containers compute systems only
 	containers, err := hcsshim.GetContainers(hcsshim.ComputeSystemQuery{Types: []string{"Container"}})
 	if err != nil {
 		_ = level.Error(c.logger).Log("msg", "Err in Getting containers", "err", err)
-		return nil, err
+		return err
 	}
 
 	count := len(containers)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.ContainersCount,
+		c.containersCount,
 		prometheus.GaugeValue,
 		float64(count),
 	)
 	if count == 0 {
-		return nil, nil
+		return nil
 	}
 
 	containerPrefixes := make(map[string]string)
@@ -251,67 +264,67 @@ func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, erro
 			containerPrefixes[containerDetails.ID] = containerIdWithPrefix
 
 			ch <- prometheus.MustNewConstMetric(
-				c.ContainerAvailable,
+				c.containerAvailable,
 				prometheus.CounterValue,
 				1,
 				containerIdWithPrefix,
 			)
 			ch <- prometheus.MustNewConstMetric(
-				c.UsageCommitBytes,
+				c.usageCommitBytes,
 				prometheus.GaugeValue,
 				float64(cstats.Memory.UsageCommitBytes),
 				containerIdWithPrefix,
 			)
 			ch <- prometheus.MustNewConstMetric(
-				c.UsageCommitPeakBytes,
+				c.usageCommitPeakBytes,
 				prometheus.GaugeValue,
 				float64(cstats.Memory.UsageCommitPeakBytes),
 				containerIdWithPrefix,
 			)
 			ch <- prometheus.MustNewConstMetric(
-				c.UsagePrivateWorkingSetBytes,
+				c.usagePrivateWorkingSetBytes,
 				prometheus.GaugeValue,
 				float64(cstats.Memory.UsagePrivateWorkingSetBytes),
 				containerIdWithPrefix,
 			)
 			ch <- prometheus.MustNewConstMetric(
-				c.RuntimeTotal,
+				c.runtimeTotal,
 				prometheus.CounterValue,
 				float64(cstats.Processor.TotalRuntime100ns)*perflib.TicksToSecondScaleFactor,
 				containerIdWithPrefix,
 			)
 			ch <- prometheus.MustNewConstMetric(
-				c.RuntimeUser,
+				c.runtimeUser,
 				prometheus.CounterValue,
 				float64(cstats.Processor.RuntimeUser100ns)*perflib.TicksToSecondScaleFactor,
 				containerIdWithPrefix,
 			)
 			ch <- prometheus.MustNewConstMetric(
-				c.RuntimeKernel,
+				c.runtimeKernel,
 				prometheus.CounterValue,
 				float64(cstats.Processor.RuntimeKernel100ns)*perflib.TicksToSecondScaleFactor,
 				containerIdWithPrefix,
 			)
 			ch <- prometheus.MustNewConstMetric(
-				c.ReadCountNormalized,
+				c.readCountNormalized,
 				prometheus.CounterValue,
 				float64(cstats.Storage.ReadCountNormalized),
 				containerIdWithPrefix,
 			)
 			ch <- prometheus.MustNewConstMetric(
-				c.ReadSizeBytes,
+				c.readSizeBytes,
 				prometheus.CounterValue,
 				float64(cstats.Storage.ReadSizeBytes),
 				containerIdWithPrefix,
 			)
 			ch <- prometheus.MustNewConstMetric(
-				c.WriteCountNormalized,
+				c.writeCountNormalized,
 				prometheus.CounterValue,
 				float64(cstats.Storage.WriteCountNormalized),
 				containerIdWithPrefix,
 			)
 			ch <- prometheus.MustNewConstMetric(
-				c.WriteSizeBytes,
+				c.writeSizeBytes,
 				prometheus.CounterValue,
 				float64(cstats.Storage.WriteSizeBytes),
 				containerIdWithPrefix,
@@ -322,18 +335,18 @@ func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, erro
 	hnsEndpoints, err := hcsshim.HNSListEndpointRequest()
 	if err != nil {
 		_ = level.Warn(c.logger).Log("msg", "Failed to collect network stats for containers")
-		return nil, nil
+		return err
 	}
 
 	if len(hnsEndpoints) == 0 {
-		_ = level.Info(c.logger).Log("msg", fmt.Sprintf("No network stats for containers to collect"))
-		return nil, nil
+		_ = level.Info(c.logger).Log("msg", "No network stats for containers to collect")
+		return nil
 	}
 
 	for _, endpoint := range hnsEndpoints {
 		endpointStats, err := hcsshim.GetHNSEndpointStats(endpoint.Id)
 		if err != nil {
-			_ = level.Warn(c.logger).Log("msg", fmt.Sprintf("Failed to collect network stats for interface %s", endpoint.Id), "err", err)
+			_ = level.Warn(c.logger).Log("msg", "Failed to collect network stats for interface "+endpoint.Id, "err", err)
 			continue
 		}
 
@@ -342,43 +355,43 @@ func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, erro
 			endpointId := strings.ToUpper(endpoint.Id)
 
 			if !ok {
-				_ = level.Warn(c.logger).Log("msg", fmt.Sprintf("Failed to collect network stats for container %s", containerId))
+				_ = level.Warn(c.logger).Log("msg", "Failed to collect network stats for container "+containerId)
 				continue
 			}
 
 			ch <- prometheus.MustNewConstMetric(
-				c.BytesReceived,
+				c.bytesReceived,
 				prometheus.CounterValue,
 				float64(endpointStats.BytesReceived),
 				containerIdWithPrefix, endpointId,
 			)
 
 			ch <- prometheus.MustNewConstMetric(
-				c.BytesSent,
+				c.bytesSent,
 				prometheus.CounterValue,
 				float64(endpointStats.BytesSent),
 				containerIdWithPrefix, endpointId,
 			)
 			ch <- prometheus.MustNewConstMetric(
-				c.PacketsReceived,
+				c.packetsReceived,
 				prometheus.CounterValue,
 				float64(endpointStats.PacketsReceived),
 				containerIdWithPrefix, endpointId,
 			)
 			ch <- prometheus.MustNewConstMetric(
-				c.PacketsSent,
+				c.packetsSent,
 				prometheus.CounterValue,
 				float64(endpointStats.PacketsSent),
 				containerIdWithPrefix, endpointId,
 			)
 			ch <- prometheus.MustNewConstMetric(
-				c.DroppedPacketsIncoming,
+				c.droppedPacketsIncoming,
 				prometheus.CounterValue,
 				float64(endpointStats.DroppedPacketsIncoming),
 				containerIdWithPrefix, endpointId,
 			)
 			ch <- prometheus.MustNewConstMetric(
-				c.DroppedPacketsOutgoing,
+				c.droppedPacketsOutgoing,
 				prometheus.CounterValue,
 				float64(endpointStats.DroppedPacketsOutgoing),
 				containerIdWithPrefix, endpointId,
@@ -386,7 +399,7 @@ func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, erro
 		}
 	}
 
-	return nil, nil
+	return nil
 }
 
 func getContainerIdWithPrefix(containerDetails hcsshim.ContainerProperties) string {

pkg/collector/cpu/cpu.go

@@ -19,71 +19,82 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-type collector struct {
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	CStateSecondsTotal *prometheus.Desc
-	TimeTotal          *prometheus.Desc
-	InterruptsTotal    *prometheus.Desc
-	DPCsTotal          *prometheus.Desc
-
-	ClockInterruptsTotal     *prometheus.Desc
-	IdleBreakEventsTotal     *prometheus.Desc
-	ParkingStatus            *prometheus.Desc
-	ProcessorFrequencyMHz    *prometheus.Desc
-	ProcessorMaxFrequencyMHz *prometheus.Desc
-	ProcessorPerformance     *prometheus.Desc
-	ProcessorMPerf           *prometheus.Desc
-	ProcessorRTC             *prometheus.Desc
-	ProcessorUtility         *prometheus.Desc
-	ProcessorPrivUtility     *prometheus.Desc
+	cStateSecondsTotal         *prometheus.Desc
+	timeTotal                  *prometheus.Desc
+	interruptsTotal            *prometheus.Desc
+	dpcsTotal                  *prometheus.Desc
+	clockInterruptsTotal       *prometheus.Desc
+	idleBreakEventsTotal       *prometheus.Desc
+	parkingStatus              *prometheus.Desc
+	processorFrequencyMHz      *prometheus.Desc
+	processorPerformance       *prometheus.Desc
+	processorMPerf             *prometheus.Desc
+	processorRTC               *prometheus.Desc
+	processorUtility           *prometheus.Desc
+	processorPrivilegedUtility *prometheus.Desc
 }
 
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	if winversion.WindowsVersionFloat > 6.05 {
 		return []string{"Processor Information"}, nil
 	}
 	return []string{"Processor"}, nil
 }
 
-func (c *collector) Build() error {
-	c.CStateSecondsTotal = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.cStateSecondsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "cstate_seconds_total"),
 		"Time spent in low-power idle state",
 		[]string{"core", "state"},
 		nil,
 	)
-	c.TimeTotal = prometheus.NewDesc(
+	c.timeTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "time_total"),
 		"Time that processor spent in different modes (dpc, idle, interrupt, privileged, user)",
 		[]string{"core", "mode"},
 		nil,
 	)
-	c.InterruptsTotal = prometheus.NewDesc(
+	c.interruptsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "interrupts_total"),
 		"Total number of received and serviced hardware interrupts",
 		[]string{"core"},
 		nil,
 	)
-	c.DPCsTotal = prometheus.NewDesc(
+	c.dpcsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "dpcs_total"),
 		"Total number of received and serviced deferred procedure calls (DPCs)",
 		[]string{"core"},
@@ -100,79 +111,79 @@ func (c *collector) Build() error {
 		return nil
 	}
 
-	c.CStateSecondsTotal = prometheus.NewDesc(
+	c.cStateSecondsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "cstate_seconds_total"),
 		"Time spent in low-power idle state",
 		[]string{"core", "state"},
 		nil,
 	)
-	c.TimeTotal = prometheus.NewDesc(
+	c.timeTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "time_total"),
 		"Time that processor spent in different modes (dpc, idle, interrupt, privileged, user)",
 		[]string{"core", "mode"},
 		nil,
 	)
-	c.InterruptsTotal = prometheus.NewDesc(
+	c.interruptsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "interrupts_total"),
 		"Total number of received and serviced hardware interrupts",
 		[]string{"core"},
 		nil,
 	)
-	c.DPCsTotal = prometheus.NewDesc(
+	c.dpcsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "dpcs_total"),
 		"Total number of received and serviced deferred procedure calls (DPCs)",
 		[]string{"core"},
 		nil,
 	)
-	c.ClockInterruptsTotal = prometheus.NewDesc(
+	c.clockInterruptsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "clock_interrupts_total"),
 		"Total number of received and serviced clock tick interrupts",
 		[]string{"core"},
 		nil,
 	)
-	c.IdleBreakEventsTotal = prometheus.NewDesc(
+	c.idleBreakEventsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "idle_break_events_total"),
 		"Total number of time processor was woken from idle",
 		[]string{"core"},
 		nil,
 	)
-	c.ParkingStatus = prometheus.NewDesc(
+	c.parkingStatus = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "parking_status"),
 		"Parking Status represents whether a processor is parked or not",
 		[]string{"core"},
 		nil,
 	)
-	c.ProcessorFrequencyMHz = prometheus.NewDesc(
+	c.processorFrequencyMHz = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "core_frequency_mhz"),
 		"Core frequency in megahertz",
 		[]string{"core"},
 		nil,
 	)
-	c.ProcessorPerformance = prometheus.NewDesc(
+	c.processorPerformance = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "processor_performance_total"),
 		"Processor Performance is the average performance of the processor while it is executing instructions, as a percentage of the nominal performance of the processor. On some processors, Processor Performance may exceed 100%",
 		[]string{"core"},
 		nil,
 	)
-	c.ProcessorMPerf = prometheus.NewDesc(
+	c.processorMPerf = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "processor_mperf_total"),
 		"Processor MPerf is the number of TSC ticks incremented while executing instructions",
 		[]string{"core"},
 		nil,
 	)
-	c.ProcessorRTC = prometheus.NewDesc(
+	c.processorRTC = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "processor_rtc_total"),
 		"Processor RTC represents the number of RTC ticks made since the system booted. It should consistently be 64e6, and can be used to properly derive Processor Utility Rate",
 		[]string{"core"},
 		nil,
 	)
-	c.ProcessorUtility = prometheus.NewDesc(
+	c.processorUtility = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "processor_utility_total"),
 		"Processor Utility represents is the amount of time the core spends executing instructions",
 		[]string{"core"},
 		nil,
 	)
-	c.ProcessorPrivUtility = prometheus.NewDesc(
+	c.processorPrivilegedUtility = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "processor_privileged_utility_total"),
 		"Processor Privileged Utility represents is the amount of time the core has spent executing instructions inside the kernel",
 		[]string{"core"},
@@ -182,7 +193,7 @@ func (c *collector) Build() error {
 	return nil
 }
 
-func (c *collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+func (c *Collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	if winversion.WindowsVersionFloat > 6.05 {
 		return c.CollectFull(ctx, ch)
 	}
@@ -198,9 +209,9 @@ type perflibProcessor struct {
 	DPCRate               float64 `perflib:"DPC Rate"`
 	DPCsQueued            float64 `perflib:"DPCs Queued/sec"`
 	Interrupts            float64 `perflib:"Interrupts/sec"`
-	PercentC2Time         float64 `perflib:"% C1 Time"`
-	PercentC3Time         float64 `perflib:"% C2 Time"`
-	PercentC1Time         float64 `perflib:"% C3 Time"`
+	PercentC1Time         float64 `perflib:"% C1 Time"`
+	PercentC2Time         float64 `perflib:"% C2 Time"`
+	PercentC3Time         float64 `perflib:"% C3 Time"`
 	PercentDPCTime        float64 `perflib:"% DPC Time"`
 	PercentIdleTime       float64 `perflib:"% Idle Time"`
 	PercentInterruptTime  float64 `perflib:"% Interrupt Time"`
@@ -209,7 +220,7 @@ type perflibProcessor struct {
 	PercentUserTime       float64 `perflib:"% User Time"`
 }
 
-func (c *collector) CollectBasic(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+func (c *Collector) CollectBasic(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	data := make([]perflibProcessor, 0)
 	err := perflib.UnmarshalObject(ctx.PerfObjects["Processor"], &data, c.logger)
 	if err != nil {
@@ -223,63 +234,63 @@ func (c *collector) CollectBasic(ctx *types.ScrapeContext, ch chan<- prometheus.
 		core := cpu.Name
 
 		ch <- prometheus.MustNewConstMetric(
-			c.CStateSecondsTotal,
+			c.cStateSecondsTotal,
 			prometheus.CounterValue,
 			cpu.PercentC1Time,
 			core, "c1",
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.CStateSecondsTotal,
+			c.cStateSecondsTotal,
 			prometheus.CounterValue,
 			cpu.PercentC2Time,
 			core, "c2",
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.CStateSecondsTotal,
+			c.cStateSecondsTotal,
 			prometheus.CounterValue,
 			cpu.PercentC3Time,
 			core, "c3",
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.TimeTotal,
+			c.timeTotal,
 			prometheus.CounterValue,
 			cpu.PercentIdleTime,
 			core, "idle",
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.TimeTotal,
+			c.timeTotal,
 			prometheus.CounterValue,
 			cpu.PercentInterruptTime,
 			core, "interrupt",
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.TimeTotal,
+			c.timeTotal,
 			prometheus.CounterValue,
 			cpu.PercentDPCTime,
 			core, "dpc",
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.TimeTotal,
+			c.timeTotal,
 			prometheus.CounterValue,
 			cpu.PercentPrivilegedTime,
 			core, "privileged",
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.TimeTotal,
+			c.timeTotal,
 			prometheus.CounterValue,
 			cpu.PercentUserTime,
 			core, "user",
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.InterruptsTotal,
+			c.interruptsTotal,
 			prometheus.CounterValue,
 			cpu.Interrupts,
 			core,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.DPCsTotal,
+			c.dpcsTotal,
 			prometheus.CounterValue,
 			cpu.DPCsQueued,
 			core,
@@ -318,7 +329,7 @@ type perflibProcessorInformation struct {
 	UserTimeSeconds          float64 `perflib:"% User Time"`
 }
 
-func (c *collector) CollectFull(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+func (c *Collector) CollectFull(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	data := make([]perflibProcessorInformation, 0)
 	err := perflib.UnmarshalObject(ctx.PerfObjects["Processor Information"], &data, c.logger)
 	if err != nil {
@@ -332,119 +343,119 @@ func (c *collector) CollectFull(ctx *types.ScrapeContext, ch chan<- prometheus.M
 		core := cpu.Name
 
 		ch <- prometheus.MustNewConstMetric(
-			c.CStateSecondsTotal,
+			c.cStateSecondsTotal,
 			prometheus.CounterValue,
 			cpu.C1TimeSeconds,
 			core, "c1",
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.CStateSecondsTotal,
+			c.cStateSecondsTotal,
 			prometheus.CounterValue,
 			cpu.C2TimeSeconds,
 			core, "c2",
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.CStateSecondsTotal,
+			c.cStateSecondsTotal,
 			prometheus.CounterValue,
 			cpu.C3TimeSeconds,
 			core, "c3",
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.TimeTotal,
+			c.timeTotal,
 			prometheus.CounterValue,
 			cpu.IdleTimeSeconds,
 			core, "idle",
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.TimeTotal,
+			c.timeTotal,
 			prometheus.CounterValue,
 			cpu.InterruptTimeSeconds,
 			core, "interrupt",
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.TimeTotal,
+			c.timeTotal,
 			prometheus.CounterValue,
 			cpu.DPCTimeSeconds,
 			core, "dpc",
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.TimeTotal,
+			c.timeTotal,
 			prometheus.CounterValue,
 			cpu.PrivilegedTimeSeconds,
 			core, "privileged",
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.TimeTotal,
+			c.timeTotal,
 			prometheus.CounterValue,
 			cpu.UserTimeSeconds,
 			core, "user",
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.InterruptsTotal,
+			c.interruptsTotal,
 			prometheus.CounterValue,
 			cpu.InterruptsTotal,
 			core,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.DPCsTotal,
+			c.dpcsTotal,
 			prometheus.CounterValue,
 			cpu.DPCsQueuedTotal,
 			core,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.ClockInterruptsTotal,
+			c.clockInterruptsTotal,
 			prometheus.CounterValue,
 			cpu.ClockInterruptsTotal,
 			core,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.IdleBreakEventsTotal,
+			c.idleBreakEventsTotal,
 			prometheus.CounterValue,
 			cpu.IdleBreakEventsTotal,
 			core,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.ParkingStatus,
+			c.parkingStatus,
 			prometheus.GaugeValue,
 			cpu.ParkingStatus,
 			core,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.ProcessorFrequencyMHz,
+			c.processorFrequencyMHz,
 			prometheus.GaugeValue,
 			cpu.ProcessorFrequencyMHz,
 			core,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.ProcessorPerformance,
+			c.processorPerformance,
 			prometheus.CounterValue,
 			cpu.ProcessorPerformance,
 			core,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.ProcessorMPerf,
+			c.processorMPerf,
 			prometheus.CounterValue,
 			cpu.ProcessorMPerf,
 			core,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.ProcessorRTC,
+			c.processorRTC,
 			prometheus.CounterValue,
 			cpu.ProcessorRTC,
 			core,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.ProcessorUtility,
+			c.processorUtility,
 			prometheus.CounterValue,
 			cpu.ProcessorUtilityRate,
 			core,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.ProcessorPrivUtility,
+			c.processorPrivilegedUtility,
 			prometheus.CounterValue,
 			cpu.PrivilegedUtilitySeconds,
 			core,

pkg/collector/cpu_info/cpu_info.go

@@ -25,39 +25,52 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-// A collector is a Prometheus collector for a few WMI metrics in Win32_Processor
-type collector struct {
+// A Collector is a Prometheus Collector for a few WMI metrics in Win32_Processor.
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	CpuInfo *prometheus.Desc
+	cpuInfo *prometheus.Desc
 }
 
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{}, nil
 }
 
-func (c *collector) Build() error {
-	c.CpuInfo = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.cpuInfo = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, "", Name),
-		"Labelled CPU information as provided provided by Win32_Processor",
+		"Labelled CPU information as provided by Win32_Processor",
 		[]string{
 			"architecture",
 			"device_id",
@@ -85,30 +98,30 @@ type win32_Processor struct {
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ch); err != nil {
-		_ = level.Error(c.logger).Log("msg", "failed collecting cpu_info metrics", "desc", desc, "err", err)
+func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collect(ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed collecting cpu_info metrics", "err", err)
 		return err
 	}
 	return nil
 }
 
-func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *Collector) collect(ch chan<- prometheus.Metric) error {
 	var dst []win32_Processor
 	// We use a static query here because the provided methods in wmi.go all issue a SELECT *;
 	// This results in the time-consuming LoadPercentage field being read which seems to measure each CPU
 	// serially over a 1 second interval, so the scrape time is at least 1s * num_sockets
 	if err := wmi.Query(win32ProcessorQuery, &dst); err != nil {
-		return nil, err
+		return err
 	}
 	if len(dst) == 0 {
-		return nil, errors.New("WMI query returned empty result set")
+		return errors.New("WMI query returned empty result set")
 	}
 
 	// Some CPUs end up exposing trailing spaces for certain strings, so clean them up
 	for _, processor := range dst {
 		ch <- prometheus.MustNewConstMetric(
-			c.CpuInfo,
+			c.cpuInfo,
 			prometheus.GaugeValue,
 			1.0,
 			strconv.Itoa(int(processor.Architecture)),
@@ -121,5 +134,5 @@ func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, erro
 		)
 	}
 
-	return nil, nil
+	return nil
 }

pkg/collector/cpu_info/cpu_info_test.go

@@ -0,0 +1,12 @@
+package cpu_info_test
+
+import (
+	"testing"
+
+	"github.com/prometheus-community/windows_exporter/pkg/collector/cpu_info"
+	"github.com/prometheus-community/windows_exporter/pkg/testutils"
+)
+
+func BenchmarkCollector(b *testing.B) {
+	testutils.FuncBenchmarkCollector(b, cpu_info.Name, cpu_info.NewWithFlags)
+}

pkg/collector/cs/cs.go

@@ -17,51 +17,64 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-// A collector is a Prometheus collector for WMI metrics
-type collector struct {
+// A Collector is a Prometheus Collector for WMI metrics.
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	PhysicalMemoryBytes *prometheus.Desc
-	LogicalProcessors   *prometheus.Desc
-	Hostname            *prometheus.Desc
+	physicalMemoryBytes *prometheus.Desc
+	logicalProcessors   *prometheus.Desc
+	hostname            *prometheus.Desc
 }
 
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{}, nil
 }
 
-func (c *collector) Build() error {
-	c.LogicalProcessors = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.logicalProcessors = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "logical_processors"),
 		"ComputerSystem.NumberOfLogicalProcessors",
 		nil,
 		nil,
 	)
-	c.PhysicalMemoryBytes = prometheus.NewDesc(
+	c.physicalMemoryBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "physical_memory_bytes"),
 		"ComputerSystem.TotalPhysicalMemory",
 		nil,
 		nil,
 	)
-	c.Hostname = prometheus.NewDesc(
+	c.hostname = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "hostname"),
 		"Labelled system hostname information as provided by ComputerSystem.DNSHostName and ComputerSystem.Domain",
 		[]string{
@@ -76,51 +89,51 @@ func (c *collector) Build() error {
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ch); err != nil {
-		_ = level.Error(c.logger).Log("msg", "failed collecting cs metrics", "desc", desc, "err", err)
+func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collect(ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed collecting cs metrics", "err", err)
 		return err
 	}
 	return nil
 }
 
-func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *Collector) collect(ch chan<- prometheus.Metric) error {
 	// Get systeminfo for number of processors
 	systemInfo := sysinfoapi.GetSystemInfo()
 
 	// Get memory status for physical memory
 	mem, err := sysinfoapi.GlobalMemoryStatusEx()
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	ch <- prometheus.MustNewConstMetric(
-		c.LogicalProcessors,
+		c.logicalProcessors,
 		prometheus.GaugeValue,
 		float64(systemInfo.NumberOfProcessors),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.PhysicalMemoryBytes,
+		c.physicalMemoryBytes,
 		prometheus.GaugeValue,
 		float64(mem.TotalPhys),
 	)
 
 	hostname, err := sysinfoapi.GetComputerName(sysinfoapi.ComputerNameDNSHostname)
 	if err != nil {
-		return nil, err
+		return err
 	}
 	domain, err := sysinfoapi.GetComputerName(sysinfoapi.ComputerNameDNSDomain)
 	if err != nil {
-		return nil, err
+		return err
 	}
 	fqdn, err := sysinfoapi.GetComputerName(sysinfoapi.ComputerNameDNSFullyQualified)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	ch <- prometheus.MustNewConstMetric(
-		c.Hostname,
+		c.hostname,
 		prometheus.GaugeValue,
 		1.0,
 		hostname,
@@ -128,5 +141,5 @@ func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, erro
 		fqdn,
 	)
 
-	return nil, nil
+	return nil
 }

pkg/collector/dfsr/dfsr.go

@@ -3,89 +3,87 @@
 package dfsr
 
 import (
+	"slices"
+	"strings"
+
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/prometheus-community/windows_exporter/pkg/perflib"
 	"github.com/prometheus-community/windows_exporter/pkg/types"
-	"github.com/prometheus-community/windows_exporter/pkg/utils"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-const (
-	Name                      = "dfsr"
-	FlagDfsrEnabledCollectors = "collectors.dfsr.sources-enabled"
-)
+const Name = "dfsr"
 
 type Config struct {
-	DfsrEnabledCollectors string `yaml:"enabled_collectors"`
+	CollectorsEnabled []string `yaml:"collectors_enabled"`
 }
 
 var ConfigDefaults = Config{
-	DfsrEnabledCollectors: "",
+	CollectorsEnabled: []string{"connection", "folder", "volume"},
 }
 
-// collector contains the metric and state data of the DFSR collectors.
-type collector struct {
+// Collector contains the metric and state data of the DFSR collectors.
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	dfsrEnabledCollectors *string
+	// connection source
+	connectionBandwidthSavingsUsingDFSReplicationTotal *prometheus.Desc
+	connectionBytesReceivedTotal                       *prometheus.Desc
+	connectionCompressedSizeOfFilesReceivedTotal       *prometheus.Desc
+	connectionFilesReceivedTotal                       *prometheus.Desc
+	connectionRDCBytesReceivedTotal                    *prometheus.Desc
+	connectionRDCCompressedSizeOfFilesReceivedTotal    *prometheus.Desc
+	connectionRDCSizeOfFilesReceivedTotal              *prometheus.Desc
+	connectionRDCNumberofFilesReceivedTotal            *prometheus.Desc
+	connectionSizeOfFilesReceivedTotal                 *prometheus.Desc
 
-	// Connection source
-	ConnectionBandwidthSavingsUsingDFSReplicationTotal *prometheus.Desc
-	ConnectionBytesReceivedTotal                       *prometheus.Desc
-	ConnectionCompressedSizeOfFilesReceivedTotal       *prometheus.Desc
-	ConnectionFilesReceivedTotal                       *prometheus.Desc
-	ConnectionRDCBytesReceivedTotal                    *prometheus.Desc
-	ConnectionRDCCompressedSizeOfFilesReceivedTotal    *prometheus.Desc
-	ConnectionRDCSizeOfFilesReceivedTotal              *prometheus.Desc
-	ConnectionRDCNumberofFilesReceivedTotal            *prometheus.Desc
-	ConnectionSizeOfFilesReceivedTotal                 *prometheus.Desc
+	// folder source
+	folderBandwidthSavingsUsingDFSReplicationTotal *prometheus.Desc
+	folderCompressedSizeOfFilesReceivedTotal       *prometheus.Desc
+	folderConflictBytesCleanedupTotal              *prometheus.Desc
+	folderConflictBytesGeneratedTotal              *prometheus.Desc
+	folderConflictFilesCleanedUpTotal              *prometheus.Desc
+	folderConflictFilesGeneratedTotal              *prometheus.Desc
+	folderConflictfolderCleanupsCompletedTotal     *prometheus.Desc
+	folderConflictSpaceInUse                       *prometheus.Desc
+	folderDeletedSpaceInUse                        *prometheus.Desc
+	folderDeletedBytesCleanedUpTotal               *prometheus.Desc
+	folderDeletedBytesGeneratedTotal               *prometheus.Desc
+	folderDeletedFilesCleanedUpTotal               *prometheus.Desc
+	folderDeletedFilesGeneratedTotal               *prometheus.Desc
+	folderFileInstallsRetriedTotal                 *prometheus.Desc
+	folderFileInstallsSucceededTotal               *prometheus.Desc
+	folderFilesReceivedTotal                       *prometheus.Desc
+	folderRDCBytesReceivedTotal                    *prometheus.Desc
+	folderRDCCompressedSizeOfFilesReceivedTotal    *prometheus.Desc
+	folderRDCNumberofFilesReceivedTotal            *prometheus.Desc
+	folderRDCSizeOfFilesReceivedTotal              *prometheus.Desc
+	folderSizeOfFilesReceivedTotal                 *prometheus.Desc
+	folderStagingSpaceInUse                        *prometheus.Desc
+	folderStagingBytesCleanedUpTotal               *prometheus.Desc
+	folderStagingBytesGeneratedTotal               *prometheus.Desc
+	folderStagingFilesCleanedUpTotal               *prometheus.Desc
+	folderStagingFilesGeneratedTotal               *prometheus.Desc
+	folderUpdatesDroppedTotal                      *prometheus.Desc
 
-	// Folder source
-	FolderBandwidthSavingsUsingDFSReplicationTotal *prometheus.Desc
-	FolderCompressedSizeOfFilesReceivedTotal       *prometheus.Desc
-	FolderConflictBytesCleanedupTotal              *prometheus.Desc
-	FolderConflictBytesGeneratedTotal              *prometheus.Desc
-	FolderConflictFilesCleanedUpTotal              *prometheus.Desc
-	FolderConflictFilesGeneratedTotal              *prometheus.Desc
-	FolderConflictFolderCleanupsCompletedTotal     *prometheus.Desc
-	FolderConflictSpaceInUse                       *prometheus.Desc
-	FolderDeletedSpaceInUse                        *prometheus.Desc
-	FolderDeletedBytesCleanedUpTotal               *prometheus.Desc
-	FolderDeletedBytesGeneratedTotal               *prometheus.Desc
-	FolderDeletedFilesCleanedUpTotal               *prometheus.Desc
-	FolderDeletedFilesGeneratedTotal               *prometheus.Desc
-	FolderFileInstallsRetriedTotal                 *prometheus.Desc
-	FolderFileInstallsSucceededTotal               *prometheus.Desc
-	FolderFilesReceivedTotal                       *prometheus.Desc
-	FolderRDCBytesReceivedTotal                    *prometheus.Desc
-	FolderRDCCompressedSizeOfFilesReceivedTotal    *prometheus.Desc
-	FolderRDCNumberofFilesReceivedTotal            *prometheus.Desc
-	FolderRDCSizeOfFilesReceivedTotal              *prometheus.Desc
-	FolderSizeOfFilesReceivedTotal                 *prometheus.Desc
-	FolderStagingSpaceInUse                        *prometheus.Desc
-	FolderStagingBytesCleanedUpTotal               *prometheus.Desc
-	FolderStagingBytesGeneratedTotal               *prometheus.Desc
-	FolderStagingFilesCleanedUpTotal               *prometheus.Desc
-	FolderStagingFilesGeneratedTotal               *prometheus.Desc
-	FolderUpdatesDroppedTotal                      *prometheus.Desc
+	// volume source
+	volumeDatabaseLookupsTotal           *prometheus.Desc
+	volumeDatabaseCommitsTotal           *prometheus.Desc
+	volumeUSNJournalUnreadPercentage     *prometheus.Desc
+	volumeUSNJournalRecordsAcceptedTotal *prometheus.Desc
+	volumeUSNJournalRecordsReadTotal     *prometheus.Desc
 
-	// Volume source
-	VolumeDatabaseLookupsTotal           *prometheus.Desc
-	VolumeDatabaseCommitsTotal           *prometheus.Desc
-	VolumeUSNJournalUnreadPercentage     *prometheus.Desc
-	VolumeUSNJournalRecordsAcceptedTotal *prometheus.Desc
-	VolumeUSNJournalRecordsReadTotal     *prometheus.Desc
-
-	// Map of child collector functions used during collection
+	// Map of child Collector functions used during collection
 	dfsrChildCollectors []dfsrCollectorFunc
 }
 
 type dfsrCollectorFunc func(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error
 
-// Map Perflib sources to DFSR collector names
-// e.g, volume -> DFS Replication Service Volumes
+// Map Perflib sources to DFSR Collector names
+// e.g, volume -> DFS Replication Service Volumes.
 func dfsrGetPerfObjectName(collector string) string {
 	prefix := "DFS "
 	suffix := ""
@@ -100,345 +98,370 @@ func dfsrGetPerfObjectName(collector string) string {
 	return prefix + suffix
 }
 
-func New(logger log.Logger, config *Config) types.Collector {
+func New(logger log.Logger, config *Config) *Collector {
 	if config == nil {
 		config = &ConfigDefaults
 	}
 
-	c := &collector{
-		dfsrEnabledCollectors: &config.DfsrEnabledCollectors,
+	if config.CollectorsEnabled == nil {
+		config.CollectorsEnabled = ConfigDefaults.CollectorsEnabled
 	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(app *kingpin.Application) types.Collector {
-	return &collector{
-		dfsrEnabledCollectors: app.
-			Flag(FlagDfsrEnabledCollectors, "Comma-seperated list of DFSR Perflib sources to use.").Default("connection,folder,volume").
-			Default(ConfigDefaults.DfsrEnabledCollectors).String(),
+func NewWithFlags(app *kingpin.Application) *Collector {
+	c := &Collector{
+		config: ConfigDefaults,
 	}
+
+	var collectorsEnabled string
+
+	app.Flag("collectors.dfsr.sources-enabled", "Comma-separated list of DFSR Perflib sources to use.").
+		Default(strings.Join(ConfigDefaults.CollectorsEnabled, ",")).StringVar(&collectorsEnabled)
+
+	app.Action(func(*kingpin.ParseContext) error {
+		c.config.CollectorsEnabled = strings.Split(collectorsEnabled, ",")
+
+		return nil
+	})
+
+	return c
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	// Perflib sources are dynamic, depending on the enabled child collectors
-	var perflibDependencies []string
-	for _, source := range utils.ExpandEnabledChildCollectors(*c.dfsrEnabledCollectors) {
+	expandedChildCollectors := slices.Compact(c.config.CollectorsEnabled)
+	perflibDependencies := make([]string, 0, len(expandedChildCollectors))
+
+	for _, source := range expandedChildCollectors {
 		perflibDependencies = append(perflibDependencies, dfsrGetPerfObjectName(source))
 	}
 
 	return perflibDependencies, nil
 }
 
-func (c *collector) Build() error {
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
 	_ = level.Info(c.logger).Log("msg", "dfsr collector is in an experimental state! Metrics for this collector have not been tested.")
 
-	// Connection
-	c.ConnectionBandwidthSavingsUsingDFSReplicationTotal = prometheus.NewDesc(
+	// connection
+	c.connectionBandwidthSavingsUsingDFSReplicationTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "connection_bandwidth_savings_using_dfs_replication_bytes_total"),
 		"Total bytes of bandwidth saved using DFS Replication for this connection",
 		[]string{"name"},
 		nil,
 	)
 
-	c.ConnectionBytesReceivedTotal = prometheus.NewDesc(
+	c.connectionBytesReceivedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "connection_bytes_received_total"),
 		"Total bytes received for connection",
 		[]string{"name"},
 		nil,
 	)
 
-	c.ConnectionCompressedSizeOfFilesReceivedTotal = prometheus.NewDesc(
+	c.connectionCompressedSizeOfFilesReceivedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "connection_compressed_size_of_files_received_bytes_total"),
 		"Total compressed size of files received on the connection, in bytes",
 		[]string{"name"},
 		nil,
 	)
 
-	c.ConnectionFilesReceivedTotal = prometheus.NewDesc(
+	c.connectionFilesReceivedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "connection_received_files_total"),
 		"Total number of files received for connection",
 		[]string{"name"},
 		nil,
 	)
 
-	c.ConnectionRDCBytesReceivedTotal = prometheus.NewDesc(
+	c.connectionRDCBytesReceivedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "connection_rdc_received_bytes_total"),
 		"Total bytes received on the connection while replicating files using Remote Differential Compression",
 		[]string{"name"},
 		nil,
 	)
 
-	c.ConnectionRDCCompressedSizeOfFilesReceivedTotal = prometheus.NewDesc(
+	c.connectionRDCCompressedSizeOfFilesReceivedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "connection_rdc_compressed_size_of_received_files_bytes_total"),
 		"Total uncompressed size of files received with Remote Differential Compression for connection",
 		[]string{"name"},
 		nil,
 	)
 
-	c.ConnectionRDCNumberofFilesReceivedTotal = prometheus.NewDesc(
+	c.connectionRDCNumberofFilesReceivedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "connection_rdc_received_files_total"),
 		"Total number of files received using remote differential compression",
 		[]string{"name"},
 		nil,
 	)
 
-	c.ConnectionRDCSizeOfFilesReceivedTotal = prometheus.NewDesc(
+	c.connectionRDCSizeOfFilesReceivedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "connection_rdc_size_of_received_files_bytes_total"),
 		"Total size of received Remote Differential Compression files, in bytes.",
 		[]string{"name"},
 		nil,
 	)
 
-	c.ConnectionSizeOfFilesReceivedTotal = prometheus.NewDesc(
+	c.connectionSizeOfFilesReceivedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "connection_files_received_bytes_total"),
 		"Total size of files received, in bytes",
 		[]string{"name"},
 		nil,
 	)
 
-	c. // Folder
-		FolderBandwidthSavingsUsingDFSReplicationTotal = prometheus.NewDesc(
+	// folder
+	c.folderBandwidthSavingsUsingDFSReplicationTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_bandwidth_savings_using_dfs_replication_bytes_total"),
 		"Total bytes of bandwidth saved using DFS Replication for this folder",
 		[]string{"name"},
 		nil,
 	)
 
-	c.FolderCompressedSizeOfFilesReceivedTotal = prometheus.NewDesc(
+	c.folderCompressedSizeOfFilesReceivedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_compressed_size_of_received_files_bytes_total"),
 		"Total compressed size of files received on the folder, in bytes",
 		[]string{"name"},
 		nil,
 	)
 
-	c.FolderConflictBytesCleanedupTotal = prometheus.NewDesc(
+	c.folderConflictBytesCleanedupTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_conflict_cleaned_up_bytes_total"),
 		"Total size of conflict loser files and folders deleted from the Conflict and Deleted folder, in bytes",
 		[]string{"name"},
 		nil,
 	)
 
-	c.FolderConflictBytesGeneratedTotal = prometheus.NewDesc(
+	c.folderConflictBytesGeneratedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_conflict_generated_bytes_total"),
 		"Total size of conflict loser files and folders moved to the Conflict and Deleted folder, in bytes",
 		[]string{"name"},
 		nil,
 	)
 
-	c.FolderConflictFilesCleanedUpTotal = prometheus.NewDesc(
+	c.folderConflictFilesCleanedUpTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_conflict_cleaned_up_files_total"),
 		"Number of conflict loser files deleted from the Conflict and Deleted folder",
 		[]string{"name"},
 		nil,
 	)
 
-	c.FolderConflictFilesGeneratedTotal = prometheus.NewDesc(
+	c.folderConflictFilesGeneratedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_conflict_generated_files_total"),
 		"Number of files and folders moved to the Conflict and Deleted folder",
 		[]string{"name"},
 		nil,
 	)
 
-	c.FolderConflictFolderCleanupsCompletedTotal = prometheus.NewDesc(
+	c.folderConflictfolderCleanupsCompletedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_conflict_folder_cleanups_total"),
 		"Number of deletions of conflict loser files and folders in the Conflict and Deleted",
 		[]string{"name"},
 		nil,
 	)
 
-	c.FolderConflictSpaceInUse = prometheus.NewDesc(
+	c.folderConflictSpaceInUse = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_conflict_space_in_use_bytes"),
 		"Total size of the conflict loser files and folders currently in the Conflict and Deleted folder",
 		[]string{"name"},
 		nil,
 	)
 
-	c.FolderDeletedSpaceInUse = prometheus.NewDesc(
+	c.folderDeletedSpaceInUse = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_deleted_space_in_use_bytes"),
 		"Total size (in bytes) of the deleted files and folders currently in the Conflict and Deleted folder",
 		[]string{"name"},
 		nil,
 	)
 
-	c.FolderDeletedBytesCleanedUpTotal = prometheus.NewDesc(
+	c.folderDeletedBytesCleanedUpTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_deleted_cleaned_up_bytes_total"),
 		"Total size (in bytes) of replicating deleted files and folders that were cleaned up from the Conflict and Deleted folder",
 		[]string{"name"},
 		nil,
 	)
 
-	c.FolderDeletedBytesGeneratedTotal = prometheus.NewDesc(
+	c.folderDeletedBytesGeneratedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_deleted_generated_bytes_total"),
 		"Total size (in bytes) of replicated deleted files and folders that were moved to the Conflict and Deleted folder after they were deleted from a replicated folder on a sending member",
 		[]string{"name"},
 		nil,
 	)
 
-	c.FolderDeletedFilesCleanedUpTotal = prometheus.NewDesc(
+	c.folderDeletedFilesCleanedUpTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_deleted_cleaned_up_files_total"),
 		"Number of files and folders that were cleaned up from the Conflict and Deleted folder",
 		[]string{"name"},
 		nil,
 	)
 
-	c.FolderDeletedFilesGeneratedTotal = prometheus.NewDesc(
+	c.folderDeletedFilesGeneratedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_deleted_generated_files_total"),
 		"Number of deleted files and folders that were moved to the Conflict and Deleted folder",
 		[]string{"name"},
 		nil,
 	)
 
-	c.FolderFileInstallsRetriedTotal = prometheus.NewDesc(
+	c.folderFileInstallsRetriedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_file_installs_retried_total"),
 		"Total number of file installs that are being retried due to sharing violations or other errors encountered when installing the files",
 		[]string{"name"},
 		nil,
 	)
 
-	c.FolderFileInstallsSucceededTotal = prometheus.NewDesc(
+	c.folderFileInstallsSucceededTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_file_installs_succeeded_total"),
 		"Total number of files that were successfully received from sending members and installed locally on this server",
 		[]string{"name"},
 		nil,
 	)
 
-	c.FolderFilesReceivedTotal = prometheus.NewDesc(
+	c.folderFilesReceivedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_received_files_total"),
 		"Total number of files received",
 		[]string{"name"},
 		nil,
 	)
 
-	c.FolderRDCBytesReceivedTotal = prometheus.NewDesc(
+	c.folderRDCBytesReceivedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_rdc_received_bytes_total"),
 		"Total number of bytes received in replicating files using Remote Differential Compression",
 		[]string{"name"},
 		nil,
 	)
 
-	c.FolderRDCCompressedSizeOfFilesReceivedTotal = prometheus.NewDesc(
+	c.folderRDCCompressedSizeOfFilesReceivedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_rdc_compressed_size_of_received_files_bytes_total"),
 		"Total compressed size (in bytes) of the files received with Remote Differential Compression",
 		[]string{"name"},
 		nil,
 	)
 
-	c.FolderRDCNumberofFilesReceivedTotal = prometheus.NewDesc(
+	c.folderRDCNumberofFilesReceivedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_rdc_received_files_total"),
 		"Total number of files received with Remote Differential Compression",
 		[]string{"name"},
 		nil,
 	)
 
-	c.FolderRDCSizeOfFilesReceivedTotal = prometheus.NewDesc(
+	c.folderRDCSizeOfFilesReceivedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_rdc_files_received_bytes_total"),
 		"Total uncompressed size (in bytes) of the files received with Remote Differential Compression",
 		[]string{"name"},
 		nil,
 	)
 
-	c.FolderSizeOfFilesReceivedTotal = prometheus.NewDesc(
+	c.folderSizeOfFilesReceivedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_files_received_bytes_total"),
 		"Total uncompressed size (in bytes) of the files received",
 		[]string{"name"},
 		nil,
 	)
 
-	c.FolderStagingSpaceInUse = prometheus.NewDesc(
+	c.folderStagingSpaceInUse = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_staging_space_in_use_bytes"),
 		"Total size of files and folders currently in the staging folder.",
 		[]string{"name"},
 		nil,
 	)
 
-	c.FolderStagingBytesCleanedUpTotal = prometheus.NewDesc(
+	c.folderStagingBytesCleanedUpTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_staging_cleaned_up_bytes_total"),
 		"Total size (in bytes) of the files and folders that have been cleaned up from the staging folder",
 		[]string{"name"},
 		nil,
 	)
 
-	c.FolderStagingBytesGeneratedTotal = prometheus.NewDesc(
+	c.folderStagingBytesGeneratedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_staging_generated_bytes_total"),
 		"Total size (in bytes) of replicated files and folders in the staging folder created by the DFS Replication service since last restart",
 		[]string{"name"},
 		nil,
 	)
 
-	c.FolderStagingFilesCleanedUpTotal = prometheus.NewDesc(
+	c.folderStagingFilesCleanedUpTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_staging_cleaned_up_files_total"),
 		"Total number of files and folders that have been cleaned up from the staging folder",
 		[]string{"name"},
 		nil,
 	)
 
-	c.FolderStagingFilesGeneratedTotal = prometheus.NewDesc(
+	c.folderStagingFilesGeneratedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_staging_generated_files_total"),
 		"Total number of times replicated files and folders have been staged by the DFS Replication service",
 		[]string{"name"},
 		nil,
 	)
 
-	c.FolderUpdatesDroppedTotal = prometheus.NewDesc(
+	c.folderUpdatesDroppedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "folder_dropped_updates_total"),
 		"Total number of redundant file replication update records that have been ignored by the DFS Replication service because they did not change the replicated file or folder",
 		[]string{"name"},
 		nil,
 	)
 
-	c. // Volume
-		VolumeDatabaseCommitsTotal = prometheus.NewDesc(
+	// volume
+	c.volumeDatabaseCommitsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "volume_database_commits_total"),
-		"Total number of DFSR Volume database commits",
+		"Total number of DFSR volume database commits",
 		[]string{"name"},
 		nil,
 	)
 
-	c.VolumeDatabaseLookupsTotal = prometheus.NewDesc(
+	c.volumeDatabaseLookupsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "volume_database_lookups_total"),
-		"Total number of DFSR Volume database lookups",
+		"Total number of DFSR volume database lookups",
 		[]string{"name"},
 		nil,
 	)
 
-	c.VolumeUSNJournalUnreadPercentage = prometheus.NewDesc(
+	c.volumeUSNJournalUnreadPercentage = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "volume_usn_journal_unread_percentage"),
-		"Percentage of DFSR Volume USN journal records that are unread",
+		"Percentage of DFSR volume USN journal records that are unread",
 		[]string{"name"},
 		nil,
 	)
 
-	c.VolumeUSNJournalRecordsAcceptedTotal = prometheus.NewDesc(
+	c.volumeUSNJournalRecordsAcceptedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "volume_usn_journal_accepted_records_total"),
 		"Total number of USN journal records accepted",
 		[]string{"name"},
 		nil,
 	)
 
-	c.VolumeUSNJournalRecordsReadTotal = prometheus.NewDesc(
+	c.volumeUSNJournalRecordsReadTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "volume_usn_journal_read_records_total"),
-		"Total number of DFSR Volume USN journal records read",
+		"Total number of DFSR volume USN journal records read",
 		[]string{"name"},
 		nil,
 	)
 
-	c.dfsrChildCollectors = c.getDFSRChildCollectors(utils.ExpandEnabledChildCollectors(*c.dfsrEnabledCollectors))
+	// Perflib sources are dynamic, depending on the enabled child collectors
+	expandedChildCollectors := slices.Compact(c.config.CollectorsEnabled)
+	c.dfsrChildCollectors = c.getDFSRChildCollectors(expandedChildCollectors)
 
 	return nil
 }
 
 // Maps enabled child collectors names to their relevant collection function,
-// for use in collector.Collect()
-func (c *collector) getDFSRChildCollectors(enabledCollectors []string) []dfsrCollectorFunc {
+// for use in Collector.Collect().
+func (c *Collector) getDFSRChildCollectors(enabledCollectors []string) []dfsrCollectorFunc {
 	var dfsrCollectors []dfsrCollectorFunc
 	for _, collector := range enabledCollectors {
 		switch collector {
@@ -456,7 +479,7 @@ func (c *collector) getDFSRChildCollectors(enabledCollectors []string) []dfsrCol
 
 // Collect implements the Collector interface.
 // Sends metric values for each metric to the provided prometheus Metric channel.
-func (c *collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+func (c *Collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	for _, fn := range c.dfsrChildCollectors {
 		err := fn(ctx, ch)
 		if err != nil {
@@ -466,7 +489,7 @@ func (c *collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metri
 	return nil
 }
 
-// PerflibDFSRConnection Perflib: "DFS Replication Service Connections"
+// PerflibDFSRConnection Perflib: "DFS Replication Service Connections".
 type PerflibDFSRConnection struct {
 	Name string
 
@@ -481,7 +504,7 @@ type PerflibDFSRConnection struct {
 	SizeOfFilesReceivedTotal                 float64 `perflib:"Size of Files Received"`
 }
 
-func (c *collector) collectConnection(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+func (c *Collector) collectConnection(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	var dst []PerflibDFSRConnection
 	if err := perflib.UnmarshalObject(ctx.PerfObjects["DFS Replication Connections"], &dst, c.logger); err != nil {
 		return err
@@ -489,74 +512,73 @@ func (c *collector) collectConnection(ctx *types.ScrapeContext, ch chan<- promet
 
 	for _, connection := range dst {
 		ch <- prometheus.MustNewConstMetric(
-			c.ConnectionBandwidthSavingsUsingDFSReplicationTotal,
+			c.connectionBandwidthSavingsUsingDFSReplicationTotal,
 			prometheus.CounterValue,
 			connection.BandwidthSavingsUsingDFSReplicationTotal,
 			connection.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.ConnectionBytesReceivedTotal,
+			c.connectionBytesReceivedTotal,
 			prometheus.CounterValue,
 			connection.BytesReceivedTotal,
 			connection.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.ConnectionCompressedSizeOfFilesReceivedTotal,
+			c.connectionCompressedSizeOfFilesReceivedTotal,
 			prometheus.CounterValue,
 			connection.CompressedSizeOfFilesReceivedTotal,
 			connection.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.ConnectionFilesReceivedTotal,
+			c.connectionFilesReceivedTotal,
 			prometheus.CounterValue,
 			connection.FilesReceivedTotal,
 			connection.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.ConnectionRDCBytesReceivedTotal,
+			c.connectionRDCBytesReceivedTotal,
 			prometheus.CounterValue,
 			connection.RDCBytesReceivedTotal,
 			connection.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.ConnectionRDCCompressedSizeOfFilesReceivedTotal,
+			c.connectionRDCCompressedSizeOfFilesReceivedTotal,
 			prometheus.CounterValue,
 			connection.RDCCompressedSizeOfFilesReceivedTotal,
 			connection.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.ConnectionRDCSizeOfFilesReceivedTotal,
+			c.connectionRDCSizeOfFilesReceivedTotal,
 			prometheus.CounterValue,
 			connection.RDCSizeOfFilesReceivedTotal,
 			connection.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.ConnectionRDCNumberofFilesReceivedTotal,
+			c.connectionRDCNumberofFilesReceivedTotal,
 			prometheus.CounterValue,
 			connection.RDCNumberofFilesReceivedTotal,
 			connection.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.ConnectionSizeOfFilesReceivedTotal,
+			c.connectionSizeOfFilesReceivedTotal,
 			prometheus.CounterValue,
 			connection.SizeOfFilesReceivedTotal,
 			connection.Name,
 		)
-
 	}
 	return nil
 }
 
-// PerflibDFSRFolder Perflib: "DFS Replicated Folder"
-type PerflibDFSRFolder struct {
+// perflibDFSRFolder Perflib: "DFS Replicated Folder".
+type perflibDFSRFolder struct {
 	Name string
 
 	BandwidthSavingsUsingDFSReplicationTotal float64 `perflib:"Bandwidth Savings Using DFS Replication"`
@@ -565,7 +587,7 @@ type PerflibDFSRFolder struct {
 	ConflictBytesGeneratedTotal              float64 `perflib:"Conflict Bytes Generated"`
 	ConflictFilesCleanedUpTotal              float64 `perflib:"Conflict Files Cleaned Up"`
 	ConflictFilesGeneratedTotal              float64 `perflib:"Conflict Files Generated"`
-	ConflictFolderCleanupsCompletedTotal     float64 `perflib:"Conflict Folder Cleanups Completed"`
+	ConflictFolderCleanupsCompletedTotal     float64 `perflib:"Conflict folder Cleanups Completed"`
 	ConflictSpaceInUse                       float64 `perflib:"Conflict Space In Use"`
 	DeletedSpaceInUse                        float64 `perflib:"Deleted Space In Use"`
 	DeletedBytesCleanedUpTotal               float64 `perflib:"Deleted Bytes Cleaned Up"`
@@ -588,197 +610,197 @@ type PerflibDFSRFolder struct {
 	UpdatesDroppedTotal                      float64 `perflib:"Updates Dropped"`
 }
 
-func (c *collector) collectFolder(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	var dst []PerflibDFSRFolder
+func (c *Collector) collectFolder(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	var dst []perflibDFSRFolder
 	if err := perflib.UnmarshalObject(ctx.PerfObjects["DFS Replicated Folders"], &dst, c.logger); err != nil {
 		return err
 	}
 
 	for _, folder := range dst {
 		ch <- prometheus.MustNewConstMetric(
-			c.FolderBandwidthSavingsUsingDFSReplicationTotal,
+			c.folderBandwidthSavingsUsingDFSReplicationTotal,
 			prometheus.CounterValue,
 			folder.BandwidthSavingsUsingDFSReplicationTotal,
 			folder.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FolderCompressedSizeOfFilesReceivedTotal,
+			c.folderCompressedSizeOfFilesReceivedTotal,
 			prometheus.CounterValue,
 			folder.CompressedSizeOfFilesReceivedTotal,
 			folder.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FolderConflictBytesCleanedupTotal,
+			c.folderConflictBytesCleanedupTotal,
 			prometheus.CounterValue,
 			folder.ConflictBytesCleanedupTotal,
 			folder.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FolderConflictBytesGeneratedTotal,
+			c.folderConflictBytesGeneratedTotal,
 			prometheus.CounterValue,
 			folder.ConflictBytesGeneratedTotal,
 			folder.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FolderConflictFilesCleanedUpTotal,
+			c.folderConflictFilesCleanedUpTotal,
 			prometheus.CounterValue,
 			folder.ConflictFilesCleanedUpTotal,
 			folder.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FolderConflictFilesGeneratedTotal,
+			c.folderConflictFilesGeneratedTotal,
 			prometheus.CounterValue,
 			folder.ConflictFilesGeneratedTotal,
 			folder.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FolderConflictFolderCleanupsCompletedTotal,
+			c.folderConflictfolderCleanupsCompletedTotal,
 			prometheus.CounterValue,
 			folder.ConflictFolderCleanupsCompletedTotal,
 			folder.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FolderConflictSpaceInUse,
+			c.folderConflictSpaceInUse,
 			prometheus.GaugeValue,
 			folder.ConflictSpaceInUse,
 			folder.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FolderDeletedSpaceInUse,
+			c.folderDeletedSpaceInUse,
 			prometheus.GaugeValue,
 			folder.DeletedSpaceInUse,
 			folder.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FolderDeletedBytesCleanedUpTotal,
+			c.folderDeletedBytesCleanedUpTotal,
 			prometheus.CounterValue,
 			folder.DeletedBytesCleanedUpTotal,
 			folder.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FolderDeletedBytesGeneratedTotal,
+			c.folderDeletedBytesGeneratedTotal,
 			prometheus.CounterValue,
 			folder.DeletedBytesGeneratedTotal,
 			folder.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FolderDeletedFilesCleanedUpTotal,
+			c.folderDeletedFilesCleanedUpTotal,
 			prometheus.CounterValue,
 			folder.DeletedFilesCleanedUpTotal,
 			folder.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FolderDeletedFilesGeneratedTotal,
+			c.folderDeletedFilesGeneratedTotal,
 			prometheus.CounterValue,
 			folder.DeletedFilesGeneratedTotal,
 			folder.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FolderFileInstallsRetriedTotal,
+			c.folderFileInstallsRetriedTotal,
 			prometheus.CounterValue,
 			folder.FileInstallsRetriedTotal,
 			folder.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FolderFileInstallsSucceededTotal,
+			c.folderFileInstallsSucceededTotal,
 			prometheus.CounterValue,
 			folder.FileInstallsSucceededTotal,
 			folder.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FolderFilesReceivedTotal,
+			c.folderFilesReceivedTotal,
 			prometheus.CounterValue,
 			folder.FilesReceivedTotal,
 			folder.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FolderRDCBytesReceivedTotal,
+			c.folderRDCBytesReceivedTotal,
 			prometheus.CounterValue,
 			folder.RDCBytesReceivedTotal,
 			folder.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FolderRDCCompressedSizeOfFilesReceivedTotal,
+			c.folderRDCCompressedSizeOfFilesReceivedTotal,
 			prometheus.CounterValue,
 			folder.RDCCompressedSizeOfFilesReceivedTotal,
 			folder.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FolderRDCNumberofFilesReceivedTotal,
+			c.folderRDCNumberofFilesReceivedTotal,
 			prometheus.CounterValue,
 			folder.RDCNumberofFilesReceivedTotal,
 			folder.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FolderRDCSizeOfFilesReceivedTotal,
+			c.folderRDCSizeOfFilesReceivedTotal,
 			prometheus.CounterValue,
 			folder.RDCSizeOfFilesReceivedTotal,
 			folder.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FolderSizeOfFilesReceivedTotal,
+			c.folderSizeOfFilesReceivedTotal,
 			prometheus.CounterValue,
 			folder.SizeOfFilesReceivedTotal,
 			folder.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FolderStagingSpaceInUse,
+			c.folderStagingSpaceInUse,
 			prometheus.GaugeValue,
 			folder.StagingSpaceInUse,
 			folder.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FolderStagingBytesCleanedUpTotal,
+			c.folderStagingBytesCleanedUpTotal,
 			prometheus.CounterValue,
 			folder.StagingBytesCleanedUpTotal,
 			folder.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FolderStagingBytesGeneratedTotal,
+			c.folderStagingBytesGeneratedTotal,
 			prometheus.CounterValue,
 			folder.StagingBytesGeneratedTotal,
 			folder.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FolderStagingFilesCleanedUpTotal,
+			c.folderStagingFilesCleanedUpTotal,
 			prometheus.CounterValue,
 			folder.StagingFilesCleanedUpTotal,
 			folder.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FolderStagingFilesGeneratedTotal,
+			c.folderStagingFilesGeneratedTotal,
 			prometheus.CounterValue,
 			folder.StagingFilesGeneratedTotal,
 			folder.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FolderUpdatesDroppedTotal,
+			c.folderUpdatesDroppedTotal,
 			prometheus.CounterValue,
 			folder.UpdatesDroppedTotal,
 			folder.Name,
@@ -787,8 +809,8 @@ func (c *collector) collectFolder(ctx *types.ScrapeContext, ch chan<- prometheus
 	return nil
 }
 
-// PerflibDFSRVolume Perflib: "DFS Replication Service Volumes"
-type PerflibDFSRVolume struct {
+// perflibDFSRVolume Perflib: "DFS Replication Service Volumes".
+type perflibDFSRVolume struct {
 	Name string
 
 	DatabaseCommitsTotal           float64 `perflib:"Database Commits"`
@@ -798,48 +820,47 @@ type PerflibDFSRVolume struct {
 	USNJournalUnreadPercentage     float64 `perflib:"USN Journal Records Unread Percentage"`
 }
 
-func (c *collector) collectVolume(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	var dst []PerflibDFSRVolume
-	if err := perflib.UnmarshalObject(ctx.PerfObjects["DFS Replication Service Volumes"], &dst, c.logger); err != nil {
+func (c *Collector) collectVolume(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	var dst []perflibDFSRVolume
+	if err := perflib.UnmarshalObject(ctx.PerfObjects["DFS Replication Service volumes"], &dst, c.logger); err != nil {
 		return err
 	}
 
 	for _, volume := range dst {
 		ch <- prometheus.MustNewConstMetric(
-			c.VolumeDatabaseLookupsTotal,
+			c.volumeDatabaseLookupsTotal,
 			prometheus.CounterValue,
 			volume.DatabaseLookupsTotal,
 			volume.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.VolumeDatabaseCommitsTotal,
+			c.volumeDatabaseCommitsTotal,
 			prometheus.CounterValue,
 			volume.DatabaseCommitsTotal,
 			volume.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.VolumeUSNJournalRecordsAcceptedTotal,
+			c.volumeUSNJournalRecordsAcceptedTotal,
 			prometheus.CounterValue,
 			volume.USNJournalRecordsAcceptedTotal,
 			volume.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.VolumeUSNJournalRecordsReadTotal,
+			c.volumeUSNJournalRecordsReadTotal,
 			prometheus.CounterValue,
 			volume.USNJournalRecordsReadTotal,
 			volume.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.VolumeUSNJournalUnreadPercentage,
+			c.volumeUSNJournalUnreadPercentage,
 			prometheus.GaugeValue,
 			volume.USNJournalUnreadPercentage,
 			volume.Name,
 		)
-
 	}
 	return nil
 }

pkg/collector/dhcp/dhcp.go

@@ -16,205 +16,218 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-// A collector is a Prometheus collector perflib DHCP metrics
-type collector struct {
+// A Collector is a Prometheus Collector perflib DHCP metrics.
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	PacketsReceivedTotal                             *prometheus.Desc
-	DuplicatesDroppedTotal                           *prometheus.Desc
-	PacketsExpiredTotal                              *prometheus.Desc
-	ActiveQueueLength                                *prometheus.Desc
-	ConflictCheckQueueLength                         *prometheus.Desc
-	DiscoversTotal                                   *prometheus.Desc
-	OffersTotal                                      *prometheus.Desc
-	RequestsTotal                                    *prometheus.Desc
-	InformsTotal                                     *prometheus.Desc
-	AcksTotal                                        *prometheus.Desc
-	NacksTotal                                       *prometheus.Desc
-	DeclinesTotal                                    *prometheus.Desc
-	ReleasesTotal                                    *prometheus.Desc
-	OfferQueueLength                                 *prometheus.Desc
-	DeniedDueToMatch                                 *prometheus.Desc
-	DeniedDueToNonMatch                              *prometheus.Desc
-	FailoverBndupdSentTotal                          *prometheus.Desc
-	FailoverBndupdReceivedTotal                      *prometheus.Desc
-	FailoverBndackSentTotal                          *prometheus.Desc
-	FailoverBndackReceivedTotal                      *prometheus.Desc
-	FailoverBndupdPendingOutboundQueue               *prometheus.Desc
-	FailoverTransitionsCommunicationinterruptedState *prometheus.Desc
-	FailoverTransitionsPartnerdownState              *prometheus.Desc
-	FailoverTransitionsRecoverState                  *prometheus.Desc
-	FailoverBndupdDropped                            *prometheus.Desc
+	acksTotal                                        *prometheus.Desc
+	activeQueueLength                                *prometheus.Desc
+	conflictCheckQueueLength                         *prometheus.Desc
+	declinesTotal                                    *prometheus.Desc
+	deniedDueToMatch                                 *prometheus.Desc
+	deniedDueToNonMatch                              *prometheus.Desc
+	discoversTotal                                   *prometheus.Desc
+	duplicatesDroppedTotal                           *prometheus.Desc
+	failoverBndackReceivedTotal                      *prometheus.Desc
+	failoverBndackSentTotal                          *prometheus.Desc
+	failoverBndupdDropped                            *prometheus.Desc
+	failoverBndupdPendingOutboundQueue               *prometheus.Desc
+	failoverBndupdReceivedTotal                      *prometheus.Desc
+	failoverBndupdSentTotal                          *prometheus.Desc
+	failoverTransitionsCommunicationInterruptedState *prometheus.Desc
+	failoverTransitionsPartnerDownState              *prometheus.Desc
+	failoverTransitionsRecoverState                  *prometheus.Desc
+	informsTotal                                     *prometheus.Desc
+	nACKsTotal                                       *prometheus.Desc
+	offerQueueLength                                 *prometheus.Desc
+	offersTotal                                      *prometheus.Desc
+	packetsExpiredTotal                              *prometheus.Desc
+	packetsReceivedTotal                             *prometheus.Desc
+	releasesTotal                                    *prometheus.Desc
+	requestsTotal                                    *prometheus.Desc
 }
 
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{"DHCP Server"}, nil
 }
 
-func (c *collector) Build() error {
-	c.PacketsReceivedTotal = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.packetsReceivedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "packets_received_total"),
 		"Total number of packets received by the DHCP server (PacketsReceivedTotal)",
 		nil,
 		nil,
 	)
-	c.DuplicatesDroppedTotal = prometheus.NewDesc(
+	c.duplicatesDroppedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "duplicates_dropped_total"),
 		"Total number of duplicate packets received by the DHCP server (DuplicatesDroppedTotal)",
 		nil,
 		nil,
 	)
-	c.PacketsExpiredTotal = prometheus.NewDesc(
+	c.packetsExpiredTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "packets_expired_total"),
 		"Total number of packets expired in the DHCP server message queue (PacketsExpiredTotal)",
 		nil,
 		nil,
 	)
-	c.ActiveQueueLength = prometheus.NewDesc(
+	c.activeQueueLength = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "active_queue_length"),
 		"Number of packets in the processing queue of the DHCP server (ActiveQueueLength)",
 		nil,
 		nil,
 	)
-	c.ConflictCheckQueueLength = prometheus.NewDesc(
+	c.conflictCheckQueueLength = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "conflict_check_queue_length"),
 		"Number of packets in the DHCP server queue waiting on conflict detection (ping). (ConflictCheckQueueLength)",
 		nil,
 		nil,
 	)
-	c.DiscoversTotal = prometheus.NewDesc(
+	c.discoversTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "discovers_total"),
 		"Total DHCP Discovers received by the DHCP server (DiscoversTotal)",
 		nil,
 		nil,
 	)
-	c.OffersTotal = prometheus.NewDesc(
+	c.offersTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "offers_total"),
 		"Total DHCP Offers sent by the DHCP server (OffersTotal)",
 		nil,
 		nil,
 	)
-	c.RequestsTotal = prometheus.NewDesc(
+	c.requestsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "requests_total"),
 		"Total DHCP Requests received by the DHCP server (RequestsTotal)",
 		nil,
 		nil,
 	)
-	c.InformsTotal = prometheus.NewDesc(
+	c.informsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "informs_total"),
 		"Total DHCP Informs received by the DHCP server (InformsTotal)",
 		nil,
 		nil,
 	)
-	c.AcksTotal = prometheus.NewDesc(
+	c.acksTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "acks_total"),
 		"Total DHCP Acks sent by the DHCP server (AcksTotal)",
 		nil,
 		nil,
 	)
-	c.NacksTotal = prometheus.NewDesc(
+	c.nACKsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "nacks_total"),
 		"Total DHCP Nacks sent by the DHCP server (NacksTotal)",
 		nil,
 		nil,
 	)
-	c.DeclinesTotal = prometheus.NewDesc(
+	c.declinesTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "declines_total"),
 		"Total DHCP Declines received by the DHCP server (DeclinesTotal)",
 		nil,
 		nil,
 	)
-	c.ReleasesTotal = prometheus.NewDesc(
+	c.releasesTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "releases_total"),
 		"Total DHCP Releases received by the DHCP server (ReleasesTotal)",
 		nil,
 		nil,
 	)
-	c.OfferQueueLength = prometheus.NewDesc(
+	c.offerQueueLength = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "offer_queue_length"),
 		"Number of packets in the offer queue of the DHCP server (OfferQueueLength)",
 		nil,
 		nil,
 	)
-	c.DeniedDueToMatch = prometheus.NewDesc(
+	c.deniedDueToMatch = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "denied_due_to_match_total"),
 		"Total number of DHCP requests denied, based on matches from the Deny list (DeniedDueToMatch)",
 		nil,
 		nil,
 	)
-	c.DeniedDueToNonMatch = prometheus.NewDesc(
+	c.deniedDueToNonMatch = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "denied_due_to_nonmatch_total"),
 		"Total number of DHCP requests denied, based on non-matches from the Allow list (DeniedDueToNonMatch)",
 		nil,
 		nil,
 	)
-	c.FailoverBndupdSentTotal = prometheus.NewDesc(
+	c.failoverBndupdSentTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "failover_bndupd_sent_total"),
 		"Number of DHCP fail over Binding Update messages sent (FailoverBndupdSentTotal)",
 		nil,
 		nil,
 	)
-	c.FailoverBndupdReceivedTotal = prometheus.NewDesc(
+	c.failoverBndupdReceivedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "failover_bndupd_received_total"),
 		"Number of DHCP fail over Binding Update messages received (FailoverBndupdReceivedTotal)",
 		nil,
 		nil,
 	)
-	c.FailoverBndackSentTotal = prometheus.NewDesc(
+	c.failoverBndackSentTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "failover_bndack_sent_total"),
 		"Number of DHCP fail over Binding Ack messages sent (FailoverBndackSentTotal)",
 		nil,
 		nil,
 	)
-	c.FailoverBndackReceivedTotal = prometheus.NewDesc(
+	c.failoverBndackReceivedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "failover_bndack_received_total"),
 		"Number of DHCP fail over Binding Ack messages received (FailoverBndackReceivedTotal)",
 		nil,
 		nil,
 	)
-	c.FailoverBndupdPendingOutboundQueue = prometheus.NewDesc(
+	c.failoverBndupdPendingOutboundQueue = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "failover_bndupd_pending_in_outbound_queue"),
 		"Number of pending outbound DHCP fail over Binding Update messages (FailoverBndupdPendingOutboundQueue)",
 		nil,
 		nil,
 	)
-	c.FailoverTransitionsCommunicationinterruptedState = prometheus.NewDesc(
+	c.failoverTransitionsCommunicationInterruptedState = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "failover_transitions_communicationinterrupted_state_total"),
 		"Total number of transitions into COMMUNICATION INTERRUPTED state (FailoverTransitionsCommunicationinterruptedState)",
 		nil,
 		nil,
 	)
-	c.FailoverTransitionsPartnerdownState = prometheus.NewDesc(
+	c.failoverTransitionsPartnerDownState = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "failover_transitions_partnerdown_state_total"),
 		"Total number of transitions into PARTNER DOWN state (FailoverTransitionsPartnerdownState)",
 		nil,
 		nil,
 	)
-	c.FailoverTransitionsRecoverState = prometheus.NewDesc(
+	c.failoverTransitionsRecoverState = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "failover_transitions_recover_total"),
 		"Total number of transitions into RECOVER state (FailoverTransitionsRecoverState)",
 		nil,
 		nil,
 	)
-	c.FailoverBndupdDropped = prometheus.NewDesc(
+	c.failoverBndupdDropped = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "failover_bndupd_dropped_total"),
 		"Total number of DHCP fail over Binding Updates dropped (FailoverBndupdDropped)",
 		nil,
@@ -254,158 +267,158 @@ type dhcpPerf struct {
 	FailoverBndupdDropped                            float64 `perflib:"Failover: BndUpd Dropped."`
 }
 
-func (c *collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+func (c *Collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	var dhcpPerfs []dhcpPerf
 	if err := perflib.UnmarshalObject(ctx.PerfObjects["DHCP Server"], &dhcpPerfs, c.logger); err != nil {
 		return err
 	}
 
 	ch <- prometheus.MustNewConstMetric(
-		c.PacketsReceivedTotal,
+		c.packetsReceivedTotal,
 		prometheus.CounterValue,
 		dhcpPerfs[0].PacketsReceivedTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.DuplicatesDroppedTotal,
+		c.duplicatesDroppedTotal,
 		prometheus.CounterValue,
 		dhcpPerfs[0].DuplicatesDroppedTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.PacketsExpiredTotal,
+		c.packetsExpiredTotal,
 		prometheus.CounterValue,
 		dhcpPerfs[0].PacketsExpiredTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.ActiveQueueLength,
+		c.activeQueueLength,
 		prometheus.GaugeValue,
 		dhcpPerfs[0].ActiveQueueLength,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.ConflictCheckQueueLength,
+		c.conflictCheckQueueLength,
 		prometheus.GaugeValue,
 		dhcpPerfs[0].ConflictCheckQueueLength,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.DiscoversTotal,
+		c.discoversTotal,
 		prometheus.CounterValue,
 		dhcpPerfs[0].DiscoversTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.OffersTotal,
+		c.offersTotal,
 		prometheus.CounterValue,
 		dhcpPerfs[0].OffersTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.RequestsTotal,
+		c.requestsTotal,
 		prometheus.CounterValue,
 		dhcpPerfs[0].RequestsTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.InformsTotal,
+		c.informsTotal,
 		prometheus.CounterValue,
 		dhcpPerfs[0].InformsTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AcksTotal,
+		c.acksTotal,
 		prometheus.CounterValue,
 		dhcpPerfs[0].AcksTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.NacksTotal,
+		c.nACKsTotal,
 		prometheus.CounterValue,
 		dhcpPerfs[0].NacksTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.DeclinesTotal,
+		c.declinesTotal,
 		prometheus.CounterValue,
 		dhcpPerfs[0].DeclinesTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.ReleasesTotal,
+		c.releasesTotal,
 		prometheus.CounterValue,
 		dhcpPerfs[0].ReleasesTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.OfferQueueLength,
+		c.offerQueueLength,
 		prometheus.GaugeValue,
 		dhcpPerfs[0].OfferQueueLength,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.DeniedDueToMatch,
+		c.deniedDueToMatch,
 		prometheus.CounterValue,
 		dhcpPerfs[0].DeniedDueToMatch,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.DeniedDueToNonMatch,
+		c.deniedDueToNonMatch,
 		prometheus.CounterValue,
 		dhcpPerfs[0].DeniedDueToNonMatch,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.FailoverBndupdSentTotal,
+		c.failoverBndupdSentTotal,
 		prometheus.CounterValue,
 		dhcpPerfs[0].FailoverBndupdSentTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.FailoverBndupdReceivedTotal,
+		c.failoverBndupdReceivedTotal,
 		prometheus.CounterValue,
 		dhcpPerfs[0].FailoverBndupdReceivedTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.FailoverBndackSentTotal,
+		c.failoverBndackSentTotal,
 		prometheus.CounterValue,
 		dhcpPerfs[0].FailoverBndackSentTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.FailoverBndackReceivedTotal,
+		c.failoverBndackReceivedTotal,
 		prometheus.CounterValue,
 		dhcpPerfs[0].FailoverBndackReceivedTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.FailoverBndupdPendingOutboundQueue,
+		c.failoverBndupdPendingOutboundQueue,
 		prometheus.GaugeValue,
 		dhcpPerfs[0].FailoverBndupdPendingOutboundQueue,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.FailoverTransitionsCommunicationinterruptedState,
+		c.failoverTransitionsCommunicationInterruptedState,
 		prometheus.CounterValue,
 		dhcpPerfs[0].FailoverTransitionsCommunicationinterruptedState,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.FailoverTransitionsPartnerdownState,
+		c.failoverTransitionsPartnerDownState,
 		prometheus.CounterValue,
 		dhcpPerfs[0].FailoverTransitionsPartnerdownState,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.FailoverTransitionsRecoverState,
+		c.failoverTransitionsRecoverState,
 		prometheus.CounterValue,
 		dhcpPerfs[0].FailoverTransitionsRecoverState,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.FailoverBndupdDropped,
+		c.failoverBndupdDropped,
 		prometheus.CounterValue,
 		dhcpPerfs[0].FailoverBndupdDropped,
 	)

pkg/collector/diskdrive/diskdrive.go

@@ -23,41 +23,54 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-// A collector is a Prometheus collector for a few WMI metrics in Win32_DiskDrive
-type collector struct {
+// A Collector is a Prometheus Collector for a few WMI metrics in Win32_DiskDrive.
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	DiskInfo     *prometheus.Desc
-	Status       *prometheus.Desc
-	Size         *prometheus.Desc
-	Partitions   *prometheus.Desc
-	Availability *prometheus.Desc
+	availability *prometheus.Desc
+	diskInfo     *prometheus.Desc
+	partitions   *prometheus.Desc
+	size         *prometheus.Desc
+	status       *prometheus.Desc
 }
 
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{}, nil
 }
 
-func (c *collector) Build() error {
-	c.DiskInfo = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.diskInfo = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "info"),
 		"General drive information",
 		[]string{
@@ -68,25 +81,25 @@ func (c *collector) Build() error {
 		},
 		nil,
 	)
-	c.Status = prometheus.NewDesc(
+	c.status = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "status"),
 		"Status of the drive",
 		[]string{"name", "status"},
 		nil,
 	)
-	c.Size = prometheus.NewDesc(
+	c.size = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "size"),
 		"Size of the disk drive. It is calculated by multiplying the total number of cylinders, tracks in each cylinder, sectors in each track, and bytes in each sector.",
 		[]string{"name"},
 		nil,
 	)
-	c.Partitions = prometheus.NewDesc(
+	c.partitions = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "partitions"),
 		"Number of partitions",
 		[]string{"name"},
 		nil,
 	)
-	c.Availability = prometheus.NewDesc(
+	c.availability = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "availability"),
 		"Availability Status",
 		[]string{"name", "availability"},
@@ -96,7 +109,7 @@ func (c *collector) Build() error {
 	return nil
 }
 
-type Win32_DiskDrive struct {
+type win32_DiskDrive struct {
 	DeviceID     string
 	Model        string
 	Size         uint64
@@ -149,33 +162,33 @@ var (
 )
 
 // Collect sends the metric values for each metric to the provided prometheus Metric channel.
-func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ch); err != nil {
-		_ = level.Error(c.logger).Log("msg", "failed collecting disk_drive_info metrics", "desc", desc, "err", err)
+func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collect(ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed collecting disk_drive_info metrics", "err", err)
 		return err
 	}
 	return nil
 }
 
-func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
-	var dst []Win32_DiskDrive
+func (c *Collector) collect(ch chan<- prometheus.Metric) error {
+	var dst []win32_DiskDrive
 
 	if err := wmi.Query(win32DiskQuery, &dst); err != nil {
-		return nil, err
+		return err
 	}
 	if len(dst) == 0 {
-		return nil, errors.New("WMI query returned empty result set")
+		return errors.New("WMI query returned empty result set")
 	}
 
 	for _, disk := range dst {
 		ch <- prometheus.MustNewConstMetric(
-			c.DiskInfo,
+			c.diskInfo,
 			prometheus.GaugeValue,
 			1.0,
-			strings.Trim(disk.DeviceID, "\\.\\"),
+			strings.Trim(disk.DeviceID, "\\.\\"), //nolint:staticcheck
 			strings.TrimRight(disk.Model, " "),
 			strings.TrimRight(disk.Caption, " "),
-			strings.TrimRight(disk.Name, "\\.\\"),
+			strings.TrimRight(disk.Name, "\\.\\"), //nolint:staticcheck
 		)
 
 		for _, status := range allDiskStatus {
@@ -185,26 +198,26 @@ func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, erro
 			}
 
 			ch <- prometheus.MustNewConstMetric(
-				c.Status,
+				c.status,
 				prometheus.GaugeValue,
 				isCurrentState,
-				strings.Trim(disk.Name, "\\.\\"),
+				strings.Trim(disk.Name, "\\.\\"), //nolint:staticcheck
 				status,
 			)
 		}
 
 		ch <- prometheus.MustNewConstMetric(
-			c.Size,
+			c.size,
 			prometheus.GaugeValue,
 			float64(disk.Size),
-			strings.Trim(disk.Name, "\\.\\"),
+			strings.Trim(disk.Name, "\\.\\"), //nolint:staticcheck
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.Partitions,
+			c.partitions,
 			prometheus.GaugeValue,
 			float64(disk.Partitions),
-			strings.Trim(disk.Name, "\\.\\"),
+			strings.Trim(disk.Name, "\\.\\"), //nolint:staticcheck
 		)
 
 		for availNum, val := range availMap {
@@ -213,14 +226,14 @@ func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, erro
 				isCurrentState = 1.0
 			}
 			ch <- prometheus.MustNewConstMetric(
-				c.Availability,
+				c.availability,
 				prometheus.GaugeValue,
 				isCurrentState,
-				strings.Trim(disk.Name, "\\.\\"),
+				strings.Trim(disk.Name, "\\.\\"), //nolint:staticcheck
 				val,
 			)
 		}
 	}
 
-	return nil, nil
+	return nil
 }

pkg/collector/dns/dns.go

@@ -19,184 +19,197 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-// A collector is a Prometheus collector for WMI Win32_PerfRawData_DNS_DNS metrics
-type collector struct {
+// A Collector is a Prometheus Collector for WMI Win32_PerfRawData_DNS_DNS metrics.
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	ZoneTransferRequestsReceived  *prometheus.Desc
-	ZoneTransferRequestsSent      *prometheus.Desc
-	ZoneTransferResponsesReceived *prometheus.Desc
-	ZoneTransferSuccessReceived   *prometheus.Desc
-	ZoneTransferSuccessSent       *prometheus.Desc
-	ZoneTransferFailures          *prometheus.Desc
-	MemoryUsedBytes               *prometheus.Desc
-	DynamicUpdatesQueued          *prometheus.Desc
-	DynamicUpdatesReceived        *prometheus.Desc
-	DynamicUpdatesFailures        *prometheus.Desc
-	NotifyReceived                *prometheus.Desc
-	NotifySent                    *prometheus.Desc
-	SecureUpdateFailures          *prometheus.Desc
-	SecureUpdateReceived          *prometheus.Desc
-	Queries                       *prometheus.Desc
-	Responses                     *prometheus.Desc
-	RecursiveQueries              *prometheus.Desc
-	RecursiveQueryFailures        *prometheus.Desc
-	RecursiveQuerySendTimeouts    *prometheus.Desc
-	WinsQueries                   *prometheus.Desc
-	WinsResponses                 *prometheus.Desc
-	UnmatchedResponsesReceived    *prometheus.Desc
+	dynamicUpdatesFailures        *prometheus.Desc
+	dynamicUpdatesQueued          *prometheus.Desc
+	dynamicUpdatesReceived        *prometheus.Desc
+	memoryUsedBytes               *prometheus.Desc
+	notifyReceived                *prometheus.Desc
+	notifySent                    *prometheus.Desc
+	queries                       *prometheus.Desc
+	recursiveQueries              *prometheus.Desc
+	recursiveQueryFailures        *prometheus.Desc
+	recursiveQuerySendTimeouts    *prometheus.Desc
+	responses                     *prometheus.Desc
+	secureUpdateFailures          *prometheus.Desc
+	secureUpdateReceived          *prometheus.Desc
+	unmatchedResponsesReceived    *prometheus.Desc
+	winsQueries                   *prometheus.Desc
+	winsResponses                 *prometheus.Desc
+	zoneTransferFailures          *prometheus.Desc
+	zoneTransferRequestsReceived  *prometheus.Desc
+	zoneTransferRequestsSent      *prometheus.Desc
+	zoneTransferResponsesReceived *prometheus.Desc
+	zoneTransferSuccessReceived   *prometheus.Desc
+	zoneTransferSuccessSent       *prometheus.Desc
 }
 
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{}, nil
 }
 
-func (c *collector) Build() error {
-	c.ZoneTransferRequestsReceived = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.zoneTransferRequestsReceived = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "zone_transfer_requests_received_total"),
 		"Number of zone transfer requests (AXFR/IXFR) received by the master DNS server",
 		[]string{"qtype"},
 		nil,
 	)
-	c.ZoneTransferRequestsSent = prometheus.NewDesc(
+	c.zoneTransferRequestsSent = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "zone_transfer_requests_sent_total"),
 		"Number of zone transfer requests (AXFR/IXFR) sent by the secondary DNS server",
 		[]string{"qtype"},
 		nil,
 	)
-	c.ZoneTransferResponsesReceived = prometheus.NewDesc(
+	c.zoneTransferResponsesReceived = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "zone_transfer_response_received_total"),
 		"Number of zone transfer responses (AXFR/IXFR) received by the secondary DNS server",
 		[]string{"qtype"},
 		nil,
 	)
-	c.ZoneTransferSuccessReceived = prometheus.NewDesc(
+	c.zoneTransferSuccessReceived = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "zone_transfer_success_received_total"),
 		"Number of successful zone transfers (AXFR/IXFR) received by the secondary DNS server",
 		[]string{"qtype", "protocol"},
 		nil,
 	)
-	c.ZoneTransferSuccessSent = prometheus.NewDesc(
+	c.zoneTransferSuccessSent = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "zone_transfer_success_sent_total"),
 		"Number of successful zone transfers (AXFR/IXFR) of the master DNS server",
 		[]string{"qtype"},
 		nil,
 	)
-	c.ZoneTransferFailures = prometheus.NewDesc(
+	c.zoneTransferFailures = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "zone_transfer_failures_total"),
 		"Number of failed zone transfers of the master DNS server",
 		nil,
 		nil,
 	)
-	c.MemoryUsedBytes = prometheus.NewDesc(
+	c.memoryUsedBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "memory_used_bytes"),
 		"Current memory used by DNS server",
 		[]string{"area"},
 		nil,
 	)
-	c.DynamicUpdatesQueued = prometheus.NewDesc(
+	c.dynamicUpdatesQueued = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "dynamic_updates_queued"),
 		"Number of dynamic updates queued by the DNS server",
 		nil,
 		nil,
 	)
-	c.DynamicUpdatesReceived = prometheus.NewDesc(
+	c.dynamicUpdatesReceived = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "dynamic_updates_received_total"),
 		"Number of secure update requests received by the DNS server",
 		[]string{"operation"},
 		nil,
 	)
-	c.DynamicUpdatesFailures = prometheus.NewDesc(
+	c.dynamicUpdatesFailures = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "dynamic_updates_failures_total"),
 		"Number of dynamic updates which timed out or were rejected by the DNS server",
 		[]string{"reason"},
 		nil,
 	)
-	c.NotifyReceived = prometheus.NewDesc(
+	c.notifyReceived = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "notify_received_total"),
 		"Number of notifies received by the secondary DNS server",
 		nil,
 		nil,
 	)
-	c.NotifySent = prometheus.NewDesc(
+	c.notifySent = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "notify_sent_total"),
 		"Number of notifies sent by the master DNS server",
 		nil,
 		nil,
 	)
-	c.SecureUpdateFailures = prometheus.NewDesc(
+	c.secureUpdateFailures = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "secure_update_failures_total"),
 		"Number of secure updates that failed on the DNS server",
 		nil,
 		nil,
 	)
-	c.SecureUpdateReceived = prometheus.NewDesc(
+	c.secureUpdateReceived = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "secure_update_received_total"),
 		"Number of secure update requests received by the DNS server",
 		nil,
 		nil,
 	)
-	c.Queries = prometheus.NewDesc(
+	c.queries = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "queries_total"),
 		"Number of queries received by DNS server",
 		[]string{"protocol"},
 		nil,
 	)
-	c.Responses = prometheus.NewDesc(
+	c.responses = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "responses_total"),
 		"Number of responses sent by DNS server",
 		[]string{"protocol"},
 		nil,
 	)
-	c.RecursiveQueries = prometheus.NewDesc(
+	c.recursiveQueries = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "recursive_queries_total"),
 		"Number of recursive queries received by DNS server",
 		nil,
 		nil,
 	)
-	c.RecursiveQueryFailures = prometheus.NewDesc(
+	c.recursiveQueryFailures = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "recursive_query_failures_total"),
 		"Number of recursive query failures",
 		nil,
 		nil,
 	)
-	c.RecursiveQuerySendTimeouts = prometheus.NewDesc(
+	c.recursiveQuerySendTimeouts = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "recursive_query_send_timeouts_total"),
 		"Number of recursive query sending timeouts",
 		nil,
 		nil,
 	)
-	c.WinsQueries = prometheus.NewDesc(
+	c.winsQueries = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "wins_queries_total"),
 		"Number of WINS lookup requests received by the server",
 		[]string{"direction"},
 		nil,
 	)
-	c.WinsResponses = prometheus.NewDesc(
+	c.winsResponses = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "wins_responses_total"),
 		"Number of WINS lookup responses sent by the server",
 		[]string{"direction"},
 		nil,
 	)
-	c.UnmatchedResponsesReceived = prometheus.NewDesc(
+	c.unmatchedResponsesReceived = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "unmatched_responses_total"),
 		"Number of response packets received by the DNS server that do not match any outstanding remote query",
 		nil,
@@ -207,9 +220,9 @@ func (c *collector) Build() error {
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ch); err != nil {
-		_ = level.Error(c.logger).Log("msg", "failed collecting dns metrics", "desc", desc, "err", err)
+func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collect(ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed collecting dns metrics", "err", err)
 		return err
 	}
 	return nil
@@ -261,77 +274,77 @@ type Win32_PerfRawData_DNS_DNS struct {
 	ZoneTransferSOARequestSent     uint32
 }
 
-func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *Collector) collect(ch chan<- prometheus.Metric) error {
 	var dst []Win32_PerfRawData_DNS_DNS
 	q := wmi.QueryAll(&dst, c.logger)
 	if err := wmi.Query(q, &dst); err != nil {
-		return nil, err
+		return err
 	}
 	if len(dst) == 0 {
-		return nil, errors.New("WMI query returned empty result set")
+		return errors.New("WMI query returned empty result set")
 	}
 
 	ch <- prometheus.MustNewConstMetric(
-		c.ZoneTransferRequestsReceived,
+		c.zoneTransferRequestsReceived,
 		prometheus.CounterValue,
 		float64(dst[0].AXFRRequestReceived),
 		"full",
 	)
 	ch <- prometheus.MustNewConstMetric(
-		c.ZoneTransferRequestsReceived,
+		c.zoneTransferRequestsReceived,
 		prometheus.CounterValue,
 		float64(dst[0].IXFRRequestReceived),
 		"incremental",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.ZoneTransferRequestsSent,
+		c.zoneTransferRequestsSent,
 		prometheus.CounterValue,
 		float64(dst[0].AXFRRequestSent),
 		"full",
 	)
 	ch <- prometheus.MustNewConstMetric(
-		c.ZoneTransferRequestsSent,
+		c.zoneTransferRequestsSent,
 		prometheus.CounterValue,
 		float64(dst[0].IXFRRequestSent),
 		"incremental",
 	)
 	ch <- prometheus.MustNewConstMetric(
-		c.ZoneTransferRequestsSent,
+		c.zoneTransferRequestsSent,
 		prometheus.CounterValue,
 		float64(dst[0].ZoneTransferSOARequestSent),
 		"soa",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.ZoneTransferResponsesReceived,
+		c.zoneTransferResponsesReceived,
 		prometheus.CounterValue,
 		float64(dst[0].AXFRResponseReceived),
 		"full",
 	)
 	ch <- prometheus.MustNewConstMetric(
-		c.ZoneTransferResponsesReceived,
+		c.zoneTransferResponsesReceived,
 		prometheus.CounterValue,
 		float64(dst[0].IXFRResponseReceived),
 		"incremental",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.ZoneTransferSuccessReceived,
+		c.zoneTransferSuccessReceived,
 		prometheus.CounterValue,
 		float64(dst[0].AXFRSuccessReceived),
 		"full",
 		"tcp",
 	)
 	ch <- prometheus.MustNewConstMetric(
-		c.ZoneTransferSuccessReceived,
+		c.zoneTransferSuccessReceived,
 		prometheus.CounterValue,
 		float64(dst[0].IXFRTCPSuccessReceived),
 		"incremental",
 		"tcp",
 	)
 	ch <- prometheus.MustNewConstMetric(
-		c.ZoneTransferSuccessReceived,
+		c.zoneTransferSuccessReceived,
 		prometheus.CounterValue,
 		float64(dst[0].IXFRTCPSuccessReceived),
 		"incremental",
@@ -339,186 +352,186 @@ func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, erro
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.ZoneTransferSuccessSent,
+		c.zoneTransferSuccessSent,
 		prometheus.CounterValue,
 		float64(dst[0].AXFRSuccessSent),
 		"full",
 	)
 	ch <- prometheus.MustNewConstMetric(
-		c.ZoneTransferSuccessSent,
+		c.zoneTransferSuccessSent,
 		prometheus.CounterValue,
 		float64(dst[0].IXFRSuccessSent),
 		"incremental",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.ZoneTransferFailures,
+		c.zoneTransferFailures,
 		prometheus.CounterValue,
 		float64(dst[0].ZoneTransferFailure),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.MemoryUsedBytes,
+		c.memoryUsedBytes,
 		prometheus.GaugeValue,
 		float64(dst[0].CachingMemory),
 		"caching",
 	)
 	ch <- prometheus.MustNewConstMetric(
-		c.MemoryUsedBytes,
+		c.memoryUsedBytes,
 		prometheus.GaugeValue,
 		float64(dst[0].DatabaseNodeMemory),
 		"database_node",
 	)
 	ch <- prometheus.MustNewConstMetric(
-		c.MemoryUsedBytes,
+		c.memoryUsedBytes,
 		prometheus.GaugeValue,
 		float64(dst[0].NbstatMemory),
 		"nbstat",
 	)
 	ch <- prometheus.MustNewConstMetric(
-		c.MemoryUsedBytes,
+		c.memoryUsedBytes,
 		prometheus.GaugeValue,
 		float64(dst[0].RecordFlowMemory),
 		"record_flow",
 	)
 	ch <- prometheus.MustNewConstMetric(
-		c.MemoryUsedBytes,
+		c.memoryUsedBytes,
 		prometheus.GaugeValue,
 		float64(dst[0].TCPMessageMemory),
 		"tcp_message",
 	)
 	ch <- prometheus.MustNewConstMetric(
-		c.MemoryUsedBytes,
+		c.memoryUsedBytes,
 		prometheus.GaugeValue,
 		float64(dst[0].UDPMessageMemory),
 		"udp_message",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.DynamicUpdatesReceived,
+		c.dynamicUpdatesReceived,
 		prometheus.CounterValue,
 		float64(dst[0].DynamicUpdateNoOperation),
 		"noop",
 	)
 	ch <- prometheus.MustNewConstMetric(
-		c.DynamicUpdatesReceived,
+		c.dynamicUpdatesReceived,
 		prometheus.CounterValue,
 		float64(dst[0].DynamicUpdateWrittentoDatabase),
 		"written",
 	)
 	ch <- prometheus.MustNewConstMetric(
-		c.DynamicUpdatesQueued,
+		c.dynamicUpdatesQueued,
 		prometheus.GaugeValue,
 		float64(dst[0].DynamicUpdateQueued),
 	)
 	ch <- prometheus.MustNewConstMetric(
-		c.DynamicUpdatesFailures,
+		c.dynamicUpdatesFailures,
 		prometheus.CounterValue,
 		float64(dst[0].DynamicUpdateRejected),
 		"rejected",
 	)
 	ch <- prometheus.MustNewConstMetric(
-		c.DynamicUpdatesFailures,
+		c.dynamicUpdatesFailures,
 		prometheus.CounterValue,
 		float64(dst[0].DynamicUpdateTimeOuts),
 		"timeout",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.NotifyReceived,
+		c.notifyReceived,
 		prometheus.CounterValue,
 		float64(dst[0].NotifyReceived),
 	)
 	ch <- prometheus.MustNewConstMetric(
-		c.NotifySent,
+		c.notifySent,
 		prometheus.CounterValue,
 		float64(dst[0].NotifySent),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.RecursiveQueries,
+		c.recursiveQueries,
 		prometheus.CounterValue,
 		float64(dst[0].RecursiveQueries),
 	)
 	ch <- prometheus.MustNewConstMetric(
-		c.RecursiveQueryFailures,
+		c.recursiveQueryFailures,
 		prometheus.CounterValue,
 		float64(dst[0].RecursiveQueryFailure),
 	)
 	ch <- prometheus.MustNewConstMetric(
-		c.RecursiveQuerySendTimeouts,
+		c.recursiveQuerySendTimeouts,
 		prometheus.CounterValue,
 		float64(dst[0].RecursiveSendTimeOuts),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.Queries,
+		c.queries,
 		prometheus.CounterValue,
 		float64(dst[0].TCPQueryReceived),
 		"tcp",
 	)
 	ch <- prometheus.MustNewConstMetric(
-		c.Queries,
+		c.queries,
 		prometheus.CounterValue,
 		float64(dst[0].UDPQueryReceived),
 		"udp",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.Responses,
+		c.responses,
 		prometheus.CounterValue,
 		float64(dst[0].TCPResponseSent),
 		"tcp",
 	)
 	ch <- prometheus.MustNewConstMetric(
-		c.Responses,
+		c.responses,
 		prometheus.CounterValue,
 		float64(dst[0].UDPResponseSent),
 		"udp",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.UnmatchedResponsesReceived,
+		c.unmatchedResponsesReceived,
 		prometheus.CounterValue,
 		float64(dst[0].UnmatchedResponsesReceived),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.WinsQueries,
+		c.winsQueries,
 		prometheus.CounterValue,
 		float64(dst[0].WINSLookupReceived),
 		"forward",
 	)
 	ch <- prometheus.MustNewConstMetric(
-		c.WinsQueries,
+		c.winsQueries,
 		prometheus.CounterValue,
 		float64(dst[0].WINSReverseLookupReceived),
 		"reverse",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.WinsResponses,
+		c.winsResponses,
 		prometheus.CounterValue,
 		float64(dst[0].WINSResponseSent),
 		"forward",
 	)
 	ch <- prometheus.MustNewConstMetric(
-		c.WinsResponses,
+		c.winsResponses,
 		prometheus.CounterValue,
 		float64(dst[0].WINSReverseResponseSent),
 		"reverse",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.SecureUpdateFailures,
+		c.secureUpdateFailures,
 		prometheus.CounterValue,
 		float64(dst[0].SecureUpdateFailure),
 	)
 	ch <- prometheus.MustNewConstMetric(
-		c.SecureUpdateReceived,
+		c.secureUpdateReceived,
 		prometheus.CounterValue,
 		float64(dst[0].SecureUpdateReceived),
 	)
 
-	return nil, nil
+	return nil
 }

pkg/collector/exchange/exchange.go

@@ -13,123 +13,161 @@ import (
 	"github.com/go-kit/log/level"
 	"github.com/prometheus-community/windows_exporter/pkg/perflib"
 	"github.com/prometheus-community/windows_exporter/pkg/types"
-	"github.com/prometheus-community/windows_exporter/pkg/utils"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-const (
-	Name                          = "exchange"
-	FlagExchangeListAllCollectors = "collectors.exchange.list"
-	FlagExchangeCollectorsEnabled = "collectors.exchange.enabled"
-)
+const Name = "exchange"
 
 type Config struct {
-	CollectorsEnabled string `yaml:"collectors_enabled"`
+	CollectorsEnabled []string `yaml:"collectors_enabled"`
 }
 
 var ConfigDefaults = Config{
-	CollectorsEnabled: "",
+	CollectorsEnabled: []string{
+		"ADAccessProcesses",
+		"TransportQueues",
+		"HttpProxy",
+		"ActiveSync",
+		"AvailabilityService",
+		"OutlookWebAccess",
+		"Autodiscover",
+		"WorkloadManagement",
+		"RpcClientAccess",
+		"MapiHttpEmsmdb",
+	},
 }
 
-type collector struct {
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	exchangeListAllCollectors *bool
-	exchangeCollectorsEnabled *string
-
-	LDAPReadTime                            *prometheus.Desc
-	LDAPSearchTime                          *prometheus.Desc
-	LDAPWriteTime                           *prometheus.Desc
-	LDAPTimeoutErrorsPerSec                 *prometheus.Desc
-	LongRunningLDAPOperationsPerMin         *prometheus.Desc
-	ExternalActiveRemoteDeliveryQueueLength *prometheus.Desc
-	InternalActiveRemoteDeliveryQueueLength *prometheus.Desc
-	ActiveMailboxDeliveryQueueLength        *prometheus.Desc
-	RetryMailboxDeliveryQueueLength         *prometheus.Desc
-	UnreachableQueueLength                  *prometheus.Desc
-	ExternalLargestDeliveryQueueLength      *prometheus.Desc
-	InternalLargestDeliveryQueueLength      *prometheus.Desc
-	PoisonQueueLength                       *prometheus.Desc
-	MailboxServerLocatorAverageLatency      *prometheus.Desc
-	AverageAuthenticationLatency            *prometheus.Desc
-	AverageCASProcessingLatency             *prometheus.Desc
-	MailboxServerProxyFailureRate           *prometheus.Desc
-	OutstandingProxyRequests                *prometheus.Desc
-	ProxyRequestsPerSec                     *prometheus.Desc
-	ActiveSyncRequestsPerSec                *prometheus.Desc
-	PingCommandsPending                     *prometheus.Desc
-	SyncCommandsPerSec                      *prometheus.Desc
-	AvailabilityRequestsSec                 *prometheus.Desc
-	CurrentUniqueUsers                      *prometheus.Desc
-	OWARequestsPerSec                       *prometheus.Desc
-	AutodiscoverRequestsPerSec              *prometheus.Desc
-	ActiveTasks                             *prometheus.Desc
-	CompletedTasks                          *prometheus.Desc
-	QueuedTasks                             *prometheus.Desc
-	YieldedTasks                            *prometheus.Desc
-	IsActive                                *prometheus.Desc
-	RPCAveragedLatency                      *prometheus.Desc
-	RPCRequests                             *prometheus.Desc
-	ActiveUserCount                         *prometheus.Desc
-	ConnectionCount                         *prometheus.Desc
-	RPCOperationsPerSec                     *prometheus.Desc
-	UserCount                               *prometheus.Desc
-	ActiveUserCountMapiHttpEmsmdb           *prometheus.Desc
+	activeMailboxDeliveryQueueLength        *prometheus.Desc
+	activeSyncRequestsPerSec                *prometheus.Desc
+	activeTasks                             *prometheus.Desc
+	activeUserCount                         *prometheus.Desc
+	activeUserCountMapiHttpEmsMDB           *prometheus.Desc
+	autoDiscoverRequestsPerSec              *prometheus.Desc
+	availabilityRequestsSec                 *prometheus.Desc
+	averageAuthenticationLatency            *prometheus.Desc
+	averageCASProcessingLatency             *prometheus.Desc
+	completedTasks                          *prometheus.Desc
+	connectionCount                         *prometheus.Desc
+	currentUniqueUsers                      *prometheus.Desc
+	externalActiveRemoteDeliveryQueueLength *prometheus.Desc
+	externalLargestDeliveryQueueLength      *prometheus.Desc
+	internalActiveRemoteDeliveryQueueLength *prometheus.Desc
+	internalLargestDeliveryQueueLength      *prometheus.Desc
+	isActive                                *prometheus.Desc
+	ldapReadTime                            *prometheus.Desc
+	ldapSearchTime                          *prometheus.Desc
+	ldapTimeoutErrorsPerSec                 *prometheus.Desc
+	ldapWriteTime                           *prometheus.Desc
+	longRunningLDAPOperationsPerMin         *prometheus.Desc
+	mailboxServerLocatorAverageLatency      *prometheus.Desc
+	mailboxServerProxyFailureRate           *prometheus.Desc
+	outstandingProxyRequests                *prometheus.Desc
+	owaRequestsPerSec                       *prometheus.Desc
+	pingCommandsPending                     *prometheus.Desc
+	poisonQueueLength                       *prometheus.Desc
+	proxyRequestsPerSec                     *prometheus.Desc
+	queuedTasks                             *prometheus.Desc
+	retryMailboxDeliveryQueueLength         *prometheus.Desc
+	rpcAveragedLatency                      *prometheus.Desc
+	rpcOperationsPerSec                     *prometheus.Desc
+	rpcRequests                             *prometheus.Desc
+	syncCommandsPerSec                      *prometheus.Desc
+	unreachableQueueLength                  *prometheus.Desc
+	userCount                               *prometheus.Desc
+	yieldedTasks                            *prometheus.Desc
 
 	enabledCollectors []string
 }
 
-// All available collector functions
-var exchangeAllCollectorNames = []string{
-	"ADAccessProcesses",
-	"TransportQueues",
-	"HttpProxy",
-	"ActiveSync",
-	"AvailabilityService",
-	"OutlookWebAccess",
-	"Autodiscover",
-	"WorkloadManagement",
-	"RpcClientAccess",
-	"MapiHttpEmsmdb",
-}
-
-func New(logger log.Logger, config *Config) types.Collector {
+func New(logger log.Logger, config *Config) *Collector {
 	if config == nil {
 		config = &ConfigDefaults
 	}
 
-	exchangeListAllCollectors := false
-	c := &collector{
-		exchangeCollectorsEnabled: &config.CollectorsEnabled,
-		exchangeListAllCollectors: &exchangeListAllCollectors,
+	if config.CollectorsEnabled == nil {
+		config.CollectorsEnabled = ConfigDefaults.CollectorsEnabled
 	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(app *kingpin.Application) types.Collector {
-	return &collector{
-		exchangeListAllCollectors: app.Flag(
-			FlagExchangeListAllCollectors,
-			"List the collectors along with their perflib object name/ids",
-		).Bool(),
-
-		exchangeCollectorsEnabled: app.Flag(
-			FlagExchangeCollectorsEnabled,
-			"Comma-separated list of collectors to use. Defaults to all, if not specified.",
-		).Default(ConfigDefaults.CollectorsEnabled).String(),
+func NewWithFlags(app *kingpin.Application) *Collector {
+	c := &Collector{
+		config: ConfigDefaults,
 	}
+	c.config.CollectorsEnabled = make([]string, 0)
+
+	var listAllCollectors bool
+	var collectorsEnabled string
+
+	app.Flag(
+		"collectors.exchange.list",
+		"List the collectors along with their perflib object name/ids",
+	).BoolVar(&listAllCollectors)
+
+	app.Flag(
+		"collectors.exchange.enabled",
+		"Comma-separated list of collectors to use. Defaults to all, if not specified.",
+	).Default(strings.Join(ConfigDefaults.CollectorsEnabled, ",")).StringVar(&collectorsEnabled)
+
+	app.PreAction(func(*kingpin.ParseContext) error {
+		if listAllCollectors {
+			collectorDesc := map[string]string{
+				"ADAccessProcesses":   "[19108] MSExchange ADAccess Processes",
+				"TransportQueues":     "[20524] MSExchangeTransport Queues",
+				"HttpProxy":           "[36934] MSExchange HttpProxy",
+				"ActiveSync":          "[25138] MSExchange ActiveSync",
+				"AvailabilityService": "[24914] MSExchange Availability Service",
+				"OutlookWebAccess":    "[24618] MSExchange OWA",
+				"Autodiscover":        "[29240] MSExchange Autodiscover",
+				"WorkloadManagement":  "[19430] MSExchange WorkloadManagement Workloads",
+				"RpcClientAccess":     "[29336] MSExchange RpcClientAccess",
+				"MapiHttpEmsmdb":      "[26463] MSExchange MapiHttp Emsmdb",
+			}
+
+			sb := strings.Builder{}
+			sb.WriteString(fmt.Sprintf("%-32s %-32s\n", "Collector Name", "[PerfID] Perflib Object"))
+
+			for _, cname := range ConfigDefaults.CollectorsEnabled {
+				sb.WriteString(fmt.Sprintf("%-32s %-32s\n", cname, collectorDesc[cname]))
+			}
+
+			app.UsageTemplate(sb.String()).Usage(nil)
+
+			os.Exit(0)
+		}
+
+		return nil
+	})
+
+	app.Action(func(*kingpin.ParseContext) error {
+		c.config.CollectorsEnabled = strings.Split(collectorsEnabled, ",")
+
+		return nil
+	})
+
+	return c
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{
 		"MSExchange ADAccess Processes",
 		"MSExchangeTransport Queues",
@@ -144,7 +182,11 @@ func (c *collector) GetPerfCounter() ([]string, error) {
 	}, nil
 }
 
-func (c *collector) Build() error {
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
 	// desc creates a new prometheus description
 	desc := func(metricName string, description string, labels ...string) *prometheus.Desc {
 		return prometheus.NewDesc(
@@ -155,87 +197,62 @@ func (c *collector) Build() error {
 		)
 	}
 
-	c.RPCAveragedLatency = desc("rpc_avg_latency_sec", "The latency (sec) averaged for the past 1024 packets")
-	c.RPCRequests = desc("rpc_requests", "Number of client requests currently being processed by  the RPC Client Access service")
-	c.ActiveUserCount = desc("rpc_active_user_count", "Number of unique users that have shown some kind of activity in the last 2 minutes")
-	c.ConnectionCount = desc("rpc_connection_count", "Total number of client connections maintained")
-	c.RPCOperationsPerSec = desc("rpc_operations_total", "The rate at which RPC operations occur")
-	c.UserCount = desc("rpc_user_count", "Number of users")
-	c.LDAPReadTime = desc("ldap_read_time_sec", "Time (sec) to send an LDAP read request and receive a response", "name")
-	c.LDAPSearchTime = desc("ldap_search_time_sec", "Time (sec) to send an LDAP search request and receive a response", "name")
-	c.LDAPWriteTime = desc("ldap_write_time_sec", "Time (sec) to send an LDAP Add/Modify/Delete request and receive a response", "name")
-	c.LDAPTimeoutErrorsPerSec = desc("ldap_timeout_errors_total", "Total number of LDAP timeout errors", "name")
-	c.LongRunningLDAPOperationsPerMin = desc("ldap_long_running_ops_per_sec", "Long Running LDAP operations per second", "name")
-	c.ExternalActiveRemoteDeliveryQueueLength = desc("transport_queues_external_active_remote_delivery", "External Active Remote Delivery Queue length", "name")
-	c.InternalActiveRemoteDeliveryQueueLength = desc("transport_queues_internal_active_remote_delivery", "Internal Active Remote Delivery Queue length", "name")
-	c.ActiveMailboxDeliveryQueueLength = desc("transport_queues_active_mailbox_delivery", "Active Mailbox Delivery Queue length", "name")
-	c.RetryMailboxDeliveryQueueLength = desc("transport_queues_retry_mailbox_delivery", "Retry Mailbox Delivery Queue length", "name")
-	c.UnreachableQueueLength = desc("transport_queues_unreachable", "Unreachable Queue length", "name")
-	c.ExternalLargestDeliveryQueueLength = desc("transport_queues_external_largest_delivery", "External Largest Delivery Queue length", "name")
-	c.InternalLargestDeliveryQueueLength = desc("transport_queues_internal_largest_delivery", "Internal Largest Delivery Queue length", "name")
-	c.PoisonQueueLength = desc("transport_queues_poison", "Poison Queue length", "name")
-	c.MailboxServerLocatorAverageLatency = desc("http_proxy_mailbox_server_locator_avg_latency_sec", "Average latency (sec) of MailboxServerLocator web service calls", "name")
-	c.AverageAuthenticationLatency = desc("http_proxy_avg_auth_latency", "Average time spent authenticating CAS requests over the last 200 samples", "name")
-	c.OutstandingProxyRequests = desc("http_proxy_outstanding_proxy_requests", "Number of concurrent outstanding proxy requests", "name")
-	c.ProxyRequestsPerSec = desc("http_proxy_requests_total", "Number of proxy requests processed each second", "name")
-	c.AvailabilityRequestsSec = desc("avail_service_requests_per_sec", "Number of requests serviced per second")
-	c.CurrentUniqueUsers = desc("owa_current_unique_users", "Number of unique users currently logged on to Outlook Web App")
-	c.OWARequestsPerSec = desc("owa_requests_total", "Number of requests handled by Outlook Web App per second")
-	c.AutodiscoverRequestsPerSec = desc("autodiscover_requests_total", "Number of autodiscover service requests processed each second")
-	c.ActiveTasks = desc("workload_active_tasks", "Number of active tasks currently running in the background for workload management", "name")
-	c.CompletedTasks = desc("workload_completed_tasks", "Number of workload management tasks that have been completed", "name")
-	c.QueuedTasks = desc("workload_queued_tasks", "Number of workload management tasks that are currently queued up waiting to be processed", "name")
-	c.YieldedTasks = desc("workload_yielded_tasks", "The total number of tasks that have been yielded by a workload", "name")
-	c.IsActive = desc("workload_is_active", "Active indicates whether the workload is in an active (1) or paused (0) state", "name")
-	c.ActiveSyncRequestsPerSec = desc("activesync_requests_total", "Num HTTP requests received from the client via ASP.NET per sec. Shows Current user load")
-	c.AverageCASProcessingLatency = desc("http_proxy_avg_cas_proccessing_latency_sec", "Average latency (sec) of CAS processing time over the last 200 reqs", "name")
-	c.MailboxServerProxyFailureRate = desc("http_proxy_mailbox_proxy_failure_rate", "% of failures between this CAS and MBX servers over the last 200 samples", "name")
-	c.PingCommandsPending = desc("activesync_ping_cmds_pending", "Number of ping commands currently pending in the queue")
-	c.SyncCommandsPerSec = desc("activesync_sync_cmds_total", "Number of sync commands processed per second. Clients use this command to synchronize items within a folder")
-	c.ActiveUserCountMapiHttpEmsmdb = desc("mapihttp_emsmdb_active_user_count", "Number of unique outlook users that have shown some kind of activity in the last 2 minutes")
+	c.rpcAveragedLatency = desc("rpc_avg_latency_sec", "The latency (sec) averaged for the past 1024 packets")
+	c.rpcRequests = desc("rpc_requests", "Number of client requests currently being processed by  the RPC Client Access service")
+	c.activeUserCount = desc("rpc_active_user_count", "Number of unique users that have shown some kind of activity in the last 2 minutes")
+	c.connectionCount = desc("rpc_connection_count", "Total number of client connections maintained")
+	c.rpcOperationsPerSec = desc("rpc_operations_total", "The rate at which RPC operations occur")
+	c.userCount = desc("rpc_user_count", "Number of users")
+	c.ldapReadTime = desc("ldap_read_time_sec", "Time (sec) to send an LDAP read request and receive a response", "name")
+	c.ldapSearchTime = desc("ldap_search_time_sec", "Time (sec) to send an LDAP search request and receive a response", "name")
+	c.ldapWriteTime = desc("ldap_write_time_sec", "Time (sec) to send an LDAP Add/Modify/Delete request and receive a response", "name")
+	c.ldapTimeoutErrorsPerSec = desc("ldap_timeout_errors_total", "Total number of LDAP timeout errors", "name")
+	c.longRunningLDAPOperationsPerMin = desc("ldap_long_running_ops_per_sec", "Long Running LDAP operations per second", "name")
+	c.externalActiveRemoteDeliveryQueueLength = desc("transport_queues_external_active_remote_delivery", "External Active Remote Delivery Queue length", "name")
+	c.internalActiveRemoteDeliveryQueueLength = desc("transport_queues_internal_active_remote_delivery", "Internal Active Remote Delivery Queue length", "name")
+	c.activeMailboxDeliveryQueueLength = desc("transport_queues_active_mailbox_delivery", "Active Mailbox Delivery Queue length", "name")
+	c.retryMailboxDeliveryQueueLength = desc("transport_queues_retry_mailbox_delivery", "Retry Mailbox Delivery Queue length", "name")
+	c.unreachableQueueLength = desc("transport_queues_unreachable", "Unreachable Queue length", "name")
+	c.externalLargestDeliveryQueueLength = desc("transport_queues_external_largest_delivery", "External Largest Delivery Queue length", "name")
+	c.internalLargestDeliveryQueueLength = desc("transport_queues_internal_largest_delivery", "Internal Largest Delivery Queue length", "name")
+	c.poisonQueueLength = desc("transport_queues_poison", "Poison Queue length", "name")
+	c.mailboxServerLocatorAverageLatency = desc("http_proxy_mailbox_server_locator_avg_latency_sec", "Average latency (sec) of MailboxServerLocator web service calls", "name")
+	c.averageAuthenticationLatency = desc("http_proxy_avg_auth_latency", "Average time spent authenticating CAS requests over the last 200 samples", "name")
+	c.outstandingProxyRequests = desc("http_proxy_outstanding_proxy_requests", "Number of concurrent outstanding proxy requests", "name")
+	c.proxyRequestsPerSec = desc("http_proxy_requests_total", "Number of proxy requests processed each second", "name")
+	c.availabilityRequestsSec = desc("avail_service_requests_per_sec", "Number of requests serviced per second")
+	c.currentUniqueUsers = desc("owa_current_unique_users", "Number of unique users currently logged on to Outlook Web App")
+	c.owaRequestsPerSec = desc("owa_requests_total", "Number of requests handled by Outlook Web App per second")
+	c.autoDiscoverRequestsPerSec = desc("autodiscover_requests_total", "Number of autodiscover service requests processed each second")
+	c.activeTasks = desc("workload_active_tasks", "Number of active tasks currently running in the background for workload management", "name")
+	c.completedTasks = desc("workload_completed_tasks", "Number of workload management tasks that have been completed", "name")
+	c.queuedTasks = desc("workload_queued_tasks", "Number of workload management tasks that are currently queued up waiting to be processed", "name")
+	c.yieldedTasks = desc("workload_yielded_tasks", "The total number of tasks that have been yielded by a workload", "name")
+	c.isActive = desc("workload_is_active", "Active indicates whether the workload is in an active (1) or paused (0) state", "name")
+	c.activeSyncRequestsPerSec = desc("activesync_requests_total", "Num HTTP requests received from the client via ASP.NET per sec. Shows Current user load")
+	c.averageCASProcessingLatency = desc("http_proxy_avg_cas_processing_latency_sec", "Average latency (sec) of CAS processing time over the last 200 reqs", "name")
+	c.mailboxServerProxyFailureRate = desc("http_proxy_mailbox_proxy_failure_rate", "% of failures between this CAS and MBX servers over the last 200 samples", "name")
+	c.pingCommandsPending = desc("activesync_ping_cmds_pending", "Number of ping commands currently pending in the queue")
+	c.syncCommandsPerSec = desc("activesync_sync_cmds_total", "Number of sync commands processed per second. Clients use this command to synchronize items within a folder")
+	c.activeUserCountMapiHttpEmsMDB = desc("mapihttp_emsmdb_active_user_count", "Number of unique outlook users that have shown some kind of activity in the last 2 minutes")
 
-	c.enabledCollectors = make([]string, 0, len(exchangeAllCollectorNames))
+	c.enabledCollectors = make([]string, 0, len(ConfigDefaults.CollectorsEnabled))
 
-	collectorDesc := map[string]string{
-		"ADAccessProcesses":   "[19108] MSExchange ADAccess Processes",
-		"TransportQueues":     "[20524] MSExchangeTransport Queues",
-		"HttpProxy":           "[36934] MSExchange HttpProxy",
-		"ActiveSync":          "[25138] MSExchange ActiveSync",
-		"AvailabilityService": "[24914] MSExchange Availability Service",
-		"OutlookWebAccess":    "[24618] MSExchange OWA",
-		"Autodiscover":        "[29240] MSExchange Autodiscover",
-		"WorkloadManagement":  "[19430] MSExchange WorkloadManagement Workloads",
-		"RpcClientAccess":     "[29336] MSExchange RpcClientAccess",
-		"MapiHttpEmsmdb":      "[26463] MSExchange MapiHttp Emsmdb",
+	for _, collectorName := range c.config.CollectorsEnabled {
+		if !slices.Contains(ConfigDefaults.CollectorsEnabled, collectorName) {
+			return fmt.Errorf("unknown exchange collector: %s", collectorName)
+		}
+
+		c.enabledCollectors = append(c.enabledCollectors, collectorName)
 	}
 
-	if *c.exchangeListAllCollectors {
-		fmt.Printf("%-32s %-32s\n", "Collector Name", "[PerfID] Perflib Object")
-		for _, cname := range exchangeAllCollectorNames {
-			fmt.Printf("%-32s %-32s\n", cname, collectorDesc[cname])
-		}
-		os.Exit(0)
-	}
-
-	if utils.IsEmpty(c.exchangeCollectorsEnabled) {
-		for _, collectorName := range exchangeAllCollectorNames {
-			c.enabledCollectors = append(c.enabledCollectors, collectorName)
-		}
-	} else {
-		for _, collectorName := range strings.Split(*c.exchangeCollectorsEnabled, ",") {
-			if slices.Contains(exchangeAllCollectorNames, collectorName) {
-				c.enabledCollectors = append(c.enabledCollectors, collectorName)
-			} else {
-				return fmt.Errorf("unknown exchange collector: %s", collectorName)
-			}
-		}
-	}
+	c.enabledCollectors = slices.Clip(c.enabledCollectors)
 
 	return nil
 }
 
-// Collect collects exchange metrics and sends them to prometheus
-func (c *collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+// Collect collects exchange metrics and sends them to prometheus.
+func (c *Collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	collectorFuncs := map[string]func(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error{
 		"ADAccessProcesses":   c.collectADAccessProcesses,
 		"TransportQueues":     c.collectTransportQueues,
@@ -258,7 +275,7 @@ func (c *collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metri
 	return nil
 }
 
-// Perflib: [19108] MSExchange ADAccess Processes
+// Perflib: [19108] MSExchange ADAccess Processes.
 type perflibADAccessProcesses struct {
 	Name string
 
@@ -269,7 +286,7 @@ type perflibADAccessProcesses struct {
 	LongRunningLDAPOperationsPerMin float64 `perflib:"Long Running LDAP Operations/min"`
 }
 
-func (c *collector) collectADAccessProcesses(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+func (c *Collector) collectADAccessProcesses(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	var data []perflibADAccessProcesses
 	if err := perflib.UnmarshalObject(ctx.PerfObjects["MSExchange ADAccess Processes"], &data, c.logger); err != nil {
 		return err
@@ -289,31 +306,31 @@ func (c *collector) collectADAccessProcesses(ctx *types.ScrapeContext, ch chan<-
 			labelName = fmt.Sprintf("%s_%d", labelName, labelUseCount[labelName])
 		}
 		ch <- prometheus.MustNewConstMetric(
-			c.LDAPReadTime,
+			c.ldapReadTime,
 			prometheus.CounterValue,
 			c.msToSec(proc.LDAPReadTime),
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.LDAPSearchTime,
+			c.ldapSearchTime,
 			prometheus.CounterValue,
 			c.msToSec(proc.LDAPSearchTime),
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.LDAPWriteTime,
+			c.ldapWriteTime,
 			prometheus.CounterValue,
 			c.msToSec(proc.LDAPWriteTime),
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.LDAPTimeoutErrorsPerSec,
+			c.ldapTimeoutErrorsPerSec,
 			prometheus.CounterValue,
 			proc.LDAPTimeoutErrorsPerSec,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.LongRunningLDAPOperationsPerMin,
+			c.longRunningLDAPOperationsPerMin,
 			prometheus.CounterValue,
 			proc.LongRunningLDAPOperationsPerMin*60,
 			labelName,
@@ -322,12 +339,12 @@ func (c *collector) collectADAccessProcesses(ctx *types.ScrapeContext, ch chan<-
 	return nil
 }
 
-// Perflib: [24914] MSExchange Availability Service
+// Perflib: [24914] MSExchange Availability Service.
 type perflibAvailabilityService struct {
 	RequestsSec float64 `perflib:"Availability Requests (sec)"`
 }
 
-func (c *collector) collectAvailabilityService(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+func (c *Collector) collectAvailabilityService(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	var data []perflibAvailabilityService
 	if err := perflib.UnmarshalObject(ctx.PerfObjects["MSExchange Availability Service"], &data, c.logger); err != nil {
 		return err
@@ -335,7 +352,7 @@ func (c *collector) collectAvailabilityService(ctx *types.ScrapeContext, ch chan
 
 	for _, availservice := range data {
 		ch <- prometheus.MustNewConstMetric(
-			c.AvailabilityRequestsSec,
+			c.availabilityRequestsSec,
 			prometheus.CounterValue,
 			availservice.RequestsSec,
 		)
@@ -343,7 +360,7 @@ func (c *collector) collectAvailabilityService(ctx *types.ScrapeContext, ch chan
 	return nil
 }
 
-// Perflib: [36934] MSExchange HttpProxy
+// Perflib: [36934] MSExchange HttpProxy.
 type perflibHTTPProxy struct {
 	Name string
 
@@ -355,7 +372,7 @@ type perflibHTTPProxy struct {
 	ProxyRequestsPerSec                float64 `perflib:"Proxy Requests/Sec"`
 }
 
-func (c *collector) collectHTTPProxy(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+func (c *Collector) collectHTTPProxy(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	var data []perflibHTTPProxy
 	if err := perflib.UnmarshalObject(ctx.PerfObjects["MSExchange HttpProxy"], &data, c.logger); err != nil {
 		return err
@@ -364,37 +381,37 @@ func (c *collector) collectHTTPProxy(ctx *types.ScrapeContext, ch chan<- prometh
 	for _, instance := range data {
 		labelName := c.toLabelName(instance.Name)
 		ch <- prometheus.MustNewConstMetric(
-			c.MailboxServerLocatorAverageLatency,
+			c.mailboxServerLocatorAverageLatency,
 			prometheus.GaugeValue,
 			c.msToSec(instance.MailboxServerLocatorAverageLatency),
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.AverageAuthenticationLatency,
+			c.averageAuthenticationLatency,
 			prometheus.GaugeValue,
 			instance.AverageAuthenticationLatency,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.AverageCASProcessingLatency,
+			c.averageCASProcessingLatency,
 			prometheus.GaugeValue,
 			c.msToSec(instance.AverageCASProcessingLatency),
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.MailboxServerProxyFailureRate,
+			c.mailboxServerProxyFailureRate,
 			prometheus.GaugeValue,
 			instance.MailboxServerProxyFailureRate,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.OutstandingProxyRequests,
+			c.outstandingProxyRequests,
 			prometheus.GaugeValue,
 			instance.OutstandingProxyRequests,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.ProxyRequestsPerSec,
+			c.proxyRequestsPerSec,
 			prometheus.CounterValue,
 			instance.ProxyRequestsPerSec,
 			labelName,
@@ -403,13 +420,13 @@ func (c *collector) collectHTTPProxy(ctx *types.ScrapeContext, ch chan<- prometh
 	return nil
 }
 
-// Perflib: [24618] MSExchange OWA
+// Perflib: [24618] MSExchange OWA.
 type perflibOWA struct {
 	CurrentUniqueUsers float64 `perflib:"Current Unique Users"`
 	RequestsPerSec     float64 `perflib:"Requests/sec"`
 }
 
-func (c *collector) collectOWA(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+func (c *Collector) collectOWA(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	var data []perflibOWA
 	if err := perflib.UnmarshalObject(ctx.PerfObjects["MSExchange OWA"], &data, c.logger); err != nil {
 		return err
@@ -417,12 +434,12 @@ func (c *collector) collectOWA(ctx *types.ScrapeContext, ch chan<- prometheus.Me
 
 	for _, owa := range data {
 		ch <- prometheus.MustNewConstMetric(
-			c.CurrentUniqueUsers,
+			c.currentUniqueUsers,
 			prometheus.GaugeValue,
 			owa.CurrentUniqueUsers,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.OWARequestsPerSec,
+			c.owaRequestsPerSec,
 			prometheus.CounterValue,
 			owa.RequestsPerSec,
 		)
@@ -430,14 +447,14 @@ func (c *collector) collectOWA(ctx *types.ScrapeContext, ch chan<- prometheus.Me
 	return nil
 }
 
-// Perflib: [25138] MSExchange ActiveSync
+// Perflib: [25138] MSExchange ActiveSync.
 type perflibActiveSync struct {
 	RequestsPerSec      float64 `perflib:"Requests/sec"`
 	PingCommandsPending float64 `perflib:"Ping Commands Pending"`
 	SyncCommandsPerSec  float64 `perflib:"Sync Commands/sec"`
 }
 
-func (c *collector) collectActiveSync(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+func (c *Collector) collectActiveSync(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	var data []perflibActiveSync
 	if err := perflib.UnmarshalObject(ctx.PerfObjects["MSExchange ActiveSync"], &data, c.logger); err != nil {
 		return err
@@ -445,17 +462,17 @@ func (c *collector) collectActiveSync(ctx *types.ScrapeContext, ch chan<- promet
 
 	for _, instance := range data {
 		ch <- prometheus.MustNewConstMetric(
-			c.ActiveSyncRequestsPerSec,
+			c.activeSyncRequestsPerSec,
 			prometheus.CounterValue,
 			instance.RequestsPerSec,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.PingCommandsPending,
+			c.pingCommandsPending,
 			prometheus.GaugeValue,
 			instance.PingCommandsPending,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.SyncCommandsPerSec,
+			c.syncCommandsPerSec,
 			prometheus.CounterValue,
 			instance.SyncCommandsPerSec,
 		)
@@ -463,7 +480,7 @@ func (c *collector) collectActiveSync(ctx *types.ScrapeContext, ch chan<- promet
 	return nil
 }
 
-// Perflib: [29366] MSExchange RpcClientAccess
+// Perflib: [29366] MSExchange RpcClientAccess.
 type perflibRPCClientAccess struct {
 	RPCAveragedLatency  float64 `perflib:"RPC Averaged Latency"`
 	RPCRequests         float64 `perflib:"RPC Requests"`
@@ -473,7 +490,7 @@ type perflibRPCClientAccess struct {
 	UserCount           float64 `perflib:"User Count"`
 }
 
-func (c *collector) collectRPC(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+func (c *Collector) collectRPC(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	var data []perflibRPCClientAccess
 	if err := perflib.UnmarshalObject(ctx.PerfObjects["MSExchange RpcClientAccess"], &data, c.logger); err != nil {
 		return err
@@ -481,32 +498,32 @@ func (c *collector) collectRPC(ctx *types.ScrapeContext, ch chan<- prometheus.Me
 
 	for _, rpc := range data {
 		ch <- prometheus.MustNewConstMetric(
-			c.RPCAveragedLatency,
+			c.rpcAveragedLatency,
 			prometheus.GaugeValue,
 			c.msToSec(rpc.RPCAveragedLatency),
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.RPCRequests,
+			c.rpcRequests,
 			prometheus.GaugeValue,
 			rpc.RPCRequests,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.ActiveUserCount,
+			c.activeUserCount,
 			prometheus.GaugeValue,
 			rpc.ActiveUserCount,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.ConnectionCount,
+			c.connectionCount,
 			prometheus.GaugeValue,
 			rpc.ConnectionCount,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.RPCOperationsPerSec,
+			c.rpcOperationsPerSec,
 			prometheus.CounterValue,
 			rpc.RPCOperationsPerSec,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.UserCount,
+			c.userCount,
 			prometheus.GaugeValue,
 			rpc.UserCount,
 		)
@@ -515,7 +532,7 @@ func (c *collector) collectRPC(ctx *types.ScrapeContext, ch chan<- prometheus.Me
 	return nil
 }
 
-// Perflib: [20524] MSExchangeTransport Queues
+// Perflib: [20524] MSExchangeTransport Queues.
 type perflibTransportQueues struct {
 	Name string
 
@@ -529,7 +546,7 @@ type perflibTransportQueues struct {
 	PoisonQueueLength                       float64 `perflib:"Poison Queue Length"`
 }
 
-func (c *collector) collectTransportQueues(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+func (c *Collector) collectTransportQueues(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	var data []perflibTransportQueues
 	if err := perflib.UnmarshalObject(ctx.PerfObjects["MSExchangeTransport Queues"], &data, c.logger); err != nil {
 		return err
@@ -541,49 +558,49 @@ func (c *collector) collectTransportQueues(ctx *types.ScrapeContext, ch chan<- p
 			continue
 		}
 		ch <- prometheus.MustNewConstMetric(
-			c.ExternalActiveRemoteDeliveryQueueLength,
+			c.externalActiveRemoteDeliveryQueueLength,
 			prometheus.GaugeValue,
 			queue.ExternalActiveRemoteDeliveryQueueLength,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.InternalActiveRemoteDeliveryQueueLength,
+			c.internalActiveRemoteDeliveryQueueLength,
 			prometheus.GaugeValue,
 			queue.InternalActiveRemoteDeliveryQueueLength,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.ActiveMailboxDeliveryQueueLength,
+			c.activeMailboxDeliveryQueueLength,
 			prometheus.GaugeValue,
 			queue.ActiveMailboxDeliveryQueueLength,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.RetryMailboxDeliveryQueueLength,
+			c.retryMailboxDeliveryQueueLength,
 			prometheus.GaugeValue,
 			queue.RetryMailboxDeliveryQueueLength,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.UnreachableQueueLength,
+			c.unreachableQueueLength,
 			prometheus.GaugeValue,
 			queue.UnreachableQueueLength,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.ExternalLargestDeliveryQueueLength,
+			c.externalLargestDeliveryQueueLength,
 			prometheus.GaugeValue,
 			queue.ExternalLargestDeliveryQueueLength,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.InternalLargestDeliveryQueueLength,
+			c.internalLargestDeliveryQueueLength,
 			prometheus.GaugeValue,
 			queue.InternalLargestDeliveryQueueLength,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.PoisonQueueLength,
+			c.poisonQueueLength,
 			prometheus.GaugeValue,
 			queue.PoisonQueueLength,
 			labelName,
@@ -592,7 +609,7 @@ func (c *collector) collectTransportQueues(ctx *types.ScrapeContext, ch chan<- p
 	return nil
 }
 
-// Perflib: [19430] MSExchange WorkloadManagement Workloads
+// Perflib: [19430] MSExchange WorkloadManagement Workloads.
 type perflibWorkloadManagementWorkloads struct {
 	Name string
 
@@ -603,7 +620,7 @@ type perflibWorkloadManagementWorkloads struct {
 	IsActive       float64 `perflib:"Active"`
 }
 
-func (c *collector) collectWorkloadManagementWorkloads(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+func (c *Collector) collectWorkloadManagementWorkloads(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	var data []perflibWorkloadManagementWorkloads
 	if err := perflib.UnmarshalObject(ctx.PerfObjects["MSExchange WorkloadManagement Workloads"], &data, c.logger); err != nil {
 		return err
@@ -615,31 +632,31 @@ func (c *collector) collectWorkloadManagementWorkloads(ctx *types.ScrapeContext,
 			continue
 		}
 		ch <- prometheus.MustNewConstMetric(
-			c.ActiveTasks,
+			c.activeTasks,
 			prometheus.GaugeValue,
 			instance.ActiveTasks,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.CompletedTasks,
+			c.completedTasks,
 			prometheus.CounterValue,
 			instance.CompletedTasks,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.QueuedTasks,
+			c.queuedTasks,
 			prometheus.CounterValue,
 			instance.QueuedTasks,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.YieldedTasks,
+			c.yieldedTasks,
 			prometheus.CounterValue,
 			instance.YieldedTasks,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.IsActive,
+			c.isActive,
 			prometheus.GaugeValue,
 			instance.IsActive,
 			labelName,
@@ -649,19 +666,19 @@ func (c *collector) collectWorkloadManagementWorkloads(ctx *types.ScrapeContext,
 	return nil
 }
 
-// [29240] MSExchangeAutodiscover
+// [29240] MSExchangeAutodiscover.
 type perflibAutodiscover struct {
 	RequestsPerSec float64 `perflib:"Requests/sec"`
 }
 
-func (c *collector) collectAutoDiscover(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+func (c *Collector) collectAutoDiscover(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	var data []perflibAutodiscover
 	if err := perflib.UnmarshalObject(ctx.PerfObjects["MSExchangeAutodiscover"], &data, c.logger); err != nil {
 		return err
 	}
 	for _, autodisc := range data {
 		ch <- prometheus.MustNewConstMetric(
-			c.AutodiscoverRequestsPerSec,
+			c.autoDiscoverRequestsPerSec,
 			prometheus.CounterValue,
 			autodisc.RequestsPerSec,
 		)
@@ -669,12 +686,12 @@ func (c *collector) collectAutoDiscover(ctx *types.ScrapeContext, ch chan<- prom
 	return nil
 }
 
-// perflib [26463] MSExchange MapiHttp Emsmdb
+// perflib [26463] MSExchange MapiHttp Emsmdb.
 type perflibMapiHttpEmsmdb struct {
 	ActiveUserCount float64 `perflib:"Active User Count"`
 }
 
-func (c *collector) collectMapiHttpEmsmdb(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+func (c *Collector) collectMapiHttpEmsmdb(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	var data []perflibMapiHttpEmsmdb
 	if err := perflib.UnmarshalObject(ctx.PerfObjects["MSExchange MapiHttp Emsmdb"], &data, c.logger); err != nil {
 		return err
@@ -682,7 +699,7 @@ func (c *collector) collectMapiHttpEmsmdb(ctx *types.ScrapeContext, ch chan<- pr
 
 	for _, mapihttp := range data {
 		ch <- prometheus.MustNewConstMetric(
-			c.ActiveUserCountMapiHttpEmsmdb,
+			c.activeUserCountMapiHttpEmsMDB,
 			prometheus.GaugeValue,
 			mapihttp.ActiveUserCount,
 		)
@@ -691,14 +708,14 @@ func (c *collector) collectMapiHttpEmsmdb(ctx *types.ScrapeContext, ch chan<- pr
 	return nil
 }
 
-// toLabelName converts strings to lowercase and replaces all whitespaces and dots with underscores
-func (c *collector) toLabelName(name string) string {
+// toLabelName converts strings to lowercase and replaces all whitespaces and dots with underscores.
+func (c *Collector) toLabelName(name string) string {
 	s := strings.ReplaceAll(strings.Join(strings.Fields(strings.ToLower(name)), "_"), ".", "_")
 	s = strings.ReplaceAll(s, "__", "_")
 	return s
 }
 
-// msToSec converts from ms to seconds
-func (c *collector) msToSec(t float64) float64 {
+// msToSec converts from ms to seconds.
+func (c *Collector) msToSec(t float64) float64 {
 	return t / 1000
 }

pkg/collector/fsrmquota/fsrmquota.go

@@ -3,13 +3,12 @@
 package fsrmquota
 
 import (
-	"github.com/prometheus-community/windows_exporter/pkg/types"
-	"github.com/prometheus-community/windows_exporter/pkg/utils"
-	"github.com/prometheus-community/windows_exporter/pkg/wmi"
-
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
+	"github.com/prometheus-community/windows_exporter/pkg/types"
+	"github.com/prometheus-community/windows_exporter/pkg/utils"
+	"github.com/prometheus-community/windows_exporter/pkg/wmi"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -19,94 +18,106 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-type collector struct {
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	QuotasCount *prometheus.Desc
-	Path        *prometheus.Desc
-	PeakUsage   *prometheus.Desc
-	Size        *prometheus.Desc
-	Usage       *prometheus.Desc
+	quotasCount *prometheus.Desc
+	peakUsage   *prometheus.Desc
+	size        *prometheus.Desc
+	usage       *prometheus.Desc
 
-	Description     *prometheus.Desc
-	Disabled        *prometheus.Desc
-	MatchesTemplate *prometheus.Desc
-	SoftLimit       *prometheus.Desc
-	Template        *prometheus.Desc
+	description     *prometheus.Desc
+	disabled        *prometheus.Desc
+	matchesTemplate *prometheus.Desc
+	softLimit       *prometheus.Desc
+	template        *prometheus.Desc
 }
 
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{}, nil
 }
 
-func (c *collector) Build() error {
-	c.QuotasCount = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.quotasCount = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "count"),
 		"Number of Quotas",
 		nil,
 		nil,
 	)
-	c.PeakUsage = prometheus.NewDesc(
+	c.peakUsage = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "peak_usage_bytes"),
 		"The highest amount of disk space usage charged to this quota. (PeakUsage)",
 		[]string{"path", "template"},
 		nil,
 	)
-	c.Size = prometheus.NewDesc(
+	c.size = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "size_bytes"),
 		"The size of the quota. (Size)",
 		[]string{"path", "template"},
 		nil,
 	)
-	c.Usage = prometheus.NewDesc(
+	c.usage = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "usage_bytes"),
 		"The current amount of disk space usage charged to this quota. (Usage)",
 		[]string{"path", "template"},
 		nil,
 	)
-	c.Description = prometheus.NewDesc(
+	c.description = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "description"),
 		"Description of the quota (Description)",
 		[]string{"path", "template", "description"},
 		nil,
 	)
-	c.Disabled = prometheus.NewDesc(
+	c.disabled = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "disabled"),
 		"If 1, the quota is disabled. The default value is 0. (Disabled)",
 		[]string{"path", "template"},
 		nil,
 	)
-	c.SoftLimit = prometheus.NewDesc(
+	c.softLimit = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "softlimit"),
 		"If 1, the quota is a soft limit. If 0, the quota is a hard limit. The default value is 0. Optional (SoftLimit)",
 		[]string{"path", "template"},
 		nil,
 	)
-	c.Template = prometheus.NewDesc(
+	c.template = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "template"),
 		"Quota template name. (Template)",
 		[]string{"path", "template"},
 		nil,
 	)
-	c.MatchesTemplate = prometheus.NewDesc(
+	c.matchesTemplate = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "matchestemplate"),
 		"If 1, the property values of this quota match those values of the template from which it was derived. (MatchesTemplate)",
 		[]string{"path", "template"},
@@ -117,9 +128,9 @@ func (c *collector) Build() error {
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ch); err != nil {
-		_ = level.Error(c.logger).Log("msg", "failed collecting fsrmquota metrics", "desc", desc, "err", err)
+func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collect(ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed collecting fsrmquota metrics", "err", err)
 		return err
 	}
 	return nil
@@ -142,66 +153,65 @@ type MSFT_FSRMQuota struct {
 	SoftLimit       bool
 }
 
-func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *Collector) collect(ch chan<- prometheus.Metric) error {
 	var dst []MSFT_FSRMQuota
 	q := wmi.QueryAll(&dst, c.logger)
 
 	var count int
 
 	if err := wmi.QueryNamespace(q, &dst, "root/microsoft/windows/fsrm"); err != nil {
-		return nil, err
+		return err
 	}
 
 	for _, quota := range dst {
-
 		count++
 		path := quota.Path
 		template := quota.Template
 		Description := quota.Description
 
 		ch <- prometheus.MustNewConstMetric(
-			c.PeakUsage,
+			c.peakUsage,
 			prometheus.GaugeValue,
 			float64(quota.PeakUsage),
 			path,
 			template,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.Size,
+			c.size,
 			prometheus.GaugeValue,
 			float64(quota.Size),
 			path,
 			template,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.Usage,
+			c.usage,
 			prometheus.GaugeValue,
 			float64(quota.Usage),
 			path,
 			template,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.Description,
+			c.description,
 			prometheus.GaugeValue,
 			1.0,
 			path, template, Description,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.Disabled,
+			c.disabled,
 			prometheus.GaugeValue,
 			utils.BoolToFloat(quota.Disabled),
 			path,
 			template,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.MatchesTemplate,
+			c.matchesTemplate,
 			prometheus.GaugeValue,
 			utils.BoolToFloat(quota.MatchesTemplate),
 			path,
 			template,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.SoftLimit,
+			c.softLimit,
 			prometheus.GaugeValue,
 			utils.BoolToFloat(quota.SoftLimit),
 			path,
@@ -210,9 +220,9 @@ func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, erro
 	}
 
 	ch <- prometheus.MustNewConstMetric(
-		c.QuotasCount,
+		c.quotasCount,
 		prometheus.GaugeValue,
 		float64(count),
 	)
-	return nil, nil
+	return nil
 }

pkg/collector/handler.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
-	"github.com/prometheus-community/windows_exporter/pkg/types"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/collectors"
 	"github.com/prometheus/client_golang/prometheus/collectors/version"
@@ -20,7 +19,7 @@ import (
 
 func (c *Collectors) BuildServeHTTP(disableExporterMetrics bool, timeoutMargin float64) http.HandlerFunc {
 	collectorFactory := func(timeout time.Duration, requestedCollectors []string) (error, *Prometheus) {
-		filteredCollectors := make(map[string]types.Collector)
+		filteredCollectors := make(map[string]Collector)
 		// scrape all enabled collectors if no collector is requested
 		if len(requestedCollectors) == 0 {
 			filteredCollectors = c.collectors
@@ -56,7 +55,7 @@ func (c *Collectors) BuildServeHTTP(disableExporterMetrics bool, timeoutMargin f
 		if timeoutSeconds == 0 {
 			timeoutSeconds = defaultTimeout
 		}
-		timeoutSeconds = timeoutSeconds - timeoutMargin
+		timeoutSeconds -= timeoutMargin
 
 		reg := prometheus.NewRegistry()
 		err, wc := collectorFactory(time.Duration(timeoutSeconds*float64(time.Second)), r.URL.Query()["collect[]"])

pkg/collector/iis/iis_test.go

@@ -6,6 +6,8 @@ import (
 )
 
 func TestIISDeduplication(t *testing.T) {
+	t.Parallel()
+
 	start := []perflibAPP_POOL_WAS{
 		{
 			Name:             "foo",

pkg/collector/license/license.go

@@ -0,0 +1,107 @@
+//go:build windows
+
+package license
+
+import (
+	"github.com/alecthomas/kingpin/v2"
+	"github.com/go-kit/log"
+	"github.com/go-kit/log/level"
+	"github.com/prometheus-community/windows_exporter/pkg/headers/slc"
+	"github.com/prometheus-community/windows_exporter/pkg/types"
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+const Name = "license"
+
+var labelMap = map[slc.SL_GENUINE_STATE]string{
+	slc.SL_GEN_STATE_IS_GENUINE:      "genuine",
+	slc.SL_GEN_STATE_INVALID_LICENSE: "invalid_license",
+	slc.SL_GEN_STATE_TAMPERED:        "tampered",
+	slc.SL_GEN_STATE_OFFLINE:         "offline",
+	slc.SL_GEN_STATE_LAST:            "last",
+}
+
+type Config struct{}
+
+var ConfigDefaults = Config{}
+
+// A Collector is a Prometheus Collector for WMI Win32_PerfRawData_DNS_DNS metrics.
+type Collector struct {
+	config Config
+	logger log.Logger
+
+	licenseStatus *prometheus.Desc
+}
+
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
+	c.SetLogger(logger)
+
+	return c
+}
+
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
+}
+
+func (c *Collector) GetName() string {
+	return Name
+}
+
+func (c *Collector) SetLogger(logger log.Logger) {
+	c.logger = log.With(logger, "collector", Name)
+}
+
+func (c *Collector) GetPerfCounter() ([]string, error) {
+	return []string{}, nil
+}
+
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.licenseStatus = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "status"),
+		"Status of windows license",
+		[]string{"state"},
+		nil,
+	)
+
+	return nil
+}
+
+// Collect sends the metric values for each metric
+// to the provided prometheus Metric channel.
+func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collect(ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed collecting license metrics", "err", err)
+		return err
+	}
+	return nil
+}
+
+func (c *Collector) collect(ch chan<- prometheus.Metric) error {
+	status, err := slc.SLIsWindowsGenuineLocal()
+	if err != nil {
+		return err
+	}
+
+	for k, v := range labelMap {
+		val := 0.0
+		if status == k {
+			val = 1.0
+		}
+
+		ch <- prometheus.MustNewConstMetric(c.licenseStatus, prometheus.GaugeValue, val, v)
+	}
+
+	return nil
+}

pkg/collector/license/license_test.go

@@ -0,0 +1,12 @@
+package license_test
+
+import (
+	"testing"
+
+	"github.com/prometheus-community/windows_exporter/pkg/collector/license"
+	"github.com/prometheus-community/windows_exporter/pkg/testutils"
+)
+
+func BenchmarkCollector(b *testing.B) {
+	testutils.FuncBenchmarkCollector(b, license.Name, license.NewWithFlags)
+}

pkg/collector/logical_disk/logical_disk.go

@@ -3,243 +3,274 @@
 package logical_disk
 
 import (
-	"errors"
+	"encoding/binary"
 	"fmt"
 	"regexp"
+	"slices"
+	"strconv"
+	"strings"
 
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/prometheus-community/windows_exporter/pkg/perflib"
 	"github.com/prometheus-community/windows_exporter/pkg/types"
-	"github.com/prometheus-community/windows_exporter/pkg/wmi"
 	"github.com/prometheus/client_golang/prometheus"
+	"golang.org/x/sys/windows"
 )
 
-const (
-	Name = "logical_disk"
-
-	FlagLogicalDiskVolumeExclude = "collector.logical_disk.volume-exclude"
-	FlagLogicalDiskVolumeInclude = "collector.logical_disk.volume-include"
-
-	win32DiskQuery = "SELECT VolumeName,DeviceID FROM WIN32_LogicalDisk"
-)
-
-type Win32_LogicalDisk struct {
-	VolumeName string
-	DeviceID   string
-}
+const Name = "logical_disk"
 
 type Config struct {
-	VolumeInclude string `yaml:"volume_include"`
-	VolumeExclude string `yaml:"volume_exclude"`
+	VolumeInclude *regexp.Regexp `yaml:"volume_include"`
+	VolumeExclude *regexp.Regexp `yaml:"volume_exclude"`
 }
 
 var ConfigDefaults = Config{
-	VolumeInclude: ".+",
-	VolumeExclude: "",
+	VolumeInclude: types.RegExpAny,
+	VolumeExclude: types.RegExpEmpty,
 }
 
-// A collector is a Prometheus collector for perflib logicalDisk metrics
-type collector struct {
+// A Collector is a Prometheus Collector for perflib logicalDisk metrics.
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	volumeInclude *string
-	volumeExclude *string
-
-	RequestsQueued   *prometheus.Desc
-	AvgReadQueue     *prometheus.Desc
-	AvgWriteQueue    *prometheus.Desc
-	ReadBytesTotal   *prometheus.Desc
-	ReadsTotal       *prometheus.Desc
-	WriteBytesTotal  *prometheus.Desc
-	WritesTotal      *prometheus.Desc
-	ReadTime         *prometheus.Desc
-	WriteTime        *prometheus.Desc
-	TotalSpace       *prometheus.Desc
-	FreeSpace        *prometheus.Desc
-	IdleTime         *prometheus.Desc
-	SplitIOs         *prometheus.Desc
-	ReadLatency      *prometheus.Desc
-	WriteLatency     *prometheus.Desc
-	ReadWriteLatency *prometheus.Desc
-
-	volumeIncludePattern *regexp.Regexp
-	volumeExcludePattern *regexp.Regexp
+	avgReadQueue     *prometheus.Desc
+	avgWriteQueue    *prometheus.Desc
+	freeSpace        *prometheus.Desc
+	idleTime         *prometheus.Desc
+	information      *prometheus.Desc
+	readBytesTotal   *prometheus.Desc
+	readLatency      *prometheus.Desc
+	readOnly         *prometheus.Desc
+	readsTotal       *prometheus.Desc
+	readTime         *prometheus.Desc
+	readWriteLatency *prometheus.Desc
+	requestsQueued   *prometheus.Desc
+	splitIOs         *prometheus.Desc
+	totalSpace       *prometheus.Desc
+	writeBytesTotal  *prometheus.Desc
+	writeLatency     *prometheus.Desc
+	writesTotal      *prometheus.Desc
+	writeTime        *prometheus.Desc
 }
 
-func New(logger log.Logger, config *Config) types.Collector {
+type volumeInfo struct {
+	filesystem   string
+	serialNumber string
+	label        string
+	volumeType   string
+	readonly     float64
+}
+
+func New(logger log.Logger, config *Config) *Collector {
 	if config == nil {
 		config = &ConfigDefaults
 	}
 
-	c := &collector{
-		volumeExclude: &config.VolumeExclude,
-		volumeInclude: &config.VolumeInclude,
+	if config.VolumeExclude == nil {
+		config.VolumeExclude = ConfigDefaults.VolumeExclude
 	}
+
+	if config.VolumeInclude == nil {
+		config.VolumeInclude = ConfigDefaults.VolumeInclude
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(app *kingpin.Application) types.Collector {
-	c := &collector{
-		volumeInclude: app.Flag(
-			FlagLogicalDiskVolumeInclude,
-			"Regexp of volumes to include. Volume name must both match include and not match exclude to be included.",
-		).Default(ConfigDefaults.VolumeInclude).String(),
-		volumeExclude: app.Flag(
-			FlagLogicalDiskVolumeExclude,
-			"Regexp of volumes to exclude. Volume name must both match include and not match exclude to be included.",
-		).Default(ConfigDefaults.VolumeExclude).String(),
+func NewWithFlags(app *kingpin.Application) *Collector {
+	c := &Collector{
+		config: ConfigDefaults,
 	}
 
+	var volumeExclude, volumeInclude string
+
+	app.Flag(
+		"collector.logical_disk.volume-exclude",
+		"Regexp of volumes to exclude. Volume name must both match include and not match exclude to be included.",
+	).Default(c.config.VolumeExclude.String()).StringVar(&volumeExclude)
+
+	app.Flag(
+		"collector.logical_disk.volume-include",
+		"Regexp of volumes to include. Volume name must both match include and not match exclude to be included.",
+	).Default(c.config.VolumeInclude.String()).StringVar(&volumeInclude)
+
+	app.Action(func(*kingpin.ParseContext) error {
+		var err error
+
+		c.config.VolumeExclude, err = regexp.Compile(fmt.Sprintf("^(?:%s)$", volumeExclude))
+		if err != nil {
+			return fmt.Errorf("collector.logical_disk.volume-exclude: %w", err)
+		}
+
+		c.config.VolumeInclude, err = regexp.Compile(fmt.Sprintf("^(?:%s)$", volumeInclude))
+		if err != nil {
+			return fmt.Errorf("collector.logical_disk.volume-include: %w", err)
+		}
+
+		return nil
+	})
+
 	return c
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{"LogicalDisk"}, nil
 }
 
-func (c *collector) Build() error {
-	c.RequestsQueued = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.information = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "info"),
+		"A metric with a constant '1' value labeled with logical disk information",
+		[]string{"disk", "type", "volume", "volume_name", "filesystem", "serial_number"},
+		nil,
+	)
+	c.readOnly = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "readonly"),
+		"Whether the logical disk is read-only",
+		[]string{"volume"},
+		nil,
+	)
+	c.requestsQueued = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "requests_queued"),
 		"The number of requests queued to the disk (LogicalDisk.CurrentDiskQueueLength)",
-		[]string{"volume", "volume_name"},
+		[]string{"volume"},
 		nil,
 	)
 
-	c.AvgReadQueue = prometheus.NewDesc(
+	c.avgReadQueue = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "avg_read_requests_queued"),
 		"Average number of read requests that were queued for the selected disk during the sample interval (LogicalDisk.AvgDiskReadQueueLength)",
-		[]string{"volume", "volume_name"},
+		[]string{"volume"},
 		nil,
 	)
 
-	c.AvgWriteQueue = prometheus.NewDesc(
+	c.avgWriteQueue = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "avg_write_requests_queued"),
 		"Average number of write requests that were queued for the selected disk during the sample interval (LogicalDisk.AvgDiskWriteQueueLength)",
-		[]string{"volume", "volume_name"},
+		[]string{"volume"},
 		nil,
 	)
 
-	c.ReadBytesTotal = prometheus.NewDesc(
+	c.readBytesTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "read_bytes_total"),
 		"The number of bytes transferred from the disk during read operations (LogicalDisk.DiskReadBytesPerSec)",
-		[]string{"volume", "volume_name"},
+		[]string{"volume"},
 		nil,
 	)
 
-	c.ReadsTotal = prometheus.NewDesc(
+	c.readsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "reads_total"),
 		"The number of read operations on the disk (LogicalDisk.DiskReadsPerSec)",
-		[]string{"volume", "volume_name"},
+		[]string{"volume"},
 		nil,
 	)
 
-	c.WriteBytesTotal = prometheus.NewDesc(
+	c.writeBytesTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "write_bytes_total"),
 		"The number of bytes transferred to the disk during write operations (LogicalDisk.DiskWriteBytesPerSec)",
-		[]string{"volume", "volume_name"},
+		[]string{"volume"},
 		nil,
 	)
 
-	c.WritesTotal = prometheus.NewDesc(
+	c.writesTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "writes_total"),
 		"The number of write operations on the disk (LogicalDisk.DiskWritesPerSec)",
-		[]string{"volume", "volume_name"},
+		[]string{"volume"},
 		nil,
 	)
 
-	c.ReadTime = prometheus.NewDesc(
+	c.readTime = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "read_seconds_total"),
 		"Seconds that the disk was busy servicing read requests (LogicalDisk.PercentDiskReadTime)",
-		[]string{"volume", "volume_name"},
+		[]string{"volume"},
 		nil,
 	)
 
-	c.WriteTime = prometheus.NewDesc(
+	c.writeTime = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "write_seconds_total"),
 		"Seconds that the disk was busy servicing write requests (LogicalDisk.PercentDiskWriteTime)",
-		[]string{"volume", "volume_name"},
+		[]string{"volume"},
 		nil,
 	)
 
-	c.FreeSpace = prometheus.NewDesc(
+	c.freeSpace = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "free_bytes"),
 		"Free space in bytes, updates every 10-15 min (LogicalDisk.PercentFreeSpace)",
-		[]string{"volume", "volume_name"},
+		[]string{"volume"},
 		nil,
 	)
 
-	c.TotalSpace = prometheus.NewDesc(
+	c.totalSpace = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "size_bytes"),
 		"Total space in bytes, updates every 10-15 min (LogicalDisk.PercentFreeSpace_Base)",
-		[]string{"volume", "volume_name"},
+		[]string{"volume"},
 		nil,
 	)
 
-	c.IdleTime = prometheus.NewDesc(
+	c.idleTime = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "idle_seconds_total"),
 		"Seconds that the disk was idle (LogicalDisk.PercentIdleTime)",
-		[]string{"volume", "volume_name"},
+		[]string{"volume"},
 		nil,
 	)
 
-	c.SplitIOs = prometheus.NewDesc(
+	c.splitIOs = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "split_ios_total"),
 		"The number of I/Os to the disk were split into multiple I/Os (LogicalDisk.SplitIOPerSec)",
-		[]string{"volume", "volume_name"},
+		[]string{"volume"},
 		nil,
 	)
 
-	c.ReadLatency = prometheus.NewDesc(
+	c.readLatency = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "read_latency_seconds_total"),
 		"Shows the average time, in seconds, of a read operation from the disk (LogicalDisk.AvgDiskSecPerRead)",
-		[]string{"volume", "volume_name"},
+		[]string{"volume"},
 		nil,
 	)
 
-	c.WriteLatency = prometheus.NewDesc(
+	c.writeLatency = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "write_latency_seconds_total"),
 		"Shows the average time, in seconds, of a write operation to the disk (LogicalDisk.AvgDiskSecPerWrite)",
-		[]string{"volume", "volume_name"},
+		[]string{"volume"},
 		nil,
 	)
 
-	c.ReadWriteLatency = prometheus.NewDesc(
+	c.readWriteLatency = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "read_write_latency_seconds_total"),
 		"Shows the time, in seconds, of the average disk transfer (LogicalDisk.AvgDiskSecPerTransfer)",
-		[]string{"volume", "volume_name"},
+		[]string{"volume"},
 		nil,
 	)
 
-	var err error
-	c.volumeIncludePattern, err = regexp.Compile(fmt.Sprintf("^(?:%s)$", *c.volumeInclude))
-	if err != nil {
-		return err
-	}
-
-	c.volumeExcludePattern, err = regexp.Compile(fmt.Sprintf("^(?:%s)$", *c.volumeExclude))
-	if err != nil {
-		return err
-	}
-
 	return nil
 }
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ctx, ch); err != nil {
-		_ = level.Error(c.logger).Log("failed collecting logical_disk metrics", "desc", desc, "err", err)
+func (c *Collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collect(ctx, ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed collecting logical_disk metrics", "err", err)
 		return err
 	}
 	return nil
@@ -247,10 +278,9 @@ func (c *collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metri
 
 // Win32_PerfRawData_PerfDisk_LogicalDisk docs:
 // - https://msdn.microsoft.com/en-us/windows/hardware/aa394307(v=vs.71) - Win32_PerfRawData_PerfDisk_LogicalDisk class
-// - https://msdn.microsoft.com/en-us/library/ms803973.aspx - LogicalDisk object reference
+// - https://msdn.microsoft.com/en-us/library/ms803973.aspx - LogicalDisk object reference.
 type logicalDisk struct {
 	Name                    string
-	VolumeName              string
 	CurrentDiskQueueLength  float64 `perflib:"Current Disk Queue Length"`
 	AvgDiskReadQueueLength  float64 `perflib:"Avg. Disk Read Queue Length"`
 	AvgDiskWriteQueueLength float64 `perflib:"Avg. Disk Write Queue Length"`
@@ -269,166 +299,260 @@ type logicalDisk struct {
 	AvgDiskSecPerTransfer   float64 `perflib:"Avg. Disk sec/Transfer"`
 }
 
-func (c *collector) collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
-	var dst_Win32_LogicalDisk []Win32_LogicalDisk
+func (c *Collector) collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	var (
+		err    error
+		diskID string
+		info   volumeInfo
+		dst    []logicalDisk
+	)
 
-	if err := wmi.Query(win32DiskQuery, &dst_Win32_LogicalDisk); err != nil {
-		return nil, err
-	}
-	if len(dst_Win32_LogicalDisk) == 0 {
-		return nil, errors.New("WMI query returned empty result set")
-	}
-
-	var dst []logicalDisk
-	if err := perflib.UnmarshalObject(ctx.PerfObjects["LogicalDisk"], &dst, c.logger); err != nil {
-		return nil, err
+	if err = perflib.UnmarshalObject(ctx.PerfObjects["LogicalDisk"], &dst, c.logger); err != nil {
+		return err
 	}
 
 	for _, volume := range dst {
 		if volume.Name == "_Total" ||
-			c.volumeExcludePattern.MatchString(volume.Name) ||
-			!c.volumeIncludePattern.MatchString(volume.Name) {
+			c.config.VolumeExclude.MatchString(volume.Name) ||
+			!c.config.VolumeInclude.MatchString(volume.Name) {
 			continue
 		}
-		for _, logicalDisk := range dst_Win32_LogicalDisk {
-			if logicalDisk.VolumeName == "" {
-				logicalDisk.VolumeName = "Local Disk"
-			}
-			if logicalDisk.DeviceID == volume.Name {
-				ch <- prometheus.MustNewConstMetric(
-					c.RequestsQueued,
-					prometheus.GaugeValue,
-					volume.CurrentDiskQueueLength,
-					volume.Name,
-					logicalDisk.VolumeName,
-				)
 
-				ch <- prometheus.MustNewConstMetric(
-					c.AvgReadQueue,
-					prometheus.GaugeValue,
-					volume.AvgDiskReadQueueLength*perflib.TicksToSecondScaleFactor,
-					volume.Name,
-					logicalDisk.VolumeName,
-				)
-
-				ch <- prometheus.MustNewConstMetric(
-					c.AvgWriteQueue,
-					prometheus.GaugeValue,
-					volume.AvgDiskWriteQueueLength*perflib.TicksToSecondScaleFactor,
-					volume.Name,
-					logicalDisk.VolumeName,
-				)
-
-				ch <- prometheus.MustNewConstMetric(
-					c.ReadBytesTotal,
-					prometheus.CounterValue,
-					volume.DiskReadBytesPerSec,
-					volume.Name,
-					logicalDisk.VolumeName,
-				)
-
-				ch <- prometheus.MustNewConstMetric(
-					c.ReadsTotal,
-					prometheus.CounterValue,
-					volume.DiskReadsPerSec,
-					volume.Name,
-					logicalDisk.VolumeName,
-				)
-
-				ch <- prometheus.MustNewConstMetric(
-					c.WriteBytesTotal,
-					prometheus.CounterValue,
-					volume.DiskWriteBytesPerSec,
-					volume.Name,
-					logicalDisk.VolumeName,
-				)
-
-				ch <- prometheus.MustNewConstMetric(
-					c.WritesTotal,
-					prometheus.CounterValue,
-					volume.DiskWritesPerSec,
-					volume.Name,
-					logicalDisk.VolumeName,
-				)
-
-				ch <- prometheus.MustNewConstMetric(
-					c.ReadTime,
-					prometheus.CounterValue,
-					volume.PercentDiskReadTime,
-					volume.Name,
-					logicalDisk.VolumeName,
-				)
-
-				ch <- prometheus.MustNewConstMetric(
-					c.WriteTime,
-					prometheus.CounterValue,
-					volume.PercentDiskWriteTime,
-					volume.Name,
-					logicalDisk.VolumeName,
-				)
-
-				ch <- prometheus.MustNewConstMetric(
-					c.FreeSpace,
-					prometheus.GaugeValue,
-					volume.PercentFreeSpace_Base*1024*1024,
-					volume.Name,
-					logicalDisk.VolumeName,
-				)
-
-				ch <- prometheus.MustNewConstMetric(
-					c.TotalSpace,
-					prometheus.GaugeValue,
-					volume.PercentFreeSpace*1024*1024,
-					volume.Name,
-					logicalDisk.VolumeName,
-				)
-
-				ch <- prometheus.MustNewConstMetric(
-					c.IdleTime,
-					prometheus.CounterValue,
-					volume.PercentIdleTime,
-					volume.Name,
-					logicalDisk.VolumeName,
-				)
-
-				ch <- prometheus.MustNewConstMetric(
-					c.SplitIOs,
-					prometheus.CounterValue,
-					volume.SplitIOPerSec,
-					volume.Name,
-					logicalDisk.VolumeName,
-				)
-
-				ch <- prometheus.MustNewConstMetric(
-					c.ReadLatency,
-					prometheus.CounterValue,
-					volume.AvgDiskSecPerRead*perflib.TicksToSecondScaleFactor,
-					volume.Name,
-					logicalDisk.VolumeName,
-				)
-
-				ch <- prometheus.MustNewConstMetric(
-					c.WriteLatency,
-					prometheus.CounterValue,
-					volume.AvgDiskSecPerWrite*perflib.TicksToSecondScaleFactor,
-					volume.Name,
-					logicalDisk.VolumeName,
-				)
-
-				ch <- prometheus.MustNewConstMetric(
-					c.ReadWriteLatency,
-					prometheus.CounterValue,
-					volume.AvgDiskSecPerTransfer*perflib.TicksToSecondScaleFactor,
-					volume.Name,
-					logicalDisk.VolumeName,
-				)
-
-				break
-
-			}
+		diskID, err = getDiskIDByVolume(volume.Name)
+		if err != nil {
+			_ = level.Warn(c.logger).Log("msg", "failed to get disk ID for "+volume.Name, "err", err)
 		}
 
+		info, err = getVolumeInfo(volume.Name)
+		if err != nil {
+			_ = level.Warn(c.logger).Log("msg", "failed to get volume information for %s"+volume.Name, "err", err)
+		}
+
+		ch <- prometheus.MustNewConstMetric(
+			c.information,
+			prometheus.GaugeValue,
+			1,
+			diskID,
+			info.volumeType,
+			volume.Name,
+			info.label,
+			info.filesystem,
+			info.serialNumber,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.requestsQueued,
+			prometheus.GaugeValue,
+			volume.CurrentDiskQueueLength,
+			volume.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.avgReadQueue,
+			prometheus.GaugeValue,
+			volume.AvgDiskReadQueueLength*perflib.TicksToSecondScaleFactor,
+			volume.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.avgWriteQueue,
+			prometheus.GaugeValue,
+			volume.AvgDiskWriteQueueLength*perflib.TicksToSecondScaleFactor,
+			volume.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.readBytesTotal,
+			prometheus.CounterValue,
+			volume.DiskReadBytesPerSec,
+			volume.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.readsTotal,
+			prometheus.CounterValue,
+			volume.DiskReadsPerSec,
+			volume.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.writeBytesTotal,
+			prometheus.CounterValue,
+			volume.DiskWriteBytesPerSec,
+			volume.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.writesTotal,
+			prometheus.CounterValue,
+			volume.DiskWritesPerSec,
+			volume.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.readTime,
+			prometheus.CounterValue,
+			volume.PercentDiskReadTime,
+			volume.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.writeTime,
+			prometheus.CounterValue,
+			volume.PercentDiskWriteTime,
+			volume.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.freeSpace,
+			prometheus.GaugeValue,
+			volume.PercentFreeSpace_Base*1024*1024,
+			volume.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.totalSpace,
+			prometheus.GaugeValue,
+			volume.PercentFreeSpace*1024*1024,
+			volume.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.idleTime,
+			prometheus.CounterValue,
+			volume.PercentIdleTime,
+			volume.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.splitIOs,
+			prometheus.CounterValue,
+			volume.SplitIOPerSec,
+			volume.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.readLatency,
+			prometheus.CounterValue,
+			volume.AvgDiskSecPerRead*perflib.TicksToSecondScaleFactor,
+			volume.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.writeLatency,
+			prometheus.CounterValue,
+			volume.AvgDiskSecPerWrite*perflib.TicksToSecondScaleFactor,
+			volume.Name,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.readWriteLatency,
+			prometheus.CounterValue,
+			volume.AvgDiskSecPerTransfer*perflib.TicksToSecondScaleFactor,
+			volume.Name,
+		)
 	}
 
-	return nil, nil
+	return nil
+}
+
+func getDriveType(driveType uint32) string {
+	switch driveType {
+	case windows.DRIVE_UNKNOWN:
+		return "unknown"
+	case windows.DRIVE_NO_ROOT_DIR:
+		return "norootdir"
+	case windows.DRIVE_REMOVABLE:
+		return "removable"
+	case windows.DRIVE_FIXED:
+		return "fixed"
+	case windows.DRIVE_REMOTE:
+		return "remote"
+	case windows.DRIVE_CDROM:
+		return "cdrom"
+	case windows.DRIVE_RAMDISK:
+		return "ramdisk"
+	default:
+		return "unknown"
+	}
+}
+
+// diskExtentSize Size of the DiskExtent structure in bytes.
+const diskExtentSize = 24
+
+// getDiskIDByVolume returns the disk ID for a given volume.
+func getDiskIDByVolume(rootDrive string) (string, error) {
+	// Open a volume handle to the Disk Root.
+	var err error
+	var f windows.Handle
+
+	// mode has to include FILE_SHARE permission to allow concurrent access to the disk.
+	// use 0 as access mode to avoid admin permission.
+	mode := uint32(windows.FILE_SHARE_READ | windows.FILE_SHARE_WRITE | windows.FILE_SHARE_DELETE)
+	f, err = windows.CreateFile(
+		windows.StringToUTF16Ptr(`\\.\`+rootDrive),
+		0, mode, nil, windows.OPEN_EXISTING, uint32(windows.FILE_ATTRIBUTE_READONLY), 0)
+	if err != nil {
+		return "", err
+	}
+
+	defer windows.Close(f)
+
+	controlCode := uint32(5636096) // IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS
+	volumeDiskExtents := make([]byte, 16*1024)
+
+	var bytesReturned uint32
+	err = windows.DeviceIoControl(f, controlCode, nil, 0, &volumeDiskExtents[0], uint32(len(volumeDiskExtents)), &bytesReturned, nil)
+	if err != nil {
+		return "", fmt.Errorf("could not identify physical drive for %s: %w", rootDrive, err)
+	}
+
+	numDiskIDs := uint(binary.LittleEndian.Uint32(volumeDiskExtents))
+	if numDiskIDs < 1 {
+		return "", fmt.Errorf("could not identify physical drive for %s: no disk IDs returned", rootDrive)
+	}
+
+	diskIDs := make([]string, numDiskIDs)
+
+	for i := range numDiskIDs {
+		diskIDs[i] = strconv.FormatUint(uint64(binary.LittleEndian.Uint32(volumeDiskExtents[8+i*diskExtentSize:])), 10)
+	}
+
+	slices.Sort(diskIDs)
+	diskIDs = slices.Compact(diskIDs)
+
+	return strings.Join(diskIDs, ";"), nil
+}
+
+func getVolumeInfo(rootDrive string) (volumeInfo, error) {
+	if !strings.HasSuffix(rootDrive, ":") {
+		return volumeInfo{}, nil
+	}
+
+	volPath := windows.StringToUTF16Ptr(rootDrive + `\`)
+
+	volBufLabel := make([]uint16, windows.MAX_PATH+1)
+	volSerialNum := uint32(0)
+	fsFlags := uint32(0)
+	volBufType := make([]uint16, windows.MAX_PATH+1)
+
+	driveType := windows.GetDriveType(volPath)
+
+	err := windows.GetVolumeInformation(volPath, &volBufLabel[0], uint32(len(volBufLabel)),
+		&volSerialNum, nil, &fsFlags, &volBufType[0], uint32(len(volBufType)))
+	if err != nil {
+		if driveType != windows.DRIVE_CDROM && driveType != windows.DRIVE_REMOVABLE {
+			return volumeInfo{}, err
+		}
+
+		return volumeInfo{}, nil
+	}
+
+	return volumeInfo{
+		volumeType:   getDriveType(driveType),
+		label:        windows.UTF16PtrToString(&volBufLabel[0]),
+		filesystem:   windows.UTF16PtrToString(&volBufType[0]),
+		serialNumber: fmt.Sprintf("%X", volSerialNum),
+		readonly:     float64(fsFlags & windows.FILE_READ_ONLY_VOLUME),
+	}, nil
 }

pkg/collector/logical_disk/logical_disk_test.go

@@ -9,8 +9,8 @@ import (
 )
 
 func BenchmarkCollector(b *testing.B) {
-	// Whitelist is not set in testing context (kingpin flags not parsed), causing the collector to skip all disks.
+	// Whitelist is not set in testing context (kingpin flags not parsed), causing the Collector to skip all disks.
 	localVolumeInclude := ".+"
-	kingpin.CommandLine.GetArg(logical_disk.FlagLogicalDiskVolumeInclude).StringVar(&localVolumeInclude)
+	kingpin.CommandLine.GetArg("collector.logical_disk.volume-include").StringVar(&localVolumeInclude)
 	testutils.FuncBenchmarkCollector(b, "logical_disk", logical_disk.NewWithFlags)
 }

pkg/collector/logon/logon.go

@@ -5,12 +5,11 @@ package logon
 import (
 	"errors"
 
-	"github.com/prometheus-community/windows_exporter/pkg/types"
-	"github.com/prometheus-community/windows_exporter/pkg/wmi"
-
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
+	"github.com/prometheus-community/windows_exporter/pkg/types"
+	"github.com/prometheus-community/windows_exporter/pkg/wmi"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -20,37 +19,50 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-// A collector is a Prometheus collector for WMI metrics
-type collector struct {
+// A Collector is a Prometheus Collector for WMI metrics.
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	LogonType *prometheus.Desc
+	logonType *prometheus.Desc
 }
 
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{}, nil
 }
 
-func (c *collector) Build() error {
-	c.LogonType = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.logonType = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "logon_type"),
 		"Number of active logon sessions (LogonSession.LogonType)",
 		[]string{"status"},
@@ -61,9 +73,9 @@ func (c *collector) Build() error {
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ch); err != nil {
-		_ = level.Error(c.logger).Log("failed collecting user metrics", "desc", desc, "err", err)
+func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collect(ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed collecting user metrics", "err", err)
 		return err
 	}
 	return nil
@@ -75,14 +87,14 @@ type Win32_LogonSession struct {
 	LogonType uint32
 }
 
-func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *Collector) collect(ch chan<- prometheus.Metric) error {
 	var dst []Win32_LogonSession
 	q := wmi.QueryAll(&dst, c.logger)
 	if err := wmi.Query(q, &dst); err != nil {
-		return nil, err
+		return err
 	}
 	if len(dst) == 0 {
-		return nil, errors.New("WMI query returned empty result set")
+		return errors.New("WMI query returned empty result set")
 	}
 
 	// Init counters
@@ -132,94 +144,94 @@ func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, erro
 	}
 
 	ch <- prometheus.MustNewConstMetric(
-		c.LogonType,
+		c.logonType,
 		prometheus.GaugeValue,
 		float64(system),
 		"system",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.LogonType,
+		c.logonType,
 		prometheus.GaugeValue,
 		float64(interactive),
 		"interactive",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.LogonType,
+		c.logonType,
 		prometheus.GaugeValue,
 		float64(network),
 		"network",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.LogonType,
+		c.logonType,
 		prometheus.GaugeValue,
 		float64(batch),
 		"batch",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.LogonType,
+		c.logonType,
 		prometheus.GaugeValue,
 		float64(service),
 		"service",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.LogonType,
+		c.logonType,
 		prometheus.GaugeValue,
 		float64(proxy),
 		"proxy",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.LogonType,
+		c.logonType,
 		prometheus.GaugeValue,
 		float64(unlock),
 		"unlock",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.LogonType,
+		c.logonType,
 		prometheus.GaugeValue,
 		float64(networkcleartext),
 		"network_clear_text",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.LogonType,
+		c.logonType,
 		prometheus.GaugeValue,
 		float64(newcredentials),
 		"new_credentials",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.LogonType,
+		c.logonType,
 		prometheus.GaugeValue,
 		float64(remoteinteractive),
 		"remote_interactive",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.LogonType,
+		c.logonType,
 		prometheus.GaugeValue,
 		float64(cachedinteractive),
 		"cached_interactive",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.LogonType,
+		c.logonType,
 		prometheus.GaugeValue,
 		float64(remoteinteractive),
 		"cached_remote_interactive",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.LogonType,
+		c.logonType,
 		prometheus.GaugeValue,
 		float64(cachedunlock),
 		"cached_unlock",
 	)
-	return nil, nil
+	return nil
 }

pkg/collector/logon/logon_test.go

@@ -8,6 +8,6 @@ import (
 )
 
 func BenchmarkCollector(b *testing.B) {
-	// No context name required as collector source is WMI
+	// No context name required as Collector source is WMI
 	testutils.FuncBenchmarkCollector(b, logon.Name, logon.NewWithFlags)
 }

pkg/collector/map.go

@@ -17,6 +17,7 @@ import (
 	"github.com/prometheus-community/windows_exporter/pkg/collector/fsrmquota"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/hyperv"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/iis"
+	"github.com/prometheus-community/windows_exporter/pkg/collector/license"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/logical_disk"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/logon"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/memory"
@@ -39,11 +40,13 @@ import (
 	"github.com/prometheus-community/windows_exporter/pkg/collector/nps"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/os"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/physical_disk"
+	"github.com/prometheus-community/windows_exporter/pkg/collector/printer"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/process"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/remote_fx"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/scheduled_task"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/service"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/smb"
+	"github.com/prometheus-community/windows_exporter/pkg/collector/smbclient"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/smtp"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/system"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/tcp"
@@ -54,67 +57,68 @@ import (
 	"github.com/prometheus-community/windows_exporter/pkg/collector/time"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/vmware"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/vmware_blast"
-	"github.com/prometheus-community/windows_exporter/pkg/types"
-
 	"golang.org/x/exp/maps"
 )
 
-var Map = map[string]types.CollectorBuilderWithFlags{
-	ad.Name:                              ad.NewWithFlags,
-	adcs.Name:                            adcs.NewWithFlags,
-	adfs.Name:                            adfs.NewWithFlags,
-	cache.Name:                           cache.NewWithFlags,
-	container.Name:                       container.NewWithFlags,
-	cpu.Name:                             cpu.NewWithFlags,
-	cpu_info.Name:                        cpu_info.NewWithFlags,
-	cs.Name:                              cs.NewWithFlags,
-	dfsr.Name:                            dfsr.NewWithFlags,
-	dhcp.Name:                            dhcp.NewWithFlags,
-	diskdrive.Name:                       diskdrive.NewWithFlags,
-	dns.Name:                             dns.NewWithFlags,
-	exchange.Name:                        exchange.NewWithFlags,
-	fsrmquota.Name:                       fsrmquota.NewWithFlags,
-	hyperv.Name:                          hyperv.NewWithFlags,
-	iis.Name:                             iis.NewWithFlags,
-	logical_disk.Name:                    logical_disk.NewWithFlags,
-	logon.Name:                           logon.NewWithFlags,
-	memory.Name:                          memory.NewWithFlags,
-	mscluster_cluster.Name:               mscluster_cluster.NewWithFlags,
-	mscluster_network.Name:               mscluster_network.NewWithFlags,
-	mscluster_node.Name:                  mscluster_node.NewWithFlags,
-	mscluster_resource.Name:              mscluster_resource.NewWithFlags,
-	mscluster_resourcegroup.Name:         mscluster_resourcegroup.NewWithFlags,
-	msmq.Name:                            msmq.NewWithFlags,
-	mssql.Name:                           mssql.NewWithFlags,
-	net.Name:                             net.NewWithFlags,
-	netframework_clrexceptions.Name:      netframework_clrexceptions.NewWithFlags,
-	netframework_clrinterop.Name:         netframework_clrinterop.NewWithFlags,
-	netframework_clrjit.Name:             netframework_clrjit.NewWithFlags,
-	netframework_clrloading.Name:         netframework_clrloading.NewWithFlags,
-	netframework_clrlocksandthreads.Name: netframework_clrlocksandthreads.NewWithFlags,
-	netframework_clrmemory.Name:          netframework_clrmemory.NewWithFlags,
-	netframework_clrremoting.Name:        netframework_clrremoting.NewWithFlags,
-	netframework_clrsecurity.Name:        netframework_clrsecurity.NewWithFlags,
-	nps.Name:                             nps.NewWithFlags,
-	os.Name:                              os.NewWithFlags,
-	physical_disk.Name:                   physical_disk.NewWithFlags,
-	process.Name:                         process.NewWithFlags,
-	remote_fx.Name:                       remote_fx.NewWithFlags,
-	scheduled_task.Name:                  scheduled_task.NewWithFlags,
-	service.Name:                         service.NewWithFlags,
-	smb.Name:                             smb.NewWithFlags,
-	smtp.Name:                            smtp.NewWithFlags,
-	system.Name:                          system.NewWithFlags,
-	teradici_pcoip.Name:                  teradici_pcoip.NewWithFlags,
-	tcp.Name:                             tcp.NewWithFlags,
-	terminal_services.Name:               terminal_services.NewWithFlags,
-	textfile.Name:                        textfile.NewWithFlags,
-	thermalzone.Name:                     thermalzone.NewWithFlags,
-	time.Name:                            time.NewWithFlags,
-	vmware.Name:                          vmware.NewWithFlags,
-	vmware_blast.Name:                    vmware_blast.NewWithFlags,
+var BuildersWithFlags = map[string]BuilderWithFlags[Collector]{
+	ad.Name:                              NewBuilderWithFlags(ad.NewWithFlags),
+	adcs.Name:                            NewBuilderWithFlags(adcs.NewWithFlags),
+	adfs.Name:                            NewBuilderWithFlags(adfs.NewWithFlags),
+	cache.Name:                           NewBuilderWithFlags(cache.NewWithFlags),
+	container.Name:                       NewBuilderWithFlags(container.NewWithFlags),
+	cpu.Name:                             NewBuilderWithFlags(cpu.NewWithFlags),
+	cpu_info.Name:                        NewBuilderWithFlags(cpu_info.NewWithFlags),
+	cs.Name:                              NewBuilderWithFlags(cs.NewWithFlags),
+	dfsr.Name:                            NewBuilderWithFlags(dfsr.NewWithFlags),
+	dhcp.Name:                            NewBuilderWithFlags(dhcp.NewWithFlags),
+	diskdrive.Name:                       NewBuilderWithFlags(diskdrive.NewWithFlags),
+	dns.Name:                             NewBuilderWithFlags(dns.NewWithFlags),
+	exchange.Name:                        NewBuilderWithFlags(exchange.NewWithFlags),
+	fsrmquota.Name:                       NewBuilderWithFlags(fsrmquota.NewWithFlags),
+	hyperv.Name:                          NewBuilderWithFlags(hyperv.NewWithFlags),
+	iis.Name:                             NewBuilderWithFlags(iis.NewWithFlags),
+	license.Name:                         NewBuilderWithFlags(license.NewWithFlags),
+	logical_disk.Name:                    NewBuilderWithFlags(logical_disk.NewWithFlags),
+	logon.Name:                           NewBuilderWithFlags(logon.NewWithFlags),
+	memory.Name:                          NewBuilderWithFlags(memory.NewWithFlags),
+	mscluster_cluster.Name:               NewBuilderWithFlags(mscluster_cluster.NewWithFlags),
+	mscluster_network.Name:               NewBuilderWithFlags(mscluster_network.NewWithFlags),
+	mscluster_node.Name:                  NewBuilderWithFlags(mscluster_node.NewWithFlags),
+	mscluster_resource.Name:              NewBuilderWithFlags(mscluster_resource.NewWithFlags),
+	mscluster_resourcegroup.Name:         NewBuilderWithFlags(mscluster_resourcegroup.NewWithFlags),
+	msmq.Name:                            NewBuilderWithFlags(msmq.NewWithFlags),
+	mssql.Name:                           NewBuilderWithFlags(mssql.NewWithFlags),
+	net.Name:                             NewBuilderWithFlags(net.NewWithFlags),
+	netframework_clrexceptions.Name:      NewBuilderWithFlags(netframework_clrexceptions.NewWithFlags),
+	netframework_clrinterop.Name:         NewBuilderWithFlags(netframework_clrinterop.NewWithFlags),
+	netframework_clrjit.Name:             NewBuilderWithFlags(netframework_clrjit.NewWithFlags),
+	netframework_clrloading.Name:         NewBuilderWithFlags(netframework_clrloading.NewWithFlags),
+	netframework_clrlocksandthreads.Name: NewBuilderWithFlags(netframework_clrlocksandthreads.NewWithFlags),
+	netframework_clrmemory.Name:          NewBuilderWithFlags(netframework_clrmemory.NewWithFlags),
+	netframework_clrremoting.Name:        NewBuilderWithFlags(netframework_clrremoting.NewWithFlags),
+	netframework_clrsecurity.Name:        NewBuilderWithFlags(netframework_clrsecurity.NewWithFlags),
+	nps.Name:                             NewBuilderWithFlags(nps.NewWithFlags),
+	os.Name:                              NewBuilderWithFlags(os.NewWithFlags),
+	physical_disk.Name:                   NewBuilderWithFlags(physical_disk.NewWithFlags),
+	printer.Name:                         NewBuilderWithFlags(printer.NewWithFlags),
+	process.Name:                         NewBuilderWithFlags(process.NewWithFlags),
+	remote_fx.Name:                       NewBuilderWithFlags(remote_fx.NewWithFlags),
+	scheduled_task.Name:                  NewBuilderWithFlags(scheduled_task.NewWithFlags),
+	service.Name:                         NewBuilderWithFlags(service.NewWithFlags),
+	smb.Name:                             NewBuilderWithFlags(smb.NewWithFlags),
+	smbclient.Name:                       NewBuilderWithFlags(smbclient.NewWithFlags),
+	smtp.Name:                            NewBuilderWithFlags(smtp.NewWithFlags),
+	system.Name:                          NewBuilderWithFlags(system.NewWithFlags),
+	teradici_pcoip.Name:                  NewBuilderWithFlags(teradici_pcoip.NewWithFlags),
+	tcp.Name:                             NewBuilderWithFlags(tcp.NewWithFlags),
+	terminal_services.Name:               NewBuilderWithFlags(terminal_services.NewWithFlags),
+	textfile.Name:                        NewBuilderWithFlags(textfile.NewWithFlags),
+	thermalzone.Name:                     NewBuilderWithFlags(thermalzone.NewWithFlags),
+	time.Name:                            NewBuilderWithFlags(time.NewWithFlags),
+	vmware.Name:                          NewBuilderWithFlags(vmware.NewWithFlags),
+	vmware_blast.Name:                    NewBuilderWithFlags(vmware_blast.NewWithFlags),
 }
 
 func Available() []string {
-	return maps.Keys(Map)
+	return maps.Keys(BuildersWithFlags)
 }

pkg/collector/memory/memory.go

@@ -20,266 +20,279 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-// A collector is a Prometheus collector for perflib Memory metrics
-type collector struct {
+// A Collector is a Prometheus Collector for perflib Memory metrics.
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	AvailableBytes                  *prometheus.Desc
-	CacheBytes                      *prometheus.Desc
-	CacheBytesPeak                  *prometheus.Desc
-	CacheFaultsTotal                *prometheus.Desc
-	CommitLimit                     *prometheus.Desc
-	CommittedBytes                  *prometheus.Desc
-	DemandZeroFaultsTotal           *prometheus.Desc
-	FreeAndZeroPageListBytes        *prometheus.Desc
-	FreeSystemPageTableEntries      *prometheus.Desc
-	ModifiedPageListBytes           *prometheus.Desc
-	PageFaultsTotal                 *prometheus.Desc
-	SwapPageReadsTotal              *prometheus.Desc
-	SwapPagesReadTotal              *prometheus.Desc
-	SwapPagesWrittenTotal           *prometheus.Desc
-	SwapPageOperationsTotal         *prometheus.Desc
-	SwapPageWritesTotal             *prometheus.Desc
-	PoolNonpagedAllocsTotal         *prometheus.Desc
-	PoolNonpagedBytes               *prometheus.Desc
-	PoolPagedAllocsTotal            *prometheus.Desc
-	PoolPagedBytes                  *prometheus.Desc
-	PoolPagedResidentBytes          *prometheus.Desc
-	StandbyCacheCoreBytes           *prometheus.Desc
-	StandbyCacheNormalPriorityBytes *prometheus.Desc
-	StandbyCacheReserveBytes        *prometheus.Desc
-	SystemCacheResidentBytes        *prometheus.Desc
-	SystemCodeResidentBytes         *prometheus.Desc
-	SystemCodeTotalBytes            *prometheus.Desc
-	SystemDriverResidentBytes       *prometheus.Desc
-	SystemDriverTotalBytes          *prometheus.Desc
-	TransitionFaultsTotal           *prometheus.Desc
-	TransitionPagesRepurposedTotal  *prometheus.Desc
-	WriteCopiesTotal                *prometheus.Desc
+	availableBytes                  *prometheus.Desc
+	cacheBytes                      *prometheus.Desc
+	cacheBytesPeak                  *prometheus.Desc
+	cacheFaultsTotal                *prometheus.Desc
+	commitLimit                     *prometheus.Desc
+	committedBytes                  *prometheus.Desc
+	demandZeroFaultsTotal           *prometheus.Desc
+	freeAndZeroPageListBytes        *prometheus.Desc
+	freeSystemPageTableEntries      *prometheus.Desc
+	modifiedPageListBytes           *prometheus.Desc
+	pageFaultsTotal                 *prometheus.Desc
+	swapPageReadsTotal              *prometheus.Desc
+	swapPagesReadTotal              *prometheus.Desc
+	swapPagesWrittenTotal           *prometheus.Desc
+	swapPageOperationsTotal         *prometheus.Desc
+	swapPageWritesTotal             *prometheus.Desc
+	poolNonPagedAllocationsTotal    *prometheus.Desc
+	poolNonPagedBytes               *prometheus.Desc
+	poolPagedAllocationsTotal       *prometheus.Desc
+	poolPagedBytes                  *prometheus.Desc
+	poolPagedResidentBytes          *prometheus.Desc
+	standbyCacheCoreBytes           *prometheus.Desc
+	standbyCacheNormalPriorityBytes *prometheus.Desc
+	standbyCacheReserveBytes        *prometheus.Desc
+	systemCacheResidentBytes        *prometheus.Desc
+	systemCodeResidentBytes         *prometheus.Desc
+	systemCodeTotalBytes            *prometheus.Desc
+	systemDriverResidentBytes       *prometheus.Desc
+	systemDriverTotalBytes          *prometheus.Desc
+	transitionFaultsTotal           *prometheus.Desc
+	transitionPagesRepurposedTotal  *prometheus.Desc
+	writeCopiesTotal                *prometheus.Desc
 }
 
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{"Memory"}, nil
 }
 
-func (c *collector) Build() error {
-	c.AvailableBytes = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.availableBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "available_bytes"),
 		"The amount of physical memory immediately available for allocation to a process or for system use. It is equal to the sum of memory assigned to"+
 			" the standby (cached), free and zero page lists (AvailableBytes)",
 		nil,
 		nil,
 	)
-	c.CacheBytes = prometheus.NewDesc(
+	c.cacheBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "cache_bytes"),
 		"(CacheBytes)",
 		nil,
 		nil,
 	)
-	c.CacheBytesPeak = prometheus.NewDesc(
+	c.cacheBytesPeak = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "cache_bytes_peak"),
 		"(CacheBytesPeak)",
 		nil,
 		nil,
 	)
-	c.CacheFaultsTotal = prometheus.NewDesc(
+	c.cacheFaultsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "cache_faults_total"),
 		"Number of faults which occur when a page sought in the file system cache is not found there and must be retrieved from elsewhere in memory (soft fault) "+
 			"or from disk (hard fault) (Cache Faults/sec)",
 		nil,
 		nil,
 	)
-	c.CommitLimit = prometheus.NewDesc(
+	c.commitLimit = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "commit_limit"),
 		"(CommitLimit)",
 		nil,
 		nil,
 	)
-	c.CommittedBytes = prometheus.NewDesc(
+	c.committedBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "committed_bytes"),
 		"(CommittedBytes)",
 		nil,
 		nil,
 	)
-	c.DemandZeroFaultsTotal = prometheus.NewDesc(
+	c.demandZeroFaultsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "demand_zero_faults_total"),
 		"The number of zeroed pages required to satisfy faults. Zeroed pages, pages emptied of previously stored data and filled with zeros, are a security"+
 			" feature of Windows that prevent processes from seeing data stored by earlier processes that used the memory space (Demand Zero Faults/sec)",
 		nil,
 		nil,
 	)
-	c.FreeAndZeroPageListBytes = prometheus.NewDesc(
+	c.freeAndZeroPageListBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "free_and_zero_page_list_bytes"),
 		"The amount of physical memory, in bytes, that is assigned to the free and zero page lists. This memory does not contain cached data. It is immediately"+
 			" available for allocation to a process or for system use (FreeAndZeroPageListBytes)",
 		nil,
 		nil,
 	)
-	c.FreeSystemPageTableEntries = prometheus.NewDesc(
+	c.freeSystemPageTableEntries = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "free_system_page_table_entries"),
 		"(FreeSystemPageTableEntries)",
 		nil,
 		nil,
 	)
-	c.ModifiedPageListBytes = prometheus.NewDesc(
+	c.modifiedPageListBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "modified_page_list_bytes"),
 		"The amount of physical memory, in bytes, that is assigned to the modified page list. This memory contains cached data and code that is not actively in "+
 			"use by processes, the system and the system cache (ModifiedPageListBytes)",
 		nil,
 		nil,
 	)
-	c.PageFaultsTotal = prometheus.NewDesc(
+	c.pageFaultsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "page_faults_total"),
 		"Overall rate at which faulted pages are handled by the processor (Page Faults/sec)",
 		nil,
 		nil,
 	)
-	c.SwapPageReadsTotal = prometheus.NewDesc(
+	c.swapPageReadsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "swap_page_reads_total"),
 		"Number of disk page reads (a single read operation reading several pages is still only counted once) (PageReadsPersec)",
 		nil,
 		nil,
 	)
-	c.SwapPagesReadTotal = prometheus.NewDesc(
+	c.swapPagesReadTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "swap_pages_read_total"),
 		"Number of pages read across all page reads (ie counting all pages read even if they are read in a single operation) (PagesInputPersec)",
 		nil,
 		nil,
 	)
-	c.SwapPagesWrittenTotal = prometheus.NewDesc(
+	c.swapPagesWrittenTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "swap_pages_written_total"),
 		"Number of pages written across all page writes (ie counting all pages written even if they are written in a single operation) (PagesOutputPersec)",
 		nil,
 		nil,
 	)
-	c.SwapPageOperationsTotal = prometheus.NewDesc(
+	c.swapPageOperationsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "swap_page_operations_total"),
 		"Total number of swap page read and writes (PagesPersec)",
 		nil,
 		nil,
 	)
-	c.SwapPageWritesTotal = prometheus.NewDesc(
+	c.swapPageWritesTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "swap_page_writes_total"),
 		"Number of disk page writes (a single write operation writing several pages is still only counted once) (PageWritesPersec)",
 		nil,
 		nil,
 	)
-	c.PoolNonpagedAllocsTotal = prometheus.NewDesc(
+	c.poolNonPagedAllocationsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "pool_nonpaged_allocs_total"),
 		"The number of calls to allocate space in the nonpaged pool. The nonpaged pool is an area of system memory area for objects that cannot be written"+
 			" to disk, and must remain in physical memory as long as they are allocated (PoolNonpagedAllocs)",
 		nil,
 		nil,
 	)
-	c.PoolNonpagedBytes = prometheus.NewDesc(
+	c.poolNonPagedBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "pool_nonpaged_bytes"),
 		"Number of bytes in the non-paged pool, an area of the system virtual memory that is used for objects that cannot be written to disk, but must "+
 			"remain in physical memory as long as they are allocated (PoolNonpagedBytes)",
 		nil,
 		nil,
 	)
-	c.PoolPagedAllocsTotal = prometheus.NewDesc(
+	c.poolPagedAllocationsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "pool_paged_allocs_total"),
 		"Number of calls to allocate space in the paged pool, regardless of the amount of space allocated in each call (PoolPagedAllocs)",
 		nil,
 		nil,
 	)
-	c.PoolPagedBytes = prometheus.NewDesc(
+	c.poolPagedBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "pool_paged_bytes"),
 		"(PoolPagedBytes)",
 		nil,
 		nil,
 	)
-	c.PoolPagedResidentBytes = prometheus.NewDesc(
+	c.poolPagedResidentBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "pool_paged_resident_bytes"),
 		"The size, in bytes, of the portion of the paged pool that is currently resident and active in physical memory. The paged pool is an area of the "+
 			"system virtual memory that is used for objects that can be written to disk when they are not being used (PoolPagedResidentBytes)",
 		nil,
 		nil,
 	)
-	c.StandbyCacheCoreBytes = prometheus.NewDesc(
+	c.standbyCacheCoreBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "standby_cache_core_bytes"),
 		"The amount of physical memory, in bytes, that is assigned to the core standby cache page lists. This memory contains cached data and code that is "+
 			"not actively in use by processes, the system and the system cache (StandbyCacheCoreBytes)",
 		nil,
 		nil,
 	)
-	c.StandbyCacheNormalPriorityBytes = prometheus.NewDesc(
+	c.standbyCacheNormalPriorityBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "standby_cache_normal_priority_bytes"),
 		"The amount of physical memory, in bytes, that is assigned to the normal priority standby cache page lists. This memory contains cached data and "+
 			"code that is not actively in use by processes, the system and the system cache (StandbyCacheNormalPriorityBytes)",
 		nil,
 		nil,
 	)
-	c.StandbyCacheReserveBytes = prometheus.NewDesc(
+	c.standbyCacheReserveBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "standby_cache_reserve_bytes"),
 		"The amount of physical memory, in bytes, that is assigned to the reserve standby cache page lists. This memory contains cached data and code "+
 			"that is not actively in use by processes, the system and the system cache (StandbyCacheReserveBytes)",
 		nil,
 		nil,
 	)
-	c.SystemCacheResidentBytes = prometheus.NewDesc(
+	c.systemCacheResidentBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "system_cache_resident_bytes"),
 		"The size, in bytes, of the portion of the system file cache which is currently resident and active in physical memory (SystemCacheResidentBytes)",
 		nil,
 		nil,
 	)
-	c.SystemCodeResidentBytes = prometheus.NewDesc(
+	c.systemCodeResidentBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "system_code_resident_bytes"),
 		"The size, in bytes, of the pageable operating system code that is currently resident and active in physical memory (SystemCodeResidentBytes)",
 		nil,
 		nil,
 	)
-	c.SystemCodeTotalBytes = prometheus.NewDesc(
+	c.systemCodeTotalBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "system_code_total_bytes"),
 		"The size, in bytes, of the pageable operating system code currently mapped into the system virtual address space (SystemCodeTotalBytes)",
 		nil,
 		nil,
 	)
-	c.SystemDriverResidentBytes = prometheus.NewDesc(
+	c.systemDriverResidentBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "system_driver_resident_bytes"),
 		"The size, in bytes, of the pageable physical memory being used by device drivers. It is the working set (physical memory area) of the drivers (SystemDriverResidentBytes)",
 		nil,
 		nil,
 	)
-	c.SystemDriverTotalBytes = prometheus.NewDesc(
+	c.systemDriverTotalBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "system_driver_total_bytes"),
 		"The size, in bytes, of the pageable virtual memory currently being used by device drivers. Pageable memory can be written to disk when it is not being used (SystemDriverTotalBytes)",
 		nil,
 		nil,
 	)
-	c.TransitionFaultsTotal = prometheus.NewDesc(
+	c.transitionFaultsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "transition_faults_total"),
 		"Number of faults rate at which page faults are resolved by recovering pages that were being used by another process sharing the page, or were on the "+
 			"modified page list or the standby list, or were being written to disk at the time of the page fault (TransitionFaultsPersec)",
 		nil,
 		nil,
 	)
-	c.TransitionPagesRepurposedTotal = prometheus.NewDesc(
+	c.transitionPagesRepurposedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "transition_pages_repurposed_total"),
 		"Transition Pages RePurposed is the rate at which the number of transition cache pages were reused for a different purpose (TransitionPagesRePurposedPersec)",
 		nil,
 		nil,
 	)
-	c.WriteCopiesTotal = prometheus.NewDesc(
+	c.writeCopiesTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "write_copies_total"),
 		"The number of page faults caused by attempting to write that were satisfied by copying the page from elsewhere in physical memory (WriteCopiesPersec)",
 		nil,
@@ -290,9 +303,9 @@ func (c *collector) Build() error {
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ctx, ch); err != nil {
-		_ = level.Error(c.logger).Log("failed collecting memory metrics", "desc", desc, "err", err)
+func (c *Collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collect(ctx, ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed collecting memory metrics", "err", err)
 		return err
 	}
 	return nil
@@ -335,203 +348,203 @@ type memory struct {
 	WriteCopiesPersec               float64 `perflib:"Write Copies/sec"`
 }
 
-func (c *collector) collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *Collector) collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	var dst []memory
 	if err := perflib.UnmarshalObject(ctx.PerfObjects["Memory"], &dst, c.logger); err != nil {
-		return nil, err
+		return err
 	}
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AvailableBytes,
+		c.availableBytes,
 		prometheus.GaugeValue,
 		dst[0].AvailableBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.CacheBytes,
+		c.cacheBytes,
 		prometheus.GaugeValue,
 		dst[0].CacheBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.CacheBytesPeak,
+		c.cacheBytesPeak,
 		prometheus.GaugeValue,
 		dst[0].CacheBytesPeak,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.CacheFaultsTotal,
+		c.cacheFaultsTotal,
 		prometheus.CounterValue,
 		dst[0].CacheFaultsPersec,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.CommitLimit,
+		c.commitLimit,
 		prometheus.GaugeValue,
 		dst[0].CommitLimit,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.CommittedBytes,
+		c.committedBytes,
 		prometheus.GaugeValue,
 		dst[0].CommittedBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.DemandZeroFaultsTotal,
+		c.demandZeroFaultsTotal,
 		prometheus.CounterValue,
 		dst[0].DemandZeroFaultsPersec,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.FreeAndZeroPageListBytes,
+		c.freeAndZeroPageListBytes,
 		prometheus.GaugeValue,
 		dst[0].FreeAndZeroPageListBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.FreeSystemPageTableEntries,
+		c.freeSystemPageTableEntries,
 		prometheus.GaugeValue,
 		dst[0].FreeSystemPageTableEntries,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.ModifiedPageListBytes,
+		c.modifiedPageListBytes,
 		prometheus.GaugeValue,
 		dst[0].ModifiedPageListBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.PageFaultsTotal,
+		c.pageFaultsTotal,
 		prometheus.CounterValue,
 		dst[0].PageFaultsPersec,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.SwapPageReadsTotal,
+		c.swapPageReadsTotal,
 		prometheus.CounterValue,
 		dst[0].PageReadsPersec,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.SwapPagesReadTotal,
+		c.swapPagesReadTotal,
 		prometheus.CounterValue,
 		dst[0].PagesInputPersec,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.SwapPagesWrittenTotal,
+		c.swapPagesWrittenTotal,
 		prometheus.CounterValue,
 		dst[0].PagesOutputPersec,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.SwapPageOperationsTotal,
+		c.swapPageOperationsTotal,
 		prometheus.CounterValue,
 		dst[0].PagesPersec,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.SwapPageWritesTotal,
+		c.swapPageWritesTotal,
 		prometheus.CounterValue,
 		dst[0].PageWritesPersec,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.PoolNonpagedAllocsTotal,
+		c.poolNonPagedAllocationsTotal,
 		prometheus.GaugeValue,
 		dst[0].PoolNonpagedAllocs,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.PoolNonpagedBytes,
+		c.poolNonPagedBytes,
 		prometheus.GaugeValue,
 		dst[0].PoolNonpagedBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.PoolPagedAllocsTotal,
+		c.poolPagedAllocationsTotal,
 		prometheus.CounterValue,
 		dst[0].PoolPagedAllocs,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.PoolPagedBytes,
+		c.poolPagedBytes,
 		prometheus.GaugeValue,
 		dst[0].PoolPagedBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.PoolPagedResidentBytes,
+		c.poolPagedResidentBytes,
 		prometheus.GaugeValue,
 		dst[0].PoolPagedResidentBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.StandbyCacheCoreBytes,
+		c.standbyCacheCoreBytes,
 		prometheus.GaugeValue,
 		dst[0].StandbyCacheCoreBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.StandbyCacheNormalPriorityBytes,
+		c.standbyCacheNormalPriorityBytes,
 		prometheus.GaugeValue,
 		dst[0].StandbyCacheNormalPriorityBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.StandbyCacheReserveBytes,
+		c.standbyCacheReserveBytes,
 		prometheus.GaugeValue,
 		dst[0].StandbyCacheReserveBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.SystemCacheResidentBytes,
+		c.systemCacheResidentBytes,
 		prometheus.GaugeValue,
 		dst[0].SystemCacheResidentBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.SystemCodeResidentBytes,
+		c.systemCodeResidentBytes,
 		prometheus.GaugeValue,
 		dst[0].SystemCodeResidentBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.SystemCodeTotalBytes,
+		c.systemCodeTotalBytes,
 		prometheus.GaugeValue,
 		dst[0].SystemCodeTotalBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.SystemDriverResidentBytes,
+		c.systemDriverResidentBytes,
 		prometheus.GaugeValue,
 		dst[0].SystemDriverResidentBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.SystemDriverTotalBytes,
+		c.systemDriverTotalBytes,
 		prometheus.GaugeValue,
 		dst[0].SystemDriverTotalBytes,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.TransitionFaultsTotal,
+		c.transitionFaultsTotal,
 		prometheus.CounterValue,
 		dst[0].TransitionFaultsPersec,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.TransitionPagesRepurposedTotal,
+		c.transitionPagesRepurposedTotal,
 		prometheus.CounterValue,
 		dst[0].TransitionPagesRePurposedPersec,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.WriteCopiesTotal,
+		c.writeCopiesTotal,
 		prometheus.CounterValue,
 		dst[0].WriteCopiesPersec,
 	)
 
-	return nil, nil
+	return nil
 }

pkg/collector/mscluster_network/mscluster_network.go

@@ -1,11 +1,10 @@
 package mscluster_network
 
 import (
-	"github.com/prometheus-community/windows_exporter/pkg/types"
-	"github.com/prometheus-community/windows_exporter/pkg/wmi"
-
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/go-kit/log"
+	"github.com/prometheus-community/windows_exporter/pkg/types"
+	"github.com/prometheus-community/windows_exporter/pkg/wmi"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -15,65 +14,78 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-// A collector is a Prometheus collector for WMI MSCluster_Network metrics
-type collector struct {
+// A Collector is a Prometheus Collector for WMI MSCluster_Network metrics.
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	Characteristics *prometheus.Desc
-	Flags           *prometheus.Desc
-	Metric          *prometheus.Desc
-	Role            *prometheus.Desc
-	State           *prometheus.Desc
+	characteristics *prometheus.Desc
+	flags           *prometheus.Desc
+	metric          *prometheus.Desc
+	role            *prometheus.Desc
+	state           *prometheus.Desc
 }
 
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{"Memory"}, nil
 }
 
-func (c *collector) Build() error {
-	c.Characteristics = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.characteristics = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "characteristics"),
 		"Provides the characteristics of the network.",
 		[]string{"name"},
 		nil,
 	)
-	c.Flags = prometheus.NewDesc(
+	c.flags = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "flags"),
 		"Provides access to the flags set for the node. ",
 		[]string{"name"},
 		nil,
 	)
-	c.Metric = prometheus.NewDesc(
+	c.metric = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "metric"),
 		"The metric of a cluster network (networks with lower values are used first). If this value is set, then the AutoMetric property is set to false.",
 		[]string{"name"},
 		nil,
 	)
-	c.Role = prometheus.NewDesc(
+	c.role = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "role"),
 		"Provides access to the network's Role property. The Role property describes the role of the network in the cluster. 0: None; 1: Cluster; 2: Client; 3: Both ",
 		[]string{"name"},
 		nil,
 	)
-	c.State = prometheus.NewDesc(
+	c.state = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "state"),
 		"Provides the current state of the network. 1-1: Unknown; 0: Unavailable; 1: Down; 2: Partitioned; 3: Up",
 		[]string{"name"},
@@ -95,8 +107,8 @@ type MSCluster_Network struct {
 }
 
 // Collect sends the metric values for each metric
-// to the provided prometheus Metric channel.
-func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+// to the provided prometheus metric channel.
+func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	var dst []MSCluster_Network
 	q := wmi.QueryAll(&dst, c.logger)
 	if err := wmi.QueryNamespace(q, &dst, "root/MSCluster"); err != nil {
@@ -105,35 +117,35 @@ func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric)
 
 	for _, v := range dst {
 		ch <- prometheus.MustNewConstMetric(
-			c.Characteristics,
+			c.characteristics,
 			prometheus.GaugeValue,
 			float64(v.Characteristics),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.Flags,
+			c.flags,
 			prometheus.GaugeValue,
 			float64(v.Flags),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.Metric,
+			c.metric,
 			prometheus.GaugeValue,
 			float64(v.Metric),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.Role,
+			c.role,
 			prometheus.GaugeValue,
 			float64(v.Role),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.State,
+			c.state,
 			prometheus.GaugeValue,
 			float64(v.State),
 			v.Name,

pkg/collector/mscluster_node/mscluster_node.go

@@ -1,11 +1,10 @@
 package mscluster_node
 
 import (
-	"github.com/prometheus-community/windows_exporter/pkg/types"
-	"github.com/prometheus-community/windows_exporter/pkg/wmi"
-
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/go-kit/log"
+	"github.com/prometheus-community/windows_exporter/pkg/types"
+	"github.com/prometheus-community/windows_exporter/pkg/wmi"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -15,131 +14,144 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-// Variable used by mscluster_resource and mscluster_resourcegroup
+// Variable used by mscluster_resource and mscluster_resourcegroup.
 var NodeName []string
 
-// A collector is a Prometheus collector for WMI MSCluster_Node metrics
-type collector struct {
+// A Collector is a Prometheus Collector for WMI MSCluster_Node metrics.
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	BuildNumber           *prometheus.Desc
-	Characteristics       *prometheus.Desc
-	DetectedCloudPlatform *prometheus.Desc
-	DynamicWeight         *prometheus.Desc
-	Flags                 *prometheus.Desc
-	MajorVersion          *prometheus.Desc
-	MinorVersion          *prometheus.Desc
-	NeedsPreventQuorum    *prometheus.Desc
-	NodeDrainStatus       *prometheus.Desc
-	NodeHighestVersion    *prometheus.Desc
-	NodeLowestVersion     *prometheus.Desc
-	NodeWeight            *prometheus.Desc
-	State                 *prometheus.Desc
-	StatusInformation     *prometheus.Desc
+	buildNumber           *prometheus.Desc
+	characteristics       *prometheus.Desc
+	detectedCloudPlatform *prometheus.Desc
+	dynamicWeight         *prometheus.Desc
+	flags                 *prometheus.Desc
+	majorVersion          *prometheus.Desc
+	minorVersion          *prometheus.Desc
+	needsPreventQuorum    *prometheus.Desc
+	nodeDrainStatus       *prometheus.Desc
+	nodeHighestVersion    *prometheus.Desc
+	nodeLowestVersion     *prometheus.Desc
+	nodeWeight            *prometheus.Desc
+	state                 *prometheus.Desc
+	statusInformation     *prometheus.Desc
 }
 
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{"Memory"}, nil
 }
 
-func (c *collector) Build() error {
-	c.BuildNumber = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.buildNumber = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "build_number"),
 		"Provides access to the node's BuildNumber property.",
 		[]string{"name"},
 		nil,
 	)
-	c.Characteristics = prometheus.NewDesc(
+	c.characteristics = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "characteristics"),
 		"Provides access to the characteristics set for the node.",
 		[]string{"name"},
 		nil,
 	)
-	c.DetectedCloudPlatform = prometheus.NewDesc(
+	c.detectedCloudPlatform = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "detected_cloud_platform"),
 		"(DetectedCloudPlatform)",
 		[]string{"name"},
 		nil,
 	)
-	c.DynamicWeight = prometheus.NewDesc(
+	c.dynamicWeight = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "dynamic_weight"),
 		"The dynamic vote weight of the node adjusted by dynamic quorum feature.",
 		[]string{"name"},
 		nil,
 	)
-	c.Flags = prometheus.NewDesc(
+	c.flags = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "flags"),
 		"Provides access to the flags set for the node.",
 		[]string{"name"},
 		nil,
 	)
-	c.MajorVersion = prometheus.NewDesc(
+	c.majorVersion = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "major_version"),
 		"Provides access to the node's MajorVersion property, which specifies the major portion of the Windows version installed.",
 		[]string{"name"},
 		nil,
 	)
-	c.MinorVersion = prometheus.NewDesc(
+	c.minorVersion = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "minor_version"),
 		"Provides access to the node's MinorVersion property, which specifies the minor portion of the Windows version installed.",
 		[]string{"name"},
 		nil,
 	)
-	c.NeedsPreventQuorum = prometheus.NewDesc(
+	c.needsPreventQuorum = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "needs_prevent_quorum"),
 		"Whether the cluster service on that node should be started with prevent quorum flag.",
 		[]string{"name"},
 		nil,
 	)
-	c.NodeDrainStatus = prometheus.NewDesc(
+	c.nodeDrainStatus = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "node_drain_status"),
 		"The current node drain status of a node. 0: Not Initiated; 1: In Progress; 2: Completed; 3: Failed",
 		[]string{"name"},
 		nil,
 	)
-	c.NodeHighestVersion = prometheus.NewDesc(
+	c.nodeHighestVersion = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "node_highest_version"),
 		"Provides access to the node's NodeHighestVersion property, which specifies the highest possible version of the cluster service with which the node can join or communicate.",
 		[]string{"name"},
 		nil,
 	)
-	c.NodeLowestVersion = prometheus.NewDesc(
+	c.nodeLowestVersion = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "node_lowest_version"),
 		"Provides access to the node's NodeLowestVersion property, which specifies the lowest possible version of the cluster service with which the node can join or communicate.",
 		[]string{"name"},
 		nil,
 	)
-	c.NodeWeight = prometheus.NewDesc(
+	c.nodeWeight = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "node_weight"),
 		"The vote weight of the node.",
 		[]string{"name"},
 		nil,
 	)
-	c.State = prometheus.NewDesc(
+	c.state = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "state"),
 		"Returns the current state of a node. -1: Unknown; 0: Up; 1: Down; 2: Paused; 3: Joining",
 		[]string{"name"},
 		nil,
 	)
-	c.StatusInformation = prometheus.NewDesc(
+	c.statusInformation = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "status_information"),
 		"The isolation or quarantine status of the node.",
 		[]string{"name"},
@@ -171,7 +183,7 @@ type MSCluster_Node struct {
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	var dst []MSCluster_Node
 	q := wmi.QueryAll(&dst, c.logger)
 	if err := wmi.QueryNamespace(q, &dst, "root/MSCluster"); err != nil {
@@ -181,100 +193,99 @@ func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric)
 	NodeName = []string{}
 
 	for _, v := range dst {
-
 		ch <- prometheus.MustNewConstMetric(
-			c.BuildNumber,
+			c.buildNumber,
 			prometheus.GaugeValue,
 			float64(v.BuildNumber),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.Characteristics,
+			c.characteristics,
 			prometheus.GaugeValue,
 			float64(v.Characteristics),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.DetectedCloudPlatform,
+			c.detectedCloudPlatform,
 			prometheus.GaugeValue,
 			float64(v.DetectedCloudPlatform),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.DynamicWeight,
+			c.dynamicWeight,
 			prometheus.GaugeValue,
 			float64(v.DynamicWeight),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.Flags,
+			c.flags,
 			prometheus.GaugeValue,
 			float64(v.Flags),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.MajorVersion,
+			c.majorVersion,
 			prometheus.GaugeValue,
 			float64(v.MajorVersion),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.MinorVersion,
+			c.minorVersion,
 			prometheus.GaugeValue,
 			float64(v.MinorVersion),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.NeedsPreventQuorum,
+			c.needsPreventQuorum,
 			prometheus.GaugeValue,
 			float64(v.NeedsPreventQuorum),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.NodeDrainStatus,
+			c.nodeDrainStatus,
 			prometheus.GaugeValue,
 			float64(v.NodeDrainStatus),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.NodeHighestVersion,
+			c.nodeHighestVersion,
 			prometheus.GaugeValue,
 			float64(v.NodeHighestVersion),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.NodeLowestVersion,
+			c.nodeLowestVersion,
 			prometheus.GaugeValue,
 			float64(v.NodeLowestVersion),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.NodeWeight,
+			c.nodeWeight,
 			prometheus.GaugeValue,
 			float64(v.NodeWeight),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.State,
+			c.state,
 			prometheus.GaugeValue,
 			float64(v.State),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.StatusInformation,
+			c.statusInformation,
 			prometheus.GaugeValue,
 			float64(v.StatusInformation),
 			v.Name,

pkg/collector/mscluster_resource/mscluster_resource.go

@@ -1,12 +1,11 @@
 package mscluster_resource
 
 import (
+	"github.com/alecthomas/kingpin/v2"
+	"github.com/go-kit/log"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/mscluster_node"
 	"github.com/prometheus-community/windows_exporter/pkg/types"
 	"github.com/prometheus-community/windows_exporter/pkg/wmi"
-
-	"github.com/alecthomas/kingpin/v2"
-	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -16,155 +15,168 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-// A collector is a Prometheus collector for WMI MSCluster_Resource metrics
-type collector struct {
+// A Collector is a Prometheus Collector for WMI MSCluster_Resource metrics.
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	Characteristics        *prometheus.Desc
-	DeadlockTimeout        *prometheus.Desc
-	EmbeddedFailureAction  *prometheus.Desc
-	Flags                  *prometheus.Desc
-	IsAlivePollInterval    *prometheus.Desc
-	LooksAlivePollInterval *prometheus.Desc
-	MonitorProcessId       *prometheus.Desc
-	OwnerNode              *prometheus.Desc
-	PendingTimeout         *prometheus.Desc
-	ResourceClass          *prometheus.Desc
-	RestartAction          *prometheus.Desc
-	RestartDelay           *prometheus.Desc
-	RestartPeriod          *prometheus.Desc
-	RestartThreshold       *prometheus.Desc
-	RetryPeriodOnFailure   *prometheus.Desc
-	State                  *prometheus.Desc
-	Subclass               *prometheus.Desc
+	characteristics        *prometheus.Desc
+	deadlockTimeout        *prometheus.Desc
+	embeddedFailureAction  *prometheus.Desc
+	flags                  *prometheus.Desc
+	isAlivePollInterval    *prometheus.Desc
+	looksAlivePollInterval *prometheus.Desc
+	monitorProcessId       *prometheus.Desc
+	ownerNode              *prometheus.Desc
+	pendingTimeout         *prometheus.Desc
+	resourceClass          *prometheus.Desc
+	restartAction          *prometheus.Desc
+	restartDelay           *prometheus.Desc
+	restartPeriod          *prometheus.Desc
+	restartThreshold       *prometheus.Desc
+	retryPeriodOnFailure   *prometheus.Desc
+	state                  *prometheus.Desc
+	subclass               *prometheus.Desc
 }
 
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{"Memory"}, nil
 }
 
-func (c *collector) Build() error {
-	c.Characteristics = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.characteristics = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "characteristics"),
 		"Provides the characteristics of the object.",
 		[]string{"type", "owner_group", "name"},
 		nil,
 	)
-	c.DeadlockTimeout = prometheus.NewDesc(
+	c.deadlockTimeout = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "deadlock_timeout"),
 		"Indicates the length of time to wait, in milliseconds, before declaring a deadlock in any call into a resource.",
 		[]string{"type", "owner_group", "name"},
 		nil,
 	)
-	c.EmbeddedFailureAction = prometheus.NewDesc(
+	c.embeddedFailureAction = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "embedded_failure_action"),
 		"The time, in milliseconds, that a resource should remain in a failed state before the Cluster service attempts to restart it.",
 		[]string{"type", "owner_group", "name"},
 		nil,
 	)
-	c.Flags = prometheus.NewDesc(
+	c.flags = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "flags"),
 		"Provides access to the flags set for the object.",
 		[]string{"type", "owner_group", "name"},
 		nil,
 	)
-	c.IsAlivePollInterval = prometheus.NewDesc(
+	c.isAlivePollInterval = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "is_alive_poll_interval"),
 		"Provides access to the resource's IsAlivePollInterval property, which is the recommended interval in milliseconds at which the Cluster Service should poll the resource to determine whether it is operational. If the property is set to 0xFFFFFFFF, the Cluster Service uses the IsAlivePollInterval property for the resource type associated with the resource.",
 		[]string{"type", "owner_group", "name"},
 		nil,
 	)
-	c.LooksAlivePollInterval = prometheus.NewDesc(
+	c.looksAlivePollInterval = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "looks_alive_poll_interval"),
 		"Provides access to the resource's LooksAlivePollInterval property, which is the recommended interval in milliseconds at which the Cluster Service should poll the resource to determine whether it appears operational. If the property is set to 0xFFFFFFFF, the Cluster Service uses the LooksAlivePollInterval property for the resource type associated with the resource.",
 		[]string{"type", "owner_group", "name"},
 		nil,
 	)
-	c.MonitorProcessId = prometheus.NewDesc(
+	c.monitorProcessId = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "monitor_process_id"),
 		"Provides the process ID of the resource host service that is currently hosting the resource.",
 		[]string{"type", "owner_group", "name"},
 		nil,
 	)
-	c.OwnerNode = prometheus.NewDesc(
+	c.ownerNode = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "owner_node"),
 		"The node hosting the resource. 0: Not hosted; 1: Hosted",
 		[]string{"type", "owner_group", "node_name", "name"},
 		nil,
 	)
-	c.OwnerNode = prometheus.NewDesc(
+	c.ownerNode = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "owner_node"),
 		"The node hosting the resource. 0: Not hosted; 1: Hosted",
 		[]string{"type", "owner_group", "node_name", "name"},
 		nil,
 	)
-	c.PendingTimeout = prometheus.NewDesc(
+	c.pendingTimeout = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "pending_timeout"),
 		"Provides access to the resource's PendingTimeout property. If a resource cannot be brought online or taken offline in the number of milliseconds specified by the PendingTimeout property, the resource is forcibly terminated.",
 		[]string{"type", "owner_group", "name"},
 		nil,
 	)
-	c.ResourceClass = prometheus.NewDesc(
+	c.resourceClass = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "resource_class"),
 		"Gets or sets the resource class of a resource. 0: Unknown; 1: Storage; 2: Network; 32768: Unknown ",
 		[]string{"type", "owner_group", "name"},
 		nil,
 	)
-	c.RestartAction = prometheus.NewDesc(
+	c.restartAction = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "restart_action"),
 		"Provides access to the resource's RestartAction property, which is the action to be taken by the Cluster Service if the resource fails.",
 		[]string{"type", "owner_group", "name"},
 		nil,
 	)
-	c.RestartDelay = prometheus.NewDesc(
+	c.restartDelay = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "restart_delay"),
 		"Indicates the time delay before a failed resource is restarted.",
 		[]string{"type", "owner_group", "name"},
 		nil,
 	)
-	c.RestartPeriod = prometheus.NewDesc(
+	c.restartPeriod = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "restart_period"),
 		"Provides access to the resource's RestartPeriod property, which is interval of time, in milliseconds, during which a specified number of restart attempts can be made on a nonresponsive resource.",
 		[]string{"type", "owner_group", "name"},
 		nil,
 	)
-	c.RestartThreshold = prometheus.NewDesc(
+	c.restartThreshold = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "restart_threshold"),
 		"Provides access to the resource's RestartThreshold property which is the maximum number of restart attempts that can be made on a resource within an interval defined by the RestartPeriod property before the Cluster Service initiates the action specified by the RestartAction property.",
 		[]string{"type", "owner_group", "name"},
 		nil,
 	)
-	c.RetryPeriodOnFailure = prometheus.NewDesc(
+	c.retryPeriodOnFailure = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "retry_period_on_failure"),
 		"Provides access to the resource's RetryPeriodOnFailure property, which is the interval of time (in milliseconds) that a resource should remain in a failed state before the Cluster service attempts to restart it.",
 		[]string{"type", "owner_group", "name"},
 		nil,
 	)
-	c.State = prometheus.NewDesc(
+	c.state = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "state"),
 		"The current state of the resource. -1: Unknown; 0: Inherited; 1: Initializing; 2: Online; 3: Offline; 4: Failed; 128: Pending; 129: Online Pending; 130: Offline Pending ",
 		[]string{"type", "owner_group", "name"},
 		nil,
 	)
-	c.Subclass = prometheus.NewDesc(
+	c.subclass = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "subclass"),
 		"Provides the list of references to nodes that can be the owner of this resource.",
 		[]string{"type", "owner_group", "name"},
@@ -201,7 +213,7 @@ type MSCluster_Resource struct {
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	var dst []MSCluster_Resource
 	q := wmi.QueryAll(&dst, c.logger)
 	if err := wmi.QueryNamespace(q, &dst, "root/MSCluster"); err != nil {
@@ -209,51 +221,50 @@ func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric)
 	}
 
 	for _, v := range dst {
-
 		ch <- prometheus.MustNewConstMetric(
-			c.Characteristics,
+			c.characteristics,
 			prometheus.GaugeValue,
 			float64(v.Characteristics),
 			v.Type, v.OwnerGroup, v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.DeadlockTimeout,
+			c.deadlockTimeout,
 			prometheus.GaugeValue,
 			float64(v.DeadlockTimeout),
 			v.Type, v.OwnerGroup, v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.EmbeddedFailureAction,
+			c.embeddedFailureAction,
 			prometheus.GaugeValue,
 			float64(v.EmbeddedFailureAction),
 			v.Type, v.OwnerGroup, v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.Flags,
+			c.flags,
 			prometheus.GaugeValue,
 			float64(v.Flags),
 			v.Type, v.OwnerGroup, v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.IsAlivePollInterval,
+			c.isAlivePollInterval,
 			prometheus.GaugeValue,
 			float64(v.IsAlivePollInterval),
 			v.Type, v.OwnerGroup, v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.LooksAlivePollInterval,
+			c.looksAlivePollInterval,
 			prometheus.GaugeValue,
 			float64(v.LooksAlivePollInterval),
 			v.Type, v.OwnerGroup, v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.MonitorProcessId,
+			c.monitorProcessId,
 			prometheus.GaugeValue,
 			float64(v.MonitorProcessId),
 			v.Type, v.OwnerGroup, v.Name,
@@ -266,7 +277,7 @@ func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric)
 					isCurrentState = 1.0
 				}
 				ch <- prometheus.MustNewConstMetric(
-					c.OwnerNode,
+					c.ownerNode,
 					prometheus.GaugeValue,
 					isCurrentState,
 					v.Type, v.OwnerGroup, node_name, v.Name,
@@ -275,63 +286,63 @@ func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric)
 		}
 
 		ch <- prometheus.MustNewConstMetric(
-			c.PendingTimeout,
+			c.pendingTimeout,
 			prometheus.GaugeValue,
 			float64(v.PendingTimeout),
 			v.Type, v.OwnerGroup, v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.ResourceClass,
+			c.resourceClass,
 			prometheus.GaugeValue,
 			float64(v.ResourceClass),
 			v.Type, v.OwnerGroup, v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.RestartAction,
+			c.restartAction,
 			prometheus.GaugeValue,
 			float64(v.RestartAction),
 			v.Type, v.OwnerGroup, v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.RestartDelay,
+			c.restartDelay,
 			prometheus.GaugeValue,
 			float64(v.RestartDelay),
 			v.Type, v.OwnerGroup, v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.RestartPeriod,
+			c.restartPeriod,
 			prometheus.GaugeValue,
 			float64(v.RestartPeriod),
 			v.Type, v.OwnerGroup, v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.RestartThreshold,
+			c.restartThreshold,
 			prometheus.GaugeValue,
 			float64(v.RestartThreshold),
 			v.Type, v.OwnerGroup, v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.RetryPeriodOnFailure,
+			c.retryPeriodOnFailure,
 			prometheus.GaugeValue,
 			float64(v.RetryPeriodOnFailure),
 			v.Type, v.OwnerGroup, v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.State,
+			c.state,
 			prometheus.GaugeValue,
 			float64(v.State),
 			v.Type, v.OwnerGroup, v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.Subclass,
+			c.subclass,
 			prometheus.GaugeValue,
 			float64(v.Subclass),
 			v.Type, v.OwnerGroup, v.Name,

pkg/collector/mscluster_resourcegroup/mscluster_resourcegroup.go

@@ -1,12 +1,11 @@
 package mscluster_resourcegroup
 
 import (
+	"github.com/alecthomas/kingpin/v2"
+	"github.com/go-kit/log"
 	"github.com/prometheus-community/windows_exporter/pkg/collector/mscluster_node"
 	"github.com/prometheus-community/windows_exporter/pkg/types"
 	"github.com/prometheus-community/windows_exporter/pkg/wmi"
-
-	"github.com/alecthomas/kingpin/v2"
-	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -16,136 +15,147 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-// A collector is a Prometheus collector for WMI MSCluster_ResourceGroup metrics
-type collector struct {
+// A Collector is a Prometheus Collector for WMI MSCluster_ResourceGroup metrics.
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	AutoFailbackType    *prometheus.Desc
-	Characteristics     *prometheus.Desc
-	ColdStartSetting    *prometheus.Desc
-	DefaultOwner        *prometheus.Desc
-	FailbackWindowEnd   *prometheus.Desc
-	FailbackWindowStart *prometheus.Desc
-	FailoverPeriod      *prometheus.Desc
-	FailoverThreshold   *prometheus.Desc
-	FaultDomain         *prometheus.Desc
-	Flags               *prometheus.Desc
-	GroupType           *prometheus.Desc
-	PlacementOptions    *prometheus.Desc
-	OwnerNode           *prometheus.Desc
-	Priority            *prometheus.Desc
-	ResiliencyPeriod    *prometheus.Desc
-	State               *prometheus.Desc
+	autoFailbackType    *prometheus.Desc
+	characteristics     *prometheus.Desc
+	coldStartSetting    *prometheus.Desc
+	defaultOwner        *prometheus.Desc
+	failbackWindowEnd   *prometheus.Desc
+	failbackWindowStart *prometheus.Desc
+	failOverPeriod      *prometheus.Desc
+	failOverThreshold   *prometheus.Desc
+	flags               *prometheus.Desc
+	groupType           *prometheus.Desc
+	ownerNode           *prometheus.Desc
+	priority            *prometheus.Desc
+	resiliencyPeriod    *prometheus.Desc
+	state               *prometheus.Desc
 }
 
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{"Memory"}, nil
 }
 
-func (c *collector) Build() error {
-	c.AutoFailbackType = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.autoFailbackType = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "auto_failback_type"),
 		"Provides access to the group's AutoFailbackType property.",
 		[]string{"name"},
 		nil,
 	)
-	c.Characteristics = prometheus.NewDesc(
+	c.characteristics = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "characteristics"),
 		"Provides the characteristics of the group.",
 		[]string{"name"},
 		nil,
 	)
-	c.ColdStartSetting = prometheus.NewDesc(
+	c.coldStartSetting = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "cold_start_setting"),
 		"Indicates whether a group can start after a cluster cold start.",
 		[]string{"name"},
 		nil,
 	)
-	c.DefaultOwner = prometheus.NewDesc(
+	c.defaultOwner = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "default_owner"),
 		"Number of the last node the resource group was activated on or explicitly moved to.",
 		[]string{"name"},
 		nil,
 	)
-	c.FailbackWindowEnd = prometheus.NewDesc(
+	c.failbackWindowEnd = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "failback_window_end"),
 		"The FailbackWindowEnd property provides the latest time that the group can be moved back to the node identified as its preferred node.",
 		[]string{"name"},
 		nil,
 	)
-	c.FailbackWindowStart = prometheus.NewDesc(
+	c.failbackWindowStart = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "failback_window_start"),
 		"The FailbackWindowStart property provides the earliest time (that is, local time as kept by the cluster) that the group can be moved back to the node identified as its preferred node.",
 		[]string{"name"},
 		nil,
 	)
-	c.FailoverPeriod = prometheus.NewDesc(
+	c.failOverPeriod = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "failover_period"),
 		"The FailoverPeriod property specifies a number of hours during which a maximum number of failover attempts, specified by the FailoverThreshold property, can occur.",
 		[]string{"name"},
 		nil,
 	)
-	c.FailoverThreshold = prometheus.NewDesc(
+	c.failOverThreshold = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "failover_threshold"),
 		"The FailoverThreshold property specifies the maximum number of failover attempts.",
 		[]string{"name"},
 		nil,
 	)
-	c.Flags = prometheus.NewDesc(
+	c.flags = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "flags"),
 		"Provides access to the flags set for the group. ",
 		[]string{"name"},
 		nil,
 	)
-	c.GroupType = prometheus.NewDesc(
+	c.groupType = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "group_type"),
 		"The Type of the resource group.",
 		[]string{"name"},
 		nil,
 	)
-	c.OwnerNode = prometheus.NewDesc(
+	c.ownerNode = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "owner_node"),
 		"The node hosting the resource group. 0: Not hosted; 1: Hosted",
 		[]string{"node_name", "name"},
 		nil,
 	)
-	c.OwnerNode = prometheus.NewDesc(
+	c.ownerNode = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "owner_node"),
 		"The node hosting the resource group. 0: Not hosted; 1: Hosted",
 		[]string{"node_name", "name"},
 		nil,
 	)
-	c.Priority = prometheus.NewDesc(
+	c.priority = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "priority"),
 		"Priority value of the resource group",
 		[]string{"name"},
 		nil,
 	)
-	c.ResiliencyPeriod = prometheus.NewDesc(
+	c.resiliencyPeriod = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "resiliency_period"),
 		"The resiliency period for this group, in seconds.",
 		[]string{"name"},
 		nil,
 	)
-	c.State = prometheus.NewDesc(
+	c.state = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "state"),
 		"The current state of the resource group. -1: Unknown; 0: Online; 1: Offline; 2: Failed; 3: Partial Online; 4: Pending",
 		[]string{"name"},
@@ -177,7 +187,7 @@ type MSCluster_ResourceGroup struct {
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	var dst []MSCluster_ResourceGroup
 	q := wmi.QueryAll(&dst, c.logger)
 	if err := wmi.QueryNamespace(q, &dst, "root/MSCluster"); err != nil {
@@ -185,72 +195,71 @@ func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric)
 	}
 
 	for _, v := range dst {
-
 		ch <- prometheus.MustNewConstMetric(
-			c.AutoFailbackType,
+			c.autoFailbackType,
 			prometheus.GaugeValue,
 			float64(v.AutoFailbackType),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.Characteristics,
+			c.characteristics,
 			prometheus.GaugeValue,
 			float64(v.Characteristics),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.ColdStartSetting,
+			c.coldStartSetting,
 			prometheus.GaugeValue,
 			float64(v.ColdStartSetting),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.DefaultOwner,
+			c.defaultOwner,
 			prometheus.GaugeValue,
 			float64(v.DefaultOwner),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FailbackWindowEnd,
+			c.failbackWindowEnd,
 			prometheus.GaugeValue,
 			float64(v.FailbackWindowEnd),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FailbackWindowStart,
+			c.failbackWindowStart,
 			prometheus.GaugeValue,
 			float64(v.FailbackWindowStart),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FailoverPeriod,
+			c.failOverPeriod,
 			prometheus.GaugeValue,
 			float64(v.FailoverPeriod),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FailoverThreshold,
+			c.failOverThreshold,
 			prometheus.GaugeValue,
 			float64(v.FailoverThreshold),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.Flags,
+			c.flags,
 			prometheus.GaugeValue,
 			float64(v.Flags),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.GroupType,
+			c.groupType,
 			prometheus.GaugeValue,
 			float64(v.GroupType),
 			v.Name,
@@ -263,7 +272,7 @@ func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric)
 					isCurrentState = 1.0
 				}
 				ch <- prometheus.MustNewConstMetric(
-					c.OwnerNode,
+					c.ownerNode,
 					prometheus.GaugeValue,
 					isCurrentState,
 					node_name, v.Name,
@@ -272,26 +281,25 @@ func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric)
 		}
 
 		ch <- prometheus.MustNewConstMetric(
-			c.Priority,
+			c.priority,
 			prometheus.GaugeValue,
 			float64(v.Priority),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.ResiliencyPeriod,
+			c.resiliencyPeriod,
 			prometheus.GaugeValue,
 			float64(v.ResiliencyPeriod),
 			v.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.State,
+			c.state,
 			prometheus.GaugeValue,
 			float64(v.State),
 			v.Name,
 		)
-
 	}
 
 	return nil

pkg/collector/msmq/msmq.go

@@ -14,87 +14,97 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-const (
-	Name                = "msmq"
-	FlagMsmqWhereClause = "collector.msmq.msmq-where"
-)
+const Name = "msmq"
 
 type Config struct {
-	QueryWhereClause string `yaml:"query_where_clause"`
+	QueryWhereClause *string `yaml:"query_where_clause"`
 }
 
 var ConfigDefaults = Config{
-	QueryWhereClause: "",
+	QueryWhereClause: utils.ToPTR(""),
 }
 
-// A collector is a Prometheus collector for WMI Win32_PerfRawData_MSMQ_MSMQQueue metrics
-type collector struct {
+// A Collector is a Prometheus Collector for WMI Win32_PerfRawData_MSMQ_MSMQQueue metrics.
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	queryWhereClause *string
-
-	BytesinJournalQueue    *prometheus.Desc
-	BytesinQueue           *prometheus.Desc
-	MessagesinJournalQueue *prometheus.Desc
-	MessagesinQueue        *prometheus.Desc
+	bytesInJournalQueue    *prometheus.Desc
+	bytesInQueue           *prometheus.Desc
+	messagesInJournalQueue *prometheus.Desc
+	messagesInQueue        *prometheus.Desc
 }
 
-func New(logger log.Logger, config *Config) types.Collector {
+func New(logger log.Logger, config *Config) *Collector {
 	if config == nil {
 		config = &ConfigDefaults
 	}
 
-	c := &collector{
-		queryWhereClause: &config.QueryWhereClause,
+	if config.QueryWhereClause == nil {
+		config.QueryWhereClause = ConfigDefaults.QueryWhereClause
 	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(app *kingpin.Application) types.Collector {
-	return &collector{
-		queryWhereClause: app.
-			Flag(FlagMsmqWhereClause, "WQL 'where' clause to use in WMI metrics query. Limits the response to the msmqs you specify and reduces the size of the response.").
-			Default(ConfigDefaults.QueryWhereClause).String(),
+func NewWithFlags(app *kingpin.Application) *Collector {
+	c := &Collector{
+		config: ConfigDefaults,
 	}
+
+	app.Flag("collector.msmq.msmq-where", "WQL 'where' clause to use in WMI metrics query. "+
+		"Limits the response to the msmqs you specify and reduces the size of the response.").
+		Default(*c.config.QueryWhereClause).StringVar(c.config.QueryWhereClause)
+
+	return c
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{}, nil
 }
 
-func (c *collector) Build() error {
-	if utils.IsEmpty(c.queryWhereClause) {
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	if *c.config.QueryWhereClause == "" {
 		_ = level.Warn(c.logger).Log("msg", "No where-clause specified for msmq collector. This will generate a very large number of metrics!")
 	}
 
-	c.BytesinJournalQueue = prometheus.NewDesc(
+	c.bytesInJournalQueue = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "bytes_in_journal_queue"),
 		"Size of queue journal in bytes",
 		[]string{"name"},
 		nil,
 	)
-	c.BytesinQueue = prometheus.NewDesc(
+	c.bytesInQueue = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "bytes_in_queue"),
 		"Size of queue in bytes",
 		[]string{"name"},
 		nil,
 	)
-	c.MessagesinJournalQueue = prometheus.NewDesc(
+	c.messagesInJournalQueue = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "messages_in_journal_queue"),
 		"Count messages in queue journal",
 		[]string{"name"},
 		nil,
 	)
-	c.MessagesinQueue = prometheus.NewDesc(
+	c.messagesInQueue = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "messages_in_queue"),
 		"Count messages in queue",
 		[]string{"name"},
@@ -105,58 +115,60 @@ func (c *collector) Build() error {
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ch); err != nil {
-		_ = level.Error(c.logger).Log("failed collecting msmq metrics", "desc", desc, "err", err)
+func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collect(ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed collecting msmq metrics", "err", err)
 		return err
 	}
 	return nil
 }
 
-type Win32_PerfRawData_MSMQ_MSMQQueue struct {
+type msmqQueue struct {
 	Name string
 
-	BytesinJournalQueue    uint64
-	BytesinQueue           uint64
-	MessagesinJournalQueue uint64
-	MessagesinQueue        uint64
+	BytesInJournalQueue    uint64
+	BytesInQueue           uint64
+	MessagesInJournalQueue uint64
+	MessagesInQueue        uint64
 }
 
-func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
-	var dst []Win32_PerfRawData_MSMQ_MSMQQueue
-	q := wmi.QueryAllWhere(&dst, *c.queryWhereClause, c.logger)
+func (c *Collector) collect(ch chan<- prometheus.Metric) error {
+	var dst []msmqQueue
+
+	q := wmi.QueryAllForClassWhere(&dst, "Win32_PerfRawData_MSMQ_MSMQQueue", *c.config.QueryWhereClause, c.logger)
 	if err := wmi.Query(q, &dst); err != nil {
-		return nil, err
+		return err
 	}
 
 	for _, msmq := range dst {
 		ch <- prometheus.MustNewConstMetric(
-			c.BytesinJournalQueue,
+			c.bytesInJournalQueue,
 			prometheus.GaugeValue,
-			float64(msmq.BytesinJournalQueue),
+			float64(msmq.BytesInJournalQueue),
 			strings.ToLower(msmq.Name),
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.BytesinQueue,
+			c.bytesInQueue,
 			prometheus.GaugeValue,
-			float64(msmq.BytesinQueue),
+			float64(msmq.BytesInQueue),
 			strings.ToLower(msmq.Name),
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.MessagesinJournalQueue,
+			c.messagesInJournalQueue,
 			prometheus.GaugeValue,
-			float64(msmq.MessagesinJournalQueue),
+			float64(msmq.MessagesInJournalQueue),
 			strings.ToLower(msmq.Name),
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.MessagesinQueue,
+			c.messagesInQueue,
 			prometheus.GaugeValue,
-			float64(msmq.MessagesinQueue),
+			float64(msmq.MessagesInQueue),
 			strings.ToLower(msmq.Name),
 		)
 	}
-	return nil, nil
+
+	return nil
 }

pkg/collector/msmq/msmq_test.go

@@ -8,6 +8,6 @@ import (
 )
 
 func BenchmarkCollector(b *testing.B) {
-	// No context name required as collector source is WMI
+	// No context name required as Collector source is WMI
 	testutils.FuncBenchmarkCollector(b, msmq.Name, msmq.NewWithFlags)
 }

pkg/collector/net/net.go

@@ -14,190 +14,202 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-const (
-	Name = "net"
-
-	FlagNicExclude = "collector.net.nic-exclude"
-	FlagNicInclude = "collector.net.nic-include"
-)
+const Name = "net"
 
 type Config struct {
-	NicInclude string `yaml:"nic_include"`
-	NicExclude string `yaml:"nic_exclude"`
+	NicExclude *regexp.Regexp `yaml:"nic_exclude"`
+	NicInclude *regexp.Regexp `yaml:"nic_include"`
 }
 
 var ConfigDefaults = Config{
-	NicInclude: ".+",
-	NicExclude: "",
+	NicExclude: types.RegExpEmpty,
+	NicInclude: types.RegExpAny,
 }
 
 var nicNameToUnderscore = regexp.MustCompile("[^a-zA-Z0-9]")
 
-// A collector is a Prometheus collector for Perflib Network Interface metrics
-type collector struct {
+// A Collector is a Prometheus Collector for Perflib Network Interface metrics.
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	nicInclude *string
-	nicExclude *string
-
-	BytesReceivedTotal       *prometheus.Desc
-	BytesSentTotal           *prometheus.Desc
-	BytesTotal               *prometheus.Desc
-	OutputQueueLength        *prometheus.Desc
-	PacketsOutboundDiscarded *prometheus.Desc
-	PacketsOutboundErrors    *prometheus.Desc
-	PacketsTotal             *prometheus.Desc
-	PacketsReceivedDiscarded *prometheus.Desc
-	PacketsReceivedErrors    *prometheus.Desc
-	PacketsReceivedTotal     *prometheus.Desc
-	PacketsReceivedUnknown   *prometheus.Desc
-	PacketsSentTotal         *prometheus.Desc
-	CurrentBandwidth         *prometheus.Desc
-
-	nicIncludePattern *regexp.Regexp
-	nicExcludePattern *regexp.Regexp
+	bytesReceivedTotal       *prometheus.Desc
+	bytesSentTotal           *prometheus.Desc
+	bytesTotal               *prometheus.Desc
+	outputQueueLength        *prometheus.Desc
+	packetsOutboundDiscarded *prometheus.Desc
+	packetsOutboundErrors    *prometheus.Desc
+	packetsTotal             *prometheus.Desc
+	packetsReceivedDiscarded *prometheus.Desc
+	packetsReceivedErrors    *prometheus.Desc
+	packetsReceivedTotal     *prometheus.Desc
+	packetsReceivedUnknown   *prometheus.Desc
+	packetsSentTotal         *prometheus.Desc
+	currentBandwidth         *prometheus.Desc
 }
 
-func New(logger log.Logger, config *Config) types.Collector {
+func New(logger log.Logger, config *Config) *Collector {
 	if config == nil {
 		config = &ConfigDefaults
 	}
 
-	c := &collector{
-		nicExclude: &config.NicExclude,
-		nicInclude: &config.NicInclude,
+	if config.NicExclude == nil {
+		config.NicExclude = ConfigDefaults.NicExclude
 	}
+
+	if config.NicInclude == nil {
+		config.NicInclude = ConfigDefaults.NicInclude
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(app *kingpin.Application) types.Collector {
-	c := &collector{
-		nicInclude: app.Flag(
-			FlagNicInclude,
-			"Regexp of NIC:s to include. NIC name must both match include and not match exclude to be included.",
-		).Default(ConfigDefaults.NicInclude).String(),
-
-		nicExclude: app.Flag(
-			FlagNicExclude,
-			"Regexp of NIC:s to exclude. NIC name must both match include and not match exclude to be included.",
-		).Default(ConfigDefaults.NicExclude).String(),
+func NewWithFlags(app *kingpin.Application) *Collector {
+	c := &Collector{
+		config: ConfigDefaults,
 	}
 
+	var nicExclude, nicInclude string
+
+	app.Flag(
+		"collector.net.nic-exclude",
+		"Regexp of NIC:s to exclude. NIC name must both match include and not match exclude to be included.",
+	).Default(c.config.NicExclude.String()).StringVar(&nicExclude)
+
+	app.Flag(
+		"collector.net.nic-include",
+		"Regexp of NIC:s to include. NIC name must both match include and not match exclude to be included.",
+	).Default(c.config.NicInclude.String()).StringVar(&nicInclude)
+
+	app.Action(func(*kingpin.ParseContext) error {
+		var err error
+
+		c.config.NicExclude, err = regexp.Compile(fmt.Sprintf("^(?:%s)$", nicExclude))
+		if err != nil {
+			return fmt.Errorf("collector.net.nic-exclude: %w", err)
+		}
+
+		c.config.NicInclude, err = regexp.Compile(fmt.Sprintf("^(?:%s)$", nicInclude))
+		if err != nil {
+			return fmt.Errorf("collector.net.nic-include: %w", err)
+		}
+
+		return nil
+	})
+
 	return c
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{"Network Interface"}, nil
 }
 
-func (c *collector) Build() error {
-	c.BytesReceivedTotal = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.bytesReceivedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "bytes_received_total"),
 		"(Network.BytesReceivedPerSec)",
 		[]string{"nic"},
 		nil,
 	)
-	c.BytesSentTotal = prometheus.NewDesc(
+	c.bytesSentTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "bytes_sent_total"),
 		"(Network.BytesSentPerSec)",
 		[]string{"nic"},
 		nil,
 	)
-	c.BytesTotal = prometheus.NewDesc(
+	c.bytesTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "bytes_total"),
 		"(Network.BytesTotalPerSec)",
 		[]string{"nic"},
 		nil,
 	)
-	c.OutputQueueLength = prometheus.NewDesc(
+	c.outputQueueLength = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "output_queue_length_packets"),
 		"(Network.OutputQueueLength)",
 		[]string{"nic"},
 		nil,
 	)
-	c.PacketsOutboundDiscarded = prometheus.NewDesc(
+	c.packetsOutboundDiscarded = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "packets_outbound_discarded_total"),
 		"(Network.PacketsOutboundDiscarded)",
 		[]string{"nic"},
 		nil,
 	)
-	c.PacketsOutboundErrors = prometheus.NewDesc(
+	c.packetsOutboundErrors = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "packets_outbound_errors_total"),
 		"(Network.PacketsOutboundErrors)",
 		[]string{"nic"},
 		nil,
 	)
-	c.PacketsReceivedDiscarded = prometheus.NewDesc(
+	c.packetsReceivedDiscarded = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "packets_received_discarded_total"),
 		"(Network.PacketsReceivedDiscarded)",
 		[]string{"nic"},
 		nil,
 	)
-	c.PacketsReceivedErrors = prometheus.NewDesc(
+	c.packetsReceivedErrors = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "packets_received_errors_total"),
 		"(Network.PacketsReceivedErrors)",
 		[]string{"nic"},
 		nil,
 	)
-	c.PacketsReceivedTotal = prometheus.NewDesc(
+	c.packetsReceivedTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "packets_received_total"),
 		"(Network.PacketsReceivedPerSec)",
 		[]string{"nic"},
 		nil,
 	)
-	c.PacketsReceivedUnknown = prometheus.NewDesc(
+	c.packetsReceivedUnknown = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "packets_received_unknown_total"),
 		"(Network.PacketsReceivedUnknown)",
 		[]string{"nic"},
 		nil,
 	)
-	c.PacketsTotal = prometheus.NewDesc(
+	c.packetsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "packets_total"),
 		"(Network.PacketsPerSec)",
 		[]string{"nic"},
 		nil,
 	)
-	c.PacketsSentTotal = prometheus.NewDesc(
+	c.packetsSentTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "packets_sent_total"),
 		"(Network.PacketsSentPerSec)",
 		[]string{"nic"},
 		nil,
 	)
-	c.CurrentBandwidth = prometheus.NewDesc(
+	c.currentBandwidth = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "current_bandwidth_bytes"),
 		"(Network.CurrentBandwidth)",
 		[]string{"nic"},
 		nil,
 	)
 
-	var err error
-	c.nicIncludePattern, err = regexp.Compile(fmt.Sprintf("^(?:%s)$", *c.nicInclude))
-	if err != nil {
-		return err
-	}
-
-	c.nicExcludePattern, err = regexp.Compile(fmt.Sprintf("^(?:%s)$", *c.nicExclude))
-	if err != nil {
-		return err
-	}
-
 	return nil
 }
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ctx, ch); err != nil {
-		_ = level.Error(c.logger).Log("failed collecting net metrics", "desc", desc, "err", err)
+func (c *Collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collect(ctx, ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed collecting net metrics", "err", err)
 		return err
 	}
 	return nil
@@ -228,16 +240,16 @@ type networkInterface struct {
 	CurrentBandwidth         float64 `perflib:"Current Bandwidth"`
 }
 
-func (c *collector) collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *Collector) collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	var dst []networkInterface
 
 	if err := perflib.UnmarshalObject(ctx.PerfObjects["Network Interface"], &dst, c.logger); err != nil {
-		return nil, err
+		return err
 	}
 
 	for _, nic := range dst {
-		if c.nicExcludePattern.MatchString(nic.Name) ||
-			!c.nicIncludePattern.MatchString(nic.Name) {
+		if c.config.NicExclude.MatchString(nic.Name) ||
+			!c.config.NicInclude.MatchString(nic.Name) {
 			continue
 		}
 
@@ -248,83 +260,84 @@ func (c *collector) collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metri
 
 		// Counters
 		ch <- prometheus.MustNewConstMetric(
-			c.BytesReceivedTotal,
+			c.bytesReceivedTotal,
 			prometheus.CounterValue,
 			nic.BytesReceivedPerSec,
 			name,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.BytesSentTotal,
+			c.bytesSentTotal,
 			prometheus.CounterValue,
 			nic.BytesSentPerSec,
 			name,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.BytesTotal,
+			c.bytesTotal,
 			prometheus.CounterValue,
 			nic.BytesTotalPerSec,
 			name,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.OutputQueueLength,
+			c.outputQueueLength,
 			prometheus.GaugeValue,
 			nic.OutputQueueLength,
 			name,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.PacketsOutboundDiscarded,
+			c.packetsOutboundDiscarded,
 			prometheus.CounterValue,
 			nic.PacketsOutboundDiscarded,
 			name,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.PacketsOutboundErrors,
+			c.packetsOutboundErrors,
 			prometheus.CounterValue,
 			nic.PacketsOutboundErrors,
 			name,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.PacketsTotal,
+			c.packetsTotal,
 			prometheus.CounterValue,
 			nic.PacketsPerSec,
 			name,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.PacketsReceivedDiscarded,
+			c.packetsReceivedDiscarded,
 			prometheus.CounterValue,
 			nic.PacketsReceivedDiscarded,
 			name,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.PacketsReceivedErrors,
+			c.packetsReceivedErrors,
 			prometheus.CounterValue,
 			nic.PacketsReceivedErrors,
 			name,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.PacketsReceivedTotal,
+			c.packetsReceivedTotal,
 			prometheus.CounterValue,
 			nic.PacketsReceivedPerSec,
 			name,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.PacketsReceivedUnknown,
+			c.packetsReceivedUnknown,
 			prometheus.CounterValue,
 			nic.PacketsReceivedUnknown,
 			name,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.PacketsSentTotal,
+			c.packetsSentTotal,
 			prometheus.CounterValue,
 			nic.PacketsSentPerSec,
 			name,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.CurrentBandwidth,
+			c.currentBandwidth,
 			prometheus.GaugeValue,
 			nic.CurrentBandwidth/8,
 			name,
 		)
 	}
-	return nil, nil
+
+	return nil
 }

pkg/collector/net/net_bench_test.go

@@ -11,9 +11,9 @@ import (
 )
 
 func BenchmarkCollector(b *testing.B) {
-	// Include is not set in testing context (kingpin flags not parsed), causing the collector to skip all interfaces.
+	// PrinterInclude is not set in testing context (kingpin flags not parsed), causing the collector to skip all interfaces.
 	localNicInclude := ".+"
 
-	kingpin.CommandLine.GetArg(net.FlagNicInclude).StringVar(&localNicInclude)
+	kingpin.CommandLine.GetArg("collector.net.nic-include").StringVar(&localNicInclude)
 	testutils.FuncBenchmarkCollector(b, net.Name, net.NewWithFlags)
 }

pkg/collector/net/net_test.go

@@ -7,6 +7,8 @@ import (
 )
 
 func TestNetworkToInstanceName(t *testing.T) {
+	t.Parallel()
+
 	data := map[string]string{
 		"Intel[R] Dual Band Wireless-AC 8260": "Intel_R__Dual_Band_Wireless_AC_8260",
 	}

pkg/collector/netframework_clrexceptions/netframework_clrexceptions.go

@@ -3,12 +3,11 @@
 package netframework_clrexceptions
 
 import (
-	"github.com/prometheus-community/windows_exporter/pkg/types"
-	"github.com/prometheus-community/windows_exporter/pkg/wmi"
-
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
+	"github.com/prometheus-community/windows_exporter/pkg/types"
+	"github.com/prometheus-community/windows_exporter/pkg/wmi"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -18,58 +17,71 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-// A collector is a Prometheus collector for WMI Win32_PerfRawData_NETFramework_NETCLRExceptions metrics
-type collector struct {
+// A Collector is a Prometheus Collector for WMI Win32_PerfRawData_NETFramework_NETCLRExceptions metrics.
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	NumberofExcepsThrown *prometheus.Desc
-	NumberofFilters      *prometheus.Desc
-	NumberofFinallys     *prometheus.Desc
-	ThrowToCatchDepth    *prometheus.Desc
+	numberOfExceptionsThrown *prometheus.Desc
+	numberOfFilters          *prometheus.Desc
+	numberOfFinally          *prometheus.Desc
+	throwToCatchDepth        *prometheus.Desc
 }
 
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{}, nil
 }
 
-func (c *collector) Build() error {
-	c.NumberofExcepsThrown = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.numberOfExceptionsThrown = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "exceptions_thrown_total"),
 		"Displays the total number of exceptions thrown since the application started. This includes both .NET exceptions and unmanaged exceptions that are converted into .NET exceptions.",
 		[]string{"process"},
 		nil,
 	)
-	c.NumberofFilters = prometheus.NewDesc(
+	c.numberOfFilters = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "exceptions_filters_total"),
 		"Displays the total number of .NET exception filters executed. An exception filter evaluates regardless of whether an exception is handled.",
 		[]string{"process"},
 		nil,
 	)
-	c.NumberofFinallys = prometheus.NewDesc(
+	c.numberOfFinally = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "exceptions_finallys_total"),
 		"Displays the total number of finally blocks executed. Only the finally blocks executed for an exception are counted; finally blocks on normal code paths are not counted by this counter.",
 		[]string{"process"},
 		nil,
 	)
-	c.ThrowToCatchDepth = prometheus.NewDesc(
+	c.throwToCatchDepth = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "throw_to_catch_depth_total"),
 		"Displays the total number of stack frames traversed, from the frame that threw the exception to the frame that handled the exception.",
 		[]string{"process"},
@@ -80,9 +92,9 @@ func (c *collector) Build() error {
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ch); err != nil {
-		_ = level.Error(c.logger).Log("failed collecting win32_perfrawdata_netframework_netclrexceptions metrics", "desc", desc, "err", err)
+func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collect(ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed collecting win32_perfrawdata_netframework_netclrexceptions metrics", "err", err)
 		return err
 	}
 	return nil
@@ -98,47 +110,46 @@ type Win32_PerfRawData_NETFramework_NETCLRExceptions struct {
 	ThrowToCatchDepthPersec    uint32
 }
 
-func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *Collector) collect(ch chan<- prometheus.Metric) error {
 	var dst []Win32_PerfRawData_NETFramework_NETCLRExceptions
 	q := wmi.QueryAll(&dst, c.logger)
 	if err := wmi.Query(q, &dst); err != nil {
-		return nil, err
+		return err
 	}
 
 	for _, process := range dst {
-
 		if process.Name == "_Global_" {
 			continue
 		}
 
 		ch <- prometheus.MustNewConstMetric(
-			c.NumberofExcepsThrown,
+			c.numberOfExceptionsThrown,
 			prometheus.CounterValue,
 			float64(process.NumberofExcepsThrown),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.NumberofFilters,
+			c.numberOfFilters,
 			prometheus.CounterValue,
 			float64(process.NumberofFiltersPersec),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.NumberofFinallys,
+			c.numberOfFinally,
 			prometheus.CounterValue,
 			float64(process.NumberofFinallysPersec),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.ThrowToCatchDepth,
+			c.throwToCatchDepth,
 			prometheus.CounterValue,
 			float64(process.ThrowToCatchDepthPersec),
 			process.Name,
 		)
 	}
 
-	return nil, nil
+	return nil
 }

pkg/collector/netframework_clrexceptions/netframework_clrexceptions_test.go

@@ -8,6 +8,6 @@ import (
 )
 
 func BenchmarkCollector(b *testing.B) {
-	// No context name required as collector source is WMI
+	// No context name required as Collector source is WMI
 	testutils.FuncBenchmarkCollector(b, netframework_clrexceptions.Name, netframework_clrexceptions.NewWithFlags)
 }

pkg/collector/netframework_clrinterop/netframework_clrinterop.go

@@ -3,12 +3,11 @@
 package netframework_clrinterop
 
 import (
-	"github.com/prometheus-community/windows_exporter/pkg/types"
-	"github.com/prometheus-community/windows_exporter/pkg/wmi"
-
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
+	"github.com/prometheus-community/windows_exporter/pkg/types"
+	"github.com/prometheus-community/windows_exporter/pkg/wmi"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -18,51 +17,64 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-// A collector is a Prometheus collector for WMI Win32_PerfRawData_NETFramework_NETCLRInterop metrics
-type collector struct {
+// A Collector is a Prometheus Collector for WMI Win32_PerfRawData_NETFramework_NETCLRInterop metrics.
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	NumberofCCWs        *prometheus.Desc
-	Numberofmarshalling *prometheus.Desc
-	NumberofStubs       *prometheus.Desc
+	numberOfCCWs        *prometheus.Desc
+	numberOfMarshalling *prometheus.Desc
+	numberOfStubs       *prometheus.Desc
 }
 
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{}, nil
 }
 
-func (c *collector) Build() error {
-	c.NumberofCCWs = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.numberOfCCWs = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "com_callable_wrappers_total"),
 		"Displays the current number of COM callable wrappers (CCWs). A CCW is a proxy for a managed object being referenced from an unmanaged COM client.",
 		[]string{"process"},
 		nil,
 	)
-	c.Numberofmarshalling = prometheus.NewDesc(
+	c.numberOfMarshalling = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "interop_marshalling_total"),
 		"Displays the total number of times arguments and return values have been marshaled from managed to unmanaged code, and vice versa, since the application started.",
 		[]string{"process"},
 		nil,
 	)
-	c.NumberofStubs = prometheus.NewDesc(
+	c.numberOfStubs = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "interop_stubs_created_total"),
 		"Displays the current number of stubs created by the common language runtime. Stubs are responsible for marshaling arguments and return values from managed to unmanaged code, and vice versa, during a COM interop call or a platform invoke call.",
 		[]string{"process"},
@@ -73,9 +85,9 @@ func (c *collector) Build() error {
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ch); err != nil {
-		_ = level.Error(c.logger).Log("failed collecting win32_perfrawdata_netframework_netclrinterop metrics", "desc", desc, "err", err)
+func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collect(ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed collecting win32_perfrawdata_netframework_netclrinterop metrics", "err", err)
 		return err
 	}
 	return nil
@@ -91,40 +103,39 @@ type Win32_PerfRawData_NETFramework_NETCLRInterop struct {
 	NumberofTLBimportsPersec uint32
 }
 
-func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *Collector) collect(ch chan<- prometheus.Metric) error {
 	var dst []Win32_PerfRawData_NETFramework_NETCLRInterop
 	q := wmi.QueryAll(&dst, c.logger)
 	if err := wmi.Query(q, &dst); err != nil {
-		return nil, err
+		return err
 	}
 
 	for _, process := range dst {
-
 		if process.Name == "_Global_" {
 			continue
 		}
 
 		ch <- prometheus.MustNewConstMetric(
-			c.NumberofCCWs,
+			c.numberOfCCWs,
 			prometheus.CounterValue,
 			float64(process.NumberofCCWs),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.Numberofmarshalling,
+			c.numberOfMarshalling,
 			prometheus.CounterValue,
 			float64(process.Numberofmarshalling),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.NumberofStubs,
+			c.numberOfStubs,
 			prometheus.CounterValue,
 			float64(process.NumberofStubs),
 			process.Name,
 		)
 	}
 
-	return nil, nil
+	return nil
 }

pkg/collector/netframework_clrjit/netframework_clrjit.go

@@ -17,58 +17,71 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-// A collector is a Prometheus collector for WMI Win32_PerfRawData_NETFramework_NETCLRJit metrics
-type collector struct {
+// A Collector is a Prometheus Collector for WMI Win32_PerfRawData_NETFramework_NETCLRJit metrics.
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	NumberofMethodsJitted      *prometheus.Desc
-	TimeinJit                  *prometheus.Desc
-	StandardJitFailures        *prometheus.Desc
-	TotalNumberofILBytesJitted *prometheus.Desc
+	numberOfMethodsJitted      *prometheus.Desc
+	timeInJit                  *prometheus.Desc
+	standardJitFailures        *prometheus.Desc
+	totalNumberOfILBytesJitted *prometheus.Desc
 }
 
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{}, nil
 }
 
-func (c *collector) Build() error {
-	c.NumberofMethodsJitted = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.numberOfMethodsJitted = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "jit_methods_total"),
 		"Displays the total number of methods JIT-compiled since the application started. This counter does not include pre-JIT-compiled methods.",
 		[]string{"process"},
 		nil,
 	)
-	c.TimeinJit = prometheus.NewDesc(
+	c.timeInJit = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "jit_time_percent"),
 		"Displays the percentage of time spent in JIT compilation. This counter is updated at the end of every JIT compilation phase. A JIT compilation phase occurs when a method and its dependencies are compiled.",
 		[]string{"process"},
 		nil,
 	)
-	c.StandardJitFailures = prometheus.NewDesc(
+	c.standardJitFailures = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "jit_standard_failures_total"),
 		"Displays the peak number of methods the JIT compiler has failed to compile since the application started. This failure can occur if the MSIL cannot be verified or if there is an internal error in the JIT compiler.",
 		[]string{"process"},
 		nil,
 	)
-	c.TotalNumberofILBytesJitted = prometheus.NewDesc(
+	c.totalNumberOfILBytesJitted = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "jit_il_bytes_total"),
 		"Displays the total number of Microsoft intermediate language (MSIL) bytes compiled by the just-in-time (JIT) compiler since the application started",
 		[]string{"process"},
@@ -79,9 +92,9 @@ func (c *collector) Build() error {
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ch); err != nil {
-		_ = level.Error(c.logger).Log("failed collecting win32_perfrawdata_netframework_netclrjit metrics", "desc", desc, "err", err)
+func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collect(ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed collecting win32_perfrawdata_netframework_netclrjit metrics", "err", err)
 		return err
 	}
 	return nil
@@ -99,47 +112,46 @@ type Win32_PerfRawData_NETFramework_NETCLRJit struct {
 	TotalNumberofILBytesJitted uint32
 }
 
-func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *Collector) collect(ch chan<- prometheus.Metric) error {
 	var dst []Win32_PerfRawData_NETFramework_NETCLRJit
 	q := wmi.QueryAll(&dst, c.logger)
 	if err := wmi.Query(q, &dst); err != nil {
-		return nil, err
+		return err
 	}
 
 	for _, process := range dst {
-
 		if process.Name == "_Global_" {
 			continue
 		}
 
 		ch <- prometheus.MustNewConstMetric(
-			c.NumberofMethodsJitted,
+			c.numberOfMethodsJitted,
 			prometheus.CounterValue,
 			float64(process.NumberofMethodsJitted),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.TimeinJit,
+			c.timeInJit,
 			prometheus.GaugeValue,
 			float64(process.PercentTimeinJit)/float64(process.Frequency_PerfTime),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.StandardJitFailures,
+			c.standardJitFailures,
 			prometheus.GaugeValue,
 			float64(process.StandardJitFailures),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.TotalNumberofILBytesJitted,
+			c.totalNumberOfILBytesJitted,
 			prometheus.CounterValue,
 			float64(process.TotalNumberofILBytesJitted),
 			process.Name,
 		)
 	}
 
-	return nil, nil
+	return nil
 }

pkg/collector/netframework_clrloading/netframework_clrloading.go

@@ -17,93 +17,106 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-// A collector is a Prometheus collector for WMI Win32_PerfRawData_NETFramework_NETCLRLoading metrics
-type collector struct {
+// A Collector is a Prometheus Collector for WMI Win32_PerfRawData_NETFramework_NETCLRLoading metrics.
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	BytesinLoaderHeap         *prometheus.Desc
-	Currentappdomains         *prometheus.Desc
-	CurrentAssemblies         *prometheus.Desc
-	CurrentClassesLoaded      *prometheus.Desc
-	TotalAppdomains           *prometheus.Desc
-	Totalappdomainsunloaded   *prometheus.Desc
-	TotalAssemblies           *prometheus.Desc
-	TotalClassesLoaded        *prometheus.Desc
-	TotalNumberofLoadFailures *prometheus.Desc
+	bytesInLoaderHeap         *prometheus.Desc
+	currentAppDomains         *prometheus.Desc
+	currentAssemblies         *prometheus.Desc
+	currentClassesLoaded      *prometheus.Desc
+	totalAppDomains           *prometheus.Desc
+	totalAppDomainsUnloaded   *prometheus.Desc
+	totalAssemblies           *prometheus.Desc
+	totalClassesLoaded        *prometheus.Desc
+	totalNumberOfLoadFailures *prometheus.Desc
 }
 
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{}, nil
 }
 
-func (c *collector) Build() error {
-	c.BytesinLoaderHeap = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.bytesInLoaderHeap = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "loader_heap_size_bytes"),
 		"Displays the current size, in bytes, of the memory committed by the class loader across all application domains. Committed memory is the physical space reserved in the disk paging file.",
 		[]string{"process"},
 		nil,
 	)
-	c.Currentappdomains = prometheus.NewDesc(
+	c.currentAppDomains = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "appdomains_loaded_current"),
 		"Displays the current number of application domains loaded in this application.",
 		[]string{"process"},
 		nil,
 	)
-	c.CurrentAssemblies = prometheus.NewDesc(
+	c.currentAssemblies = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "assemblies_loaded_current"),
 		"Displays the current number of assemblies loaded across all application domains in the currently running application. If the assembly is loaded as domain-neutral from multiple application domains, this counter is incremented only once.",
 		[]string{"process"},
 		nil,
 	)
-	c.CurrentClassesLoaded = prometheus.NewDesc(
+	c.currentClassesLoaded = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "classes_loaded_current"),
 		"Displays the current number of classes loaded in all assemblies.",
 		[]string{"process"},
 		nil,
 	)
-	c.TotalAppdomains = prometheus.NewDesc(
+	c.totalAppDomains = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "appdomains_loaded_total"),
 		"Displays the peak number of application domains loaded since the application started.",
 		[]string{"process"},
 		nil,
 	)
-	c.Totalappdomainsunloaded = prometheus.NewDesc(
+	c.totalAppDomainsUnloaded = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "appdomains_unloaded_total"),
 		"Displays the total number of application domains unloaded since the application started. If an application domain is loaded and unloaded multiple times, this counter increments each time the application domain is unloaded.",
 		[]string{"process"},
 		nil,
 	)
-	c.TotalAssemblies = prometheus.NewDesc(
+	c.totalAssemblies = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "assemblies_loaded_total"),
 		"Displays the total number of assemblies loaded since the application started. If the assembly is loaded as domain-neutral from multiple application domains, this counter is incremented only once.",
 		[]string{"process"},
 		nil,
 	)
-	c.TotalClassesLoaded = prometheus.NewDesc(
+	c.totalClassesLoaded = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "classes_loaded_total"),
 		"Displays the cumulative number of classes loaded in all assemblies since the application started.",
 		[]string{"process"},
 		nil,
 	)
-	c.TotalNumberofLoadFailures = prometheus.NewDesc(
+	c.totalNumberOfLoadFailures = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "class_load_failures_total"),
 		"Displays the peak number of classes that have failed to load since the application started.",
 		[]string{"process"},
@@ -114,9 +127,9 @@ func (c *collector) Build() error {
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ch); err != nil {
-		_ = level.Error(c.logger).Log("failed collecting win32_perfrawdata_netframework_netclrloading metrics", "desc", desc, "err", err)
+func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collect(ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed collecting win32_perfrawdata_netframework_netclrloading metrics", "err", err)
 		return err
 	}
 	return nil
@@ -143,82 +156,81 @@ type Win32_PerfRawData_NETFramework_NETCLRLoading struct {
 	TotalNumberofLoadFailures uint32
 }
 
-func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *Collector) collect(ch chan<- prometheus.Metric) error {
 	var dst []Win32_PerfRawData_NETFramework_NETCLRLoading
 	q := wmi.QueryAll(&dst, c.logger)
 	if err := wmi.Query(q, &dst); err != nil {
-		return nil, err
+		return err
 	}
 
 	for _, process := range dst {
-
 		if process.Name == "_Global_" {
 			continue
 		}
 
 		ch <- prometheus.MustNewConstMetric(
-			c.BytesinLoaderHeap,
+			c.bytesInLoaderHeap,
 			prometheus.GaugeValue,
 			float64(process.BytesinLoaderHeap),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.Currentappdomains,
+			c.currentAppDomains,
 			prometheus.GaugeValue,
 			float64(process.Currentappdomains),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.CurrentAssemblies,
+			c.currentAssemblies,
 			prometheus.GaugeValue,
 			float64(process.CurrentAssemblies),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.CurrentClassesLoaded,
+			c.currentClassesLoaded,
 			prometheus.GaugeValue,
 			float64(process.CurrentClassesLoaded),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.TotalAppdomains,
+			c.totalAppDomains,
 			prometheus.CounterValue,
 			float64(process.TotalAppdomains),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.Totalappdomainsunloaded,
+			c.totalAppDomainsUnloaded,
 			prometheus.CounterValue,
 			float64(process.Totalappdomainsunloaded),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.TotalAssemblies,
+			c.totalAssemblies,
 			prometheus.CounterValue,
 			float64(process.TotalAssemblies),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.TotalClassesLoaded,
+			c.totalClassesLoaded,
 			prometheus.CounterValue,
 			float64(process.TotalClassesLoaded),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.TotalNumberofLoadFailures,
+			c.totalNumberOfLoadFailures,
 			prometheus.CounterValue,
 			float64(process.TotalNumberofLoadFailures),
 			process.Name,
 		)
 	}
 
-	return nil, nil
+	return nil
 }

pkg/collector/netframework_clrlocksandthreads/netframework_clrlocksandthreads.go

@@ -17,79 +17,92 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-// A collector is a Prometheus collector for WMI Win32_PerfRawData_NETFramework_NETCLRLocksAndThreads metrics
-type collector struct {
+// A Collector is a Prometheus Collector for WMI Win32_PerfRawData_NETFramework_NETCLRLocksAndThreads metrics.
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	CurrentQueueLength               *prometheus.Desc
-	NumberofcurrentlogicalThreads    *prometheus.Desc
-	NumberofcurrentphysicalThreads   *prometheus.Desc
-	Numberofcurrentrecognizedthreads *prometheus.Desc
-	Numberoftotalrecognizedthreads   *prometheus.Desc
-	QueueLengthPeak                  *prometheus.Desc
-	TotalNumberofContentions         *prometheus.Desc
+	currentQueueLength               *prometheus.Desc
+	numberOfCurrentLogicalThreads    *prometheus.Desc
+	numberOfCurrentPhysicalThreads   *prometheus.Desc
+	numberOfCurrentRecognizedThreads *prometheus.Desc
+	numberOfTotalRecognizedThreads   *prometheus.Desc
+	queueLengthPeak                  *prometheus.Desc
+	totalNumberOfContentions         *prometheus.Desc
 }
 
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{}, nil
 }
 
-func (c *collector) Build() error {
-	c.CurrentQueueLength = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.currentQueueLength = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "current_queue_length"),
 		"Displays the total number of threads that are currently waiting to acquire a managed lock in the application.",
 		[]string{"process"},
 		nil,
 	)
-	c.NumberofcurrentlogicalThreads = prometheus.NewDesc(
+	c.numberOfCurrentLogicalThreads = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "current_logical_threads"),
 		"Displays the number of current managed thread objects in the application. This counter maintains the count of both running and stopped threads. ",
 		[]string{"process"},
 		nil,
 	)
-	c.NumberofcurrentphysicalThreads = prometheus.NewDesc(
+	c.numberOfCurrentPhysicalThreads = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "physical_threads_current"),
 		"Displays the number of native operating system threads created and owned by the common language runtime to act as underlying threads for managed thread objects. This counter's value does not include the threads used by the runtime in its internal operations; it is a subset of the threads in the operating system process.",
 		[]string{"process"},
 		nil,
 	)
-	c.Numberofcurrentrecognizedthreads = prometheus.NewDesc(
+	c.numberOfCurrentRecognizedThreads = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "recognized_threads_current"),
 		"Displays the number of threads that are currently recognized by the runtime. These threads are associated with a corresponding managed thread object. The runtime does not create these threads, but they have run inside the runtime at least once.",
 		[]string{"process"},
 		nil,
 	)
-	c.Numberoftotalrecognizedthreads = prometheus.NewDesc(
+	c.numberOfTotalRecognizedThreads = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "recognized_threads_total"),
 		"Displays the total number of threads that have been recognized by the runtime since the application started. These threads are associated with a corresponding managed thread object. The runtime does not create these threads, but they have run inside the runtime at least once.",
 		[]string{"process"},
 		nil,
 	)
-	c.QueueLengthPeak = prometheus.NewDesc(
+	c.queueLengthPeak = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "queue_length_total"),
 		"Displays the total number of threads that waited to acquire a managed lock since the application started.",
 		[]string{"process"},
 		nil,
 	)
-	c.TotalNumberofContentions = prometheus.NewDesc(
+	c.totalNumberOfContentions = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "contentions_total"),
 		"Displays the total number of times that threads in the runtime have attempted to acquire a managed lock unsuccessfully.",
 		[]string{"process"},
@@ -100,9 +113,9 @@ func (c *collector) Build() error {
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ch); err != nil {
-		_ = level.Error(c.logger).Log("failed collecting win32_perfrawdata_netframework_netclrlocksandthreads metrics", "desc", desc, "err", err)
+func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collect(ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed collecting win32_perfrawdata_netframework_netclrlocksandthreads metrics", "err", err)
 		return err
 	}
 	return nil
@@ -123,68 +136,67 @@ type Win32_PerfRawData_NETFramework_NETCLRLocksAndThreads struct {
 	TotalNumberofContentions         uint32
 }
 
-func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *Collector) collect(ch chan<- prometheus.Metric) error {
 	var dst []Win32_PerfRawData_NETFramework_NETCLRLocksAndThreads
 	q := wmi.QueryAll(&dst, c.logger)
 	if err := wmi.Query(q, &dst); err != nil {
-		return nil, err
+		return err
 	}
 
 	for _, process := range dst {
-
 		if process.Name == "_Global_" {
 			continue
 		}
 
 		ch <- prometheus.MustNewConstMetric(
-			c.CurrentQueueLength,
+			c.currentQueueLength,
 			prometheus.GaugeValue,
 			float64(process.CurrentQueueLength),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.NumberofcurrentlogicalThreads,
+			c.numberOfCurrentLogicalThreads,
 			prometheus.GaugeValue,
 			float64(process.NumberofcurrentlogicalThreads),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.NumberofcurrentphysicalThreads,
+			c.numberOfCurrentPhysicalThreads,
 			prometheus.GaugeValue,
 			float64(process.NumberofcurrentphysicalThreads),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.Numberofcurrentrecognizedthreads,
+			c.numberOfCurrentRecognizedThreads,
 			prometheus.GaugeValue,
 			float64(process.Numberofcurrentrecognizedthreads),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.Numberoftotalrecognizedthreads,
+			c.numberOfTotalRecognizedThreads,
 			prometheus.CounterValue,
 			float64(process.Numberoftotalrecognizedthreads),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.QueueLengthPeak,
+			c.queueLengthPeak,
 			prometheus.CounterValue,
 			float64(process.QueueLengthPeak),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.TotalNumberofContentions,
+			c.totalNumberOfContentions,
 			prometheus.CounterValue,
 			float64(process.TotalNumberofContentions),
 			process.Name,
 		)
 	}
 
-	return nil, nil
+	return nil
 }

pkg/collector/netframework_clrmemory/netframework_clrmemory.go

@@ -17,117 +17,127 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-// A collector is a Prometheus collector for WMI Win32_PerfRawData_NETFramework_NETCLRMemory metrics
-type collector struct {
+// A Collector is a Prometheus Collector for WMI Win32_PerfRawData_NETFramework_NETCLRMemory metrics.
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	AllocatedBytes                     *prometheus.Desc
-	FinalizationSurvivors              *prometheus.Desc
-	HeapSize                           *prometheus.Desc
-	PromotedBytes                      *prometheus.Desc
-	NumberGCHandles                    *prometheus.Desc
-	NumberCollections                  *prometheus.Desc
-	NumberInducedGC                    *prometheus.Desc
-	NumberofPinnedObjects              *prometheus.Desc
-	NumberofSinkBlocksinuse            *prometheus.Desc
-	NumberTotalCommittedBytes          *prometheus.Desc
-	NumberTotalreservedBytes           *prometheus.Desc
-	TimeinGC                           *prometheus.Desc
-	PromotedFinalizationMemoryfromGen0 *prometheus.Desc
-	PromotedMemoryfromGen0             *prometheus.Desc
-	PromotedMemoryfromGen1             *prometheus.Desc
+	allocatedBytes            *prometheus.Desc
+	finalizationSurvivors     *prometheus.Desc
+	heapSize                  *prometheus.Desc
+	promotedBytes             *prometheus.Desc
+	numberGCHandles           *prometheus.Desc
+	numberCollections         *prometheus.Desc
+	numberInducedGC           *prometheus.Desc
+	numberOfPinnedObjects     *prometheus.Desc
+	numberOfSinkBlocksInUse   *prometheus.Desc
+	numberTotalCommittedBytes *prometheus.Desc
+	numberTotalReservedBytes  *prometheus.Desc
+	timeInGC                  *prometheus.Desc
 }
 
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{}, nil
 }
 
-func (c *collector) Build() error {
-	c.AllocatedBytes = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.allocatedBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "allocated_bytes_total"),
 		"Displays the total number of bytes allocated on the garbage collection heap.",
 		[]string{"process"},
 		nil,
 	)
-	c.FinalizationSurvivors = prometheus.NewDesc(
+	c.finalizationSurvivors = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "finalization_survivors"),
 		"Displays the number of garbage-collected objects that survive a collection because they are waiting to be finalized.",
 		[]string{"process"},
 		nil,
 	)
-	c.HeapSize = prometheus.NewDesc(
+	c.heapSize = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "heap_size_bytes"),
 		"Displays the maximum bytes that can be allocated; it does not indicate the current number of bytes allocated.",
 		[]string{"process", "area"},
 		nil,
 	)
-	c.PromotedBytes = prometheus.NewDesc(
+	c.promotedBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "promoted_bytes"),
 		"Displays the bytes that were promoted from the generation to the next one during the last GC. Memory is promoted when it survives a garbage collection.",
 		[]string{"process", "area"},
 		nil,
 	)
-	c.NumberGCHandles = prometheus.NewDesc(
+	c.numberGCHandles = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "number_gc_handles"),
 		"Displays the current number of garbage collection handles in use. Garbage collection handles are handles to resources external to the common language runtime and the managed environment.",
 		[]string{"process"},
 		nil,
 	)
-	c.NumberCollections = prometheus.NewDesc(
+	c.numberCollections = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "collections_total"),
 		"Displays the number of times the generation objects are garbage collected since the application started.",
 		[]string{"process", "area"},
 		nil,
 	)
-	c.NumberInducedGC = prometheus.NewDesc(
+	c.numberInducedGC = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "induced_gc_total"),
 		"Displays the peak number of times garbage collection was performed because of an explicit call to GC.Collect.",
 		[]string{"process"},
 		nil,
 	)
-	c.NumberofPinnedObjects = prometheus.NewDesc(
+	c.numberOfPinnedObjects = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "number_pinned_objects"),
 		"Displays the number of pinned objects encountered in the last garbage collection.",
 		[]string{"process"},
 		nil,
 	)
-	c.NumberofSinkBlocksinuse = prometheus.NewDesc(
+	c.numberOfSinkBlocksInUse = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "number_sink_blocksinuse"),
 		"Displays the current number of synchronization blocks in use. Synchronization blocks are per-object data structures allocated for storing synchronization information. They hold weak references to managed objects and must be scanned by the garbage collector.",
 		[]string{"process"},
 		nil,
 	)
-	c.NumberTotalCommittedBytes = prometheus.NewDesc(
+	c.numberTotalCommittedBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "committed_bytes"),
 		"Displays the amount of virtual memory, in bytes, currently committed by the garbage collector. Committed memory is the physical memory for which space has been reserved in the disk paging file.",
 		[]string{"process"},
 		nil,
 	)
-	c.NumberTotalreservedBytes = prometheus.NewDesc(
+	c.numberTotalReservedBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "reserved_bytes"),
 		"Displays the amount of virtual memory, in bytes, currently reserved by the garbage collector. Reserved memory is the virtual memory space reserved for the application when no disk or main memory pages have been used.",
 		[]string{"process"},
 		nil,
 	)
-	c.TimeinGC = prometheus.NewDesc(
+	c.timeInGC = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "gc_time_percent"),
 		"Displays the percentage of time that was spent performing a garbage collection in the last sample.",
 		[]string{"process"},
@@ -138,9 +148,9 @@ func (c *collector) Build() error {
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ch); err != nil {
-		_ = level.Error(c.logger).Log("failed collecting win32_perfrawdata_netframework_netclrmemory metrics", "desc", desc, "err", err)
+func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collect(ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed collecting win32_perfrawdata_netframework_netclrmemory metrics", "err", err)
 		return err
 	}
 	return nil
@@ -180,35 +190,34 @@ type Win32_PerfRawData_NETFramework_NETCLRMemory struct {
 	PromotedMemoryfromGen1             uint64
 }
 
-func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *Collector) collect(ch chan<- prometheus.Metric) error {
 	var dst []Win32_PerfRawData_NETFramework_NETCLRMemory
 	q := wmi.QueryAll(&dst, c.logger)
 	if err := wmi.Query(q, &dst); err != nil {
-		return nil, err
+		return err
 	}
 
 	for _, process := range dst {
-
 		if process.Name == "_Global_" {
 			continue
 		}
 
 		ch <- prometheus.MustNewConstMetric(
-			c.AllocatedBytes,
+			c.allocatedBytes,
 			prometheus.CounterValue,
 			float64(process.AllocatedBytesPersec),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.FinalizationSurvivors,
+			c.finalizationSurvivors,
 			prometheus.GaugeValue,
 			float64(process.FinalizationSurvivors),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.HeapSize,
+			c.heapSize,
 			prometheus.GaugeValue,
 			float64(process.Gen0heapsize),
 			process.Name,
@@ -216,7 +225,7 @@ func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, erro
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.PromotedBytes,
+			c.promotedBytes,
 			prometheus.GaugeValue,
 			float64(process.Gen0PromotedBytesPerSec),
 			process.Name,
@@ -224,7 +233,7 @@ func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, erro
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.HeapSize,
+			c.heapSize,
 			prometheus.GaugeValue,
 			float64(process.Gen1heapsize),
 			process.Name,
@@ -232,7 +241,7 @@ func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, erro
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.PromotedBytes,
+			c.promotedBytes,
 			prometheus.GaugeValue,
 			float64(process.Gen1PromotedBytesPerSec),
 			process.Name,
@@ -240,7 +249,7 @@ func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, erro
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.HeapSize,
+			c.heapSize,
 			prometheus.GaugeValue,
 			float64(process.Gen2heapsize),
 			process.Name,
@@ -248,7 +257,7 @@ func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, erro
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.HeapSize,
+			c.heapSize,
 			prometheus.GaugeValue,
 			float64(process.LargeObjectHeapsize),
 			process.Name,
@@ -256,14 +265,14 @@ func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, erro
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.NumberGCHandles,
+			c.numberGCHandles,
 			prometheus.GaugeValue,
 			float64(process.NumberGCHandles),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.NumberCollections,
+			c.numberCollections,
 			prometheus.CounterValue,
 			float64(process.NumberGen0Collections),
 			process.Name,
@@ -271,7 +280,7 @@ func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, erro
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.NumberCollections,
+			c.numberCollections,
 			prometheus.CounterValue,
 			float64(process.NumberGen1Collections),
 			process.Name,
@@ -279,7 +288,7 @@ func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, erro
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.NumberCollections,
+			c.numberCollections,
 			prometheus.CounterValue,
 			float64(process.NumberGen2Collections),
 			process.Name,
@@ -287,47 +296,47 @@ func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, erro
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.NumberInducedGC,
+			c.numberInducedGC,
 			prometheus.CounterValue,
 			float64(process.NumberInducedGC),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.NumberofPinnedObjects,
+			c.numberOfPinnedObjects,
 			prometheus.GaugeValue,
 			float64(process.NumberofPinnedObjects),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.NumberofSinkBlocksinuse,
+			c.numberOfSinkBlocksInUse,
 			prometheus.GaugeValue,
 			float64(process.NumberofSinkBlocksinuse),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.NumberTotalCommittedBytes,
+			c.numberTotalCommittedBytes,
 			prometheus.GaugeValue,
 			float64(process.NumberTotalcommittedBytes),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.NumberTotalreservedBytes,
+			c.numberTotalReservedBytes,
 			prometheus.GaugeValue,
 			float64(process.NumberTotalreservedBytes),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.TimeinGC,
+			c.timeInGC,
 			prometheus.GaugeValue,
 			float64(100*process.PercentTimeinGC)/float64(process.PercentTimeinGC_base),
 			process.Name,
 		)
 	}
 
-	return nil, nil
+	return nil
 }

pkg/collector/netframework_clrremoting/netframework_clrremoting.go

@@ -17,72 +17,85 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-// A collector is a Prometheus collector for WMI Win32_PerfRawData_NETFramework_NETCLRRemoting metrics
-type collector struct {
+// A Collector is a Prometheus Collector for WMI Win32_PerfRawData_NETFramework_NETCLRRemoting metrics.
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	Channels                  *prometheus.Desc
-	ContextBoundClassesLoaded *prometheus.Desc
-	ContextBoundObjects       *prometheus.Desc
-	ContextProxies            *prometheus.Desc
-	Contexts                  *prometheus.Desc
-	TotalRemoteCalls          *prometheus.Desc
+	channels                  *prometheus.Desc
+	contextBoundClassesLoaded *prometheus.Desc
+	contextBoundObjects       *prometheus.Desc
+	contextProxies            *prometheus.Desc
+	contexts                  *prometheus.Desc
+	totalRemoteCalls          *prometheus.Desc
 }
 
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{}, nil
 }
 
-func (c *collector) Build() error {
-	c.Channels = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.channels = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "channels_total"),
 		"Displays the total number of remoting channels registered across all application domains since application started.",
 		[]string{"process"},
 		nil,
 	)
-	c.ContextBoundClassesLoaded = prometheus.NewDesc(
+	c.contextBoundClassesLoaded = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "context_bound_classes_loaded"),
 		"Displays the current number of context-bound classes that are loaded.",
 		[]string{"process"},
 		nil,
 	)
-	c.ContextBoundObjects = prometheus.NewDesc(
+	c.contextBoundObjects = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "context_bound_objects_total"),
 		"Displays the total number of context-bound objects allocated.",
 		[]string{"process"},
 		nil,
 	)
-	c.ContextProxies = prometheus.NewDesc(
+	c.contextProxies = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "context_proxies_total"),
 		"Displays the total number of remoting proxy objects in this process since it started.",
 		[]string{"process"},
 		nil,
 	)
-	c.Contexts = prometheus.NewDesc(
+	c.contexts = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "contexts"),
 		"Displays the current number of remoting contexts in the application.",
 		[]string{"process"},
 		nil,
 	)
-	c.TotalRemoteCalls = prometheus.NewDesc(
+	c.totalRemoteCalls = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "remote_calls_total"),
 		"Displays the total number of remote procedure calls invoked since the application started.",
 		[]string{"process"},
@@ -93,9 +106,9 @@ func (c *collector) Build() error {
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ch); err != nil {
-		_ = level.Error(c.logger).Log("failed collecting win32_perfrawdata_netframework_netclrremoting metrics", "desc", desc, "err", err)
+func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collect(ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed collecting win32_perfrawdata_netframework_netclrremoting metrics", "err", err)
 		return err
 	}
 	return nil
@@ -113,61 +126,60 @@ type Win32_PerfRawData_NETFramework_NETCLRRemoting struct {
 	TotalRemoteCalls               uint32
 }
 
-func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *Collector) collect(ch chan<- prometheus.Metric) error {
 	var dst []Win32_PerfRawData_NETFramework_NETCLRRemoting
 	q := wmi.QueryAll(&dst, c.logger)
 	if err := wmi.Query(q, &dst); err != nil {
-		return nil, err
+		return err
 	}
 
 	for _, process := range dst {
-
 		if process.Name == "_Global_" {
 			continue
 		}
 
 		ch <- prometheus.MustNewConstMetric(
-			c.Channels,
+			c.channels,
 			prometheus.CounterValue,
 			float64(process.Channels),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.ContextBoundClassesLoaded,
+			c.contextBoundClassesLoaded,
 			prometheus.GaugeValue,
 			float64(process.ContextBoundClassesLoaded),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.ContextBoundObjects,
+			c.contextBoundObjects,
 			prometheus.CounterValue,
 			float64(process.ContextBoundObjectsAllocPersec),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.ContextProxies,
+			c.contextProxies,
 			prometheus.CounterValue,
 			float64(process.ContextProxies),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.Contexts,
+			c.contexts,
 			prometheus.GaugeValue,
 			float64(process.Contexts),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.TotalRemoteCalls,
+			c.totalRemoteCalls,
 			prometheus.CounterValue,
 			float64(process.TotalRemoteCalls),
 			process.Name,
 		)
 	}
 
-	return nil, nil
+	return nil
 }

pkg/collector/netframework_clrsecurity/netframework_clrsecurity.go

@@ -17,58 +17,71 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-// A collector is a Prometheus collector for WMI Win32_PerfRawData_NETFramework_NETCLRSecurity metrics
-type collector struct {
+// A Collector is a Prometheus Collector for WMI Win32_PerfRawData_NETFramework_NETCLRSecurity metrics.
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	NumberLinkTimeChecks *prometheus.Desc
-	TimeinRTchecks       *prometheus.Desc
-	StackWalkDepth       *prometheus.Desc
-	TotalRuntimeChecks   *prometheus.Desc
+	numberLinkTimeChecks *prometheus.Desc
+	timeInRTChecks       *prometheus.Desc
+	stackWalkDepth       *prometheus.Desc
+	totalRuntimeChecks   *prometheus.Desc
 }
 
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{}, nil
 }
 
-func (c *collector) Build() error {
-	c.NumberLinkTimeChecks = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.numberLinkTimeChecks = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "link_time_checks_total"),
 		"Displays the total number of link-time code access security checks since the application started.",
 		[]string{"process"},
 		nil,
 	)
-	c.TimeinRTchecks = prometheus.NewDesc(
+	c.timeInRTChecks = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "rt_checks_time_percent"),
 		"Displays the percentage of time spent performing runtime code access security checks in the last sample.",
 		[]string{"process"},
 		nil,
 	)
-	c.StackWalkDepth = prometheus.NewDesc(
+	c.stackWalkDepth = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "stack_walk_depth"),
 		"Displays the depth of the stack during that last runtime code access security check.",
 		[]string{"process"},
 		nil,
 	)
-	c.TotalRuntimeChecks = prometheus.NewDesc(
+	c.totalRuntimeChecks = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "runtime_checks_total"),
 		"Displays the total number of runtime code access security checks performed since the application started.",
 		[]string{"process"},
@@ -79,9 +92,9 @@ func (c *collector) Build() error {
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ch); err != nil {
-		_ = level.Error(c.logger).Log("failed collecting win32_perfrawdata_netframework_netclrsecurity metrics", "desc", desc, "err", err)
+func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collect(ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed collecting win32_perfrawdata_netframework_netclrsecurity metrics", "err", err)
 		return err
 	}
 	return nil
@@ -98,47 +111,46 @@ type Win32_PerfRawData_NETFramework_NETCLRSecurity struct {
 	TotalRuntimeChecks           uint32
 }
 
-func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *Collector) collect(ch chan<- prometheus.Metric) error {
 	var dst []Win32_PerfRawData_NETFramework_NETCLRSecurity
 	q := wmi.QueryAll(&dst, c.logger)
 	if err := wmi.Query(q, &dst); err != nil {
-		return nil, err
+		return err
 	}
 
 	for _, process := range dst {
-
 		if process.Name == "_Global_" {
 			continue
 		}
 
 		ch <- prometheus.MustNewConstMetric(
-			c.NumberLinkTimeChecks,
+			c.numberLinkTimeChecks,
 			prometheus.CounterValue,
 			float64(process.NumberLinkTimeChecks),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.TimeinRTchecks,
+			c.timeInRTChecks,
 			prometheus.GaugeValue,
 			float64(process.PercentTimeinRTchecks)/float64(process.Frequency_PerfTime),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.StackWalkDepth,
+			c.stackWalkDepth,
 			prometheus.GaugeValue,
 			float64(process.StackWalkDepth),
 			process.Name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.TotalRuntimeChecks,
+			c.totalRuntimeChecks,
 			prometheus.CounterValue,
 			float64(process.TotalRuntimeChecks),
 			process.Name,
 		)
 	}
 
-	return nil, nil
+	return nil
 }

pkg/collector/nps/nps.go

@@ -17,207 +17,220 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-// collector is a Prometheus collector for WMI Win32_PerfRawData_IAS_NPSAuthenticationServer and Win32_PerfRawData_IAS_NPSAccountingServer metrics
-type collector struct {
+// Collector is a Prometheus Collector for WMI Win32_PerfRawData_IAS_NPSAuthenticationServer and Win32_PerfRawData_IAS_NPSAccountingServer metrics.
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	AccessAccepts           *prometheus.Desc
-	AccessChallenges        *prometheus.Desc
-	AccessRejects           *prometheus.Desc
-	AccessRequests          *prometheus.Desc
-	AccessBadAuthenticators *prometheus.Desc
-	AccessDroppedPackets    *prometheus.Desc
-	AccessInvalidRequests   *prometheus.Desc
-	AccessMalformedPackets  *prometheus.Desc
-	AccessPacketsReceived   *prometheus.Desc
-	AccessPacketsSent       *prometheus.Desc
-	AccessServerResetTime   *prometheus.Desc
-	AccessServerUpTime      *prometheus.Desc
-	AccessUnknownType       *prometheus.Desc
+	accessAccepts           *prometheus.Desc
+	accessChallenges        *prometheus.Desc
+	accessRejects           *prometheus.Desc
+	accessRequests          *prometheus.Desc
+	accessBadAuthenticators *prometheus.Desc
+	accessDroppedPackets    *prometheus.Desc
+	accessInvalidRequests   *prometheus.Desc
+	accessMalformedPackets  *prometheus.Desc
+	accessPacketsReceived   *prometheus.Desc
+	accessPacketsSent       *prometheus.Desc
+	accessServerResetTime   *prometheus.Desc
+	accessServerUpTime      *prometheus.Desc
+	accessUnknownType       *prometheus.Desc
 
-	AccountingRequests          *prometheus.Desc
-	AccountingResponses         *prometheus.Desc
-	AccountingBadAuthenticators *prometheus.Desc
-	AccountingDroppedPackets    *prometheus.Desc
-	AccountingInvalidRequests   *prometheus.Desc
-	AccountingMalformedPackets  *prometheus.Desc
-	AccountingNoRecord          *prometheus.Desc
-	AccountingPacketsReceived   *prometheus.Desc
-	AccountingPacketsSent       *prometheus.Desc
-	AccountingServerResetTime   *prometheus.Desc
-	AccountingServerUpTime      *prometheus.Desc
-	AccountingUnknownType       *prometheus.Desc
+	accountingRequests          *prometheus.Desc
+	accountingResponses         *prometheus.Desc
+	accountingBadAuthenticators *prometheus.Desc
+	accountingDroppedPackets    *prometheus.Desc
+	accountingInvalidRequests   *prometheus.Desc
+	accountingMalformedPackets  *prometheus.Desc
+	accountingNoRecord          *prometheus.Desc
+	accountingPacketsReceived   *prometheus.Desc
+	accountingPacketsSent       *prometheus.Desc
+	accountingServerResetTime   *prometheus.Desc
+	accountingServerUpTime      *prometheus.Desc
+	accountingUnknownType       *prometheus.Desc
 }
 
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{}, nil
 }
 
-func (c *collector) Build() error {
-	c.AccessAccepts = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.accessAccepts = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "access_accepts"),
 		"(AccessAccepts)",
 		nil,
 		nil,
 	)
-	c.AccessChallenges = prometheus.NewDesc(
+	c.accessChallenges = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "access_challenges"),
 		"(AccessChallenges)",
 		nil,
 		nil,
 	)
-	c.AccessRejects = prometheus.NewDesc(
+	c.accessRejects = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "access_rejects"),
 		"(AccessRejects)",
 		nil,
 		nil,
 	)
-	c.AccessRequests = prometheus.NewDesc(
+	c.accessRequests = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "access_requests"),
 		"(AccessRequests)",
 		nil,
 		nil,
 	)
-	c.AccessBadAuthenticators = prometheus.NewDesc(
+	c.accessBadAuthenticators = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "access_bad_authenticators"),
 		"(BadAuthenticators)",
 		nil,
 		nil,
 	)
-	c.AccessDroppedPackets = prometheus.NewDesc(
+	c.accessDroppedPackets = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "access_dropped_packets"),
 		"(DroppedPackets)",
 		nil,
 		nil,
 	)
-	c.AccessInvalidRequests = prometheus.NewDesc(
+	c.accessInvalidRequests = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "access_invalid_requests"),
 		"(InvalidRequests)",
 		nil,
 		nil,
 	)
-	c.AccessMalformedPackets = prometheus.NewDesc(
+	c.accessMalformedPackets = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "access_malformed_packets"),
 		"(MalformedPackets)",
 		nil,
 		nil,
 	)
-	c.AccessPacketsReceived = prometheus.NewDesc(
+	c.accessPacketsReceived = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "access_packets_received"),
 		"(PacketsReceived)",
 		nil,
 		nil,
 	)
-	c.AccessPacketsSent = prometheus.NewDesc(
+	c.accessPacketsSent = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "access_packets_sent"),
 		"(PacketsSent)",
 		nil,
 		nil,
 	)
-	c.AccessServerResetTime = prometheus.NewDesc(
+	c.accessServerResetTime = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "access_server_reset_time"),
 		"(ServerResetTime)",
 		nil,
 		nil,
 	)
-	c.AccessServerUpTime = prometheus.NewDesc(
+	c.accessServerUpTime = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "access_server_up_time"),
 		"(ServerUpTime)",
 		nil,
 		nil,
 	)
-	c.AccessUnknownType = prometheus.NewDesc(
+	c.accessUnknownType = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "access_unknown_type"),
 		"(UnknownType)",
 		nil,
 		nil,
 	)
 
-	c.AccountingRequests = prometheus.NewDesc(
+	c.accountingRequests = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "accounting_requests"),
 		"(AccountingRequests)",
 		nil,
 		nil,
 	)
-	c.AccountingResponses = prometheus.NewDesc(
+	c.accountingResponses = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "accounting_responses"),
 		"(AccountingResponses)",
 		nil,
 		nil,
 	)
-	c.AccountingBadAuthenticators = prometheus.NewDesc(
+	c.accountingBadAuthenticators = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "accounting_bad_authenticators"),
 		"(BadAuthenticators)",
 		nil,
 		nil,
 	)
-	c.AccountingDroppedPackets = prometheus.NewDesc(
+	c.accountingDroppedPackets = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "accounting_dropped_packets"),
 		"(DroppedPackets)",
 		nil,
 		nil,
 	)
-	c.AccountingInvalidRequests = prometheus.NewDesc(
+	c.accountingInvalidRequests = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "accounting_invalid_requests"),
 		"(InvalidRequests)",
 		nil,
 		nil,
 	)
-	c.AccountingMalformedPackets = prometheus.NewDesc(
+	c.accountingMalformedPackets = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "accounting_malformed_packets"),
 		"(MalformedPackets)",
 		nil,
 		nil,
 	)
-	c.AccountingNoRecord = prometheus.NewDesc(
+	c.accountingNoRecord = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "accounting_no_record"),
 		"(NoRecord)",
 		nil,
 		nil,
 	)
-	c.AccountingPacketsReceived = prometheus.NewDesc(
+	c.accountingPacketsReceived = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "accounting_packets_received"),
 		"(PacketsReceived)",
 		nil,
 		nil,
 	)
-	c.AccountingPacketsSent = prometheus.NewDesc(
+	c.accountingPacketsSent = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "accounting_packets_sent"),
 		"(PacketsSent)",
 		nil,
 		nil,
 	)
-	c.AccountingServerResetTime = prometheus.NewDesc(
+	c.accountingServerResetTime = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "accounting_server_reset_time"),
 		"(ServerResetTime)",
 		nil,
 		nil,
 	)
-	c.AccountingServerUpTime = prometheus.NewDesc(
+	c.accountingServerUpTime = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "accounting_server_up_time"),
 		"(ServerUpTime)",
 		nil,
 		nil,
 	)
-	c.AccountingUnknownType = prometheus.NewDesc(
+	c.accountingUnknownType = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "accounting_unknown_type"),
 		"(UnknownType)",
 		nil,
@@ -228,20 +241,20 @@ func (c *collector) Build() error {
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.CollectAccept(ch); err != nil {
-		_ = level.Error(c.logger).Log("msg", fmt.Sprintf("failed collecting NPS accept data: %s %v", desc, err))
+func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.CollectAccept(ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", fmt.Sprintf("failed collecting NPS accept data: %s", err))
 		return err
 	}
-	if desc, err := c.CollectAccounting(ch); err != nil {
-		_ = level.Error(c.logger).Log("msg", fmt.Sprintf("failed collecting NPS accounting data: %s %v", desc, err))
+	if err := c.CollectAccounting(ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", fmt.Sprintf("failed collecting NPS accounting data: %s", err))
 		return err
 	}
 	return nil
 }
 
 // Win32_PerfRawData_IAS_NPSAuthenticationServer docs:
-// at the moment there is no Microsoft documentation
+// at the moment there is no Microsoft documentation.
 type Win32_PerfRawData_IAS_NPSAuthenticationServer struct {
 	Name string
 
@@ -279,172 +292,172 @@ type Win32_PerfRawData_IAS_NPSAccountingServer struct {
 
 // CollectAccept sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *collector) CollectAccept(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *Collector) CollectAccept(ch chan<- prometheus.Metric) error {
 	var dst []Win32_PerfRawData_IAS_NPSAuthenticationServer
 	q := wmi.QueryAll(&dst, c.logger)
 	if err := wmi.Query(q, &dst); err != nil {
-		return nil, err
+		return err
 	}
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AccessAccepts,
+		c.accessAccepts,
 		prometheus.CounterValue,
 		float64(dst[0].AccessAccepts),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AccessChallenges,
+		c.accessChallenges,
 		prometheus.CounterValue,
 		float64(dst[0].AccessChallenges),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AccessRejects,
+		c.accessRejects,
 		prometheus.CounterValue,
 		float64(dst[0].AccessRejects),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AccessRequests,
+		c.accessRequests,
 		prometheus.CounterValue,
 		float64(dst[0].AccessRequests),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AccessBadAuthenticators,
+		c.accessBadAuthenticators,
 		prometheus.CounterValue,
 		float64(dst[0].AccessBadAuthenticators),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AccessDroppedPackets,
+		c.accessDroppedPackets,
 		prometheus.CounterValue,
 		float64(dst[0].AccessDroppedPackets),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AccessInvalidRequests,
+		c.accessInvalidRequests,
 		prometheus.CounterValue,
 		float64(dst[0].AccessInvalidRequests),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AccessMalformedPackets,
+		c.accessMalformedPackets,
 		prometheus.CounterValue,
 		float64(dst[0].AccessMalformedPackets),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AccessPacketsReceived,
+		c.accessPacketsReceived,
 		prometheus.CounterValue,
 		float64(dst[0].AccessPacketsReceived),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AccessPacketsSent,
+		c.accessPacketsSent,
 		prometheus.CounterValue,
 		float64(dst[0].AccessPacketsSent),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AccessServerResetTime,
+		c.accessServerResetTime,
 		prometheus.CounterValue,
 		float64(dst[0].AccessServerResetTime),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AccessServerUpTime,
+		c.accessServerUpTime,
 		prometheus.CounterValue,
 		float64(dst[0].AccessServerUpTime),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AccessUnknownType,
+		c.accessUnknownType,
 		prometheus.CounterValue,
 		float64(dst[0].AccessUnknownType),
 	)
 
-	return nil, nil
+	return nil
 }
 
-func (c *collector) CollectAccounting(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *Collector) CollectAccounting(ch chan<- prometheus.Metric) error {
 	var dst []Win32_PerfRawData_IAS_NPSAccountingServer
 	q := wmi.QueryAll(&dst, c.logger)
 	if err := wmi.Query(q, &dst); err != nil {
-		return nil, err
+		return err
 	}
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AccountingRequests,
+		c.accountingRequests,
 		prometheus.CounterValue,
 		float64(dst[0].AccountingRequests),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AccountingResponses,
+		c.accountingResponses,
 		prometheus.CounterValue,
 		float64(dst[0].AccountingResponses),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AccountingBadAuthenticators,
+		c.accountingBadAuthenticators,
 		prometheus.CounterValue,
 		float64(dst[0].AccountingBadAuthenticators),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AccountingDroppedPackets,
+		c.accountingDroppedPackets,
 		prometheus.CounterValue,
 		float64(dst[0].AccountingDroppedPackets),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AccountingInvalidRequests,
+		c.accountingInvalidRequests,
 		prometheus.CounterValue,
 		float64(dst[0].AccountingInvalidRequests),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AccountingMalformedPackets,
+		c.accountingMalformedPackets,
 		prometheus.CounterValue,
 		float64(dst[0].AccountingMalformedPackets),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AccountingNoRecord,
+		c.accountingNoRecord,
 		prometheus.CounterValue,
 		float64(dst[0].AccountingNoRecord),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AccountingPacketsReceived,
+		c.accountingPacketsReceived,
 		prometheus.CounterValue,
 		float64(dst[0].AccountingPacketsReceived),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AccountingPacketsSent,
+		c.accountingPacketsSent,
 		prometheus.CounterValue,
 		float64(dst[0].AccountingPacketsSent),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AccountingServerResetTime,
+		c.accountingServerResetTime,
 		prometheus.CounterValue,
 		float64(dst[0].AccountingServerResetTime),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AccountingServerUpTime,
+		c.accountingServerUpTime,
 		prometheus.CounterValue,
 		float64(dst[0].AccountingServerUpTime),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.AccountingUnknownType,
+		c.accountingUnknownType,
 		prometheus.CounterValue,
 		float64(dst[0].AccountingUnknownType),
 	)
 
-	return nil, nil
+	return nil
 }

pkg/collector/os/os.go

@@ -6,12 +6,15 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"strconv"
 	"strings"
+	"syscall"
 	"time"
 
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
+	"github.com/prometheus-community/windows_exporter/pkg/headers/kernel32"
 	"github.com/prometheus-community/windows_exporter/pkg/headers/netapi32"
 	"github.com/prometheus-community/windows_exporter/pkg/headers/psapi"
 	"github.com/prometheus-community/windows_exporter/pkg/headers/sysinfoapi"
@@ -27,23 +30,24 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-// A collector is a Prometheus collector for WMI metrics
-type collector struct {
+// A Collector is a Prometheus Collector for WMI metrics.
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	OSInformation           *prometheus.Desc
-	PhysicalMemoryFreeBytes *prometheus.Desc
-	PagingFreeBytes         *prometheus.Desc
-	VirtualMemoryFreeBytes  *prometheus.Desc
-	ProcessesLimit          *prometheus.Desc
-	ProcessMemoryLimitBytes *prometheus.Desc
-	Processes               *prometheus.Desc
-	Users                   *prometheus.Desc
-	PagingLimitBytes        *prometheus.Desc
-	VirtualMemoryBytes      *prometheus.Desc
-	VisibleMemoryBytes      *prometheus.Desc
-	Time                    *prometheus.Desc
-	Timezone                *prometheus.Desc
+	osInformation           *prometheus.Desc
+	pagingFreeBytes         *prometheus.Desc
+	pagingLimitBytes        *prometheus.Desc
+	physicalMemoryFreeBytes *prometheus.Desc
+	processMemoryLimitBytes *prometheus.Desc
+	processes               *prometheus.Desc
+	processesLimit          *prometheus.Desc
+	time                    *prometheus.Desc
+	timezone                *prometheus.Desc
+	users                   *prometheus.Desc
+	virtualMemoryBytes      *prometheus.Desc
+	virtualMemoryFreeBytes  *prometheus.Desc
+	visibleMemoryBytes      *prometheus.Desc
 }
 
 type pagingFileCounter struct {
@@ -52,102 +56,114 @@ type pagingFileCounter struct {
 	UsagePeak float64 `perflib:"% Usage Peak"`
 }
 
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{"Paging File"}, nil
 }
 
-func (c *collector) Build() error {
-	c.OSInformation = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.osInformation = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "info"),
 		"OperatingSystem.Caption, OperatingSystem.Version",
 		[]string{"product", "version", "major_version", "minor_version", "build_number", "revision"},
 		nil,
 	)
-	c.PagingLimitBytes = prometheus.NewDesc(
+	c.pagingLimitBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "paging_limit_bytes"),
 		"OperatingSystem.SizeStoredInPagingFiles",
 		nil,
 		nil,
 	)
-	c.PagingFreeBytes = prometheus.NewDesc(
+	c.pagingFreeBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "paging_free_bytes"),
 		"OperatingSystem.FreeSpaceInPagingFiles",
 		nil,
 		nil,
 	)
-	c.PhysicalMemoryFreeBytes = prometheus.NewDesc(
+	c.physicalMemoryFreeBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "physical_memory_free_bytes"),
 		"OperatingSystem.FreePhysicalMemory",
 		nil,
 		nil,
 	)
-	c.Time = prometheus.NewDesc(
+	c.time = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "time"),
 		"OperatingSystem.LocalDateTime",
 		nil,
 		nil,
 	)
-	c.Timezone = prometheus.NewDesc(
+	c.timezone = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "timezone"),
 		"OperatingSystem.LocalDateTime",
 		[]string{"timezone"},
 		nil,
 	)
-	c.Processes = prometheus.NewDesc(
+	c.processes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "processes"),
 		"OperatingSystem.NumberOfProcesses",
 		nil,
 		nil,
 	)
-	c.ProcessesLimit = prometheus.NewDesc(
+	c.processesLimit = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "processes_limit"),
 		"OperatingSystem.MaxNumberOfProcesses",
 		nil,
 		nil,
 	)
-	c.ProcessMemoryLimitBytes = prometheus.NewDesc(
+	c.processMemoryLimitBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "process_memory_limit_bytes"),
 		"OperatingSystem.MaxProcessMemorySize",
 		nil,
 		nil,
 	)
-	c.Users = prometheus.NewDesc(
+	c.users = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "users"),
 		"OperatingSystem.NumberOfUsers",
 		nil,
 		nil,
 	)
-	c.VirtualMemoryBytes = prometheus.NewDesc(
+	c.virtualMemoryBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "virtual_memory_bytes"),
 		"OperatingSystem.TotalVirtualMemorySize",
 		nil,
 		nil,
 	)
-	c.VisibleMemoryBytes = prometheus.NewDesc(
+	c.visibleMemoryBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "visible_memory_bytes"),
 		"OperatingSystem.TotalVisibleMemorySize",
 		nil,
 		nil,
 	)
-	c.VirtualMemoryFreeBytes = prometheus.NewDesc(
+	c.virtualMemoryFreeBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "virtual_memory_free_bytes"),
 		"OperatingSystem.FreeVirtualMemory",
 		nil,
@@ -158,16 +174,16 @@ func (c *collector) Build() error {
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ctx, ch); err != nil {
-		_ = level.Error(c.logger).Log("failed collecting os metrics", "desc", desc, "err", err)
+func (c *Collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collect(ctx, ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed collecting os metrics", "err", err)
 		return err
 	}
 	return nil
 }
 
 // Win32_OperatingSystem docs:
-// - https://msdn.microsoft.com/en-us/library/aa394239 - Win32_OperatingSystem class
+// - https://msdn.microsoft.com/en-us/library/aa394239 - Win32_OperatingSystem class.
 type Win32_OperatingSystem struct {
 	Caption                 string
 	FreePhysicalMemory      uint64
@@ -184,52 +200,36 @@ type Win32_OperatingSystem struct {
 	Version                 string
 }
 
-func (c *collector) collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *Collector) collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	nwgi, err := netapi32.GetWorkstationInfo()
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	gmse, err := sysinfoapi.GlobalMemoryStatusEx()
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	currentTime := time.Now()
-	timezoneName, _ := currentTime.Zone()
+
+	timeZoneInfo, err := kernel32.GetDynamicTimeZoneInformation()
+	if err != nil {
+		return err
+	}
+
+	// timeZoneKeyName contains the english name of the timezone.
+	timezoneName := syscall.UTF16ToString(timeZoneInfo.TimeZoneKeyName[:])
 
 	// Get total allocation of paging files across all disks.
 	memManKey, err := registry.OpenKey(registry.LOCAL_MACHINE, `SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management`, registry.QUERY_VALUE)
+	if err != nil {
+		return err
+	}
+
 	defer memManKey.Close()
 
-	if err != nil {
-		return nil, err
-	}
 	pagingFiles, _, pagingErr := memManKey.GetStringsValue("ExistingPageFiles")
-	// Get build number and product name from registry
-	ntKey, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\Microsoft\Windows NT\CurrentVersion`, registry.QUERY_VALUE)
-	defer ntKey.Close()
-
-	if err != nil {
-		return nil, err
-	}
-
-	pn, _, err := ntKey.GetStringValue("ProductName")
-	if err != nil {
-		return nil, err
-	}
-
-	bn, _, err := ntKey.GetStringValue("CurrentBuildNumber")
-	if err != nil {
-		return nil, err
-	}
-
-	revision, _, err := ntKey.GetIntegerValue("UBR")
-	if errors.Is(err, registry.ErrNotExist) {
-		revision = 0
-	} else if err != nil {
-		return nil, err
-	}
 
 	var fsipf float64
 	for _, pagingFile := range pagingFiles {
@@ -243,14 +243,39 @@ func (c *collector) collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metri
 		}
 	}
 
+	// Get build number and product name from registry
+	ntKey, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\Microsoft\Windows NT\CurrentVersion`, registry.QUERY_VALUE)
+	if err != nil {
+		return err
+	}
+
+	defer ntKey.Close()
+
+	pn, _, err := ntKey.GetStringValue("ProductName")
+	if err != nil {
+		return err
+	}
+
+	bn, _, err := ntKey.GetStringValue("CurrentBuildNumber")
+	if err != nil {
+		return err
+	}
+
+	revision, _, err := ntKey.GetIntegerValue("UBR")
+	if errors.Is(err, registry.ErrNotExist) {
+		revision = 0
+	} else if err != nil {
+		return err
+	}
+
 	gpi, err := psapi.GetPerformanceInfo()
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	pfc := make([]pagingFileCounter, 0)
 	if err := perflib.UnmarshalObject(ctx.PerfObjects["Paging File"], &pfc, c.logger); err != nil {
-		return nil, err
+		return err
 	}
 
 	// Get current page file usage.
@@ -266,31 +291,31 @@ func (c *collector) collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metri
 	pfb := fsipf - (pfbRaw * float64(gpi.PageSize))
 
 	ch <- prometheus.MustNewConstMetric(
-		c.OSInformation,
+		c.osInformation,
 		prometheus.GaugeValue,
 		1.0,
-		fmt.Sprintf("Microsoft %s", pn), // Caption
+		"Microsoft "+pn, // Caption
 		fmt.Sprintf("%d.%d.%s", nwgi.VersionMajor, nwgi.VersionMinor, bn), // Version
-		fmt.Sprintf("%d", nwgi.VersionMajor),                              // Major Version
-		fmt.Sprintf("%d", nwgi.VersionMinor),                              // Minor Version
-		bn,                                                                // Build number
-		fmt.Sprintf("%d", revision),                                       // Revision
+		strconv.FormatUint(uint64(nwgi.VersionMajor), 10),                 // Major Version
+		strconv.FormatUint(uint64(nwgi.VersionMinor), 10),                 // Minor Version
+		bn,                               // Build number
+		strconv.FormatUint(revision, 10), // Revision
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.PhysicalMemoryFreeBytes,
+		c.physicalMemoryFreeBytes,
 		prometheus.GaugeValue,
 		float64(gmse.AvailPhys),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.Time,
+		c.time,
 		prometheus.GaugeValue,
 		float64(currentTime.Unix()),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.Timezone,
+		c.timezone,
 		prometheus.GaugeValue,
 		1.0,
 		timezoneName,
@@ -298,21 +323,21 @@ func (c *collector) collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metri
 
 	if pagingErr == nil {
 		ch <- prometheus.MustNewConstMetric(
-			c.PagingFreeBytes,
+			c.pagingFreeBytes,
 			prometheus.GaugeValue,
 			pfb,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.PagingLimitBytes,
+			c.pagingLimitBytes,
 			prometheus.GaugeValue,
 			fsipf,
 		)
 	} else {
-		_ = level.Debug(c.logger).Log("Could not find HKLM:\\SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Memory Management key. windows_os_paging_free_bytes and windows_os_paging_limit_bytes will be omitted.")
+		_ = level.Debug(c.logger).Log("msg", "Could not find HKLM:\\SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Memory Management key. windows_os_paging_free_bytes and windows_os_paging_limit_bytes will be omitted.")
 	}
 	ch <- prometheus.MustNewConstMetric(
-		c.VirtualMemoryFreeBytes,
+		c.virtualMemoryFreeBytes,
 		prometheus.GaugeValue,
 		float64(gmse.AvailPageFile),
 	)
@@ -321,40 +346,40 @@ func (c *collector) collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metri
 	// https://techcommunity.microsoft.com/t5/windows-blog-archive/pushing-the-limits-of-windows-processes-and-threads/ba-p/723824
 	// https://docs.microsoft.com/en-us/windows/win32/cimwin32prov/win32-operatingsystem
 	ch <- prometheus.MustNewConstMetric(
-		c.ProcessesLimit,
+		c.processesLimit,
 		prometheus.GaugeValue,
 		float64(4294967295),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.ProcessMemoryLimitBytes,
+		c.processMemoryLimitBytes,
 		prometheus.GaugeValue,
 		float64(gmse.TotalVirtual),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.Processes,
+		c.processes,
 		prometheus.GaugeValue,
 		float64(gpi.ProcessCount),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.Users,
+		c.users,
 		prometheus.GaugeValue,
 		float64(nwgi.LoggedOnUsers),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.VirtualMemoryBytes,
+		c.virtualMemoryBytes,
 		prometheus.GaugeValue,
 		float64(gmse.TotalPageFile),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
-		c.VisibleMemoryBytes,
+		c.visibleMemoryBytes,
 		prometheus.GaugeValue,
 		float64(gmse.TotalPhys),
 	)
 
-	return nil, nil
+	return nil
 }

pkg/collector/physical_disk/physical_disk.go

@@ -15,199 +15,204 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-const (
-	Name                    = "physical_disk"
-	FlagPhysicalDiskExclude = "collector.physical_disk.disk-exclude"
-	FlagPhysicalDiskInclude = "collector.physical_disk.disk-include"
-)
+const Name = "physical_disk"
 
 type Config struct {
-	DiskInclude string `yaml:"disk_include"`
-	DiskExclude string `yaml:"disk_exclude"`
+	DiskInclude *regexp.Regexp `yaml:"disk_include"`
+	DiskExclude *regexp.Regexp `yaml:"disk_exclude"`
 }
 
 var ConfigDefaults = Config{
-	DiskInclude: ".+",
-	DiskExclude: "",
+	DiskInclude: types.RegExpAny,
+	DiskExclude: types.RegExpEmpty,
 }
 
-// A collector is a Prometheus collector for perflib PhysicalDisk metrics
-type collector struct {
+// A Collector is a Prometheus Collector for perflib PhysicalDisk metrics.
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	diskInclude *string
-	diskExclude *string
-
-	diskIncludeSet bool
-	diskExcludeSet bool
-
-	RequestsQueued   *prometheus.Desc
-	ReadBytesTotal   *prometheus.Desc
-	ReadsTotal       *prometheus.Desc
-	WriteBytesTotal  *prometheus.Desc
-	WritesTotal      *prometheus.Desc
-	ReadTime         *prometheus.Desc
-	WriteTime        *prometheus.Desc
-	IdleTime         *prometheus.Desc
-	SplitIOs         *prometheus.Desc
-	ReadLatency      *prometheus.Desc
-	WriteLatency     *prometheus.Desc
-	ReadWriteLatency *prometheus.Desc
-
-	diskIncludePattern *regexp.Regexp
-	diskExcludePattern *regexp.Regexp
+	idleTime         *prometheus.Desc
+	readBytesTotal   *prometheus.Desc
+	readLatency      *prometheus.Desc
+	readTime         *prometheus.Desc
+	readWriteLatency *prometheus.Desc
+	readsTotal       *prometheus.Desc
+	requestsQueued   *prometheus.Desc
+	splitIOs         *prometheus.Desc
+	writeBytesTotal  *prometheus.Desc
+	writeLatency     *prometheus.Desc
+	writeTime        *prometheus.Desc
+	writesTotal      *prometheus.Desc
 }
 
-func New(logger log.Logger, config *Config) types.Collector {
+func New(logger log.Logger, config *Config) *Collector {
 	if config == nil {
 		config = &ConfigDefaults
 	}
 
-	c := &collector{
-		diskExclude: &config.DiskExclude,
-		diskInclude: &config.DiskInclude,
+	if config.DiskExclude == nil {
+		config.DiskExclude = ConfigDefaults.DiskExclude
 	}
+
+	if config.DiskInclude == nil {
+		config.DiskInclude = ConfigDefaults.DiskInclude
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(app *kingpin.Application) types.Collector {
-	c := &collector{}
+func NewWithFlags(app *kingpin.Application) *Collector {
+	c := &Collector{
+		config: ConfigDefaults,
+	}
 
-	c.diskInclude = app.Flag(
-		FlagPhysicalDiskInclude,
-		"Regexp of disks to include. Disk number must both match include and not match exclude to be included.",
-	).Default(ConfigDefaults.DiskInclude).PreAction(func(_ *kingpin.ParseContext) error {
-		c.diskIncludeSet = true
-		return nil
-	}).String()
+	var diskExclude, diskInclude string
 
-	c.diskExclude = app.Flag(
-		FlagPhysicalDiskExclude,
+	app.Flag(
+		"collector.physical_disk.disk-exclude",
 		"Regexp of disks to exclude. Disk number must both match include and not match exclude to be included.",
-	).Default(ConfigDefaults.DiskExclude).PreAction(func(_ *kingpin.ParseContext) error {
-		c.diskExcludeSet = true
+	).Default(c.config.DiskExclude.String()).StringVar(&diskExclude)
+
+	app.Flag(
+		"collector.physical_disk.disk-include",
+		"Regexp of disks to include. Disk number must both match include and not match exclude to be included.",
+	).Default(c.config.DiskInclude.String()).StringVar(&diskInclude)
+
+	app.Action(func(*kingpin.ParseContext) error {
+		var err error
+
+		c.config.DiskExclude, err = regexp.Compile(fmt.Sprintf("^(?:%s)$", diskExclude))
+		if err != nil {
+			return fmt.Errorf("collector.physical_disk.disk-exclude: %w", err)
+		}
+
+		c.config.DiskInclude, err = regexp.Compile(fmt.Sprintf("^(?:%s)$", diskInclude))
+		if err != nil {
+			return fmt.Errorf("collector.physical_disk.disk-include: %w", err)
+		}
+
 		return nil
-	}).String()
+	})
+
 	return c
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{"PhysicalDisk"}, nil
 }
 
-func (c *collector) Build() error {
-	c.RequestsQueued = prometheus.NewDesc(
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.requestsQueued = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "requests_queued"),
 		"The number of requests queued to the disk (PhysicalDisk.CurrentDiskQueueLength)",
 		[]string{"disk"},
 		nil,
 	)
 
-	c.ReadBytesTotal = prometheus.NewDesc(
+	c.readBytesTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "read_bytes_total"),
 		"The number of bytes transferred from the disk during read operations (PhysicalDisk.DiskReadBytesPerSec)",
 		[]string{"disk"},
 		nil,
 	)
 
-	c.ReadsTotal = prometheus.NewDesc(
+	c.readsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "reads_total"),
 		"The number of read operations on the disk (PhysicalDisk.DiskReadsPerSec)",
 		[]string{"disk"},
 		nil,
 	)
 
-	c.WriteBytesTotal = prometheus.NewDesc(
+	c.writeBytesTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "write_bytes_total"),
 		"The number of bytes transferred to the disk during write operations (PhysicalDisk.DiskWriteBytesPerSec)",
 		[]string{"disk"},
 		nil,
 	)
 
-	c.WritesTotal = prometheus.NewDesc(
+	c.writesTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "writes_total"),
 		"The number of write operations on the disk (PhysicalDisk.DiskWritesPerSec)",
 		[]string{"disk"},
 		nil,
 	)
 
-	c.ReadTime = prometheus.NewDesc(
+	c.readTime = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "read_seconds_total"),
 		"Seconds that the disk was busy servicing read requests (PhysicalDisk.PercentDiskReadTime)",
 		[]string{"disk"},
 		nil,
 	)
 
-	c.WriteTime = prometheus.NewDesc(
+	c.writeTime = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "write_seconds_total"),
 		"Seconds that the disk was busy servicing write requests (PhysicalDisk.PercentDiskWriteTime)",
 		[]string{"disk"},
 		nil,
 	)
 
-	c.IdleTime = prometheus.NewDesc(
+	c.idleTime = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "idle_seconds_total"),
 		"Seconds that the disk was idle (PhysicalDisk.PercentIdleTime)",
 		[]string{"disk"},
 		nil,
 	)
 
-	c.SplitIOs = prometheus.NewDesc(
+	c.splitIOs = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "split_ios_total"),
 		"The number of I/Os to the disk were split into multiple I/Os (PhysicalDisk.SplitIOPerSec)",
 		[]string{"disk"},
 		nil,
 	)
 
-	c.ReadLatency = prometheus.NewDesc(
+	c.readLatency = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "read_latency_seconds_total"),
 		"Shows the average time, in seconds, of a read operation from the disk (PhysicalDisk.AvgDiskSecPerRead)",
 		[]string{"disk"},
 		nil,
 	)
 
-	c.WriteLatency = prometheus.NewDesc(
+	c.writeLatency = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "write_latency_seconds_total"),
 		"Shows the average time, in seconds, of a write operation to the disk (PhysicalDisk.AvgDiskSecPerWrite)",
 		[]string{"disk"},
 		nil,
 	)
 
-	c.ReadWriteLatency = prometheus.NewDesc(
+	c.readWriteLatency = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "read_write_latency_seconds_total"),
 		"Shows the time, in seconds, of the average disk transfer (PhysicalDisk.AvgDiskSecPerTransfer)",
 		[]string{"disk"},
 		nil,
 	)
 
-	var err error
-	c.diskIncludePattern, err = regexp.Compile(fmt.Sprintf("^(?:%s)$", *c.diskInclude))
-	if err != nil {
-		return err
-	}
-
-	c.diskExcludePattern, err = regexp.Compile(fmt.Sprintf("^(?:%s)$", *c.diskExclude))
-	if err != nil {
-		return err
-	}
-
 	return nil
 }
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ctx, ch); err != nil {
-		_ = level.Error(c.logger).Log("failed collecting physical_disk metrics", "desc", desc, "err", err)
+func (c *Collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collect(ctx, ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed collecting physical_disk metrics", "err", err)
 		return err
 	}
 	return nil
@@ -215,7 +220,7 @@ func (c *collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metri
 
 // PhysicalDisk
 // Win32_PerfRawData_PerfDisk_PhysicalDisk docs:
-// - https://docs.microsoft.com/en-us/previous-versions/aa394308(v=vs.85) - Win32_PerfRawData_PerfDisk_PhysicalDisk class
+// - https://docs.microsoft.com/en-us/previous-versions/aa394308(v=vs.85) - Win32_PerfRawData_PerfDisk_PhysicalDisk class.
 type PhysicalDisk struct {
 	Name                   string
 	CurrentDiskQueueLength float64 `perflib:"Current Disk Queue Length"`
@@ -232,16 +237,16 @@ type PhysicalDisk struct {
 	AvgDiskSecPerTransfer  float64 `perflib:"Avg. Disk sec/Transfer"`
 }
 
-func (c *collector) collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *Collector) collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	var dst []PhysicalDisk
 	if err := perflib.UnmarshalObject(ctx.PerfObjects["PhysicalDisk"], &dst, c.logger); err != nil {
-		return nil, err
+		return err
 	}
 
 	for _, disk := range dst {
 		if disk.Name == "_Total" ||
-			c.diskExcludePattern.MatchString(disk.Name) ||
-			!c.diskIncludePattern.MatchString(disk.Name) {
+			c.config.DiskExclude.MatchString(disk.Name) ||
+			!c.config.DiskInclude.MatchString(disk.Name) {
 			continue
 		}
 
@@ -250,89 +255,89 @@ func (c *collector) collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metri
 		disk_number, _, _ := strings.Cut(disk.Name, " ")
 
 		ch <- prometheus.MustNewConstMetric(
-			c.RequestsQueued,
+			c.requestsQueued,
 			prometheus.GaugeValue,
 			disk.CurrentDiskQueueLength,
 			disk_number,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.ReadBytesTotal,
+			c.readBytesTotal,
 			prometheus.CounterValue,
 			disk.DiskReadBytesPerSec,
 			disk_number,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.ReadsTotal,
+			c.readsTotal,
 			prometheus.CounterValue,
 			disk.DiskReadsPerSec,
 			disk_number,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.WriteBytesTotal,
+			c.writeBytesTotal,
 			prometheus.CounterValue,
 			disk.DiskWriteBytesPerSec,
 			disk_number,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.WritesTotal,
+			c.writesTotal,
 			prometheus.CounterValue,
 			disk.DiskWritesPerSec,
 			disk_number,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.ReadTime,
+			c.readTime,
 			prometheus.CounterValue,
 			disk.PercentDiskReadTime,
 			disk_number,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.WriteTime,
+			c.writeTime,
 			prometheus.CounterValue,
 			disk.PercentDiskWriteTime,
 			disk_number,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.IdleTime,
+			c.idleTime,
 			prometheus.CounterValue,
 			disk.PercentIdleTime,
 			disk_number,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.SplitIOs,
+			c.splitIOs,
 			prometheus.CounterValue,
 			disk.SplitIOPerSec,
 			disk_number,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.ReadLatency,
+			c.readLatency,
 			prometheus.CounterValue,
 			disk.AvgDiskSecPerRead*perflib.TicksToSecondScaleFactor,
 			disk_number,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.WriteLatency,
+			c.writeLatency,
 			prometheus.CounterValue,
 			disk.AvgDiskSecPerWrite*perflib.TicksToSecondScaleFactor,
 			disk_number,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.ReadWriteLatency,
+			c.readWriteLatency,
 			prometheus.CounterValue,
 			disk.AvgDiskSecPerTransfer*perflib.TicksToSecondScaleFactor,
 			disk_number,
 		)
 	}
 
-	return nil, nil
+	return nil
 }

pkg/collector/physical_disk/physical_disk_test.go

@@ -0,0 +1,12 @@
+package physical_disk_test
+
+import (
+	"testing"
+
+	"github.com/prometheus-community/windows_exporter/pkg/collector/physical_disk"
+	"github.com/prometheus-community/windows_exporter/pkg/testutils"
+)
+
+func BenchmarkCollector(b *testing.B) {
+	testutils.FuncBenchmarkCollector(b, physical_disk.Name, physical_disk.NewWithFlags)
+}

pkg/collector/printer/printer.go

@@ -0,0 +1,254 @@
+//go:build windows
+
+package printer
+
+import (
+	"fmt"
+	"regexp"
+	"strings"
+
+	"github.com/alecthomas/kingpin/v2"
+	"github.com/go-kit/log"
+	"github.com/go-kit/log/level"
+	"github.com/prometheus-community/windows_exporter/pkg/types"
+	"github.com/prometheus-community/windows_exporter/pkg/wmi"
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+const Name = "printer"
+
+// printerStatusMap source: https://learn.microsoft.com/en-us/windows/win32/cimwin32prov/win32-printer#:~:text=Power%20Save-,PrinterStatus,Offline%20(7),-PrintJobDataType
+var printerStatusMap = map[uint16]string{
+	1: "Other",
+	2: "Unknown",
+	3: "Idle",
+	4: "Printing",
+	5: "Warmup",
+	6: "Stopped Printing",
+	7: "Offline",
+}
+
+type Config struct {
+	PrinterInclude *regexp.Regexp `yaml:"printer_include"`
+	PrinterExclude *regexp.Regexp `yaml:"printer_exclude"`
+}
+
+var ConfigDefaults = Config{
+	PrinterInclude: types.RegExpAny,
+	PrinterExclude: types.RegExpEmpty,
+}
+
+type Collector struct {
+	config Config
+	logger log.Logger
+
+	printerStatus    *prometheus.Desc
+	printerJobStatus *prometheus.Desc
+	printerJobCount  *prometheus.Desc
+}
+
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	if config.PrinterExclude == nil {
+		config.PrinterExclude = ConfigDefaults.PrinterExclude
+	}
+
+	if config.PrinterInclude == nil {
+		config.PrinterInclude = ConfigDefaults.PrinterInclude
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
+	c.SetLogger(logger)
+
+	return c
+}
+
+func NewWithFlags(app *kingpin.Application) *Collector {
+	c := &Collector{
+		config: ConfigDefaults,
+	}
+
+	var printerInclude, printerExclude string
+
+	app.Flag(
+		"collector.printer.include",
+		"Regular expression to match printers to collect metrics for",
+	).Default(c.config.PrinterInclude.String()).StringVar(&printerInclude)
+
+	app.Flag(
+		"collector.printer.exclude",
+		"Regular expression to match printers to exclude",
+	).Default(c.config.PrinterExclude.String()).StringVar(&printerExclude)
+
+	app.Action(func(*kingpin.ParseContext) error {
+		var err error
+
+		c.config.PrinterInclude, err = regexp.Compile(fmt.Sprintf("^(?:%s)$", printerInclude))
+		if err != nil {
+			return fmt.Errorf("collector.printer.include: %w", err)
+		}
+
+		c.config.PrinterExclude, err = regexp.Compile(fmt.Sprintf("^(?:%s)$", printerExclude))
+		if err != nil {
+			return fmt.Errorf("collector.printer.exclude: %w", err)
+		}
+
+		return nil
+	})
+
+	return c
+}
+
+func (c *Collector) SetLogger(logger log.Logger) {
+	c.logger = log.With(logger, "collector", Name)
+}
+
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	c.printerJobStatus = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "job_status"),
+		"A counter of printer jobs by status",
+		[]string{"printer", "status"},
+		nil,
+	)
+	c.printerStatus = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "status"),
+		"Printer status",
+		[]string{"printer", "status"},
+		nil,
+	)
+	c.printerJobCount = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "job_count"),
+		"Number of jobs processed by the printer since the last reset",
+		[]string{"printer"},
+		nil,
+	)
+
+	return nil
+}
+
+func (c *Collector) GetName() string { return Name }
+
+func (c *Collector) GetPerfCounter() ([]string, error) { return []string{"Printer"}, nil }
+
+type wmiPrinter struct {
+	Name                   string
+	Default                bool
+	PrinterStatus          uint16
+	JobCountSinceLastReset uint32
+}
+
+type wmiPrintJob struct {
+	Name   string
+	Status string
+}
+
+func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collectPrinterStatus(ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed to collect printer status metrics", "err", err)
+		return err
+	}
+
+	if err := c.collectPrinterJobStatus(ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed to collect printer job status metrics", "err", err)
+		return err
+	}
+
+	return nil
+}
+
+func (c *Collector) collectPrinterStatus(ch chan<- prometheus.Metric) error {
+	var printers []wmiPrinter
+
+	q := wmi.QueryAllForClass(&printers, "win32_Printer", c.logger)
+	if err := wmi.Query(q, &printers); err != nil {
+		return err
+	}
+
+	for _, printer := range printers {
+		if c.config.PrinterExclude.MatchString(printer.Name) ||
+			!c.config.PrinterInclude.MatchString(printer.Name) {
+			continue
+		}
+
+		for printerStatus, printerStatusName := range printerStatusMap {
+			isCurrentStatus := 0.0
+			if printerStatus == printer.PrinterStatus {
+				isCurrentStatus = 1.0
+			}
+
+			ch <- prometheus.MustNewConstMetric(
+				c.printerStatus,
+				prometheus.GaugeValue,
+				isCurrentStatus,
+				printer.Name,
+				printerStatusName,
+			)
+		}
+
+		ch <- prometheus.MustNewConstMetric(
+			c.printerJobCount,
+			prometheus.CounterValue,
+			float64(printer.JobCountSinceLastReset),
+			printer.Name,
+		)
+	}
+
+	return nil
+}
+
+func (c *Collector) collectPrinterJobStatus(ch chan<- prometheus.Metric) error {
+	var printJobs []wmiPrintJob
+
+	q := wmi.QueryAllForClass(&printJobs, "win32_PrintJob", c.logger)
+	if err := wmi.Query(q, &printJobs); err != nil {
+		return err
+	}
+
+	groupedPrintJobs := c.groupPrintJobs(printJobs)
+	for group, count := range groupedPrintJobs {
+		ch <- prometheus.MustNewConstMetric(
+			c.printerJobStatus,
+			prometheus.GaugeValue,
+			float64(count),
+			group.printerName,
+			group.status,
+		)
+	}
+
+	return nil
+}
+
+type PrintJobStatusGroup struct {
+	printerName string
+	status      string
+}
+
+func (c *Collector) groupPrintJobs(printJobs []wmiPrintJob) map[PrintJobStatusGroup]int {
+	groupedPrintJobs := make(map[PrintJobStatusGroup]int)
+
+	for _, printJob := range printJobs {
+		printerName := strings.Split(printJob.Name, ",")[0]
+
+		if c.config.PrinterExclude.MatchString(printerName) ||
+			!c.config.PrinterInclude.MatchString(printerName) {
+			continue
+		}
+
+		groupedPrintJobs[PrintJobStatusGroup{
+			printerName: printerName,
+			status:      printJob.Status,
+		}]++
+	}
+
+	return groupedPrintJobs
+}

pkg/collector/printer/printer_test.go

@@ -0,0 +1,16 @@
+package printer_test
+
+import (
+	"testing"
+
+	"github.com/alecthomas/kingpin/v2"
+	"github.com/prometheus-community/windows_exporter/pkg/collector/printer"
+	"github.com/prometheus-community/windows_exporter/pkg/testutils"
+)
+
+func BenchmarkCollector(b *testing.B) {
+	// Whitelist is not set in testing context (kingpin flags not parsed), causing the collector to skip all printers.
+	printersInclude := ".+"
+	kingpin.CommandLine.GetArg("collector.printer.include").StringVar(&printersInclude)
+	testutils.FuncBenchmarkCollector(b, "printer", printer.NewWithFlags)
+}

pkg/collector/process/process.go

@@ -3,221 +3,248 @@
 package process
 
 import (
+	"errors"
 	"fmt"
 	"regexp"
 	"strconv"
 	"strings"
+	"syscall"
 
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/prometheus-community/windows_exporter/pkg/perflib"
 	"github.com/prometheus-community/windows_exporter/pkg/types"
-	"github.com/prometheus-community/windows_exporter/pkg/utils"
 	"github.com/prometheus-community/windows_exporter/pkg/wmi"
 	"github.com/prometheus/client_golang/prometheus"
+	"golang.org/x/sys/windows"
 )
 
-const (
-	Name                    = "process"
-	FlagProcessExclude      = "collector.process.exclude"
-	FlagProcessInclude      = "collector.process.include"
-	FlagEnableWorkerProcess = "collector.process.iis"
-)
+const Name = "process"
 
 type Config struct {
-	ProcessInclude      string `yaml:"process_include"`
-	ProcessExclude      string `yaml:"process_exclude"`
-	EnableWorkerProcess bool   `yaml:"enable_iis_worker_process"`
+	ProcessInclude      *regexp.Regexp `yaml:"process_include"`
+	ProcessExclude      *regexp.Regexp `yaml:"process_exclude"`
+	EnableWorkerProcess bool           `yaml:"enable_iis_worker_process"` //nolint:tagliatelle
+	EnableReportOwner   bool           `yaml:"enable_report_owner"`
 }
 
 var ConfigDefaults = Config{
-	ProcessInclude:      ".+",
-	ProcessExclude:      "",
+	ProcessInclude:      types.RegExpAny,
+	ProcessExclude:      types.RegExpEmpty,
 	EnableWorkerProcess: false,
+	EnableReportOwner:   false,
 }
 
-type collector struct {
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	processInclude *string
-	processExclude *string
+	lookupCache map[string]string
 
-	enableWorkerProcess *bool
-
-	StartTime         *prometheus.Desc
-	CPUTimeTotal      *prometheus.Desc
-	HandleCount       *prometheus.Desc
-	IOBytesTotal      *prometheus.Desc
-	IOOperationsTotal *prometheus.Desc
-	PageFaultsTotal   *prometheus.Desc
-	PageFileBytes     *prometheus.Desc
-	PoolBytes         *prometheus.Desc
-	PriorityBase      *prometheus.Desc
-	PrivateBytes      *prometheus.Desc
-	ThreadCount       *prometheus.Desc
-	VirtualBytes      *prometheus.Desc
-	WorkingSetPrivate *prometheus.Desc
-	WorkingSetPeak    *prometheus.Desc
-	WorkingSet        *prometheus.Desc
-
-	processIncludePattern *regexp.Regexp
-	processExcludePattern *regexp.Regexp
+	cpuTimeTotal      *prometheus.Desc
+	handleCount       *prometheus.Desc
+	ioBytesTotal      *prometheus.Desc
+	ioOperationsTotal *prometheus.Desc
+	pageFaultsTotal   *prometheus.Desc
+	pageFileBytes     *prometheus.Desc
+	poolBytes         *prometheus.Desc
+	priorityBase      *prometheus.Desc
+	privateBytes      *prometheus.Desc
+	startTime         *prometheus.Desc
+	threadCount       *prometheus.Desc
+	virtualBytes      *prometheus.Desc
+	workingSet        *prometheus.Desc
+	workingSetPeak    *prometheus.Desc
+	workingSetPrivate *prometheus.Desc
 }
 
-func New(logger log.Logger, config *Config) types.Collector {
+func New(logger log.Logger, config *Config) *Collector {
 	if config == nil {
 		config = &ConfigDefaults
 	}
 
-	c := &collector{
-		processExclude:      &config.ProcessExclude,
-		processInclude:      &config.ProcessInclude,
-		enableWorkerProcess: &config.EnableWorkerProcess,
+	if config.ProcessExclude == nil {
+		config.ProcessExclude = ConfigDefaults.ProcessExclude
 	}
+
+	if config.ProcessInclude == nil {
+		config.ProcessInclude = ConfigDefaults.ProcessInclude
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(app *kingpin.Application) types.Collector {
-	c := &collector{
-		processInclude: app.Flag(
-			FlagProcessInclude,
-			"Regexp of processes to include. Process name must both match include and not match exclude to be included.",
-		).Default(ConfigDefaults.ProcessInclude).String(),
-
-		processExclude: app.Flag(
-			FlagProcessExclude,
-			"Regexp of processes to exclude. Process name must both match include and not match exclude to be included.",
-		).Default(ConfigDefaults.ProcessExclude).String(),
-
-		enableWorkerProcess: app.Flag(
-			FlagEnableWorkerProcess,
-			"Enable IIS worker process name queries. May cause the collector to leak memory.",
-		).Default("false").Bool(),
+func NewWithFlags(app *kingpin.Application) *Collector {
+	c := &Collector{
+		config: ConfigDefaults,
 	}
+
+	var processExclude, processInclude string
+
+	app.Flag(
+		"collector.process.exclude",
+		"Regexp of processes to exclude. Process name must both match include and not match exclude to be included.",
+	).Default(c.config.ProcessExclude.String()).StringVar(&processExclude)
+
+	app.Flag(
+		"collector.process.include",
+		"Regexp of processes to include. Process name must both match include and not match exclude to be included.",
+	).Default(c.config.ProcessInclude.String()).StringVar(&processInclude)
+
+	app.Flag(
+		"collector.process.iis",
+		"Enable IIS worker process name queries. May cause the collector to leak memory.",
+	).Default(strconv.FormatBool(c.config.EnableWorkerProcess)).BoolVar(&c.config.EnableWorkerProcess)
+
+	app.Flag(
+		"collector.process.report-owner",
+		"Enable reporting of process owner.",
+	).Default(strconv.FormatBool(c.config.EnableReportOwner)).BoolVar(&c.config.EnableReportOwner)
+
+	app.Action(func(*kingpin.ParseContext) error {
+		var err error
+
+		c.config.ProcessExclude, err = regexp.Compile(fmt.Sprintf("^(?:%s)$", processExclude))
+		if err != nil {
+			return fmt.Errorf("collector.process.exclude: %w", err)
+		}
+
+		c.config.ProcessInclude, err = regexp.Compile(fmt.Sprintf("^(?:%s)$", processInclude))
+		if err != nil {
+			return fmt.Errorf("collector.process.include: %w", err)
+		}
+
+		return nil
+	})
+
 	return c
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{"Process"}, nil
 }
 
-func (c *collector) Build() error {
-	if c.processInclude != nil && *c.processInclude == ".*" && utils.IsEmpty(c.processExclude) {
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	if c.config.ProcessInclude.String() == "^(?:.*)$" && c.config.ProcessExclude.String() == "^(?:)$" {
 		_ = level.Warn(c.logger).Log("msg", "No filters specified for process collector. This will generate a very large number of metrics!")
 	}
 
-	c.StartTime = prometheus.NewDesc(
+	commonLabels := make([]string, 0)
+	if c.config.EnableReportOwner {
+		commonLabels = []string{"owner"}
+	}
+
+	c.startTime = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "start_time"),
 		"Time of process start.",
-		[]string{"process", "process_id", "creating_process_id"},
+		append(commonLabels, "process", "process_id", "creating_process_id"),
 		nil,
 	)
-	c.CPUTimeTotal = prometheus.NewDesc(
+	c.cpuTimeTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "cpu_time_total"),
 		"Returns elapsed time that all of the threads of this process used the processor to execute instructions by mode (privileged, user).",
-		[]string{"process", "process_id", "creating_process_id", "mode"},
+		append(commonLabels, "process", "process_id", "creating_process_id", "mode"),
 		nil,
 	)
-	c.HandleCount = prometheus.NewDesc(
+	c.handleCount = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "handles"),
 		"Total number of handles the process has open. This number is the sum of the handles currently open by each thread in the process.",
-		[]string{"process", "process_id", "creating_process_id"},
+		append(commonLabels, "process", "process_id", "creating_process_id"),
 		nil,
 	)
-	c.IOBytesTotal = prometheus.NewDesc(
+	c.ioBytesTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "io_bytes_total"),
 		"Bytes issued to I/O operations in different modes (read, write, other).",
-		[]string{"process", "process_id", "creating_process_id", "mode"},
+		append(commonLabels, "process", "process_id", "creating_process_id", "mode"),
 		nil,
 	)
-	c.IOOperationsTotal = prometheus.NewDesc(
+	c.ioOperationsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "io_operations_total"),
 		"I/O operations issued in different modes (read, write, other).",
-		[]string{"process", "process_id", "creating_process_id", "mode"},
+		append(commonLabels, "process", "process_id", "creating_process_id", "mode"),
 		nil,
 	)
-	c.PageFaultsTotal = prometheus.NewDesc(
+	c.pageFaultsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "page_faults_total"),
 		"Page faults by the threads executing in this process.",
-		[]string{"process", "process_id", "creating_process_id"},
+		append(commonLabels, "process", "process_id", "creating_process_id"),
 		nil,
 	)
-	c.PageFileBytes = prometheus.NewDesc(
+	c.pageFileBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "page_file_bytes"),
 		"Current number of bytes this process has used in the paging file(s).",
-		[]string{"process", "process_id", "creating_process_id"},
+		append(commonLabels, "process", "process_id", "creating_process_id"),
 		nil,
 	)
-	c.PoolBytes = prometheus.NewDesc(
+	c.poolBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "pool_bytes"),
 		"Pool Bytes is the last observed number of bytes in the paged or nonpaged pool.",
-		[]string{"process", "process_id", "creating_process_id", "pool"},
+		append(commonLabels, "process", "process_id", "creating_process_id", "pool"),
 		nil,
 	)
-	c.PriorityBase = prometheus.NewDesc(
+	c.priorityBase = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "priority_base"),
 		"Current base priority of this process. Threads within a process can raise and lower their own base priority relative to the process base priority of the process.",
-		[]string{"process", "process_id", "creating_process_id"},
+		append(commonLabels, "process", "process_id", "creating_process_id"),
 		nil,
 	)
-	c.PrivateBytes = prometheus.NewDesc(
+	c.privateBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "private_bytes"),
 		"Current number of bytes this process has allocated that cannot be shared with other processes.",
-		[]string{"process", "process_id", "creating_process_id"},
+		append(commonLabels, "process", "process_id", "creating_process_id"),
 		nil,
 	)
-	c.ThreadCount = prometheus.NewDesc(
+	c.threadCount = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "threads"),
 		"Number of threads currently active in this process.",
-		[]string{"process", "process_id", "creating_process_id"},
+		append(commonLabels, "process", "process_id", "creating_process_id"),
 		nil,
 	)
-	c.VirtualBytes = prometheus.NewDesc(
+	c.virtualBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "virtual_bytes"),
 		"Current size, in bytes, of the virtual address space that the process is using.",
-		[]string{"process", "process_id", "creating_process_id"},
+		append(commonLabels, "process", "process_id", "creating_process_id"),
 		nil,
 	)
-	c.WorkingSetPrivate = prometheus.NewDesc(
+	c.workingSetPrivate = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "working_set_private_bytes"),
 		"Size of the working set, in bytes, that is use for this process only and not shared nor shareable by other processes.",
-		[]string{"process", "process_id", "creating_process_id"},
+		append(commonLabels, "process", "process_id", "creating_process_id"),
 		nil,
 	)
-	c.WorkingSetPeak = prometheus.NewDesc(
+	c.workingSetPeak = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "working_set_peak_bytes"),
 		"Maximum size, in bytes, of the Working Set of this process at any point in time. The Working Set is the set of memory pages touched recently by the threads in the process.",
-		[]string{"process", "process_id", "creating_process_id"},
+		append(commonLabels, "process", "process_id", "creating_process_id"),
 		nil,
 	)
-	c.WorkingSet = prometheus.NewDesc(
+	c.workingSet = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "working_set_bytes"),
 		"Maximum number of bytes in the working set of this process at any point in time. The working set is the set of memory pages touched recently by the threads in the process.",
-		[]string{"process", "process_id", "creating_process_id"},
+		append(commonLabels, "process", "process_id", "creating_process_id"),
 		nil,
 	)
 
-	var err error
-
-	c.processIncludePattern, err = regexp.Compile(fmt.Sprintf("^(?:%s)$", *c.processInclude))
-	if err != nil {
-		return err
-	}
-
-	c.processExcludePattern, err = regexp.Compile(fmt.Sprintf("^(?:%s)$", *c.processExclude))
-	if err != nil {
-		return err
-	}
+	c.lookupCache = make(map[string]string)
 
 	return nil
 }
@@ -242,7 +269,7 @@ type perflibProcess struct {
 	PageFaultsPerSec        float64 `perflib:"Page Faults/sec"`
 	PageFileBytesPeak       float64 `perflib:"Page File Bytes Peak"`
 	PageFileBytes           float64 `perflib:"Page File Bytes"`
-	PoolNonpagedBytes       float64 `perflib:"Pool Nonpaged Bytes"`
+	PoolNonPagedBytes       float64 `perflib:"Pool Nonpaged Bytes"`
 	PoolPagedBytes          float64 `perflib:"Pool Paged Bytes"`
 	PriorityBase            float64 `perflib:"Priority Base"`
 	PrivateBytes            float64 `perflib:"Private Bytes"`
@@ -259,34 +286,37 @@ type WorkerProcess struct {
 	ProcessId   uint64
 }
 
-func (c *collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+func (c *Collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	data := make([]perflibProcess, 0)
 	err := perflib.UnmarshalObject(ctx.PerfObjects["Process"], &data, c.logger)
 	if err != nil {
 		return err
 	}
 
-	var dst_wp []WorkerProcess
-	if *c.enableWorkerProcess {
-		q_wp := wmi.QueryAll(&dst_wp, c.logger)
-		if err := wmi.QueryNamespace(q_wp, &dst_wp, "root\\WebAdministration"); err != nil {
-			_ = level.Debug(c.logger).Log(fmt.Sprintf("Could not query WebAdministration namespace for IIS worker processes: %v. Skipping\n", err))
+	var workerProcesses []WorkerProcess
+	if c.config.EnableWorkerProcess {
+		queryWorkerProcess := wmi.QueryAllForClass(&workerProcesses, "WorkerProcess", c.logger)
+		if err := wmi.QueryNamespace(queryWorkerProcess, &workerProcesses, "root\\WebAdministration"); err != nil {
+			_ = level.Debug(c.logger).Log("msg", "Could not query WebAdministration namespace for IIS worker processes", "err", err)
 		}
 	}
 
+	var owner string
+
 	for _, process := range data {
 		if process.Name == "_Total" ||
-			c.processExcludePattern.MatchString(process.Name) ||
-			!c.processIncludePattern.MatchString(process.Name) {
+			c.config.ProcessExclude.MatchString(process.Name) ||
+			!c.config.ProcessInclude.MatchString(process.Name) {
 			continue
 		}
-		// Duplicate processes are suffixed # and an index number. Remove those.
-		processName := strings.Split(process.Name, "#")[0]
-		pid := strconv.FormatUint(uint64(process.IDProcess), 10)
-		cpid := strconv.FormatUint(uint64(process.CreatingProcessID), 10)
 
-		if *c.enableWorkerProcess {
-			for _, wp := range dst_wp {
+		// Duplicate processes are suffixed #, and an index number. Remove those.
+		processName, _, _ := strings.Cut(process.Name, "#")
+		pid := strconv.FormatUint(uint64(process.IDProcess), 10)
+		parentPID := strconv.FormatUint(uint64(process.CreatingProcessID), 10)
+
+		if c.config.EnableWorkerProcess {
+			for _, wp := range workerProcesses {
 				if wp.ProcessId == uint64(process.IDProcess) {
 					processName = strings.Join([]string{processName, wp.AppPoolName}, "_")
 					break
@@ -294,205 +324,204 @@ func (c *collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metri
 			}
 		}
 
+		labels := make([]string, 0, 4)
+
+		if c.config.EnableReportOwner {
+			owner, err = c.getProcessOwner(int(process.IDProcess))
+			if err != nil {
+				owner = "unknown"
+			}
+
+			labels = []string{owner}
+		}
+
+		labels = append(labels, processName, pid, parentPID)
+
 		ch <- prometheus.MustNewConstMetric(
-			c.StartTime,
+			c.startTime,
 			prometheus.GaugeValue,
 			process.ElapsedTime,
-			processName,
-			pid,
-			cpid,
+			labels...,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.HandleCount,
+			c.handleCount,
 			prometheus.GaugeValue,
 			process.HandleCount,
-			processName,
-			pid,
-			cpid,
+			labels...,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.CPUTimeTotal,
+			c.cpuTimeTotal,
 			prometheus.CounterValue,
 			process.PercentPrivilegedTime,
-			processName,
-			pid,
-			cpid,
-			"privileged",
+			append(labels, "privileged")...,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.CPUTimeTotal,
+			c.cpuTimeTotal,
 			prometheus.CounterValue,
 			process.PercentUserTime,
-			processName,
-			pid,
-			cpid,
-			"user",
+			append(labels, "user")...,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.IOBytesTotal,
+			c.ioBytesTotal,
 			prometheus.CounterValue,
 			process.IOOtherBytesPerSec,
-			processName,
-			pid,
-			cpid,
-			"other",
+			append(labels, "other")...,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.IOOperationsTotal,
+			c.ioOperationsTotal,
 			prometheus.CounterValue,
 			process.IOOtherOperationsPerSec,
-			processName,
-			pid,
-			cpid,
-			"other",
+			append(labels, "other")...,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.IOBytesTotal,
+			c.ioBytesTotal,
 			prometheus.CounterValue,
 			process.IOReadBytesPerSec,
-			processName,
-			pid,
-			cpid,
-			"read",
+			append(labels, "read")...,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.IOOperationsTotal,
+			c.ioOperationsTotal,
 			prometheus.CounterValue,
 			process.IOReadOperationsPerSec,
-			processName,
-			pid,
-			cpid,
-			"read",
+			append(labels, "read")...,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.IOBytesTotal,
+			c.ioBytesTotal,
 			prometheus.CounterValue,
 			process.IOWriteBytesPerSec,
-			processName,
-			pid,
-			cpid,
-			"write",
+			append(labels, "write")...,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.IOOperationsTotal,
+			c.ioOperationsTotal,
 			prometheus.CounterValue,
 			process.IOWriteOperationsPerSec,
-			processName,
-			pid,
-			cpid,
-			"write",
+			append(labels, "write")...,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.PageFaultsTotal,
+			c.pageFaultsTotal,
 			prometheus.CounterValue,
 			process.PageFaultsPerSec,
-			processName,
-			pid,
-			cpid,
+			labels...,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.PageFileBytes,
+			c.pageFileBytes,
 			prometheus.GaugeValue,
 			process.PageFileBytes,
-			processName,
-			pid,
-			cpid,
+			labels...,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.PoolBytes,
+			c.poolBytes,
 			prometheus.GaugeValue,
-			process.PoolNonpagedBytes,
-			processName,
-			pid,
-			cpid,
-			"nonpaged",
+			process.PoolNonPagedBytes,
+			append(labels, "nonpaged")...,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.PoolBytes,
+			c.poolBytes,
 			prometheus.GaugeValue,
 			process.PoolPagedBytes,
-			processName,
-			pid,
-			cpid,
-			"paged",
+			append(labels, "paged")...,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.PriorityBase,
+			c.priorityBase,
 			prometheus.GaugeValue,
 			process.PriorityBase,
-			processName,
-			pid,
-			cpid,
+			labels...,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.PrivateBytes,
+			c.privateBytes,
 			prometheus.GaugeValue,
 			process.PrivateBytes,
-			processName,
-			pid,
-			cpid,
+			labels...,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.ThreadCount,
+			c.threadCount,
 			prometheus.GaugeValue,
 			process.ThreadCount,
-			processName,
-			pid,
-			cpid,
+			labels...,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.VirtualBytes,
+			c.virtualBytes,
 			prometheus.GaugeValue,
 			process.VirtualBytes,
-			processName,
-			pid,
-			cpid,
+			labels...,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.WorkingSetPrivate,
+			c.workingSetPrivate,
 			prometheus.GaugeValue,
 			process.WorkingSetPrivate,
-			processName,
-			pid,
-			cpid,
+			labels...,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.WorkingSetPeak,
+			c.workingSetPeak,
 			prometheus.GaugeValue,
 			process.WorkingSetPeak,
-			processName,
-			pid,
-			cpid,
+			labels...,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.WorkingSet,
+			c.workingSet,
 			prometheus.GaugeValue,
 			process.WorkingSet,
-			processName,
-			pid,
-			cpid,
+			labels...,
 		)
 	}
 
 	return nil
 }
+
+// ref: https://github.com/microsoft/hcsshim/blob/8beabacfc2d21767a07c20f8dd5f9f3932dbf305/internal/uvm/stats.go#L25
+func (c *Collector) getProcessOwner(pid int) (string, error) {
+	p, err := windows.OpenProcess(windows.PROCESS_QUERY_LIMITED_INFORMATION, false, uint32(pid))
+	if errors.Is(err, syscall.Errno(0x57)) { // invalid parameter, for PIDs that don't exist
+		return "", errors.New("process not found")
+	}
+
+	if err != nil {
+		return "", fmt.Errorf("OpenProcess: %w", err)
+	}
+
+	defer windows.Close(p)
+
+	var tok windows.Token
+	if err = windows.OpenProcessToken(p, windows.TOKEN_QUERY, &tok); err != nil {
+		return "", fmt.Errorf("OpenProcessToken: %w", err)
+	}
+
+	tokenUser, err := tok.GetTokenUser()
+	if err != nil {
+		return "", fmt.Errorf("GetTokenUser: %w", err)
+	}
+
+	sid := tokenUser.User.Sid.String()
+	if owner, ok := c.lookupCache[sid]; ok {
+		return owner, nil
+	}
+
+	account, domain, _, err := tokenUser.User.Sid.LookupAccount("")
+	if err != nil {
+		c.lookupCache[sid] = sid
+	} else {
+		c.lookupCache[sid] = fmt.Sprintf(`%s\%s`, account, domain)
+	}
+
+	return c.lookupCache[sid], nil
+}

pkg/collector/process/process_test.go

@@ -9,9 +9,9 @@ import (
 )
 
 func BenchmarkProcessCollector(b *testing.B) {
-	// Include is not set in testing context (kingpin flags not parsed), causing the collector to skip all processes.
+	// PrinterInclude is not set in testing context (kingpin flags not parsed), causing the collector to skip all processes.
 	localProcessInclude := ".+"
-	kingpin.CommandLine.GetArg(process.FlagProcessInclude).StringVar(&localProcessInclude)
+	kingpin.CommandLine.GetArg("collector.process.include").StringVar(&localProcessInclude)
 	// No context name required as collector source is WMI
 	testutils.FuncBenchmarkCollector(b, process.Name, process.NewWithFlags)
 }

pkg/collector/prometheus.go

@@ -87,7 +87,7 @@ func (coll *Prometheus) Collect(ch chan<- prometheus.Metric) {
 		time.Since(t).Seconds(),
 	)
 	if err != nil {
-		ch <- prometheus.NewInvalidMetric(coll.scrapeSuccessDesc, fmt.Errorf("failed to prepare scrape: %v", err))
+		ch <- prometheus.NewInvalidMetric(coll.scrapeSuccessDesc, fmt.Errorf("failed to prepare scrape: %w", err))
 		return
 	}
 
@@ -112,7 +112,7 @@ func (coll *Prometheus) Collect(ch chan<- prometheus.Metric) {
 	}()
 
 	for name, c := range coll.collectors.collectors {
-		go func(name string, c types.Collector) {
+		go func(name string, c Collector) {
 			defer wg.Done()
 			outcome := coll.execute(name, c, scrapeContext, metricsBuffer)
 			l.Lock()
@@ -171,7 +171,7 @@ func (coll *Prometheus) Collect(ch chan<- prometheus.Metric) {
 	l.Unlock()
 }
 
-func (coll *Prometheus) execute(name string, c types.Collector, ctx *types.ScrapeContext, ch chan<- prometheus.Metric) collectorOutcome {
+func (coll *Prometheus) execute(name string, c Collector, ctx *types.ScrapeContext, ch chan<- prometheus.Metric) collectorOutcome {
 	t := time.Now()
 	err := c.Collect(ctx, ch)
 	duration := time.Since(t).Seconds()

pkg/collector/remote_fx/remote_fx.go

@@ -20,159 +20,193 @@ type Config struct{}
 
 var ConfigDefaults = Config{}
 
-// collector
-// A RemoteFxNetworkCollector is a Prometheus collector for
+// Collector
+// A RemoteFxNetworkCollector is a Prometheus Collector for
 // WMI Win32_PerfRawData_Counters_RemoteFXNetwork & Win32_PerfRawData_Counters_RemoteFXGraphics metrics
 // https://wutils.com/wmi/root/cimv2/win32_perfrawdata_counters_remotefxnetwork/
 // https://wutils.com/wmi/root/cimv2/win32_perfrawdata_counters_remotefxgraphics/
-type collector struct {
+type Collector struct {
+	config Config
 	logger log.Logger
 
 	// net
-	BaseTCPRTT               *prometheus.Desc
-	BaseUDPRTT               *prometheus.Desc
-	CurrentTCPBandwidth      *prometheus.Desc
-	CurrentTCPRTT            *prometheus.Desc
-	CurrentUDPBandwidth      *prometheus.Desc
-	CurrentUDPRTT            *prometheus.Desc
-	TotalReceivedBytes       *prometheus.Desc
-	TotalSentBytes           *prometheus.Desc
-	UDPPacketsReceivedPersec *prometheus.Desc
-	UDPPacketsSentPersec     *prometheus.Desc
+	baseTCPRTT               *prometheus.Desc
+	baseUDPRTT               *prometheus.Desc
+	currentTCPBandwidth      *prometheus.Desc
+	currentTCPRTT            *prometheus.Desc
+	currentUDPBandwidth      *prometheus.Desc
+	currentUDPRTT            *prometheus.Desc
+	fecRate                  *prometheus.Desc
+	lossRate                 *prometheus.Desc
+	retransmissionRate       *prometheus.Desc
+	totalReceivedBytes       *prometheus.Desc
+	totalSentBytes           *prometheus.Desc
+	udpPacketsReceivedPerSec *prometheus.Desc
+	udpPacketsSentPerSec     *prometheus.Desc
 
 	// gfx
-	AverageEncodingTime                         *prometheus.Desc
-	FrameQuality                                *prometheus.Desc
-	FramesSkippedPerSecondInsufficientResources *prometheus.Desc
-	GraphicsCompressionratio                    *prometheus.Desc
-	InputFramesPerSecond                        *prometheus.Desc
-	OutputFramesPerSecond                       *prometheus.Desc
-	SourceFramesPerSecond                       *prometheus.Desc
+	averageEncodingTime                         *prometheus.Desc
+	frameQuality                                *prometheus.Desc
+	framesSkippedPerSecondInsufficientResources *prometheus.Desc
+	graphicsCompressionRatio                    *prometheus.Desc
+	inputFramesPerSecond                        *prometheus.Desc
+	outputFramesPerSecond                       *prometheus.Desc
+	sourceFramesPerSecond                       *prometheus.Desc
 }
 
-func New(logger log.Logger, _ *Config) types.Collector {
-	c := &collector{}
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) types.Collector {
-	return &collector{}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
-	return []string{"RemoteFX Network"}, nil
+func (c *Collector) GetPerfCounter() ([]string, error) {
+	return []string{"RemoteFX Network", "RemoteFX Graphics"}, nil
 }
 
-func (c *collector) Build() error {
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
 	// net
-	c.BaseTCPRTT = prometheus.NewDesc(
+	c.baseTCPRTT = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "net_base_tcp_rtt_seconds"),
 		"Base TCP round-trip time (RTT) detected in seconds",
 		[]string{"session_name"},
 		nil,
 	)
-	c.BaseUDPRTT = prometheus.NewDesc(
+	c.baseUDPRTT = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "net_base_udp_rtt_seconds"),
 		"Base UDP round-trip time (RTT) detected in seconds.",
 		[]string{"session_name"},
 		nil,
 	)
-	c.CurrentTCPBandwidth = prometheus.NewDesc(
+	c.currentTCPBandwidth = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "net_current_tcp_bandwidth"),
 		"TCP Bandwidth detected in bytes per second.",
 		[]string{"session_name"},
 		nil,
 	)
-	c.CurrentTCPRTT = prometheus.NewDesc(
+	c.currentTCPRTT = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "net_current_tcp_rtt_seconds"),
 		"Average TCP round-trip time (RTT) detected in seconds.",
 		[]string{"session_name"},
 		nil,
 	)
-	c.CurrentUDPBandwidth = prometheus.NewDesc(
+	c.currentUDPBandwidth = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "net_current_udp_bandwidth"),
 		"UDP Bandwidth detected in bytes per second.",
 		[]string{"session_name"},
 		nil,
 	)
-	c.CurrentUDPRTT = prometheus.NewDesc(
+	c.currentUDPRTT = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "net_current_udp_rtt_seconds"),
 		"Average UDP round-trip time (RTT) detected in seconds.",
 		[]string{"session_name"},
 		nil,
 	)
-	c.TotalReceivedBytes = prometheus.NewDesc(
+	c.totalReceivedBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "net_received_bytes_total"),
 		"(TotalReceivedBytes)",
 		[]string{"session_name"},
 		nil,
 	)
-	c.TotalSentBytes = prometheus.NewDesc(
+	c.totalSentBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "net_sent_bytes_total"),
 		"(TotalSentBytes)",
 		[]string{"session_name"},
 		nil,
 	)
-	c.UDPPacketsReceivedPersec = prometheus.NewDesc(
+	c.udpPacketsReceivedPerSec = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "net_udp_packets_received_total"),
 		"Rate in packets per second at which packets are received over UDP.",
 		[]string{"session_name"},
 		nil,
 	)
-	c.UDPPacketsSentPersec = prometheus.NewDesc(
+	c.udpPacketsSentPerSec = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "net_udp_packets_sent_total"),
 		"Rate in packets per second at which packets are sent over UDP.",
 		[]string{"session_name"},
 		nil,
 	)
+	c.fecRate = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "net_fec_rate"),
+		"Forward Error Correction (FEC) percentage",
+		[]string{"session_name"},
+		nil,
+	)
+	c.lossRate = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "net_loss_rate"),
+		"Loss percentage",
+		[]string{"session_name"},
+		nil,
+	)
+	c.retransmissionRate = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "net_retransmission_rate"),
+		"Percentage of packets that have been retransmitted",
+		[]string{"session_name"},
+		nil,
+	)
 
 	// gfx
-	c.AverageEncodingTime = prometheus.NewDesc(
+	c.averageEncodingTime = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "gfx_average_encoding_time_seconds"),
 		"Average frame encoding time in seconds",
 		[]string{"session_name"},
 		nil,
 	)
-	c.FrameQuality = prometheus.NewDesc(
+	c.frameQuality = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "gfx_frame_quality"),
 		"Quality of the output frame expressed as a percentage of the quality of the source frame.",
 		[]string{"session_name"},
 		nil,
 	)
-	c.FramesSkippedPerSecondInsufficientResources = prometheus.NewDesc(
+	c.framesSkippedPerSecondInsufficientResources = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "gfx_frames_skipped_insufficient_resource_total"),
 		"Number of frames skipped per second due to insufficient client resources.",
 		[]string{"session_name", "resource"},
 		nil,
 	)
-	c.GraphicsCompressionratio = prometheus.NewDesc(
+	c.graphicsCompressionRatio = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "gfx_graphics_compression_ratio"),
 		"Ratio of the number of bytes encoded to the number of bytes input.",
 		[]string{"session_name"},
 		nil,
 	)
-	c.InputFramesPerSecond = prometheus.NewDesc(
+	c.inputFramesPerSecond = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "gfx_input_frames_total"),
 		"Number of sources frames provided as input to RemoteFX graphics per second.",
 		[]string{"session_name"},
 		nil,
 	)
-	c.OutputFramesPerSecond = prometheus.NewDesc(
+	c.outputFramesPerSecond = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "gfx_output_frames_total"),
 		"Number of frames sent to the client per second.",
 		[]string{"session_name"},
 		nil,
 	)
-	c.SourceFramesPerSecond = prometheus.NewDesc(
+	c.sourceFramesPerSecond = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "gfx_source_frames_total"),
 		"Number of frames composed by the source (DWM) per second.",
 		[]string{"session_name"},
@@ -183,13 +217,13 @@ func (c *collector) Build() error {
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collectRemoteFXNetworkCount(ctx, ch); err != nil {
-		_ = level.Error(c.logger).Log("failed collecting terminal services session count metrics", "desc", desc, "err", err)
+func (c *Collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collectRemoteFXNetworkCount(ctx, ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed collecting terminal services session count metrics", "err", err)
 		return err
 	}
-	if desc, err := c.collectRemoteFXGraphicsCounters(ctx, ch); err != nil {
-		_ = level.Error(c.logger).Log("failed collecting terminal services session count metrics", "desc", desc, "err", err)
+	if err := c.collectRemoteFXGraphicsCounters(ctx, ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed collecting terminal services session count metrics", "err", err)
 		return err
 	}
 	return nil
@@ -207,83 +241,106 @@ type perflibRemoteFxNetwork struct {
 	TotalSentBytes           float64 `perflib:"Total Sent Bytes"`
 	UDPPacketsReceivedPersec float64 `perflib:"UDP Packets Received/sec"`
 	UDPPacketsSentPersec     float64 `perflib:"UDP Packets Sent/sec"`
+	FECRate                  float64 `perflib:"Forward Error Correction (FEC) percentage"`
+	LossRate                 float64 `perflib:"Loss percentage"`
+	RetransmissionRate       float64 `perflib:"Percentage of packets that have been retransmitted"`
 }
 
-func (c *collector) collectRemoteFXNetworkCount(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *Collector) collectRemoteFXNetworkCount(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	dst := make([]perflibRemoteFxNetwork, 0)
 	err := perflib.UnmarshalObject(ctx.PerfObjects["RemoteFX Network"], &dst, c.logger)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	for _, d := range dst {
 		// only connect metrics for remote named sessions
-		n := strings.ToLower(d.Name)
+		n := strings.ToLower(normalizeSessionName(d.Name))
 		if n == "" || n == "services" || n == "console" {
 			continue
 		}
 		ch <- prometheus.MustNewConstMetric(
-			c.BaseTCPRTT,
+			c.baseTCPRTT,
 			prometheus.GaugeValue,
 			utils.MilliSecToSec(d.BaseTCPRTT),
-			d.Name,
+			normalizeSessionName(d.Name),
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.BaseUDPRTT,
+			c.baseUDPRTT,
 			prometheus.GaugeValue,
 			utils.MilliSecToSec(d.BaseUDPRTT),
-			d.Name,
+			normalizeSessionName(d.Name),
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.CurrentTCPBandwidth,
+			c.currentTCPBandwidth,
 			prometheus.GaugeValue,
 			(d.CurrentTCPBandwidth*1000)/8,
-			d.Name,
+			normalizeSessionName(d.Name),
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.CurrentTCPRTT,
+			c.currentTCPRTT,
 			prometheus.GaugeValue,
 			utils.MilliSecToSec(d.CurrentTCPRTT),
-			d.Name,
+			normalizeSessionName(d.Name),
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.CurrentUDPBandwidth,
+			c.currentUDPBandwidth,
 			prometheus.GaugeValue,
 			(d.CurrentUDPBandwidth*1000)/8,
-			d.Name,
+			normalizeSessionName(d.Name),
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.CurrentUDPRTT,
+			c.currentUDPRTT,
 			prometheus.GaugeValue,
 			utils.MilliSecToSec(d.CurrentUDPRTT),
-			d.Name,
+			normalizeSessionName(d.Name),
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.TotalReceivedBytes,
+			c.totalReceivedBytes,
 			prometheus.CounterValue,
 			d.TotalReceivedBytes,
-			d.Name,
+			normalizeSessionName(d.Name),
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.TotalSentBytes,
+			c.totalSentBytes,
 			prometheus.CounterValue,
 			d.TotalSentBytes,
-			d.Name,
+			normalizeSessionName(d.Name),
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.UDPPacketsReceivedPersec,
+			c.udpPacketsReceivedPerSec,
 			prometheus.CounterValue,
 			d.UDPPacketsReceivedPersec,
-			d.Name,
+			normalizeSessionName(d.Name),
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.UDPPacketsSentPersec,
+			c.udpPacketsSentPerSec,
 			prometheus.CounterValue,
 			d.UDPPacketsSentPersec,
-			d.Name,
+			normalizeSessionName(d.Name),
+		)
+		ch <- prometheus.MustNewConstMetric(
+			c.fecRate,
+			prometheus.GaugeValue,
+			d.FECRate,
+			normalizeSessionName(d.Name),
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.lossRate,
+			prometheus.GaugeValue,
+			d.LossRate,
+			normalizeSessionName(d.Name),
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.retransmissionRate,
+			prometheus.GaugeValue,
+			d.RetransmissionRate,
+			normalizeSessionName(d.Name),
 		)
 	}
-	return nil, nil
+	return nil
 }
 
 type perflibRemoteFxGraphics struct {
@@ -299,77 +356,82 @@ type perflibRemoteFxGraphics struct {
 	SourceFramesPerSecond                              float64 `perflib:"Source Frames/Second"`
 }
 
-func (c *collector) collectRemoteFXGraphicsCounters(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *Collector) collectRemoteFXGraphicsCounters(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	dst := make([]perflibRemoteFxGraphics, 0)
 	err := perflib.UnmarshalObject(ctx.PerfObjects["RemoteFX Graphics"], &dst, c.logger)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	for _, d := range dst {
 		// only connect metrics for remote named sessions
-		n := strings.ToLower(d.Name)
+		n := strings.ToLower(normalizeSessionName(d.Name))
 		if n == "" || n == "services" || n == "console" {
 			continue
 		}
 		ch <- prometheus.MustNewConstMetric(
-			c.AverageEncodingTime,
+			c.averageEncodingTime,
 			prometheus.GaugeValue,
 			utils.MilliSecToSec(d.AverageEncodingTime),
-			d.Name,
+			normalizeSessionName(d.Name),
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.FrameQuality,
+			c.frameQuality,
 			prometheus.GaugeValue,
 			d.FrameQuality,
-			d.Name,
+			normalizeSessionName(d.Name),
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.FramesSkippedPerSecondInsufficientResources,
+			c.framesSkippedPerSecondInsufficientResources,
 			prometheus.CounterValue,
 			d.FramesSkippedPerSecondInsufficientClientResources,
-			d.Name,
+			normalizeSessionName(d.Name),
 			"client",
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.FramesSkippedPerSecondInsufficientResources,
+			c.framesSkippedPerSecondInsufficientResources,
 			prometheus.CounterValue,
 			d.FramesSkippedPerSecondInsufficientNetworkResources,
-			d.Name,
+			normalizeSessionName(d.Name),
 			"network",
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.FramesSkippedPerSecondInsufficientResources,
+			c.framesSkippedPerSecondInsufficientResources,
 			prometheus.CounterValue,
 			d.FramesSkippedPerSecondInsufficientServerResources,
-			d.Name,
+			normalizeSessionName(d.Name),
 			"server",
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.GraphicsCompressionratio,
+			c.graphicsCompressionRatio,
 			prometheus.GaugeValue,
 			d.GraphicsCompressionratio,
-			d.Name,
+			normalizeSessionName(d.Name),
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.InputFramesPerSecond,
+			c.inputFramesPerSecond,
 			prometheus.CounterValue,
 			d.InputFramesPerSecond,
-			d.Name,
+			normalizeSessionName(d.Name),
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.OutputFramesPerSecond,
+			c.outputFramesPerSecond,
 			prometheus.CounterValue,
 			d.OutputFramesPerSecond,
-			d.Name,
+			normalizeSessionName(d.Name),
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.SourceFramesPerSecond,
+			c.sourceFramesPerSecond,
 			prometheus.CounterValue,
 			d.SourceFramesPerSecond,
-			d.Name,
+			normalizeSessionName(d.Name),
 		)
 	}
 
-	return nil, nil
+	return nil
+}
+
+// normalizeSessionName ensure that the session is the same between WTS API and performance counters.
+func normalizeSessionName(sessionName string) string {
+	return strings.Replace(sessionName, "RDP-tcp", "RDP-Tcp", 1)
 }

pkg/collector/scheduled_task/scheduled_task.go

@@ -3,6 +3,7 @@
 package scheduled_task
 
 import (
+	"errors"
 	"fmt"
 	"regexp"
 	"runtime"
@@ -17,35 +18,25 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-const (
-	Name = "scheduled_task"
-
-	FlagScheduledTaskExclude = "collector.scheduled_task.exclude"
-	FlagScheduledTaskInclude = "collector.scheduled_task.include"
-)
+const Name = "scheduled_task"
 
 type Config struct {
-	TaskExclude string `yaml:"task_exclude"`
-	TaskInclude string `yaml:"task_include"`
+	TaskExclude *regexp.Regexp `yaml:"task_exclude"`
+	TaskInclude *regexp.Regexp `yaml:"task_include"`
 }
 
 var ConfigDefaults = Config{
-	TaskExclude: "",
-	TaskInclude: ".+",
+	TaskExclude: types.RegExpEmpty,
+	TaskInclude: types.RegExpAny,
 }
 
-type collector struct {
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	taskExclude *string
-	taskInclude *string
-
-	LastResult *prometheus.Desc
-	MissedRuns *prometheus.Desc
-	State      *prometheus.Desc
-
-	taskIncludePattern *regexp.Regexp
-	taskExcludePattern *regexp.Regexp
+	lastResult *prometheus.Desc
+	missedRuns *prometheus.Desc
+	state      *prometheus.Desc
 }
 
 // TaskState ...
@@ -60,10 +51,13 @@ const (
 	TASK_STATE_QUEUED
 	TASK_STATE_READY
 	TASK_STATE_RUNNING
-	TASK_RESULT_SUCCESS TaskResult = 0x0
 )
 
-// RegisteredTask ...
+const (
+	SCHED_S_SUCCESS          TaskResult = 0x0
+	SCHED_S_TASK_HAS_NOT_RUN TaskResult = 0x00041303
+)
+
 type ScheduledTask struct {
 	Name            string
 	Path            string
@@ -75,97 +69,108 @@ type ScheduledTask struct {
 
 type ScheduledTasks []ScheduledTask
 
-func New(logger log.Logger, config *Config) types.Collector {
+func New(logger log.Logger, config *Config) *Collector {
 	if config == nil {
 		config = &ConfigDefaults
 	}
 
-	c := &collector{
-		taskExclude: &config.TaskExclude,
-		taskInclude: &config.TaskInclude,
+	if config.TaskExclude == nil {
+		config.TaskExclude = ConfigDefaults.TaskExclude
 	}
+
+	if config.TaskInclude == nil {
+		config.TaskInclude = ConfigDefaults.TaskInclude
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(app *kingpin.Application) types.Collector {
-	c := &collector{
-		taskInclude: app.Flag(
-			FlagScheduledTaskInclude,
-			"Regexp of tasks to include. Task path must both match include and not match exclude to be included.",
-		).Default(ConfigDefaults.TaskInclude).String(),
-
-		taskExclude: app.Flag(
-			FlagScheduledTaskExclude,
-			"Regexp of tasks to exclude. Task path must both match include and not match exclude to be included.",
-		).Default(ConfigDefaults.TaskExclude).String(),
+func NewWithFlags(app *kingpin.Application) *Collector {
+	c := &Collector{
+		config: ConfigDefaults,
 	}
 
+	var taskExclude, taskInclude string
+
+	app.Flag(
+		"collector.scheduled_task.exclude",
+		"Regexp of tasks to exclude. Task path must both match include and not match exclude to be included.",
+	).Default(c.config.TaskExclude.String()).StringVar(&taskExclude)
+
+	app.Flag(
+		"collector.scheduled_task.include",
+		"Regexp of tasks to include. Task path must both match include and not match exclude to be included.",
+	).Default(c.config.TaskInclude.String()).StringVar(&taskInclude)
+
+	app.Action(func(*kingpin.ParseContext) error {
+		var err error
+
+		c.config.TaskExclude, err = regexp.Compile(fmt.Sprintf("^(?:%s)$", taskExclude))
+		if err != nil {
+			return fmt.Errorf("collector.scheduled_task.exclude: %w", err)
+		}
+
+		c.config.TaskInclude, err = regexp.Compile(fmt.Sprintf("^(?:%s)$", taskInclude))
+		if err != nil {
+			return fmt.Errorf("collector.scheduled_task.include: %w", err)
+		}
+
+		return nil
+	})
+
 	return c
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{}, nil
 }
 
-func (c *collector) Build() error {
-	runtime.LockOSThread()
-	defer runtime.UnlockOSThread()
+func (c *Collector) Close() error {
+	return nil
+}
 
-	err := ole.CoInitializeEx(0, ole.COINIT_MULTITHREADED)
-	if err != nil {
-		code := err.(*ole.OleError).Code()
-		if code != ole.S_OK && code != S_FALSE {
-			return err
-		}
-	}
-	defer ole.CoUninitialize()
-
-	c.LastResult = prometheus.NewDesc(
+func (c *Collector) Build() error {
+	c.lastResult = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "last_result"),
 		"The result that was returned the last time the registered task was run",
 		[]string{"task"},
 		nil,
 	)
 
-	c.MissedRuns = prometheus.NewDesc(
+	c.missedRuns = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "missed_runs"),
 		"The number of times the registered task missed a scheduled run",
 		[]string{"task"},
 		nil,
 	)
 
-	c.State = prometheus.NewDesc(
+	c.state = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "state"),
 		"The current state of a scheduled task",
 		[]string{"task", "state"},
 		nil,
 	)
 
-	c.taskIncludePattern, err = regexp.Compile(fmt.Sprintf("^(?:%s)$", *c.taskInclude))
-	if err != nil {
-		return err
-	}
-
-	c.taskExcludePattern, err = regexp.Compile(fmt.Sprintf("^(?:%s)$", *c.taskExclude))
-	if err != nil {
-		return err
-	}
-
 	return nil
 }
 
-func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if desc, err := c.collect(ch); err != nil {
-		_ = level.Error(c.logger).Log("failed collecting user metrics", "desc", desc, "err", err)
+func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collect(ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed collecting user metrics", "err", err)
 		return err
 	}
 
@@ -174,37 +179,18 @@ func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric)
 
 var TASK_STATES = []string{"disabled", "queued", "ready", "running", "unknown"}
 
-func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, error) {
+func (c *Collector) collect(ch chan<- prometheus.Metric) error {
 	scheduledTasks, err := getScheduledTasks()
 	if err != nil {
-		return nil, err
+		return err
 	}
 
 	for _, task := range scheduledTasks {
-		if c.taskExcludePattern.MatchString(task.Path) ||
-			!c.taskIncludePattern.MatchString(task.Path) {
+		if c.config.TaskExclude.MatchString(task.Path) ||
+			!c.config.TaskInclude.MatchString(task.Path) {
 			continue
 		}
 
-		lastResult := 0.0
-		if task.LastTaskResult == TASK_RESULT_SUCCESS {
-			lastResult = 1.0
-		}
-
-		ch <- prometheus.MustNewConstMetric(
-			c.LastResult,
-			prometheus.GaugeValue,
-			lastResult,
-			task.Path,
-		)
-
-		ch <- prometheus.MustNewConstMetric(
-			c.MissedRuns,
-			prometheus.GaugeValue,
-			task.MissedRunsCount,
-			task.Path,
-		)
-
 		for _, state := range TASK_STATES {
 			var stateValue float64
 
@@ -213,16 +199,39 @@ func (c *collector) collect(ch chan<- prometheus.Metric) (*prometheus.Desc, erro
 			}
 
 			ch <- prometheus.MustNewConstMetric(
-				c.State,
+				c.state,
 				prometheus.GaugeValue,
 				stateValue,
 				task.Path,
 				state,
 			)
 		}
+
+		if task.LastTaskResult == SCHED_S_TASK_HAS_NOT_RUN {
+			continue
+		}
+
+		lastResult := 0.0
+		if task.LastTaskResult == SCHED_S_SUCCESS {
+			lastResult = 1.0
+		}
+
+		ch <- prometheus.MustNewConstMetric(
+			c.lastResult,
+			prometheus.GaugeValue,
+			lastResult,
+			task.Path,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.missedRuns,
+			prometheus.GaugeValue,
+			task.MissedRunsCount,
+			task.Path,
+		)
 	}
 
-	return nil, nil
+	return nil
 }
 
 const SCHEDULED_TASK_PROGRAM_ID = "Schedule.Service.1"
@@ -230,7 +239,24 @@ const SCHEDULED_TASK_PROGRAM_ID = "Schedule.Service.1"
 // S_FALSE is returned by CoInitialize if it was already called on this thread.
 const S_FALSE = 0x00000001
 
-func getScheduledTasks() (scheduledTasks ScheduledTasks, err error) {
+func getScheduledTasks() (ScheduledTasks, error) {
+	var scheduledTasks ScheduledTasks
+
+	// The only way to run WMI queries in parallel while being thread-safe is to
+	// ensure the CoInitialize[Ex]() call is bound to its current OS thread.
+	// Otherwise, attempting to initialize and run parallel queries across
+	// goroutines will result in protected memory errors.
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
+	if err := ole.CoInitializeEx(0, ole.COINIT_MULTITHREADED); err != nil {
+		var oleCode *ole.OleError
+		if errors.As(err, &oleCode) && oleCode.Code() != ole.S_OK && oleCode.Code() != S_FALSE {
+			return nil, err
+		}
+	}
+	defer ole.CoUninitialize()
+
 	schedClassID, err := ole.ClassIDFrom(SCHEDULED_TASK_PROGRAM_ID)
 	if err != nil {
 		return scheduledTasks, err
@@ -310,7 +336,9 @@ func fetchTasksRecursively(folder *ole.IDispatch, scheduledTasks *ScheduledTasks
 	return err
 }
 
-func parseTask(task *ole.IDispatch) (scheduledTask ScheduledTask, err error) {
+func parseTask(task *ole.IDispatch) (ScheduledTask, error) {
+	var scheduledTask ScheduledTask
+
 	taskNameVar, err := oleutil.GetProperty(task, "Name")
 	if err != nil {
 		return scheduledTask, err
@@ -373,7 +401,9 @@ func parseTask(task *ole.IDispatch) (scheduledTask ScheduledTask, err error) {
 
 	scheduledTask.Name = taskNameVar.ToString()
 	scheduledTask.Path = strings.ReplaceAll(taskPathVar.ToString(), "\\", "/")
-	scheduledTask.Enabled = taskEnabledVar.Value().(bool)
+	if val, ok := taskEnabledVar.Value().(bool); ok {
+		scheduledTask.Enabled = val
+	}
 	scheduledTask.State = TaskState(taskStateVar.Val)
 	scheduledTask.MissedRunsCount = float64(taskNumberOfMissedRunsVar.Val)
 	scheduledTask.LastTaskResult = TaskResult(taskLastTaskResultVar.Val)

pkg/collector/service/service.go

@@ -3,10 +3,12 @@
 package service
 
 import (
+	"errors"
 	"fmt"
 	"strconv"
 	"strings"
 	"syscall"
+	"unsafe"
 
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/go-kit/log"
@@ -19,76 +21,83 @@ import (
 	"golang.org/x/sys/windows/svc/mgr"
 )
 
-const (
-	Name                   = "service"
-	FlagServiceWhereClause = "collector.service.services-where"
-	FlagServiceUseAPI      = "collector.service.use-api"
-)
+const Name = "service"
 
 type Config struct {
 	ServiceWhereClause string `yaml:"service_where_clause"`
 	UseAPI             bool   `yaml:"use_api"`
+	V2                 bool   `yaml:"v2"`
 }
 
 var ConfigDefaults = Config{
 	ServiceWhereClause: "",
 	UseAPI:             false,
+	V2:                 false,
 }
 
-// A collector is a Prometheus collector for WMI Win32_Service metrics
-type collector struct {
+// A Collector is a Prometheus Collector for WMI Win32_Service metrics.
+type Collector struct {
 	logger log.Logger
 
 	serviceWhereClause *string
 	useAPI             *bool
+	v2                 *bool
 
 	Information *prometheus.Desc
 	State       *prometheus.Desc
 	StartMode   *prometheus.Desc
 	Status      *prometheus.Desc
-
-	queryWhereClause string
+	StateV2     *prometheus.Desc
 }
 
-func New(logger log.Logger, config *Config) types.Collector {
+func New(logger log.Logger, config *Config) *Collector {
 	if config == nil {
 		config = &ConfigDefaults
 	}
 
-	c := &collector{
+	c := &Collector{
 		serviceWhereClause: &config.ServiceWhereClause,
 		useAPI:             &config.UseAPI,
 	}
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(app *kingpin.Application) types.Collector {
-	return &collector{
+func NewWithFlags(app *kingpin.Application) *Collector {
+	return &Collector{
 		serviceWhereClause: app.Flag(
-			FlagServiceWhereClause,
+			"collector.service.services-where",
 			"WQL 'where' clause to use in WMI metrics query. Limits the response to the services you specify and reduces the size of the response.",
 		).Default(ConfigDefaults.ServiceWhereClause).String(),
 		useAPI: app.Flag(
-			FlagServiceUseAPI,
+			"collector.service.use-api",
 			"Use API calls to collect service data instead of WMI. Flag 'collector.service.services-where' won't be effective.",
 		).Default(strconv.FormatBool(ConfigDefaults.UseAPI)).Bool(),
+		v2: app.Flag(
+			"collector.service.v2",
+			"Enable V2 service collector. This collector can services state much more efficiently, can't provide general service information.",
+		).Default(strconv.FormatBool(ConfigDefaults.V2)).Bool(),
 	}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{}, nil
 }
 
-func (c *collector) Build() error {
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
 	if utils.IsEmpty(c.serviceWhereClause) {
 		_ = level.Warn(c.logger).Log("msg", "No where-clause specified for service collector. This will generate a very large number of metrics!")
 	}
@@ -120,25 +129,37 @@ func (c *collector) Build() error {
 		[]string{"name", "status"},
 		nil,
 	)
-	c.queryWhereClause = *c.serviceWhereClause
+	c.StateV2 = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "state"),
+		"The state of the service (State)",
+		[]string{"name", "display_name", "status"},
+		nil,
+	)
+
 	return nil
 }
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
-func (c *collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	if *c.useAPI {
-		if err := c.collectAPI(ch); err != nil {
+func (c *Collector) Collect(_ *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	var err error
+
+	switch {
+	case *c.useAPI:
+		if err = c.collectAPI(ch); err != nil {
 			_ = level.Error(c.logger).Log("msg", "failed collecting API service metrics:", "err", err)
-			return err
 		}
-	} else {
-		if err := c.collectWMI(ch); err != nil {
+	case *c.v2:
+		if err = c.collectAPIV2(ch); err != nil {
+			_ = level.Error(c.logger).Log("msg", "failed collecting API service metrics:", "err", err)
+		}
+	default:
+		if err = c.collectWMI(ch); err != nil {
 			_ = level.Error(c.logger).Log("msg", "failed collecting WMI service metrics:", "err", err)
-			return err
 		}
 	}
-	return nil
+
+	return err
 }
 
 // Win32_Service docs:
@@ -164,7 +185,7 @@ var (
 		"paused",
 		"unknown",
 	}
-	apiStateValues = map[uint]string{
+	apiStateValues = map[uint32]string{
 		windows.SERVICE_CONTINUE_PENDING: "continue pending",
 		windows.SERVICE_PAUSE_PENDING:    "pause pending",
 		windows.SERVICE_PAUSED:           "paused",
@@ -203,14 +224,14 @@ var (
 	}
 )
 
-func (c *collector) collectWMI(ch chan<- prometheus.Metric) error {
+func (c *Collector) collectWMI(ch chan<- prometheus.Metric) error {
 	var dst []Win32_Service
-	q := wmi.QueryAllWhere(&dst, c.queryWhereClause, c.logger)
+	q := wmi.QueryAllWhere(&dst, *c.serviceWhereClause, c.logger) //nolint:staticcheck
 	if err := wmi.Query(q, &dst); err != nil {
 		return err
 	}
 	for _, service := range dst {
-		pid := fmt.Sprintf("%d", uint64(service.ProcessId))
+		pid := strconv.FormatUint(uint64(service.ProcessId), 10)
 
 		runAs := ""
 		if service.StartName != nil {
@@ -271,7 +292,7 @@ func (c *collector) collectWMI(ch chan<- prometheus.Metric) error {
 	return nil
 }
 
-func (c *collector) collectAPI(ch chan<- prometheus.Metric) error {
+func (c *Collector) collectAPI(ch chan<- prometheus.Metric) error {
 	svcmgrConnection, err := mgr.Connect()
 	if err != nil {
 		return err
@@ -319,7 +340,7 @@ func (c *collector) collectAPI(ch chan<- prometheus.Metric) error {
 				return
 			}
 
-			pid := fmt.Sprintf("%d", uint64(serviceStatus.ProcessId))
+			pid := strconv.FormatUint(uint64(serviceStatus.ProcessId), 10)
 
 			ch <- prometheus.MustNewConstMetric(
 				c.Information,
@@ -333,7 +354,7 @@ func (c *collector) collectAPI(ch chan<- prometheus.Metric) error {
 
 			for _, state := range apiStateValues {
 				isCurrentState := 0.0
-				if state == apiStateValues[uint(serviceStatus.State)] {
+				if state == apiStateValues[uint32(serviceStatus.State)] {
 					isCurrentState = 1.0
 				}
 				ch <- prometheus.MustNewConstMetric(
@@ -362,3 +383,92 @@ func (c *collector) collectAPI(ch chan<- prometheus.Metric) error {
 	}
 	return nil
 }
+
+func (c *Collector) collectAPIV2(ch chan<- prometheus.Metric) error {
+	services, err := c.queryAllServiceStates()
+	if err != nil {
+		_ = level.Warn(c.logger).Log("msg", "Failed to query services", "err", err)
+		return err
+	}
+
+	if services == nil {
+		_ = level.Warn(c.logger).Log("msg", "No services queried")
+		return nil
+	}
+
+	var isCurrentState float64
+
+	for _, svc := range services {
+		for state, stateValue := range apiStateValues {
+			isCurrentState = 0.0
+			if state == svc.ServiceStatusProcess.CurrentState {
+				isCurrentState = 1.0
+			}
+
+			ch <- prometheus.MustNewConstMetric(
+				c.StateV2,
+				prometheus.GaugeValue,
+				isCurrentState,
+				windows.UTF16PtrToString(svc.ServiceName),
+				windows.UTF16PtrToString(svc.DisplayName),
+				stateValue,
+			)
+		}
+	}
+
+	return nil
+}
+
+// queryAllServiceStates returns all service states of the current Windows system
+// This is realized by ask Service Manager directly.
+//
+// Unless explicitly stated otherwise all files in this repository are licensed
+// under the Apache License Version 2.0.
+// This product includes software developed at Datadog (https://www.datadoghq.com/).
+// Copyright 2016-present Datadog, Inc.
+//
+// Source: https://github.com/DataDog/datadog-agent/blob/afbd8b6c87939c92610c654cb07fdfd439e4fb27/pkg/util/winutil/scmmonitor.go#L61-L96
+func (c *Collector) queryAllServiceStates() ([]windows.ENUM_SERVICE_STATUS_PROCESS, error) {
+	// EnumServiceStatusEx requires only SC_MANAGER_ENUM_SERVICE.
+	h, err := windows.OpenSCManager(nil, nil, windows.SC_MANAGER_ENUMERATE_SERVICE)
+	if err != nil {
+		return nil, fmt.Errorf("failed to open scm: %w", err)
+	}
+
+	m := &mgr.Mgr{Handle: h}
+	defer func() {
+		if err := m.Disconnect(); err != nil {
+			_ = level.Warn(c.logger).Log("msg", "Failed to disconnect from scm", "err", err)
+		}
+	}()
+
+	var bytesNeeded, servicesReturned uint32
+	var buf []byte
+	for {
+		var p *byte
+		if len(buf) > 0 {
+			p = &buf[0]
+		}
+		err = windows.EnumServicesStatusEx(m.Handle, windows.SC_ENUM_PROCESS_INFO,
+			windows.SERVICE_WIN32, windows.SERVICE_STATE_ALL,
+			p, uint32(len(buf)), &bytesNeeded, &servicesReturned, nil, nil)
+		if err == nil {
+			break
+		}
+		if !errors.Is(err, windows.ERROR_MORE_DATA) {
+			return nil, fmt.Errorf("failed to enum services %w", err)
+		}
+		if bytesNeeded <= uint32(len(buf)) {
+			return nil, err
+		}
+		buf = make([]byte, bytesNeeded)
+	}
+
+	if servicesReturned == 0 {
+		return nil, nil
+	}
+
+	services := unsafe.Slice((*windows.ENUM_SERVICE_STATUS_PROCESS)(unsafe.Pointer(&buf[0])), servicesReturned)
+
+	return services, nil
+}

pkg/collector/smb/smb.go

@@ -3,9 +3,6 @@
 package smb
 
 import (
-	"fmt"
-	"os"
-	"slices"
 	"strings"
 
 	"github.com/alecthomas/kingpin/v2"
@@ -16,80 +13,57 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-const (
-	Name                     = "smb"
-	FlagSmbListAllCollectors = "collectors.smb.list"
-	FlagSmbCollectorsEnabled = "collectors.smb.enabled"
-)
+const Name = "smb"
 
-type Config struct {
-	CollectorsEnabled string `yaml:"collectors_enabled"`
-}
+type Config struct{}
 
-var ConfigDefaults = Config{
-	CollectorsEnabled: "",
-}
+var ConfigDefaults = Config{}
 
-type collector struct {
+type Collector struct {
+	config Config
 	logger log.Logger
 
-	smbListAllCollectors *bool
-	smbCollectorsEnabled *string
-
-	TreeConnectCount     *prometheus.Desc
-	CurrentOpenFileCount *prometheus.Desc
-
-	enabledCollectors []string
+	treeConnectCount     *prometheus.Desc
+	currentOpenFileCount *prometheus.Desc
 }
 
-// All available collector functions
-var smbAllCollectorNames = []string{
-	"ServerShares",
-}
-
-func New(logger log.Logger, config *Config) types.Collector {
+func New(logger log.Logger, config *Config) *Collector {
 	if config == nil {
 		config = &ConfigDefaults
 	}
 
-	smbListAllCollectors := false
-	c := &collector{
-		smbCollectorsEnabled: &config.CollectorsEnabled,
-		smbListAllCollectors: &smbListAllCollectors,
+	c := &Collector{
+		config: *config,
 	}
+
 	c.SetLogger(logger)
+
 	return c
 }
 
-func NewWithFlags(app *kingpin.Application) types.Collector {
-	return &collector{
-		smbListAllCollectors: app.Flag(
-			FlagSmbListAllCollectors,
-			"List the collectors along with their perflib object name/ids",
-		).Bool(),
-
-		smbCollectorsEnabled: app.Flag(
-			FlagSmbCollectorsEnabled,
-			"Comma-separated list of collectors to use. Defaults to all, if not specified.",
-		).Default(ConfigDefaults.CollectorsEnabled).String(),
-	}
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
 }
 
-func (c *collector) GetName() string {
+func (c *Collector) GetName() string {
 	return Name
 }
 
-func (c *collector) SetLogger(logger log.Logger) {
+func (c *Collector) SetLogger(logger log.Logger) {
 	c.logger = log.With(logger, "collector", Name)
 }
 
-func (c *collector) GetPerfCounter() ([]string, error) {
+func (c *Collector) GetPerfCounter() ([]string, error) {
 	return []string{
 		"SMB Server Shares",
 	}, nil
 }
 
-func (c *collector) Build() error {
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
 	// desc creates a new prometheus description
 	desc := func(metricName string, description string, labels ...string) *prometheus.Desc {
 		return prometheus.NewDesc(
@@ -100,56 +74,24 @@ func (c *collector) Build() error {
 		)
 	}
 
-	c.CurrentOpenFileCount = desc("server_shares_current_open_file_count", "Current total count open files on the SMB Server")
-	c.TreeConnectCount = desc("server_shares_tree_connect_count", "Count of user connections to the SMB Server")
+	c.currentOpenFileCount = desc("server_shares_current_open_file_count", "Current total count open files on the SMB Server")
+	c.treeConnectCount = desc("server_shares_tree_connect_count", "Count of user connections to the SMB Server")
 
-	c.enabledCollectors = make([]string, 0, len(smbAllCollectorNames))
+	return nil
+}
 
-	collectorDesc := map[string]string{
-		"ServerShares": "SMB Server Shares",
-	}
+// Collect collects smb metrics and sends them to prometheus.
+func (c *Collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collectServerShares(ctx, ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "failed to collect server share metrics", "err", err)
 
-	if *c.smbListAllCollectors {
-		fmt.Printf("%-32s %-32s\n", "Collector Name", "Perflib Object")
-		for _, cname := range smbAllCollectorNames {
-			fmt.Printf("%-32s %-32s\n", cname, collectorDesc[cname])
-		}
-		os.Exit(0)
-	}
-
-	if *c.smbCollectorsEnabled == "" {
-		for _, collectorName := range smbAllCollectorNames {
-			c.enabledCollectors = append(c.enabledCollectors, collectorName)
-		}
-	} else {
-		for _, collectorName := range strings.Split(*c.smbCollectorsEnabled, ",") {
-			if slices.Contains(smbAllCollectorNames, collectorName) {
-				c.enabledCollectors = append(c.enabledCollectors, collectorName)
-			} else {
-				return fmt.Errorf("unknown smb collector: %s", collectorName)
-			}
-		}
+		return err
 	}
 
 	return nil
 }
 
-// Collect collects smb metrics and sends them to prometheus
-func (c *collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
-	collectorFuncs := map[string]func(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error{
-		"ServerShares": c.collectServerShares,
-	}
-
-	for _, collectorName := range c.enabledCollectors {
-		if err := collectorFuncs[collectorName](ctx, ch); err != nil {
-			_ = level.Error(c.logger).Log("msg", "Error in "+collectorName, "err", err)
-			return err
-		}
-	}
-	return nil
-}
-
-// Perflib: SMB Server Shares
+// Perflib: SMB Server Shares.
 type perflibServerShares struct {
 	Name string
 
@@ -157,7 +99,7 @@ type perflibServerShares struct {
 	TreeConnectCount     float64 `perflib:"Tree Connect Count"`
 }
 
-func (c *collector) collectServerShares(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+func (c *Collector) collectServerShares(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
 	var data []perflibServerShares
 	if err := perflib.UnmarshalObject(ctx.PerfObjects["SMB Server Shares"], &data, c.logger); err != nil {
 		return err
@@ -169,23 +111,22 @@ func (c *collector) collectServerShares(ctx *types.ScrapeContext, ch chan<- prom
 		}
 
 		ch <- prometheus.MustNewConstMetric(
-			c.CurrentOpenFileCount,
+			c.currentOpenFileCount,
 			prometheus.CounterValue,
 			instance.CurrentOpenFileCount,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
-			c.TreeConnectCount,
+			c.treeConnectCount,
 			prometheus.CounterValue,
 			instance.TreeConnectCount,
 		)
-
 	}
 	return nil
 }
 
-// toLabelName converts strings to lowercase and replaces all whitespaces and dots with underscores
-func (c *collector) toLabelName(name string) string {
+// toLabelName converts strings to lowercase and replaces all whitespaces and dots with underscores.
+func (c *Collector) toLabelName(name string) string {
 	s := strings.ReplaceAll(strings.Join(strings.Fields(strings.ToLower(name)), "_"), ".", "_")
 	s = strings.ReplaceAll(s, "__", "_")
 	return s

pkg/collector/smbclient/smbclient.go

@@ -0,0 +1,388 @@
+//go:build windows
+
+package smbclient
+
+import (
+	"strings"
+
+	"github.com/alecthomas/kingpin/v2"
+	"github.com/go-kit/log"
+	"github.com/go-kit/log/level"
+	"github.com/prometheus-community/windows_exporter/pkg/perflib"
+	"github.com/prometheus-community/windows_exporter/pkg/types"
+	"github.com/prometheus/client_golang/prometheus"
+)
+
+const (
+	Name = "smbclient"
+)
+
+type Config struct{}
+
+var ConfigDefaults = Config{}
+
+type Collector struct {
+	config Config
+	logger log.Logger
+
+	readBytesTotal                            *prometheus.Desc
+	readBytesTransmittedViaSMBDirectTotal     *prometheus.Desc
+	readRequestQueueSecsTotal                 *prometheus.Desc
+	readRequestsTransmittedViaSMBDirectTotal  *prometheus.Desc
+	readSecsTotal                             *prometheus.Desc
+	readsTotal                                *prometheus.Desc
+	turboIOReadsTotal                         *prometheus.Desc
+	TurboIOWritesTotal                        *prometheus.Desc
+	writeBytesTotal                           *prometheus.Desc
+	writeBytesTransmittedViaSMBDirectTotal    *prometheus.Desc
+	writeRequestQueueSecsTotal                *prometheus.Desc
+	writeRequestsTransmittedViaSMBDirectTotal *prometheus.Desc
+	writeSecsTotal                            *prometheus.Desc
+	writesTotal                               *prometheus.Desc
+
+	creditStallsTotal     *prometheus.Desc
+	currentDataQueued     *prometheus.Desc
+	dataBytesTotal        *prometheus.Desc
+	dataRequestsTotal     *prometheus.Desc
+	metadataRequestsTotal *prometheus.Desc
+	requestQueueSecsTotal *prometheus.Desc
+	requestSecs           *prometheus.Desc
+}
+
+func New(logger log.Logger, config *Config) *Collector {
+	if config == nil {
+		config = &ConfigDefaults
+	}
+
+	c := &Collector{
+		config: *config,
+	}
+
+	c.SetLogger(logger)
+
+	return c
+}
+
+func NewWithFlags(_ *kingpin.Application) *Collector {
+	return &Collector{}
+}
+
+func (c *Collector) GetName() string {
+	return Name
+}
+
+func (c *Collector) SetLogger(logger log.Logger) {
+	c.logger = log.With(logger, "collector", Name)
+}
+
+func (c *Collector) GetPerfCounter() ([]string, error) {
+	return []string{
+		"SMB Client Shares",
+	}, nil
+}
+
+func (c *Collector) Close() error {
+	return nil
+}
+
+func (c *Collector) Build() error {
+	// desc creates a new prometheus description
+	desc := func(metricName string, description string, labels []string) *prometheus.Desc {
+		return prometheus.NewDesc(
+			prometheus.BuildFQName(types.Namespace, "smbclient", metricName),
+			description,
+			labels,
+			nil,
+		)
+	}
+
+	c.requestQueueSecsTotal = desc("data_queue_seconds_total",
+		"Seconds requests waited on queue on this share",
+		[]string{"server", "share"},
+	)
+	c.readRequestQueueSecsTotal = desc("read_queue_seconds_total",
+		"Seconds read requests waited on queue on this share",
+		[]string{"server", "share"},
+	)
+	c.writeRequestQueueSecsTotal = desc("write_queue_seconds_total",
+		"Seconds write requests waited on queue on this share",
+		[]string{"server", "share"},
+	)
+	c.requestSecs = desc("request_seconds_total",
+		"Seconds waiting for requests on this share",
+		[]string{"server", "share"},
+	)
+	c.creditStallsTotal = desc("stalls_total",
+		"The number of requests delayed based on insufficient credits on this share",
+		[]string{"server", "share"},
+	)
+	c.currentDataQueued = desc("requests_queued",
+		"The point in time number of requests outstanding on this share",
+		[]string{"server", "share"},
+	)
+	c.dataBytesTotal = desc("data_bytes_total",
+		"The bytes read or written on this share",
+		[]string{"server", "share"},
+	)
+	c.dataRequestsTotal = desc("requests_total",
+		"The requests on this share",
+		[]string{"server", "share"},
+	)
+	c.metadataRequestsTotal = desc("metadata_requests_total",
+		"The metadata requests on this share",
+		[]string{"server", "share"},
+	)
+	c.readBytesTransmittedViaSMBDirectTotal = desc("read_bytes_via_smbdirect_total",
+		"The bytes read from this share via RDMA direct placement",
+		[]string{"server", "share"},
+	)
+	c.readBytesTotal = desc("read_bytes_total",
+		"The bytes read on this share",
+		[]string{"server", "share"},
+	)
+	c.readRequestsTransmittedViaSMBDirectTotal = desc("read_requests_via_smbdirect_total",
+		"The read requests on this share via RDMA direct placement",
+		[]string{"server", "share"},
+	)
+	c.readsTotal = desc("read_requests_total",
+		"The read requests on this share",
+		[]string{"server", "share"},
+	)
+	c.turboIOReadsTotal = desc("turbo_io_reads_total",
+		"The read requests that go through Turbo I/O",
+		[]string{"server", "share"},
+	)
+	c.TurboIOWritesTotal = desc("turbo_io_writes_total",
+		"The write requests that go through Turbo I/O",
+		[]string{"server", "share"},
+	)
+	c.writeBytesTransmittedViaSMBDirectTotal = desc("write_bytes_via_smbdirect_total",
+		"The written bytes to this share via RDMA direct placement",
+		[]string{"server", "share"},
+	)
+	c.writeBytesTotal = desc("write_bytes_total",
+		"The bytes written on this share",
+		[]string{"server", "share"},
+	)
+	c.writeRequestsTransmittedViaSMBDirectTotal = desc("write_requests_via_smbdirect_total",
+		"The write requests to this share via RDMA direct placement",
+		[]string{"server", "share"},
+	)
+	c.writesTotal = desc("write_requests_total",
+		"The write requests on this share",
+		[]string{"server", "share"},
+	)
+	c.readSecsTotal = desc("read_seconds_total",
+		"Seconds waiting for read requests on this share",
+		[]string{"server", "share"},
+	)
+	c.writeSecsTotal = desc("write_seconds_total",
+		"Seconds waiting for write requests on this share",
+		[]string{"server", "share"},
+	)
+
+	return nil
+}
+
+// Collect collects smb client metrics and sends them to prometheus.
+func (c *Collector) Collect(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	if err := c.collectClientShares(ctx, ch); err != nil {
+		_ = level.Error(c.logger).Log("msg", "Error in ClientShares", "err", err)
+		return err
+	}
+
+	return nil
+}
+
+// Perflib: SMB Client Shares.
+type perflibClientShares struct {
+	Name string
+
+	AvgDataQueueLength                         float64 `perflib:"Avg. Data Queue Length"`
+	AvgReadQueueLength                         float64 `perflib:"Avg. Read Queue Length"`
+	AvgSecPerRead                              float64 `perflib:"Avg. sec/Read"`
+	AvgSecPerWrite                             float64 `perflib:"Avg. sec/Write"`
+	AvgSecPerDataRequest                       float64 `perflib:"Avg. sec/Data Request"`
+	AvgWriteQueueLength                        float64 `perflib:"Avg. Write Queue Length"`
+	CreditStallsPerSec                         float64 `perflib:"Credit Stalls/sec"`
+	CurrentDataQueueLength                     float64 `perflib:"Current Data Queue Length"`
+	DataBytesPerSec                            float64 `perflib:"Data Bytes/sec"`
+	DataRequestsPerSec                         float64 `perflib:"Data Requests/sec"`
+	MetadataRequestsPerSec                     float64 `perflib:"Metadata Requests/sec"`
+	ReadBytesTransmittedViaSMBDirectPerSec     float64 `perflib:"Read Bytes transmitted via SMB Direct/sec"`
+	ReadBytesPerSec                            float64 `perflib:"Read Bytes/sec"`
+	ReadRequestsTransmittedViaSMBDirectPerSec  float64 `perflib:"Read Requests transmitted via SMB Direct/sec"`
+	ReadRequestsPerSec                         float64 `perflib:"Read Requests/sec"`
+	TurboIOReadsPerSec                         float64 `perflib:"Turbo I/O Reads/sec"`
+	TurboIOWritesPerSec                        float64 `perflib:"Turbo I/O Writes/sec"`
+	WriteBytesTransmittedViaSMBDirectPerSec    float64 `perflib:"Write Bytes transmitted via SMB Direct/sec"`
+	WriteBytesPerSec                           float64 `perflib:"Write Bytes/sec"`
+	WriteRequestsTransmittedViaSMBDirectPerSec float64 `perflib:"Write Requests transmitted via SMB Direct/sec"`
+	WriteRequestsPerSec                        float64 `perflib:"Write Requests/sec"`
+}
+
+func (c *Collector) collectClientShares(ctx *types.ScrapeContext, ch chan<- prometheus.Metric) error {
+	var data []perflibClientShares
+	if err := perflib.UnmarshalObject(ctx.PerfObjects["SMB Client Shares"], &data, c.logger); err != nil {
+		return err
+	}
+	for _, instance := range data {
+		if instance.Name == "_Total" {
+			continue
+		}
+
+		parsed := strings.FieldsFunc(instance.Name, func(r rune) bool { return r == '\\' })
+		serverValue := parsed[0]
+		shareValue := parsed[1]
+		// Request time spent on queue. Convert from ticks to seconds.
+		ch <- prometheus.MustNewConstMetric(
+			c.requestQueueSecsTotal,
+			prometheus.CounterValue,
+			instance.AvgDataQueueLength*perflib.TicksToSecondScaleFactor,
+			serverValue, shareValue,
+		)
+
+		// Read time spent on queue. Convert from ticks to seconds.
+		ch <- prometheus.MustNewConstMetric(
+			c.readRequestQueueSecsTotal,
+			prometheus.CounterValue,
+			instance.AvgReadQueueLength*perflib.TicksToSecondScaleFactor,
+			serverValue, shareValue,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.readSecsTotal,
+			prometheus.CounterValue,
+			instance.AvgSecPerRead*perflib.TicksToSecondScaleFactor,
+			serverValue, shareValue,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.writeSecsTotal,
+			prometheus.CounterValue,
+			instance.AvgSecPerWrite*perflib.TicksToSecondScaleFactor,
+			serverValue, shareValue,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.requestSecs,
+			prometheus.CounterValue,
+			instance.AvgSecPerDataRequest*perflib.TicksToSecondScaleFactor,
+			serverValue, shareValue,
+		)
+
+		// Write time spent on queue. Convert from  ticks to seconds.
+		ch <- prometheus.MustNewConstMetric(
+			c.writeRequestQueueSecsTotal,
+			prometheus.CounterValue,
+			instance.AvgWriteQueueLength*perflib.TicksToSecondScaleFactor,
+			serverValue, shareValue,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.creditStallsTotal,
+			prometheus.CounterValue,
+			instance.CreditStallsPerSec,
+			serverValue, shareValue,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.currentDataQueued,
+			prometheus.GaugeValue,
+			instance.CurrentDataQueueLength,
+			serverValue, shareValue,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.dataBytesTotal,
+			prometheus.CounterValue,
+			instance.DataBytesPerSec,
+			serverValue, shareValue,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.dataRequestsTotal,
+			prometheus.CounterValue,
+			instance.DataRequestsPerSec,
+			serverValue, shareValue,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.metadataRequestsTotal,
+			prometheus.CounterValue,
+			instance.MetadataRequestsPerSec,
+			serverValue, shareValue,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.readBytesTransmittedViaSMBDirectTotal,
+			prometheus.CounterValue,
+			instance.ReadBytesTransmittedViaSMBDirectPerSec,
+			serverValue, shareValue,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.readBytesTotal,
+			prometheus.CounterValue,
+			instance.ReadBytesPerSec,
+			serverValue, shareValue,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.readRequestsTransmittedViaSMBDirectTotal,
+			prometheus.CounterValue,
+			instance.ReadRequestsTransmittedViaSMBDirectPerSec,
+			serverValue, shareValue,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.readsTotal,
+			prometheus.CounterValue,
+			instance.ReadRequestsPerSec,
+			serverValue, shareValue,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.turboIOReadsTotal,
+			prometheus.CounterValue,
+			instance.TurboIOReadsPerSec,
+			serverValue, shareValue,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.TurboIOWritesTotal,
+			prometheus.CounterValue,
+			instance.TurboIOWritesPerSec,
+			serverValue, shareValue,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.writeBytesTransmittedViaSMBDirectTotal,
+			prometheus.CounterValue,
+			instance.WriteBytesTransmittedViaSMBDirectPerSec,
+			serverValue, shareValue,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.writeBytesTotal,
+			prometheus.CounterValue,
+			instance.WriteBytesPerSec,
+			serverValue, shareValue,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.writeRequestsTransmittedViaSMBDirectTotal,
+			prometheus.CounterValue,
+			instance.WriteRequestsTransmittedViaSMBDirectPerSec,
+			serverValue, shareValue,
+		)
+
+		ch <- prometheus.MustNewConstMetric(
+			c.writesTotal,
+			prometheus.CounterValue,
+			instance.WriteRequestsPerSec,
+			serverValue, shareValue,
+		)
+	}
+	return nil
+}