fix(deps): update module github.com/microsoft/hcsshim to v0.13.0 (#2036)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.editorconfig

@@ -11,6 +11,9 @@ tab_width = 4
 indent_style = space
 indent_size = 4
 
+[renovate.json]
+indent_size = 2
+
 [*.{yml,yaml}]
 indent_style = space
-indent_size = 2
+indent_size = 2

.github/ISSUE_TEMPLATE/question.yaml

@@ -2,6 +2,28 @@ name: ❓ Question
 description: Something is not clear.
 labels: [ ❓ question ]
 body:
+  
+  - type: markdown
+    attributes:
+      value: |-
+        > [!NOTE]
+        > If you encounter "Counter not found" issues, try to re-build  the performance counter first.
+
+        ```
+        PS C:\WINDOWS\system32> cd c:\windows\system32
+        PS C:\windows\system32> lodctr /R
+        
+        Error: Unable to rebuild performance counter setting from system backup store, error code is 2
+        PS C:\windows\system32> cd ..
+        PS C:\windows> cd syswow64
+        PS C:\windows\syswow64> lodctr /R
+        
+        Info: Successfully rebuilt performance counter setting from system backup store
+        PS C:\windows\syswow64> winmgmt.exe /RESYNCPERF
+        ```
+        
+        ----
+
   - type: textarea
     attributes:
       label: Problem Statement

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,40 @@
+
+
+<!--
+    Please give your PR a title in the form "area: short description".  For example "cpu: reduce usage by 95%" or "docs: fix typo in installation.md".
+
+    If your PR is to fix an issue, put "Fixes #issue-number" in the description.
+
+    Don't forget!
+
+    - Please sign CNCF's Developer Certificate of Origin and sign-off your commits by adding the -s / --signoff flag to `git commit`. See https://github.com/apps/dco for more information.
+
+    - If the PR adds or changes a behaviour or fixes a bug of an exported API it would need a unit/e2e test.
+
+    - Performance improvements would need a benchmark test to prove it.
+
+    - All comments should start with a capital letter and end with a full stop.
+ -->
+
+
+#### What this PR does / why we need it
+
+#### Which issue this PR fixes
+
+*(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #
+
+- fixes #
+
+#### Special notes for your reviewer
+
+#### Particularly user-facing changes
+
+#### Checklist
+
+Complete these before marking the PR as `ready to review`:
+
+<!-- [Place an '[x]' (no spaces) in all applicable fields.] -->
+
+- [ ] [DCO](https://github.com/prometheus-community/helm-charts/blob/main/CONTRIBUTING.md#sign-off-your-work) signed
+- [ ] The PR title has a summary of the changes and the area they affect
+- [ ] The PR body has a summary to reflect any significant (and particularly user-facing) changes introduced by this PR

.github/dependabot.yml

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

.github/workflows/container_description.yml

@@ -18,7 +18,7 @@ jobs:
     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
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Set docker hub repo name
         run: echo "DOCKER_REPO_NAME=$(make docker-repo-name)" >> $GITHUB_ENV
       - name: Push README to Dockerhub
@@ -33,3 +33,25 @@ jobs:
           # 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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - 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

@@ -4,27 +4,13 @@ name: Linting
 # have been changed.
 on:
   push:
-    paths:
-    - "go.mod"
-    - "go.sum"
-    - "**.go"
-    - ".github/workflows/lint.yml"
-    - "tools/e2e-output.txt"
     branches:
       - master
       - next
       - main
+      - "0.*"
+      - "1.*"
   pull_request:
-    paths:
-    - "go.mod"
-    - "go.sum"
-    - "**.go"
-    - ".github/workflows/lint.yml"
-    - "tools/e2e-output.txt"
-    branches:
-      - master
-      - next
-      - main
 
 env:
   VERSION_PROMU: '0.14.0'
@@ -32,10 +18,10 @@ env:
 
 jobs:
   test:
-    runs-on: windows-2019
+    runs-on: windows-2025
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
           go-version-file: 'go.mod'
 
@@ -55,10 +41,10 @@ jobs:
         run: make e2e-test
 
   promtool:
-    runs-on: windows-2019
+    runs-on: windows-2025
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
           go-version-file: 'go.mod'
 
@@ -79,7 +65,7 @@ jobs:
         run: make promtool
 
       - name: Upload windows_exporter.exe
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         if: always()
         with:
           name: windows_exporter.amd64.exe
@@ -88,7 +74,7 @@ jobs:
           if-no-files-found: error
 
   lint:
-    runs-on: windows-2022
+    runs-on: windows-2025
     steps:
       # `gofmt` linter run by golangci-lint fails on CRLF line endings (the default for Windows)
       - name: Set git to use LF
@@ -96,13 +82,14 @@ jobs:
           git config --global core.autocrlf false
           git config --global core.eol lf
 
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
           go-version-file: 'go.mod'
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
         with:
-          version: v1.60
-          args: "--max-same-issues=0"
+          # renovate: github=golangci/golangci-lint
+          version: v2.1.6
+          args: "--max-same-issues=0"

.github/workflows/pr-check.yaml

@@ -33,11 +33,11 @@ jobs:
     name: check title prefix
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: check
         run: |
           PR_TITLE_PREFIX=$(echo "$PR_TITLE" | cut -d':' -f1)
-          if [[ -d "internal/collector/$PR_TITLE_PREFIX" ]] || [[ -d "internal/$PR_TITLE_PREFIX" ]] || [[ -d "pkg/$PR_TITLE_PREFIX" ]] || [[ -d "$PR_TITLE_PREFIX" ]] || [[ "$PR_TITLE_PREFIX" == "docs" ]] || [[ "$PR_TITLE_PREFIX" == "ci" ]] || [[ "$PR_TITLE_PREFIX" == "revert" ]] || [[ "$PR_TITLE_PREFIX" == "fix" ]]  || [[ "$PR_TITLE_PREFIX" == "feat" ]] || [[ "$PR_TITLE_PREFIX" == "chore" ]] || [[ "$PR_TITLE_PREFIX" == "chore(docs)" ]] || [[ "$PR_TITLE_PREFIX" == "chore(deps)" ]] || [[ "$PR_TITLE_PREFIX" == "*" ]] || [[ "$PR_TITLE_PREFIX" == "Synchronize common files from prometheus/prometheus" ]]; then
+          if [[ -d "internal/collector/$PR_TITLE_PREFIX" ]] || [[ -d "internal/$PR_TITLE_PREFIX" ]] || [[ -d "pkg/$PR_TITLE_PREFIX" ]] || [[ -d "$PR_TITLE_PREFIX" ]] || [[ "$PR_TITLE_PREFIX" == "docs" ]] || [[ "$PR_TITLE_PREFIX" == "ci" ]] || [[ "$PR_TITLE_PREFIX" == "revert" ]] || [[ "$PR_TITLE_PREFIX" == "fix" ]] || [[ "$PR_TITLE_PREFIX" == "fix(deps)" ]] || [[ "$PR_TITLE_PREFIX" == "feat" ]] || [[ "$PR_TITLE_PREFIX" == "chore" ]] || [[ "$PR_TITLE_PREFIX" == "chore(docs)" ]] || [[ "$PR_TITLE_PREFIX" == "chore(deps)" ]] || [[ "$PR_TITLE_PREFIX" == "*" ]] || [[ "$PR_TITLE_PREFIX" == "Release"* ]] || [[ "$PR_TITLE_PREFIX" == "Synchronize common files from prometheus/prometheus" ]]; then
             exit 0
           fi
 

.github/workflows/release.yml

@@ -21,24 +21,26 @@ env:
 
 jobs:
   build:
-    runs-on: windows-2022
+    runs-on: windows-2025
+    environment: build
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: '0'
 
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
         with:
           go-version-file: 'go.mod'
 
       - name: Install WiX
-        run: dotnet tool install --global wix
+        run: |
+          dotnet tool install --global wix --version 5.0.2
 
       - name: Install WiX extensions
         run: |
-          wix extension add -g WixToolset.Util.wixext
-          wix extension add -g WixToolset.Ui.wixext
-          wix extension add -g WixToolset.Firewall.wixext
+          wix extension add -g WixToolset.Util.wixext/5.0.2
+          wix extension add -g WixToolset.Ui.wixext/5.0.2
+          wix extension add -g WixToolset.Firewall.wixext/5.0.2
 
       - name: Install Build deps
         run: |
@@ -68,6 +70,40 @@ jobs:
 
           Get-ChildItem -Path output
 
+      - name: Sign build artifacts
+        if: ${{ (github.event_name != 'pull_request' && github.repository == 'prometheus-community/windows_exporter') || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == 'prometheus-community/windows_exporter') }}
+        run: |
+          $ErrorActionPreference = "Stop"
+          $Version = Get-Content VERSION
+
+          $b64      = $env:CODE_SIGN_KEY
+          $filename = 'windows_exporter_CodeSign.pfx'
+
+          $bytes = [Convert]::FromBase64String($b64)
+          [IO.File]::WriteAllBytes($filename, $bytes)
+
+          $basePath = "C:\Program Files (x86)\Windows Kits\10\bin"
+          $latestSigntool = Get-ChildItem -Path $basePath -Directory |
+          Where-Object { $_.Name -match "^\d+\.\d+\.\d+\.\d+$" } |
+          Sort-Object { [Version]$_.Name } -Descending |
+          Select-Object -First 1 |
+          ForEach-Object { Join-Path $_.FullName "x64\signtool.exe" }
+
+          if (Test-Path $latestSigntool) {
+            Write-Output $latestSigntool
+          } else {
+            Write-Output "signtool.exe not found"
+          }
+
+          foreach($Arch in "amd64", "arm64") {
+            & $latestSigntool sign /v /tr "http://timestamp.digicert.com" /d "Prometheus exporter for Windows machines" /td SHA256 /fd SHA256 /a /f "windows_exporter_CodeSign.pfx" /p $env:CODE_SIGN_PASSWORD "output\windows_exporter-$Version-$Arch.exe"
+          }
+
+          rm windows_exporter_CodeSign.pfx
+        env:
+          CODE_SIGN_KEY: ${{ secrets.CODE_SIGN_KEY }}
+          CODE_SIGN_PASSWORD: ${{ secrets.CODE_SIGN_PASSWORD }}
+
       - name: Build Release Artifacts
         run: |
           $ErrorActionPreference = "Stop"
@@ -79,12 +115,49 @@ jobs:
           }
 
           Move-Item installer\*.msi output\
-          Get-ChildItem -Path output\
+          Get-ChildItem -Path output\ g
 
-          promu checksum output\
+      - name: Sign installer artifacts
+        if: ${{ (github.event_name != 'pull_request' && github.repository == 'prometheus-community/windows_exporter') || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == 'prometheus-community/windows_exporter') }}
+        run: |
+          $ErrorActionPreference = "Stop"
+          $Version = Get-Content VERSION
+
+          $b64      = $env:CODE_SIGN_KEY
+          $filename = 'windows_exporter_CodeSign.pfx'
+
+          $bytes = [Convert]::FromBase64String($b64)
+          [IO.File]::WriteAllBytes($filename, $bytes)
+
+          $basePath = "C:\Program Files (x86)\Windows Kits\10\bin"
+          $latestSigntool = Get-ChildItem -Path $basePath -Directory |
+          Where-Object { $_.Name -match "^\d+\.\d+\.\d+\.\d+$" } |
+          Sort-Object { [Version]$_.Name } -Descending |
+          Select-Object -First 1 |
+          ForEach-Object { Join-Path $_.FullName "x64\signtool.exe" }
+
+          if (Test-Path $latestSigntool) {
+            Write-Output $latestSigntool
+          } else {
+            Write-Output "signtool.exe not found"
+          }
+
+          foreach($Arch in "amd64", "arm64") {
+            & $latestSigntool sign /v /tr "http://timestamp.digicert.com" /d "Prometheus exporter for Windows machines" /td SHA256 /fd SHA256 /a /f "windows_exporter_CodeSign.pfx" /p $env:CODE_SIGN_PASSWORD "output\windows_exporter-$Version-$Arch.msi"
+          }
+
+          rm windows_exporter_CodeSign.pfx
+        env:
+          CODE_SIGN_KEY: ${{ secrets.CODE_SIGN_KEY }}
+          CODE_SIGN_PASSWORD: ${{ secrets.CODE_SIGN_PASSWORD }}
+
+      - name: Generate checksums
+        run: |
+          promu checksum output
+          cat output\sha256sums.txt
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: windows_exporter_binaries
           path: |
@@ -103,34 +176,37 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - build
+    env:
+      DOCKER_BUILD_SUMMARY: false
+      DOCKER_BUILD_RECORD_UPLOAD: false
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: '0'
 
       - name: Download Artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
         with:
           name: windows_exporter_binaries
 
       - name: Login to Docker Hub
         if: ${{ github.event_name != 'pull_request' }}
-        uses: docker/login-action@v3
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         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: ${{ secrets.QUAY_USER }}
-      #    password: ${{ secrets.QUAY_PASS }}
+      - name: Login to quay.io
+        if: ${{ github.event_name != 'pull_request' }}
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
+        with:
+          registry: quay.io
+          username: ${{ secrets.QUAY_IO_LOGIN }}
+          password: ${{ secrets.QUAY_IO_PASSWORD }}
 
       - name: Login to GitHub container registry
         if: ${{ github.event_name != 'pull_request' }}
-        uses: docker/login-action@v3
+        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -138,12 +214,12 @@ jobs:
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
         with:
           images: |
             ghcr.io/prometheus-community/windows-exporter
             docker.io/prometheuscommunity/windows-exporter
-          # quay.io/prometheuscommunity/windows-exporter
+            quay.io/prometheuscommunity/windows-exporter
           tags: |
             type=semver,pattern={{version}}
             type=ref,event=branch
@@ -155,13 +231,14 @@ jobs:
             org.opencontainers.image.licenses=MIT
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
 
       - name: Build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: windows/amd64
+          annotations: ${{ steps.meta.outputs.labels }}

.github/workflows/spelling.yml

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

.github/workflows/stale-close.yml

@@ -11,7 +11,7 @@ jobs:
     if: github.repository_owner == 'prometheus' || github.repository_owner == 'prometheus-community' # Don't run this workflow on forks.
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
+      - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           # opt out of defaults to avoid marking issues as stale and closing them

.github/workflows/stale.yml

@@ -11,7 +11,7 @@ jobs:
     if: github.repository_owner == 'prometheus' || github.repository_owner == 'prometheus-community' # Don't run this workflow on forks.
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
+      - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           # opt out of defaults to avoid marking issues as stale and closing them

.golangci.yaml

@@ -1,91 +1,129 @@
+version: "2"
 linters:
-  enable-all: true
+  default: all
   disable:
     - cyclop
     - depguard
     - dupl
     - err113
-    - execinquery
     - exhaustive
     - exhaustruct
-    - exportloopref
     - fatcontext
+    - funcorder
     - funlen
-    - gochecknoglobals
     - gocognit
     - goconst
     - gocyclo
     - godot
-    - gomnd
-    - paralleltest
     - lll
     - maintidx
     - mnd
+    - paralleltest
+    - tagliatelle
     - testpackage
     - varnamelen
     - wrapcheck
+  settings:
+    forbidigo:
+      forbid:
+        - pattern: ^(fmt\.Print(|f|ln)|print|println)$
+        - pattern: ^syscall\.(.{1,7}|.{7}[^N]|.{9,})$
+          msg: use golang.org/x/sys/windows instead of syscall
+        - pattern: ^windows\.NewLazyDLL$
+          msg: use NewLazySystemDLL instead NewLazyDLL
+    goheader:
+      values:
+        const:
+          COMPANY: The Prometheus Authors
+      template: |-
+        SPDX-License-Identifier: Apache-2.0
 
-run:
-  timeout: 5m
+        Copyright {{ COMPANY }}
+        Licensed under the Apache License, Version 2.0 (the "License");
+        you may not use this file except in compliance with the License.
+        You may obtain a copy of the License at
 
-linters-settings:
-  gosec:
-    excludes:
-      - G101 # Potential hardcoded credentials
-      - G115 # integer overflow conversion
+        http://www.apache.org/licenses/LICENSE-2.0
 
-  gci:
-    sections:
-      - prefix(github.com/prometheus-community/windows_exporter/internal/windowsservice)
-      - 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
-  forbidigo:
-    forbid:
-      - "^(fmt\\.Print(|f|ln)|print|println)$"
-      - p: "^syscall\\.(.{1,7}|.{7}[^N]|.{9,})$"
-        msg: use golang.org/x/sys/windows instead of syscall
-      - p: "^windows\\.NewLazyDLL$"
-        msg: use NewLazySystemDLL instead NewLazyDLL
-  sloglint:
-    no-mixed-args: true
-    kv-only: false
-    attr-only: true
-    no-global: "all"
-    context: "scope"
-    static-msg: false
-    no-raw-keys: false
-    key-naming-case: snake
-    forbidden-keys:
-      - time
-      - level
-      - msg
-      - source
-    args-on-sep-lines: true
-  stylecheck:
-    checks: ["all", "-ST1003"]
-issues:
-  exclude:
-  - don't use underscores in Go names
-  - don't use an underscore in package name
-  - exported type .+ should have comment or be unexported
-  exclude-rules:
-  - # Golint has many capitalisation complaints on WMI class names
-    text: "`?\\w+`? should be `?\\w+`?"
-    linters:
-    - revive
-  - text: "don't use ALL_CAPS in Go names; use CamelCase"
-    linters:
-    - revive
-  - path: internal/perfdata/v1/
-    linters:
-      - godox
-      - stylecheck
+        Unless required by applicable law or agreed to in writing, software
+        distributed under the License is distributed on an "AS IS" BASIS,
+        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+        See the License for the specific language governing permissions and
+        limitations under the License.
+    gomoddirectives:
+      toolchain-forbidden: true
+    gosec:
+      excludes:
+        - G101
+        - G115
+    sloglint:
+      no-mixed-args: true
+      kv-only: false
+      attr-only: true
+      no-global: all
+      context: scope
+      static-msg: false
+      no-raw-keys: false
+      key-naming-case: snake
+      forbidden-keys:
+        - time
+        - level
+        - msg
+        - source
+      args-on-sep-lines: true
+    staticcheck:
+      checks:
+        - -ST1003
+        - all
+    tagliatelle:
+      case:
+        rules:
+          json: camel
+          yaml: snake
+        use-field-name: true
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - revive
+        text: '`?\w+`? should be `?\w+`?'
+      - linters:
+          - revive
+        text: don't use ALL_CAPS in Go names; use CamelCase
+      - path: .+\.go$
+        text: don't use underscores in Go names
+      - path: .+\.go$
+        text: don't use an underscore in package name
+      - path: .+\.go$
+        text: exported type .+ should have comment or be unexported
+      - linters:
+        - staticcheck
+        text: "ST1003:"
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - gofumpt
+    - goimports
+  settings:
+    gci:
+      sections:
+        - prefix(github.com/prometheus-community/windows_exporter/internal/windowsservice)
+        - standard
+        - default
+      custom-order: true
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

.promu.yml

@@ -8,6 +8,7 @@ repository:
 build:
   binaries:
     - name: windows_exporter
+      path: ./cmd/windows_exporter
   tags:
     all:
       - trimpath

.run/all.run.xml

@@ -0,0 +1,30 @@
+<!--
+  ~ SPDX-License-Identifier: Apache-2.0
+  ~
+  ~ Copyright The Prometheus Authors
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="all" type="GoApplicationRunConfiguration" factoryName="Go Application" folderName="run">
+    <module name="windows_exporter" />
+    <working_directory value="$PROJECT_DIR$" />
+    <parameters value="--web.listen-address=127.0.0.1:9182 --log.level=info --collectors.enabled=ad,adcs,adfs,cache,container,cpu,cpu_info,cs,dfsr,dhcp,diskdrive,dns,exchange,filetime,fsrmquota,hyperv,iis,license,logical_disk,logon,memory,mscluster,msmq,mssql,net,netframework,nps,os,pagefile,performancecounter,physical_disk,printer,process,remote_fx,scheduled_task,service,smb,smbclient,smtp,system,tcp,terminal_services,thermalzone,time,udp,update,vmware,performancecounter --debug.enabled --collector.performancecounter.objects='[{ &quot;name&quot;: &quot;memory&quot;, &quot;type&quot;: &quot;formatted&quot;, &quot;object&quot;: &quot;Memory&quot;, &quot;counters&quot;: [{ &quot;name&quot;:&quot;Cache Faults/sec&quot;, &quot;type&quot;:&quot;counter&quot; }]}]'" />
+    <sudo value="true" />
+    <kind value="PACKAGE" />
+    <package value="github.com/prometheus-community/windows_exporter/cmd/windows_exporter" />
+    <directory value="$PROJECT_DIR$" />
+    <filePath value="$PROJECT_DIR$/exporter.go" />
+    <method v="2" />
+  </configuration>
+</component>

CONTRIBUTING.md

@@ -0,0 +1,82 @@
+# Contributing
+
+windows_exporter uses GitHub to manage reviews of pull requests.
+
+* If you are a new contributor see: [Steps to Contribute](#steps-to-contribute)
+
+* If you have a trivial fix or improvement, go ahead and create a pull request,
+  addressing (with `@...`) a suitable maintainer of this repository (see
+  [MAINTAINERS.md](MAINTAINERS.md)) in the description of the pull request.
+
+* If you plan to do something more involved, first discuss your ideas
+  as [github issue](https://github.com/prometheus-community/windows_exporter/issues).
+  This will avoid unnecessary work and surely give you and us a good deal
+  of inspiration. New collectors are unlikely to be accepted, since the
+  `performancecounter` collector is the preferred way to collect metrics.
+
+* Relevant coding style guidelines are the [Go Code Review
+  Comments](https://code.google.com/p/go-wiki/wiki/CodeReviewComments)
+  and the _Formatting and style_ section of Peter Bourgon's [Go: Best
+  Practices for Production
+  Environments](https://peter.bourgon.org/go-in-production/#formatting-and-style).
+  gofmt and [golangci-lint](https://github.com/golangci/golangci-lint) are your friends.
+
+* Be sure to sign off on the [DCO](https://github.com/probot/dco#how-it-works).
+
+## Steps to Contribute
+
+Should you wish to work on an issue, please claim it first by commenting on the GitHub issue that you want to work on it. This is to prevent duplicated efforts from contributors on the same issue.
+For quickly compiling and testing your changes do:
+
+```bash
+# For building.
+go build -o windows_exporter.exe ./cmd/windows_exporter/
+./windows_exporter.exe
+
+# For testing.
+make test         # Make sure all the tests pass before you commit and push :)
+```
+
+To run a collection of Go linters through [`golangci-lint`](https://github.com/golangci/golangci-lint), do:
+```bash
+make lint
+```
+
+If it reports an issue and you think that the warning needs to be disregarded or is a false-positive, you can add a special comment `//nolint:linter1[,linter2,...]` before the offending line. Use this sparingly though, fixing the code to comply with the linter's recommendation is in general the preferred course of action. See [this section of the golangci-lint documentation](https://golangci-lint.run/usage/false-positives/#nolint-directive) for more information.
+
+All our issues are regularly tagged so that you can also filter down the issues involving the components you want to work on. For our labeling policy refer [the wiki page](https://github.com/prometheus/prometheus/wiki/Label-Names-and-Descriptions).
+
+## Pull Request Checklist
+
+* Branch from the main branch and, if needed, rebase to the current main branch before submitting your pull request. If it doesn't merge cleanly with main you may be asked to rebase your changes.
+
+* Commits should be as small as possible, while ensuring that each commit is correct independently (i.e., each commit should compile and pass tests).
+
+* The PR title should be of the format: `subsystem: what this PR does` (for example, `cpu: Add support for thing` or `docs: fix typo`).
+
+* If your patch is not getting reviewed or you need a specific person to review it, you can @-reply a reviewer asking for a review in the pull request or a comment.
+
+* Add tests relevant to the fixed bug or new feature.
+
+## Dependency management
+
+The Prometheus project uses [Go modules](https://golang.org/cmd/go/#hdr-Modules__module_versions__and_more) to manage dependencies on external packages.
+
+To add or update a new dependency, use the `go get` command:
+
+```bash
+# Pick the latest tagged release.
+go get example.com/some/module/pkg@latest
+
+# Pick a specific version.
+go get example.com/some/module/pkg@vX.Y.Z
+```
+
+Tidy up the `go.mod` and `go.sum` files:
+
+```bash
+# The GO111MODULE variable can be omitted when the code isn't located in GOPATH.
+GO111MODULE=on go mod tidy
+```
+
+You have to commit the changes to `go.mod` and `go.sum` before submitting the pull request.

LICENSE

@@ -1,6 +1,7 @@
 The MIT License (MIT)
 
 Copyright (c) 2016 Martin Lindhe
+Copyright (c) 2021 The Prometheus Authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,4 +1,4 @@
-# windows_exporter
+config.file# windows_exporter
 
 [![CI](https://github.com/prometheus-community/windows_exporter/actions/workflows/release.yml/badge.svg)](https://github.com/prometheus-community/windows_exporter)
 [![Linting](https://github.com/prometheus-community/windows_exporter/actions/workflows/lint.yml/badge.svg)](https://github.com/prometheus-community/windows_exporter)
@@ -33,7 +33,6 @@ Name     | Description | Enabled by default
 [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 | ✓
 [mscluster](docs/collector.mscluster.md) | MSCluster metrics |
 [msmq](docs/collector.msmq.md) | MSMQ queues |
@@ -42,7 +41,7 @@ Name     | Description | Enabled by default
 [net](docs/collector.net.md) | Network interface I/O | ✓
 [os](docs/collector.os.md) | OS metrics (memory, processes, users) | ✓
 [pagefile](docs/collector.pagefile.md) | pagefile metrics |
-[perfdata](docs/collector.perfdata.md) | Custom perfdata metrics |
+[performancecounter](docs/collector.performancecounter.md) | Custom performance counter metrics |
 [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 |
@@ -87,19 +86,19 @@ windows_exporter accepts flags to configure certain behaviours. The ones configu
 |--------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------|
 | `--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.                                                                                                                                                    |               |
+| `--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]`  |
 | `--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         |
 | `--log.file`                         | Output file of log messages. One of [stdout, stderr, eventlog, \<path to log file>]<br>**NOTE:** The MSI installer will add a default argument to the installed service setting this to eventlog | stderr        |
 
 ## Installation
 
 The latest release can be downloaded from the [releases page](https://github.com/prometheus-community/windows_exporter/releases).
 
+All binaries and installation packages are signed with an self-signed certificate. The public key can be found [here](https://github.com/prometheus-community/windows_exporter/blob/master/installer/codesign.cer).
+Once import into the trusted root certificate store, the binaries and installation packages will be trusted.
+
 Each release provides a .msi installer. The installer will setup the windows_exporter as a Windows service, as well as create an exception in the Windows Firewall.
 
 If the installer is run without any parameters, the exporter will run with default settings for enabled collectors, ports, etc.
@@ -125,6 +124,8 @@ The following parameters are available:
 | `EXTRA_FLAGS`        | Allows passing full CLI flags. Defaults to an empty string. For `--collectors.enabled` and `--config.file`, use the specialized properties  `ENABLED_COLLECTORS` and `CONFIG_FILE` |
 | `ADDLOCAL`           | Enables features within the windows_exporter installer. Supported values: `FirewallException`                                                                                      |
 | `REMOVE`             | Disables features within the windows_exporter installer. Supported values: `FirewallException`                                                                                     |
+| `APPLICATIONFOLDER`  | Directory to install windows_exporter. Defaults to `C:\Program Files\windows_exporter`                                                                                             |
+
 
 Parameters are sent to the installer via `msiexec`.
 On PowerShell, the `--%` should be passed before defining properties.
@@ -145,6 +146,11 @@ Define a config file.
 msiexec /i <path-to-msi-file> --% CONFIG_FILE="D:\config.yaml"
 ```
 
+Alternative install directory
+```powershell
+msiexec /i <path-to-msi-file> --% ADDLOCAL=FirewallException APPLICATIONFOLDER="F:\Program Files\windows_exporter"
+```
+
 On some older versions of Windows,
 you may need to surround parameter values with double quotes to get the installation command parsing properly:
 ```powershell
@@ -170,7 +176,7 @@ The windows_exporter can be run as a Docker container. The Docker image is avail
 
 * [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` -->
+* [quay.io Registry](https://quay.io/repository/prometheuscommunity/windows-exporter): `quay.io/prometheuscommunity/windows-exporter`
 
 ### Tags
 
@@ -199,6 +205,14 @@ Windows Server 2012 and 2012R2 are supported as best-effort only, but not guaran
 
 The prometheus metrics will be exposed on [localhost:9182](http://localhost:9182)
 
+### HTTP Endpoints
+
+windows_exporter provides the following HTTP endpoints:
+
+* `/metrics`: Exposes metrics in the [Prometheus text format](https://prometheus.io/docs/instrumenting/exposition_formats/).
+* `/health`: Returns 200 OK when the exporter is running.
+* `/debug/pprof/`: Exposes the [pprof](https://golang.org/pkg/net/http/pprof/) endpoints. Only, if `--debug.enabled` is set.
+
 ## Examples
 
 ### Enable only service collector and specify a custom query

cmd/windows_exporter/0_service.go

@@ -0,0 +1,213 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package main
+
+import (
+	"errors"
+	"fmt"
+	"os"
+	"strings"
+	"unsafe"
+
+	"golang.org/x/sys/windows"
+	"golang.org/x/sys/windows/svc"
+	"golang.org/x/sys/windows/svc/eventlog"
+)
+
+const serviceName = "windows_exporter"
+
+//nolint:gochecknoglobals
+var (
+	// exitCodeCh is a channel to send an exit code from the main function to the service manager.
+	// Additionally, if there is an error in the IsService var declaration,
+	// the exit code is sent to the service manager as well.
+	exitCodeCh = make(chan int, 1)
+
+	// stopCh is a channel to send a signal to the service manager that the service is stopping.
+	stopCh = make(chan struct{})
+
+	// serviceManagerFinishedCh is a channel to send a signal to the main function that the service manager has stopped the service.
+	serviceManagerFinishedCh = make(chan struct{}, 1)
+)
+
+// IsService variable declaration allows initiating time-sensitive components like registering the Windows service
+// as early as possible in the startup process.
+// init functions are called in the order they are declared, so this package should be imported first.
+//
+// Ref: https://github.com/prometheus-community/windows_exporter/issues/551#issuecomment-1220774835
+//
+// Declare imports on this package should be avoided where possible.
+// var declaration run before init function, so it guarantees that windows_exporter respond to service manager early
+// and avoid timeout.
+// The order of the var declaration and init functions depends on the filename as well. The filename should be 0_service.go
+// Ref: https://medium.com/@markbates/go-init-order-dafa89fcef22
+//
+//nolint:gochecknoglobals
+var IsService = func() bool {
+	var err error
+
+	isService, err := isWindowsService()
+	if err != nil {
+		logToFile(fmt.Sprintf("failed to detect service: %v", err))
+
+		return false
+	}
+
+	if !isService {
+		return false
+	}
+
+	defer func() {
+		go func() {
+			err := svc.Run(serviceName, &windowsExporterService{})
+			if err != nil {
+				// https://github.com/open-telemetry/opentelemetry-collector/pull/9042
+				if !errors.Is(err, windows.ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) {
+					if logErr := logToEventToLog(windows.EVENTLOG_ERROR_TYPE, fmt.Sprintf("failed to start service: %v", err)); logErr != nil {
+						logToFile(fmt.Sprintf("failed to start service: %v", err))
+					}
+				}
+			}
+
+			serviceManagerFinishedCh <- struct{}{}
+		}()
+	}()
+
+	if err := logToEventToLog(windows.EVENTLOG_INFORMATION_TYPE, "attempting to start exporter service"); err != nil {
+		logToFile(fmt.Sprintf("failed sent log to event log: %v", err))
+
+		exitCodeCh <- 2
+	}
+
+	return true
+}()
+
+type windowsExporterService struct{}
+
+// Execute is the entry point for the Windows service manager.
+func (s *windowsExporterService) Execute(_ []string, r <-chan svc.ChangeRequest, changes chan<- svc.Status) (bool, uint32) {
+	changes <- svc.Status{State: svc.StartPending}
+	changes <- svc.Status{State: svc.Running, Accepts: svc.AcceptStop | svc.AcceptShutdown}
+
+	for {
+		select {
+		case exitCodeCh := <-exitCodeCh:
+			// Stop the service if an exit code from the main function is received.
+			changes <- svc.Status{State: svc.StopPending}
+
+			return true, uint32(exitCodeCh)
+		case c := <-r:
+			// Handle the service control request.
+			switch c.Cmd {
+			case svc.Interrogate:
+				changes <- c.CurrentStatus
+			case svc.Stop, svc.Shutdown:
+				// Stop the service if a stop or shutdown request is received.
+				_ = logToEventToLog(windows.EVENTLOG_INFORMATION_TYPE, "service stop received")
+
+				changes <- svc.Status{State: svc.StopPending}
+
+				// Send a signal to the main function to stop the service.
+				stopCh <- struct{}{}
+
+				// Wait for the main function to stop the service.
+				return false, uint32(<-exitCodeCh)
+			default:
+				_ = logToEventToLog(windows.EVENTLOG_ERROR_TYPE, fmt.Sprintf("unexpected control request #%d", c))
+			}
+		}
+	}
+}
+
+// logToEventToLog logs a message to the Windows event log.
+func logToEventToLog(eType uint16, msg string) error {
+	eventLog, err := eventlog.Open(serviceName)
+	if err != nil {
+		return fmt.Errorf("failed to open event log: %w", err)
+	}
+	defer func(eventLog *eventlog.Log) {
+		_ = eventLog.Close()
+	}(eventLog)
+
+	switch eType {
+	case windows.EVENTLOG_ERROR_TYPE:
+		err = eventLog.Error(102, msg)
+	case windows.EVENTLOG_WARNING_TYPE:
+		err = eventLog.Warning(101, msg)
+	case windows.EVENTLOG_INFORMATION_TYPE:
+		err = eventLog.Info(100, msg)
+	}
+
+	if err != nil {
+		return fmt.Errorf("error report event: %w", err)
+	}
+
+	return nil
+}
+
+func logToFile(msg string) {
+	if file, err := os.CreateTemp("", "windows_exporter.service.error.log"); err == nil {
+		_, _ = file.WriteString(msg)
+		_ = file.Close()
+	}
+}
+
+// isWindowsService is a clone of "golang.org/x/sys/windows/svc:IsWindowsService", but with a fix
+// for Windows containers.
+// Go cloned the .NET implementation of this function, which has since
+// been patched to support Windows containers, which don't use Session ID 0 for services.
+// https://github.com/dotnet/runtime/pull/74188
+// This function can be replaced with go's once go brings in the fix.
+//
+// Copyright 2023-present Datadog, Inc.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// https://github.com/DataDog/datadog-agent/blob/46740e82ef40a04c4be545ed8c16a4b0d1f046cf/pkg/util/winutil/servicemain/servicemain.go#L128
+func isWindowsService() (bool, error) {
+	var currentProcess windows.PROCESS_BASIC_INFORMATION
+	infoSize := uint32(unsafe.Sizeof(currentProcess))
+
+	err := windows.NtQueryInformationProcess(windows.CurrentProcess(), windows.ProcessBasicInformation, unsafe.Pointer(&currentProcess), infoSize, &infoSize)
+	if err != nil {
+		return false, err
+	}
+
+	var parentProcess *windows.SYSTEM_PROCESS_INFORMATION
+
+	for infoSize = uint32((unsafe.Sizeof(*parentProcess) + unsafe.Sizeof(uintptr(0))) * 1024); ; {
+		parentProcess = (*windows.SYSTEM_PROCESS_INFORMATION)(unsafe.Pointer(&make([]byte, infoSize)[0]))
+
+		err = windows.NtQuerySystemInformation(windows.SystemProcessInformation, unsafe.Pointer(parentProcess), infoSize, &infoSize)
+		if err == nil {
+			break
+		} else if !errors.Is(err, windows.STATUS_INFO_LENGTH_MISMATCH) {
+			return false, err
+		}
+	}
+
+	for ; ; parentProcess = (*windows.SYSTEM_PROCESS_INFORMATION)(unsafe.Pointer(uintptr(unsafe.Pointer(parentProcess)) + uintptr(parentProcess.NextEntryOffset))) {
+		if parentProcess.UniqueProcessID == currentProcess.InheritedFromUniqueProcessId {
+			return strings.EqualFold("services.exe", parentProcess.ImageName.String()), nil
+		}
+
+		if parentProcess.NextEntryOffset == 0 {
+			break
+		}
+	}
+
+	return false, nil
+}

cmd/windows_exporter/doc.go

@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/*
+The main package for the windows_exporter executable.
+
+usage: windows_exporter [<flags>]
+
+A metrics collector for Windows.
+*/
+package main

cmd/windows_exporter/main.go

@@ -1,15 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 //go:generate go run github.com/tc-hib/go-winres@v0.3.3 make --product-version=git-tag --file-version=git-tag --arch=amd64,arm64
 
 package main
 
-//goland:noinspection GoUnsortedImport
-//nolint:gofumpt
 import (
-	// Its important that we do these first so that we can register with the Windows service control ASAP to avoid timeouts.
-	"github.com/prometheus-community/windows_exporter/internal/windowsservice"
-
 	"context"
 	"errors"
 	"fmt"
@@ -20,6 +30,7 @@ import (
 	"os/signal"
 	"os/user"
 	"runtime"
+	"runtime/debug"
 	"slices"
 	"strings"
 	"time"
@@ -29,6 +40,7 @@ import (
 	"github.com/prometheus-community/windows_exporter/internal/httphandler"
 	"github.com/prometheus-community/windows_exporter/internal/log"
 	"github.com/prometheus-community/windows_exporter/internal/log/flag"
+	"github.com/prometheus-community/windows_exporter/internal/utils"
 	"github.com/prometheus-community/windows_exporter/pkg/collector"
 	"github.com/prometheus/common/version"
 	"github.com/prometheus/exporter-toolkit/web"
@@ -37,20 +49,26 @@ import (
 )
 
 func main() {
-	exitCode := run()
+	ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, os.Kill)
+
+	exitCode := run(ctx, os.Args[1:])
+
+	stop()
 
 	// If we are running as a service, we need to signal the service control manager that we are done.
-	if !windowsservice.IsService {
+	if !IsService {
 		os.Exit(exitCode)
 	}
 
-	windowsservice.ExitCodeCh <- exitCode
+	exitCodeCh <- exitCode
 
 	// Wait for the service control manager to signal that we are done.
-	<-windowsservice.StopCh
+	<-serviceManagerFinishedCh
 }
 
-func run() int {
+func run(ctx context.Context, args []string) int {
+	startTime := time.Now()
+
 	app := kingpin.New("windows_exporter", "A metrics collector for Windows.")
 
 	var (
@@ -58,10 +76,6 @@ func run() int {
 			"config.file",
 			"YAML configuration file to use. Values set in this file will be overridden by CLI flags.",
 		).String()
-		insecureSkipVerify = app.Flag(
-			"config.file.insecure-skip-verify",
-			"Skip TLS verification in loading YAML configuration.",
-		).Default("false").Bool()
 		webConfig   = webflag.AddFlags(app, ":9182")
 		metricsPath = app.Flag(
 			"telemetry.path",
@@ -71,10 +85,6 @@ func run() int {
 			"web.disable-exporter-metrics",
 			"Exclude metrics about the exporter itself (promhttp_*, process_*, go_*).",
 		).Bool()
-		maxRequests = app.Flag(
-			"telemetry.max-requests",
-			"Maximum number of concurrent requests. 0 to disable.",
-		).Default("5").Int()
 		enabledCollectors = app.Flag(
 			"collectors.enabled",
 			"Comma-separated list of collectors to use. Use '[defaults]' as a placeholder for all the collectors enabled by default.").
@@ -91,9 +101,20 @@ func run() int {
 			"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()
+		memoryLimit = app.Flag(
+			"process.memory-limit",
+			"Limit memory usage in bytes. This is a soft-limit and not guaranteed. 0 means no limit. Read more at https://pkg.go.dev/runtime/debug#SetMemoryLimit .",
+		).Default("200000000").Int64()
 	)
 
-	logConfig := &log.Config{}
+	logFile := &log.AllowedFile{}
+
+	_ = logFile.Set("stdout")
+	if IsService {
+		_ = logFile.Set("eventlog")
+	}
+
+	logConfig := &log.Config{File: logFile}
 	flag.AddFlags(app, logConfig)
 
 	app.Version(version.Print("windows_exporter"))
@@ -102,74 +123,34 @@ func run() int {
 	// Initialize collectors before loading and parsing CLI arguments
 	collectors := collector.NewWithFlags(app)
 
-	// Load values from configuration file(s). Executable flags must first be parsed, in order
-	// to load the specified file(s).
-	if _, err := app.Parse(os.Args[1:]); err != nil {
+	if err := config.Parse(app, args); err != nil {
 		//nolint:sloglint // we do not have an logger yet
-		slog.Error("Failed to parse CLI args",
+		slog.LogAttrs(ctx, slog.LevelError, "Failed to load configuration",
 			slog.Any("err", err),
 		)
 
 		return 1
 	}
 
+	debug.SetMemoryLimit(*memoryLimit)
+
 	logger, err := log.New(logConfig)
 	if err != nil {
-		//nolint:sloglint // we do not have an logger yet
-		slog.Error("failed to create logger",
+		logger.LogAttrs(ctx, slog.LevelError, "failed to create logger",
 			slog.Any("err", err),
 		)
 
 		return 1
 	}
 
-	if *configFile != "" {
-		resolver, err := config.NewResolver(*configFile, logger, *insecureSkipVerify)
-		if err != nil {
-			logger.Error("could not load config file",
-				slog.Any("err", err),
-			)
+	logger.LogAttrs(ctx, slog.LevelDebug, "logging has Started")
 
-			return 1
-		}
-
-		if err = resolver.Bind(app, os.Args[1:]); err != nil {
-			logger.Error("Failed to bind configuration",
-				slog.Any("err", err),
-			)
-
-			return 1
-		}
-
-		// NOTE: This is temporary fix for issue #1092, calling kingpin.Parse
-		// twice makes slices flags duplicate its value, this clean up
-		// the first parse before the second call.
-		*webConfig.WebListenAddresses = (*webConfig.WebListenAddresses)[1:]
-
-		// Parse flags once more to include those discovered in configuration file(s).
-		if _, err = app.Parse(os.Args[1:]); err != nil {
-			logger.Error("Failed to parse CLI args from YAML file",
-				slog.Any("err", err),
-			)
-
-			return 1
-		}
-
-		logger, err = log.New(logConfig)
-		if err != nil {
-			//nolint:sloglint // we do not have an logger yet
-			slog.Error("failed to create logger",
-				slog.Any("err", err),
-			)
-
-			return 1
-		}
+	if configFile != nil && *configFile != "" {
+		logger.LogAttrs(ctx, slog.LevelInfo, "using configuration file: "+*configFile)
 	}
 
-	logger.Debug("Logging has Started")
-
-	if err = setPriorityWindows(logger, os.Getpid(), *processPriority); err != nil {
-		logger.Error("failed to set process priority",
+	if err = setPriorityWindows(ctx, logger, os.Getpid(), *processPriority); err != nil {
+		logger.LogAttrs(ctx, slog.LevelError, "failed to set process priority",
 			slog.Any("err", err),
 		)
 
@@ -178,7 +159,7 @@ func run() int {
 
 	enabledCollectorList := expandEnabledCollectors(*enabledCollectors)
 	if err := collectors.Enable(enabledCollectorList); err != nil {
-		logger.Error("Couldn't enable collectors",
+		logger.LogAttrs(ctx, slog.LevelError, "couldn't enable collectors",
 			slog.Any("err", err),
 		)
 
@@ -186,17 +167,19 @@ func run() int {
 	}
 
 	// Initialize collectors before loading
-	if err = collectors.Build(logger); err != nil {
-		logger.Error("Couldn't load collectors",
-			slog.Any("err", err),
-		)
+	if err = collectors.Build(ctx, logger); err != nil {
+		for _, err := range utils.SplitError(err) {
+			logger.LogAttrs(ctx, slog.LevelError, "couldn't initialize collector",
+				slog.Any("err", err),
+			)
 
-		return 1
+			return 1
+		}
 	}
 
-	logCurrentUser(logger)
+	logCurrentUser(ctx, logger)
 
-	logger.Info("Enabled collectors: " + strings.Join(enabledCollectorList, ", "))
+	logger.InfoContext(ctx, "Enabled collectors: "+strings.Join(enabledCollectorList, ", "))
 
 	mux := http.NewServeMux()
 	mux.Handle("GET /health", httphandler.NewHealthHandler())
@@ -204,7 +187,6 @@ func run() int {
 	mux.Handle("GET "+*metricsPath, httphandler.New(logger, collectors, &httphandler.Options{
 		DisableExporterMetrics: *disableExporterMetrics,
 		TimeoutMargin:          *timeoutMargin,
-		MaxRequests:            *maxRequests,
 	}))
 
 	if *debugEnabled {
@@ -215,7 +197,7 @@ func run() int {
 		mux.HandleFunc("GET /debug/pprof/trace", pprof.Trace)
 	}
 
-	logger.Info("Starting windows_exporter",
+	logger.LogAttrs(ctx, slog.LevelInfo, fmt.Sprintf("starting windows_exporter in %s", time.Since(startTime)),
 		slog.String("version", version.Version),
 		slog.String("branch", version.Branch),
 		slog.String("revision", version.GetRevision()),
@@ -242,17 +224,14 @@ func run() int {
 		close(errCh)
 	}()
 
-	ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, os.Kill)
-	defer stop()
-
 	select {
 	case <-ctx.Done():
-		logger.Info("Shutting down windows_exporter via kill signal")
-	case <-windowsservice.StopCh:
-		logger.Info("Shutting down windows_exporter via service control")
+		logger.LogAttrs(ctx, slog.LevelInfo, "Shutting down windows_exporter via kill signal")
+	case <-stopCh:
+		logger.LogAttrs(ctx, slog.LevelInfo, "Shutting down windows_exporter via service control")
 	case err := <-errCh:
 		if err != nil {
-			logger.Error("Failed to start windows_exporter",
+			logger.LogAttrs(ctx, slog.LevelError, "Failed to start windows_exporter",
 				slog.Any("err", err),
 			)
 
@@ -263,32 +242,39 @@ func run() int {
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 
-	_ = server.Shutdown(ctx)
-
-	logger.Info("windows_exporter has shut down")
+	//nolint:contextcheck // create a new context for server shutdown
+	if err = server.Shutdown(ctx); err != nil {
+		//nolint:contextcheck
+		logger.LogAttrs(ctx, slog.LevelError, "Failed to shutdown windows_exporter",
+			slog.Any("err", err),
+		)
+	} else {
+		//nolint:contextcheck
+		logger.LogAttrs(ctx, slog.LevelInfo, "windows_exporter has shut down")
+	}
 
 	return 0
 }
 
-func logCurrentUser(logger *slog.Logger) {
+func logCurrentUser(ctx context.Context, logger *slog.Logger) {
 	u, err := user.Current()
 	if err != nil {
-		logger.Warn("Unable to determine which user is running this exporter. More info: https://github.com/golang/go/issues/37348",
+		logger.LogAttrs(ctx, slog.LevelWarn, "Unable to determine which user is running this exporter. More info: https://github.com/golang/go/issues/37348",
 			slog.Any("err", err),
 		)
 
 		return
 	}
 
-	logger.Info("Running as " + u.Username)
+	logger.LogAttrs(ctx, slog.LevelInfo, "Running as "+u.Username)
 
 	if strings.Contains(u.Username, "ContainerAdministrator") || strings.Contains(u.Username, "ContainerUser") {
-		logger.Warn("Running as a preconfigured Windows Container user. This may mean you do not have Windows HostProcess containers configured correctly and some functionality will not work as expected.")
+		logger.LogAttrs(ctx, slog.LevelWarn, "Running as a preconfigured Windows Container user. This may mean you do not have Windows HostProcess containers configured correctly and some functionality will not work as expected.")
 	}
 }
 
 // setPriorityWindows sets the priority of the current process to the specified value.
-func setPriorityWindows(logger *slog.Logger, pid int, priority string) error {
+func setPriorityWindows(ctx context.Context, logger *slog.Logger, pid int, priority string) error {
 	// Mapping of priority names to uin32 values required by windows.SetPriorityClass.
 	priorityStringToInt := map[string]uint32{
 		"realtime":    windows.REALTIME_PRIORITY_CLASS,
@@ -302,11 +288,11 @@ func setPriorityWindows(logger *slog.Logger, pid int, priority string) error {
 	winPriority, ok := priorityStringToInt[priority]
 
 	// Only set process priority if a non-default and valid value has been set
-	if !ok || winPriority != windows.NORMAL_PRIORITY_CLASS {
+	if !ok || winPriority == windows.NORMAL_PRIORITY_CLASS {
 		return nil
 	}
 
-	logger.Debug("setting process priority to " + priority)
+	logger.LogAttrs(ctx, slog.LevelDebug, "setting process priority to "+priority)
 
 	// https://learn.microsoft.com/en-us/windows/win32/procthread/process-security-and-access-rights
 	handle, err := windows.OpenProcess(

cmd/windows_exporter/main_test.go

@@ -0,0 +1,190 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package main
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"io"
+	"net"
+	"net/http"
+	"net/url"
+	"os"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+	"golang.org/x/sys/windows"
+)
+
+//nolint:tparallel
+func TestRun(t *testing.T) {
+	t.Parallel()
+
+	for _, tc := range []struct {
+		name            string
+		args            []string
+		config          string
+		metricsEndpoint string
+		exitCode        int
+	}{
+		{
+			name:            "default",
+			args:            []string{},
+			metricsEndpoint: "http://127.0.0.1:9182/metrics",
+		},
+		{
+			name:            "web.listen-address",
+			args:            []string{"--web.listen-address=127.0.0.1:8080"},
+			metricsEndpoint: "http://127.0.0.1:8080/metrics",
+		},
+		{
+			name:            "web.listen-address",
+			args:            []string{"--web.listen-address=127.0.0.1:8081", "--web.listen-address=[::1]:8081"},
+			metricsEndpoint: "http://[::1]:8081/metrics",
+		},
+		{
+			name:            "config",
+			args:            []string{"--config.file=config.yaml"},
+			config:          `{"web":{"listen-address":"127.0.0.1:8082"}}`,
+			metricsEndpoint: "http://127.0.0.1:8082/metrics",
+		},
+		{
+			name:            "web.listen-address with config",
+			args:            []string{"--config.file=config.yaml", "--web.listen-address=127.0.0.1:8084"},
+			config:          `{"web":{"listen-address":"127.0.0.1:8083"}}`,
+			metricsEndpoint: "http://127.0.0.1:8084/metrics",
+		},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			ctx, cancel := context.WithCancel(t.Context())
+			defer cancel()
+
+			if tc.config != "" {
+				// Create a temporary config file.
+				tmpfile, err := os.CreateTemp(t.TempDir(), "config-*.yaml")
+				require.NoError(t, err)
+
+				t.Cleanup(func() {
+					require.NoError(t, tmpfile.Close())
+				})
+
+				_, err = tmpfile.WriteString(tc.config)
+				require.NoError(t, err)
+
+				for i, arg := range tc.args {
+					tc.args[i] = strings.ReplaceAll(arg, "config.yaml", tmpfile.Name())
+				}
+			}
+
+			exitCodeCh := make(chan int)
+
+			var stdout string
+
+			go func() {
+				stdout = captureOutput(t, func() {
+					// Simulate the service control manager signaling that we are done.
+					exitCodeCh <- run(ctx, tc.args)
+				})
+			}()
+
+			t.Cleanup(func() {
+				select {
+				case exitCode := <-exitCodeCh:
+					require.Equal(t, tc.exitCode, exitCode)
+				case <-time.After(2 * time.Second):
+					t.Fatalf("timed out waiting for exit code, want %d", tc.exitCode)
+				}
+			})
+
+			if tc.exitCode != 0 {
+				return
+			}
+
+			uri, err := url.Parse(tc.metricsEndpoint)
+			require.NoError(t, err)
+
+			err = waitUntilListening(t, "tcp", uri.Host)
+			require.NoError(t, err, "LOGS:\n%s", stdout)
+
+			req, err := http.NewRequestWithContext(ctx, http.MethodGet, tc.metricsEndpoint, nil)
+			require.NoError(t, err)
+
+			resp, err := http.DefaultClient.Do(req)
+			require.NoError(t, err, "LOGS:\n%s", stdout)
+			require.Equal(t, http.StatusOK, resp.StatusCode)
+
+			body, err := io.ReadAll(resp.Body)
+			require.NoError(t, err)
+
+			err = resp.Body.Close()
+			require.NoError(t, err)
+
+			require.NotEmpty(t, body)
+			require.Contains(t, string(body), "# HELP windows_exporter_build_info")
+
+			cancel()
+		})
+	}
+}
+
+func captureOutput(tb testing.TB, f func()) string {
+	tb.Helper()
+
+	orig := os.Stdout
+	r, w, _ := os.Pipe()
+	os.Stdout = w
+
+	f()
+
+	os.Stdout = orig
+
+	_ = w.Close()
+
+	out, _ := io.ReadAll(r)
+
+	return string(out)
+}
+
+func waitUntilListening(tb testing.TB, network, address string) error {
+	tb.Helper()
+
+	var (
+		conn net.Conn
+		err  error
+	)
+
+	for range 10 {
+		conn, err = net.DialTimeout(network, address, 100*time.Millisecond)
+		if err == nil {
+			_ = conn.Close()
+
+			return nil
+		}
+
+		if errors.Is(err, windows.Errno(10061)) {
+			time.Sleep(50 * time.Millisecond)
+
+			continue
+		}
+	}
+
+	return fmt.Errorf("listener not listening: %w", err)
+}

cmd/windows_exporter/winres/winres.json

@@ -0,0 +1,56 @@
+{
+    "RT_GROUP_ICON": {
+        "APP": {
+            "0000": [
+                "icon.png"
+            ]
+        }
+    },
+    "RT_MANIFEST": {
+        "#1": {
+            "0409": {
+                "description": "A Prometheus exporter for Windows machines.",
+                "minimum-os": "win7",
+                "execution-level": "as invoker",
+                "ui-access": false,
+                "auto-elevate": false,
+                "dpi-awareness": "system",
+                "disable-theming": false,
+                "disable-window-filtering": false,
+                "high-resolution-scrolling-aware": false,
+                "ultra-high-resolution-scrolling-aware": false,
+                "long-path-aware": false,
+                "printer-driver-isolation": false,
+                "gdi-scaling": false,
+                "segment-heap": false,
+                "use-common-controls-v6": false
+            }
+        }
+    },
+    "RT_VERSION": {
+        "#1": {
+            "0000": {
+                "fixed": {
+                    "file_version": "0.0.0.0",
+                    "product_version": "0.0.0.0"
+                },
+                "info": {
+                    "0409": {
+                        "Comments": "",
+                        "CompanyName": "Prometheus Community",
+                        "FileDescription": "A Prometheus exporter for Windows machines.",
+                        "FileVersion": "",
+                        "InternalName": "windows_exporter",
+                        "LegalCopyright": "",
+                        "LegalTrademarks": "",
+                        "OriginalFilename": "",
+                        "PrivateBuild": "",
+                        "ProductName": "windows_exporter",
+                        "ProductVersion": "",
+                        "SpecialBuild": ""
+                    }
+                }
+            }
+        }
+    }
+}

config.yaml

@@ -1,9 +1,23 @@
 # example configuration file for windows_exporter
 
 collectors:
-  enabled: cpu,cpu_info,exchange,iis,logical_disk,logon,memory,net,os,process,remote_fx,service,system,tcp,time,terminal_services,textfile
+  enabled: cpu,cpu_info,exchange,iis,logical_disk,logon,memory,net,os,performancecounter,process,remote_fx,service,system,tcp,time,terminal_services,textfile
 collector:
   service:
     include: "windows_exporter"
+  performancecounter:
+    objects: |-
+      - name: photon_udp
+        object: "Photon Socket Server: UDP"
+        instances: ["*"]
+        counters:
+          - name: "UDP: Datagrams in"
+            metric: "photon_udp_datagrams"
+            labels:
+              direction: "in"
+          - name: "UDP: Datagrams out"
+            metric: "photon_udp_datagrams"
+            labels:
+              direction: "out"
 log:
   level: warn

docs/README.md

@@ -18,6 +18,7 @@ This directory contains documentation of the collectors in the windows_exporter,
 - [`fsrmquota`](collector.fsrmquota.md)
 - [`hyperv`](collector.hyperv.md)
 - [`iis`](collector.iis.md)
+- [`license`](collector.license.md)
 - [`logical_disk`](collector.logical_disk.md)
 - [`logon`](collector.logon.md)
 - [`memory`](collector.memory.md)
@@ -28,12 +29,16 @@ This directory contains documentation of the collectors in the windows_exporter,
 - [`netframework`](collector.netframework.md)
 - [`nps`](collector.nps.md)
 - [`os`](collector.os.md)
+- [`pagefile`](collector.pagefile.md)
+- [`performancecounter`](collector.performancecounter.md)
 - [`physical_disk`](collector.physical_disk.md)
+- [`printer`](collector.printer.md)
 - [`process`](collector.process.md)
 - [`remote_fx`](collector.remote_fx.md)
 - [`scheduled_task`](collector.scheduled_task.md)
 - [`service`](collector.service.md)
 - [`smb`](collector.smb.md)
+- [`smbclient`](collector.smbclient.md)
 - [`smtp`](collector.smtp.md)
 - [`system`](collector.system.md)
 - [`tcp`](collector.tcp.md)

docs/collector.dhcp.md

@@ -2,49 +2,177 @@
 
 The dhcp collector exposes DHCP Server metrics
 
-|||
--|-
-Metric name prefix  | `dhcp`
-Data source         | Perflib
-Classes             | `DHCP Server`
-Enabled by default? | No
+|                     |               |
+|---------------------|---------------|
+| Metric name prefix  | `dhcp`        |
+| Data source         | Perflib       |
+| Classes             | `DHCP Server` |
+| Enabled by default? | No            |
 
 ## Flags
 
-None
+### `--collector.dhcp.enabled`
+
+Comma-separated list of collectors to use. Defaults to all, if not specified.
 
 ## Metrics
 
-Name | Description | Type | Labels
------|-------------|------|-------
-`packets_received_total` | Total number of packets received by the DHCP server | counter | None
-`duplicates_dropped_total` | Total number of duplicate packets received by the DHCP server | counter | None
-`packets_expired_total` | Total number of packets expired in the DHCP server message queue | counter | None
-`active_queue_length` | Number of packets in the processing queue of the DHCP server | gauge | None
-`conflict_check_queue_length` | Number of packets in the DHCP server queue waiting on conflict detection (ping) | gauge | None
-`discovers_total` | Total DHCP Discovers received by the DHCP server | counter | None
-`offers_total` | Total DHCP Offers sent by the DHCP server | counter | None
-`requests_total` | Total DHCP Requests received by the DHCP server | counter | None
-`informs_total` | Total DHCP Informs received by the DHCP server | counter | None
-`acks_total` | Total DHCP Acks sent by the DHCP server | counter | None
-`nacks_total` | Total DHCP Nacks sent by the DHCP server | counter | None
-`declines_total` | Total DHCP Declines received by the DHCP server | counter | None
-`releases_total` | Total DHCP Releases received by the DHCP server | counter | None
-`offer_queue_length` | Number of packets in the offer queue of the DHCP server | gauge | None
-`denied_due_to_match_total` | Total number of DHCP requests denied, based on matches from the Deny List | gauge | None
-`denied_due_to_nonmatch_total` | Total number of DHCP requests denied, based on non-matches from the Allow List | gauge | None
-`failover_bndupd_sent_total` | Number of DHCP failover Binding Update messages sent | counter | None
-`failover_bndupd_received_total` | Number of DHCP failover Binding Update messages received | counter | None
-`failover_bndack_sent_total` | Number of DHCP failover Binding Ack messages sent | counter | None
-`failover_bndack_received_total` | Number of DHCP failover Binding Ack messages received | counter | None
-`failover_bndupd_pending_in_outbound_queue` | Number of pending outbound DHCP failover Binding Update messages | counter | None
-`failover_transitions_communicationinterrupted_state_total` | Total number of transitions into COMMUNICATION INTERRUPTED state | counter | None
-`failover_transitions_partnerdown_state_total` | Total number of transitions into PARTNER DOWN state | counter | None
-`failover_transitions_recover_total` | Total number of transitions into RECOVER state | counter | None
-`failover_bndupd_dropped_total` | Total number of DHCP faileover Binding Updates dropped | counter | None
+| Name                                                                     | Description                                                                    | Type    | Labels                                              |
+|--------------------------------------------------------------------------|--------------------------------------------------------------------------------|---------|-----------------------------------------------------|
+| `windows_dhcp_ack_total`                                                 | Total DHCP Acks sent by the DHCP server                                        | counter | None                                                |
+| `windows_dhcp_denied_due_to_match_total`                                 | Total number of DHCP requests denied, based on matches from the Deny List      | gauge   | None                                                |
+| `windows_dhcp_denied_due_to_nonmatch_total`                              | Total number of DHCP requests denied, based on non-matches from the Allow List | gauge   | None                                                |
+| `windows_dhcp_declines_total`                                            | Total DHCP Declines received by the DHCP server                                | counter | None                                                |
+| `windows_dhcp_discovers_total`                                           | Total DHCP Discovers received by the DHCP server                               | counter | None                                                |
+| `windows_dhcp_failover_bndack_received_total`                            | Number of DHCP failover Binding Ack messages received                          | counter | None                                                |
+| `windows_dhcp_failover_bndack_sent_total`                                | Number of DHCP failover Binding Ack messages sent                              | counter | None                                                |
+| `windows_dhcp_failover_bndupd_dropped_total`                             | Total number of DHCP failover Binding Updates dropped                          | counter | None                                                |
+| `windows_dhcp_failover_bndupd_received_total`                            | Number of DHCP failover Binding Update messages received                       | counter | None                                                |
+| `windows_dhcp_failover_bndupd_sent_total`                                | Number of DHCP failover Binding Update messages sent                           | counter | None                                                |
+| `windows_dhcp_failover_bndupd_pending_in_outbound_queue`                 | Number of pending outbound DHCP failover Binding Update messages               | counter | None                                                |
+| `windows_dhcp_failover_transitions_communicationinterrupted_state_total` | Total number of transitions into COMMUNICATION INTERRUPTED state               | counter | None                                                |
+| `windows_dhcp_failover_transitions_partnerdown_state_total`              | Total number of transitions into PARTNER DOWN state                            | counter | None                                                |
+| `windows_dhcp_failover_transitions_recover_total`                        | Total number of transitions into RECOVER state                                 | counter | None                                                |
+| `windows_dhcp_informs_total`                                             | Total DHCP Informs received by the DHCP server                                 | counter | None                                                |
+| `windows_dhcp_nacks_total`                                               | Total DHCP Nacks sent by the DHCP server                                       | counter | None                                                |
+| `windows_dhcp_offers_total`                                              | Total DHCP Offers sent by the DHCP server                                      | counter | None                                                |
+| `windows_dhcp_packets_expired_total`                                     | Total number of packets expired in the DHCP server message queue               | counter | None                                                |
+| `windows_dhcp_packets_received_total`                                    | Total number of packets received by the DHCP server                            | counter | None                                                |
+| `windows_dhcp_pending_offers_total`                                      | Total number of pending offers in the DHCP server                              | counter | None                                                |
+| `windows_dhcp_releases_total`                                            | Total DHCP Releases received by the DHCP server                                | counter | None                                                |
+| `windows_dhcp_requests_total`                                            | Total DHCP Requests received by the DHCP server                                | counter | None                                                |
+| `windows_dhcp_scope_addresses_free_on_this_server`                       | DHCP Scope free addresses on this server                                       | gauge   | `scope`                                             |
+| `windows_dhcp_scope_addresses_free_on_partner_server`                    | DHCP Scope free addresses on partner server                                    | gauge   | `scope`                                             |
+| `windows_dhcp_scope_addresses_free`                                      | DHCP Scope free addresses                                                      | gauge   | `scope`                                             |
+| `windows_dhcp_scope_addresses_in_use_on_this_server`                     | DHCP Scope addresses in use on this server                                     | gauge   | `scope`                                             |
+| `windows_dhcp_scope_addresses_in_use_on_partner_server`                  | DHCP Scope addresses in use on partner server                                  | gauge   | `scope`                                             |
+| `windows_dhcp_scope_addresses_in_use`                                    | DHCP Scope addresses in use                                                    | gauge   | `scope`                                             |
+| `windows_dhcp_scope_info`                                                | DHCP Scope information                                                         | gauge   | `name`, `superscope_name`, `superscope_id`, `scope` |
+| `windows_dhcp_scope_pending_offers`                                      | DHCP Scope pending offers                                                      | gauge   | `scope`                                             |
+| `windows_dhcp_scope_reserved_address`                                    | DHCP Scope reserved addresses                                                  | gauge   | `scope`                                             |
+| `windows_dhcp_scope_state`                                               | DHCP Scope state                                                               | gauge   | `scope`, `state`                                    |
+
 
 ### Example metric
-_This collector does not yet have explained examples, we would appreciate your help adding them!_
+```
+# HELP windows_dhcp_acks_total Total DHCP Acks sent by the DHCP server (AcksTotal)
+# TYPE windows_dhcp_acks_total counter
+windows_dhcp_acks_total 0
+# HELP windows_dhcp_active_queue_length Number of packets in the processing queue of the DHCP server (ActiveQueueLength)
+# TYPE windows_dhcp_active_queue_length gauge
+windows_dhcp_active_queue_length 0
+# HELP windows_dhcp_conflict_check_queue_length Number of packets in the DHCP server queue waiting on conflict detection (ping). (ConflictCheckQueueLength)
+# TYPE windows_dhcp_conflict_check_queue_length gauge
+windows_dhcp_conflict_check_queue_length 0
+# HELP windows_dhcp_declines_total Total DHCP Declines received by the DHCP server (DeclinesTotal)
+# TYPE windows_dhcp_declines_total counter
+windows_dhcp_declines_total 0
+# HELP windows_dhcp_denied_due_to_match_total Total number of DHCP requests denied, based on matches from the Deny list (DeniedDueToMatch)
+# TYPE windows_dhcp_denied_due_to_match_total counter
+windows_dhcp_denied_due_to_match_total 0
+# HELP windows_dhcp_denied_due_to_nonmatch_total Total number of DHCP requests denied, based on non-matches from the Allow list (DeniedDueToNonMatch)
+# TYPE windows_dhcp_denied_due_to_nonmatch_total counter
+windows_dhcp_denied_due_to_nonmatch_total 0
+# HELP windows_dhcp_discovers_total Total DHCP Discovers received by the DHCP server (DiscoversTotal)
+# TYPE windows_dhcp_discovers_total counter
+windows_dhcp_discovers_total 0
+# HELP windows_dhcp_duplicates_dropped_total Total number of duplicate packets received by the DHCP server (DuplicatesDroppedTotal)
+# TYPE windows_dhcp_duplicates_dropped_total counter
+windows_dhcp_duplicates_dropped_total 0
+# HELP windows_dhcp_failover_bndack_received_total Number of DHCP fail over Binding Ack messages received (FailoverBndackReceivedTotal)
+# TYPE windows_dhcp_failover_bndack_received_total counter
+windows_dhcp_failover_bndack_received_total 0
+# HELP windows_dhcp_failover_bndack_sent_total Number of DHCP fail over Binding Ack messages sent (FailoverBndackSentTotal)
+# TYPE windows_dhcp_failover_bndack_sent_total counter
+windows_dhcp_failover_bndack_sent_total 0
+# HELP windows_dhcp_failover_bndupd_dropped_total Total number of DHCP fail over Binding Updates dropped (FailoverBndupdDropped)
+# TYPE windows_dhcp_failover_bndupd_dropped_total counter
+windows_dhcp_failover_bndupd_dropped_total 0
+# HELP windows_dhcp_failover_bndupd_pending_in_outbound_queue Number of pending outbound DHCP fail over Binding Update messages (FailoverBndupdPendingOutboundQueue)
+# TYPE windows_dhcp_failover_bndupd_pending_in_outbound_queue gauge
+windows_dhcp_failover_bndupd_pending_in_outbound_queue 0
+# HELP windows_dhcp_failover_bndupd_received_total Number of DHCP fail over Binding Update messages received (FailoverBndupdReceivedTotal)
+# TYPE windows_dhcp_failover_bndupd_received_total counter
+windows_dhcp_failover_bndupd_received_total 0
+# HELP windows_dhcp_failover_bndupd_sent_total Number of DHCP fail over Binding Update messages sent (FailoverBndupdSentTotal)
+# TYPE windows_dhcp_failover_bndupd_sent_total counter
+windows_dhcp_failover_bndupd_sent_total 0
+# HELP windows_dhcp_failover_transitions_communicationinterrupted_state_total Total number of transitions into COMMUNICATION INTERRUPTED state (FailoverTransitionsCommunicationinterruptedState)
+# TYPE windows_dhcp_failover_transitions_communicationinterrupted_state_total counter
+windows_dhcp_failover_transitions_communicationinterrupted_state_total 0
+# HELP windows_dhcp_failover_transitions_partnerdown_state_total Total number of transitions into PARTNER DOWN state (FailoverTransitionsPartnerdownState)
+# TYPE windows_dhcp_failover_transitions_partnerdown_state_total counter
+windows_dhcp_failover_transitions_partnerdown_state_total 0
+# HELP windows_dhcp_failover_transitions_recover_total Total number of transitions into RECOVER state (FailoverTransitionsRecoverState)
+# TYPE windows_dhcp_failover_transitions_recover_total counter
+windows_dhcp_failover_transitions_recover_total 0
+# HELP windows_dhcp_informs_total Total DHCP Informs received by the DHCP server (InformsTotal)
+# TYPE windows_dhcp_informs_total counter
+windows_dhcp_informs_total 0
+# HELP windows_dhcp_nacks_total Total DHCP Nacks sent by the DHCP server (NacksTotal)
+# TYPE windows_dhcp_nacks_total counter
+windows_dhcp_nacks_total 0
+# HELP windows_dhcp_offer_queue_length Number of packets in the offer queue of the DHCP server (OfferQueueLength)
+# TYPE windows_dhcp_offer_queue_length gauge
+windows_dhcp_offer_queue_length 0
+# HELP windows_dhcp_offers_total Total DHCP Offers sent by the DHCP server (OffersTotal)
+# TYPE windows_dhcp_offers_total counter
+windows_dhcp_offers_total 0
+# HELP windows_dhcp_packets_expired_total Total number of packets expired in the DHCP server message queue (PacketsExpiredTotal)
+# TYPE windows_dhcp_packets_expired_total counter
+windows_dhcp_packets_expired_total 0
+# HELP windows_dhcp_packets_received_total Total number of packets received by the DHCP server (PacketsReceivedTotal)
+# TYPE windows_dhcp_packets_received_total counter
+windows_dhcp_packets_received_total 0
+# HELP windows_dhcp_releases_total Total DHCP Releases received by the DHCP server (ReleasesTotal)
+# TYPE windows_dhcp_releases_total counter
+windows_dhcp_releases_total 0
+# HELP windows_dhcp_requests_total Total DHCP Requests received by the DHCP server (RequestsTotal)
+# TYPE windows_dhcp_requests_total counter
+windows_dhcp_requests_total 0
+# HELP windows_dhcp_scope_addresses_free_total DHCP Scope free addresses
+# TYPE windows_dhcp_scope_addresses_free_total gauge
+windows_dhcp_scope_addresses_free_total{scope="10.11.12.0/25"} 0
+windows_dhcp_scope_addresses_free_total{scope="172.16.0.0/24"} 0
+windows_dhcp_scope_addresses_free_total{scope="192.168.0.0/24"} 231
+# HELP windows_dhcp_scope_addresses_in_use_total DHCP Scope addresses in use
+# TYPE windows_dhcp_scope_addresses_in_use_total gauge
+windows_dhcp_scope_addresses_in_use_total{scope="10.11.12.0/25"} 0
+windows_dhcp_scope_addresses_in_use_total{scope="172.16.0.0/24"} 0
+windows_dhcp_scope_addresses_in_use_total{scope="192.168.0.0/24"} 0
+# HELP windows_dhcp_scope_info DHCP Scope information
+# TYPE windows_dhcp_scope_info gauge
+windows_dhcp_scope_info{name="SUBSUPERSCOPE",scope="172.16.0.0/24",superscope_id="2",superscope_name="SUPERSCOPE"} 1
+windows_dhcp_scope_info{name="TEST",scope="192.168.0.0/24",superscope_id="0",superscope_name=""} 1
+windows_dhcp_scope_info{name="TEST2",scope="10.11.12.0/25",superscope_id="2",superscope_name="SUPERSCOPE"} 1
+# HELP windows_dhcp_scope_pending_offers_total DHCP Scope pending offers
+# TYPE windows_dhcp_scope_pending_offers_total gauge
+windows_dhcp_scope_pending_offers_total{scope="10.11.12.0/25"} 0
+windows_dhcp_scope_pending_offers_total{scope="172.16.0.0/24"} 0
+windows_dhcp_scope_pending_offers_total{scope="192.168.0.0/24"} 0
+# HELP windows_dhcp_scope_reserved_address_total DHCP Scope reserved addresses
+# TYPE windows_dhcp_scope_reserved_address_total gauge
+windows_dhcp_scope_reserved_address_total{scope="10.11.12.0/25"} 0
+windows_dhcp_scope_reserved_address_total{scope="172.16.0.0/24"} 0
+windows_dhcp_scope_reserved_address_total{scope="192.168.0.0/24"} 2
+# HELP windows_dhcp_scope_state DHCP Scope state
+# TYPE windows_dhcp_scope_state gauge
+windows_dhcp_scope_state{scope="10.11.12.0/25",state="Disabled"} 1
+windows_dhcp_scope_state{scope="10.11.12.0/25",state="DisabledSwitched"} 0
+windows_dhcp_scope_state{scope="10.11.12.0/25",state="Enabled"} 0
+windows_dhcp_scope_state{scope="10.11.12.0/25",state="EnabledSwitched"} 0
+windows_dhcp_scope_state{scope="10.11.12.0/25",state="InvalidState"} 0
+windows_dhcp_scope_state{scope="172.16.0.0/24",state="Disabled"} 1
+windows_dhcp_scope_state{scope="172.16.0.0/24",state="DisabledSwitched"} 0
+windows_dhcp_scope_state{scope="172.16.0.0/24",state="Enabled"} 0
+windows_dhcp_scope_state{scope="172.16.0.0/24",state="EnabledSwitched"} 0
+windows_dhcp_scope_state{scope="172.16.0.0/24",state="InvalidState"} 0
+windows_dhcp_scope_state{scope="192.168.0.0/24",state="Disabled"} 0
+windows_dhcp_scope_state{scope="192.168.0.0/24",state="DisabledSwitched"} 0
+windows_dhcp_scope_state{scope="192.168.0.0/24",state="Enabled"} 1
+windows_dhcp_scope_state{scope="192.168.0.0/24",state="EnabledSwitched"} 0
+windows_dhcp_scope_state{scope="192.168.0.0/24",state="InvalidState"} 0
+```
 
 ## Useful queries
 _This collector does not yet have any useful queries added, we would appreciate your help adding them!_

docs/collector.dns.md

@@ -3,14 +3,19 @@
 The dns collector exposes metrics about the DNS server
 
 |||
--|-
-Metric name prefix  | `dns`
-Classes             | [`Win32_PerfRawData_DNS_DNS`](https://technet.microsoft.com/en-us/library/cc977686.aspx)
-Enabled by default? | No
+-|-|-
+Metric name prefix  | `dns` |
+Classes             | [`Win32_PerfRawData_DNS_DNS`](https://technet.microsoft.com/en-us/library/cc977686.aspx) |
+Enabled by default | Yes |
+Metric name prefix (error stats) | `windows_dns` |
+Classes             | [`MicrosoftDNS_Statistic`](https://learn.microsoft.com/en-us/windows/win32/dns/dns-wmi-provider-overview) |
+Enabled by default (error stats)? | Yes |
 
 ## Flags
 
-None
+Name | Description
+-----|------------
+`collector.dns.enabled` | Comma-separated list of collectors to use. Available collectors: `metrics`, `error_stats`. Defaults to all collectors if not specified.
 
 ## Metrics
 
@@ -38,12 +43,56 @@ Name | Description | Type | Labels
 `windows_dns_wins_queries_total` | _Not yet documented_ | counter | `direction`
 `windows_dns_wins_responses_total` | _Not yet documented_ | counter | `direction`
 `windows_dns_unmatched_responses_total` | _Not yet documented_ | counter | None
+`windows_dns_error_stats_total` | DNS error statistics from MicrosoftDNS_Statistic | counter | `name`, `collection_name`, `dns_server`
+
+### Sub-collectors
+
+The DNS collector is split into two sub-collectors:
+
+1. `metrics` - Collects standard DNS performance metrics using PDH (Performance Data Helper)
+2. `wmi_stats` - Collects DNS error statistics from the MicrosoftDNS_Statistic WMI class
+
+By default, both sub-collectors are enabled. You can enable specific sub-collectors using the `collector.dns.enabled` flag.
+
+### Example Usage
+
+To enable only DNS error statistics collection:
+```powershell
+windows_exporter.exe --collector.dns.enabled=wmi_stats
+```
+
+To enable only standard DNS metrics:
+```powershell
+windows_exporter.exe --collector.dns.enabled=metrics
+```
+
+To enable both (default behavior):
+```powershell
+windows_exporter.exe --collector.dns.enabled=metrics,wmi_stats
+```
 
 ### Example metric
-_This collector does not yet have explained examples, we would appreciate your help adding them!_
+```
+windows_dns_wmi_stats_total{collection_name="Error Stats",dns_server="EC2AMAZ-5NNM8M1",name="BadKey"} 0
+windows_dns_wmi_stats_total{collection_name="Error Stats",dns_server="EC2AMAZ-5NNM8M1",name="BadSig"} 0
+windows_dns_wmi_stats_total{collection_name="Error Stats",dns_server="EC2AMAZ-5NNM8M1",name="BadTime"} 0
+windows_dns_wmi_stats_total{collection_name="Error Stats",dns_server="EC2AMAZ-5NNM8M1",name="FormError"} 0
+windows_dns_wmi_stats_total{collection_name="Error Stats",dns_server="EC2AMAZ-5NNM8M1",name="Max"} 0
+windows_dns_wmi_stats_total{collection_name="Error Stats",dns_server="EC2AMAZ-5NNM8M1",name="NoError"} 0
+windows_dns_wmi_stats_total{collection_name="Error Stats",dns_server="EC2AMAZ-5NNM8M1",name="NotAuth"} 0
+windows_dns_wmi_stats_total{collection_name="Error Stats",dns_server="EC2AMAZ-5NNM8M1",name="NotImpl"} 0
+windows_dns_wmi_stats_total{collection_name="Error Stats",dns_server="EC2AMAZ-5NNM8M1",name="NotZone"} 0
+windows_dns_wmi_stats_total{collection_name="Error Stats",dns_server="EC2AMAZ-5NNM8M1",name="NxDomain"} 0
+windows_dns_wmi_stats_total{collection_name="Error Stats",dns_server="EC2AMAZ-5NNM8M1",name="NxRRSet"} 0
+windows_dns_wmi_stats_total{collection_name="Error Stats",dns_server="EC2AMAZ-5NNM8M1",name="Refused"} 0
+windows_dns_wmi_stats_total{collection_name="Error Stats",dns_server="EC2AMAZ-5NNM8M1",name="ServFail"} 0
+windows_dns_wmi_stats_total{collection_name="Error Stats",dns_server="EC2AMAZ-5NNM8M1",name="UnknownError"} 0
+windows_dns_wmi_stats_total{collection_name="Error Stats",dns_server="EC2AMAZ-5NNM8M1",name="YxDomain"} 0
+windows_dns_wmi_stats_total{collection_name="Error Stats",dns_server="EC2AMAZ-5NNM8M1",name="YxRRSet"} 0
+```
 
 ## Useful queries
 _This collector does not yet have any useful queries added, we would appreciate your help adding them!_
 
 ## Alerting examples
-_This collector does not yet have alerting examples, we would appreciate your help adding them!_
+_This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/collector.exchange.md

@@ -43,7 +43,7 @@ Comma-separated list of collectors to use, for example: `--collectors.exchange.e
 | `windows_exchange_transport_queues_messages_submitted_total`                | Messages Submitted Total                                                                                    |
 | `windows_exchange_transport_queues_messages_delayed_total`                  | Messages Delayed Total                                                                                      |
 | `windows_exchange_transport_queues_messages_completed_delivery_total`       | Messages Completed Delivery Total                                                                           |
-| `windows_exchange_transport_queues_shadow_queue_length`                     | Shadow Queue Length                                                                                         |
+| `windows_exchange_transport_queues_aggregate_shadow_queue_length`           | The current number of messages in shadow queues                                                             |
 | `windows_exchange_transport_queues_submission_queue_length`                 | Submission Queue Length                                                                                     |
 | `windows_exchange_transport_queues_delay_queue_length`                      | Delay Queue Length                                                                                          |
 | `windows_exchange_transport_queues_items_completed_delivery_total`          | Items Completed Delivery Total                                                                              |
@@ -54,7 +54,7 @@ Comma-separated list of collectors to use, for example: `--collectors.exchange.e
 | `windows_exchange_http_proxy_avg_auth_latency`                              | Average time spent authenticating CAS requests over the last 200 samples                                    |
 | `windows_exchange_http_proxy_outstanding_proxy_requests`                    | Number of concurrent outstanding proxy requests                                                             |
 | `windows_exchange_http_proxy_requests_total`                                | Number of proxy requests processed each second                                                              |
-| `windows_exchange_avail_service_requests_per_sec`                           | Number of requests serviced per second                                                                      |
+| `windows_exchange_availability_service_requests_per_sec`                    | Number of requests serviced per second                                                                      |
 | `windows_exchange_owa_current_unique_users`                                 | Number of unique users currently logged on to Outlook Web App                                               |
 | `windows_exchange_owa_requests_total`                                       | Number of requests handled by Outlook Web App per second                                                    |
 | `windows_exchange_autodiscover_requests_total`                              | Number of autodiscover service requests processed each second                                               |
@@ -77,4 +77,3 @@ _This collector does not yet have any useful queries added, we would appreciate
 
 ## Alerting examples
 _This collector does not yet have alerting examples, we would appreciate your help adding them!_
-

docs/collector.iis.md

@@ -28,108 +28,108 @@ If given, an application needs to *not* match the exclude regexp in order for th
 
 ## Metrics
 
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_iis_current_anonymous_users` | The number of users who currently have an anonymous request pending with the web service | gauge | `site`
-`windows_iis_current_blocked_async_io_requests` | _Not yet documented_ | gauge | `site`
-`windows_iis_current_cgi_requests` | The number of CGI requests that are being processed simultaneously by the web service | gauge | `site`
-`windows_iis_current_connections` |  The number of active connections to the web service | gauge | `site`
-`windows_iis_current_isapi_extension_requests` | The number of [ISAPI extension](https://docs.microsoft.com/en-us/previous-versions/iis/6.0-sdk/ms525172(v=vs.90)) requests that are being processed simultaneously by the web service | gauge | `site`
-`windows_iis_current_non_anonymous_users` | The number of users who currently have a nonanonymous request pending with the web service | gauge | `site`
-`windows_iis_service_uptime` | The uptime for the web service or a Web site (seconds) | gauge | `site`
-`windows_iis_received_bytes_total` | The total bytes of data that have been received by the web service since the service started | counter | `site`
-`windows_iis_sent_bytes_total` | The number of data bytes that have been sent by the web service since the service started | counter | `site`
-`windows_iis_anonymous_users_total` | The number of users who have established an anonymous request since the web service started | counter | `site`
-`windows_iis_blocked_async_io_requests_total` | The total number of blocked asynchronous I/O requests since the start of the IIS service | counter | `site`
-`windows_iis_cgi_requests_total` | The number of all CGI requests that have been made since the web service started | counter | `site`
-`windows_iis_connection_attempts_all_instances_total` | The number of connections to the web service that have been attempted since the service started | counter | `site`
-`windows_iis_requests_total` | The number of requests that have been made since the web service was started | counter | `site`, `method`
-`windows_iis_files_received_total` | The total number of files that have been received by the FTP service since the service started | counter | `site`
-`windows_iis_files_sent_total` | The total number of files that have been sent by the FTP service since the service started | counter | `site`
-`windows_iis_ipapi_extension_requests_total` | The number of ISAPI extension requests that have been made since the web service started | counter | `site`
-`windows_iis_locked_errors_total` | The number of requests that have been made since the service started that could not be satisfied by the server because the requested document was locked. Usually reported as HTTP error 423 | counter | `site`
-`windows_iis_logon_attempts_total` | The number of attempts to log on to the web service that have occurred since the service started | counter | `site`
-`windows_iis_non_anonymous_users_total` | The number of users who have made nonanonymous requests to the web service since the service started | counter | `site`
-`windows_iis_not_found_errors_total` | The number of requests that have been made since the service started that were not satisfied by the server because the requested document was not found. Usually reported as HTTP error 404 | counter | `site`
-`windows_iis_rejected_async_io_requests_total` |The total number of rejected asynchronous I/O requests since the start of the IIS service. | counter | `site`
-`windows_iis_current_application_pool_state` | The current status of the application pool (1 - Uninitialized, 2 - Initialized, 3 - Running, 4 - Disabling, 5 - Disabled, 6 - Shutdown Pending, 7 - Delete Pending) | gauge | `app`, `state`
-`windows_iis_current_application_pool_start_time` | The unix timestamp for the application pool start time | gauge | `app`
-`windows_iis_current_worker_processes` | The current number of worker processes that are running in the application pool | gauge | `app`
-`windows_iis_maximum_worker_processes` | The maximum number of worker processes that have been created for the application pool since Windows Process Activation Service (WAS) started | gauge | `app`
-`windows_iis_recent_worker_process_failures` | The number of times that worker processes for the application pool failed during the rapid-fail protection interval | gauge | `app`
-`windows_iis_time_since_last_worker_process_failure` | The length of time, in seconds, since the last worker process failure occurred for the application pool | gauge | `app`
-`windows_iis_total_application_pool_recycles` | The number of times that the application pool has been recycled since Windows Process Activation Service (WAS) started | counter | `app`
-`windows_iis_total_application_pool_start_time` | The unix timestamp for the application pool of when the Windows Process Activation Service (WAS) started | counter | `app`
-`windows_iis_total_worker_processes_created` | The number of worker processes created for the application pool since Windows Process Activation Service (WAS) started | counter | `app`
-`windows_iis_total_worker_process_failures` | The number of times that worker processes have crashed since the application pool was started | counter | `app`
-`windows_iis_total_worker_process_ping_failures` | The number of times that Windows Process Activation Service (WAS) did not receive a response to ping messages sent to a worker process | counter | `app`
-`windows_iis_total_worker_process_shutdown_failures` | The number of times that Windows Process Activation Service (WAS) failed to shut down a worker process | counter | `app`
-`windows_iis_total_worker_process_startup_failures` | The number of times that Windows Process Activation Service (WAS) failed to start a worker process | counter | `app`
-`windows_iis_worker_cache_active_flushed_entries` | Number of file handles cached that will be closed when all current transfers complete | gauge | `app`, `pid`
-`windows_iis_worker_file_cache_memory_bytes` | Current number of bytes used by file cache | gauge | `app`, `pid`
-`windows_iis_worker_file_cache_max_memory_bytes` | Maximum number of bytes used by file cache | counter | `app`, `pid`
-`windows_iis_worker_file_cache_flushes_total` | Total number of file cache flushes (since service startup) | counter | `app`, `pid`
-`windows_iis_worker_file_cache_queries_total` | Total file cache queries (hits + misses) | counter | `app`, `pid`
-`windows_iis_worker_file_cache_hits_total` | Total number of successful lookups in the user-mode file cache | counter | `app`, `pid`
-`windows_iis_worker_file_cache_items` | Current number of files whose contents are present in user-mode cache | gauge | `app`, `pid`
-`windows_iis_worker_file_cache_items_total` | Total number of files whose contents were ever added to the user-mode cache (since service startup) | counter | `app`, `pid`
-`windows_iis_worker_file_cache_items_flushed_total` | Total number of file handles that have been removed from the user-mode cache (since service startup) | counter | `app`, `pid`
-`windows_iis_worker_uri_cache_flushes_total` | Total number of URI cache flushes (since service startup) | counter | `app`, `pid`
-`windows_iis_worker_uri_cache_queries_total` | Total number of uri cache queries (hits + misses) | counter | `app`, `pid`
-`windows_iis_worker_uri_cache_hits_total` | Total number of successful lookups in the user-mode URI cache (since service startup) | counter | `app`, `pid`
-`windows_iis_worker_uri_cache_items` | Number of URI information blocks currently in the user-mode cache | gauge | `app`, `pid`
-`windows_iis_worker_uri_cache_items_total` | Total number of URI information blocks added to the user-mode cache (since service startup) | counter | `app`, `pid`
-`windows_iis_worker_uri_cache_items_flushed_total` | The number of URI information blocks that have been removed from the user-mode cache (since service startup) | counter | `app`, `pid`
-`windows_iis_worker_metadata_cache_items` | Number of metadata information blocks currently present in user-mode cache | gauge | `app`, `pid`
-`windows_iis_worker_metadata_cache_flushes_total` | Total number of user-mode metadata cache flushes (since service startup) | counter | `app`, `pid`
-`windows_iis_worker_metadata_cache_queries_total` | Total metadata cache queries (hits + misses) | counter | `app`, `pid`
-`windows_iis_worker_metadata_cache_hits_total` | Total number of successful lookups in the user-mode metadata cache (since service startup) | counter | `app`, `pid`
-`windows_iis_worker_metadata_cache_items_cached_total` | Total number of metadata information blocks added to the user-mode cache (since service startup) | counter | `app`, `pid`
-`windows_iis_worker_metadata_cache_items_flushed_total` | Total number of metadata information blocks removed from the user-mode cache (since service startup) | counter | `app`, `pid`
-`windows_iis_worker_output_cache_active_flushed_items` |The total number of active and flushed items in the output cache of the IIS worker process. Active items are those that are currently being used to serve client requests, while flushed items are those that have been removed from the cache but are still waiting to be flushed to disk. | counter | `app`, `pid`
-`windows_iis_worker_output_cache_items` | Number of items current present in output cache | counter | `app`, `pid`
-`windows_iis_worker_output_cache_memory_bytes` | Current number of bytes used by output cache | counter | `app`, `pid`
-`windows_iis_worker_output_queries_total` | Total number of output cache queries (hits + misses) | counter | `app`, `pid`
-`windows_iis_worker_output_cache_hits_total` | Total number of successful lookups in output cache (since service startup) | counter | `app`, `pid`
-`windows_iis_worker_output_cache_items_flushed_total` | Total number of items flushed from output cache (since service startup) | counter | `app`, `pid`
-`windows_iis_worker_output_cache_flushes_total` | Total number of flushes of output cache (since service startup) | counter | `app`, `pid`
-`windows_iis_worker_threads` | Number of threads actively processing requests in the worker process | gauge | `app`, `pid`, `state`
-`windows_iis_worker_max_threads` | Maximum number of threads to which the thread pool can grow as needed | counter | `app`, `pid`
-`windows_iis_worker_requests_total` | Total number of HTTP requests served by the worker process | counter | `app`, `pid`
-`windows_iis_worker_current_requests` | Current number of requests being processed by the worker process | counter | `app`, `pid`
-`windows_iis_worker_request_errors_total` | Total number of requests that returned an error | counter | `app`, `pid`, `status_code`
-`windows_iis_worker_current_websocket_requests` | the current number of WebSocket connections being processed by the IIS worker process. | counter | `app`, `pid`
-`windows_iis_worker_websocket_connection_attempts_total` | the total number of attempted WebSocket connections since the start of the IIS worker process | counter | `app`, `pid`
-`windows_iis_worker_websocket_connection_accepted_total` | the total number of WebSocket connections that have been successfully established since the start of the IIS worker process | counter | `app`, `pid`
-`windows_iis_worker_websocket_connection_rejected_total` | the total number of WebSocket connections that have been rejected by the server since the start of the IIS worker process. Connections can be rejected for various reasons, such as capacity limitations, authentication failures, or configuration issues | counter | `app`, `pid`
-`windows_iis_server_cache_active_flushed_entries` | Number of file handles cached that will be closed when all current transfers complete | counter | None
-`windows_iis_server_file_cache_memory_bytes` | Current number of bytes used by file cache | gauge | None
-`windows_iis_server_file_cache_max_memory_bytes` | Maximum number of bytes used by file cache | counter | None
-`windows_iis_server_file_cache_flushes_total` | Total number of file cache flushes (since service startup) | counter | None
-`windows_iis_server_file_cache_queries_total` | Total number of file cache queries (hits + misses) | counter | None
-`windows_iis_server_file_cache_hits_total` | Total number of successful lookups in the file cache | counter | None
-`windows_iis_server_file_cache_items` | Current number of files whose contents are present in cache | gauge | None
-`windows_iis_server_file_cache_items_total` | Total number of files whose contents were ever added to the cache (since service startup) | counter | None
-`windows_iis_server_file_cache_items_flushed_total` | Total number of file handles that have been removed from the cache (since service startup) | counter | None
-`windows_iis_server_uri_cache_flushes_total` | Total number of URI cache flushes (since service startup) | counter | `mode`
-`windows_iis_server_uri_cache_queries_total` | Total number of uri cache queries (hits + misses) | counter | `mode`
-`windows_iis_server_uri_cache_hits_total` | Total number of successful lookups in the URI cache (since service startup) | counter | `mode`
-`windows_iis_server_uri_cache_items` | Number of URI information blocks currently in the cache | gauge | `mode`
-`windows_iis_server_uri_cache_items_total` | Total number of URI information blocks added to the cache (since service startup) | counter | `mode`
-`windows_iis_server_uri_cache_items_flushed_total` | The number of URI information blocks that have been removed from the cache (since service startup) | counter | `mode`
-`windows_iis_server_metadata_cache_items` | Number of metadata information blocks currently present in cache | gauge | None
-`windows_iis_server_metadata_cache_flushes_total` | Total number of metadata cache flushes (since service startup) | counter | None
-`windows_iis_server_metadata_cache_queries_total` | Total metadata cache queries (hits + misses) | counter | None
-`windows_iis_server_metadata_cache_hits_total` | Total number of successful lookups in the metadata cache (since service startup) | counter | None
-`windows_iis_server_metadata_cache_items_cached_total` | Total number of metadata information blocks added to the cache (since service startup) | counter | None
-`windows_iis_server_metadata_cache_items_flushed_total` | Total number of metadata information blocks removed from the cache (since service startup) | counter | None
-`windows_iis_server_output_cache_active_flushed_items` | The total number of active and flushed items in the output cache of the IIS server | counter | None
-`windows_iis_server_output_cache_items` | Number of items current present in output cache | counter | None
-`windows_iis_server_output_cache_memory_bytes` | Current number of bytes used by output cache | counter | None
-`windows_iis_server_output_cache_queries_total` | Total output cache queries (hits + misses) | counter | None
-`windows_iis_server_output_cache_hits_total` | Total number of successful lookups in output cache (since service startup) | counter | None
-`windows_iis_server_output_cache_items_flushed_total` | Total number of items flushed from output cache (since service startup) | counter | None
-`windows_iis_server_output_cache_flushes_total` | Total number of flushes of output cache (since service startup) | counter | None
+| Name                                                     | Description                                                                                                                                                                                                                                                                                 | Type    | Labels                      |
+|----------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|-----------------------------|
+| `windows_iis_current_anonymous_users`                    | The number of users who currently have an anonymous request pending with the web service                                                                                                                                                                                                    | gauge   | `site`                      |
+| `windows_iis_current_blocked_async_io_requests`          | _Not yet documented_                                                                                                                                                                                                                                                                        | gauge   | `site`                      |
+| `windows_iis_current_cgi_requests`                       | The number of CGI requests that are being processed simultaneously by the web service                                                                                                                                                                                                       | gauge   | `site`                      |
+| `windows_iis_current_connections`                        | The number of active connections to the web service                                                                                                                                                                                                                                         | gauge   | `site`                      |
+| `windows_iis_current_isapi_extension_requests`           | The number of [ISAPI extension](https://docs.microsoft.com/en-us/previous-versions/iis/6.0-sdk/ms525172(v=vs.90)) requests that are being processed simultaneously by the web service                                                                                                       | gauge   | `site`                      |
+| `windows_iis_current_non_anonymous_users`                | The number of users who currently have a nonanonymous request pending with the web service                                                                                                                                                                                                  | gauge   | `site`                      |
+| `windows_iis_service_uptime`                             | The uptime for the web service or a Web site (seconds)                                                                                                                                                                                                                                      | gauge   | `site`                      |
+| `windows_iis_received_bytes_total`                       | The total bytes of data that have been received by the web service since the service started                                                                                                                                                                                                | counter | `site`                      |
+| `windows_iis_sent_bytes_total`                           | The number of data bytes that have been sent by the web service since the service started                                                                                                                                                                                                   | counter | `site`                      |
+| `windows_iis_anonymous_users_total`                      | The number of users who have established an anonymous request since the web service started                                                                                                                                                                                                 | counter | `site`                      |
+| `windows_iis_blocked_async_io_requests_total`            | The total number of blocked asynchronous I/O requests since the start of the IIS service                                                                                                                                                                                                    | counter | `site`                      |
+| `windows_iis_cgi_requests_total`                         | The number of all CGI requests that have been made since the web service started                                                                                                                                                                                                            | counter | `site`                      |
+| `windows_iis_connection_attempts_all_instances_total`    | The number of connections to the web service that have been attempted since the service started                                                                                                                                                                                             | counter | `site`                      |
+| `windows_iis_requests_total`                             | The number of requests that have been made since the web service was started                                                                                                                                                                                                                | counter | `site`, `method`            |
+| `windows_iis_files_received_total`                       | The total number of files that have been received by the FTP service since the service started                                                                                                                                                                                              | counter | `site`                      |
+| `windows_iis_files_sent_total`                           | The total number of files that have been sent by the FTP service since the service started                                                                                                                                                                                                  | counter | `site`                      |
+| `windows_iis_ipapi_extension_requests_total`             | The number of ISAPI extension requests that have been made since the web service started                                                                                                                                                                                                    | counter | `site`                      |
+| `windows_iis_locked_errors_total`                        | The number of requests that have been made since the service started that could not be satisfied by the server because the requested document was locked. Usually reported as HTTP error 423                                                                                                | counter | `site`                      |
+| `windows_iis_logon_attempts_total`                       | The number of attempts to log on to the web service that have occurred since the service started                                                                                                                                                                                            | counter | `site`                      |
+| `windows_iis_non_anonymous_users_total`                  | The number of users who have made nonanonymous requests to the web service since the service started                                                                                                                                                                                        | counter | `site`                      |
+| `windows_iis_not_found_errors_total`                     | The number of requests that have been made since the service started that were not satisfied by the server because the requested document was not found. Usually reported as HTTP error 404                                                                                                 | counter | `site`                      |
+| `windows_iis_rejected_async_io_requests_total`           | The total number of rejected asynchronous I/O requests since the start of the IIS service.                                                                                                                                                                                                  | counter | `site`                      |
+| `windows_iis_current_application_pool_state`             | The current status of the application pool (1 - Uninitialized, 2 - Initialized, 3 - Running, 4 - Disabling, 5 - Disabled, 6 - Shutdown Pending, 7 - Delete Pending)                                                                                                                         | gauge   | `app`, `state`              |
+| `windows_iis_current_application_pool_start_time`        | The unix timestamp for the application pool start time                                                                                                                                                                                                                                      | gauge   | `app`                       |
+| `windows_iis_current_worker_processes`                   | The current number of worker processes that are running in the application pool                                                                                                                                                                                                             | gauge   | `app`                       |
+| `windows_iis_maximum_worker_processes`                   | The maximum number of worker processes that have been created for the application pool since Windows Process Activation Service (WAS) started                                                                                                                                               | gauge   | `app`                       |
+| `windows_iis_recent_worker_process_failures`             | The number of times that worker processes for the application pool failed during the rapid-fail protection interval                                                                                                                                                                         | gauge   | `app`                       |
+| `windows_iis_time_since_last_worker_process_failure`     | The length of time, in seconds, since the last worker process failure occurred for the application pool                                                                                                                                                                                     | gauge   | `app`                       |
+| `windows_iis_total_application_pool_recycles`            | The number of times that the application pool has been recycled since Windows Process Activation Service (WAS) started                                                                                                                                                                      | counter | `app`                       |
+| `windows_iis_total_application_pool_start_time`          | The unix timestamp for the application pool of when the Windows Process Activation Service (WAS) started                                                                                                                                                                                    | counter | `app`                       |
+| `windows_iis_total_worker_processes_created`             | The number of worker processes created for the application pool since Windows Process Activation Service (WAS) started                                                                                                                                                                      | counter | `app`                       |
+| `windows_iis_total_worker_process_failures`              | The number of times that worker processes have crashed since the application pool was started                                                                                                                                                                                               | counter | `app`                       |
+| `windows_iis_total_worker_process_ping_failures`         | The number of times that Windows Process Activation Service (WAS) did not receive a response to ping messages sent to a worker process                                                                                                                                                      | counter | `app`                       |
+| `windows_iis_total_worker_process_shutdown_failures`     | The number of times that Windows Process Activation Service (WAS) failed to shut down a worker process                                                                                                                                                                                      | counter | `app`                       |
+| `windows_iis_total_worker_process_startup_failures`      | The number of times that Windows Process Activation Service (WAS) failed to start a worker process                                                                                                                                                                                          | counter | `app`                       |
+| `windows_iis_worker_cache_active_flushed_entries`        | Number of file handles cached that will be closed when all current transfers complete                                                                                                                                                                                                       | gauge   | `app`, `pid`                |
+| `windows_iis_worker_file_cache_memory_bytes`             | Current number of bytes used by file cache                                                                                                                                                                                                                                                  | gauge   | `app`, `pid`                |
+| `windows_iis_worker_file_cache_max_memory_bytes`         | Maximum number of bytes used by file cache                                                                                                                                                                                                                                                  | counter | `app`, `pid`                |
+| `windows_iis_worker_file_cache_flushes_total`            | Total number of file cache flushes (since service startup)                                                                                                                                                                                                                                  | counter | `app`, `pid`                |
+| `windows_iis_worker_file_cache_queries_total`            | Total file cache queries (hits + misses)                                                                                                                                                                                                                                                    | counter | `app`, `pid`                |
+| `windows_iis_worker_file_cache_hits_total`               | Total number of successful lookups in the user-mode file cache                                                                                                                                                                                                                              | counter | `app`, `pid`                |
+| `windows_iis_worker_file_cache_items`                    | Current number of files whose contents are present in user-mode cache                                                                                                                                                                                                                       | gauge   | `app`, `pid`                |
+| `windows_iis_worker_file_cache_items_total`              | Total number of files whose contents were ever added to the user-mode cache (since service startup)                                                                                                                                                                                         | counter | `app`, `pid`                |
+| `windows_iis_worker_file_cache_items_flushed_total`      | Total number of file handles that have been removed from the user-mode cache (since service startup)                                                                                                                                                                                        | counter | `app`, `pid`                |
+| `windows_iis_worker_uri_cache_flushes_total`             | Total number of URI cache flushes (since service startup)                                                                                                                                                                                                                                   | counter | `app`, `pid`                |
+| `windows_iis_worker_uri_cache_queries_total`             | Total number of uri cache queries (hits + misses)                                                                                                                                                                                                                                           | counter | `app`, `pid`                |
+| `windows_iis_worker_uri_cache_hits_total`                | Total number of successful lookups in the user-mode URI cache (since service startup)                                                                                                                                                                                                       | counter | `app`, `pid`                |
+| `windows_iis_worker_uri_cache_items`                     | Number of URI information blocks currently in the user-mode cache                                                                                                                                                                                                                           | gauge   | `app`, `pid`                |
+| `windows_iis_worker_uri_cache_items_total`               | Total number of URI information blocks added to the user-mode cache (since service startup)                                                                                                                                                                                                 | counter | `app`, `pid`                |
+| `windows_iis_worker_uri_cache_items_flushed_total`       | The number of URI information blocks that have been removed from the user-mode cache (since service startup)                                                                                                                                                                                | counter | `app`, `pid`                |
+| `windows_iis_worker_metadata_cache_items`                | Number of metadata information blocks currently present in user-mode cache                                                                                                                                                                                                                  | gauge   | `app`, `pid`                |
+| `windows_iis_worker_metadata_cache_flushes_total`        | Total number of user-mode metadata cache flushes (since service startup)                                                                                                                                                                                                                    | counter | `app`, `pid`                |
+| `windows_iis_worker_metadata_cache_queries_total`        | Total metadata cache queries (hits + misses)                                                                                                                                                                                                                                                | counter | `app`, `pid`                |
+| `windows_iis_worker_metadata_cache_hits_total`           | Total number of successful lookups in the user-mode metadata cache (since service startup)                                                                                                                                                                                                  | counter | `app`, `pid`                |
+| `windows_iis_worker_metadata_cache_items_cached_total`   | Total number of metadata information blocks added to the user-mode cache (since service startup)                                                                                                                                                                                            | counter | `app`, `pid`                |
+| `windows_iis_worker_metadata_cache_items_flushed_total`  | Total number of metadata information blocks removed from the user-mode cache (since service startup)                                                                                                                                                                                        | counter | `app`, `pid`                |
+| `windows_iis_worker_output_cache_active_flushed_items`   | The total number of active and flushed items in the output cache of the IIS worker process. Active items are those that are currently being used to serve client requests, while flushed items are those that have been removed from the cache but are still waiting to be flushed to disk. | counter | `app`, `pid`                |
+| `windows_iis_worker_output_cache_items`                  | Number of items current present in output cache                                                                                                                                                                                                                                             | counter | `app`, `pid`                |
+| `windows_iis_worker_output_cache_memory_bytes`           | Current number of bytes used by output cache                                                                                                                                                                                                                                                | counter | `app`, `pid`                |
+| `windows_iis_worker_output_queries_total`                | Total number of output cache queries (hits + misses)                                                                                                                                                                                                                                        | counter | `app`, `pid`                |
+| `windows_iis_worker_output_cache_hits_total`             | Total number of successful lookups in output cache (since service startup)                                                                                                                                                                                                                  | counter | `app`, `pid`                |
+| `windows_iis_worker_output_cache_items_flushed_total`    | Total number of items flushed from output cache (since service startup)                                                                                                                                                                                                                     | counter | `app`, `pid`                |
+| `windows_iis_worker_output_cache_flushes_total`          | Total number of flushes of output cache (since service startup)                                                                                                                                                                                                                             | counter | `app`, `pid`                |
+| `windows_iis_worker_threads`                             | Number of threads actively processing requests in the worker process                                                                                                                                                                                                                        | gauge   | `app`, `pid`, `state`       |
+| `windows_iis_worker_max_threads`                         | Maximum number of threads to which the thread pool can grow as needed                                                                                                                                                                                                                       | counter | `app`, `pid`                |
+| `windows_iis_worker_requests_total`                      | Total number of HTTP requests served by the worker process                                                                                                                                                                                                                                  | counter | `app`, `pid`                |
+| `windows_iis_worker_current_requests`                    | Current number of requests being processed by the worker process                                                                                                                                                                                                                            | counter | `app`, `pid`                |
+| `windows_iis_worker_request_errors_total`                | Total number of requests that returned an error                                                                                                                                                                                                                                             | counter | `app`, `pid`, `status_code` |
+| `windows_iis_worker_current_websocket_requests`          | the current number of WebSocket connections being processed by the IIS worker process.                                                                                                                                                                                                      | counter | `app`, `pid`                |
+| `windows_iis_worker_websocket_connection_attempts_total` | the total number of attempted WebSocket connections since the start of the IIS worker process                                                                                                                                                                                               | counter | `app`, `pid`                |
+| `windows_iis_worker_websocket_connection_accepted_total` | the total number of WebSocket connections that have been successfully established since the start of the IIS worker process                                                                                                                                                                 | counter | `app`, `pid`                |
+| `windows_iis_worker_websocket_connection_rejected_total` | the total number of WebSocket connections that have been rejected by the server since the start of the IIS worker process. Connections can be rejected for various reasons, such as capacity limitations, authentication failures, or configuration issues                                  | counter | `app`, `pid`                |
+| `windows_iis_server_cache_active_flushed_entries`        | Number of file handles cached that will be closed when all current transfers complete                                                                                                                                                                                                       | counter | None                        |
+| `windows_iis_server_file_cache_memory_bytes`             | Current number of bytes used by file cache                                                                                                                                                                                                                                                  | gauge   | None                        |
+| `windows_iis_server_file_cache_max_memory_bytes`         | Maximum number of bytes used by file cache                                                                                                                                                                                                                                                  | counter | None                        |
+| `windows_iis_server_file_cache_flushes_total`            | Total number of file cache flushes (since service startup)                                                                                                                                                                                                                                  | counter | None                        |
+| `windows_iis_server_file_cache_queries_total`            | Total number of file cache queries (hits + misses)                                                                                                                                                                                                                                          | counter | None                        |
+| `windows_iis_server_file_cache_hits_total`               | Total number of successful lookups in the file cache                                                                                                                                                                                                                                        | counter | None                        |
+| `windows_iis_server_file_cache_items`                    | Current number of files whose contents are present in cache                                                                                                                                                                                                                                 | gauge   | None                        |
+| `windows_iis_server_file_cache_items_total`              | Total number of files whose contents were ever added to the cache (since service startup)                                                                                                                                                                                                   | counter | None                        |
+| `windows_iis_server_file_cache_items_flushed_total`      | Total number of file handles that have been removed from the cache (since service startup)                                                                                                                                                                                                  | counter | None                        |
+| `windows_iis_server_uri_cache_flushes_total`             | Total number of URI cache flushes (since service startup)                                                                                                                                                                                                                                   | counter | `mode`                      |
+| `windows_iis_server_uri_cache_queries_total`             | Total number of uri cache queries (hits + misses)                                                                                                                                                                                                                                           | counter | `mode`                      |
+| `windows_iis_server_uri_cache_hits_total`                | Total number of successful lookups in the URI cache (since service startup)                                                                                                                                                                                                                 | counter | `mode`                      |
+| `windows_iis_server_uri_cache_items`                     | Number of URI information blocks currently in the cache                                                                                                                                                                                                                                     | gauge   | `mode`                      |
+| `windows_iis_server_uri_cache_items_total`               | Total number of URI information blocks added to the cache (since service startup)                                                                                                                                                                                                           | counter | `mode`                      |
+| `windows_iis_server_uri_cache_items_flushed_total`       | The number of URI information blocks that have been removed from the cache (since service startup)                                                                                                                                                                                          | counter | `mode`                      |
+| `windows_iis_server_metadata_cache_items`                | Number of metadata information blocks currently present in cache                                                                                                                                                                                                                            | gauge   | None                        |
+| `windows_iis_server_metadata_cache_flushes_total`        | Total number of metadata cache flushes (since service startup)                                                                                                                                                                                                                              | counter | None                        |
+| `windows_iis_server_metadata_cache_queries_total`        | Total metadata cache queries (hits + misses)                                                                                                                                                                                                                                                | counter | None                        |
+| `windows_iis_server_metadata_cache_hits_total`           | Total number of successful lookups in the metadata cache (since service startup)                                                                                                                                                                                                            | counter | None                        |
+| `windows_iis_server_metadata_cache_items_cached_total`   | Total number of metadata information blocks added to the cache (since service startup)                                                                                                                                                                                                      | counter | None                        |
+| `windows_iis_server_metadata_cache_items_flushed_total`  | Total number of metadata information blocks removed from the cache (since service startup)                                                                                                                                                                                                  | counter | None                        |
+| `windows_iis_server_output_cache_active_flushed_items`   | The total number of active and flushed items in the output cache of the IIS server                                                                                                                                                                                                          | counter | None                        |
+| `windows_iis_server_output_cache_items`                  | Number of items current present in output cache                                                                                                                                                                                                                                             | counter | None                        |
+| `windows_iis_server_output_cache_memory_bytes`           | Current number of bytes used by output cache                                                                                                                                                                                                                                                | counter | None                        |
+| `windows_iis_server_output_cache_queries_total`          | Total output cache queries (hits + misses)                                                                                                                                                                                                                                                  | counter | None                        |
+| `windows_iis_server_output_cache_hits_total`             | Total number of successful lookups in output cache (since service startup)                                                                                                                                                                                                                  | counter | None                        |
+| `windows_iis_server_output_cache_items_flushed_total`    | Total number of items flushed from output cache (since service startup)                                                                                                                                                                                                                     | counter | None                        |
+| `windows_iis_server_output_cache_flushes_total`          | Total number of flushes of output cache (since service startup)                                                                                                                                                                                                                             | counter | None                        |
 
 ### Example metric
 _This collector does not yet have explained examples, we would appreciate your help adding them!_

docs/collector.logical_disk.md

@@ -69,6 +69,23 @@ Show volume usage (%)
 100.0 - 100 * (windows_logical_disk_free_bytes{instance="localhost", volume="C:"} / windows_logical_disk_size_bytes{instance="localhost", volume="C:"})
 ```
 
+Disk Activity
+```promql
+  (
+      rate(windows_logical_disk_read_seconds_total[2m])
+    +
+      rate(windows_logical_disk_write_seconds_total[2m])
+  )
+/
+  (
+      rate(windows_logical_disk_read_seconds_total[2m])
+    +
+      rate(windows_logical_disk_write_seconds_total[2m])
+    +
+      rate(windows_logical_disk_idle_seconds_total[2m])
+  )
+```
+
 ## Alerting examples
 **prometheus.rules**
 ```yaml

docs/collector.logon.md

@@ -1,78 +0,0 @@
-# logon collector
-
-The logon collector exposes metrics detailing the active user logon sessions.
-
-|                     |           |
-|---------------------|-----------|
-| Metric name prefix  | `logon`   |
-| Source              | Win32 API |
-| Enabled by default? | No        |
-
-## Flags
-
-None
-
-## Metrics
-
-| Name                                      | Description                                | Type  | Labels                             |
-|-------------------------------------------|--------------------------------------------|-------|------------------------------------|
-| `windows_logon_session_logon_timestamp_seconds` | timestamp of the logon session in seconds. | gauge | `domain`, `id`, `type`, `username` |
-
-### Example metric
-Query the total number of interactive logon sessions
-```
-# HELP windows_logon_session_logon_timestamp_seconds timestamp of the logon session in seconds.
-# TYPE windows_logon_session_logon_timestamp_seconds gauge
-windows_logon_session_logon_timestamp_seconds{domain="",id="0x0:0x8c54",type="System",username=""} 1.72876928e+09
-windows_logon_session_logon_timestamp_seconds{domain="Font Driver Host",id="0x0:0x991a",type="Interactive",username="UMFD-1"} 1.728769282e+09
-windows_logon_session_logon_timestamp_seconds{domain="Font Driver Host",id="0x0:0x9933",type="Interactive",username="UMFD-0"} 1.728769282e+09
-windows_logon_session_logon_timestamp_seconds{domain="Font Driver Host",id="0x0:0x994a",type="Interactive",username="UMFD-0"} 1.728769282e+09
-windows_logon_session_logon_timestamp_seconds{domain="Font Driver Host",id="0x0:0x999d",type="Interactive",username="UMFD-1"} 1.728769282e+09
-windows_logon_session_logon_timestamp_seconds{domain="Font Driver Host",id="0x0:0xbf25a",type="Interactive",username="UMFD-2"} 1.728769532e+09
-windows_logon_session_logon_timestamp_seconds{domain="Font Driver Host",id="0x0:0xbf290",type="Interactive",username="UMFD-2"} 1.728769532e+09
-windows_logon_session_logon_timestamp_seconds{domain="JKROEPKE",id="0x0:0x130241",type="Network",username="vm-jok-dev$"} 1.728769625e+09
-windows_logon_session_logon_timestamp_seconds{domain="JKROEPKE",id="0x0:0x24f7c9",type="Network",username="vm-jok-dev$"} 1.728770121e+09
-windows_logon_session_logon_timestamp_seconds{domain="JKROEPKE",id="0x0:0x276846",type="Network",username="vm-jok-dev$"} 1.728770195e+09
-windows_logon_session_logon_timestamp_seconds{domain="JKROEPKE",id="0x0:0x3e4",type="Service",username="vm-jok-dev$"} 1.728769283e+09
-windows_logon_session_logon_timestamp_seconds{domain="JKROEPKE",id="0x0:0x3e7",type="System",username="vm-jok-dev$"} 1.728769279e+09
-windows_logon_session_logon_timestamp_seconds{domain="JKROEPKE",id="0x0:0x71d0f",type="Network",username="vm-jok-dev$"} 1.728769324e+09
-windows_logon_session_logon_timestamp_seconds{domain="JKROEPKE",id="0x0:0x720a3",type="Network",username="vm-jok-dev$"} 1.728769324e+09
-windows_logon_session_logon_timestamp_seconds{domain="JKROEPKE",id="0x0:0x725cb",type="Network",username="vm-jok-dev$"} 1.728769324e+09
-windows_logon_session_logon_timestamp_seconds{domain="JKROEPKE",id="0x0:0x753d8",type="Network",username="vm-jok-dev$"} 1.728769325e+09
-windows_logon_session_logon_timestamp_seconds{domain="JKROEPKE",id="0x0:0xa3913",type="Network",username="vm-jok-dev$"} 1.728769385e+09
-windows_logon_session_logon_timestamp_seconds{domain="JKROEPKE",id="0x0:0xbe7f2",type="Network",username="jok"} 1.728769531e+09
-windows_logon_session_logon_timestamp_seconds{domain="JKROEPKE",id="0x0:0xc76c4",type="RemoteInteractive",username="jok"} 1.728769533e+09
-windows_logon_session_logon_timestamp_seconds{domain="NT AUTHORITY",id="0x0:0x3e3",type="Service",username="IUSR"} 1.728769295e+09
-windows_logon_session_logon_timestamp_seconds{domain="NT AUTHORITY",id="0x0:0x3e5",type="Service",username="LOCAL SERVICE"} 1.728769283e+09
-windows_logon_session_logon_timestamp_seconds{domain="NT Service",id="0x0:0xae4c7",type="Service",username="MSSQLSERVER"} 1.728769425e+09
-windows_logon_session_logon_timestamp_seconds{domain="NT Service",id="0x0:0xb42f1",type="Service",username="SQLTELEMETRY"} 1.728769431e+09
-windows_logon_session_logon_timestamp_seconds{domain="Window Manager",id="0x0:0xbfbac",type="Interactive",username="DWM-2"} 1.728769532e+09
-windows_logon_session_logon_timestamp_seconds{domain="Window Manager",id="0x0:0xbfc72",type="Interactive",username="DWM-2"} 1.728769532e+09
-windows_logon_session_logon_timestamp_seconds{domain="Window Manager",id="0x0:0xdedd",type="Interactive",username="DWM-1"} 1.728769283e+09
-windows_logon_session_logon_timestamp_seconds{domain="Window Manager",id="0x0:0xdefd",type="Interactive",username="DWM-1"} 1.728769283e+09
-```
-
-### Possible values for `type`
-
-- System
-- Interactive
-- Network
-- Batch
-- Service
-- Proxy
-- Unlock
-- NetworkCleartext
-- NewCredentials
-- RemoteInteractive
-- CachedInteractive
-- CachedRemoteInteractive
-- CachedUnlock
-
-## Useful queries
-Query the total number of local and remote (I.E. Terminal Services) interactive sessions.
-```
-count(windows_logon_logon_type{type=~"Interactive|RemoteInteractive"}) by (type)
-```
-
-## Alerting examples
-_This collector doesn’t yet have alerting examples, we would appreciate your help adding them!_

docs/collector.memory.md

@@ -68,7 +68,7 @@ Show memory usage for instance (%)
 ```yaml
 # Alert on hosts that have exhausted all available physical memory
 - alert: MemoryExhausted
-  expr: windows_os_physical_memory_free_bytes == 0
+  expr: windows_memory_physical_free_bytes == 0
   for: 10m
   labels:
     severity: high

docs/collector.msmq.md

@@ -2,26 +2,22 @@
 
 The msmq collector exposes metrics about the queues on a MSMQ server
 
-|||
--|-
-Metric name prefix  | `msmq`
-Classes             | `Win32_PerfRawData_MSMQ_MSMQQueue`
-Enabled by default? | No
+|                     |                      |
+|---------------------|----------------------|
+| Metric name prefix  | `msmq`               |
+| Spource             | Performance Counters |
+| Enabled by default? | No                   |
 
 ## Flags
 
-### `--collector.msmq.msmq-where`
-
-A WMI filter on which queues to include. `%` is a wildcard, and can be used to match on substrings.
-
 ## Metrics
 
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_msmq_bytes_in_journal_queue` | Size of queue journal in bytes | gauge | `name`
-`windows_msmq_bytes_in_queue` | Size of queue in bytes | gauge | `name`
-`windows_msmq_messages_in_journal_queue` | Count messages in queue journal | gauge | `name`
-`windows_msmq_messages_in_queue` | Count messages in queue | gauge | `name`
+| Name                                     | Description                     | Type  | Labels |
+|------------------------------------------|---------------------------------|-------|--------|
+| `windows_msmq_bytes_in_journal_queue`    | Size of queue journal in bytes  | gauge | `name` |
+| `windows_msmq_bytes_in_queue`            | Size of queue in bytes          | gauge | `name` |
+| `windows_msmq_messages_in_journal_queue` | Count messages in queue journal | gauge | `name` |
+| `windows_msmq_messages_in_queue`         | Count messages in queue         | gauge | `name` |
 
 ### Example metric
 _This collector does not yet have explained examples, we would appreciate your help adding them!_

docs/collector.mssql.md

@@ -10,23 +10,15 @@ Enabled by default? | No
 
 ## Flags
 
-### `--collectors.mssql.classes-enabled`
+### `--collectors.mssql.enabled`
 
 Comma-separated list of MSSQL WMI classes to use. Supported values are `accessmethods`, `availreplica`, `bufman`, `databases`, `dbreplica`, `genstats`, `locks`, `memmgr`, `sqlstats`, `sqlerrors`, `transactions`, and `waitstats`.
 
-### `--collectors.mssql.class-print`
-
-If true, print available mssql WMI classes and exit.  Only displays if the mssql collector is enabled.fman`, `databases`, `dbreplica`, `genstats`, `locks`, `memmgr`, `sqlstats`, `sqlerrors`, `transactions`, and `waitstats`.
-
-### `--collector.mssql.port`
-
-Port of MSSQL server used for `windows_mssql_info` metric. Default is `1433`.
 
 ## Metrics
 
 | Name                                                               | Description                                                                                                                                                                                                                                                                                  | Type    | Labels                        |
 |--------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|-------------------------------|
-| `windows_mssql_info`                                               | Returns information about the MSSQL server running on port 1433                                                                                                                                                                                                                              | gauge   | `version`                     |
 | `windows_mssql_collector_duration_seconds`                         | The time taken for each sub-collector to return                                                                                                                                                                                                                                              | gauge   | `collector`, `mssql_instance` |
 | `windows_mssql_collector_success`                                  | 1 if sub-collector succeeded, 0 otherwise                                                                                                                                                                                                                                                    | gauge   | `collector`, `mssql_instance` |
 | `windows_mssql_accessmethods_au_batch_cleanups`                    | The total number of batches that were completed successfully by the background task that cleans up deferred dropped allocation units                                                                                                                                                         | counter | `mssql_instance`              |
@@ -197,6 +189,7 @@ Port of MSSQL server used for `windows_mssql_info` metric. Default is `1433`.
 | `windows_mssql_genstats_trace_event_notification_queue_size`       | Number of trace event notification instances waiting in the internal queue to be sent through Service Broker                                                                                                                                                                                 | gauge   | `mssql_instance`              |
 | `windows_mssql_genstats_transactions`                              | Number of transaction enlistments (local, DTC, bound all combined)                                                                                                                                                                                                                           | gauge   | `mssql_instance`              |
 | `windows_mssql_genstats_user_connections`                          | Counts the number of users currently connected to SQL Server                                                                                                                                                                                                                                 | gauge   | `mssql_instance`              |
+| `windows_mssql_instance_info `                                               | Returns information about the MSSQL server running on port 1433                                                                                                                                                                                                                              | gauge   | `version`                     |
 | `windows_mssql_locks_average_wait_seconds`                         | Average amount of wait time (in milliseconds) for each lock request that resulted in a wait                                                                                                                                                                                                  | gauge   | `mssql_instance`, `resource`  |
 | `windows_mssql_locks_lock_requests`                                | Number of new locks and lock conversions per second requested from the lock manager                                                                                                                                                                                                          | counter | `mssql_instance`, `resource`  |
 | `windows_mssql_locks_lock_timeouts`                                | Number of lock requests per second that timed out, including requests for NOWAIT locks                                                                                                                                                                                                       | counter | `mssql_instance`, `resource`  |

docs/collector.net.md

@@ -19,23 +19,31 @@ If given, an interface name needs to match the include regexp in order for the c
 
 If given, an interface name needs to *not* match the exclude regexp in order for the corresponding metrics to be reported
 
+### `--collector.net.enabled`
+
+Comma-separated list of collectors to use. Defaults to all, if not specified. Supported values are: `metrics`, `nic_addresses`.
+
 ## Metrics
 
-Name | Description | Type | Labels
------|-------------|------|-------
-`windows_net_bytes_received_total` | Total bytes received by interface | counter | `nic`
-`windows_net_bytes_sent_total` | Total bytes transmitted by interface | counter | `nic`
-`windows_net_bytes_total` | Total bytes received and transmitted by interface | counter | `nic`
-`windows_net_output_queue_length_packets` | Length of the output packet queue (in packets). If this is longer than 2, delays occur. | gauge | `nic`
-`windows_net_packets_outbound_discarded_total` | Total outbound packets that were chosen to be discarded even though no errors had been detected to prevent transmission | counter | `nic`
-`windows_net_packets_outbound_errors_total` | Total packets that could not be transmitted due to errors | counter | `nic`
-`windows_net_packets_received_discarded_total` | Total inbound packets that were chosen to be discarded even though no errors had been detected to prevent delivery | counter | `nic`
-`windows_net_packets_received_errors_total` | Total packets that could not be received due to errors  | counter | `nic`
-`windows_net_packets_received_total` | Total packets received by interface | counter | `nic`
-`windows_net_packets_received_unknown_total` | Total packets received by interface that were discarded because of an unknown or unsupported protocol | counter | `nic`
-`windows_net_packets_total` | Total packets received and transmitted by interface | counter | `nic`
-`windows_net_packets_sent_total` | Total packets transmitted by interface | counter | `nic`
-`windows_net_current_bandwidth_bytes` | Estimate of the interface's current bandwidth in bytes per second | gauge | `nic`
+| Name                                           | Description                                                                                                             | Type    | Labels                         |
+|------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------|---------|--------------------------------|
+| `windows_net_bytes_received_total`             | Total bytes received by interface                                                                                       | counter | `nic`                          |
+| `windows_net_bytes_sent_total`                 | Total bytes transmitted by interface                                                                                    | counter | `nic`                          |
+| `windows_net_bytes_total`                      | Total bytes received and transmitted by interface                                                                       | counter | `nic`                          |
+| `windows_net_output_queue_length_packets`      | Length of the output packet queue (in packets). If this is longer than 2, delays occur.                                 | gauge   | `nic`                          |
+| `windows_net_packets_outbound_discarded_total` | Total outbound packets that were chosen to be discarded even though no errors had been detected to prevent transmission | counter | `nic`                          |
+| `windows_net_packets_outbound_errors_total`    | Total packets that could not be transmitted due to errors                                                               | counter | `nic`                          |
+| `windows_net_packets_received_discarded_total` | Total inbound packets that were chosen to be discarded even though no errors had been detected to prevent delivery      | counter | `nic`                          |
+| `windows_net_packets_received_errors_total`    | Total packets that could not be received due to errors                                                                  | counter | `nic`                          |
+| `windows_net_packets_received_total`           | Total packets received by interface                                                                                     | counter | `nic`                          |
+| `windows_net_packets_received_unknown_total`   | Total packets received by interface that were discarded because of an unknown or unsupported protocol                   | counter | `nic`                          |
+| `windows_net_packets_total`                    | Total packets received and transmitted by interface                                                                     | counter | `nic`                          |
+| `windows_net_packets_sent_total`               | Total packets transmitted by interface                                                                                  | counter | `nic`                          |
+| `windows_net_current_bandwidth_bytes`          | Estimate of the interface's current bandwidth in bytes per second                                                       | gauge   | `nic`                          |
+| `windows_net_nic_address_info`                 | A metric with a constant '1' value labeled with the network interface's address information.                            | gauge   | `nic`, `address`, `family`     |
+| `windows_net_nic_info`                         | A metric with a constant '1' value labeled with the network interface's general information.                            | gauge   | `nic`, `friendly_name`, `mac`  |
+| `windows_net_nic_operation_status`             | The operational status for the interface as defined in RFC 2863 as IfOperStatus.                                        | gauge   | `nic`, `status`                |
+| `windows_net_route_info`                       | A metric with a constant '1' value labeled with the network interface's route information.                              | gauge   | `nic`, `src`, `dest`, `metric` |
 
 ### Example metric
 Query the rate of transmitted network traffic

docs/collector.netframework.md

@@ -10,7 +10,9 @@ The netframework collector exposes metrics about dotnet framework.
 
 ## Flags
 
-None
+### `--collector.netframework.enabled`
+
+Comma-separated list of collectors to use. Defaults to all, if not specified.
 
 ## Metrics
 

docs/collector.perfdata.md

@@ -1,114 +0,0 @@
-# Perfdata collector
-
-The perfdata collector exposes any configured metric.
-
-|                     |                         |
-|---------------------|-------------------------|
-| Metric name prefix  | `perfdata`              |
-| Data source         | Performance Data Helper |
-| Enabled by default? | No                      |
-
-## Flags
-
-
-### `--collector.perfdata.objects`
-
-Objects is a list of objects to collect metrics from. The value takes the form of a JSON array of strings. YAML is also supported.
-
-The collector supports only english named counter. Localized counter-names are not supported.
-
-#### Schema
-
-YAML: 
-```yaml
-- object: "Processor Information"
-  instances: ["*"]
-  instance_label: "core"
-  counters:
-    "% Processor Time": {}
-- object: "Memory"
-  counters:
-    "Cache Faults/sec":
-      type: "counter"
-```
-
-JSON:
-
-```json
-[
-  {"object":"Processor Information","instance_label": "core","instances":["*"],"counters": {"% Processor Time": {}}},
-  {"object":"Memory","counters": {"Cache Faults/sec": {"type": "counter"}}}
-]
-```
-
-#### name
-
-ObjectName is the Object to query for, like Processor, DirectoryServices, LogicalDisk or similar.
-
-The collector supports only english named counter. Localized counter-names are not supported.
-
-#### instances
-
-The instances key (this is an array) declares the instances of a counter you would like returned, it can be one or more values.
-
-Example: Instances = `["C:","D:","E:"]`
-
-This will return only for the instances C:, D: and E: where relevant. To get all instances of a Counter, use `["*"]` only. 
-
-Some Objects like `Memory` do not have instances to select from at all. In this case, the `instances` key can be omitted.
-
-#### counters
-
-The Counters key (this is an object) declares the counters of the ObjectName you would like returned, it can also be one or more values.
-
-Example: Counters = `{"% Idle Time": {}, "% Disk Read Time": {}, "% Disk Write Time": {}}`
-
-This must be specified for every counter you want the results. Wildcards are not supported.
-
-#### counters Sub-Schema
-
-##### type
-
-This key is optional. It indicates the type of the counter. The value can be `counter` or `gauge`. 
-If not specified, the windows_exporter will try to determine the type based on the counter type.
-
-### Example
-
-```
-# HELP windows_perfdata_memory_cache_faults_sec 
-# TYPE windows_perfdata_memory_cache_faults_sec counter
-windows_perfdata_memory_cache_faults_sec 2.369977e+07
-# HELP windows_perfdata_processor_information__processor_time 
-# TYPE windows_perfdata_processor_information__processor_time gauge
-windows_perfdata_processor_information__processor_time{instance="0,0"} 1.7259640625e+11
-windows_perfdata_processor_information__processor_time{instance="0,1"} 1.7576796875e+11
-windows_perfdata_processor_information__processor_time{instance="0,10"} 2.2704234375e+11
-windows_perfdata_processor_information__processor_time{instance="0,11"} 2.3069296875e+11
-windows_perfdata_processor_information__processor_time{instance="0,12"} 2.3302265625e+11
-windows_perfdata_processor_information__processor_time{instance="0,13"} 2.32851875e+11
-windows_perfdata_processor_information__processor_time{instance="0,14"} 2.3282421875e+11
-windows_perfdata_processor_information__processor_time{instance="0,15"} 2.3271234375e+11
-windows_perfdata_processor_information__processor_time{instance="0,16"} 2.329590625e+11
-windows_perfdata_processor_information__processor_time{instance="0,17"} 2.32800625e+11
-windows_perfdata_processor_information__processor_time{instance="0,18"} 2.3194359375e+11
-windows_perfdata_processor_information__processor_time{instance="0,19"} 2.32380625e+11
-windows_perfdata_processor_information__processor_time{instance="0,2"} 1.954765625e+11
-windows_perfdata_processor_information__processor_time{instance="0,20"} 2.3259765625e+11
-windows_perfdata_processor_information__processor_time{instance="0,21"} 2.3268515625e+11
-windows_perfdata_processor_information__processor_time{instance="0,22"} 2.3301765625e+11
-windows_perfdata_processor_information__processor_time{instance="0,23"} 2.3264328125e+11
-windows_perfdata_processor_information__processor_time{instance="0,3"} 1.94745625e+11
-windows_perfdata_processor_information__processor_time{instance="0,4"} 2.2011453125e+11
-windows_perfdata_processor_information__processor_time{instance="0,5"} 2.27244375e+11
-windows_perfdata_processor_information__processor_time{instance="0,6"} 2.25501875e+11
-windows_perfdata_processor_information__processor_time{instance="0,7"} 2.2995265625e+11
-windows_perfdata_processor_information__processor_time{instance="0,8"} 2.2929890625e+11
-windows_perfdata_processor_information__processor_time{instance="0,9"} 2.313540625e+11
-windows_perfdata_processor_information__processor_time{instance="0,_Total"} 2.23009459635e+11
-```
-
-## Metrics
-
-The perfdata collector returns metrics based on the user configuration. 
-The metrics are named based on the object name and the counter name.
-The instance name is added as a label to the metric.

docs/collector.performancecounter.md

@@ -0,0 +1,262 @@
+# performancecounter collector
+
+The performancecounter collector exposes any configured metric.
+
+|                     |                         |
+|---------------------|-------------------------|
+| Metric name prefix  | `performancecounter`              |
+| Data source         | Performance Data Helper |
+| Enabled by default? | No                      |
+
+## Flags
+
+
+### `--collector.performancecounter.objects`
+
+Objects is a list of objects to collect metrics from. The value takes the form of a JSON array of strings.
+YAML is supported.
+
+The collector supports only English-named counter. Localized counter-names aren’t supported.
+
+> [!CAUTION]
+> If you are using a configuration file, the value must be kept as a string.
+>
+> Use a `|-` to keep the value as a string.
+
+#### Example
+
+```yaml
+collector:
+  performancecounter:
+    objects: |-
+      - name: memory
+        object: "Memory"
+        counters:
+          - name: "Cache Faults/sec"
+            type: "counter" # optional
+```
+
+#### Schema
+
+YAML:
+
+<details>
+<summary>Click to expand YAML schema</summary>
+
+```yaml
+- name: cpu # free text name
+  object: "Processor Information" # Performance counter object name
+  instances: ["*"]
+  instance_label: "core"
+  counters:
+    - name: "% Processor Time"
+      metric: windows_performancecounter_processor_information_processor_time # optional
+      labels:
+        state: active
+    - name: "% Idle Time"
+      metric: windows_performancecounter_processor_information_processor_time # optional
+      labels:
+        state: idle
+- name: memory
+  object: "Memory"
+  type: "formatted"
+  counters:
+    - name: "Cache Faults/sec"
+      type: "counter" # optional
+```
+
+</details>
+
+<details>
+<summary>Click to expand JSON schema</summary>
+
+```json
+[
+  {
+    "name": "cpu",
+    "object": "Processor Information",
+    "instances": [
+      "*"
+    ],
+    "instance_label": "core",
+    "counters": [
+      {
+        "name": "% Processor Time",
+        "metric": "windows_performancecounter_processor_information_processor_time",
+        "labels": {
+          "state": "active"
+        }
+      },
+      {
+        "name": "% Idle Time",
+        "metric": "windows_performancecounter_processor_information_processor_time",
+        "labels": {
+          "state": "idle"
+        }
+      }
+    ]
+  },
+  {
+    "name": "memory",
+    "object": "Memory",
+    "type": "formatted",
+    "counters": [
+      {
+        "name": "Cache Faults/sec",
+        "type": "counter"
+      }
+    ]
+  }
+]
+```
+</details>
+
+#### name
+
+The name is used to identify the object in the logs and metrics.
+Must unique across all objects.
+
+#### object
+
+ObjectName is the Object to query for, like Processor, DirectoryServices, LogicalDisk or similar.
+
+The collector supports only english named counter. Localized counter-names are not supported.
+
+#### type
+
+The counter-type. The value can be `raw` or `formatted`. Optional and defaults to `raw`.
+
+- `raw` returns the raw value of the counter. This is the default.
+- `formatted` returns the formatted value of the counter. This is useful for counters like `Processor Information` where the value is a percentage.
+
+The difference between a raw Windows Performance Counter and a formatted Windows Performance Counter is about how the data is presented and processed:
+
+1. Raw Windows Performance Counter:
+
+   This provides the counter's data in its basic, unprocessed form.
+   The values may represent cumulative counts, time intervals, or other uncalibrated metrics.
+   Interpreting these values often requires more calculations or context, such as calculating deltas or normalizing values over time.
+
+2. Formatted Windows Performance Counter:
+
+   This presents data that has already been processed and interpreted according to the counter type (e.g., rates per second, averages, percentages).
+   Formatted counters are easier to understand directly since the necessary calculations have been applied.
+   These are often what monitoring tools display to users because they are meaningful at a glance.
+
+For example:
+
+* A raw counter for CPU time might give the total number of clock ticks used since the system started.
+* A formatted counter would convert this into a percentage of CPU utilization over a specific time interval.
+
+
+#### instances
+
+The instances key (this is an array) declares the instances of a counter you would like returned, it can be one or more values.
+
+Example: Instances = `["C:","D:","E:"]`
+
+This will return only for the instances C:, D: and E: where relevant. To get all instances of a Counter, use `["*"]` only.
+
+Some Objects like `Memory` do not have instances to select from at all. In this case, the `instances` key can be omitted.
+
+#### counters
+
+List of counters to collect from the object. See the counters sub-schema for more information.
+
+#### counters Sub-Schema
+
+##### name
+
+The name of the counter to collect.
+
+##### metric
+
+It indicates the name of the metric to be exposed. If not specified, the metric name will be generated based on the object name and the counter name.
+
+This key is optional.
+
+##### type
+
+It indicates the type of the counter. The value can be `counter` or `gauge`.
+If not specified, the windows_exporter will try to determine the type based on the counter type.
+
+This key is optional.
+
+##### labels
+
+Labels is a map of key-value pairs that will be added as labels to the metric.
+
+### Example
+
+```
+# HELP windows_performancecounter_memory_cache_faults_sec
+# TYPE windows_performancecounter_memory_cache_faults_sec counter
+windows_performancecounter_memory_cache_faults_sec 7.028097e+06
+# HELP windows_performancecounter_processor_information_processor_time
+# TYPE windows_performancecounter_processor_information_processor_time counter
+windows_performancecounter_processor_information_processor_time{core="0,0",state="active"} 8.3809375e+10
+windows_performancecounter_processor_information_processor_time{core="0,0",state="idle"} 8380.9375
+windows_performancecounter_processor_information_processor_time{core="0,1",state="active"} 8.2868125e+10
+windows_performancecounter_processor_information_processor_time{core="0,1",state="idle"} 8286.8125
+windows_performancecounter_processor_information_processor_time{core="0,10",state="active"} 9.720046875e+10
+windows_performancecounter_processor_information_processor_time{core="0,10",state="idle"} 9720.046875
+windows_performancecounter_processor_information_processor_time{core="0,11",state="active"} 9.994921875e+10
+windows_performancecounter_processor_information_processor_time{core="0,11",state="idle"} 9994.921875
+windows_performancecounter_processor_information_processor_time{core="0,12",state="active"} 1.014403125e+11
+windows_performancecounter_processor_information_processor_time{core="0,12",state="idle"} 10144.03125
+windows_performancecounter_processor_information_processor_time{core="0,13",state="active"} 1.0155453125e+11
+windows_performancecounter_processor_information_processor_time{core="0,13",state="idle"} 10155.453125
+windows_performancecounter_processor_information_processor_time{core="0,14",state="active"} 1.01290625e+11
+windows_performancecounter_processor_information_processor_time{core="0,14",state="idle"} 10129.0625
+windows_performancecounter_processor_information_processor_time{core="0,15",state="active"} 1.0134890625e+11
+windows_performancecounter_processor_information_processor_time{core="0,15",state="idle"} 10134.890625
+windows_performancecounter_processor_information_processor_time{core="0,16",state="active"} 1.01405625e+11
+windows_performancecounter_processor_information_processor_time{core="0,16",state="idle"} 10140.5625
+windows_performancecounter_processor_information_processor_time{core="0,17",state="active"} 1.0153421875e+11
+windows_performancecounter_processor_information_processor_time{core="0,17",state="idle"} 10153.421875
+windows_performancecounter_processor_information_processor_time{core="0,18",state="active"} 1.0086390625e+11
+windows_performancecounter_processor_information_processor_time{core="0,18",state="idle"} 10086.390625
+windows_performancecounter_processor_information_processor_time{core="0,19",state="active"} 1.0123453125e+11
+windows_performancecounter_processor_information_processor_time{core="0,19",state="idle"} 10123.453125
+windows_performancecounter_processor_information_processor_time{core="0,2",state="active"} 8.3548125e+10
+windows_performancecounter_processor_information_processor_time{core="0,2",state="idle"} 8354.8125
+windows_performancecounter_processor_information_processor_time{core="0,20",state="active"} 1.011703125e+11
+windows_performancecounter_processor_information_processor_time{core="0,20",state="idle"} 10117.03125
+windows_performancecounter_processor_information_processor_time{core="0,21",state="active"} 1.0140984375e+11
+windows_performancecounter_processor_information_processor_time{core="0,21",state="idle"} 10140.984375
+windows_performancecounter_processor_information_processor_time{core="0,22",state="active"} 1.014615625e+11
+windows_performancecounter_processor_information_processor_time{core="0,22",state="idle"} 10146.15625
+windows_performancecounter_processor_information_processor_time{core="0,23",state="active"} 1.0145125e+11
+windows_performancecounter_processor_information_processor_time{core="0,23",state="idle"} 10145.125
+windows_performancecounter_processor_information_processor_time{core="0,3",state="active"} 8.488953125e+10
+windows_performancecounter_processor_information_processor_time{core="0,3",state="idle"} 8488.953125
+windows_performancecounter_processor_information_processor_time{core="0,4",state="active"} 9.338234375e+10
+windows_performancecounter_processor_information_processor_time{core="0,4",state="idle"} 9338.234375
+windows_performancecounter_processor_information_processor_time{core="0,5",state="active"} 9.776453125e+10
+windows_performancecounter_processor_information_processor_time{core="0,5",state="idle"} 9776.453125
+windows_performancecounter_processor_information_processor_time{core="0,6",state="active"} 9.736265625e+10
+windows_performancecounter_processor_information_processor_time{core="0,6",state="idle"} 9736.265625
+windows_performancecounter_processor_information_processor_time{core="0,7",state="active"} 9.959375e+10
+windows_performancecounter_processor_information_processor_time{core="0,7",state="idle"} 9959.375
+windows_performancecounter_processor_information_processor_time{core="0,8",state="active"} 9.939421875e+10
+windows_performancecounter_processor_information_processor_time{core="0,8",state="idle"} 9939.421875
+windows_performancecounter_processor_information_processor_time{core="0,9",state="active"} 1.0059484375e+11
+windows_performancecounter_processor_information_processor_time{core="0,9",state="idle"} 10059.484375
+```
+> [!NOTE]
+> If you are using a configuration file, the value must be keep as string.
+
+Example:
+
+```yaml
+collector:
+  performancecounter:
+    objects: |
+```
+
+
+## Metrics
+
+The perfdata collector returns metrics based on the user configuration.
+The metrics are named based on the object name and the counter name.
+The instance name is added as a label to the metric.

docs/collector.physical_disk.md

@@ -21,19 +21,21 @@ If given, a disk needs to *not* match the exclude regexp in order for the corres
 
 ## Metrics
 
-Name | Description | Type | Labels
------|-------------|------|-------
-`requests_queued` | Number of requests outstanding on the disk at the time the performance data is collected | gauge | `disk`
-`read_bytes_total` | Rate at which bytes are transferred from the disk during read operations | counter | `disk`
-`reads_total` | Rate of read operations on the disk | counter | `disk`
-`write_bytes_total` | Rate at which bytes are transferred to the disk during write operations  | counter | `disk`
-`writes_total` | Rate of write operations on the disk  | counter | `disk`
-`read_seconds_total` | Seconds the disk was busy servicing read requests | counter | `disk`
-`write_seconds_total` | Seconds the disk was busy servicing write requests | counter | `disk`
-`free_bytes` | Unused space of the disk in bytes (not real time, updates every 10-15 min) | gauge | `disk`
-`size_bytes` | Total size of the disk in bytes (not real time, updates every 10-15 min) | gauge | `disk`
-`idle_seconds_total` | Seconds the disk was idle (not servicing read/write requests) | counter | `disk`
-`split_ios_total` | Number of I/Os to the disk split into multiple I/Os | counter | `disk`
+| Name                                                   | Description                                                                                             | Type    | Labels |
+|--------------------------------------------------------|---------------------------------------------------------------------------------------------------------|---------|--------|
+| windows_physical_disk_requests_queued                  | The number of requests queued to the disk (PhysicalDisk.CurrentDiskQueueLength)                         | Gauge   | disk   |
+| windows_physical_disk_read_bytes_total                 | The number of bytes transferred from the disk during read operations (PhysicalDisk.DiskReadBytesPerSec) | Counter | disk   |
+| windows_physical_disk_reads_total                      | The number of read operations on the disk (PhysicalDisk.DiskReadsPerSec)                                | Counter | disk   |
+| windows_physical_disk_write_bytes_total                | The number of bytes transferred to the disk during write operations (PhysicalDisk.DiskWriteBytesPerSec) | Counter | disk   |
+| windows_physical_disk_writes_total                     | The number of write operations on the disk (PhysicalDisk.DiskWritesPerSec)                              | Counter | disk   |
+| windows_physical_disk_read_seconds_total               | Seconds that the disk was busy servicing read requests (PhysicalDisk.PercentDiskReadTime)               | Counter | disk   |
+| windows_physical_disk_write_seconds_total              | Seconds that the disk was busy servicing write requests (PhysicalDisk.PercentDiskWriteTime)             | Counter | disk   |
+| windows_physical_disk_idle_seconds_total               | Seconds that the disk was idle (PhysicalDisk.PercentIdleTime)                                           | Counter | disk   |
+| windows_physical_disk_split_ios_total                  | The number of I/Os to the disk that were split into multiple I/Os (PhysicalDisk.SplitIOPerSec)          | Counter | disk   |
+| windows_physical_disk_read_latency_seconds_total       | The average time, in seconds, of a read operation from the disk (PhysicalDisk.AvgDiskSecPerRead)        | Counter | disk   |
+| windows_physical_disk_write_latency_seconds_total      | The average time, in seconds, of a write operation to the disk (PhysicalDisk.AvgDiskSecPerWrite)        | Counter | disk   |
+| windows_physical_disk_read_write_latency_seconds_total | The time, in seconds, of the average disk transfer (PhysicalDisk.AvgDiskSecPerTransfer)                 | Counter | disk   |
+
 
 ### 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.
@@ -52,29 +54,4 @@ rate(windows_physical_disk_reads_total{instance="localhost", disk=~"0"}[2m]) + r
 ```
 
 ## Alerting examples
-**prometheus.rules**
-```yaml
-groups:
-- name: Windows Disk Alerts
-  rules:
-
-  # Sends an alert when disk space usage is above 95%
-  - alert: DiskSpaceUsage
-    expr: 100.0 - 100 * (windows_physical_disk_free_bytes / windows_physical_disk_size_bytes) > 95
-    for: 10m
-    labels:
-      severity: high
-    annotations:
-      summary: "Disk Space Usage (instance {{ $labels.instance }})"
-      description: "Disk Space on Drive is used more than 95%\n  VALUE = {{ $value }}\n  LABELS: {{ $labels }}"
-
-  # Alerts on disks with over 85% space usage predicted to fill within the next four days
-  - alert: DiskFilling
-    expr: 100 * (windows_physical_disk_free_bytes / windows_physical_disk_size_bytes) < 15 and predict_linear(windows_physical_disk_free_bytes[6h], 4 * 24 * 3600) < 0
-    for: 10m
-    labels:
-      severity: warning
-    annotations:
-      summary: "Disk full in four days (instance {{ $labels.instance }})"
-      description: "{{ $labels.disk }} is expected to fill up within four days. Currently {{ $value | humanize }}% is available.\n VALUE = {{ $value }}\n LABELS: {{ $labels }}"
-```
+_This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/collector.process.md

@@ -69,30 +69,35 @@ w3wp_Test
 
 ## Metrics
 
-| Name                                        | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Type    | Labels                                                                                |
-|---------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|---------------------------------------------------------------------------------------|
-| `windows_process_info`                      | A metric with a constant '1' value labeled with process information                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | gauge   | `process`, `process_id`, `creating_process_id`, `process_group_id`,`owner`, `cmdline` |
-| `windows_process_start_time`                | Time of process start                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | gauge   | `process`, `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`, `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`                                                               |
-| `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`, `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`, `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`                                                               |
-| `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`                                                               |
-| `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`, `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`                                                               |
-| `windows_process_private_bytes`             | Current number of bytes this process has allocated that cannot be shared with other processes.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | gauge   | `process`, `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`                                                               |
-| `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`                                                               |
-| `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`                                                               |
-| `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`                                                               |
-| `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`                                                               |
+| Name                                           | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Type    | Labels                                                                                |
+|------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|---------------------------------------------------------------------------------------|
+| `windows_process_info`                         | A metric with a constant '1' value labeled with process information                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | gauge   | `process`, `process_id`, `creating_process_id`, `process_group_id`,`owner`, `cmdline` |
+| `windows_process_start_time_seconds_timestamp` | Epoch time (seconds since 1970/1/1) of process start.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               | gauge   | `process`, `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`, `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`                                                               |
+| `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`, `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`, `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`                                                               |
+| `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`                                                               |
+| `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`, `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`                                                               |
+| `windows_process_private_bytes`                | Current number of bytes this process has allocated that cannot be shared with other processes.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | gauge   | `process`, `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`                                                               |
+| `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`                                                               |
+| `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`                                                               |
+| `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`                                                               |
+| `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`                                                               |
 
 ### Example metric
 _This collector does not yet have explained examples, we would appreciate your help adding them!_
 
 ## Useful queries
-_This collector does not yet have any useful queries added, we would appreciate your help adding them!_
+
+Add extended information like cmdline or owner to other process metrics.
+
+```
+windows_process_working_set_bytes * on(process_id) group_left(owner, cmdline) windows_process_info
+```
 
 ## Alerting examples
 _This collector does not yet have alerting examples, we would appreciate your help adding them!_

docs/collector.system.md

@@ -14,16 +14,16 @@ None
 
 ## Metrics
 
-| Name                                        | Description                                                                                                                                                                                                       | Type    | Labels |
-|---------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|--------|
-| `windows_system_context_switches_total`     | Total number of [context switches](https://en.wikipedia.org/wiki/Context_switch)                                                                                                                                  | counter | None   |
-| `windows_system_exception_dispatches_total` | Total exceptions dispatched by the system                                                                                                                                                                         | counter | None   |
-| `windows_system_processes`                  | Number of process contexts currently loaded or running on the operating system                                                                                                                                    | gauge   | None   |
-| `windows_system_process_limit`              | The size of the user-mode portion of the virtual address space of the calling process, in bytes. This value depends on the type of process, the type of processor, and the configuration of the operating system. | gauge   | None   |
-| `windows_system_processor_queue_length`     | Number of threads in the processor queue. There is a single queue for processor time even on computers with multiple processors.                                                                                  | gauge   | None   |
-| `windows_system_system_calls_total`         | Total combined calls to Windows NT system service routines by all processes running on the computer                                                                                                               | counter | None   |
-| `windows_system_system_up_time`             | Time of last boot of system                                                                                                                                                                                       | gauge   | None   |
-| `windows_system_threads`                    | Number of Windows system [threads](https://en.wikipedia.org/wiki/Thread_(computing))                                                                                                                              | gauge   | None   |
+| Name                                         | Description                                                                                                                                                                                                       | Type    | Labels |
+|----------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|--------|
+| `windows_system_boot_time_timestamp`         | Unix timestamp of last system boot                                                                                                                                                                                | gauge   | None   |
+| `windows_system_context_switches_total`      | Total number of [context switches](https://en.wikipedia.org/wiki/Context_switch)                                                                                                                                  | counter | None   |
+| `windows_system_exception_dispatches_total`  | Total exceptions dispatched by the system                                                                                                                                                                         | counter | None   |
+| `windows_system_processes`                   | Number of process contexts currently loaded or running on the operating system                                                                                                                                    | gauge   | None   |
+| `windows_system_process_limit`               | The size of the user-mode portion of the virtual address space of the calling process, in bytes. This value depends on the type of process, the type of processor, and the configuration of the operating system. | gauge   | None   |
+| `windows_system_processor_queue_length`      | Number of threads in the processor queue. There is a single queue for processor time even on computers with multiple processors.                                                                                  | gauge   | None   |
+| `windows_system_system_calls_total`          | Total combined calls to Windows NT system service routines by all processes running on the computer                                                                                                               | counter | None   |
+| `windows_system_threads`                     | Number of Windows system [threads](https://en.wikipedia.org/wiki/Thread_(computing))                                                                                                                              | gauge   | None   |
 
 
 
@@ -41,7 +41,7 @@ windows_system_processes{instance="localhost"}
 ## Useful queries
 Find hosts that have rebooted in the last 24 hours
 ```
-time() - windows_system_system_up_time < 86400
+time() - windows_system_boot_time_timestamp < 86400
 ```
 
 ## Alerting examples

docs/collector.time.md

@@ -21,16 +21,17 @@ Matching is case-sensitive.
 
 ## 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`         | 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       |
-| `windows_time_current_timestamp_seconds`            | Current time as reported by the operating system, in [Unix time](https://en.wikipedia.org/wiki/Unix_time). See [time.Unix()](https://golang.org/pkg/time/#Unix) for details                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | gauge   | None       |
-| `windows_time_timezone`                             | Current timezone as reported by the operating system.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | gauge   | `timezone` |
+| Name                                               | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | Type    | Labels     |
+|----------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|------------|
+| `windows_time_clock_frequency_adjustment`          | 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.                                                                                                                                                                                                                                                                                                                                                                                                                  | gauge   | None       |
+| `windows_time_clock_frequency_adjustment_ppb`      | 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.                                                                                                                                                                                                                                                                                                                                                                                                                  | gauge   | 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       |
+| `windows_time_current_timestamp_seconds`           | Current time as reported by the operating system, in [Unix time](https://en.wikipedia.org/wiki/Unix_time). See [time.Unix()](https://golang.org/pkg/time/#Unix) for details                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | gauge   | None       |
+| `windows_time_timezone`                            | Current timezone as reported by the operating system.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | gauge   | `timezone` |
 
 ### Example metric
 _This collector does not yet have explained examples, we would appreciate your help adding them!_

docs/collector.update.md

@@ -11,8 +11,12 @@ The Windows Update service is responsible for managing the installation of updat
 | Data source         | Windows Update service |
 | Enabled by default? | No                     |
 
+
 ## Flags
 
+> [!NOTE]
+> The collector name used in the CLI flags is `updates`, while the metric prefix is `update`. This naming mismatch is known and intentional for compatibility reasons.
+
 ### `--collector.updates.online`
 Whether to search for updates online. If set to `false`, the collector will only list updates that are already found by the Windows Update service.
 Set to `true` to search for updates online, which will take longer to complete.
@@ -22,23 +26,23 @@ Define the interval of scraping Windows Update information
 
 ## Metrics
 
-| Name                           | Description                                   | Type  | Labels                        |
-|--------------------------------|-----------------------------------------------|-------|-------------------------------|
-| `windows_updates_pending_info` | Expose information single pending update item | gauge | `category`,`severity`,`title` |
-| `windows_updates_scrape_query_duration_seconds` | Duration of the last scrape query to the Windows Update API | gauge |  |
-| `windows_updates_scrape_timestamp_seconds` | Timestamp of the last scrape | gauge |  |
+| Name                           | Description                                                 | Type  | Labels                        |
+|--------------------------------|-------------------------------------------------------------|-------|-------------------------------|
+| `windows_update_pending_info` | Expose information for a single pending update item         | gauge | `category`,`severity`,`title` |
+| `windows_update_scrape_query_duration_seconds` | Duration of the last scrape query to the Windows Update API | gauge |  |
+| `windows_update_scrape_timestamp_seconds` | Timestamp of the last scrape                                | gauge |  |
 
 ### Example metrics
 ```
-# HELP windows_updates_pending Pending Windows Updates
-# TYPE windows_updates_pending gauge
-windows_updates_pending{category="Drivers",severity="",title="Intel Corporation - Bluetooth - 23.60.5.10"} 1
-# HELP windows_updates_scrape_query_duration_seconds Duration of the last scrape query to the Windows Update API
-# TYPE windows_updates_scrape_query_duration_seconds gauge
-windows_updates_scrape_query_duration_seconds 2.8161838
-# HELP windows_updates_scrape_timestamp_seconds Timestamp of the last scrape
-# TYPE windows_updates_scrape_timestamp_seconds gauge
-windows_updates_scrape_timestamp_seconds 1.727539734e+09
+# HELP windows_update_pending Pending Windows Updates
+# TYPE windows_update_pending gauge
+windows_update_pending{category="Drivers",severity="",title="Intel Corporation - Bluetooth - 23.60.5.10"} 1
+# HELP windows_update_scrape_query_duration_seconds Duration of the last scrape query to the Windows Update API
+# TYPE windows_update_scrape_query_duration_seconds gauge
+windows_update_scrape_query_duration_seconds 2.8161838
+# HELP windows_update_scrape_timestamp_seconds Timestamp of the last scrape
+# TYPE windows_update_scrape_timestamp_seconds gauge
+windows_update_scrape_timestamp_seconds 1.727539734e+09
 ```
 
 ## Useful queries

go.mod

@@ -1,55 +1,53 @@
 module github.com/prometheus-community/windows_exporter
 
-go 1.23
+go 1.24
 
 require (
-	github.com/Microsoft/go-winio v0.6.2
-	github.com/Microsoft/hcsshim v0.12.9
+	github.com/Microsoft/hcsshim v0.13.0
 	github.com/alecthomas/kingpin/v2 v2.4.0
-	github.com/bmatcuk/doublestar/v4 v4.7.1
+	github.com/bmatcuk/doublestar/v4 v4.8.1
 	github.com/dimchansky/utfbom v1.1.1
 	github.com/go-ole/go-ole v1.3.0
-	github.com/google/uuid v1.6.0
-	github.com/prometheus/client_golang v1.20.5
-	github.com/prometheus/client_model v0.6.1
-	github.com/prometheus/common v0.60.1
-	github.com/prometheus/exporter-toolkit v0.13.1
-	github.com/stretchr/testify v1.9.0
-	golang.org/x/sys v0.27.0
+	github.com/prometheus/client_golang v1.22.0
+	github.com/prometheus/client_model v0.6.2
+	github.com/prometheus/common v0.64.0
+	github.com/prometheus/exporter-toolkit v0.14.0
+	github.com/stretchr/testify v1.10.0
+	golang.org/x/sys v0.33.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
+	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/containerd/cgroups/v3 v3.0.3 // indirect
-	github.com/containerd/errdefs v0.3.0 // indirect
+	github.com/containerd/cgroups/v3 v3.0.5 // indirect
+	github.com/containerd/errdefs v1.0.0 // indirect
 	github.com/containerd/errdefs/pkg v0.3.0 // indirect
-	github.com/containerd/typeurl/v2 v2.2.0 // indirect
+	github.com/containerd/typeurl/v2 v2.2.3 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/jpillora/backoff v1.0.0 // indirect
-	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/mdlayher/socket v0.5.1 // indirect
 	github.com/mdlayher/vsock v1.2.1 // 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.15.1 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/prometheus/procfs v0.16.1 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	golang.org/x/crypto v0.28.0 // indirect
-	golang.org/x/net v0.30.0 // indirect
-	golang.org/x/oauth2 v0.23.0 // indirect
-	golang.org/x/sync v0.8.0 // indirect
-	golang.org/x/text v0.19.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
-	google.golang.org/grpc v1.67.1 // indirect
-	google.golang.org/protobuf v1.35.1 // indirect
+	golang.org/x/crypto v0.38.0 // indirect
+	golang.org/x/net v0.40.0 // indirect
+	golang.org/x/oauth2 v0.30.0 // indirect
+	golang.org/x/sync v0.14.0 // indirect
+	golang.org/x/text v0.25.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250512202823-5a2f75b736a9 // indirect
+	google.golang.org/grpc v1.72.1 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )

go.sum

@@ -2,29 +2,29 @@ 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.9 h1:2zJy5KA+l0loz1HzEGqyNnjd3fyZA31ZBCGKacp6lLg=
-github.com/Microsoft/hcsshim v0.12.9/go.mod h1:fJ0gkFAna6ukt0bLdKB8djt4XIJhF/vEPuoIWYVvZ8Y=
+github.com/Microsoft/hcsshim v0.13.0 h1:/BcXOiS6Qi7N9XqUcv27vkIuVOkBEcWstd2pMlWSeaA=
+github.com/Microsoft/hcsshim v0.13.0/go.mod h1:9KWJ/8DgU+QzYGupX4tzMhRQE8h6w90lH6HAaclpEok=
 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-20240927000941-0f3dac36c52b h1:mimo19zliBX/vSQ6PWWSL9lK8qwHozUj03+zLoEB8O0=
 github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b/go.mod h1:fvzegU4vN3H1qMT+8wDmzjAcDONcgo2/SZ/TyfdUOFs=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/bmatcuk/doublestar/v4 v4.7.1 h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0CXv75Q=
-github.com/bmatcuk/doublestar/v4 v4.7.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
+github.com/bmatcuk/doublestar/v4 v4.8.1 h1:54Bopc5c2cAvhLRAzqOGCYHYyhcDHsFF4wWIR5wKP38=
+github.com/bmatcuk/doublestar/v4 v4.8.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/containerd/cgroups/v3 v3.0.3 h1:S5ByHZ/h9PMe5IOQoN7E+nMc2UcLEM/V48DGDJ9kip0=
-github.com/containerd/cgroups/v3 v3.0.3/go.mod h1:8HBe7V3aWGLFPd/k03swSIsGjZhHI2WzJmticMgVuz0=
-github.com/containerd/errdefs v0.3.0 h1:FSZgGOeK4yuT/+DnF07/Olde/q4KBoMsaamhXxIMDp4=
-github.com/containerd/errdefs v0.3.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
+github.com/containerd/cgroups/v3 v3.0.5 h1:44na7Ud+VwyE7LIoJ8JTNQOa549a8543BmzaJHo6Bzo=
+github.com/containerd/cgroups/v3 v3.0.5/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins=
+github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
+github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
 github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=
 github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
-github.com/containerd/typeurl/v2 v2.2.0 h1:6NBDbQzr7I5LHgp34xAXYF5DOTQDn05X58lsPEmzLso=
-github.com/containerd/typeurl/v2 v2.2.0/go.mod h1:8XOOxnyatxSWuG8OfsZXVnAF4iZfedjS/8UHSPJnX4g=
+github.com/containerd/typeurl/v2 v2.2.3 h1:yNA/94zxWdvYACdYO8zofhrTVuQY73fFU1y++dYSw40=
+github.com/containerd/typeurl/v2 v2.2.3/go.mod h1:95ljDnPfD3bAbDJRugOiShd/DlAAsxGtUBhJxIn7SCk=
 github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -43,8 +43,8 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ=
+github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8/go.mod h1:wcDNUvekVysuuOpQKo3191zZyTpiI6se1N1ULghS0sw=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -55,23 +55,23 @@ 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.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.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
-github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 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=
@@ -88,19 +88,20 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+
 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.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
-github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
+github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
 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.60.1 h1:FUas6GcOw66yB/73KC+BOZoFJmbo/1pojoILArPAaSc=
-github.com/prometheus/common v0.60.1/go.mod h1:h0LYf1R1deLSKtD4Vdg8gy4RuOvENW2J/h19V5NADQw=
-github.com/prometheus/exporter-toolkit v0.13.1 h1:Evsh0gWQo2bdOHlnz9+0Nm7/OFfIwhE2Ws4A2jIlR04=
-github.com/prometheus/exporter-toolkit v0.13.1/go.mod h1:ujdv2YIOxtdFxxqtloLpbqmxd5J0Le6IITUvIRSWjj0=
-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/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
+github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
+github.com/prometheus/common v0.64.0 h1:pdZeA+g617P7oGv1CzdTzyeShxAGrTBsolKNOLQPGO4=
+github.com/prometheus/common v0.64.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
+github.com/prometheus/exporter-toolkit v0.14.0 h1:NMlswfibpcZZ+H0sZBiTjrA3/aBFHkNZqE+iCj5EmRg=
+github.com/prometheus/exporter-toolkit v0.14.0/go.mod h1:Gu5LnVvt7Nr/oqTBUC23WILZepW0nffNo10XdhQcwWA=
+github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg=
+github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
 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=
@@ -114,8 +115,9 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.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.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -125,8 +127,8 @@ 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-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
-golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
+golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
+golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 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=
@@ -142,30 +144,30 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
-golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
+golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
+golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
-golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
+golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
 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-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
-golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
+golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 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-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
-golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
+golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 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.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
-golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
+golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
 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=
@@ -183,15 +185,15 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
 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=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250512202823-5a2f75b736a9 h1:IkAfh6J/yllPtpYFU0zZN1hUPYdT0ogkBT/9hMxHjvg=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250512202823-5a2f75b736a9/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.67.1 h1:zWnc1Vrcno+lHZCOofnIMvycFcc0QRGIzm9dhnDX68E=
-google.golang.org/grpc v1.67.1/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
+google.golang.org/grpc v1.72.1 h1:HR03wO6eyZ7lknl75XlxABNVLLFc2PAb6mHlYh756mA=
+google.golang.org/grpc v1.72.1/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -201,8 +203,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.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
-google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 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

@@ -28,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 .\files.wxs .\main.wxs -d ProductName=windows_exporter -d Version=$($MsiVersion) -ext WixToolset.Firewall.wixext -ext WixToolset.UI.wixext -ext WixToolset.Util.wixext"
+Invoke-Expression "wix build -sw1149 -arch $wixArch -o .\windows_exporter-$($Version)-$($Arch).msi .\files.wxs .\main.wxs -d ProductName=windows_exporter -d Version=$($MsiVersion) -ext WixToolset.Firewall.wixext -ext WixToolset.UI.wixext -ext WixToolset.Util.wixext"
 
 Write-Verbose "Done!"
 Pop-Location

installer/files.wxs

@@ -1,5 +1,22 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<!--
+  ~ SPDX-License-Identifier: Apache-2.0
+  ~
+  ~ Copyright The Prometheus Authors
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<Wix xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"
+     xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Fragment>
         <DirectoryRef Id="APPLICATIONFOLDER">
             <Component Transitive="yes">
@@ -12,10 +29,15 @@
                     ErrorControl="normal"
                     Start="auto"
                     Type="ownProcess"
+                    Interactive="no"
                     Vital="yes"
-                    Arguments="--log.file eventlog [ConfigFileFlag] [CollectorsFlag] [ListenFlag] [MetricsPathFlag] [TextfileDirsFlag] [ExtraFlags]">
+                    Arguments="[ConfigFileFlag] [CollectorsFlag] [ListenFlag] [MetricsPathFlag] [TextfileDirsFlag] [ExtraFlags]">
+                    <ServiceConfig
+                        DelayedAutoStart="yes"
+                        OnInstall="yes"
+                        OnReinstall="yes" />
                     <util:ServiceConfig
-                        ResetPeriodInDays="1"
+                        ResetPeriodInDays="0"
                         FirstFailureActionType="restart"
                         SecondFailureActionType="restart"
                         ThirdFailureActionType="restart"
@@ -24,6 +46,12 @@
                     <ServiceDependency Id="wmiApSrv" />
                 </ServiceInstall>
                 <ServiceControl Id="ServiceStateControl" Name="windows_exporter" Remove="uninstall" Start="install" Stop="both"/>
+                <!-- The "Name" field must match the argument to eventlog.Open() -->
+                <util:EventSource Log="Application" Name="windows_exporter"
+                                  EventMessageFile="%SystemRoot%\System32\EventCreate.exe"
+                                  SupportsErrors="yes"
+                                  SupportsInformationals="yes"
+                                  SupportsWarnings="yes"/>
             </Component>
             <Component Id="CreateTextfileDirectory" Directory="textfile_inputs" Guid="d03ef58a-9cbf-4165-ad39-d143e9b27e14">
                 <CreateFolder />

installer/main.wxs

@@ -9,9 +9,26 @@
 <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
 <?endif?>
 
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:fw="http://wixtoolset.org/schemas/v4/wxs/firewall"
-     xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
+<!--
+  ~ SPDX-License-Identifier: Apache-2.0
+  ~
+  ~ Copyright The Prometheus Authors
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<Wix xmlns:fw="http://wixtoolset.org/schemas/v4/wxs/firewall"
+     xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui"
+     xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <Package UpgradeCode="66a6eb5b-1fc2-4b14-a362-5ceec6413308" Name="$(var.ProductName)" Version="$(var.Version)"
              Manufacturer="prometheus-community" Language="1033" Scope="perMachine">
         <SummaryInformation Manufacturer="prometheus-community" Description="$(var.ProductName) $(var.Version) installer" />
@@ -28,6 +45,9 @@
                             Property="OLDERVERSIONBEINGUPGRADED" />
         </Upgrade>
 
+        <CustomAction Id="CheckExtraFlags"
+                      Error="The parameter '--config.file' must not be included in EXTRA_FLAGS. Use CONFIG_FILE instead. Please remove it and try again." />
+
         <CustomAction Id="set_maintenance" Property="MAINTENANCE" Value="true" />
 
         <!-- Set to reinstall all features. -->
@@ -39,12 +59,12 @@
         <CustomAction Id="set_reinstallmode_property"
                       Property="REINSTALLMODE"
                       Value="amus" />
+        <!-- START CUSTOM ACTION FOR CONFIG FILE CREATION -->
         <SetProperty
             Id="CreateConfigFile"
             Value="&quot;[%ComSpec]&quot; /c TYPE NUL >>&quot;[ConfigFile_NonDefault][ConfigFile_Default]&quot;"
             Before="CreateConfigFile"
             Sequence="execute"
-            Condition="ConfigFile_NonDefault OR ConfigFile_Default"
         />
         <CustomAction
             Id="CreateConfigFile"
@@ -54,6 +74,24 @@
             Return="check"
             Impersonate="no"
         />
+        <!-- END CUSTOM ACTION FOR CONFIG FILE CREATION -->
+
+        <!-- START CUSTOM ACTION FOR KILLING THE PROCESS -->
+        <SetProperty
+            Id="KillProcess"
+            Value="&quot;[WindowsFolder]System32\taskkill.exe&quot; /T /F /IM windows_exporter.exe"
+            Before="KillProcess"
+            Sequence="execute"
+        />
+        <CustomAction
+            Id="KillProcess"
+            BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)"
+            DllEntry="WixQuietExec"
+            Execute="deferred"
+            Return="ignore"
+            Impersonate="no"
+        />
+        <!-- END CUSTOM ACTION FOR KILLING THE PROCESS -->
 
         <InstallExecuteSequence>
             <!-- Set REINSTALL=all and REINSTALLMODE=amus if the user reruns the
@@ -63,6 +101,10 @@
             <Custom Action="set_reinstall_all_property" Before="set_reinstallmode_property" Condition="MAINTENANCE"/>
             <Custom Action="set_reinstallmode_property" Before="LaunchConditions" Condition="MAINTENANCE"/>
             <Custom Action="CreateConfigFile" Before="InstallServices" Condition="ConfigFile_NonDefault OR ConfigFile_Default" />
+            <Custom Action="KillProcess" Before="RemoveFiles" />
+
+            <Custom Action="CheckExtraFlags" Before="InstallInitialize"
+                    Condition="EXTRA_FLAGS AND (EXTRA_FLAGS&gt;&lt;&quot;--config.file&quot;)" />
         </InstallExecuteSequence>
 
         <Media Id="1" Cabinet="windows_exporter.cab" EmbedCab="yes"  />

internal/collector/ad/ad_test.go

@@ -1,3 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package ad_test
@@ -12,3 +27,7 @@ import (
 func BenchmarkCollector(b *testing.B) {
 	testutils.FuncBenchmarkCollector(b, ad.Name, ad.NewWithFlags)
 }
+
+func TestCollector(t *testing.T) {
+	testutils.TestCollector(t, ad.New, nil)
+}

internal/collector/ad/const.go

@@ -1,207 +0,0 @@
-package ad
-
-const (
-	abANRPerSec                                                      = "AB ANR/sec"
-	abBrowsesPerSec                                                  = "AB Browses/sec"
-	abClientSessions                                                 = "AB Client Sessions"
-	abMatchesPerSec                                                  = "AB Matches/sec"
-	abPropertyReadsPerSec                                            = "AB Property Reads/sec"
-	abProxyLookupsPerSec                                             = "AB Proxy Lookups/sec"
-	abSearchesPerSec                                                 = "AB Searches/sec"
-	approximateHighestDNT                                            = "Approximate highest DNT"
-	atqEstimatedQueueDelay                                           = "ATQ Estimated Queue Delay"
-	atqOutstandingQueuedRequests                                     = "ATQ Outstanding Queued Requests"
-	_                                                                = "ATQ Queue Latency"
-	atqRequestLatency                                                = "ATQ Request Latency"
-	atqThreadsLDAP                                                   = "ATQ Threads LDAP"
-	atqThreadsOther                                                  = "ATQ Threads Other"
-	atqThreadsTotal                                                  = "ATQ Threads Total"
-	baseSearchesPerSec                                               = "Base searches/sec"
-	databaseAddsPerSec                                               = "Database adds/sec"
-	databaseDeletesPerSec                                            = "Database deletes/sec"
-	databaseModifiesPerSec                                           = "Database modifys/sec"
-	databaseRecyclesPerSec                                           = "Database recycles/sec"
-	digestBindsPerSec                                                = "Digest Binds/sec"
-	_                                                                = "DirSync session throttling rate"
-	_                                                                = "DirSync sessions in progress"
-	draHighestUSNCommittedHighPart                                   = "DRA Highest USN Committed (High part)"
-	draHighestUSNCommittedLowPart                                    = "DRA Highest USN Committed (Low part)"
-	draHighestUSNIssuedHighPart                                      = "DRA Highest USN Issued (High part)"
-	draHighestUSNIssuedLowPart                                       = "DRA Highest USN Issued (Low part)"
-	draInboundBytesCompressedBetweenSitesAfterCompressionSinceBoot   = "DRA Inbound Bytes Compressed (Between Sites, After Compression) Since Boot"
-	draInboundBytesCompressedBetweenSitesAfterCompressionPerSec      = "DRA Inbound Bytes Compressed (Between Sites, After Compression)/sec"
-	draInboundBytesCompressedBetweenSitesBeforeCompressionSinceBoot  = "DRA Inbound Bytes Compressed (Between Sites, Before Compression) Since Boot"
-	draInboundBytesCompressedBetweenSitesBeforeCompressionPerSec     = "DRA Inbound Bytes Compressed (Between Sites, Before Compression)/sec"
-	draInboundBytesNotCompressedWithinSiteSinceBoot                  = "DRA Inbound Bytes Not Compressed (Within Site) Since Boot"
-	draInboundBytesNotCompressedWithinSitePerSec                     = "DRA Inbound Bytes Not Compressed (Within Site)/sec"
-	draInboundBytesTotalSinceBoot                                    = "DRA Inbound Bytes Total Since Boot"
-	draInboundBytesTotalPerSec                                       = "DRA Inbound Bytes Total/sec"
-	draInboundFullSyncObjectsRemaining                               = "DRA Inbound Full Sync Objects Remaining"
-	draInboundLinkValueUpdatesRemainingInPacket                      = "DRA Inbound Link Value Updates Remaining in Packet"
-	_                                                                = "DRA Inbound Link Values/sec"
-	draInboundObjectUpdatesRemainingInPacket                         = "DRA Inbound Object Updates Remaining in Packet"
-	draInboundObjectsAppliedPerSec                                   = "DRA Inbound Objects Applied/sec"
-	draInboundObjectsFilteredPerSec                                  = "DRA Inbound Objects Filtered/sec"
-	draInboundObjectsPerSec                                          = "DRA Inbound Objects/sec"
-	draInboundPropertiesAppliedPerSec                                = "DRA Inbound Properties Applied/sec"
-	draInboundPropertiesFilteredPerSec                               = "DRA Inbound Properties Filtered/sec"
-	draInboundPropertiesTotalPerSec                                  = "DRA Inbound Properties Total/sec"
-	_                                                                = "DRA Inbound Sync Link Deletion/sec"
-	draInboundTotalUpdatesRemainingInPacket                          = "DRA Inbound Total Updates Remaining in Packet"
-	draInboundValuesDNsOnlyPerSec                                    = "DRA Inbound Values (DNs only)/sec"
-	draInboundValuesTotalPerSec                                      = "DRA Inbound Values Total/sec"
-	_                                                                = "DRA number of NC replication calls since boot"
-	_                                                                = "DRA number of successful NC replication calls since boot"
-	draOutboundBytesCompressedBetweenSitesAfterCompressionSinceBoot  = "DRA Outbound Bytes Compressed (Between Sites, After Compression) Since Boot"
-	draOutboundBytesCompressedBetweenSitesAfterCompressionPerSec     = "DRA Outbound Bytes Compressed (Between Sites, After Compression)/sec"
-	draOutboundBytesCompressedBetweenSitesBeforeCompressionSinceBoot = "DRA Outbound Bytes Compressed (Between Sites, Before Compression) Since Boot"
-	draOutboundBytesCompressedBetweenSitesBeforeCompressionPerSec    = "DRA Outbound Bytes Compressed (Between Sites, Before Compression)/sec"
-	draOutboundBytesNotCompressedWithinSiteSinceBoot                 = "DRA Outbound Bytes Not Compressed (Within Site) Since Boot"
-	draOutboundBytesNotCompressedWithinSitePerSec                    = "DRA Outbound Bytes Not Compressed (Within Site)/sec"
-	draOutboundBytesTotalSinceBoot                                   = "DRA Outbound Bytes Total Since Boot"
-	draOutboundBytesTotalPerSec                                      = "DRA Outbound Bytes Total/sec"
-	draOutboundObjectsFilteredPerSec                                 = "DRA Outbound Objects Filtered/sec"
-	draOutboundObjectsPerSec                                         = "DRA Outbound Objects/sec"
-	draOutboundPropertiesPerSec                                      = "DRA Outbound Properties/sec"
-	draOutboundValuesDNsOnlyPerSec                                   = "DRA Outbound Values (DNs only)/sec"
-	draOutboundValuesTotalPerSec                                     = "DRA Outbound Values Total/sec"
-	draPendingReplicationOperations                                  = "DRA Pending Replication Operations"
-	draPendingReplicationSynchronizations                            = "DRA Pending Replication Synchronizations"
-	draSyncFailuresOnSchemaMismatch                                  = "DRA Sync Failures on Schema Mismatch"
-	draSyncRequestsMade                                              = "DRA Sync Requests Made"
-	draSyncRequestsSuccessful                                        = "DRA Sync Requests Successful"
-	draThreadsGettingNCChanges                                       = "DRA Threads Getting NC Changes"
-	draThreadsGettingNCChangesHoldingSemaphore                       = "DRA Threads Getting NC Changes Holding Semaphore"
-	_                                                                = "DRA total number of Busy failures since boot"
-	_                                                                = "DRA total number of MissingParent failures since boot"
-	_                                                                = "DRA total number of NotEnoughAttrs/MissingObject failures since boot"
-	_                                                                = "DRA total number of Preempted failures since boot"
-	_                                                                = "DRA total time of applying replication package since boot"
-	_                                                                = "DRA total time of NC replication calls since boot"
-	_                                                                = "DRA total time of successful NC replication calls since boot"
-	_                                                                = "DRA total time of successfully applying replication package since boot"
-	_                                                                = "DRA total time on waiting async replication packages since boot"
-	_                                                                = "DRA total time on waiting sync replication packages since boot"
-	dsPercentReadsFromDRA                                            = "DS % Reads from DRA"
-	dsPercentReadsFromKCC                                            = "DS % Reads from KCC"
-	dsPercentReadsFromLSA                                            = "DS % Reads from LSA"
-	dsPercentReadsFromNSPI                                           = "DS % Reads from NSPI"
-	dsPercentReadsFromNTDSAPI                                        = "DS % Reads from NTDSAPI"
-	dsPercentReadsFromSAM                                            = "DS % Reads from SAM"
-	dsPercentReadsOther                                              = "DS % Reads Other"
-	dsPercentSearchesFromDRA                                         = "DS % Searches from DRA"
-	dsPercentSearchesFromKCC                                         = "DS % Searches from KCC"
-	dsPercentSearchesFromLDAP                                        = "DS % Searches from LDAP"
-	dsPercentSearchesFromLSA                                         = "DS % Searches from LSA"
-	dsPercentSearchesFromNSPI                                        = "DS % Searches from NSPI"
-	dsPercentSearchesFromNTDSAPI                                     = "DS % Searches from NTDSAPI"
-	dsPercentSearchesFromSAM                                         = "DS % Searches from SAM"
-	dsPercentSearchesOther                                           = "DS % Searches Other"
-	dsPercentWritesFromDRA                                           = "DS % Writes from DRA"
-	dsPercentWritesFromKCC                                           = "DS % Writes from KCC"
-	dsPercentWritesFromLDAP                                          = "DS % Writes from LDAP"
-	dsPercentWritesFromLSA                                           = "DS % Writes from LSA"
-	dsPercentWritesFromNSPI                                          = "DS % Writes from NSPI"
-	dsPercentWritesFromNTDSAPI                                       = "DS % Writes from NTDSAPI"
-	dsPercentWritesFromSAM                                           = "DS % Writes from SAM"
-	dsPercentWritesOther                                             = "DS % Writes Other"
-	dsClientBindsPerSec                                              = "DS Client Binds/sec"
-	dsClientNameTranslationsPerSec                                   = "DS Client Name Translations/sec"
-	dsDirectoryReadsPerSec                                           = "DS Directory Reads/sec"
-	dsDirectorySearchesPerSec                                        = "DS Directory Searches/sec"
-	dsDirectoryWritesPerSec                                          = "DS Directory Writes/sec"
-	dsMonitorListSize                                                = "DS Monitor List Size"
-	dsNameCacheHitRate                                               = "DS Name Cache hit rate"
-	dsNotifyQueueSize                                                = "DS Notify Queue Size"
-	dsSearchSubOperationsPerSec                                      = "DS Search sub-operations/sec"
-	dsSecurityDescriptorPropagationsEvents                           = "DS Security Descriptor Propagations Events"
-	dsSecurityDescriptorPropagatorAverageExclusionTime               = "DS Security Descriptor Propagator Average Exclusion Time"
-	dsSecurityDescriptorPropagatorRuntimeQueue                       = "DS Security Descriptor Propagator Runtime Queue"
-	dsSecurityDescriptorSubOperationsPerSec                          = "DS Security Descriptor sub-operations/sec"
-	dsServerBindsPerSec                                              = "DS Server Binds/sec"
-	dsServerNameTranslationsPerSec                                   = "DS Server Name Translations/sec"
-	dsThreadsInUse                                                   = "DS Threads in Use"
-	_                                                                = "Error eventlogs since boot"
-	_                                                                = "Error events since boot"
-	externalBindsPerSec                                              = "External Binds/sec"
-	fastBindsPerSec                                                  = "Fast Binds/sec"
-	_                                                                = "Fatal events since boot"
-	_                                                                = "Info eventlogs since boot"
-	ldapActiveThreads                                                = "LDAP Active Threads"
-	_                                                                = "LDAP Add Operations"
-	_                                                                = "LDAP Add Operations/sec"
-	_                                                                = "LDAP batch slots available"
-	ldapBindTime                                                     = "LDAP Bind Time"
-	_                                                                = "LDAP busy retries"
-	_                                                                = "LDAP busy retries/sec"
-	ldapClientSessions                                               = "LDAP Client Sessions"
-	ldapClosedConnectionsPerSec                                      = "LDAP Closed Connections/sec"
-	_                                                                = "LDAP Delete Operations"
-	_                                                                = "LDAP Delete Operations/sec"
-	_                                                                = "LDAP Modify DN Operations"
-	_                                                                = "LDAP Modify DN Operations/sec"
-	_                                                                = "LDAP Modify Operations"
-	_                                                                = "LDAP Modify Operations/sec"
-	ldapNewConnectionsPerSec                                         = "LDAP New Connections/sec"
-	ldapNewSSLConnectionsPerSec                                      = "LDAP New SSL Connections/sec"
-	_                                                                = "LDAP Outbound Bytes"
-	_                                                                = "LDAP Outbound Bytes/sec"
-	_                                                                = "LDAP Page Search Cache entries count"
-	_                                                                = "LDAP Page Search Cache size"
-	ldapSearchesPerSec                                               = "LDAP Searches/sec"
-	ldapSuccessfulBindsPerSec                                        = "LDAP Successful Binds/sec"
-	_                                                                = "LDAP Threads Sleeping on BUSY"
-	ldapUDPOperationsPerSec                                          = "LDAP UDP operations/sec"
-	ldapWritesPerSec                                                 = "LDAP Writes/sec"
-	linkValuesCleanedPerSec                                          = "Link Values Cleaned/sec"
-	_                                                                = "Links added"
-	_                                                                = "Links added/sec"
-	_                                                                = "Links visited"
-	_                                                                = "Links visited/sec"
-	_                                                                = "Logical link deletes"
-	_                                                                = "Logical link deletes/sec"
-	negotiatedBindsPerSec                                            = "Negotiated Binds/sec"
-	ntlmBindsPerSec                                                  = "NTLM Binds/sec"
-	_                                                                = "Objects returned"
-	_                                                                = "Objects returned/sec"
-	_                                                                = "Objects visited"
-	_                                                                = "Objects visited/sec"
-	oneLevelSearchesPerSec                                           = "Onelevel searches/sec"
-	_                                                                = "PDC failed password update notifications"
-	_                                                                = "PDC password update notifications/sec"
-	_                                                                = "PDC successful password update notifications"
-	phantomsCleanedPerSec                                            = "Phantoms Cleaned/sec"
-	phantomsVisitedPerSec                                            = "Phantoms Visited/sec"
-	_                                                                = "Physical link deletes"
-	_                                                                = "Physical link deletes/sec"
-	_                                                                = "Replicate Single Object operations"
-	_                                                                = "Replicate Single Object operations/sec"
-	_                                                                = "RID Pool invalidations since boot"
-	_                                                                = "RID Pool request failures since boot"
-	_                                                                = "RID Pool request successes since boot"
-	samAccountGroupEvaluationLatency                                 = "SAM Account Group Evaluation Latency"
-	samDisplayInformationQueriesPerSec                               = "SAM Display Information Queries/sec"
-	samDomainLocalGroupMembershipEvaluationsPerSec                   = "SAM Domain Local Group Membership Evaluations/sec"
-	samEnumerationsPerSec                                            = "SAM Enumerations/sec"
-	samGCEvaluationsPerSec                                           = "SAM GC Evaluations/sec"
-	samGlobalGroupMembershipEvaluationsPerSec                        = "SAM Global Group Membership Evaluations/sec"
-	samMachineCreationAttemptsPerSec                                 = "SAM Machine Creation Attempts/sec"
-	samMembershipChangesPerSec                                       = "SAM Membership Changes/sec"
-	samNonTransitiveMembershipEvaluationsPerSec                      = "SAM Non-Transitive Membership Evaluations/sec"
-	samPasswordChangesPerSec                                         = "SAM Password Changes/sec"
-	samResourceGroupEvaluationLatency                                = "SAM Resource Group Evaluation Latency"
-	samSuccessfulComputerCreationsPerSecIncludesAllRequests          = "SAM Successful Computer Creations/sec: Includes all requests"
-	samSuccessfulUserCreationsPerSec                                 = "SAM Successful User Creations/sec"
-	samTransitiveMembershipEvaluationsPerSec                         = "SAM Transitive Membership Evaluations/sec"
-	samUniversalGroupMembershipEvaluationsPerSec                     = "SAM Universal Group Membership Evaluations/sec"
-	samUserCreationAttemptsPerSec                                    = "SAM User Creation Attempts/sec"
-	simpleBindsPerSec                                                = "Simple Binds/sec"
-	subtreeSearchesPerSec                                            = "Subtree searches/sec"
-	tombstonesGarbageCollectedPerSec                                 = "Tombstones Garbage Collected/sec"
-	tombstonesVisitedPerSec                                          = "Tombstones Visited/sec"
-	transitiveOperationsMillisecondsRun                              = "Transitive operations milliseconds run"
-	transitiveOperationsPerSec                                       = "Transitive operations/sec"
-	transitiveSubOperationsPerSec                                    = "Transitive suboperations/sec"
-	_                                                                = "Warning eventlogs since boot"
-	_                                                                = "Warning events since boot"
-)

internal/collector/ad/types.go

@@ -0,0 +1,225 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package ad
+
+type perfDataCounterValues struct {
+	AbANRPerSec                                                      float64 `perfdata:"AB ANR/sec"`
+	AbBrowsesPerSec                                                  float64 `perfdata:"AB Browses/sec"`
+	AbClientSessions                                                 float64 `perfdata:"AB Client Sessions"`
+	AbMatchesPerSec                                                  float64 `perfdata:"AB Matches/sec"`
+	AbPropertyReadsPerSec                                            float64 `perfdata:"AB Property Reads/sec"`
+	AbProxyLookupsPerSec                                             float64 `perfdata:"AB Proxy Lookups/sec"`
+	AbSearchesPerSec                                                 float64 `perfdata:"AB Searches/sec"`
+	ApproximateHighestDNT                                            float64 `perfdata:"Approximate highest DNT"`
+	AtqEstimatedQueueDelay                                           float64 `perfdata:"ATQ Estimated Queue Delay"`
+	AtqOutstandingQueuedRequests                                     float64 `perfdata:"ATQ Outstanding Queued Requests"`
+	_                                                                float64 `perfdata:"ATQ Queue Latency"`
+	AtqRequestLatency                                                float64 `perfdata:"ATQ Request Latency"`
+	AtqThreadsLDAP                                                   float64 `perfdata:"ATQ Threads LDAP"`
+	AtqThreadsOther                                                  float64 `perfdata:"ATQ Threads Other"`
+	AtqThreadsTotal                                                  float64 `perfdata:"ATQ Threads Total"`
+	BaseSearchesPerSec                                               float64 `perfdata:"Base searches/sec"`
+	DatabaseAddsPerSec                                               float64 `perfdata:"Database adds/sec"`
+	DatabaseDeletesPerSec                                            float64 `perfdata:"Database deletes/sec"`
+	DatabaseModifiesPerSec                                           float64 `perfdata:"Database modifys/sec"`
+	DatabaseRecyclesPerSec                                           float64 `perfdata:"Database recycles/sec"`
+	DigestBindsPerSec                                                float64 `perfdata:"Digest Binds/sec"`
+	_                                                                float64 `perfdata:"DirSync session throttling rate"`
+	_                                                                float64 `perfdata:"DirSync sessions in progress"`
+	DRAHighestUSNCommittedHighPart                                   float64 `perfdata:"DRA Highest USN Committed (High part)"`
+	DRAHighestUSNCommittedLowPart                                    float64 `perfdata:"DRA Highest USN Committed (Low part)"`
+	DRAHighestUSNIssuedHighPart                                      float64 `perfdata:"DRA Highest USN Issued (High part)"`
+	DRAHighestUSNIssuedLowPart                                       float64 `perfdata:"DRA Highest USN Issued (Low part)"`
+	DRAInboundBytesCompressedBetweenSitesAfterCompressionSinceBoot   float64 `perfdata:"DRA Inbound Bytes Compressed (Between Sites, After Compression) Since Boot"`
+	DRAInboundBytesCompressedBetweenSitesAfterCompressionPerSec      float64 `perfdata:"DRA Inbound Bytes Compressed (Between Sites, After Compression)/sec"`
+	DRAInboundBytesCompressedBetweenSitesBeforeCompressionSinceBoot  float64 `perfdata:"DRA Inbound Bytes Compressed (Between Sites, Before Compression) Since Boot"`
+	DRAInboundBytesCompressedBetweenSitesBeforeCompressionPerSec     float64 `perfdata:"DRA Inbound Bytes Compressed (Between Sites, Before Compression)/sec"`
+	DRAInboundBytesNotCompressedWithinSiteSinceBoot                  float64 `perfdata:"DRA Inbound Bytes Not Compressed (Within Site) Since Boot"`
+	DRAInboundBytesNotCompressedWithinSitePerSec                     float64 `perfdata:"DRA Inbound Bytes Not Compressed (Within Site)/sec"`
+	DRAInboundBytesTotalSinceBoot                                    float64 `perfdata:"DRA Inbound Bytes Total Since Boot"`
+	DRAInboundBytesTotalPerSec                                       float64 `perfdata:"DRA Inbound Bytes Total/sec"`
+	DRAInboundFullSyncObjectsRemaining                               float64 `perfdata:"DRA Inbound Full Sync Objects Remaining"`
+	DRAInboundLinkValueUpdatesRemainingInPacket                      float64 `perfdata:"DRA Inbound Link Value Updates Remaining in Packet"`
+	_                                                                float64 `perfdata:"DRA Inbound Link Values/sec"`
+	DRAInboundObjectUpdatesRemainingInPacket                         float64 `perfdata:"DRA Inbound Object Updates Remaining in Packet"`
+	DRAInboundObjectsAppliedPerSec                                   float64 `perfdata:"DRA Inbound Objects Applied/sec"`
+	DRAInboundObjectsFilteredPerSec                                  float64 `perfdata:"DRA Inbound Objects Filtered/sec"`
+	DRAInboundObjectsPerSec                                          float64 `perfdata:"DRA Inbound Objects/sec"`
+	DRAInboundPropertiesAppliedPerSec                                float64 `perfdata:"DRA Inbound Properties Applied/sec"`
+	DRAInboundPropertiesFilteredPerSec                               float64 `perfdata:"DRA Inbound Properties Filtered/sec"`
+	DRAInboundPropertiesTotalPerSec                                  float64 `perfdata:"DRA Inbound Properties Total/sec"`
+	_                                                                float64 `perfdata:"DRA Inbound Sync Link Deletion/sec"`
+	DRAInboundTotalUpdatesRemainingInPacket                          float64 `perfdata:"DRA Inbound Total Updates Remaining in Packet"`
+	DRAInboundValuesDNsOnlyPerSec                                    float64 `perfdata:"DRA Inbound Values (DNs only)/sec"`
+	DRAInboundValuesTotalPerSec                                      float64 `perfdata:"DRA Inbound Values Total/sec"`
+	_                                                                float64 `perfdata:"DRA number of NC replication calls since boot"`
+	_                                                                float64 `perfdata:"DRA number of successful NC replication calls since boot"`
+	DRAOutboundBytesCompressedBetweenSitesAfterCompressionSinceBoot  float64 `perfdata:"DRA Outbound Bytes Compressed (Between Sites, After Compression) Since Boot"`
+	DRAOutboundBytesCompressedBetweenSitesAfterCompressionPerSec     float64 `perfdata:"DRA Outbound Bytes Compressed (Between Sites, After Compression)/sec"`
+	DRAOutboundBytesCompressedBetweenSitesBeforeCompressionSinceBoot float64 `perfdata:"DRA Outbound Bytes Compressed (Between Sites, Before Compression) Since Boot"`
+	DRAOutboundBytesCompressedBetweenSitesBeforeCompressionPerSec    float64 `perfdata:"DRA Outbound Bytes Compressed (Between Sites, Before Compression)/sec"`
+	DRAOutboundBytesNotCompressedWithinSiteSinceBoot                 float64 `perfdata:"DRA Outbound Bytes Not Compressed (Within Site) Since Boot"`
+	DRAOutboundBytesNotCompressedWithinSitePerSec                    float64 `perfdata:"DRA Outbound Bytes Not Compressed (Within Site)/sec"`
+	DRAOutboundBytesTotalSinceBoot                                   float64 `perfdata:"DRA Outbound Bytes Total Since Boot"`
+	DRAOutboundBytesTotalPerSec                                      float64 `perfdata:"DRA Outbound Bytes Total/sec"`
+	DRAOutboundObjectsFilteredPerSec                                 float64 `perfdata:"DRA Outbound Objects Filtered/sec"`
+	DRAOutboundObjectsPerSec                                         float64 `perfdata:"DRA Outbound Objects/sec"`
+	DRAOutboundPropertiesPerSec                                      float64 `perfdata:"DRA Outbound Properties/sec"`
+	DRAOutboundValuesDNsOnlyPerSec                                   float64 `perfdata:"DRA Outbound Values (DNs only)/sec"`
+	DRAOutboundValuesTotalPerSec                                     float64 `perfdata:"DRA Outbound Values Total/sec"`
+	DRAPendingReplicationOperations                                  float64 `perfdata:"DRA Pending Replication Operations"`
+	DRAPendingReplicationSynchronizations                            float64 `perfdata:"DRA Pending Replication Synchronizations"`
+	DRASyncFailuresOnSchemaMismatch                                  float64 `perfdata:"DRA Sync Failures on Schema Mismatch"`
+	DRASyncRequestsMade                                              float64 `perfdata:"DRA Sync Requests Made"`
+	DRASyncRequestsSuccessful                                        float64 `perfdata:"DRA Sync Requests Successful"`
+	DRAThreadsGettingNCChanges                                       float64 `perfdata:"DRA Threads Getting NC Changes"`
+	DRAThreadsGettingNCChangesHoldingSemaphore                       float64 `perfdata:"DRA Threads Getting NC Changes Holding Semaphore"`
+	_                                                                float64 `perfdata:"DRA total number of Busy failures since boot"`
+	_                                                                float64 `perfdata:"DRA total number of MissingParent failures since boot"`
+	_                                                                float64 `perfdata:"DRA total number of NotEnoughAttrs/MissingObject failures since boot"`
+	_                                                                float64 `perfdata:"DRA total number of Preempted failures since boot"`
+	_                                                                float64 `perfdata:"DRA total time of applying replication package since boot"`
+	_                                                                float64 `perfdata:"DRA total time of NC replication calls since boot"`
+	_                                                                float64 `perfdata:"DRA total time of successful NC replication calls since boot"`
+	_                                                                float64 `perfdata:"DRA total time of successfully applying replication package since boot"`
+	_                                                                float64 `perfdata:"DRA total time on waiting async replication packages since boot"`
+	_                                                                float64 `perfdata:"DRA total time on waiting sync replication packages since boot"`
+	DsPercentReadsFromDRA                                            float64 `perfdata:"DS % Reads from DRA"`
+	DsPercentReadsFromKCC                                            float64 `perfdata:"DS % Reads from KCC"`
+	DsPercentReadsFromLSA                                            float64 `perfdata:"DS % Reads from LSA"`
+	DsPercentReadsFromNSPI                                           float64 `perfdata:"DS % Reads from NSPI"`
+	DsPercentReadsFromNTDSAPI                                        float64 `perfdata:"DS % Reads from NTDSAPI"`
+	DsPercentReadsFromSAM                                            float64 `perfdata:"DS % Reads from SAM"`
+	DsPercentReadsOther                                              float64 `perfdata:"DS % Reads Other"`
+	DsPercentSearchesFromDRA                                         float64 `perfdata:"DS % Searches from DRA"`
+	DsPercentSearchesFromKCC                                         float64 `perfdata:"DS % Searches from KCC"`
+	DsPercentSearchesFromLDAP                                        float64 `perfdata:"DS % Searches from LDAP"`
+	DsPercentSearchesFromLSA                                         float64 `perfdata:"DS % Searches from LSA"`
+	DsPercentSearchesFromNSPI                                        float64 `perfdata:"DS % Searches from NSPI"`
+	DsPercentSearchesFromNTDSAPI                                     float64 `perfdata:"DS % Searches from NTDSAPI"`
+	DsPercentSearchesFromSAM                                         float64 `perfdata:"DS % Searches from SAM"`
+	DsPercentSearchesOther                                           float64 `perfdata:"DS % Searches Other"`
+	DsPercentWritesFromDRA                                           float64 `perfdata:"DS % Writes from DRA"`
+	DsPercentWritesFromKCC                                           float64 `perfdata:"DS % Writes from KCC"`
+	DsPercentWritesFromLDAP                                          float64 `perfdata:"DS % Writes from LDAP"`
+	DsPercentWritesFromLSA                                           float64 `perfdata:"DS % Writes from LSA"`
+	DsPercentWritesFromNSPI                                          float64 `perfdata:"DS % Writes from NSPI"`
+	DsPercentWritesFromNTDSAPI                                       float64 `perfdata:"DS % Writes from NTDSAPI"`
+	DsPercentWritesFromSAM                                           float64 `perfdata:"DS % Writes from SAM"`
+	DsPercentWritesOther                                             float64 `perfdata:"DS % Writes Other"`
+	DsClientBindsPerSec                                              float64 `perfdata:"DS Client Binds/sec"`
+	DsClientNameTranslationsPerSec                                   float64 `perfdata:"DS Client Name Translations/sec"`
+	DsDirectoryReadsPerSec                                           float64 `perfdata:"DS Directory Reads/sec"`
+	DsDirectorySearchesPerSec                                        float64 `perfdata:"DS Directory Searches/sec"`
+	DsDirectoryWritesPerSec                                          float64 `perfdata:"DS Directory Writes/sec"`
+	DsMonitorListSize                                                float64 `perfdata:"DS Monitor List Size"`
+	DsNameCacheHitRate                                               float64 `perfdata:"DS Name Cache hit rate"`
+	DsNameCacheHitRateSecondValue                                    float64 `perfdata:"DS Name Cache hit rate,secondvalue"`
+	DsNotifyQueueSize                                                float64 `perfdata:"DS Notify Queue Size"`
+	DsSearchSubOperationsPerSec                                      float64 `perfdata:"DS Search sub-operations/sec"`
+	DsSecurityDescriptorPropagationsEvents                           float64 `perfdata:"DS Security Descriptor Propagations Events"`
+	DsSecurityDescriptorPropagatorAverageExclusionTime               float64 `perfdata:"DS Security Descriptor Propagator Average Exclusion Time"`
+	DsSecurityDescriptorPropagatorRuntimeQueue                       float64 `perfdata:"DS Security Descriptor Propagator Runtime Queue"`
+	DsSecurityDescriptorSubOperationsPerSec                          float64 `perfdata:"DS Security Descriptor sub-operations/sec"`
+	DsServerBindsPerSec                                              float64 `perfdata:"DS Server Binds/sec"`
+	DsServerNameTranslationsPerSec                                   float64 `perfdata:"DS Server Name Translations/sec"`
+	DsThreadsInUse                                                   float64 `perfdata:"DS Threads in Use"`
+	_                                                                float64 `perfdata:"Error eventlogs since boot"`
+	_                                                                float64 `perfdata:"Error events since boot"`
+	ExternalBindsPerSec                                              float64 `perfdata:"External Binds/sec"`
+	FastBindsPerSec                                                  float64 `perfdata:"Fast Binds/sec"`
+	_                                                                float64 `perfdata:"Fatal events since boot"`
+	_                                                                float64 `perfdata:"Info eventlogs since boot"`
+	LdapActiveThreads                                                float64 `perfdata:"LDAP Active Threads"`
+	_                                                                float64 `perfdata:"LDAP Add Operations"`
+	_                                                                float64 `perfdata:"LDAP Add Operations/sec"`
+	_                                                                float64 `perfdata:"LDAP batch slots available"`
+	LdapBindTime                                                     float64 `perfdata:"LDAP Bind Time"`
+	_                                                                float64 `perfdata:"LDAP busy retries"`
+	_                                                                float64 `perfdata:"LDAP busy retries/sec"`
+	LdapClientSessions                                               float64 `perfdata:"LDAP Client Sessions"`
+	LdapClosedConnectionsPerSec                                      float64 `perfdata:"LDAP Closed Connections/sec"`
+	_                                                                float64 `perfdata:"LDAP Delete Operations"`
+	_                                                                float64 `perfdata:"LDAP Delete Operations/sec"`
+	_                                                                float64 `perfdata:"LDAP Modify DN Operations"`
+	_                                                                float64 `perfdata:"LDAP Modify DN Operations/sec"`
+	_                                                                float64 `perfdata:"LDAP Modify Operations"`
+	_                                                                float64 `perfdata:"LDAP Modify Operations/sec"`
+	LdapNewConnectionsPerSec                                         float64 `perfdata:"LDAP New Connections/sec"`
+	LdapNewSSLConnectionsPerSec                                      float64 `perfdata:"LDAP New SSL Connections/sec"`
+	_                                                                float64 `perfdata:"LDAP Outbound Bytes"`
+	_                                                                float64 `perfdata:"LDAP Outbound Bytes/sec"`
+	_                                                                float64 `perfdata:"LDAP Page Search Cache entries count"`
+	_                                                                float64 `perfdata:"LDAP Page Search Cache size"`
+	LdapSearchesPerSec                                               float64 `perfdata:"LDAP Searches/sec"`
+	LdapSuccessfulBindsPerSec                                        float64 `perfdata:"LDAP Successful Binds/sec"`
+	_                                                                float64 `perfdata:"LDAP Threads Sleeping on BUSY"`
+	LdapUDPOperationsPerSec                                          float64 `perfdata:"LDAP UDP operations/sec"`
+	LdapWritesPerSec                                                 float64 `perfdata:"LDAP Writes/sec"`
+	LinkValuesCleanedPerSec                                          float64 `perfdata:"Link Values Cleaned/sec"`
+	_                                                                float64 `perfdata:"Links added"`
+	_                                                                float64 `perfdata:"Links added/sec"`
+	_                                                                float64 `perfdata:"Links visited"`
+	_                                                                float64 `perfdata:"Links visited/sec"`
+	_                                                                float64 `perfdata:"Logical link deletes"`
+	_                                                                float64 `perfdata:"Logical link deletes/sec"`
+	NegotiatedBindsPerSec                                            float64 `perfdata:"Negotiated Binds/sec"`
+	NTLMBindsPerSec                                                  float64 `perfdata:"NTLM Binds/sec"`
+	_                                                                float64 `perfdata:"Objects returned"`
+	_                                                                float64 `perfdata:"Objects returned/sec"`
+	_                                                                float64 `perfdata:"Objects visited"`
+	_                                                                float64 `perfdata:"Objects visited/sec"`
+	OneLevelSearchesPerSec                                           float64 `perfdata:"Onelevel searches/sec"`
+	_                                                                float64 `perfdata:"PDC failed password update notifications"`
+	_                                                                float64 `perfdata:"PDC password update notifications/sec"`
+	_                                                                float64 `perfdata:"PDC successful password update notifications"`
+	PhantomsCleanedPerSec                                            float64 `perfdata:"Phantoms Cleaned/sec"`
+	PhantomsVisitedPerSec                                            float64 `perfdata:"Phantoms Visited/sec"`
+	_                                                                float64 `perfdata:"Physical link deletes"`
+	_                                                                float64 `perfdata:"Physical link deletes/sec"`
+	_                                                                float64 `perfdata:"Replicate Single Object operations"`
+	_                                                                float64 `perfdata:"Replicate Single Object operations/sec"`
+	_                                                                float64 `perfdata:"RID Pool invalidations since boot"`
+	_                                                                float64 `perfdata:"RID Pool request failures since boot"`
+	_                                                                float64 `perfdata:"RID Pool request successes since boot"`
+	SamAccountGroupEvaluationLatency                                 float64 `perfdata:"SAM Account Group Evaluation Latency"`
+	SamDisplayInformationQueriesPerSec                               float64 `perfdata:"SAM Display Information Queries/sec"`
+	SamDomainLocalGroupMembershipEvaluationsPerSec                   float64 `perfdata:"SAM Domain Local Group Membership Evaluations/sec"`
+	SamEnumerationsPerSec                                            float64 `perfdata:"SAM Enumerations/sec"`
+	SamGCEvaluationsPerSec                                           float64 `perfdata:"SAM GC Evaluations/sec"`
+	SamGlobalGroupMembershipEvaluationsPerSec                        float64 `perfdata:"SAM Global Group Membership Evaluations/sec"`
+	SamMachineCreationAttemptsPerSec                                 float64 `perfdata:"SAM Machine Creation Attempts/sec"`
+	SamMembershipChangesPerSec                                       float64 `perfdata:"SAM Membership Changes/sec"`
+	SamNonTransitiveMembershipEvaluationsPerSec                      float64 `perfdata:"SAM Non-Transitive Membership Evaluations/sec"`
+	SamPasswordChangesPerSec                                         float64 `perfdata:"SAM Password Changes/sec"`
+	SamResourceGroupEvaluationLatency                                float64 `perfdata:"SAM Resource Group Evaluation Latency"`
+	SamSuccessfulComputerCreationsPerSecIncludesAllRequests          float64 `perfdata:"SAM Successful Computer Creations/sec: Includes all requests"`
+	SamSuccessfulUserCreationsPerSec                                 float64 `perfdata:"SAM Successful User Creations/sec"`
+	SamTransitiveMembershipEvaluationsPerSec                         float64 `perfdata:"SAM Transitive Membership Evaluations/sec"`
+	SamUniversalGroupMembershipEvaluationsPerSec                     float64 `perfdata:"SAM Universal Group Membership Evaluations/sec"`
+	SamUserCreationAttemptsPerSec                                    float64 `perfdata:"SAM User Creation Attempts/sec"`
+	SimpleBindsPerSec                                                float64 `perfdata:"Simple Binds/sec"`
+	SubtreeSearchesPerSec                                            float64 `perfdata:"Subtree searches/sec"`
+	TombstonesGarbageCollectedPerSec                                 float64 `perfdata:"Tombstones Garbage Collected/sec"`
+	TombstonesVisitedPerSec                                          float64 `perfdata:"Tombstones Visited/sec"`
+	TransitiveOperationsMillisecondsRun                              float64 `perfdata:"Transitive operations milliseconds run"`
+	TransitiveOperationsPerSec                                       float64 `perfdata:"Transitive operations/sec"`
+	TransitiveSubOperationsPerSec                                    float64 `perfdata:"Transitive suboperations/sec"`
+	_                                                                float64 `perfdata:"Warning eventlogs since boot"`
+	_                                                                float64 `perfdata:"Warning events since boot"`
+}

internal/collector/adcs/adcs.go

@@ -1,15 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package adcs
 
 import (
-	"errors"
 	"fmt"
 	"log/slog"
 
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/prometheus-community/windows_exporter/internal/mi"
-	"github.com/prometheus-community/windows_exporter/internal/perfdata"
+	"github.com/prometheus-community/windows_exporter/internal/pdh"
 	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus-community/windows_exporter/internal/utils"
 	"github.com/prometheus/client_golang/prometheus"
@@ -19,12 +33,14 @@ const Name = "adcs"
 
 type Config struct{}
 
+//nolint:gochecknoglobals
 var ConfigDefaults = Config{}
 
 type Collector struct {
 	config Config
 
-	perfDataCollector *perfdata.Collector
+	perfDataCollector *pdh.Collector
+	perfDataObject    []perfDataCounterValues
 
 	challengeResponseProcessingTime              *prometheus.Desc
 	challengeResponsesPerSecond                  *prometheus.Desc
@@ -68,27 +84,6 @@ func (c *Collector) Close() error {
 }
 
 func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
-	var err error
-
-	c.perfDataCollector, err = perfdata.NewCollector("Certification Authority", perfdata.InstanceAll, []string{
-		requestsPerSecond,
-		requestProcessingTime,
-		retrievalsPerSecond,
-		retrievalProcessingTime,
-		failedRequestsPerSecond,
-		issuedRequestsPerSecond,
-		pendingRequestsPerSecond,
-		requestCryptographicSigningTime,
-		requestPolicyModuleProcessingTime,
-		challengeResponsesPerSecond,
-		challengeResponseProcessingTime,
-		signedCertificateTimestampListsPerSecond,
-		signedCertificateTimestampListProcessingTime,
-	})
-	if err != nil {
-		return fmt.Errorf("failed to create Certification Authority collector: %w", err)
-	}
-
 	c.requestsPerSecond = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "requests_total"),
 		"Total certificate requests processed",
@@ -168,97 +163,100 @@ func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
 		nil,
 	)
 
+	var err error
+
+	c.perfDataCollector, err = pdh.NewCollector[perfDataCounterValues](pdh.CounterTypeRaw, "Certification Authority", pdh.InstancesAll)
+	if err != nil {
+		return fmt.Errorf("failed to create Certification Authority collector: %w", err)
+	}
+
 	return nil
 }
 
 func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
-	perfData, err := c.perfDataCollector.Collect()
+	err := c.perfDataCollector.Collect(&c.perfDataObject)
 	if err != nil {
 		return fmt.Errorf("failed to collect Certification Authority (ADCS) metrics: %w", err)
 	}
 
-	if len(perfData) == 0 {
-		return errors.New("perflib query for Certification Authority (ADCS) returned empty result set")
-	}
-
-	for name, data := range perfData {
+	for _, data := range c.perfDataObject {
 		ch <- prometheus.MustNewConstMetric(
 			c.requestsPerSecond,
 			prometheus.CounterValue,
-			data[requestsPerSecond].FirstValue,
-			name,
+			data.RequestsPerSecond,
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.requestProcessingTime,
 			prometheus.GaugeValue,
-			utils.MilliSecToSec(data[requestProcessingTime].FirstValue),
-			name,
+			utils.MilliSecToSec(data.RequestProcessingTime),
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.retrievalsPerSecond,
 			prometheus.CounterValue,
-			data[retrievalsPerSecond].FirstValue,
-			name,
+			data.RetrievalsPerSecond,
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.retrievalProcessingTime,
 			prometheus.GaugeValue,
-			utils.MilliSecToSec(data[retrievalProcessingTime].FirstValue),
-			name,
+			utils.MilliSecToSec(data.RetrievalProcessingTime),
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.failedRequestsPerSecond,
 			prometheus.CounterValue,
-			data[failedRequestsPerSecond].FirstValue,
-			name,
+			data.FailedRequestsPerSecond,
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.issuedRequestsPerSecond,
 			prometheus.CounterValue,
-			data[issuedRequestsPerSecond].FirstValue,
-			name,
+			data.IssuedRequestsPerSecond,
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.pendingRequestsPerSecond,
 			prometheus.CounterValue,
-			data[pendingRequestsPerSecond].FirstValue,
-			name,
+			data.PendingRequestsPerSecond,
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.requestCryptographicSigningTime,
 			prometheus.GaugeValue,
-			utils.MilliSecToSec(data[requestCryptographicSigningTime].FirstValue),
-			name,
+			utils.MilliSecToSec(data.RequestCryptographicSigningTime),
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.requestPolicyModuleProcessingTime,
 			prometheus.GaugeValue,
-			utils.MilliSecToSec(data[requestPolicyModuleProcessingTime].FirstValue),
-			name,
+			utils.MilliSecToSec(data.RequestPolicyModuleProcessingTime),
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.challengeResponsesPerSecond,
 			prometheus.CounterValue,
-			data[challengeResponsesPerSecond].FirstValue,
-			name,
+			data.ChallengeResponsesPerSecond,
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.challengeResponseProcessingTime,
 			prometheus.GaugeValue,
-			utils.MilliSecToSec(data[challengeResponseProcessingTime].FirstValue),
-			name,
+			utils.MilliSecToSec(data.ChallengeResponseProcessingTime),
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.signedCertificateTimestampListsPerSecond,
 			prometheus.CounterValue,
-			data[signedCertificateTimestampListsPerSecond].FirstValue,
-			name,
+			data.SignedCertificateTimestampListsPerSecond,
+			data.Name,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.signedCertificateTimestampListProcessingTime,
 			prometheus.GaugeValue,
-			utils.MilliSecToSec(data[signedCertificateTimestampListProcessingTime].FirstValue),
-			name,
+			utils.MilliSecToSec(data.SignedCertificateTimestampListProcessingTime),
+			data.Name,
 		)
 	}
 

internal/collector/adcs/adcs_test.go

@@ -1,3 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package adcs_test
@@ -12,3 +27,7 @@ import (
 func BenchmarkCollector(b *testing.B) {
 	testutils.FuncBenchmarkCollector(b, adcs.Name, adcs.NewWithFlags)
 }
+
+func TestCollector(t *testing.T) {
+	testutils.TestCollector(t, adcs.New, nil)
+}

internal/collector/adcs/const.go

@@ -1,19 +0,0 @@
-//go:build windows
-
-package adcs
-
-const (
-	challengeResponseProcessingTime              = "Challenge Response processing time (ms)"
-	challengeResponsesPerSecond                  = "Challenge Responses/sec"
-	failedRequestsPerSecond                      = "Failed Requests/sec"
-	issuedRequestsPerSecond                      = "Issued Requests/sec"
-	pendingRequestsPerSecond                     = "Pending Requests/sec"
-	requestCryptographicSigningTime              = "Request cryptographic signing time (ms)"
-	requestPolicyModuleProcessingTime            = "Request policy module processing time (ms)"
-	requestProcessingTime                        = "Request processing time (ms)"
-	requestsPerSecond                            = "Requests/sec"
-	retrievalProcessingTime                      = "Retrieval processing time (ms)"
-	retrievalsPerSecond                          = "Retrievals/sec"
-	signedCertificateTimestampListProcessingTime = "Signed Certificate Timestamp List processing time (ms)"
-	signedCertificateTimestampListsPerSecond     = "Signed Certificate Timestamp Lists/sec"
-)

internal/collector/adcs/types.go

@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package adcs
+
+type perfDataCounterValues struct {
+	Name string
+
+	ChallengeResponseProcessingTime              float64 `perfdata:"Challenge Response processing time (ms)"`
+	ChallengeResponsesPerSecond                  float64 `perfdata:"Challenge Responses/sec"`
+	FailedRequestsPerSecond                      float64 `perfdata:"Failed Requests/sec"`
+	IssuedRequestsPerSecond                      float64 `perfdata:"Issued Requests/sec"`
+	PendingRequestsPerSecond                     float64 `perfdata:"Pending Requests/sec"`
+	RequestCryptographicSigningTime              float64 `perfdata:"Request cryptographic signing time (ms)"`
+	RequestPolicyModuleProcessingTime            float64 `perfdata:"Request policy module processing time (ms)"`
+	RequestProcessingTime                        float64 `perfdata:"Request processing time (ms)"`
+	RequestsPerSecond                            float64 `perfdata:"Requests/sec"`
+	RetrievalProcessingTime                      float64 `perfdata:"Retrieval processing time (ms)"`
+	RetrievalsPerSecond                          float64 `perfdata:"Retrievals/sec"`
+	SignedCertificateTimestampListProcessingTime float64 `perfdata:"Signed Certificate Timestamp List processing time (ms)"`
+	SignedCertificateTimestampListsPerSecond     float64 `perfdata:"Signed Certificate Timestamp Lists/sec"`
+}

internal/collector/adfs/adfs.go

@@ -1,18 +1,30 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package adfs
 
 import (
-	"errors"
 	"fmt"
 	"log/slog"
-	"maps"
 	"math"
-	"slices"
 
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/prometheus-community/windows_exporter/internal/mi"
-	"github.com/prometheus-community/windows_exporter/internal/perfdata"
+	"github.com/prometheus-community/windows_exporter/internal/pdh"
 	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
@@ -21,12 +33,14 @@ const Name = "adfs"
 
 type Config struct{}
 
+//nolint:gochecknoglobals
 var ConfigDefaults = Config{}
 
 type Collector struct {
 	config Config
 
-	perfDataCollector *perfdata.Collector
+	perfDataCollector *pdh.Collector
+	perfDataObject    []perfDataCounterValues
 
 	adLoginConnectionFailures                          *prometheus.Desc
 	artifactDBFailures                                 *prometheus.Desc
@@ -100,57 +114,6 @@ func (c *Collector) Close() error {
 }
 
 func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
-	var err error
-
-	c.perfDataCollector, err = perfdata.NewCollector("AD FS", perfdata.InstanceAll, []string{
-		adLoginConnectionFailures,
-		certificateAuthentications,
-		deviceAuthentications,
-		extranetAccountLockouts,
-		federatedAuthentications,
-		passportAuthentications,
-		passiveRequests,
-		passwordChangeFailed,
-		passwordChangeSucceeded,
-		tokenRequests,
-		windowsIntegratedAuthentications,
-		oAuthAuthZRequests,
-		oAuthClientAuthentications,
-		oAuthClientAuthenticationFailures,
-		oAuthClientCredentialRequestFailures,
-		oAuthClientCredentialRequests,
-		oAuthClientPrivateKeyJWTAuthenticationFailures,
-		oAuthClientPrivateKeyJWTAuthentications,
-		oAuthClientBasicAuthenticationFailures,
-		oAuthClientBasicAuthentications,
-		oAuthClientSecretPostAuthenticationFailures,
-		oAuthClientSecretPostAuthentications,
-		oAuthClientWindowsAuthenticationFailures,
-		oAuthClientWindowsAuthentications,
-		oAuthLogonCertRequestFailures,
-		oAuthLogonCertTokenRequests,
-		oAuthPasswordGrantRequestFailures,
-		oAuthPasswordGrantRequests,
-		oAuthTokenRequests,
-		samlPTokenRequests,
-		ssoAuthenticationFailures,
-		ssoAuthentications,
-		wsFedTokenRequests,
-		wsTrustTokenRequests,
-		usernamePasswordAuthenticationFailures,
-		usernamePasswordAuthentications,
-		externalAuthentications,
-		externalAuthNFailures,
-		artifactDBFailures,
-		avgArtifactDBQueryTime,
-		configDBFailures,
-		avgConfigDBQueryTime,
-		federationMetadataRequests,
-	})
-	if err != nil {
-		return fmt.Errorf("failed to create AD FS collector: %w", err)
-	}
-
 	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",
@@ -410,283 +373,278 @@ func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
 		nil,
 	)
 
+	var err error
+
+	c.perfDataCollector, err = pdh.NewCollector[perfDataCounterValues](pdh.CounterTypeRaw, "AD FS", nil)
+	if err != nil {
+		return fmt.Errorf("failed to create AD FS collector: %w", err)
+	}
+
 	return nil
 }
 
 func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
-	data, err := c.perfDataCollector.Collect()
+	err := c.perfDataCollector.Collect(&c.perfDataObject)
 	if err != nil {
 		return fmt.Errorf("failed to collect ADFS metrics: %w", err)
 	}
 
-	instanceKey := slices.Collect(maps.Keys(data))
-
-	if len(instanceKey) == 0 {
-		return errors.New("perflib query for ADFS returned empty result set")
-	}
-
-	adfsData, ok := data[instanceKey[0]]
-
-	if !ok {
-		return errors.New("perflib query for ADFS returned empty result set")
-	}
-
 	ch <- prometheus.MustNewConstMetric(
 		c.adLoginConnectionFailures,
 		prometheus.CounterValue,
-		adfsData[adLoginConnectionFailures].FirstValue,
+		c.perfDataObject[0].AdLoginConnectionFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.certificateAuthentications,
 		prometheus.CounterValue,
-		adfsData[certificateAuthentications].FirstValue,
+		c.perfDataObject[0].CertificateAuthentications,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.deviceAuthentications,
 		prometheus.CounterValue,
-		adfsData[deviceAuthentications].FirstValue,
+		c.perfDataObject[0].DeviceAuthentications,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.extranetAccountLockouts,
 		prometheus.CounterValue,
-		adfsData[extranetAccountLockouts].FirstValue,
+		c.perfDataObject[0].ExtranetAccountLockouts,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.federatedAuthentications,
 		prometheus.CounterValue,
-		adfsData[federatedAuthentications].FirstValue,
+		c.perfDataObject[0].FederatedAuthentications,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.passportAuthentications,
 		prometheus.CounterValue,
-		adfsData[passportAuthentications].FirstValue,
+		c.perfDataObject[0].PassportAuthentications,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.passiveRequests,
 		prometheus.CounterValue,
-		adfsData[passiveRequests].FirstValue,
+		c.perfDataObject[0].PassiveRequests,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.passwordChangeFailed,
 		prometheus.CounterValue,
-		adfsData[passwordChangeFailed].FirstValue,
+		c.perfDataObject[0].PasswordChangeFailed,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.passwordChangeSucceeded,
 		prometheus.CounterValue,
-		adfsData[passwordChangeSucceeded].FirstValue,
+		c.perfDataObject[0].PasswordChangeSucceeded,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.tokenRequests,
 		prometheus.CounterValue,
-		adfsData[tokenRequests].FirstValue,
+		c.perfDataObject[0].TokenRequests,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.windowsIntegratedAuthentications,
 		prometheus.CounterValue,
-		adfsData[windowsIntegratedAuthentications].FirstValue,
+		c.perfDataObject[0].WindowsIntegratedAuthentications,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthAuthZRequests,
 		prometheus.CounterValue,
-		adfsData[oAuthAuthZRequests].FirstValue,
+		c.perfDataObject[0].OAuthAuthZRequests,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthClientAuthentications,
 		prometheus.CounterValue,
-		adfsData[oAuthClientAuthentications].FirstValue,
+		c.perfDataObject[0].OAuthClientAuthentications,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthClientAuthenticationsFailures,
 		prometheus.CounterValue,
-		adfsData[oAuthClientAuthenticationFailures].FirstValue,
+		c.perfDataObject[0].OAuthClientAuthenticationFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthClientCredentialsRequestFailures,
 		prometheus.CounterValue,
-		adfsData[oAuthClientCredentialRequestFailures].FirstValue,
+		c.perfDataObject[0].OAuthClientCredentialRequestFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthClientCredentialsRequests,
 		prometheus.CounterValue,
-		adfsData[oAuthClientCredentialRequests].FirstValue,
+		c.perfDataObject[0].OAuthClientCredentialRequests,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthClientPrivateKeyJwtAuthenticationFailures,
 		prometheus.CounterValue,
-		adfsData[oAuthClientPrivateKeyJWTAuthenticationFailures].FirstValue,
+		c.perfDataObject[0].OAuthClientPrivateKeyJWTAuthenticationFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthClientPrivateKeyJwtAuthentications,
 		prometheus.CounterValue,
-		adfsData[oAuthClientPrivateKeyJWTAuthentications].FirstValue,
+		c.perfDataObject[0].OAuthClientPrivateKeyJWTAuthentications,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthClientSecretBasicAuthenticationFailures,
 		prometheus.CounterValue,
-		adfsData[oAuthClientBasicAuthenticationFailures].FirstValue,
+		c.perfDataObject[0].OAuthClientBasicAuthenticationFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthClientSecretBasicAuthentications,
 		prometheus.CounterValue,
-		adfsData[oAuthClientBasicAuthentications].FirstValue,
+		c.perfDataObject[0].OAuthClientBasicAuthentications,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthClientSecretPostAuthenticationFailures,
 		prometheus.CounterValue,
-		adfsData[oAuthClientSecretPostAuthenticationFailures].FirstValue,
+		c.perfDataObject[0].OAuthClientSecretPostAuthenticationFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthClientSecretPostAuthentications,
 		prometheus.CounterValue,
-		adfsData[oAuthClientSecretPostAuthentications].FirstValue,
+		c.perfDataObject[0].OAuthClientSecretPostAuthentications,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthClientWindowsIntegratedAuthenticationFailures,
 		prometheus.CounterValue,
-		adfsData[oAuthClientWindowsAuthenticationFailures].FirstValue,
+		c.perfDataObject[0].OAuthClientWindowsAuthenticationFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthClientWindowsIntegratedAuthentications,
 		prometheus.CounterValue,
-		adfsData[oAuthClientWindowsAuthentications].FirstValue,
+		c.perfDataObject[0].OAuthClientWindowsAuthentications,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthLogonCertificateRequestFailures,
 		prometheus.CounterValue,
-		adfsData[oAuthLogonCertRequestFailures].FirstValue,
+		c.perfDataObject[0].OAuthLogonCertRequestFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthLogonCertificateTokenRequests,
 		prometheus.CounterValue,
-		adfsData[oAuthLogonCertTokenRequests].FirstValue,
+		c.perfDataObject[0].OAuthLogonCertTokenRequests,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthPasswordGrantRequestFailures,
 		prometheus.CounterValue,
-		adfsData[oAuthPasswordGrantRequestFailures].FirstValue,
+		c.perfDataObject[0].OAuthPasswordGrantRequestFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthPasswordGrantRequests,
 		prometheus.CounterValue,
-		adfsData[oAuthPasswordGrantRequests].FirstValue,
+		c.perfDataObject[0].OAuthPasswordGrantRequests,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.oAuthTokenRequests,
 		prometheus.CounterValue,
-		adfsData[oAuthTokenRequests].FirstValue,
+		c.perfDataObject[0].OAuthTokenRequests,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.samlPTokenRequests,
 		prometheus.CounterValue,
-		adfsData[samlPTokenRequests].FirstValue,
+		c.perfDataObject[0].SamlPTokenRequests,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.ssoAuthenticationFailures,
 		prometheus.CounterValue,
-		adfsData[ssoAuthenticationFailures].FirstValue,
+		c.perfDataObject[0].SsoAuthenticationFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.ssoAuthentications,
 		prometheus.CounterValue,
-		adfsData[ssoAuthentications].FirstValue,
+		c.perfDataObject[0].SsoAuthentications,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.wsFedTokenRequests,
 		prometheus.CounterValue,
-		adfsData[wsFedTokenRequests].FirstValue,
+		c.perfDataObject[0].WsFedTokenRequests,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.wsTrustTokenRequests,
 		prometheus.CounterValue,
-		adfsData[wsTrustTokenRequests].FirstValue,
+		c.perfDataObject[0].WsTrustTokenRequests,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.upAuthenticationFailures,
 		prometheus.CounterValue,
-		adfsData[usernamePasswordAuthenticationFailures].FirstValue,
+		c.perfDataObject[0].UsernamePasswordAuthenticationFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.upAuthentications,
 		prometheus.CounterValue,
-		adfsData[usernamePasswordAuthentications].FirstValue,
+		c.perfDataObject[0].UsernamePasswordAuthentications,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.externalAuthenticationFailures,
 		prometheus.CounterValue,
-		adfsData[externalAuthNFailures].FirstValue,
+		c.perfDataObject[0].ExternalAuthNFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.externalAuthentications,
 		prometheus.CounterValue,
-		adfsData[externalAuthentications].FirstValue,
+		c.perfDataObject[0].ExternalAuthentications,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.artifactDBFailures,
 		prometheus.CounterValue,
-		adfsData[artifactDBFailures].FirstValue,
+		c.perfDataObject[0].ArtifactDBFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.avgArtifactDBQueryTime,
 		prometheus.CounterValue,
-		adfsData[avgArtifactDBQueryTime].FirstValue*math.Pow(10, -8),
+		c.perfDataObject[0].AvgArtifactDBQueryTime*math.Pow(10, -8),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.configDBFailures,
 		prometheus.CounterValue,
-		adfsData[configDBFailures].FirstValue,
+		c.perfDataObject[0].ConfigDBFailures,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.avgConfigDBQueryTime,
 		prometheus.CounterValue,
-		adfsData[avgConfigDBQueryTime].FirstValue*math.Pow(10, -8),
+		c.perfDataObject[0].AvgConfigDBQueryTime*math.Pow(10, -8),
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.federationMetadataRequests,
 		prometheus.CounterValue,
-		adfsData[federationMetadataRequests].FirstValue,
+		c.perfDataObject[0].FederationMetadataRequests,
 	)
 
 	return nil

internal/collector/adfs/adfs_test.go

@@ -1,3 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package adfs_test
@@ -12,3 +27,7 @@ import (
 func BenchmarkCollector(b *testing.B) {
 	testutils.FuncBenchmarkCollector(b, adfs.Name, adfs.NewWithFlags)
 }
+
+func TestCollector(t *testing.T) {
+	testutils.TestCollector(t, adfs.New, nil)
+}

internal/collector/adfs/const.go

@@ -1,49 +0,0 @@
-//go:build windows
-
-package adfs
-
-const (
-	adLoginConnectionFailures                      = "AD Login Connection Failures"
-	artifactDBFailures                             = "Artifact Database Connection Failures"
-	avgArtifactDBQueryTime                         = "Average Artifact Database Query Time"
-	avgConfigDBQueryTime                           = "Average Config Database Query Time"
-	certificateAuthentications                     = "Certificate Authentications"
-	configDBFailures                               = "Configuration Database Connection Failures"
-	deviceAuthentications                          = "Device Authentications"
-	externalAuthentications                        = "External Authentications"
-	externalAuthNFailures                          = "External Authentication Failures"
-	extranetAccountLockouts                        = "Extranet Account Lockouts"
-	federatedAuthentications                       = "Federated Authentications"
-	federationMetadataRequests                     = "Federation Metadata Requests"
-	oAuthAuthZRequests                             = "OAuth AuthZ Requests"
-	oAuthClientAuthenticationFailures              = "OAuth Client Authentications Failures"
-	oAuthClientAuthentications                     = "OAuth Client Authentications"
-	oAuthClientBasicAuthenticationFailures         = "OAuth Client Secret Basic Authentication Failures"
-	oAuthClientBasicAuthentications                = "OAuth Client Secret Basic Authentication Requests"
-	oAuthClientCredentialRequestFailures           = "OAuth Client Credentials Request Failures"
-	oAuthClientCredentialRequests                  = "OAuth Client Credentials Requests"
-	oAuthClientPrivateKeyJWTAuthenticationFailures = "OAuth Client Private Key Jwt Authentication Failures"
-	oAuthClientPrivateKeyJWTAuthentications        = "OAuth Client Private Key Jwt Authentications"
-	oAuthClientSecretPostAuthenticationFailures    = "OAuth Client Secret Post Authentication Failures"
-	oAuthClientSecretPostAuthentications           = "OAuth Client Secret Post Authentications"
-	oAuthClientWindowsAuthenticationFailures       = "OAuth Client Windows Integrated Authentication Failures"
-	oAuthClientWindowsAuthentications              = "OAuth Client Windows Integrated Authentications"
-	oAuthLogonCertRequestFailures                  = "OAuth Logon Certificate Request Failures"
-	oAuthLogonCertTokenRequests                    = "OAuth Logon Certificate Token Requests"
-	oAuthPasswordGrantRequestFailures              = "OAuth Password Grant Request Failures"
-	oAuthPasswordGrantRequests                     = "OAuth Password Grant Requests"
-	oAuthTokenRequests                             = "OAuth Token Requests"
-	passiveRequests                                = "Passive Requests"
-	passportAuthentications                        = "Microsoft Passport Authentications"
-	passwordChangeFailed                           = "Password Change Failed Requests"
-	passwordChangeSucceeded                        = "Password Change Successful Requests"
-	samlPTokenRequests                             = "SAML-P Token Requests"
-	ssoAuthenticationFailures                      = "SSO Authentication Failures"
-	ssoAuthentications                             = "SSO Authentications"
-	tokenRequests                                  = "Token Requests"
-	usernamePasswordAuthenticationFailures         = "U/P Authentication Failures"
-	usernamePasswordAuthentications                = "U/P Authentications"
-	windowsIntegratedAuthentications               = "Windows Integrated Authentications"
-	wsFedTokenRequests                             = "WS-Fed Token Requests"
-	wsTrustTokenRequests                           = "WS-Trust Token Requests"
-)

internal/collector/adfs/types.go

@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package adfs
+
+type perfDataCounterValues struct {
+	AdLoginConnectionFailures                      float64 `perfdata:"AD Login Connection Failures"`
+	ArtifactDBFailures                             float64 `perfdata:"Artifact Database Connection Failures"`
+	AvgArtifactDBQueryTime                         float64 `perfdata:"Average Artifact Database Query Time"`
+	AvgConfigDBQueryTime                           float64 `perfdata:"Average Config Database Query Time"`
+	CertificateAuthentications                     float64 `perfdata:"Certificate Authentications"`
+	ConfigDBFailures                               float64 `perfdata:"Configuration Database Connection Failures"`
+	DeviceAuthentications                          float64 `perfdata:"Device Authentications"`
+	ExternalAuthentications                        float64 `perfdata:"External Authentications"`
+	ExternalAuthNFailures                          float64 `perfdata:"External Authentication Failures"`
+	ExtranetAccountLockouts                        float64 `perfdata:"Extranet Account Lockouts"`
+	FederatedAuthentications                       float64 `perfdata:"Federated Authentications"`
+	FederationMetadataRequests                     float64 `perfdata:"Federation Metadata Requests"`
+	OAuthAuthZRequests                             float64 `perfdata:"OAuth AuthZ Requests"`
+	OAuthClientAuthenticationFailures              float64 `perfdata:"OAuth Client Authentications Failures"`
+	OAuthClientAuthentications                     float64 `perfdata:"OAuth Client Authentications"`
+	OAuthClientBasicAuthenticationFailures         float64 `perfdata:"OAuth Client Secret Basic Authentication Failures"`
+	OAuthClientBasicAuthentications                float64 `perfdata:"OAuth Client Secret Basic Authentications"`
+	OAuthClientCredentialRequestFailures           float64 `perfdata:"OAuth Client Credentials Request Failures"`
+	OAuthClientCredentialRequests                  float64 `perfdata:"OAuth Client Credentials Requests"`
+	OAuthClientPrivateKeyJWTAuthenticationFailures float64 `perfdata:"OAuth Client Private Key Jwt Authentication Failures"`
+	OAuthClientPrivateKeyJWTAuthentications        float64 `perfdata:"OAuth Client Private Key Jwt Authentications"`
+	OAuthClientSecretPostAuthenticationFailures    float64 `perfdata:"OAuth Client Secret Post Authentication Failures"`
+	OAuthClientSecretPostAuthentications           float64 `perfdata:"OAuth Client Secret Post Authentications"`
+	OAuthClientWindowsAuthenticationFailures       float64 `perfdata:"OAuth Client Windows Integrated Authentication Failures"`
+	OAuthClientWindowsAuthentications              float64 `perfdata:"OAuth Client Windows Integrated Authentications"`
+	OAuthLogonCertRequestFailures                  float64 `perfdata:"OAuth Logon Certificate Request Failures"`
+	OAuthLogonCertTokenRequests                    float64 `perfdata:"OAuth Logon Certificate Token Requests"`
+	OAuthPasswordGrantRequestFailures              float64 `perfdata:"OAuth Password Grant Request Failures"`
+	OAuthPasswordGrantRequests                     float64 `perfdata:"OAuth Password Grant Requests"`
+	OAuthTokenRequests                             float64 `perfdata:"OAuth Token Requests"`
+	PassiveRequests                                float64 `perfdata:"Passive Requests"`
+	PassportAuthentications                        float64 `perfdata:"Microsoft Passport Authentications"`
+	PasswordChangeFailed                           float64 `perfdata:"Password Change Failed Requests"`
+	PasswordChangeSucceeded                        float64 `perfdata:"Password Change Successful Requests"`
+	SamlPTokenRequests                             float64 `perfdata:"SAML-P Token Requests"`
+	SsoAuthenticationFailures                      float64 `perfdata:"SSO Authentication Failures"`
+	SsoAuthentications                             float64 `perfdata:"SSO Authentications"`
+	TokenRequests                                  float64 `perfdata:"Token Requests"`
+	UsernamePasswordAuthenticationFailures         float64 `perfdata:"U/P Authentication Failures"`
+	UsernamePasswordAuthentications                float64 `perfdata:"U/P Authentications"`
+	WindowsIntegratedAuthentications               float64 `perfdata:"Windows Integrated Authentications"`
+	WsFedTokenRequests                             float64 `perfdata:"WS-Fed Token Requests"`
+	WsTrustTokenRequests                           float64 `perfdata:"WS-Trust Token Requests"`
+}

internal/collector/cache/cache.go

@@ -1,15 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package cache
 
 import (
-	"errors"
 	"fmt"
 	"log/slog"
 
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/prometheus-community/windows_exporter/internal/mi"
-	"github.com/prometheus-community/windows_exporter/internal/perfdata"
+	"github.com/prometheus-community/windows_exporter/internal/pdh"
 	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
@@ -18,13 +32,15 @@ const Name = "cache"
 
 type Config struct{}
 
+//nolint:gochecknoglobals
 var ConfigDefaults = Config{}
 
 // A Collector is a Prometheus Collector for Perflib Cache metrics.
 type Collector struct {
 	config Config
 
-	perfDataCollector *perfdata.Collector
+	perfDataCollector *pdh.Collector
+	perfDataObject    []perfDataCounterValues
 
 	asyncCopyReadsTotal         *prometheus.Desc
 	asyncDataMapsTotal          *prometheus.Desc
@@ -84,43 +100,6 @@ func (c *Collector) Close() error {
 }
 
 func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
-	var err error
-
-	c.perfDataCollector, err = perfdata.NewCollector("Cache", perfdata.InstanceAll, []string{
-		asyncCopyReadsTotal,
-		asyncDataMapsTotal,
-		asyncFastReadsTotal,
-		asyncMDLReadsTotal,
-		asyncPinReadsTotal,
-		copyReadHitsTotal,
-		copyReadsTotal,
-		dataFlushesTotal,
-		dataFlushPagesTotal,
-		dataMapHitsPercent,
-		dataMapPinsTotal,
-		dataMapsTotal,
-		dirtyPages,
-		dirtyPageThreshold,
-		fastReadNotPossiblesTotal,
-		fastReadResourceMissesTotal,
-		fastReadsTotal,
-		lazyWriteFlushesTotal,
-		lazyWritePagesTotal,
-		mdlReadHitsTotal,
-		mdlReadsTotal,
-		pinReadHitsTotal,
-		pinReadsTotal,
-		readAheadsTotal,
-		syncCopyReadsTotal,
-		syncDataMapsTotal,
-		syncFastReadsTotal,
-		syncMDLReadsTotal,
-		syncPinReadsTotal,
-	})
-	if err != nil {
-		return fmt.Errorf("failed to create Cache collector: %w", err)
-	}
-
 	c.asyncCopyReadsTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "async_copy_reads_total"),
 		"(AsyncCopyReadsTotal)",
@@ -296,194 +275,195 @@ func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
 		nil,
 	)
 
+	var err error
+
+	c.perfDataCollector, err = pdh.NewCollector[perfDataCounterValues](pdh.CounterTypeRaw, "Cache", pdh.InstancesAll)
+	if err != nil {
+		return fmt.Errorf("failed to create Cache collector: %w", err)
+	}
+
 	return nil
 }
 
 // Collect implements the Collector interface.
 func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
-	data, err := c.perfDataCollector.Collect()
+	err := c.perfDataCollector.Collect(&c.perfDataObject)
 	if err != nil {
 		return fmt.Errorf("failed to collect Cache metrics: %w", err)
 	}
 
-	cacheData, ok := data[perfdata.EmptyInstance]
-
-	if !ok {
-		return errors.New("perflib query for Cache returned empty result set")
-	}
-
 	ch <- prometheus.MustNewConstMetric(
 		c.asyncCopyReadsTotal,
 		prometheus.CounterValue,
-		cacheData[asyncCopyReadsTotal].FirstValue,
+		c.perfDataObject[0].AsyncCopyReadsTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.asyncDataMapsTotal,
 		prometheus.CounterValue,
-		cacheData[asyncDataMapsTotal].FirstValue,
+		c.perfDataObject[0].AsyncDataMapsTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.asyncFastReadsTotal,
 		prometheus.CounterValue,
-		cacheData[asyncFastReadsTotal].FirstValue,
+		c.perfDataObject[0].AsyncFastReadsTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.asyncMDLReadsTotal,
 		prometheus.CounterValue,
-		cacheData[asyncMDLReadsTotal].FirstValue,
+		c.perfDataObject[0].AsyncMDLReadsTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.asyncPinReadsTotal,
 		prometheus.CounterValue,
-		cacheData[asyncPinReadsTotal].FirstValue,
+		c.perfDataObject[0].AsyncPinReadsTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.copyReadHitsTotal,
 		prometheus.GaugeValue,
-		cacheData[copyReadHitsTotal].FirstValue,
+		c.perfDataObject[0].CopyReadHitsTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.copyReadsTotal,
 		prometheus.CounterValue,
-		cacheData[copyReadsTotal].FirstValue,
+		c.perfDataObject[0].CopyReadsTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.dataFlushesTotal,
 		prometheus.CounterValue,
-		cacheData[dataFlushesTotal].FirstValue,
+		c.perfDataObject[0].DataFlushesTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.dataFlushPagesTotal,
 		prometheus.CounterValue,
-		cacheData[dataFlushPagesTotal].FirstValue,
+		c.perfDataObject[0].DataFlushPagesTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.dataMapHitsPercent,
 		prometheus.GaugeValue,
-		cacheData[dataMapHitsPercent].FirstValue,
+		c.perfDataObject[0].DataMapHitsPercent,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.dataMapPinsTotal,
 		prometheus.CounterValue,
-		cacheData[dataMapPinsTotal].FirstValue,
+		c.perfDataObject[0].DataMapPinsTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.dataMapsTotal,
 		prometheus.CounterValue,
-		cacheData[dataMapsTotal].FirstValue,
+		c.perfDataObject[0].DataMapsTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.dirtyPages,
 		prometheus.GaugeValue,
-		cacheData[dirtyPages].FirstValue,
+		c.perfDataObject[0].DirtyPages,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.dirtyPageThreshold,
 		prometheus.GaugeValue,
-		cacheData[dirtyPageThreshold].FirstValue,
+		c.perfDataObject[0].DirtyPageThreshold,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.fastReadNotPossiblesTotal,
 		prometheus.CounterValue,
-		cacheData[fastReadNotPossiblesTotal].FirstValue,
+		c.perfDataObject[0].FastReadNotPossiblesTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.fastReadResourceMissesTotal,
 		prometheus.CounterValue,
-		cacheData[fastReadResourceMissesTotal].FirstValue,
+		c.perfDataObject[0].FastReadResourceMissesTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.fastReadsTotal,
 		prometheus.CounterValue,
-		cacheData[fastReadsTotal].FirstValue,
+		c.perfDataObject[0].FastReadsTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.lazyWriteFlushesTotal,
 		prometheus.CounterValue,
-		cacheData[lazyWriteFlushesTotal].FirstValue,
+		c.perfDataObject[0].LazyWriteFlushesTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.lazyWritePagesTotal,
 		prometheus.CounterValue,
-		cacheData[lazyWritePagesTotal].FirstValue,
+		c.perfDataObject[0].LazyWritePagesTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.mdlReadHitsTotal,
 		prometheus.CounterValue,
-		cacheData[mdlReadHitsTotal].FirstValue,
+		c.perfDataObject[0].MdlReadHitsTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.mdlReadsTotal,
 		prometheus.CounterValue,
-		cacheData[mdlReadsTotal].FirstValue,
+		c.perfDataObject[0].MdlReadsTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.pinReadHitsTotal,
 		prometheus.CounterValue,
-		cacheData[pinReadHitsTotal].FirstValue,
+		c.perfDataObject[0].PinReadHitsTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.pinReadsTotal,
 		prometheus.CounterValue,
-		cacheData[pinReadsTotal].FirstValue,
+		c.perfDataObject[0].PinReadsTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.readAheadsTotal,
 		prometheus.CounterValue,
-		cacheData[readAheadsTotal].FirstValue,
+		c.perfDataObject[0].ReadAheadsTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.syncCopyReadsTotal,
 		prometheus.CounterValue,
-		cacheData[syncCopyReadsTotal].FirstValue,
+		c.perfDataObject[0].SyncCopyReadsTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.syncDataMapsTotal,
 		prometheus.CounterValue,
-		cacheData[syncDataMapsTotal].FirstValue,
+		c.perfDataObject[0].SyncDataMapsTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.syncFastReadsTotal,
 		prometheus.CounterValue,
-		cacheData[syncFastReadsTotal].FirstValue,
+		c.perfDataObject[0].SyncFastReadsTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.syncMDLReadsTotal,
 		prometheus.CounterValue,
-		cacheData[syncMDLReadsTotal].FirstValue,
+		c.perfDataObject[0].SyncMDLReadsTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.syncPinReadsTotal,
 		prometheus.CounterValue,
-		cacheData[syncPinReadsTotal].FirstValue,
+		c.perfDataObject[0].SyncPinReadsTotal,
 	)
 
 	return nil

internal/collector/cache/cache_test.go

@@ -1,3 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package cache_test
@@ -12,3 +27,7 @@ import (
 func BenchmarkCollector(b *testing.B) {
 	testutils.FuncBenchmarkCollector(b, cache.Name, cache.NewWithFlags)
 }
+
+func TestCollector(t *testing.T) {
+	testutils.TestCollector(t, cache.New, nil)
+}

internal/collector/cache/const.go

@@ -1,37 +0,0 @@
-//go:build windows
-
-package cache
-
-// Perflib "Cache":
-// - https://docs.microsoft.com/en-us/previous-versions/aa394267(v=vs.85)
-const (
-	asyncCopyReadsTotal         = "Async Copy Reads/sec"
-	asyncDataMapsTotal          = "Async Data Maps/sec"
-	asyncFastReadsTotal         = "Async Fast Reads/sec"
-	asyncMDLReadsTotal          = "Async MDL Reads/sec"
-	asyncPinReadsTotal          = "Async Pin Reads/sec"
-	copyReadHitsTotal           = "Copy Read Hits %"
-	copyReadsTotal              = "Copy Reads/sec"
-	dataFlushesTotal            = "Data Flushes/sec"
-	dataFlushPagesTotal         = "Data Flush Pages/sec"
-	dataMapHitsPercent          = "Data Map Hits %"
-	dataMapPinsTotal            = "Data Map Pins/sec"
-	dataMapsTotal               = "Data Maps/sec"
-	dirtyPages                  = "Dirty Pages"
-	dirtyPageThreshold          = "Dirty Page Threshold"
-	fastReadNotPossiblesTotal   = "Fast Read Not Possibles/sec"
-	fastReadResourceMissesTotal = "Fast Read Resource Misses/sec"
-	fastReadsTotal              = "Fast Reads/sec"
-	lazyWriteFlushesTotal       = "Lazy Write Flushes/sec"
-	lazyWritePagesTotal         = "Lazy Write Pages/sec"
-	mdlReadHitsTotal            = "MDL Read Hits %"
-	mdlReadsTotal               = "MDL Reads/sec"
-	pinReadHitsTotal            = "Pin Read Hits %"
-	pinReadsTotal               = "Pin Reads/sec"
-	readAheadsTotal             = "Read Aheads/sec"
-	syncCopyReadsTotal          = "Sync Copy Reads/sec"
-	syncDataMapsTotal           = "Sync Data Maps/sec"
-	syncFastReadsTotal          = "Sync Fast Reads/sec"
-	syncMDLReadsTotal           = "Sync MDL Reads/sec"
-	syncPinReadsTotal           = "Sync Pin Reads/sec"
-)

internal/collector/cache/types.go

@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package cache
+
+// Perflib "Cache":
+// - https://docs.microsoft.com/en-us/previous-versions/aa394267(v=vs.85)
+type perfDataCounterValues struct {
+	AsyncCopyReadsTotal         float64 `perfdata:"Async Copy Reads/sec"`
+	AsyncDataMapsTotal          float64 `perfdata:"Async Data Maps/sec"`
+	AsyncFastReadsTotal         float64 `perfdata:"Async Fast Reads/sec"`
+	AsyncMDLReadsTotal          float64 `perfdata:"Async MDL Reads/sec"`
+	AsyncPinReadsTotal          float64 `perfdata:"Async Pin Reads/sec"`
+	CopyReadHitsTotal           float64 `perfdata:"Copy Read Hits %"`
+	CopyReadsTotal              float64 `perfdata:"Copy Reads/sec"`
+	DataFlushesTotal            float64 `perfdata:"Data Flushes/sec"`
+	DataFlushPagesTotal         float64 `perfdata:"Data Flush Pages/sec"`
+	DataMapHitsPercent          float64 `perfdata:"Data Map Hits %"`
+	DataMapPinsTotal            float64 `perfdata:"Data Map Pins/sec"`
+	DataMapsTotal               float64 `perfdata:"Data Maps/sec"`
+	DirtyPages                  float64 `perfdata:"Dirty Pages"`
+	DirtyPageThreshold          float64 `perfdata:"Dirty Page Threshold"`
+	FastReadNotPossiblesTotal   float64 `perfdata:"Fast Read Not Possibles/sec"`
+	FastReadResourceMissesTotal float64 `perfdata:"Fast Read Resource Misses/sec"`
+	FastReadsTotal              float64 `perfdata:"Fast Reads/sec"`
+	LazyWriteFlushesTotal       float64 `perfdata:"Lazy Write Flushes/sec"`
+	LazyWritePagesTotal         float64 `perfdata:"Lazy Write Pages/sec"`
+	MdlReadHitsTotal            float64 `perfdata:"MDL Read Hits %"`
+	MdlReadsTotal               float64 `perfdata:"MDL Reads/sec"`
+	PinReadHitsTotal            float64 `perfdata:"Pin Read Hits %"`
+	PinReadsTotal               float64 `perfdata:"Pin Reads/sec"`
+	ReadAheadsTotal             float64 `perfdata:"Read Aheads/sec"`
+	SyncCopyReadsTotal          float64 `perfdata:"Sync Copy Reads/sec"`
+	SyncDataMapsTotal           float64 `perfdata:"Sync Data Maps/sec"`
+	SyncFastReadsTotal          float64 `perfdata:"Sync Fast Reads/sec"`
+	SyncMDLReadsTotal           float64 `perfdata:"Sync MDL Reads/sec"`
+	SyncPinReadsTotal           float64 `perfdata:"Sync Pin Reads/sec"`
+}

internal/collector/container/container.go

@@ -1,3 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package container
@@ -11,7 +26,7 @@ import (
 	"github.com/Microsoft/hcsshim"
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/prometheus-community/windows_exporter/internal/mi"
-	"github.com/prometheus-community/windows_exporter/internal/perfdata"
+	"github.com/prometheus-community/windows_exporter/internal/pdh"
 	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
@@ -20,6 +35,7 @@ const Name = "container"
 
 type Config struct{}
 
+//nolint:gochecknoglobals
 var ConfigDefaults = Config{}
 
 // A Collector is a Prometheus Collector for containers metrics.
@@ -308,19 +324,19 @@ func (c *Collector) collectContainer(ch chan<- prometheus.Metric, containerDetai
 	ch <- prometheus.MustNewConstMetric(
 		c.runtimeTotal,
 		prometheus.CounterValue,
-		float64(containerStats.Processor.TotalRuntime100ns)*perfdata.TicksToSecondScaleFactor,
+		float64(containerStats.Processor.TotalRuntime100ns)*pdh.TicksToSecondScaleFactor,
 		containerIdWithPrefix,
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.runtimeUser,
 		prometheus.CounterValue,
-		float64(containerStats.Processor.RuntimeUser100ns)*perfdata.TicksToSecondScaleFactor,
+		float64(containerStats.Processor.RuntimeUser100ns)*pdh.TicksToSecondScaleFactor,
 		containerIdWithPrefix,
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.runtimeKernel,
 		prometheus.CounterValue,
-		float64(containerStats.Processor.RuntimeKernel100ns)*perfdata.TicksToSecondScaleFactor,
+		float64(containerStats.Processor.RuntimeKernel100ns)*pdh.TicksToSecondScaleFactor,
 		containerIdWithPrefix,
 	)
 	ch <- prometheus.MustNewConstMetric(

internal/collector/container/container_test.go

@@ -1,3 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package container_test
@@ -12,3 +27,7 @@ import (
 func BenchmarkCollector(b *testing.B) {
 	testutils.FuncBenchmarkCollector(b, container.Name, container.NewWithFlags)
 }
+
+func TestCollector(t *testing.T) {
+	testutils.TestCollector(t, container.New, nil)
+}

internal/collector/cpu/const.go

@@ -1,30 +0,0 @@
-//go:build windows
-
-package cpu
-
-// Processor performance counters.
-const (
-	c1TimeSeconds            = "% C1 Time"
-	c2TimeSeconds            = "% C2 Time"
-	c3TimeSeconds            = "% C3 Time"
-	c1TransitionsTotal       = "C1 Transitions/sec"
-	c2TransitionsTotal       = "C2 Transitions/sec"
-	c3TransitionsTotal       = "C3 Transitions/sec"
-	clockInterruptsTotal     = "Clock Interrupts/sec"
-	dpcQueuedPerSecond       = "DPCs Queued/sec"
-	dpcTimeSeconds           = "% DPC Time"
-	idleBreakEventsTotal     = "Idle Break Events/sec"
-	idleTimeSeconds          = "% Idle Time"
-	interruptsTotal          = "Interrupts/sec"
-	interruptTimeSeconds     = "% Interrupt Time"
-	parkingStatus            = "Parking Status"
-	performanceLimitPercent  = "% Performance Limit"
-	priorityTimeSeconds      = "% Priority Time"
-	privilegedTimeSeconds    = "% Privileged Time"
-	privilegedUtilitySeconds = "% Privileged Utility"
-	processorFrequencyMHz    = "Processor Frequency"
-	processorPerformance     = "% Processor Performance"
-	processorTimeSeconds     = "% Processor Time"
-	processorUtilityRate     = "% Processor Utility"
-	userTimeSeconds          = "% User Time"
-)

internal/collector/cpu/cpu.go

@@ -1,3 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package cpu
@@ -9,7 +24,7 @@ import (
 
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/prometheus-community/windows_exporter/internal/mi"
-	"github.com/prometheus-community/windows_exporter/internal/perfdata"
+	"github.com/prometheus-community/windows_exporter/internal/pdh"
 	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus-community/windows_exporter/internal/utils"
 	"github.com/prometheus/client_golang/prometheus"
@@ -19,12 +34,14 @@ const Name = "cpu"
 
 type Config struct{}
 
+//nolint:gochecknoglobals
 var ConfigDefaults = Config{}
 
 type Collector struct {
 	config Config
 
-	perfDataCollector *perfdata.Collector
+	perfDataCollector *pdh.Collector
+	perfDataObject    []perfDataCounterValues
 
 	mu sync.Mutex
 
@@ -74,39 +91,8 @@ func (c *Collector) Close() error {
 }
 
 func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
-	var err error
-
 	c.mu = sync.Mutex{}
 
-	c.perfDataCollector, err = perfdata.NewCollector("Processor Information", perfdata.InstanceAll, []string{
-		c1TimeSeconds,
-		c2TimeSeconds,
-		c3TimeSeconds,
-		c1TransitionsTotal,
-		c2TransitionsTotal,
-		c3TransitionsTotal,
-		clockInterruptsTotal,
-		dpcQueuedPerSecond,
-		dpcTimeSeconds,
-		idleBreakEventsTotal,
-		idleTimeSeconds,
-		interruptsTotal,
-		interruptTimeSeconds,
-		parkingStatus,
-		performanceLimitPercent,
-		priorityTimeSeconds,
-		privilegedTimeSeconds,
-		privilegedUtilitySeconds,
-		processorFrequencyMHz,
-		processorPerformance,
-		processorTimeSeconds,
-		processorUtilityRate,
-		userTimeSeconds,
-	})
-	if err != nil {
-		return fmt.Errorf("failed to create Processor Information collector: %w", err)
-	}
-
 	c.logicalProcessors = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "logical_processor"),
 		"Total number of logical processors",
@@ -195,6 +181,13 @@ func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
 	c.processorRTCValues = map[string]utils.Counter{}
 	c.processorMPerfValues = map[string]utils.Counter{}
 
+	var err error
+
+	c.perfDataCollector, err = pdh.NewCollector[perfDataCounterValues](pdh.CounterTypeRaw, "Processor Information", pdh.InstancesAll)
+	if err != nil {
+		return fmt.Errorf("failed to create Processor Information collector: %w", err)
+	}
+
 	return nil
 }
 
@@ -202,14 +195,15 @@ func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
 	c.mu.Lock() // Lock is needed to prevent concurrent map access to c.processorRTCValues
 	defer c.mu.Unlock()
 
-	data, err := c.perfDataCollector.Collect()
+	err := c.perfDataCollector.Collect(&c.perfDataObject)
 	if err != nil {
 		return fmt.Errorf("failed to collect Processor Information metrics: %w", err)
 	}
 
 	var coreCount float64
 
-	for core, coreData := range data {
+	for _, coreData := range c.perfDataObject {
+		core := coreData.Name
 		coreCount++
 
 		var (
@@ -219,17 +213,17 @@ func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
 		)
 
 		if counterProcessorRTCValues, ok = c.processorRTCValues[core]; ok {
-			counterProcessorRTCValues.AddValue(uint32(coreData[processorUtilityRate].SecondValue))
+			counterProcessorRTCValues.AddValue(uint32(coreData.ProcessorUtilityRateSecondValue))
 		} else {
-			counterProcessorRTCValues = utils.NewCounter(uint32(coreData[privilegedUtilitySeconds].SecondValue))
+			counterProcessorRTCValues = utils.NewCounter(uint32(coreData.ProcessorUtilityRateSecondValue))
 		}
 
 		c.processorRTCValues[core] = counterProcessorRTCValues
 
 		if counterProcessorMPerfValues, ok = c.processorMPerfValues[core]; ok {
-			counterProcessorMPerfValues.AddValue(uint32(coreData[processorPerformance].SecondValue))
+			counterProcessorMPerfValues.AddValue(uint32(coreData.ProcessorPerformanceSecondValue))
 		} else {
-			counterProcessorMPerfValues = utils.NewCounter(uint32(coreData[processorPerformance].SecondValue))
+			counterProcessorMPerfValues = utils.NewCounter(uint32(coreData.ProcessorPerformanceSecondValue))
 		}
 
 		c.processorMPerfValues[core] = counterProcessorMPerfValues
@@ -237,95 +231,95 @@ func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
 		ch <- prometheus.MustNewConstMetric(
 			c.cStateSecondsTotal,
 			prometheus.CounterValue,
-			coreData[c1TimeSeconds].FirstValue,
+			coreData.C1TimeSeconds,
 			core, "c1",
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.cStateSecondsTotal,
 			prometheus.CounterValue,
-			coreData[c2TimeSeconds].FirstValue,
+			coreData.C2TimeSeconds,
 			core, "c2",
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.cStateSecondsTotal,
 			prometheus.CounterValue,
-			coreData[c3TimeSeconds].FirstValue,
+			coreData.C3TimeSeconds,
 			core, "c3",
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.timeTotal,
 			prometheus.CounterValue,
-			coreData[idleTimeSeconds].FirstValue,
+			coreData.IdleTimeSeconds,
 			core, "idle",
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.timeTotal,
 			prometheus.CounterValue,
-			coreData[interruptTimeSeconds].FirstValue,
+			coreData.InterruptTimeSeconds,
 			core, "interrupt",
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.timeTotal,
 			prometheus.CounterValue,
-			coreData[dpcTimeSeconds].FirstValue,
+			coreData.DpcTimeSeconds,
 			core, "dpc",
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.timeTotal,
 			prometheus.CounterValue,
-			coreData[privilegedTimeSeconds].FirstValue,
+			coreData.PrivilegedTimeSeconds,
 			core, "privileged",
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.timeTotal,
 			prometheus.CounterValue,
-			coreData[userTimeSeconds].FirstValue,
+			coreData.UserTimeSeconds,
 			core, "user",
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.interruptsTotal,
 			prometheus.CounterValue,
-			coreData[interruptsTotal].FirstValue,
+			coreData.InterruptsTotal,
 			core,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.dpcsTotal,
 			prometheus.CounterValue,
-			coreData[dpcQueuedPerSecond].FirstValue,
+			coreData.DpcQueuedPerSecond,
 			core,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.clockInterruptsTotal,
 			prometheus.CounterValue,
-			coreData[clockInterruptsTotal].FirstValue,
+			coreData.ClockInterruptsTotal,
 			core,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.idleBreakEventsTotal,
 			prometheus.CounterValue,
-			coreData[idleBreakEventsTotal].FirstValue,
+			coreData.IdleBreakEventsTotal,
 			core,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.parkingStatus,
 			prometheus.GaugeValue,
-			coreData[parkingStatus].FirstValue,
+			coreData.ParkingStatus,
 			core,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.processorFrequencyMHz,
 			prometheus.GaugeValue,
-			coreData[processorFrequencyMHz].FirstValue,
+			coreData.ProcessorFrequencyMHz,
 			core,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.processorPerformance,
 			prometheus.CounterValue,
-			coreData[processorPerformance].FirstValue,
+			coreData.ProcessorPerformance,
 			core,
 		)
 		ch <- prometheus.MustNewConstMetric(
@@ -343,13 +337,13 @@ func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
 		ch <- prometheus.MustNewConstMetric(
 			c.processorUtility,
 			prometheus.CounterValue,
-			coreData[processorUtilityRate].FirstValue,
+			coreData.ProcessorUtilityRate,
 			core,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.processorPrivilegedUtility,
 			prometheus.CounterValue,
-			coreData[privilegedUtilitySeconds].FirstValue,
+			coreData.PrivilegedUtilitySeconds,
 			core,
 		)
 	}

internal/collector/cpu/cpu_test.go

@@ -1,3 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package cpu_test

internal/collector/cpu/types.go

@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package cpu
+
+// Processor performance counters.
+type perfDataCounterValues struct {
+	Name string
+
+	C1TimeSeconds                   float64 `perfdata:"% C1 Time"`
+	C2TimeSeconds                   float64 `perfdata:"% C2 Time"`
+	C3TimeSeconds                   float64 `perfdata:"% C3 Time"`
+	C1TransitionsTotal              float64 `perfdata:"C1 Transitions/sec"`
+	C2TransitionsTotal              float64 `perfdata:"C2 Transitions/sec"`
+	C3TransitionsTotal              float64 `perfdata:"C3 Transitions/sec"`
+	ClockInterruptsTotal            float64 `perfdata:"Clock Interrupts/sec"`
+	DpcQueuedPerSecond              float64 `perfdata:"DPCs Queued/sec"`
+	DpcTimeSeconds                  float64 `perfdata:"% DPC Time"`
+	IdleBreakEventsTotal            float64 `perfdata:"Idle Break Events/sec"`
+	IdleTimeSeconds                 float64 `perfdata:"% Idle Time"`
+	InterruptsTotal                 float64 `perfdata:"Interrupts/sec"`
+	InterruptTimeSeconds            float64 `perfdata:"% Interrupt Time"`
+	ParkingStatus                   float64 `perfdata:"Parking Status"`
+	PerformanceLimitPercent         float64 `perfdata:"% Performance Limit"`
+	PriorityTimeSeconds             float64 `perfdata:"% Priority Time"`
+	PrivilegedTimeSeconds           float64 `perfdata:"% Privileged Time"`
+	PrivilegedUtilitySeconds        float64 `perfdata:"% Privileged Utility"`
+	ProcessorFrequencyMHz           float64 `perfdata:"Processor Frequency"`
+	ProcessorPerformance            float64 `perfdata:"% Processor Performance"`
+	ProcessorPerformanceSecondValue float64 `perfdata:"% Processor Performance,secondvalue"`
+	ProcessorTimeSeconds            float64 `perfdata:"% Processor Time"`
+	ProcessorUtilityRate            float64 `perfdata:"% Processor Utility"`
+	ProcessorUtilityRateSecondValue float64 `perfdata:"% Processor Utility,secondvalue"`
+	UserTimeSeconds                 float64 `perfdata:"% User Time"`
+}

internal/collector/cpu_info/cpu_info.go

@@ -1,3 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package cpu_info
@@ -19,6 +34,7 @@ const Name = "cpu_info"
 
 type Config struct{}
 
+//nolint:gochecknoglobals
 var ConfigDefaults = Config{}
 
 // A Collector is a Prometheus Collector for a few WMI metrics in Win32_Processor.
@@ -61,18 +77,6 @@ func (c *Collector) Close() error {
 }
 
 func (c *Collector) Build(_ *slog.Logger, miSession *mi.Session) error {
-	if miSession == nil {
-		return errors.New("miSession is nil")
-	}
-
-	miQuery, err := mi.NewQuery("SELECT Architecture, DeviceId, Description, Family, L2CacheSize, L3CacheSize, Name, ThreadCount, NumberOfCores, NumberOfEnabledCore, NumberOfLogicalProcessors FROM Win32_Processor")
-	if err != nil {
-		return fmt.Errorf("failed to create WMI query: %w", err)
-	}
-
-	c.miQuery = miQuery
-	c.miSession = miSession
-
 	c.cpuInfo = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, "", Name),
 		"Labelled CPU information as provided by Win32_Processor",
@@ -134,6 +138,23 @@ func (c *Collector) Build(_ *slog.Logger, miSession *mi.Session) error {
 		nil,
 	)
 
+	if miSession == nil {
+		return errors.New("miSession is nil")
+	}
+
+	miQuery, err := mi.NewQuery("SELECT Architecture, DeviceId, Description, Family, L2CacheSize, L3CacheSize, Name, ThreadCount, NumberOfCores, NumberOfEnabledCore, NumberOfLogicalProcessors FROM Win32_Processor")
+	if err != nil {
+		return fmt.Errorf("failed to create WMI query: %w", err)
+	}
+
+	c.miQuery = miQuery
+	c.miSession = miSession
+
+	var dst []miProcessor
+	if err := c.miSession.Query(&dst, mi.NamespaceRootCIMv2, c.miQuery); err != nil {
+		return fmt.Errorf("WMI query failed: %w", err)
+	}
+
 	return nil
 }
 

internal/collector/cpu_info/cpu_info_test.go

@@ -1,3 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package cpu_info_test

internal/collector/cs/cs.go

@@ -1,3 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package cs
@@ -16,6 +31,7 @@ const Name = "cs"
 
 type Config struct{}
 
+//nolint:gochecknoglobals
 var ConfigDefaults = Config{}
 
 // A Collector is a Prometheus Collector for WMI metrics.
@@ -23,7 +39,7 @@ type Collector struct {
 	config Config
 
 	// physicalMemoryBytes
-	// Deprecated: Use windows_physical_memory_total_bytes instead
+	// Deprecated: Use windows_memory_physical_total_bytes instead
 	physicalMemoryBytes *prometheus.Desc
 	// logicalProcessors
 	// Deprecated: Use windows_cpu_logical_processor instead
@@ -71,7 +87,7 @@ func (c *Collector) Build(logger *slog.Logger, _ *mi.Session) error {
 	)
 	c.physicalMemoryBytes = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "physical_memory_bytes"),
-		"Deprecated: Use windows_physical_memory_total_bytes instead",
+		"Deprecated: Use windows_memory_physical_total_bytes instead",
 		nil,
 		nil,
 	)

internal/collector/cs/cs_test.go

@@ -1,3 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package cs_test
@@ -12,3 +27,7 @@ import (
 func BenchmarkCollector(b *testing.B) {
 	testutils.FuncBenchmarkCollector(b, cs.Name, cs.NewWithFlags)
 }
+
+func TestCollector(t *testing.T) {
+	testutils.TestCollector(t, cs.New, nil)
+}

internal/collector/dfsr/const.go

@@ -1,44 +0,0 @@
-//go:build windows
-
-package dfsr
-
-const (
-	// Connection Perflib: "DFS Replication Service Connections".
-	bytesReceivedTotal = "Total Bytes Received"
-
-	// Folder Perflib: "DFS Replicated Folder".
-	bandwidthSavingsUsingDFSReplicationTotal = "Bandwidth Savings Using DFS Replication"
-	compressedSizeOfFilesReceivedTotal       = "Compressed Size of Files Received"
-	conflictBytesCleanedUpTotal              = "Conflict Bytes Cleaned Up"
-	conflictBytesGeneratedTotal              = "Conflict Bytes Generated"
-	conflictFilesCleanedUpTotal              = "Conflict Files Cleaned Up"
-	conflictFilesGeneratedTotal              = "Conflict Files Generated"
-	conflictFolderCleanupsCompletedTotal     = "Conflict folder Cleanups Completed"
-	conflictSpaceInUse                       = "Conflict Space In Use"
-	deletedSpaceInUse                        = "Deleted Space In Use"
-	deletedBytesCleanedUpTotal               = "Deleted Bytes Cleaned Up"
-	deletedBytesGeneratedTotal               = "Deleted Bytes Generated"
-	deletedFilesCleanedUpTotal               = "Deleted Files Cleaned Up"
-	deletedFilesGeneratedTotal               = "Deleted Files Generated"
-	fileInstallsRetriedTotal                 = "File Installs Retried"
-	fileInstallsSucceededTotal               = "File Installs Succeeded"
-	filesReceivedTotal                       = "Total Files Received"
-	rdcBytesReceivedTotal                    = "RDC Bytes Received"
-	rdcCompressedSizeOfFilesReceivedTotal    = "RDC Compressed Size of Files Received"
-	rdcNumberOfFilesReceivedTotal            = "RDC Number of Files Received"
-	rdcSizeOfFilesReceivedTotal              = "RDC Size of Files Received"
-	sizeOfFilesReceivedTotal                 = "Size of Files Received"
-	stagingSpaceInUse                        = "Staging Space In Use"
-	stagingBytesCleanedUpTotal               = "Staging Bytes Cleaned Up"
-	stagingBytesGeneratedTotal               = "Staging Bytes Generated"
-	stagingFilesCleanedUpTotal               = "Staging Files Cleaned Up"
-	stagingFilesGeneratedTotal               = "Staging Files Generated"
-	updatesDroppedTotal                      = "Updates Dropped"
-
-	// Volume Perflib: "DFS Replication Service Volumes".
-	databaseCommitsTotal           = "Database Commits"
-	databaseLookupsTotal           = "Database Lookups"
-	usnJournalRecordsReadTotal     = "USN Journal Records Read"
-	usnJournalRecordsAcceptedTotal = "USN Journal Records Accepted"
-	usnJournalUnreadPercentage     = "USN Journal Records Unread Percentage"
-)

internal/collector/dfsr/dfsr.go

@@ -1,3 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package dfsr
@@ -11,7 +26,7 @@ import (
 
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/prometheus-community/windows_exporter/internal/mi"
-	"github.com/prometheus-community/windows_exporter/internal/perfdata"
+	"github.com/prometheus-community/windows_exporter/internal/pdh"
 	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
@@ -19,9 +34,10 @@ import (
 const Name = "dfsr"
 
 type Config struct {
-	CollectorsEnabled []string `yaml:"collectors_enabled"`
+	CollectorsEnabled []string `yaml:"sources-enabled"`
 }
 
+//nolint:gochecknoglobals
 var ConfigDefaults = Config{
 	CollectorsEnabled: []string{"connection", "folder", "volume"},
 }
@@ -30,9 +46,12 @@ var ConfigDefaults = Config{
 type Collector struct {
 	config Config
 
-	perfDataCollectorConnection *perfdata.Collector
-	perfDataCollectorFolder     *perfdata.Collector
-	perfDataCollectorVolume     *perfdata.Collector
+	perfDataCollectorConnection *pdh.Collector
+	perfDataCollectorFolder     *pdh.Collector
+	perfDataCollectorVolume     *pdh.Collector
+	perfDataObjectConnection    []perfDataCounterValuesConnection
+	perfDataObjectFolder        []perfDataCounterValuesFolder
+	perfDataObjectVolume        []perfDataCounterValuesVolume
 
 	// connection source
 	connectionBandwidthSavingsUsingDFSReplicationTotal *prometheus.Desc
@@ -143,72 +162,6 @@ func (c *Collector) Build(logger *slog.Logger, _ *mi.Session) error {
 
 	logger.Info("dfsr collector is in an experimental state! Metrics for this collector have not been tested.")
 
-	var err error
-
-	if slices.Contains(c.config.CollectorsEnabled, "connection") {
-		c.perfDataCollectorConnection, err = perfdata.NewCollector("DFS Replication Connections", perfdata.InstanceAll, []string{
-			bandwidthSavingsUsingDFSReplicationTotal,
-			bytesReceivedTotal,
-			compressedSizeOfFilesReceivedTotal,
-			filesReceivedTotal,
-			rdcBytesReceivedTotal,
-			rdcCompressedSizeOfFilesReceivedTotal,
-			rdcNumberOfFilesReceivedTotal,
-			rdcSizeOfFilesReceivedTotal,
-			sizeOfFilesReceivedTotal,
-		})
-		if err != nil {
-			return fmt.Errorf("failed to create DFS Replication Connections collector: %w", err)
-		}
-	}
-
-	if slices.Contains(c.config.CollectorsEnabled, "folder") {
-		c.perfDataCollectorFolder, err = perfdata.NewCollector("DFS Replicated Folders", perfdata.InstanceAll, []string{
-			bandwidthSavingsUsingDFSReplicationTotal,
-			compressedSizeOfFilesReceivedTotal,
-			conflictBytesCleanedUpTotal,
-			conflictBytesGeneratedTotal,
-			conflictFilesCleanedUpTotal,
-			conflictFilesGeneratedTotal,
-			conflictFolderCleanupsCompletedTotal,
-			conflictSpaceInUse,
-			deletedSpaceInUse,
-			deletedBytesCleanedUpTotal,
-			deletedBytesGeneratedTotal,
-			deletedFilesCleanedUpTotal,
-			deletedFilesGeneratedTotal,
-			fileInstallsRetriedTotal,
-			fileInstallsSucceededTotal,
-			filesReceivedTotal,
-			rdcBytesReceivedTotal,
-			rdcCompressedSizeOfFilesReceivedTotal,
-			rdcNumberOfFilesReceivedTotal,
-			rdcSizeOfFilesReceivedTotal,
-			sizeOfFilesReceivedTotal,
-			stagingSpaceInUse,
-			stagingBytesCleanedUpTotal,
-			stagingBytesGeneratedTotal,
-			stagingFilesCleanedUpTotal,
-			stagingFilesGeneratedTotal,
-			updatesDroppedTotal,
-		})
-		if err != nil {
-			return fmt.Errorf("failed to create DFS Replicated Folders collector: %w", err)
-		}
-	}
-
-	if slices.Contains(c.config.CollectorsEnabled, "volume") {
-		c.perfDataCollectorVolume, err = perfdata.NewCollector("DFS Replication Service Volumes", perfdata.InstanceAll, []string{
-			databaseCommitsTotal,
-			databaseLookupsTotal,
-			usnJournalRecordsReadTotal,
-			usnJournalRecordsAcceptedTotal,
-			usnJournalUnreadPercentage,
-		})
-		if err != nil {
-			return fmt.Errorf("failed to create DFS Replication Service Volumes collector: %w", err)
-		}
-	}
 	// connection
 	c.connectionBandwidthSavingsUsingDFSReplicationTotal = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "connection_bandwidth_savings_using_dfs_replication_bytes_total"),
@@ -499,13 +452,36 @@ func (c *Collector) Build(logger *slog.Logger, _ *mi.Session) error {
 		nil,
 	)
 
+	var err error
+
+	if slices.Contains(c.config.CollectorsEnabled, "connection") {
+		c.perfDataCollectorConnection, err = pdh.NewCollector[perfDataCounterValuesConnection](pdh.CounterTypeRaw, "DFS Replication Connections", pdh.InstancesAll)
+		if err != nil {
+			return fmt.Errorf("failed to create DFS Replication Connections collector: %w", err)
+		}
+	}
+
+	if slices.Contains(c.config.CollectorsEnabled, "folder") {
+		c.perfDataCollectorFolder, err = pdh.NewCollector[perfDataCounterValuesFolder](pdh.CounterTypeRaw, "DFS Replicated Folders", pdh.InstancesAll)
+		if err != nil {
+			return fmt.Errorf("failed to create DFS Replicated Folders collector: %w", err)
+		}
+	}
+
+	if slices.Contains(c.config.CollectorsEnabled, "volume") {
+		c.perfDataCollectorVolume, err = pdh.NewCollector[perfDataCounterValuesVolume](pdh.CounterTypeRaw, "DFS Replication Service Volumes", pdh.InstancesAll)
+		if err != nil {
+			return fmt.Errorf("failed to create DFS Replication Service Volumes collector: %w", err)
+		}
+	}
+
 	return nil
 }
 
 // Collect implements the Collector interface.
 // Sends metric values for each metric to the provided prometheus Metric channel.
 func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
-	errs := make([]error, 0, 3)
+	errs := make([]error, 0)
 
 	if slices.Contains(c.config.CollectorsEnabled, "connection") {
 		errs = append(errs, c.collectPDHConnection(ch))
@@ -523,76 +499,74 @@ func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
 }
 
 func (c *Collector) collectPDHConnection(ch chan<- prometheus.Metric) error {
-	perfData, err := c.perfDataCollectorConnection.Collect()
+	err := c.perfDataCollectorConnection.Collect(&c.perfDataObjectConnection)
 	if err != nil {
 		return fmt.Errorf("failed to collect DFS Replication Connections metrics: %w", err)
 	}
 
-	if len(perfData) == 0 {
-		return errors.New("perflib query for DFS Replication Connections returned empty result set")
-	}
+	for _, connection := range c.perfDataObjectConnection {
+		name := connection.Name
 
-	for name, connection := range perfData {
 		ch <- prometheus.MustNewConstMetric(
 			c.connectionBandwidthSavingsUsingDFSReplicationTotal,
 			prometheus.CounterValue,
-			connection[bandwidthSavingsUsingDFSReplicationTotal].FirstValue,
+			connection.BandwidthSavingsUsingDFSReplicationTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.connectionBytesReceivedTotal,
 			prometheus.CounterValue,
-			connection[bytesReceivedTotal].FirstValue,
+			connection.BytesReceivedTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.connectionCompressedSizeOfFilesReceivedTotal,
 			prometheus.CounterValue,
-			connection[compressedSizeOfFilesReceivedTotal].FirstValue,
+			connection.CompressedSizeOfFilesReceivedTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.connectionFilesReceivedTotal,
 			prometheus.CounterValue,
-			connection[filesReceivedTotal].FirstValue,
+			connection.FilesReceivedTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.connectionRDCBytesReceivedTotal,
 			prometheus.CounterValue,
-			connection[rdcBytesReceivedTotal].FirstValue,
+			connection.RdcBytesReceivedTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.connectionRDCCompressedSizeOfFilesReceivedTotal,
 			prometheus.CounterValue,
-			connection[rdcCompressedSizeOfFilesReceivedTotal].FirstValue,
+			connection.RdcCompressedSizeOfFilesReceivedTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.connectionRDCSizeOfFilesReceivedTotal,
 			prometheus.CounterValue,
-			connection[rdcSizeOfFilesReceivedTotal].FirstValue,
+			connection.RdcSizeOfFilesReceivedTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.connectionRDCNumberOfFilesReceivedTotal,
 			prometheus.CounterValue,
-			connection[rdcNumberOfFilesReceivedTotal].FirstValue,
+			connection.RdcNumberOfFilesReceivedTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.connectionSizeOfFilesReceivedTotal,
 			prometheus.CounterValue,
-			connection[sizeOfFilesReceivedTotal].FirstValue,
+			connection.SizeOfFilesReceivedTotal,
 			name,
 		)
 	}
@@ -601,202 +575,200 @@ func (c *Collector) collectPDHConnection(ch chan<- prometheus.Metric) error {
 }
 
 func (c *Collector) collectPDHFolder(ch chan<- prometheus.Metric) error {
-	perfData, err := c.perfDataCollectorFolder.Collect()
+	err := c.perfDataCollectorFolder.Collect(&c.perfDataObjectFolder)
 	if err != nil {
 		return fmt.Errorf("failed to collect DFS Replicated Folders metrics: %w", err)
 	}
 
-	if len(perfData) == 0 {
-		return errors.New("perflib query for DFS Replicated Folders returned empty result set")
-	}
+	for _, folder := range c.perfDataObjectFolder {
+		name := folder.Name
 
-	for name, folder := range perfData {
 		ch <- prometheus.MustNewConstMetric(
 			c.folderBandwidthSavingsUsingDFSReplicationTotal,
 			prometheus.CounterValue,
-			folder[bandwidthSavingsUsingDFSReplicationTotal].FirstValue,
+			folder.BandwidthSavingsUsingDFSReplicationTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderCompressedSizeOfFilesReceivedTotal,
 			prometheus.CounterValue,
-			folder[compressedSizeOfFilesReceivedTotal].FirstValue,
+			folder.CompressedSizeOfFilesReceivedTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderConflictBytesCleanedUpTotal,
 			prometheus.CounterValue,
-			folder[conflictBytesCleanedUpTotal].FirstValue,
+			folder.ConflictBytesCleanedUpTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderConflictBytesGeneratedTotal,
 			prometheus.CounterValue,
-			folder[conflictBytesGeneratedTotal].FirstValue,
+			folder.ConflictBytesGeneratedTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderConflictFilesCleanedUpTotal,
 			prometheus.CounterValue,
-			folder[conflictFilesCleanedUpTotal].FirstValue,
+			folder.ConflictFilesCleanedUpTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderConflictFilesGeneratedTotal,
 			prometheus.CounterValue,
-			folder[conflictFilesGeneratedTotal].FirstValue,
+			folder.ConflictFilesGeneratedTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderConflictFolderCleanupsCompletedTotal,
 			prometheus.CounterValue,
-			folder[conflictFolderCleanupsCompletedTotal].FirstValue,
+			folder.ConflictFolderCleanupsCompletedTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderConflictSpaceInUse,
 			prometheus.GaugeValue,
-			folder[conflictSpaceInUse].FirstValue,
+			folder.ConflictSpaceInUse,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderDeletedSpaceInUse,
 			prometheus.GaugeValue,
-			folder[deletedSpaceInUse].FirstValue,
+			folder.DeletedSpaceInUse,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderDeletedBytesCleanedUpTotal,
 			prometheus.CounterValue,
-			folder[deletedBytesCleanedUpTotal].FirstValue,
+			folder.DeletedBytesCleanedUpTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderDeletedBytesGeneratedTotal,
 			prometheus.CounterValue,
-			folder[deletedBytesGeneratedTotal].FirstValue,
+			folder.DeletedBytesGeneratedTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderDeletedFilesCleanedUpTotal,
 			prometheus.CounterValue,
-			folder[deletedFilesCleanedUpTotal].FirstValue,
+			folder.DeletedFilesCleanedUpTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderDeletedFilesGeneratedTotal,
 			prometheus.CounterValue,
-			folder[deletedFilesGeneratedTotal].FirstValue,
+			folder.DeletedFilesGeneratedTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderFileInstallsRetriedTotal,
 			prometheus.CounterValue,
-			folder[fileInstallsRetriedTotal].FirstValue,
+			folder.FileInstallsRetriedTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderFileInstallsSucceededTotal,
 			prometheus.CounterValue,
-			folder[fileInstallsSucceededTotal].FirstValue,
+			folder.FileInstallsSucceededTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderFilesReceivedTotal,
 			prometheus.CounterValue,
-			folder[filesReceivedTotal].FirstValue,
+			folder.FilesReceivedTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderRDCBytesReceivedTotal,
 			prometheus.CounterValue,
-			folder[rdcBytesReceivedTotal].FirstValue,
+			folder.RdcBytesReceivedTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderRDCCompressedSizeOfFilesReceivedTotal,
 			prometheus.CounterValue,
-			folder[rdcCompressedSizeOfFilesReceivedTotal].FirstValue,
+			folder.RdcCompressedSizeOfFilesReceivedTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderRDCNumberOfFilesReceivedTotal,
 			prometheus.CounterValue,
-			folder[rdcNumberOfFilesReceivedTotal].FirstValue,
+			folder.RdcNumberOfFilesReceivedTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderRDCSizeOfFilesReceivedTotal,
 			prometheus.CounterValue,
-			folder[rdcSizeOfFilesReceivedTotal].FirstValue,
+			folder.RdcSizeOfFilesReceivedTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderSizeOfFilesReceivedTotal,
 			prometheus.CounterValue,
-			folder[sizeOfFilesReceivedTotal].FirstValue,
+			folder.SizeOfFilesReceivedTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderStagingSpaceInUse,
 			prometheus.GaugeValue,
-			folder[stagingSpaceInUse].FirstValue,
+			folder.StagingSpaceInUse,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderStagingBytesCleanedUpTotal,
 			prometheus.CounterValue,
-			folder[stagingBytesCleanedUpTotal].FirstValue,
+			folder.StagingBytesCleanedUpTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderStagingBytesGeneratedTotal,
 			prometheus.CounterValue,
-			folder[stagingBytesGeneratedTotal].FirstValue,
+			folder.StagingBytesGeneratedTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderStagingFilesCleanedUpTotal,
 			prometheus.CounterValue,
-			folder[stagingFilesCleanedUpTotal].FirstValue,
+			folder.StagingFilesCleanedUpTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderStagingFilesGeneratedTotal,
 			prometheus.CounterValue,
-			folder[stagingFilesGeneratedTotal].FirstValue,
+			folder.StagingFilesGeneratedTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.folderUpdatesDroppedTotal,
 			prometheus.CounterValue,
-			folder[updatesDroppedTotal].FirstValue,
+			folder.UpdatesDroppedTotal,
 			name,
 		)
 	}
@@ -805,48 +777,45 @@ func (c *Collector) collectPDHFolder(ch chan<- prometheus.Metric) error {
 }
 
 func (c *Collector) collectPDHVolume(ch chan<- prometheus.Metric) error {
-	perfData, err := c.perfDataCollectorVolume.Collect()
+	err := c.perfDataCollectorVolume.Collect(&c.perfDataObjectVolume)
 	if err != nil {
 		return fmt.Errorf("failed to collect DFS Replication Volumes metrics: %w", err)
 	}
 
-	if len(perfData) == 0 {
-		return errors.New("perflib query for DFS Replication Volumes returned empty result set")
-	}
-
-	for name, volume := range perfData {
+	for _, volume := range c.perfDataObjectVolume {
+		name := volume.Name
 		ch <- prometheus.MustNewConstMetric(
 			c.volumeDatabaseLookupsTotal,
 			prometheus.CounterValue,
-			volume[databaseLookupsTotal].FirstValue,
+			volume.DatabaseLookupsTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.volumeDatabaseCommitsTotal,
 			prometheus.CounterValue,
-			volume[databaseCommitsTotal].FirstValue,
+			volume.DatabaseCommitsTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.volumeUSNJournalRecordsAcceptedTotal,
 			prometheus.CounterValue,
-			volume[usnJournalRecordsAcceptedTotal].FirstValue,
+			volume.UsnJournalRecordsAcceptedTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.volumeUSNJournalRecordsReadTotal,
 			prometheus.CounterValue,
-			volume[usnJournalRecordsReadTotal].FirstValue,
+			volume.UsnJournalRecordsReadTotal,
 			name,
 		)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.volumeUSNJournalUnreadPercentage,
 			prometheus.GaugeValue,
-			volume[usnJournalUnreadPercentage].FirstValue,
+			volume.UsnJournalUnreadPercentage,
 			name,
 		)
 	}

internal/collector/dfsr/dfsr_test.go

@@ -1,3 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package dfsr_test
@@ -12,3 +27,7 @@ import (
 func BenchmarkCollector(b *testing.B) {
 	testutils.FuncBenchmarkCollector(b, dfsr.Name, dfsr.NewWithFlags)
 }
+
+func TestCollector(t *testing.T) {
+	testutils.TestCollector(t, dfsr.New, nil)
+}

internal/collector/dfsr/types.go

@@ -0,0 +1,77 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package dfsr
+
+// Connection Perflib: "DFS Replication Service Connections".
+type perfDataCounterValuesConnection struct {
+	Name string
+
+	BandwidthSavingsUsingDFSReplicationTotal float64 `perfdata:"Bandwidth Savings Using DFS Replication"`
+	BytesReceivedTotal                       float64 `perfdata:"Total Bytes Received"`
+	CompressedSizeOfFilesReceivedTotal       float64 `perfdata:"Compressed Size of Files Received"`
+	FilesReceivedTotal                       float64 `perfdata:"Total Files Received"`
+	RdcBytesReceivedTotal                    float64 `perfdata:"RDC Bytes Received"`
+	RdcCompressedSizeOfFilesReceivedTotal    float64 `perfdata:"RDC Compressed Size of Files Received"`
+	RdcNumberOfFilesReceivedTotal            float64 `perfdata:"RDC Number of Files Received"`
+	RdcSizeOfFilesReceivedTotal              float64 `perfdata:"RDC Size of Files Received"`
+	SizeOfFilesReceivedTotal                 float64 `perfdata:"Size of Files Received"`
+}
+
+// Folder Perflib: "DFS Replicated Folder".
+type perfDataCounterValuesFolder struct {
+	Name string
+
+	BandwidthSavingsUsingDFSReplicationTotal float64 `perfdata:"Bandwidth Savings Using DFS Replication"`
+	CompressedSizeOfFilesReceivedTotal       float64 `perfdata:"Compressed Size of Files Received"`
+	ConflictBytesCleanedUpTotal              float64 `perfdata:"Conflict Bytes Cleaned Up"`
+	ConflictBytesGeneratedTotal              float64 `perfdata:"Conflict Bytes Generated"`
+	ConflictFilesCleanedUpTotal              float64 `perfdata:"Conflict Files Cleaned Up"`
+	ConflictFilesGeneratedTotal              float64 `perfdata:"Conflict Files Generated"`
+	ConflictFolderCleanupsCompletedTotal     float64 `perfdata:"Conflict folder Cleanups Completed"`
+	ConflictSpaceInUse                       float64 `perfdata:"Conflict Space In Use"`
+	DeletedSpaceInUse                        float64 `perfdata:"Deleted Space In Use"`
+	DeletedBytesCleanedUpTotal               float64 `perfdata:"Deleted Bytes Cleaned Up"`
+	DeletedBytesGeneratedTotal               float64 `perfdata:"Deleted Bytes Generated"`
+	DeletedFilesCleanedUpTotal               float64 `perfdata:"Deleted Files Cleaned Up"`
+	DeletedFilesGeneratedTotal               float64 `perfdata:"Deleted Files Generated"`
+	FileInstallsRetriedTotal                 float64 `perfdata:"File Installs Retried"`
+	FileInstallsSucceededTotal               float64 `perfdata:"File Installs Succeeded"`
+	FilesReceivedTotal                       float64 `perfdata:"Total Files Received"`
+	RdcBytesReceivedTotal                    float64 `perfdata:"RDC Bytes Received"`
+	RdcCompressedSizeOfFilesReceivedTotal    float64 `perfdata:"RDC Compressed Size of Files Received"`
+	RdcNumberOfFilesReceivedTotal            float64 `perfdata:"RDC Number of Files Received"`
+	RdcSizeOfFilesReceivedTotal              float64 `perfdata:"RDC Size of Files Received"`
+	SizeOfFilesReceivedTotal                 float64 `perfdata:"Size of Files Received"`
+	StagingSpaceInUse                        float64 `perfdata:"Staging Space In Use"`
+	StagingBytesCleanedUpTotal               float64 `perfdata:"Staging Bytes Cleaned Up"`
+	StagingBytesGeneratedTotal               float64 `perfdata:"Staging Bytes Generated"`
+	StagingFilesCleanedUpTotal               float64 `perfdata:"Staging Files Cleaned Up"`
+	StagingFilesGeneratedTotal               float64 `perfdata:"Staging Files Generated"`
+	UpdatesDroppedTotal                      float64 `perfdata:"Updates Dropped"`
+}
+
+// Volume Perflib: "DFS Replication Service Volumes".
+type perfDataCounterValuesVolume struct {
+	Name string
+
+	DatabaseCommitsTotal           float64 `perfdata:"Database Commits"`
+	DatabaseLookupsTotal           float64 `perfdata:"Database Lookups"`
+	UsnJournalRecordsReadTotal     float64 `perfdata:"USN Journal Records Read"`
+	UsnJournalRecordsAcceptedTotal float64 `perfdata:"USN Journal Records Accepted"`
+	UsnJournalUnreadPercentage     float64 `perfdata:"USN Journal Unread Percentage"`
+}

internal/collector/dhcp/const.go

@@ -1,31 +0,0 @@
-//go:build windows
-
-package dhcp
-
-const (
-	acksTotal                                        = "Acks/sec"
-	activeQueueLength                                = "Active Queue Length"
-	conflictCheckQueueLength                         = "Conflict Check Queue Length"
-	declinesTotal                                    = "Declines/sec"
-	deniedDueToMatch                                 = "Denied due to match."
-	deniedDueToNonMatch                              = "Denied due to match."
-	discoversTotal                                   = "Discovers/sec"
-	duplicatesDroppedTotal                           = "Duplicates Dropped/sec"
-	failoverBndAckReceivedTotal                      = "Failover: BndAck received/sec."
-	failoverBndAckSentTotal                          = "Failover: BndAck sent/sec."
-	failoverBndUpdDropped                            = "Failover: BndUpd Dropped."
-	failoverBndUpdPendingOutboundQueue               = "Failover: BndUpd pending in outbound queue."
-	failoverBndUpdReceivedTotal                      = "Failover: BndUpd received/sec."
-	failoverBndUpdSentTotal                          = "Failover: BndUpd sent/sec."
-	failoverTransitionsCommunicationInterruptedState = "Failover: Transitions to COMMUNICATION-INTERRUPTED state."
-	failoverTransitionsPartnerDownState              = "Failover: Transitions to PARTNER-DOWN state."
-	failoverTransitionsRecoverState                  = "Failover: Transitions to RECOVER state."
-	informsTotal                                     = "Informs/sec"
-	nacksTotal                                       = "Nacks/sec"
-	offerQueueLength                                 = "Offer Queue Length"
-	offersTotal                                      = "Offers/sec"
-	packetsExpiredTotal                              = "Packets Expired/sec"
-	packetsReceivedTotal                             = "Packets Received/sec"
-	releasesTotal                                    = "Releases/sec"
-	requestsTotal                                    = "Requests/sec"
-)

internal/collector/dhcp/dhcp.go

@@ -1,3 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package dhcp
@@ -6,25 +21,43 @@ import (
 	"errors"
 	"fmt"
 	"log/slog"
+	"slices"
+	"strconv"
+	"strings"
 
 	"github.com/alecthomas/kingpin/v2"
+	"github.com/prometheus-community/windows_exporter/internal/headers/dhcpsapi"
 	"github.com/prometheus-community/windows_exporter/internal/mi"
-	"github.com/prometheus-community/windows_exporter/internal/perfdata"
+	"github.com/prometheus-community/windows_exporter/internal/pdh"
 	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-const Name = "dhcp"
+const (
+	Name = "dhcp"
 
-type Config struct{}
+	subCollectorServerMetrics = "server_metrics"
+	subCollectorScopeMetrics  = "scope_metrics"
+)
 
-var ConfigDefaults = Config{}
+type Config struct {
+	CollectorsEnabled []string `yaml:"enabled"`
+}
+
+//nolint:gochecknoglobals
+var ConfigDefaults = Config{
+	CollectorsEnabled: []string{
+		subCollectorServerMetrics,
+		subCollectorScopeMetrics,
+	},
+}
 
 // A Collector is a Prometheus Collector perflib DHCP metrics.
 type Collector struct {
 	config Config
 
-	perfDataCollector *perfdata.Collector
+	perfDataCollector *pdh.Collector
+	perfDataObject    []perfDataCounterValues
 
 	acksTotal                                        *prometheus.Desc
 	activeQueueLength                                *prometheus.Desc
@@ -51,6 +84,17 @@ type Collector struct {
 	packetsReceivedTotal                             *prometheus.Desc
 	releasesTotal                                    *prometheus.Desc
 	requestsTotal                                    *prometheus.Desc
+
+	scopeInfo                               *prometheus.Desc
+	scopeState                              *prometheus.Desc
+	scopeAddressesFreeTotal                 *prometheus.Desc
+	scopeAddressesFreeOnPartnerServerTotal  *prometheus.Desc
+	scopeAddressesFreeOnThisServerTotal     *prometheus.Desc
+	scopeAddressesInUseTotal                *prometheus.Desc
+	scopeAddressesInUseOnPartnerServerTotal *prometheus.Desc
+	scopeAddressesInUseOnThisServerTotal    *prometheus.Desc
+	scopePendingOffersTotal                 *prometheus.Desc
+	scopeReservedAddressTotal               *prometheus.Desc
 }
 
 func New(config *Config) *Collector {
@@ -58,6 +102,10 @@ func New(config *Config) *Collector {
 		config = &ConfigDefaults
 	}
 
+	if config.CollectorsEnabled == nil {
+		config.CollectorsEnabled = ConfigDefaults.CollectorsEnabled
+	}
+
 	c := &Collector{
 		config: *config,
 	}
@@ -65,8 +113,26 @@ func New(config *Config) *Collector {
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) *Collector {
-	return &Collector{}
+func NewWithFlags(app *kingpin.Application) *Collector {
+	c := &Collector{
+		config: ConfigDefaults,
+	}
+	c.config.CollectorsEnabled = make([]string, 0)
+
+	var collectorsEnabled string
+
+	app.Flag(
+		"collector.dhcp.enabled",
+		"Comma-separated list of collectors to use. Defaults to all, if not specified.",
+	).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 {
@@ -74,7 +140,9 @@ func (c *Collector) GetName() string {
 }
 
 func (c *Collector) Close() error {
-	c.perfDataCollector.Close()
+	if slices.Contains(c.config.CollectorsEnabled, subCollectorServerMetrics) {
+		c.perfDataCollector.Close()
+	}
 
 	return nil
 }
@@ -82,351 +150,522 @@ func (c *Collector) Close() error {
 func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
 	var err error
 
-	c.perfDataCollector, err = perfdata.NewCollector("DHCP Server", perfdata.InstanceAll, []string{
-		acksTotal,
-		activeQueueLength,
-		conflictCheckQueueLength,
-		declinesTotal,
-		deniedDueToMatch,
-		deniedDueToNonMatch,
-		discoversTotal,
-		duplicatesDroppedTotal,
-		failoverBndAckReceivedTotal,
-		failoverBndAckSentTotal,
-		failoverBndUpdDropped,
-		failoverBndUpdPendingOutboundQueue,
-		failoverBndUpdReceivedTotal,
-		failoverBndUpdSentTotal,
-		failoverTransitionsCommunicationInterruptedState,
-		failoverTransitionsPartnerDownState,
-		failoverTransitionsRecoverState,
-		informsTotal,
-		nacksTotal,
-		offerQueueLength,
-		offersTotal,
-		packetsExpiredTotal,
-		packetsReceivedTotal,
-		releasesTotal,
-		requestsTotal,
-	})
-	if err != nil {
-		return fmt.Errorf("failed to create DHCP Server collector: %w", err)
+	if slices.Contains(c.config.CollectorsEnabled, subCollectorScopeMetrics) {
+		c.scopeInfo = prometheus.NewDesc(
+			prometheus.BuildFQName(types.Namespace, Name, "scope_info"),
+			"DHCP Scope information",
+			[]string{"name", "superscope_name", "superscope_id", "scope"},
+			nil,
+		)
+
+		c.scopeState = prometheus.NewDesc(
+			prometheus.BuildFQName(types.Namespace, Name, "scope_state"),
+			"DHCP Scope state",
+			[]string{"scope", "state"},
+			nil,
+		)
+
+		c.scopeAddressesFreeTotal = prometheus.NewDesc(
+			prometheus.BuildFQName(types.Namespace, Name, "scope_addresses_free"),
+			"DHCP Scope free addresses",
+			[]string{"scope"},
+			nil,
+		)
+
+		c.scopeAddressesFreeOnPartnerServerTotal = prometheus.NewDesc(
+			prometheus.BuildFQName(types.Namespace, Name, "scope_addresses_free_on_partner_server"),
+			"DHCP Scope free addresses on partner server",
+			[]string{"scope"},
+			nil,
+		)
+
+		c.scopeAddressesFreeOnThisServerTotal = prometheus.NewDesc(
+			prometheus.BuildFQName(types.Namespace, Name, "scope_addresses_free_on_this_server"),
+			"DHCP Scope free addresses on this server",
+			[]string{"scope"},
+			nil,
+		)
+
+		c.scopeAddressesInUseTotal = prometheus.NewDesc(
+			prometheus.BuildFQName(types.Namespace, Name, "scope_addresses_in_use"),
+			"DHCP Scope addresses in use",
+			[]string{"scope"},
+			nil,
+		)
+
+		c.scopeAddressesInUseOnPartnerServerTotal = prometheus.NewDesc(
+			prometheus.BuildFQName(types.Namespace, Name, "scope_addresses_in_use_on_partner_server"),
+			"DHCP Scope addresses in use on partner server",
+			[]string{"scope"},
+			nil,
+		)
+
+		c.scopeAddressesInUseOnThisServerTotal = prometheus.NewDesc(
+			prometheus.BuildFQName(types.Namespace, Name, "scope_addresses_in_use_on_this_server"),
+			"DHCP Scope addresses in use on this server",
+			[]string{"scope"},
+			nil,
+		)
+
+		c.scopePendingOffersTotal = prometheus.NewDesc(
+			prometheus.BuildFQName(types.Namespace, Name, "scope_pending_offers"),
+			"DHCP Scope pending offers",
+			[]string{"scope"},
+			nil,
+		)
+
+		c.scopeReservedAddressTotal = prometheus.NewDesc(
+			prometheus.BuildFQName(types.Namespace, Name, "scope_reserved_address"),
+			"DHCP Scope reserved addresses",
+			[]string{"scope"},
+			nil,
+		)
 	}
 
-	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(
-		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(
-		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(
-		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(
-		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(
-		prometheus.BuildFQName(types.Namespace, Name, "discovers_total"),
-		"Total DHCP Discovers received by the DHCP server (DiscoversTotal)",
-		nil,
-		nil,
-	)
-	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(
-		prometheus.BuildFQName(types.Namespace, Name, "requests_total"),
-		"Total DHCP Requests received by the DHCP server (RequestsTotal)",
-		nil,
-		nil,
-	)
-	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(
-		prometheus.BuildFQName(types.Namespace, Name, "acks_total"),
-		"Total DHCP Acks sent by the DHCP server (AcksTotal)",
-		nil,
-		nil,
-	)
-	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(
-		prometheus.BuildFQName(types.Namespace, Name, "declines_total"),
-		"Total DHCP Declines received by the DHCP server (DeclinesTotal)",
-		nil,
-		nil,
-	)
-	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(
-		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(
-		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(
-		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(
-		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(
-		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(
-		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(
-		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(
-		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(
-		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(
-		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(
-		prometheus.BuildFQName(types.Namespace, Name, "failover_transitions_recover_total"),
-		"Total number of transitions into RECOVER state (FailoverTransitionsRecoverState)",
-		nil,
-		nil,
-	)
-	c.failoverBndUpdDropped = prometheus.NewDesc(
-		prometheus.BuildFQName(types.Namespace, Name, "failover_bndupd_dropped_total"),
-		"Total number of DHCP fail over Binding Updates dropped (FailoverBndupdDropped)",
-		nil,
-		nil,
-	)
+	if slices.Contains(c.config.CollectorsEnabled, subCollectorServerMetrics) {
+		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(
+			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(
+			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(
+			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(
+			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(
+			prometheus.BuildFQName(types.Namespace, Name, "discovers_total"),
+			"Total DHCP Discovers received by the DHCP server (DiscoversTotal)",
+			nil,
+			nil,
+		)
+		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(
+			prometheus.BuildFQName(types.Namespace, Name, "requests_total"),
+			"Total DHCP Requests received by the DHCP server (RequestsTotal)",
+			nil,
+			nil,
+		)
+		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(
+			prometheus.BuildFQName(types.Namespace, Name, "acks_total"),
+			"Total DHCP Acks sent by the DHCP server (AcksTotal)",
+			nil,
+			nil,
+		)
+		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(
+			prometheus.BuildFQName(types.Namespace, Name, "declines_total"),
+			"Total DHCP Declines received by the DHCP server (DeclinesTotal)",
+			nil,
+			nil,
+		)
+		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(
+			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(
+			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(
+			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(
+			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(
+			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(
+			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(
+			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(
+			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(
+			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(
+			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(
+			prometheus.BuildFQName(types.Namespace, Name, "failover_transitions_recover_total"),
+			"Total number of transitions into RECOVER state (FailoverTransitionsRecoverState)",
+			nil,
+			nil,
+		)
+		c.failoverBndUpdDropped = prometheus.NewDesc(
+			prometheus.BuildFQName(types.Namespace, Name, "failover_bndupd_dropped_total"),
+			"Total number of DHCP fail over Binding Updates dropped (FailoverBndupdDropped)",
+			nil,
+			nil,
+		)
+
+		c.perfDataCollector, err = pdh.NewCollector[perfDataCounterValues](pdh.CounterTypeRaw, "DHCP Server", nil)
+		if err != nil {
+			return fmt.Errorf("failed to create DHCP Server collector: %w", err)
+		}
+	}
 
 	return nil
 }
 
 func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
-	perfData, err := c.perfDataCollector.Collect()
-	if err != nil {
-		return fmt.Errorf("failed to collect DHCP Server metrics: %w", err)
+	var errs []error
+
+	if slices.Contains(c.config.CollectorsEnabled, subCollectorServerMetrics) {
+		if err := c.collectServerMetrics(ch); err != nil {
+			errs = append(errs, err)
+		}
 	}
 
-	data, ok := perfData[perfdata.EmptyInstance]
-	if !ok {
-		return errors.New("perflib query for DHCP Server returned empty result set")
+	if slices.Contains(c.config.CollectorsEnabled, subCollectorScopeMetrics) {
+		if err := c.collectScopeMetrics(ch); err != nil {
+			errs = append(errs, err)
+		}
+	}
+
+	return errors.Join(errs...)
+}
+
+func (c *Collector) collectServerMetrics(ch chan<- prometheus.Metric) error {
+	err := c.perfDataCollector.Collect(&c.perfDataObject)
+	if err != nil {
+		return fmt.Errorf("failed to collect DHCP Server metrics: %w", err)
 	}
 
 	ch <- prometheus.MustNewConstMetric(
 		c.packetsReceivedTotal,
 		prometheus.CounterValue,
-		data[packetsReceivedTotal].FirstValue,
+		c.perfDataObject[0].PacketsReceivedTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.duplicatesDroppedTotal,
 		prometheus.CounterValue,
-		data[duplicatesDroppedTotal].FirstValue,
+		c.perfDataObject[0].DuplicatesDroppedTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.packetsExpiredTotal,
 		prometheus.CounterValue,
-		data[packetsExpiredTotal].FirstValue,
+		c.perfDataObject[0].PacketsExpiredTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.activeQueueLength,
 		prometheus.GaugeValue,
-		data[activeQueueLength].FirstValue,
+		c.perfDataObject[0].ActiveQueueLength,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.conflictCheckQueueLength,
 		prometheus.GaugeValue,
-		data[conflictCheckQueueLength].FirstValue,
+		c.perfDataObject[0].ConflictCheckQueueLength,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.discoversTotal,
 		prometheus.CounterValue,
-		data[discoversTotal].FirstValue,
+		c.perfDataObject[0].DiscoversTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.offersTotal,
 		prometheus.CounterValue,
-		data[offersTotal].FirstValue,
+		c.perfDataObject[0].OffersTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.requestsTotal,
 		prometheus.CounterValue,
-		data[requestsTotal].FirstValue,
+		c.perfDataObject[0].RequestsTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.informsTotal,
 		prometheus.CounterValue,
-		data[informsTotal].FirstValue,
+		c.perfDataObject[0].InformsTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.acksTotal,
 		prometheus.CounterValue,
-		data[acksTotal].FirstValue,
+		c.perfDataObject[0].AcksTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.nACKsTotal,
 		prometheus.CounterValue,
-		data[nacksTotal].FirstValue,
+		c.perfDataObject[0].NacksTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.declinesTotal,
 		prometheus.CounterValue,
-		data[declinesTotal].FirstValue,
+		c.perfDataObject[0].DeclinesTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.releasesTotal,
 		prometheus.CounterValue,
-		data[releasesTotal].FirstValue,
+		c.perfDataObject[0].ReleasesTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.offerQueueLength,
 		prometheus.GaugeValue,
-		data[offerQueueLength].FirstValue,
+		c.perfDataObject[0].OfferQueueLength,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.deniedDueToMatch,
 		prometheus.CounterValue,
-		data[deniedDueToMatch].FirstValue,
+		c.perfDataObject[0].DeniedDueToMatch,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.deniedDueToNonMatch,
 		prometheus.CounterValue,
-		data[deniedDueToNonMatch].FirstValue,
+		c.perfDataObject[0].DeniedDueToNonMatch,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.failoverBndUpdSentTotal,
 		prometheus.CounterValue,
-		data[failoverBndUpdSentTotal].FirstValue,
+		c.perfDataObject[0].FailoverBndUpdSentTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.failoverBndUpdReceivedTotal,
 		prometheus.CounterValue,
-		data[failoverBndUpdReceivedTotal].FirstValue,
+		c.perfDataObject[0].FailoverBndUpdReceivedTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.failoverBndAckSentTotal,
 		prometheus.CounterValue,
-		data[failoverBndAckSentTotal].FirstValue,
+		c.perfDataObject[0].FailoverBndAckSentTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.failoverBndAckReceivedTotal,
 		prometheus.CounterValue,
-		data[failoverBndAckReceivedTotal].FirstValue,
+		c.perfDataObject[0].FailoverBndAckReceivedTotal,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.failoverBndUpdPendingOutboundQueue,
 		prometheus.GaugeValue,
-		data[failoverBndUpdPendingOutboundQueue].FirstValue,
+		c.perfDataObject[0].FailoverBndUpdPendingOutboundQueue,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.failoverTransitionsCommunicationInterruptedState,
 		prometheus.CounterValue,
-		data[failoverTransitionsCommunicationInterruptedState].FirstValue,
+		c.perfDataObject[0].FailoverTransitionsCommunicationInterruptedState,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.failoverTransitionsPartnerDownState,
 		prometheus.CounterValue,
-		data[failoverTransitionsPartnerDownState].FirstValue,
+		c.perfDataObject[0].FailoverTransitionsPartnerDownState,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.failoverTransitionsRecoverState,
 		prometheus.CounterValue,
-		data[failoverTransitionsRecoverState].FirstValue,
+		c.perfDataObject[0].FailoverTransitionsRecoverState,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.failoverBndUpdDropped,
 		prometheus.CounterValue,
-		data[failoverBndUpdDropped].FirstValue,
+		c.perfDataObject[0].FailoverBndUpdDropped,
 	)
 
 	return nil
 }
+
+func (c *Collector) collectScopeMetrics(ch chan<- prometheus.Metric) error {
+	dhcpScopes, err := dhcpsapi.GetDHCPV4ScopeStatistics()
+	if err != nil {
+		return fmt.Errorf("failed to get DHCP scopes: %w", err)
+	}
+
+	for _, scope := range dhcpScopes {
+		scopeID := scope.ScopeIPAddress.String()
+
+		ch <- prometheus.MustNewConstMetric(
+			c.scopeInfo,
+			prometheus.GaugeValue,
+			1,
+			scope.Name,
+			scope.SuperScopeName,
+			strconv.Itoa(int(scope.SuperScopeNumber)),
+			scopeID,
+		)
+
+		for state, name := range dhcpsapi.DHCP_SUBNET_STATE_NAMES {
+			metric := 0.0
+			if state == scope.State {
+				metric = 1.0
+			}
+
+			ch <- prometheus.MustNewConstMetric(
+				c.scopeState,
+				prometheus.GaugeValue,
+				metric,
+				scopeID,
+				name,
+			)
+		}
+
+		if scope.AddressesFree != -1 {
+			ch <- prometheus.MustNewConstMetric(
+				c.scopeAddressesFreeTotal,
+				prometheus.GaugeValue,
+				scope.AddressesFree,
+				scopeID,
+			)
+		}
+
+		if scope.AddressesFreeOnPartnerServer != -1 {
+			ch <- prometheus.MustNewConstMetric(
+				c.scopeAddressesFreeOnPartnerServerTotal,
+				prometheus.GaugeValue,
+				scope.AddressesFreeOnPartnerServer,
+				scopeID,
+			)
+		}
+
+		if scope.AddressesFreeOnThisServer != -1 {
+			ch <- prometheus.MustNewConstMetric(
+				c.scopeAddressesFreeOnThisServerTotal,
+				prometheus.GaugeValue,
+				scope.AddressesFreeOnThisServer,
+				scopeID,
+			)
+		}
+
+		if scope.AddressesInUse != -1 {
+			ch <- prometheus.MustNewConstMetric(
+				c.scopeAddressesInUseTotal,
+				prometheus.GaugeValue,
+				scope.AddressesInUse,
+				scopeID,
+			)
+		}
+
+		if scope.AddressesInUseOnPartnerServer != -1 {
+			ch <- prometheus.MustNewConstMetric(
+				c.scopeAddressesInUseOnPartnerServerTotal,
+				prometheus.GaugeValue,
+				scope.AddressesInUseOnPartnerServer,
+				scopeID,
+			)
+		}
+
+		if scope.AddressesInUseOnThisServer != -1 {
+			ch <- prometheus.MustNewConstMetric(
+				c.scopeAddressesInUseOnThisServerTotal,
+				prometheus.GaugeValue,
+				scope.AddressesInUseOnThisServer,
+				scopeID,
+			)
+		}
+
+		if scope.PendingOffers != -1 {
+			ch <- prometheus.MustNewConstMetric(
+				c.scopePendingOffersTotal,
+				prometheus.GaugeValue,
+				scope.PendingOffers,
+				scopeID,
+			)
+		}
+
+		if scope.ReservedAddress != -1 {
+			ch <- prometheus.MustNewConstMetric(
+				c.scopeReservedAddressTotal,
+				prometheus.GaugeValue,
+				scope.ReservedAddress,
+				scopeID,
+			)
+		}
+	}
+
+	return nil
+}

internal/collector/dhcp/dhcp_test.go

@@ -1,3 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package dhcp_test
@@ -12,3 +27,7 @@ import (
 func BenchmarkCollector(b *testing.B) {
 	testutils.FuncBenchmarkCollector(b, dhcp.Name, dhcp.NewWithFlags)
 }
+
+func TestCollector(t *testing.T) {
+	testutils.TestCollector(t, dhcp.New, nil)
+}

internal/collector/dhcp/types.go

@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package dhcp
+
+type perfDataCounterValues struct {
+	AcksTotal                                        float64 `perfdata:"Acks/sec"`
+	ActiveQueueLength                                float64 `perfdata:"Active Queue Length"`
+	ConflictCheckQueueLength                         float64 `perfdata:"Conflict Check Queue Length"`
+	DeclinesTotal                                    float64 `perfdata:"Declines/sec"`
+	DeniedDueToMatch                                 float64 `perfdata:"Denied due to match."`
+	DeniedDueToNonMatch                              float64 `perfdata:"Denied due to match."`
+	DiscoversTotal                                   float64 `perfdata:"Discovers/sec"`
+	DuplicatesDroppedTotal                           float64 `perfdata:"Duplicates Dropped/sec"`
+	FailoverBndAckReceivedTotal                      float64 `perfdata:"Failover: BndAck received/sec."`
+	FailoverBndAckSentTotal                          float64 `perfdata:"Failover: BndAck sent/sec."`
+	FailoverBndUpdDropped                            float64 `perfdata:"Failover: BndUpd Dropped."`
+	FailoverBndUpdPendingOutboundQueue               float64 `perfdata:"Failover: BndUpd pending in outbound queue."`
+	FailoverBndUpdReceivedTotal                      float64 `perfdata:"Failover: BndUpd received/sec."`
+	FailoverBndUpdSentTotal                          float64 `perfdata:"Failover: BndUpd sent/sec."`
+	FailoverTransitionsCommunicationInterruptedState float64 `perfdata:"Failover: Transitions to COMMUNICATION-INTERRUPTED state."`
+	FailoverTransitionsPartnerDownState              float64 `perfdata:"Failover: Transitions to PARTNER-DOWN state."`
+	FailoverTransitionsRecoverState                  float64 `perfdata:"Failover: Transitions to RECOVER state."`
+	InformsTotal                                     float64 `perfdata:"Informs/sec"`
+	NacksTotal                                       float64 `perfdata:"Nacks/sec"`
+	OfferQueueLength                                 float64 `perfdata:"Offer Queue Length"`
+	OffersTotal                                      float64 `perfdata:"Offers/sec"`
+	PacketsExpiredTotal                              float64 `perfdata:"Packets Expired/sec"`
+	PacketsReceivedTotal                             float64 `perfdata:"Packets Received/sec"`
+	ReleasesTotal                                    float64 `perfdata:"Releases/sec"`
+	RequestsTotal                                    float64 `perfdata:"Requests/sec"`
+}

internal/collector/diskdrive/diskdrive.go

@@ -1,3 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package diskdrive
@@ -18,6 +33,7 @@ const Name = "diskdrive"
 
 type Config struct{}
 
+//nolint:gochecknoglobals
 var ConfigDefaults = Config{}
 
 // A Collector is a Prometheus Collector for a few WMI metrics in Win32_DiskDrive.
@@ -58,18 +74,6 @@ func (c *Collector) Close() error {
 }
 
 func (c *Collector) Build(_ *slog.Logger, miSession *mi.Session) error {
-	if miSession == nil {
-		return errors.New("miSession is nil")
-	}
-
-	miQuery, err := mi.NewQuery("SELECT DeviceID, Model, Caption, Name, Partitions, Size, Status, Availability FROM WIN32_DiskDrive")
-	if err != nil {
-		return fmt.Errorf("failed to create WMI query: %w", err)
-	}
-
-	c.miQuery = miQuery
-	c.miSession = miSession
-
 	c.diskInfo = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "info"),
 		"General drive information",
@@ -106,6 +110,23 @@ func (c *Collector) Build(_ *slog.Logger, miSession *mi.Session) error {
 		nil,
 	)
 
+	if miSession == nil {
+		return errors.New("miSession is nil")
+	}
+
+	miQuery, err := mi.NewQuery("SELECT DeviceID, Model, Caption, Name, Partitions, Size, Status, Availability FROM WIN32_DiskDrive")
+	if err != nil {
+		return fmt.Errorf("failed to create WMI query: %w", err)
+	}
+
+	c.miQuery = miQuery
+	c.miSession = miSession
+
+	var dst []diskDrive
+	if err := c.miSession.Query(&dst, mi.NamespaceRootCIMv2, c.miQuery); err != nil {
+		return fmt.Errorf("WMI query failed: %w", err)
+	}
+
 	return nil
 }
 
@@ -120,6 +141,7 @@ type diskDrive struct {
 	Availability uint16 `mi:"Availability"`
 }
 
+//nolint:gochecknoglobals
 var (
 	allDiskStatus = []string{
 		"OK",

internal/collector/diskdrive/diskdrive_test.go

@@ -1,3 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package diskdrive_test
@@ -12,3 +27,7 @@ import (
 func BenchmarkCollector(b *testing.B) {
 	testutils.FuncBenchmarkCollector(b, diskdrive.Name, diskdrive.NewWithFlags)
 }
+
+func TestCollector(t *testing.T) {
+	testutils.TestCollector(t, diskdrive.New, nil)
+}

internal/collector/dns/const.go

@@ -1,94 +0,0 @@
-//go:build windows
-
-package dns
-
-const (
-	_                              = "% User Time"
-	_                              = "176"
-	_                              = "Async Fast Reads/sec"
-	axfrRequestReceived            = "AXFR Request Received"
-	axfrRequestSent                = "AXFR Request Sent"
-	axfrResponseReceived           = "AXFR Response Received"
-	axfrSuccessReceived            = "AXFR Success Received"
-	axfrSuccessSent                = "AXFR Success Sent"
-	cachingMemory                  = "Caching Memory"
-	_                              = "Data Flush Pages/sec"
-	_                              = "Data Flushes/sec"
-	databaseNodeMemory             = "Database Node Memory"
-	dynamicUpdateNoOperation       = "Dynamic Update NoOperation"
-	_                              = "Dynamic Update NoOperation/sec"
-	dynamicUpdateQueued            = "Dynamic Update Queued"
-	_                              = "Dynamic Update Received"
-	_                              = "Dynamic Update Received/sec"
-	dynamicUpdateRejected          = "Dynamic Update Rejected"
-	dynamicUpdateTimeOuts          = "Dynamic Update TimeOuts"
-	dynamicUpdateWrittenToDatabase = "Dynamic Update Written to Database"
-	_                              = "Dynamic Update Written to Database/sec"
-	_                              = "Enumerations Server/sec"
-	_                              = "Fast Read Not Possibles/sec"
-	_                              = "Fast Read Resource Misses/sec"
-	ixfrRequestReceived            = "IXFR Request Received"
-	ixfrRequestSent                = "IXFR Request Sent"
-	ixfrResponseReceived           = "IXFR Response Received"
-	_                              = "IXFR Success Received"
-	ixfrSuccessSent                = "IXFR Success Sent"
-	ixfrTCPSuccessReceived         = "IXFR TCP Success Received"
-	ixfrUDPSuccessReceived         = "IXFR UDP Success Received"
-	_                              = "Lazy Write Flushes/sec"
-	_                              = "Lazy Write Pages/sec"
-	_                              = "Level 2 TLB Fills/sec"
-	nbStatMemory                   = "Nbstat Memory"
-	notifyReceived                 = "Notify Received"
-	notifySent                     = "Notify Sent"
-	_                              = "Query Dropped Bad Socket"
-	_                              = "Query Dropped Bad Socket/sec"
-	_                              = "Query Dropped By Policy"
-	_                              = "Query Dropped By Policy/sec"
-	_                              = "Query Dropped By Response Rate Limiting"
-	_                              = "Query Dropped By Response Rate Limiting/sec"
-	_                              = "Query Dropped Send"
-	_                              = "Query Dropped Send/sec"
-	_                              = "Query Dropped Total"
-	_                              = "Query Dropped Total/sec"
-	recordFlowMemory               = "Record Flow Memory"
-	recursiveQueries               = "Recursive Queries"
-	_                              = "Recursive Queries/sec"
-	recursiveQueryFailure          = "Recursive Query Failure"
-	_                              = "Recursive Query Failure/sec"
-	_                              = "Recursive Send TimeOuts"
-	recursiveSendTimeOuts          = "Recursive TimeOut/sec"
-	_                              = "Responses Suppressed"
-	_                              = "Responses Suppressed/sec"
-	secureUpdateFailure            = "Secure Update Failure"
-	secureUpdateReceived           = "Secure Update Received"
-	_                              = "Secure Update Received/sec"
-	tcpMessageMemory               = "TCP Message Memory"
-	tcpQueryReceived               = "TCP Query Received"
-	_                              = "TCP Query Received/sec"
-	tcpResponseSent                = "TCP Response Sent"
-	_                              = "TCP Response Sent/sec"
-	_                              = "Total Query Received"
-	_                              = "Total Query Received/sec"
-	_                              = "Total Remote Inflight Queries"
-	_                              = "Total Response Sent"
-	_                              = "Total Response Sent/sec"
-	udpMessageMemory               = "UDP Message Memory"
-	udpQueryReceived               = "UDP Query Received"
-	_                              = "UDP Query Received/sec"
-	udpResponseSent                = "UDP Response Sent"
-	_                              = "UDP Response Sent/sec"
-	unmatchedResponsesReceived     = "Unmatched Responses Received"
-	_                              = "Virtual Bytes"
-	winsLookupReceived             = "WINS Lookup Received"
-	_                              = "WINS Lookup Received/sec"
-	winsResponseSent               = "WINS Response Sent"
-	_                              = "WINS Response Sent/sec"
-	winsReverseLookupReceived      = "WINS Reverse Lookup Received"
-	_                              = "WINS Reverse Lookup Received/sec"
-	winsReverseResponseSent        = "WINS Reverse Response Sent"
-	_                              = "WINS Reverse Response Sent/sec"
-	zoneTransferFailure            = "Zone Transfer Failure"
-	zoneTransferSOARequestSent     = "Zone Transfer Request Received"
-	_                              = "Zone Transfer SOA Request Sent"
-	_                              = "Zone Transfer Success"
-)

internal/collector/dns/dns.go

@@ -1,3 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package dns
@@ -6,25 +21,43 @@ import (
 	"errors"
 	"fmt"
 	"log/slog"
+	"slices"
+	"strings"
 
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/prometheus-community/windows_exporter/internal/mi"
-	"github.com/prometheus-community/windows_exporter/internal/perfdata"
+	"github.com/prometheus-community/windows_exporter/internal/pdh"
 	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-const Name = "dns"
+const (
+	Name                 = "dns"
+	subCollectorMetrics  = "metrics"
+	subCollectorWMIStats = "wmi_stats"
+)
 
-type Config struct{}
+type Config struct {
+	CollectorsEnabled []string `yaml:"enabled"`
+}
 
-var ConfigDefaults = Config{}
+//nolint:gochecknoglobals
+var ConfigDefaults = Config{
+	CollectorsEnabled: []string{
+		subCollectorMetrics,
+		subCollectorWMIStats,
+	},
+}
 
 // A Collector is a Prometheus Collector for WMI Win32_PerfRawData_DNS_DNS metrics.
 type Collector struct {
 	config Config
 
-	perfDataCollector *perfdata.Collector
+	perfDataCollector *pdh.Collector
+	perfDataObject    []perfDataCounterValues
+
+	miSession *mi.Session
+	miQuery   mi.Query
 
 	dynamicUpdatesFailures        *prometheus.Desc
 	dynamicUpdatesQueued          *prometheus.Desc
@@ -48,6 +81,7 @@ type Collector struct {
 	zoneTransferResponsesReceived *prometheus.Desc
 	zoneTransferSuccessReceived   *prometheus.Desc
 	zoneTransferSuccessSent       *prometheus.Desc
+	dnsWMIStats                   *prometheus.Desc
 }
 
 func New(config *Config) *Collector {
@@ -55,6 +89,10 @@ func New(config *Config) *Collector {
 		config = &ConfigDefaults
 	}
 
+	if config.CollectorsEnabled == nil {
+		config.CollectorsEnabled = ConfigDefaults.CollectorsEnabled
+	}
+
 	c := &Collector{
 		config: *config,
 	}
@@ -62,8 +100,26 @@ func New(config *Config) *Collector {
 	return c
 }
 
-func NewWithFlags(_ *kingpin.Application) *Collector {
-	return &Collector{}
+func NewWithFlags(app *kingpin.Application) *Collector {
+	c := &Collector{
+		config: ConfigDefaults,
+	}
+	c.config.CollectorsEnabled = make([]string, 0)
+
+	var collectorsEnabled string
+
+	app.Flag(
+		"collector.dns.enabled",
+		"Comma-separated list of collectors to use. Defaults to all, if not specified.",
+	).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 {
@@ -76,55 +132,31 @@ func (c *Collector) Close() error {
 	return nil
 }
 
-func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
-	var err error
-
-	c.perfDataCollector, err = perfdata.NewCollector("DNS", perfdata.InstanceAll, []string{
-		axfrRequestReceived,
-		axfrRequestSent,
-		axfrResponseReceived,
-		axfrSuccessReceived,
-		axfrSuccessSent,
-		cachingMemory,
-		databaseNodeMemory,
-		dynamicUpdateNoOperation,
-		dynamicUpdateQueued,
-		dynamicUpdateRejected,
-		dynamicUpdateTimeOuts,
-		dynamicUpdateWrittenToDatabase,
-		ixfrRequestReceived,
-		ixfrRequestSent,
-		ixfrResponseReceived,
-		ixfrSuccessSent,
-		ixfrTCPSuccessReceived,
-		ixfrUDPSuccessReceived,
-		nbStatMemory,
-		notifyReceived,
-		notifySent,
-		recordFlowMemory,
-		recursiveQueries,
-		recursiveQueryFailure,
-		recursiveSendTimeOuts,
-		secureUpdateFailure,
-		secureUpdateReceived,
-		tcpMessageMemory,
-		tcpQueryReceived,
-		tcpResponseSent,
-		udpMessageMemory,
-		udpQueryReceived,
-		udpResponseSent,
-		unmatchedResponsesReceived,
-		winsLookupReceived,
-		winsResponseSent,
-		winsReverseLookupReceived,
-		winsReverseResponseSent,
-		zoneTransferFailure,
-		zoneTransferSOARequestSent,
-	})
-	if err != nil {
-		return fmt.Errorf("failed to create DNS collector: %w", err)
+func (c *Collector) Build(_ *slog.Logger, miSession *mi.Session) error {
+	for _, collector := range c.config.CollectorsEnabled {
+		if !slices.Contains([]string{subCollectorMetrics, subCollectorWMIStats}, collector) {
+			return fmt.Errorf("unknown sub collector: %s. Possible values: %s", collector,
+				strings.Join([]string{subCollectorMetrics, subCollectorWMIStats}, ", "),
+			)
+		}
 	}
 
+	if slices.Contains(c.config.CollectorsEnabled, subCollectorMetrics) {
+		if err := c.buildMetricsCollector(); err != nil {
+			return err
+		}
+	}
+
+	if slices.Contains(c.config.CollectorsEnabled, subCollectorWMIStats) {
+		if err := c.buildErrorStatsCollector(miSession); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (c *Collector) buildMetricsCollector() 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",
@@ -258,85 +290,128 @@ func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
 		nil,
 	)
 
+	c.dnsWMIStats = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "wmi_stats_total"),
+		"DNS WMI statistics from MicrosoftDNS_Statistic",
+		[]string{"name", "collection_name", "dns_server"},
+		nil,
+	)
+
+	var err error
+
+	c.perfDataCollector, err = pdh.NewCollector[perfDataCounterValues](pdh.CounterTypeRaw, "DNS", pdh.InstancesAll)
+	if err != nil {
+		return fmt.Errorf("failed to create DNS collector: %w", err)
+	}
+
+	return nil
+}
+
+func (c *Collector) buildErrorStatsCollector(miSession *mi.Session) error {
+	if miSession == nil {
+		return errors.New("miSession is nil")
+	}
+
+	query, err := mi.NewQuery("SELECT Name, CollectionName, Value, DnsServerName FROM MicrosoftDNS_Statistic WHERE CollectionName = 'Error Stats'")
+	if err != nil {
+		return fmt.Errorf("failed to create query: %w", err)
+	}
+
+	c.miSession = miSession
+	c.miQuery = query
+
 	return nil
 }
 
 // Collect sends the metric values for each metric
 // to the provided prometheus Metric channel.
 func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
-	perfData, err := c.perfDataCollector.Collect()
+	errs := make([]error, 0)
+
+	if slices.Contains(c.config.CollectorsEnabled, subCollectorMetrics) {
+		if err := c.collectMetrics(ch); err != nil {
+			errs = append(errs, fmt.Errorf("failed collecting metrics: %w", err))
+		}
+	}
+
+	if slices.Contains(c.config.CollectorsEnabled, subCollectorWMIStats) {
+		if err := c.collectErrorStats(ch); err != nil {
+			errs = append(errs, fmt.Errorf("failed collecting WMI statistics: %w", err))
+		}
+	}
+
+	return errors.Join(errs...)
+}
+
+func (c *Collector) collectMetrics(ch chan<- prometheus.Metric) error {
+	err := c.perfDataCollector.Collect(&c.perfDataObject)
 	if err != nil {
 		return fmt.Errorf("failed to collect DNS metrics: %w", err)
 	}
 
-	data, ok := perfData[perfdata.EmptyInstance]
-	if !ok {
-		return errors.New("perflib query for DNS returned empty result set")
-	}
-
 	ch <- prometheus.MustNewConstMetric(
 		c.zoneTransferRequestsReceived,
 		prometheus.CounterValue,
-		data[axfrRequestReceived].FirstValue,
+		c.perfDataObject[0].AxfrRequestReceived,
 		"full",
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.zoneTransferRequestsReceived,
 		prometheus.CounterValue,
-		data[ixfrRequestReceived].FirstValue,
+		c.perfDataObject[0].IxfrRequestReceived,
 		"incremental",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.zoneTransferRequestsSent,
 		prometheus.CounterValue,
-		data[axfrRequestSent].FirstValue,
+		c.perfDataObject[0].AxfrRequestSent,
 		"full",
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.zoneTransferRequestsSent,
 		prometheus.CounterValue,
-		data[ixfrRequestSent].FirstValue,
+		c.perfDataObject[0].IxfrRequestSent,
 		"incremental",
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.zoneTransferRequestsSent,
 		prometheus.CounterValue,
-		data[zoneTransferSOARequestSent].FirstValue,
+		c.perfDataObject[0].ZoneTransferSOARequestSent,
 		"soa",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.zoneTransferResponsesReceived,
 		prometheus.CounterValue,
-		data[axfrResponseReceived].FirstValue,
+		c.perfDataObject[0].AxfrResponseReceived,
 		"full",
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.zoneTransferResponsesReceived,
 		prometheus.CounterValue,
-		data[ixfrResponseReceived].FirstValue,
+		c.perfDataObject[0].IxfrResponseReceived,
 		"incremental",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.zoneTransferSuccessReceived,
 		prometheus.CounterValue,
-		data[axfrSuccessReceived].FirstValue,
+		c.perfDataObject[0].AxfrSuccessReceived,
 		"full",
 		"tcp",
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.zoneTransferSuccessReceived,
 		prometheus.CounterValue,
-		data[ixfrTCPSuccessReceived].FirstValue,
+		c.perfDataObject[0].IxfrTCPSuccessReceived,
 		"incremental",
 		"tcp",
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.zoneTransferSuccessReceived,
 		prometheus.CounterValue,
-		data[ixfrTCPSuccessReceived].FirstValue,
+		c.perfDataObject[0].IxfrTCPSuccessReceived,
 		"incremental",
 		"udp",
 	)
@@ -344,184 +419,205 @@ func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
 	ch <- prometheus.MustNewConstMetric(
 		c.zoneTransferSuccessSent,
 		prometheus.CounterValue,
-		data[axfrSuccessSent].FirstValue,
+		c.perfDataObject[0].AxfrSuccessSent,
 		"full",
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.zoneTransferSuccessSent,
 		prometheus.CounterValue,
-		data[ixfrSuccessSent].FirstValue,
+		c.perfDataObject[0].IxfrSuccessSent,
 		"incremental",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.zoneTransferFailures,
 		prometheus.CounterValue,
-		data[zoneTransferFailure].FirstValue,
+		c.perfDataObject[0].ZoneTransferFailure,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.memoryUsedBytes,
 		prometheus.GaugeValue,
-		data[cachingMemory].FirstValue,
+		c.perfDataObject[0].CachingMemory,
 		"caching",
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.memoryUsedBytes,
 		prometheus.GaugeValue,
-		data[databaseNodeMemory].FirstValue,
+		c.perfDataObject[0].DatabaseNodeMemory,
 		"database_node",
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.memoryUsedBytes,
 		prometheus.GaugeValue,
-		data[nbStatMemory].FirstValue,
+		c.perfDataObject[0].NbStatMemory,
 		"nbstat",
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.memoryUsedBytes,
 		prometheus.GaugeValue,
-		data[recordFlowMemory].FirstValue,
+		c.perfDataObject[0].RecordFlowMemory,
 		"record_flow",
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.memoryUsedBytes,
 		prometheus.GaugeValue,
-		data[tcpMessageMemory].FirstValue,
+		c.perfDataObject[0].TcpMessageMemory,
 		"tcp_message",
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.memoryUsedBytes,
 		prometheus.GaugeValue,
-		data[udpMessageMemory].FirstValue,
+		c.perfDataObject[0].UdpMessageMemory,
 		"udp_message",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.dynamicUpdatesReceived,
 		prometheus.CounterValue,
-		data[dynamicUpdateNoOperation].FirstValue,
+		c.perfDataObject[0].DynamicUpdateNoOperation,
 		"noop",
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.dynamicUpdatesReceived,
 		prometheus.CounterValue,
-		data[dynamicUpdateWrittenToDatabase].FirstValue,
+		c.perfDataObject[0].DynamicUpdateWrittenToDatabase,
 		"written",
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.dynamicUpdatesQueued,
 		prometheus.GaugeValue,
-		data[dynamicUpdateQueued].FirstValue,
+		c.perfDataObject[0].DynamicUpdateQueued,
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.dynamicUpdatesFailures,
 		prometheus.CounterValue,
-		data[dynamicUpdateRejected].FirstValue,
+		c.perfDataObject[0].DynamicUpdateRejected,
 		"rejected",
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.dynamicUpdatesFailures,
 		prometheus.CounterValue,
-		data[dynamicUpdateTimeOuts].FirstValue,
+		c.perfDataObject[0].DynamicUpdateTimeOuts,
 		"timeout",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.notifyReceived,
 		prometheus.CounterValue,
-		data[notifyReceived].FirstValue,
+		c.perfDataObject[0].NotifyReceived,
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.notifySent,
 		prometheus.CounterValue,
-		data[notifySent].FirstValue,
+		c.perfDataObject[0].NotifySent,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.recursiveQueries,
 		prometheus.CounterValue,
-		data[recursiveQueries].FirstValue,
+		c.perfDataObject[0].RecursiveQueries,
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.recursiveQueryFailures,
 		prometheus.CounterValue,
-		data[recursiveQueryFailure].FirstValue,
+		c.perfDataObject[0].RecursiveQueryFailure,
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.recursiveQuerySendTimeouts,
 		prometheus.CounterValue,
-		data[recursiveSendTimeOuts].FirstValue,
+		c.perfDataObject[0].RecursiveSendTimeOuts,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.queries,
 		prometheus.CounterValue,
-		data[tcpQueryReceived].FirstValue,
+		c.perfDataObject[0].TcpQueryReceived,
 		"tcp",
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.queries,
 		prometheus.CounterValue,
-		data[udpQueryReceived].FirstValue,
+		c.perfDataObject[0].UdpQueryReceived,
 		"udp",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.responses,
 		prometheus.CounterValue,
-		data[tcpResponseSent].FirstValue,
+		c.perfDataObject[0].TcpResponseSent,
 		"tcp",
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.responses,
 		prometheus.CounterValue,
-		data[udpResponseSent].FirstValue,
+		c.perfDataObject[0].UdpResponseSent,
 		"udp",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.unmatchedResponsesReceived,
 		prometheus.CounterValue,
-		data[unmatchedResponsesReceived].FirstValue,
+		c.perfDataObject[0].UnmatchedResponsesReceived,
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.winsQueries,
 		prometheus.CounterValue,
-		data[winsLookupReceived].FirstValue,
+		c.perfDataObject[0].WinsLookupReceived,
 		"forward",
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.winsQueries,
 		prometheus.CounterValue,
-		data[winsReverseLookupReceived].FirstValue,
+		c.perfDataObject[0].WinsReverseLookupReceived,
 		"reverse",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.winsResponses,
 		prometheus.CounterValue,
-		data[winsResponseSent].FirstValue,
+		c.perfDataObject[0].WinsResponseSent,
 		"forward",
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.winsResponses,
 		prometheus.CounterValue,
-		data[winsReverseResponseSent].FirstValue,
+		c.perfDataObject[0].WinsReverseResponseSent,
 		"reverse",
 	)
 
 	ch <- prometheus.MustNewConstMetric(
 		c.secureUpdateFailures,
 		prometheus.CounterValue,
-		data[secureUpdateFailure].FirstValue,
+		c.perfDataObject[0].SecureUpdateFailure,
 	)
 	ch <- prometheus.MustNewConstMetric(
 		c.secureUpdateReceived,
 		prometheus.CounterValue,
-		data[secureUpdateReceived].FirstValue,
+		c.perfDataObject[0].SecureUpdateReceived,
 	)
 
 	return nil
 }
+
+func (c *Collector) collectErrorStats(ch chan<- prometheus.Metric) error {
+	var stats []Statistic
+	if err := c.miSession.Query(&stats, mi.NamespaceRootMicrosoftDNS, c.miQuery); err != nil {
+		return fmt.Errorf("failed to query DNS statistics: %w", err)
+	}
+
+	// Collect DNS error statistics
+	for _, stat := range stats {
+		ch <- prometheus.MustNewConstMetric(
+			c.dnsWMIStats,
+			prometheus.CounterValue,
+			float64(stat.Value),
+			stat.Name,
+			stat.CollectionName,
+			stat.DnsServerName,
+		)
+	}
+
+	return nil
+}

internal/collector/dns/dns_test.go

@@ -1,3 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package dns_test
@@ -12,3 +27,7 @@ import (
 func BenchmarkCollector(b *testing.B) {
 	testutils.FuncBenchmarkCollector(b, dns.Name, dns.NewWithFlags)
 }
+
+func TestCollector(t *testing.T) {
+	testutils.TestCollector(t, dns.New, nil)
+}

internal/collector/dns/types.go

@@ -0,0 +1,117 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build windows
+
+package dns
+
+type perfDataCounterValues struct {
+	_                              float64 `perfdata:"% User Time"`
+	_                              float64 `perfdata:"176"`
+	_                              float64 `perfdata:"Async Fast Reads/sec"`
+	AxfrRequestReceived            float64 `perfdata:"AXFR Request Received"`
+	AxfrRequestSent                float64 `perfdata:"AXFR Request Sent"`
+	AxfrResponseReceived           float64 `perfdata:"AXFR Response Received"`
+	AxfrSuccessReceived            float64 `perfdata:"AXFR Success Received"`
+	AxfrSuccessSent                float64 `perfdata:"AXFR Success Sent"`
+	CachingMemory                  float64 `perfdata:"Caching Memory"`
+	_                              float64 `perfdata:"Data Flush Pages/sec"`
+	_                              float64 `perfdata:"Data Flushes/sec"`
+	DatabaseNodeMemory             float64 `perfdata:"Database Node Memory"`
+	DynamicUpdateNoOperation       float64 `perfdata:"Dynamic Update NoOperation"`
+	_                              float64 `perfdata:"Dynamic Update NoOperation/sec"`
+	DynamicUpdateQueued            float64 `perfdata:"Dynamic Update Queued"`
+	_                              float64 `perfdata:"Dynamic Update Received"`
+	_                              float64 `perfdata:"Dynamic Update Received/sec"`
+	DynamicUpdateRejected          float64 `perfdata:"Dynamic Update Rejected"`
+	DynamicUpdateTimeOuts          float64 `perfdata:"Dynamic Update TimeOuts"`
+	DynamicUpdateWrittenToDatabase float64 `perfdata:"Dynamic Update Written to Database"`
+	_                              float64 `perfdata:"Dynamic Update Written to Database/sec"`
+	_                              float64 `perfdata:"Enumerations Server/sec"`
+	_                              float64 `perfdata:"Fast Read Not Possibles/sec"`
+	_                              float64 `perfdata:"Fast Read Resource Misses/sec"`
+	IxfrRequestReceived            float64 `perfdata:"IXFR Request Received"`
+	IxfrRequestSent                float64 `perfdata:"IXFR Request Sent"`
+	IxfrResponseReceived           float64 `perfdata:"IXFR Response Received"`
+	_                              float64 `perfdata:"IXFR Success Received"`
+	IxfrSuccessSent                float64 `perfdata:"IXFR Success Sent"`
+	IxfrTCPSuccessReceived         float64 `perfdata:"IXFR TCP Success Received"`
+	IxfrUDPSuccessReceived         float64 `perfdata:"IXFR UDP Success Received"`
+	_                              float64 `perfdata:"Lazy Write Flushes/sec"`
+	_                              float64 `perfdata:"Lazy Write Pages/sec"`
+	_                              float64 `perfdata:"Level 2 TLB Fills/sec"`
+	NbStatMemory                   float64 `perfdata:"Nbstat Memory"`
+	NotifyReceived                 float64 `perfdata:"Notify Received"`
+	NotifySent                     float64 `perfdata:"Notify Sent"`
+	_                              float64 `perfdata:"Query Dropped Bad Socket"`
+	_                              float64 `perfdata:"Query Dropped Bad Socket/sec"`
+	_                              float64 `perfdata:"Query Dropped By Policy"`
+	_                              float64 `perfdata:"Query Dropped By Policy/sec"`
+	_                              float64 `perfdata:"Query Dropped By Response Rate Limiting"`
+	_                              float64 `perfdata:"Query Dropped By Response Rate Limiting/sec"`
+	_                              float64 `perfdata:"Query Dropped Send"`
+	_                              float64 `perfdata:"Query Dropped Send/sec"`
+	_                              float64 `perfdata:"Query Dropped Total"`
+	_                              float64 `perfdata:"Query Dropped Total/sec"`
+	RecordFlowMemory               float64 `perfdata:"Record Flow Memory"`
+	RecursiveQueries               float64 `perfdata:"Recursive Queries"`
+	_                              float64 `perfdata:"Recursive Queries/sec"`
+	RecursiveQueryFailure          float64 `perfdata:"Recursive Query Failure"`
+	_                              float64 `perfdata:"Recursive Query Failure/sec"`
+	_                              float64 `perfdata:"Recursive Send TimeOuts"`
+	RecursiveSendTimeOuts          float64 `perfdata:"Recursive TimeOut/sec"`
+	_                              float64 `perfdata:"Responses Suppressed"`
+	_                              float64 `perfdata:"Responses Suppressed/sec"`
+	SecureUpdateFailure            float64 `perfdata:"Secure Update Failure"`
+	SecureUpdateReceived           float64 `perfdata:"Secure Update Received"`
+	_                              float64 `perfdata:"Secure Update Received/sec"`
+	TcpMessageMemory               float64 `perfdata:"TCP Message Memory"`
+	TcpQueryReceived               float64 `perfdata:"TCP Query Received"`
+	_                              float64 `perfdata:"TCP Query Received/sec"`
+	TcpResponseSent                float64 `perfdata:"TCP Response Sent"`
+	_                              float64 `perfdata:"TCP Response Sent/sec"`
+	_                              float64 `perfdata:"Total Query Received"`
+	_                              float64 `perfdata:"Total Query Received/sec"`
+	_                              float64 `perfdata:"Total Remote Inflight Queries"`
+	_                              float64 `perfdata:"Total Response Sent"`
+	_                              float64 `perfdata:"Total Response Sent/sec"`
+	UdpMessageMemory               float64 `perfdata:"UDP Message Memory"`
+	UdpQueryReceived               float64 `perfdata:"UDP Query Received"`
+	_                              float64 `perfdata:"UDP Query Received/sec"`
+	UdpResponseSent                float64 `perfdata:"UDP Response Sent"`
+	_                              float64 `perfdata:"UDP Response Sent/sec"`
+	UnmatchedResponsesReceived     float64 `perfdata:"Unmatched Responses Received"`
+	_                              float64 `perfdata:"Virtual Bytes"`
+	WinsLookupReceived             float64 `perfdata:"WINS Lookup Received"`
+	_                              float64 `perfdata:"WINS Lookup Received/sec"`
+	WinsResponseSent               float64 `perfdata:"WINS Response Sent"`
+	_                              float64 `perfdata:"WINS Response Sent/sec"`
+	WinsReverseLookupReceived      float64 `perfdata:"WINS Reverse Lookup Received"`
+	_                              float64 `perfdata:"WINS Reverse Lookup Received/sec"`
+	WinsReverseResponseSent        float64 `perfdata:"WINS Reverse Response Sent"`
+	_                              float64 `perfdata:"WINS Reverse Response Sent/sec"`
+	ZoneTransferFailure            float64 `perfdata:"Zone Transfer Failure"`
+	ZoneTransferSOARequestSent     float64 `perfdata:"Zone Transfer Request Received"`
+	_                              float64 `perfdata:"Zone Transfer SOA Request Sent"`
+	_                              float64 `perfdata:"Zone Transfer Success"`
+}
+
+// Statistic represents the structure for DNS error statistics
+type Statistic struct {
+	Name           string `mi:"Name"`
+	CollectionName string `mi:"CollectionName"`
+	Value          uint64 `mi:"Value"`
+	DnsServerName  string `mi:"DnsServerName"`
+}

internal/collector/exchange/exchange.go

@@ -1,3 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package exchange
@@ -8,110 +23,64 @@ import (
 	"log/slog"
 	"os"
 	"strings"
+	"sync"
 
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/prometheus-community/windows_exporter/internal/mi"
-	"github.com/prometheus-community/windows_exporter/internal/perfdata"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
 const Name = "exchange"
 
 const (
-	adAccessProcesses   = "ADAccessProcesses"
-	transportQueues     = "TransportQueues"
-	httpProxy           = "HttpProxy"
-	activeSync          = "ActiveSync"
-	availabilityService = "AvailabilityService"
-	outlookWebAccess    = "OutlookWebAccess"
-	autoDiscover        = "Autodiscover"
-	workloadManagement  = "WorkloadManagement"
-	rpcClientAccess     = "RpcClientAccess"
-	mapiHttpEmsmdb      = "MapiHttpEmsmdb"
+	subCollectorADAccessProcesses   = "ADAccessProcesses"
+	subCollectorTransportQueues     = "TransportQueues"
+	subCollectorHttpProxy           = "HttpProxy"
+	subCollectorActiveSync          = "ActiveSync"
+	subCollectorAvailabilityService = "AvailabilityService"
+	subCollectorOutlookWebAccess    = "OutlookWebAccess"
+	subCollectorAutoDiscover        = "Autodiscover"
+	subCollectorWorkloadManagement  = "WorkloadManagement"
+	subCollectorRpcClientAccess     = "RpcClientAccess"
+	subCollectorMapiHTTPEmsmdb      = "MapiHttpEmsmdb"
 )
 
 type Config struct {
-	CollectorsEnabled []string `yaml:"collectors_enabled"`
+	CollectorsEnabled []string `yaml:"enabled"`
 }
 
+//nolint:gochecknoglobals
 var ConfigDefaults = Config{
 	CollectorsEnabled: []string{
-		adAccessProcesses,
-		transportQueues,
-		httpProxy,
-		activeSync,
-		availabilityService,
-		outlookWebAccess,
-		autoDiscover,
-		workloadManagement,
-		rpcClientAccess,
-		mapiHttpEmsmdb,
+		subCollectorADAccessProcesses,
+		subCollectorTransportQueues,
+		subCollectorHttpProxy,
+		subCollectorActiveSync,
+		subCollectorAvailabilityService,
+		subCollectorOutlookWebAccess,
+		subCollectorAutoDiscover,
+		subCollectorWorkloadManagement,
+		subCollectorRpcClientAccess,
+		subCollectorMapiHTTPEmsmdb,
 	},
 }
 
 type Collector struct {
 	config Config
 
-	perfDataCollectorADAccessProcesses           *perfdata.Collector
-	perfDataCollectorTransportQueues             *perfdata.Collector
-	perfDataCollectorHttpProxy                   *perfdata.Collector
-	perfDataCollectorActiveSync                  *perfdata.Collector
-	perfDataCollectorAvailabilityService         *perfdata.Collector
-	perfDataCollectorOWA                         *perfdata.Collector
-	perfDataCollectorAutoDiscover                *perfdata.Collector
-	perfDataCollectorWorkloadManagementWorkloads *perfdata.Collector
-	perfDataCollectorRpcClientAccess             *perfdata.Collector
-	perfDataCollectorMapiHttpEmsmdb              *perfdata.Collector
+	collectorFns []func(ch chan<- prometheus.Metric) error
+	closeFns     []func()
 
-	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
-	messagesQueuedForDeliveryTotal          *prometheus.Desc
-	messagesSubmittedTotal                  *prometheus.Desc
-	messagesDelayedTotal                    *prometheus.Desc
-	messagesCompletedDeliveryTotal          *prometheus.Desc
-	shadowQueueLength                       *prometheus.Desc
-	submissionQueueLength                   *prometheus.Desc
-	delayQueueLength                        *prometheus.Desc
-	itemsCompletedDeliveryTotal             *prometheus.Desc
-	itemsQueuedForDeliveryExpiredTotal      *prometheus.Desc
-	itemsQueuedForDeliveryTotal             *prometheus.Desc
-	itemsResubmittedTotal                   *prometheus.Desc
+	collectorADAccessProcesses
+	collectorActiveSync
+	collectorAutoDiscover
+	collectorAvailabilityService
+	collectorHTTPProxy
+	collectorMapiHTTPEmsMDB
+	collectorOWA
+	collectorRpcClientAccess
+	collectorTransportQueues
+	collectorWorkloadManagementWorkloads
 }
 
 func New(config *Config) *Collector {
@@ -153,16 +122,16 @@ func NewWithFlags(app *kingpin.Application) *Collector {
 	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",
+				subCollectorADAccessProcesses:   "[19108] MSExchange ADAccess Processes",
+				subCollectorTransportQueues:     "[20524] MSExchangeTransport Queues",
+				subCollectorHttpProxy:           "[36934] MSExchange HttpProxy",
+				subCollectorActiveSync:          "[25138] MSExchange ActiveSync",
+				subCollectorAvailabilityService: "[24914] MSExchange Availability Service",
+				subCollectorOutlookWebAccess:    "[24618] MSExchange OWA",
+				subCollectorAutoDiscover:        "[29240] MSExchange Autodiscover",
+				subCollectorWorkloadManagement:  "[19430] MSExchange WorkloadManagement Workloads",
+				subCollectorRpcClientAccess:     "[29336] MSExchange RpcClientAccess",
+				subCollectorMapiHTTPEmsmdb:      "[26463] MSExchange MapiHttp Emsmdb",
 			}
 
 			sb := strings.Builder{}
@@ -194,51 +163,116 @@ func (c *Collector) GetName() string {
 }
 
 func (c *Collector) Close() error {
+	for _, fn := range c.closeFns {
+		fn()
+	}
+
 	return nil
 }
 
 func (c *Collector) Build(_ *slog.Logger, _ *mi.Session) error {
-	collectorFuncs := map[string]func() error{
-		adAccessProcesses:   c.buildADAccessProcesses,
-		transportQueues:     c.buildTransportQueues,
-		httpProxy:           c.buildHTTPProxy,
-		activeSync:          c.buildActiveSync,
-		availabilityService: c.buildAvailabilityService,
-		outlookWebAccess:    c.buildOWA,
-		autoDiscover:        c.buildAutoDiscover,
-		workloadManagement:  c.buildWorkloadManagementWorkloads,
-		rpcClientAccess:     c.buildRPC,
-		mapiHttpEmsmdb:      c.buildMapiHttpEmsmdb,
+	subCollectors := map[string]struct {
+		build   func() error
+		collect func(ch chan<- prometheus.Metric) error
+		close   func()
+	}{
+		subCollectorADAccessProcesses: {
+			build:   c.buildADAccessProcesses,
+			collect: c.collectADAccessProcesses,
+			close:   c.perfDataCollectorADAccessProcesses.Close,
+		},
+		subCollectorTransportQueues: {
+			build:   c.buildTransportQueues,
+			collect: c.collectTransportQueues,
+			close:   c.perfDataCollectorTransportQueues.Close,
+		},
+		subCollectorHttpProxy: {
+			build:   c.buildHTTPProxy,
+			collect: c.collectHTTPProxy,
+			close:   c.perfDataCollectorHTTPProxy.Close,
+		},
+		subCollectorActiveSync: {
+			build:   c.buildActiveSync,
+			collect: c.collectActiveSync,
+			close:   c.perfDataCollectorActiveSync.Close,
+		},
+		subCollectorAvailabilityService: {
+			build:   c.buildAvailabilityService,
+			collect: c.collectAvailabilityService,
+			close:   c.perfDataCollectorAvailabilityService.Close,
+		},
+		subCollectorOutlookWebAccess: {
+			build:   c.buildOWA,
+			collect: c.collectOWA,
+			close:   c.perfDataCollectorOWA.Close,
+		},
+		subCollectorAutoDiscover: {
+			build:   c.buildAutoDiscover,
+			collect: c.collectAutoDiscover,
+			close:   c.perfDataCollectorAutoDiscover.Close,
+		},
+		subCollectorWorkloadManagement: {
+			build:   c.buildWorkloadManagementWorkloads,
+			collect: c.collectWorkloadManagementWorkloads,
+			close:   c.perfDataCollectorWorkloadManagementWorkloads.Close,
+		},
+		subCollectorRpcClientAccess: {
+			build:   c.buildRpcClientAccess,
+			collect: c.collectRpcClientAccess,
+			close:   c.perfDataCollectorRpcClientAccess.Close,
+		},
+		subCollectorMapiHTTPEmsmdb: {
+			build:   c.buildMapiHTTPEmsMDB,
+			collect: c.collectMapiHTTPEmsMDB,
+			close:   c.perfDataCollectorMapiHTTPEmsMDB.Close,
+		},
 	}
 
-	for _, collectorName := range c.config.CollectorsEnabled {
-		if err := collectorFuncs[collectorName](); err != nil {
-			return err
+	errs := make([]error, 0, len(c.config.CollectorsEnabled))
+
+	for _, name := range c.config.CollectorsEnabled {
+		if _, ok := subCollectors[name]; !ok {
+			return fmt.Errorf("unknown collector: %s", name)
 		}
+
+		if err := subCollectors[name].build(); err != nil {
+			errs = append(errs, fmt.Errorf("failed to build %s collector: %w", name, err))
+
+			continue
+		}
+
+		c.collectorFns = append(c.collectorFns, subCollectors[name].collect)
+		c.closeFns = append(c.closeFns, subCollectors[name].close)
 	}
 
-	return nil
+	return errors.Join(errs...)
 }
 
 // Collect collects exchange metrics and sends them to prometheus.
 func (c *Collector) Collect(ch chan<- prometheus.Metric) error {
-	collectorFuncs := map[string]func(ch chan<- prometheus.Metric) error{
-		adAccessProcesses:   c.collectADAccessProcesses,
-		transportQueues:     c.collectTransportQueues,
-		httpProxy:           c.collectHTTPProxy,
-		activeSync:          c.collectActiveSync,
-		availabilityService: c.collectAvailabilityService,
-		outlookWebAccess:    c.collectOWA,
-		autoDiscover:        c.collectAutoDiscover,
-		workloadManagement:  c.collectWorkloadManagementWorkloads,
-		rpcClientAccess:     c.collectRPC,
-		mapiHttpEmsmdb:      c.collectMapiHttpEmsmdb,
+	errCh := make(chan error, len(c.collectorFns))
+	errs := make([]error, 0, len(c.collectorFns))
+
+	wg := sync.WaitGroup{}
+
+	for _, fn := range c.collectorFns {
+		wg.Add(1)
+
+		go func(fn func(ch chan<- prometheus.Metric) error) {
+			defer wg.Done()
+
+			if err := fn(ch); err != nil {
+				errCh <- err
+			}
+		}(fn)
 	}
 
-	errs := make([]error, len(c.config.CollectorsEnabled))
+	wg.Wait()
 
-	for i, collectorName := range c.config.CollectorsEnabled {
-		errs[i] = collectorFuncs[collectorName](ch)
+	close(errCh)
+
+	for err := range errCh {
+		errs = append(errs, err)
 	}
 
 	return errors.Join(errs...)
@@ -251,8 +285,3 @@ func (c *Collector) toLabelName(name string) string {
 
 	return s
 }
-
-// msToSec converts from ms to seconds.
-func (c *Collector) msToSec(t float64) float64 {
-	return t / 1000
-}

internal/collector/exchange/exchange_active_sync.go

@@ -1,32 +1,49 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package exchange
 
 import (
-	"errors"
 	"fmt"
 
-	"github.com/prometheus-community/windows_exporter/internal/perfdata"
+	"github.com/prometheus-community/windows_exporter/internal/pdh"
 	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-const (
-	requestsPerSec      = "Requests/sec"
-	pingCommandsPending = "Ping Commands Pending"
-	syncCommandsPerSec  = "Sync Commands/sec"
-)
+type collectorActiveSync struct {
+	perfDataCollectorActiveSync *pdh.Collector
+	perfDataObjectActiveSync    []perfDataCounterValuesActiveSync
+
+	activeSyncRequestsPerSec *prometheus.Desc
+	pingCommandsPending      *prometheus.Desc
+	syncCommandsPerSec       *prometheus.Desc
+}
+
+type perfDataCounterValuesActiveSync struct {
+	RequestsPerSec      float64 `perfdata:"Requests/sec"`
+	PingCommandsPending float64 `perfdata:"Ping Commands Pending"`
+	SyncCommandsPerSec  float64 `perfdata:"Sync Commands/sec"`
+}
 
 func (c *Collector) buildActiveSync() error {
-	counters := []string{
-		requestsPerSec,
-		pingCommandsPending,
-		syncCommandsPerSec,
-	}
-
 	var err error
 
-	c.perfDataCollectorActiveSync, err = perfdata.NewCollector("MSExchange ActiveSync", perfdata.InstanceAll, counters)
+	c.perfDataCollectorActiveSync, err = pdh.NewCollector[perfDataCounterValuesActiveSync](pdh.CounterTypeRaw, "MSExchange ActiveSync", pdh.InstancesAll)
 	if err != nil {
 		return fmt.Errorf("failed to create MSExchange ActiveSync collector: %w", err)
 	}
@@ -54,30 +71,26 @@ func (c *Collector) buildActiveSync() error {
 }
 
 func (c *Collector) collectActiveSync(ch chan<- prometheus.Metric) error {
-	perfData, err := c.perfDataCollectorActiveSync.Collect()
+	err := c.perfDataCollectorActiveSync.Collect(&c.perfDataObjectActiveSync)
 	if err != nil {
 		return fmt.Errorf("failed to collect MSExchange ActiveSync metrics: %w", err)
 	}
 
-	if len(perfData) == 0 {
-		return errors.New("perflib query for MSExchange ActiveSync returned empty result set")
-	}
-
-	for _, data := range perfData {
+	for _, data := range c.perfDataObjectActiveSync {
 		ch <- prometheus.MustNewConstMetric(
 			c.activeSyncRequestsPerSec,
 			prometheus.CounterValue,
-			data[requestsPerSec].FirstValue,
+			data.RequestsPerSec,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.pingCommandsPending,
 			prometheus.GaugeValue,
-			data[pingCommandsPending].FirstValue,
+			data.PingCommandsPending,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.syncCommandsPerSec,
 			prometheus.CounterValue,
-			data[syncCommandsPerSec].FirstValue,
+			data.SyncCommandsPerSec,
 		)
 	}
 

internal/collector/exchange/exchange_ad_access_processes.go

@@ -1,36 +1,56 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package exchange
 
 import (
-	"errors"
 	"fmt"
 
-	"github.com/prometheus-community/windows_exporter/internal/perfdata"
+	"github.com/prometheus-community/windows_exporter/internal/pdh"
 	"github.com/prometheus-community/windows_exporter/internal/types"
+	"github.com/prometheus-community/windows_exporter/internal/utils"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-const (
-	ldapReadTime                    = "LDAP Read Time"
-	ldapSearchTime                  = "LDAP Search Time"
-	ldapWriteTime                   = "LDAP Write Time"
-	ldapTimeoutErrorsPerSec         = "LDAP Timeout Errors/sec"
-	longRunningLDAPOperationsPerMin = "Long Running LDAP Operations/min"
-)
+type collectorADAccessProcesses struct {
+	perfDataCollectorADAccessProcesses *pdh.Collector
+	perfDataObjectADAccessProcesses    []perfDataCounterValuesADAccessProcesses
+
+	ldapReadTime                    *prometheus.Desc
+	ldapSearchTime                  *prometheus.Desc
+	ldapTimeoutErrorsPerSec         *prometheus.Desc
+	ldapWriteTime                   *prometheus.Desc
+	longRunningLDAPOperationsPerMin *prometheus.Desc
+}
+
+type perfDataCounterValuesADAccessProcesses struct {
+	Name string
+
+	LdapReadTime                    float64 `perfdata:"LDAP Read Time"`
+	LdapSearchTime                  float64 `perfdata:"LDAP Search Time"`
+	LdapWriteTime                   float64 `perfdata:"LDAP Write Time"`
+	LdapTimeoutErrorsPerSec         float64 `perfdata:"LDAP Timeout Errors/sec"`
+	LongRunningLDAPOperationsPerMin float64 `perfdata:"Long Running LDAP Operations/min"`
+}
 
 func (c *Collector) buildADAccessProcesses() error {
-	counters := []string{
-		ldapReadTime,
-		ldapSearchTime,
-		ldapWriteTime,
-		ldapTimeoutErrorsPerSec,
-		longRunningLDAPOperationsPerMin,
-	}
-
 	var err error
 
-	c.perfDataCollectorADAccessProcesses, err = perfdata.NewCollector("MSExchange ADAccess Processes", perfdata.InstanceAll, counters)
+	c.perfDataCollectorADAccessProcesses, err = pdh.NewCollector[perfDataCounterValuesADAccessProcesses](pdh.CounterTypeRaw, "MSExchange ADAccess Processes", pdh.InstancesAll)
 	if err != nil {
 		return fmt.Errorf("failed to create MSExchange ADAccess Processes collector: %w", err)
 	}
@@ -70,19 +90,15 @@ func (c *Collector) buildADAccessProcesses() error {
 }
 
 func (c *Collector) collectADAccessProcesses(ch chan<- prometheus.Metric) error {
-	perfData, err := c.perfDataCollectorADAccessProcesses.Collect()
+	err := c.perfDataCollectorADAccessProcesses.Collect(&c.perfDataObjectADAccessProcesses)
 	if err != nil {
 		return fmt.Errorf("failed to collect MSExchange ADAccess Processes metrics: %w", err)
 	}
 
-	if len(perfData) == 0 {
-		return errors.New("perflib query for MSExchange ADAccess Processes returned empty result set")
-	}
-
 	labelUseCount := make(map[string]int)
 
-	for name, data := range perfData {
-		labelName := c.toLabelName(name)
+	for _, data := range c.perfDataObjectADAccessProcesses {
+		labelName := c.toLabelName(data.Name)
 
 		// Since we're not including the PID suffix from the instance names in the label names, we get an occasional duplicate.
 		// This seems to affect about 4 instances only of this object.
@@ -94,31 +110,31 @@ func (c *Collector) collectADAccessProcesses(ch chan<- prometheus.Metric) error
 		ch <- prometheus.MustNewConstMetric(
 			c.ldapReadTime,
 			prometheus.CounterValue,
-			c.msToSec(data[ldapReadTime].FirstValue),
+			utils.MilliSecToSec(data.LdapReadTime),
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.ldapSearchTime,
 			prometheus.CounterValue,
-			c.msToSec(data[ldapSearchTime].FirstValue),
+			utils.MilliSecToSec(data.LdapSearchTime),
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.ldapWriteTime,
 			prometheus.CounterValue,
-			c.msToSec(data[ldapWriteTime].FirstValue),
+			utils.MilliSecToSec(data.LdapWriteTime),
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.ldapTimeoutErrorsPerSec,
 			prometheus.CounterValue,
-			data[ldapTimeoutErrorsPerSec].FirstValue,
+			data.LdapTimeoutErrorsPerSec,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.longRunningLDAPOperationsPerMin,
 			prometheus.CounterValue,
-			data[longRunningLDAPOperationsPerMin].FirstValue*60,
+			data.LongRunningLDAPOperationsPerMin*60,
 			labelName,
 		)
 	}

internal/collector/exchange/exchange_autodiscover.go

@@ -1,24 +1,45 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package exchange
 
 import (
-	"errors"
 	"fmt"
 
-	"github.com/prometheus-community/windows_exporter/internal/perfdata"
+	"github.com/prometheus-community/windows_exporter/internal/pdh"
 	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-func (c *Collector) buildAutoDiscover() error {
-	counters := []string{
-		requestsPerSec,
-	}
+type collectorAutoDiscover struct {
+	perfDataCollectorAutoDiscover *pdh.Collector
+	perfDataObjectAutoDiscover    []perfDataCounterValuesAutoDiscover
 
+	autoDiscoverRequestsPerSec *prometheus.Desc
+}
+
+type perfDataCounterValuesAutoDiscover struct {
+	RequestsPerSec float64 `perfdata:"Requests/sec"`
+}
+
+func (c *Collector) buildAutoDiscover() error {
 	var err error
 
-	c.perfDataCollectorAutoDiscover, err = perfdata.NewCollector("MSExchange Autodiscover", perfdata.InstanceAll, counters)
+	c.perfDataCollectorAutoDiscover, err = pdh.NewCollector[perfDataCounterValuesAutoDiscover](pdh.CounterTypeRaw, "MSExchangeAutodiscover", nil)
 	if err != nil {
 		return fmt.Errorf("failed to create MSExchange Autodiscover collector: %w", err)
 	}
@@ -34,20 +55,16 @@ func (c *Collector) buildAutoDiscover() error {
 }
 
 func (c *Collector) collectAutoDiscover(ch chan<- prometheus.Metric) error {
-	perfData, err := c.perfDataCollectorAutoDiscover.Collect()
+	err := c.perfDataCollectorAutoDiscover.Collect(&c.perfDataObjectAutoDiscover)
 	if err != nil {
 		return fmt.Errorf("failed to collect MSExchange Autodiscover metrics: %w", err)
 	}
 
-	if len(perfData) == 0 {
-		return errors.New("perflib query for MSExchange Autodiscover returned empty result set")
-	}
-
-	for _, data := range perfData {
+	for _, data := range c.perfDataObjectAutoDiscover {
 		ch <- prometheus.MustNewConstMetric(
 			c.autoDiscoverRequestsPerSec,
 			prometheus.CounterValue,
-			data[requestsPerSec].FirstValue,
+			data.RequestsPerSec,
 		)
 	}
 

internal/collector/exchange/exchange_availability_service.go

@@ -1,30 +1,51 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package exchange
 
 import (
-	"errors"
 	"fmt"
 
-	"github.com/prometheus-community/windows_exporter/internal/perfdata"
+	"github.com/prometheus-community/windows_exporter/internal/pdh"
 	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-func (c *Collector) buildAvailabilityService() error {
-	counters := []string{
-		requestsPerSec,
-	}
+type collectorAvailabilityService struct {
+	perfDataCollectorAvailabilityService *pdh.Collector
+	perfDataObjectAvailabilityService    []perfDataCounterValuesAvailabilityService
 
+	availabilityRequestsSec *prometheus.Desc
+}
+
+type perfDataCounterValuesAvailabilityService struct {
+	AvailabilityRequestsPerSec float64 `perfdata:"Availability Requests (sec)"`
+}
+
+func (c *Collector) buildAvailabilityService() error {
 	var err error
 
-	c.perfDataCollectorAvailabilityService, err = perfdata.NewCollector("MSExchange Availability Service", perfdata.InstanceAll, counters)
+	c.perfDataCollectorAvailabilityService, err = pdh.NewCollector[perfDataCounterValuesAvailabilityService](pdh.CounterTypeRaw, "MSExchange Availability Service", pdh.InstancesAll)
 	if err != nil {
 		return fmt.Errorf("failed to create MSExchange Availability Service collector: %w", err)
 	}
 
 	c.availabilityRequestsSec = prometheus.NewDesc(
-		prometheus.BuildFQName(types.Namespace, Name, "avail_service_requests_per_sec"),
+		prometheus.BuildFQName(types.Namespace, Name, "availability_service_requests_per_sec"),
 		"Number of requests serviced per second",
 		nil,
 		nil,
@@ -34,20 +55,16 @@ func (c *Collector) buildAvailabilityService() error {
 }
 
 func (c *Collector) collectAvailabilityService(ch chan<- prometheus.Metric) error {
-	perfData, err := c.perfDataCollectorAvailabilityService.Collect()
+	err := c.perfDataCollectorAvailabilityService.Collect(&c.perfDataObjectAvailabilityService)
 	if err != nil {
 		return fmt.Errorf("failed to collect MSExchange Availability Service metrics: %w", err)
 	}
 
-	if len(perfData) == 0 {
-		return errors.New("perflib query for MSExchange Availability Service returned empty result set")
-	}
-
-	for _, data := range perfData {
+	for _, data := range c.perfDataObjectAvailabilityService {
 		ch <- prometheus.MustNewConstMetric(
 			c.availabilityRequestsSec,
 			prometheus.CounterValue,
-			data[requestsPerSec].FirstValue,
+			data.AvailabilityRequestsPerSec,
 		)
 	}
 

internal/collector/exchange/exchange_http_proxy.go

@@ -1,38 +1,58 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package exchange
 
 import (
-	"errors"
 	"fmt"
 
-	"github.com/prometheus-community/windows_exporter/internal/perfdata"
+	"github.com/prometheus-community/windows_exporter/internal/pdh"
 	"github.com/prometheus-community/windows_exporter/internal/types"
+	"github.com/prometheus-community/windows_exporter/internal/utils"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-const (
-	mailboxServerLocatorAverageLatency = "MailboxServerLocator Average Latency (Moving Average)"
-	averageAuthenticationLatency       = "Average Authentication Latency"
-	averageCASProcessingLatency        = "Average ClientAccess Server Processing Latency"
-	mailboxServerProxyFailureRate      = "Mailbox Server Proxy Failure Rate"
-	outstandingProxyRequests           = "Outstanding Proxy Requests"
-	proxyRequestsPerSec                = "Proxy Requests/Sec"
-)
+type collectorHTTPProxy struct {
+	perfDataCollectorHTTPProxy *pdh.Collector
+	perfDataObjectHTTPProxy    []perfDataCounterValuesHTTPProxy
+
+	mailboxServerLocatorAverageLatency *prometheus.Desc
+	averageAuthenticationLatency       *prometheus.Desc
+	outstandingProxyRequests           *prometheus.Desc
+	proxyRequestsPerSec                *prometheus.Desc
+	averageCASProcessingLatency        *prometheus.Desc
+	mailboxServerProxyFailureRate      *prometheus.Desc
+}
+
+type perfDataCounterValuesHTTPProxy struct {
+	Name string
+
+	MailboxServerLocatorAverageLatency float64 `perfdata:"MailboxServerLocator Average Latency (Moving Average)"`
+	AverageAuthenticationLatency       float64 `perfdata:"Average Authentication Latency"`
+	AverageCASProcessingLatency        float64 `perfdata:"Average ClientAccess Server Processing Latency"`
+	MailboxServerProxyFailureRate      float64 `perfdata:"Mailbox Server Proxy Failure Rate"`
+	OutstandingProxyRequests           float64 `perfdata:"Outstanding Proxy Requests"`
+	ProxyRequestsPerSec                float64 `perfdata:"Proxy Requests/Sec"`
+}
 
 func (c *Collector) buildHTTPProxy() error {
-	counters := []string{
-		mailboxServerLocatorAverageLatency,
-		averageAuthenticationLatency,
-		averageCASProcessingLatency,
-		mailboxServerProxyFailureRate,
-		outstandingProxyRequests,
-		proxyRequestsPerSec,
-	}
-
 	var err error
 
-	c.perfDataCollectorHttpProxy, err = perfdata.NewCollector("MSExchange HttpProxy", perfdata.InstanceAll, counters)
+	c.perfDataCollectorHTTPProxy, err = pdh.NewCollector[perfDataCounterValuesHTTPProxy](pdh.CounterTypeRaw, "MSExchange HttpProxy", pdh.InstancesAll)
 	if err != nil {
 		return fmt.Errorf("failed to create MSExchange HttpProxy collector: %w", err)
 	}
@@ -78,51 +98,47 @@ func (c *Collector) buildHTTPProxy() error {
 }
 
 func (c *Collector) collectHTTPProxy(ch chan<- prometheus.Metric) error {
-	perfData, err := c.perfDataCollectorHttpProxy.Collect()
+	err := c.perfDataCollectorHTTPProxy.Collect(&c.perfDataObjectHTTPProxy)
 	if err != nil {
 		return fmt.Errorf("failed to collect MSExchange HttpProxy Service metrics: %w", err)
 	}
 
-	if len(perfData) == 0 {
-		return errors.New("perflib query for MSExchange HttpProxy Service returned empty result set")
-	}
-
-	for name, data := range perfData {
-		labelName := c.toLabelName(name)
+	for _, data := range c.perfDataObjectHTTPProxy {
+		labelName := c.toLabelName(data.Name)
 		ch <- prometheus.MustNewConstMetric(
 			c.mailboxServerLocatorAverageLatency,
 			prometheus.GaugeValue,
-			c.msToSec(data[mailboxServerLocatorAverageLatency].FirstValue),
+			utils.MilliSecToSec(data.MailboxServerLocatorAverageLatency),
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.averageAuthenticationLatency,
 			prometheus.GaugeValue,
-			data[averageAuthenticationLatency].FirstValue,
+			data.AverageAuthenticationLatency,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.averageCASProcessingLatency,
 			prometheus.GaugeValue,
-			c.msToSec(data[averageCASProcessingLatency].FirstValue),
+			utils.MilliSecToSec(data.AverageCASProcessingLatency),
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.mailboxServerProxyFailureRate,
 			prometheus.GaugeValue,
-			data[mailboxServerProxyFailureRate].FirstValue,
+			data.MailboxServerProxyFailureRate,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.outstandingProxyRequests,
 			prometheus.GaugeValue,
-			data[outstandingProxyRequests].FirstValue,
+			data.OutstandingProxyRequests,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.proxyRequestsPerSec,
 			prometheus.CounterValue,
-			data[proxyRequestsPerSec].FirstValue,
+			data.ProxyRequestsPerSec,
 			labelName,
 		)
 	}

internal/collector/exchange/exchange_mapi_http_emsmdb.go

@@ -1,33 +1,50 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package exchange
 
 import (
-	"errors"
 	"fmt"
 
-	"github.com/prometheus-community/windows_exporter/internal/perfdata"
+	"github.com/prometheus-community/windows_exporter/internal/pdh"
 	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-const (
-	activeUserCount = "Active User Count"
-)
+type collectorMapiHTTPEmsMDB struct {
+	perfDataCollectorMapiHTTPEmsMDB *pdh.Collector
+	perfDataObjectMapiHTTPEmsMDB    []perfDataCounterValuesMapiHTTPEmsMDB
 
-func (c *Collector) buildMapiHttpEmsmdb() error {
-	counters := []string{
-		activeUserCount,
-	}
+	activeUserCountMapiHTTPEmsMDB *prometheus.Desc
+}
 
+type perfDataCounterValuesMapiHTTPEmsMDB struct {
+	ActiveUserCount float64 `perfdata:"Active User Count"`
+}
+
+func (c *Collector) buildMapiHTTPEmsMDB() error {
 	var err error
 
-	c.perfDataCollectorMapiHttpEmsmdb, err = perfdata.NewCollector("MSExchange MapiHttp Emsmdb", perfdata.InstanceAll, counters)
+	c.perfDataCollectorMapiHTTPEmsMDB, err = pdh.NewCollector[perfDataCounterValuesMapiHTTPEmsMDB](pdh.CounterTypeRaw, "MSExchange MapiHttp Emsmdb", pdh.InstancesAll)
 	if err != nil {
 		return fmt.Errorf("failed to create MSExchange MapiHttp Emsmdb: %w", err)
 	}
 
-	c.activeUserCountMapiHttpEmsMDB = prometheus.NewDesc(
+	c.activeUserCountMapiHTTPEmsMDB = prometheus.NewDesc(
 		prometheus.BuildFQName(types.Namespace, Name, "mapihttp_emsmdb_active_user_count"),
 		"Number of unique outlook users that have shown some kind of activity in the last 2 minutes",
 		nil,
@@ -37,21 +54,17 @@ func (c *Collector) buildMapiHttpEmsmdb() error {
 	return nil
 }
 
-func (c *Collector) collectMapiHttpEmsmdb(ch chan<- prometheus.Metric) error {
-	perfData, err := c.perfDataCollectorMapiHttpEmsmdb.Collect()
+func (c *Collector) collectMapiHTTPEmsMDB(ch chan<- prometheus.Metric) error {
+	err := c.perfDataCollectorMapiHTTPEmsMDB.Collect(&c.perfDataObjectMapiHTTPEmsMDB)
 	if err != nil {
 		return fmt.Errorf("failed to collect MSExchange MapiHttp Emsmdb metrics: %w", err)
 	}
 
-	if len(perfData) == 0 {
-		return errors.New("perflib query for MSExchange MapiHttp Emsmdb returned empty result set")
-	}
-
-	for _, data := range perfData {
+	for _, data := range c.perfDataObjectMapiHTTPEmsMDB {
 		ch <- prometheus.MustNewConstMetric(
-			c.activeUserCountMapiHttpEmsMDB,
+			c.activeUserCountMapiHTTPEmsMDB,
 			prometheus.GaugeValue,
-			data[activeUserCount].FirstValue,
+			data.ActiveUserCount,
 		)
 	}
 

internal/collector/exchange/exchange_outlook_web_access.go

@@ -1,30 +1,47 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package exchange
 
 import (
-	"errors"
 	"fmt"
 
-	"github.com/prometheus-community/windows_exporter/internal/perfdata"
+	"github.com/prometheus-community/windows_exporter/internal/pdh"
 	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-const (
-	currentUniqueUsers = "Current Unique Users"
-	// requestsPerSec     = "Requests/sec"
-)
+type collectorOWA struct {
+	perfDataCollectorOWA *pdh.Collector
+	perfDataObjectOWA    []perfDataCounterValuesOWA
+
+	currentUniqueUsers *prometheus.Desc
+	owaRequestsPerSec  *prometheus.Desc
+}
+
+type perfDataCounterValuesOWA struct {
+	CurrentUniqueUsers float64 `perfdata:"Current Unique Users"`
+	RequestsPerSec     float64 `perfdata:"Requests/sec"`
+}
 
 func (c *Collector) buildOWA() error {
-	counters := []string{
-		currentUniqueUsers,
-		requestsPerSec,
-	}
-
 	var err error
 
-	c.perfDataCollectorOWA, err = perfdata.NewCollector("MSExchange OWA", perfdata.InstanceAll, counters)
+	c.perfDataCollectorOWA, err = pdh.NewCollector[perfDataCounterValuesOWA](pdh.CounterTypeRaw, "MSExchange OWA", pdh.InstancesAll)
 	if err != nil {
 		return fmt.Errorf("failed to create MSExchange OWA collector: %w", err)
 	}
@@ -46,25 +63,21 @@ func (c *Collector) buildOWA() error {
 }
 
 func (c *Collector) collectOWA(ch chan<- prometheus.Metric) error {
-	perfData, err := c.perfDataCollectorOWA.Collect()
+	err := c.perfDataCollectorOWA.Collect(&c.perfDataObjectOWA)
 	if err != nil {
 		return fmt.Errorf("failed to collect MSExchange OWA metrics: %w", err)
 	}
 
-	if len(perfData) == 0 {
-		return errors.New("perflib query for MSExchange OWA returned empty result set")
-	}
-
-	for _, data := range perfData {
+	for _, data := range c.perfDataObjectOWA {
 		ch <- prometheus.MustNewConstMetric(
 			c.currentUniqueUsers,
 			prometheus.GaugeValue,
-			data[currentUniqueUsers].FirstValue,
+			data.CurrentUniqueUsers,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.owaRequestsPerSec,
 			prometheus.CounterValue,
-			data[requestsPerSec].FirstValue,
+			data.RequestsPerSec,
 		)
 	}
 

internal/collector/exchange/exchange_rpc_client_access.go

@@ -1,38 +1,56 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package exchange
 
 import (
-	"errors"
 	"fmt"
 
-	"github.com/prometheus-community/windows_exporter/internal/perfdata"
+	"github.com/prometheus-community/windows_exporter/internal/pdh"
 	"github.com/prometheus-community/windows_exporter/internal/types"
+	"github.com/prometheus-community/windows_exporter/internal/utils"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-const (
-	rpcAveragedLatency = "RPC Averaged Latency"
-	rpcRequests        = "RPC Requests"
-	// activeUserCount    = "Active User Count"
-	connectionCount     = "Connection Count"
-	rpcOperationsPerSec = "RPC Operations/sec"
-	userCount           = "User Count"
-)
+type collectorRpcClientAccess struct {
+	perfDataCollectorRpcClientAccess *pdh.Collector
+	perfDataObjectRpcClientAccess    []perfDataCounterValuesRpcClientAccess
 
-func (c *Collector) buildRPC() error {
-	counters := []string{
-		rpcAveragedLatency,
-		rpcRequests,
-		activeUserCount,
-		connectionCount,
-		rpcOperationsPerSec,
-		userCount,
-	}
+	activeUserCount     *prometheus.Desc
+	connectionCount     *prometheus.Desc
+	rpcAveragedLatency  *prometheus.Desc
+	rpcOperationsPerSec *prometheus.Desc
+	rpcRequests         *prometheus.Desc
+	userCount           *prometheus.Desc
+}
 
+type perfDataCounterValuesRpcClientAccess struct {
+	RpcAveragedLatency  float64 `perfdata:"RPC Averaged Latency"`
+	RpcRequests         float64 `perfdata:"RPC Requests"`
+	ActiveUserCount     float64 `perfdata:"Active User Count"`
+	ConnectionCount     float64 `perfdata:"Connection Count"`
+	RpcOperationsPerSec float64 `perfdata:"RPC Operations/sec"`
+	UserCount           float64 `perfdata:"User Count"`
+}
+
+func (c *Collector) buildRpcClientAccess() error {
 	var err error
 
-	c.perfDataCollectorRpcClientAccess, err = perfdata.NewCollector("MSExchange RpcClientAccess", perfdata.InstanceAll, counters)
+	c.perfDataCollectorRpcClientAccess, err = pdh.NewCollector[perfDataCounterValuesRpcClientAccess](pdh.CounterTypeRaw, "MSExchange RpcClientAccess", pdh.InstancesAll)
 	if err != nil {
 		return fmt.Errorf("failed to create MSExchange RpcClientAccess collector: %w", err)
 	}
@@ -77,46 +95,42 @@ func (c *Collector) buildRPC() error {
 	return nil
 }
 
-func (c *Collector) collectRPC(ch chan<- prometheus.Metric) error {
-	perfData, err := c.perfDataCollectorRpcClientAccess.Collect()
+func (c *Collector) collectRpcClientAccess(ch chan<- prometheus.Metric) error {
+	err := c.perfDataCollectorRpcClientAccess.Collect(&c.perfDataObjectRpcClientAccess)
 	if err != nil {
 		return fmt.Errorf("failed to collect MSExchange RpcClientAccess: %w", err)
 	}
 
-	if len(perfData) == 0 {
-		return errors.New("perflib query for MSExchange RpcClientAccess returned empty result set")
-	}
-
-	for _, data := range perfData {
+	for _, data := range c.perfDataObjectRpcClientAccess {
 		ch <- prometheus.MustNewConstMetric(
 			c.rpcAveragedLatency,
 			prometheus.GaugeValue,
-			c.msToSec(data[rpcAveragedLatency].FirstValue),
+			utils.MilliSecToSec(data.RpcAveragedLatency),
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.rpcRequests,
 			prometheus.GaugeValue,
-			data[rpcRequests].FirstValue,
+			data.RpcRequests,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.activeUserCount,
 			prometheus.GaugeValue,
-			data[activeUserCount].FirstValue,
+			data.ActiveUserCount,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.connectionCount,
 			prometheus.GaugeValue,
-			data[connectionCount].FirstValue,
+			data.ConnectionCount,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.rpcOperationsPerSec,
 			prometheus.CounterValue,
-			data[rpcOperationsPerSec].FirstValue,
+			data.RpcOperationsPerSec,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.userCount,
 			prometheus.GaugeValue,
-			data[userCount].FirstValue,
+			data.UserCount,
 		)
 	}
 

internal/collector/exchange/exchange_test.go

@@ -1,3 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package exchange_test
@@ -12,3 +27,7 @@ import (
 func BenchmarkCollector(b *testing.B) {
 	testutils.FuncBenchmarkCollector(b, exchange.Name, exchange.NewWithFlags)
 }
+
+func TestCollector(t *testing.T) {
+	testutils.TestCollector(t, exchange.New, nil)
+}

internal/collector/exchange/exchange_transport_queues.go

@@ -1,64 +1,83 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright The Prometheus Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //go:build windows
 
 package exchange
 
 import (
-	"errors"
 	"fmt"
 
-	"github.com/prometheus-community/windows_exporter/internal/perfdata"
+	"github.com/prometheus-community/windows_exporter/internal/pdh"
 	"github.com/prometheus-community/windows_exporter/internal/types"
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-const (
-	externalActiveRemoteDeliveryQueueLength = "External Active Remote Delivery Queue Length"
-	internalActiveRemoteDeliveryQueueLength = "Internal Active Remote Delivery Queue Length"
-	activeMailboxDeliveryQueueLength        = "Active Mailbox Delivery Queue Length"
-	retryMailboxDeliveryQueueLength         = "Retry Mailbox Delivery Queue Length"
-	unreachableQueueLength                  = "Unreachable Queue Length"
-	externalLargestDeliveryQueueLength      = "External Largest Delivery Queue Length"
-	internalLargestDeliveryQueueLength      = "Internal Largest Delivery Queue Length"
-	poisonQueueLength                       = "Poison Queue Length"
-	messagesQueuedForDeliveryTotal          = "Messages Queued For Delivery Total"
-	messagesSubmittedTotal                  = "Messages Submitted Total"
-	messagesDelayedTotal                    = "Messages Delayed Total"
-	messagesCompletedDeliveryTotal          = "Messages Completed Delivery Total"
-	shadowQueueLength                       = "Shadow Queue Length"
-	submissionQueueLength                   = "Submission Queue Length"
-	delayQueueLength                        = "Delay Queue Length"
-	itemsCompletedDeliveryTotal             = "Items Completed Delivery Total"
-	itemsQueuedForDeliveryExpiredTotal      = "Items Queued For Delivery Expired Total"
-	itemsQueuedForDeliveryTotal             = "Items Queued For Delivery Total"
-	itemsResubmittedTotal                   = "Items Resubmitted Total"
-)
+type collectorTransportQueues struct {
+	perfDataCollectorTransportQueues *pdh.Collector
+	perfDataObjectTransportQueues    []perfDataCounterValuesTransportQueues
+
+	activeMailboxDeliveryQueueLength        *prometheus.Desc
+	externalActiveRemoteDeliveryQueueLength *prometheus.Desc
+	externalLargestDeliveryQueueLength      *prometheus.Desc
+	internalActiveRemoteDeliveryQueueLength *prometheus.Desc
+	internalLargestDeliveryQueueLength      *prometheus.Desc
+	poisonQueueLength                       *prometheus.Desc
+	retryMailboxDeliveryQueueLength         *prometheus.Desc
+	unreachableQueueLength                  *prometheus.Desc
+	messagesQueuedForDeliveryTotal          *prometheus.Desc
+	messagesSubmittedTotal                  *prometheus.Desc
+	messagesDelayedTotal                    *prometheus.Desc
+	messagesCompletedDeliveryTotal          *prometheus.Desc
+	aggregateShadowQueueLength              *prometheus.Desc
+	submissionQueueLength                   *prometheus.Desc
+	delayQueueLength                        *prometheus.Desc
+	itemsCompletedDeliveryTotal             *prometheus.Desc
+	itemsQueuedForDeliveryExpiredTotal      *prometheus.Desc
+	itemsQueuedForDeliveryTotal             *prometheus.Desc
+	itemsResubmittedTotal                   *prometheus.Desc
+}
+
+type perfDataCounterValuesTransportQueues struct {
+	Name string
+
+	ExternalActiveRemoteDeliveryQueueLength float64 `perfdata:"External Active Remote Delivery Queue Length"`
+	InternalActiveRemoteDeliveryQueueLength float64 `perfdata:"Internal Active Remote Delivery Queue Length"`
+	ActiveMailboxDeliveryQueueLength        float64 `perfdata:"Active Mailbox Delivery Queue Length"`
+	RetryMailboxDeliveryQueueLength         float64 `perfdata:"Retry Mailbox Delivery Queue Length"`
+	UnreachableQueueLength                  float64 `perfdata:"Unreachable Queue Length"`
+	ExternalLargestDeliveryQueueLength      float64 `perfdata:"External Largest Delivery Queue Length"`
+	InternalLargestDeliveryQueueLength      float64 `perfdata:"Internal Largest Delivery Queue Length"`
+	PoisonQueueLength                       float64 `perfdata:"Poison Queue Length"`
+	MessagesQueuedForDeliveryTotal          float64 `perfdata:"Messages Queued For Delivery Total"`
+	MessagesSubmittedTotal                  float64 `perfdata:"Messages Submitted Total"`
+	MessagesDelayedTotal                    float64 `perfdata:"Messages Delayed Total"`
+	MessagesCompletedDeliveryTotal          float64 `perfdata:"Messages Completed Delivery Total"`
+	AggregateShadowQueueLength              float64 `perfdata:"Aggregate Shadow Queue Length"`
+	SubmissionQueueLength                   float64 `perfdata:"Submission Queue Length"`
+	DelayQueueLength                        float64 `perfdata:"Delay Queue Length"`
+	ItemsCompletedDeliveryTotal             float64 `perfdata:"Items Completed Delivery Total"`
+	ItemsQueuedForDeliveryExpiredTotal      float64 `perfdata:"Items Queued For Delivery Expired Total"`
+	ItemsQueuedForDeliveryTotal             float64 `perfdata:"Items Queued For Delivery Total"`
+	ItemsResubmittedTotal                   float64 `perfdata:"Items Resubmitted Total"`
+}
 
 func (c *Collector) buildTransportQueues() error {
-	counters := []string{
-		externalActiveRemoteDeliveryQueueLength,
-		internalActiveRemoteDeliveryQueueLength,
-		activeMailboxDeliveryQueueLength,
-		retryMailboxDeliveryQueueLength,
-		unreachableQueueLength,
-		externalLargestDeliveryQueueLength,
-		internalLargestDeliveryQueueLength,
-		poisonQueueLength,
-		messagesQueuedForDeliveryTotal,
-		messagesSubmittedTotal,
-		messagesDelayedTotal,
-		messagesCompletedDeliveryTotal,
-		shadowQueueLength,
-		submissionQueueLength,
-		delayQueueLength,
-		itemsCompletedDeliveryTotal,
-		itemsQueuedForDeliveryExpiredTotal,
-		itemsQueuedForDeliveryTotal,
-		itemsResubmittedTotal,
-	}
-
 	var err error
 
-	c.perfDataCollectorTransportQueues, err = perfdata.NewCollector("MSExchangeTransport Queues", perfdata.InstanceAll, counters)
+	c.perfDataCollectorTransportQueues, err = pdh.NewCollector[perfDataCounterValuesTransportQueues](pdh.CounterTypeRaw, "MSExchangeTransport Queues", pdh.InstancesAll)
 	if err != nil {
 		return fmt.Errorf("failed to create MSExchangeTransport Queues collector: %w", err)
 	}
@@ -135,9 +154,9 @@ func (c *Collector) buildTransportQueues() error {
 		[]string{"name"},
 		nil,
 	)
-	c.shadowQueueLength = prometheus.NewDesc(
-		prometheus.BuildFQName(types.Namespace, Name, "transport_queues_shadow_queue_length"),
-		"Shadow Queue Length",
+	c.aggregateShadowQueueLength = prometheus.NewDesc(
+		prometheus.BuildFQName(types.Namespace, Name, "transport_queues_aggregate_shadow_queue_length"),
+		"The current number of messages in shadow queues.",
 		[]string{"name"},
 		nil,
 	)
@@ -182,130 +201,126 @@ func (c *Collector) buildTransportQueues() error {
 }
 
 func (c *Collector) collectTransportQueues(ch chan<- prometheus.Metric) error {
-	perfData, err := c.perfDataCollectorTransportQueues.Collect()
+	err := c.perfDataCollectorTransportQueues.Collect(&c.perfDataObjectTransportQueues)
 	if err != nil {
 		return fmt.Errorf("failed to collect MSExchangeTransport Queues: %w", err)
 	}
 
-	if len(perfData) == 0 {
-		return errors.New("perflib query for MSExchangeTransport Queues returned empty result set")
-	}
-
-	for name, data := range perfData {
-		labelName := c.toLabelName(name)
+	for _, data := range c.perfDataObjectTransportQueues {
+		labelName := c.toLabelName(data.Name)
 
 		ch <- prometheus.MustNewConstMetric(
 			c.externalActiveRemoteDeliveryQueueLength,
 			prometheus.GaugeValue,
-			data[externalActiveRemoteDeliveryQueueLength].FirstValue,
+			data.ExternalActiveRemoteDeliveryQueueLength,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.internalActiveRemoteDeliveryQueueLength,
 			prometheus.GaugeValue,
-			data[internalActiveRemoteDeliveryQueueLength].FirstValue,
+			data.InternalActiveRemoteDeliveryQueueLength,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.activeMailboxDeliveryQueueLength,
 			prometheus.GaugeValue,
-			data[activeMailboxDeliveryQueueLength].FirstValue,
+			data.ActiveMailboxDeliveryQueueLength,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.retryMailboxDeliveryQueueLength,
 			prometheus.GaugeValue,
-			data[retryMailboxDeliveryQueueLength].FirstValue,
+			data.RetryMailboxDeliveryQueueLength,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.unreachableQueueLength,
 			prometheus.GaugeValue,
-			data[unreachableQueueLength].FirstValue,
+			data.UnreachableQueueLength,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.externalLargestDeliveryQueueLength,
 			prometheus.GaugeValue,
-			data[externalLargestDeliveryQueueLength].FirstValue,
+			data.ExternalLargestDeliveryQueueLength,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.internalLargestDeliveryQueueLength,
 			prometheus.GaugeValue,
-			data[internalLargestDeliveryQueueLength].FirstValue,
+			data.InternalLargestDeliveryQueueLength,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.poisonQueueLength,
 			prometheus.GaugeValue,
-			data[poisonQueueLength].FirstValue,
+			data.PoisonQueueLength,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.messagesQueuedForDeliveryTotal,
 			prometheus.CounterValue,
-			data[messagesQueuedForDeliveryTotal].FirstValue,
+			data.MessagesQueuedForDeliveryTotal,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.messagesSubmittedTotal,
 			prometheus.CounterValue,
-			data[messagesSubmittedTotal].FirstValue,
+			data.MessagesSubmittedTotal,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.messagesDelayedTotal,
 			prometheus.CounterValue,
-			data[messagesDelayedTotal].FirstValue,
+			data.MessagesDelayedTotal,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.messagesCompletedDeliveryTotal,
 			prometheus.CounterValue,
-			data[messagesCompletedDeliveryTotal].FirstValue,
+			data.MessagesCompletedDeliveryTotal,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
-			c.shadowQueueLength,
+			c.aggregateShadowQueueLength,
 			prometheus.GaugeValue,
-			data[shadowQueueLength].FirstValue,
+			data.AggregateShadowQueueLength,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.submissionQueueLength,
 			prometheus.GaugeValue,
-			data[submissionQueueLength].FirstValue,
+			data.SubmissionQueueLength,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.delayQueueLength,
 			prometheus.GaugeValue,
-			data[delayQueueLength].FirstValue,
+			data.DelayQueueLength,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.itemsCompletedDeliveryTotal,
 			prometheus.CounterValue,
-			data[itemsCompletedDeliveryTotal].FirstValue,
+			data.ItemsCompletedDeliveryTotal,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.itemsQueuedForDeliveryExpiredTotal,
 			prometheus.CounterValue,
-			data[itemsQueuedForDeliveryExpiredTotal].FirstValue,
+			data.ItemsQueuedForDeliveryExpiredTotal,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.itemsQueuedForDeliveryTotal,
 			prometheus.CounterValue,
-			data[itemsQueuedForDeliveryTotal].FirstValue,
+			data.ItemsQueuedForDeliveryTotal,
 			labelName,
 		)
 		ch <- prometheus.MustNewConstMetric(
 			c.itemsResubmittedTotal,
 			prometheus.CounterValue,
-			data[itemsResubmittedTotal].FirstValue,
+			data.ItemsResubmittedTotal,
 			labelName,
 		)
 	}