diff --git a/agent/agent_posix.go b/agent/agent_posix.go
index e43c3a781..8c311a9e7 100644
--- a/agent/agent_posix.go
+++ b/agent/agent_posix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package agent
 
diff --git a/agent/agent_windows.go b/agent/agent_windows.go
index 3196dc70e..9ac2f1035 100644
--- a/agent/agent_windows.go
+++ b/agent/agent_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package agent
 
diff --git a/cmd/telegraf/main_win_test.go b/cmd/telegraf/main_win_test.go
index 61c43ffd4..42c71b99a 100644
--- a/cmd/telegraf/main_win_test.go
+++ b/cmd/telegraf/main_win_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package main
 
diff --git a/cmd/telegraf/telegraf_posix.go b/cmd/telegraf/telegraf_posix.go
index 1919902c7..fe1182119 100644
--- a/cmd/telegraf/telegraf_posix.go
+++ b/cmd/telegraf/telegraf_posix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 
diff --git a/cmd/telegraf/telegraf_windows.go b/cmd/telegraf/telegraf_windows.go
index 4c565e6fc..feaa2b727 100644
--- a/cmd/telegraf/telegraf_windows.go
+++ b/cmd/telegraf/telegraf_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 //go:generate goversioninfo -icon=../../assets/windows/tiger.ico
 
diff --git a/internal/exec_unix.go b/internal/exec_unix.go
index 0f5d3fca0..4d1b03d7f 100644
--- a/internal/exec_unix.go
+++ b/internal/exec_unix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package internal
 
diff --git a/internal/exec_windows.go b/internal/exec_windows.go
index 708051dda..a577b866b 100644
--- a/internal/exec_windows.go
+++ b/internal/exec_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package internal
 
diff --git a/internal/globpath/globpath_test.go b/internal/globpath/globpath_test.go
index bc286bc75..0ea9c7649 100644
--- a/internal/globpath/globpath_test.go
+++ b/internal/globpath/globpath_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 // TODO: Windows - should be enabled for Windows when super asterisk is fixed on Windows
 // https://github.com/influxdata/telegraf/issues/6248
diff --git a/internal/goplugin/noplugin.go b/internal/goplugin/noplugin.go
index 65fcee418..b14e78fc7 100644
--- a/internal/goplugin/noplugin.go
+++ b/internal/goplugin/noplugin.go
@@ -1,5 +1,4 @@
 //go:build !goplugin
-// +build !goplugin
 
 package goplugin
 
diff --git a/internal/goplugin/plugin.go b/internal/goplugin/plugin.go
index 3af051833..c2d18d0c5 100644
--- a/internal/goplugin/plugin.go
+++ b/internal/goplugin/plugin.go
@@ -1,5 +1,4 @@
 //go:build goplugin
-// +build goplugin
 
 package goplugin
 
diff --git a/internal/process/process_posix.go b/internal/process/process_posix.go
index 8f736bc67..0498081a3 100644
--- a/internal/process/process_posix.go
+++ b/internal/process/process_posix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package process
 
diff --git a/internal/process/process_test.go b/internal/process/process_test.go
index d453c7380..040c5aacb 100644
--- a/internal/process/process_test.go
+++ b/internal/process/process_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package process
 
diff --git a/internal/process/process_windows.go b/internal/process/process_windows.go
index 3aefd20f4..b7de62fad 100644
--- a/internal/process/process_windows.go
+++ b/internal/process/process_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package process
 
diff --git a/logger/event_logger.go b/logger/event_logger.go
index bb0672de7..af0dd3a11 100644
--- a/logger/event_logger.go
+++ b/logger/event_logger.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package logger
 
diff --git a/logger/event_logger_test.go b/logger/event_logger_test.go
index d26825277..18b4dab9f 100644
--- a/logger/event_logger_test.go
+++ b/logger/event_logger_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package logger
 
diff --git a/plugins/inputs/bcache/bcache.go b/plugins/inputs/bcache/bcache.go
index 94f13d6ca..6b58cc5a2 100644
--- a/plugins/inputs/bcache/bcache.go
+++ b/plugins/inputs/bcache/bcache.go
@@ -1,6 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build !windows
-// +build !windows
 
 // bcache doesn't aim for Windows
 
diff --git a/plugins/inputs/bcache/bcache_test.go b/plugins/inputs/bcache/bcache_test.go
index 4c62e0f01..0e44b119c 100644
--- a/plugins/inputs/bcache/bcache_test.go
+++ b/plugins/inputs/bcache/bcache_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package bcache
 
diff --git a/plugins/inputs/bcache/bcache_windows.go b/plugins/inputs/bcache/bcache_windows.go
index faeba8888..e6c3d6e12 100644
--- a/plugins/inputs/bcache/bcache_windows.go
+++ b/plugins/inputs/bcache/bcache_windows.go
@@ -1,4 +1,3 @@
 //go:build windows
-// +build windows
 
 package bcache
diff --git a/plugins/inputs/cgroup/cgroup_linux.go b/plugins/inputs/cgroup/cgroup_linux.go
index b892f528c..f90394792 100644
--- a/plugins/inputs/cgroup/cgroup_linux.go
+++ b/plugins/inputs/cgroup/cgroup_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package cgroup
 
diff --git a/plugins/inputs/cgroup/cgroup_notlinux.go b/plugins/inputs/cgroup/cgroup_notlinux.go
index 1c9c08ec4..892d5d106 100644
--- a/plugins/inputs/cgroup/cgroup_notlinux.go
+++ b/plugins/inputs/cgroup/cgroup_notlinux.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package cgroup
 
diff --git a/plugins/inputs/cgroup/cgroup_test.go b/plugins/inputs/cgroup/cgroup_test.go
index ba74247ee..33d02c1d1 100644
--- a/plugins/inputs/cgroup/cgroup_test.go
+++ b/plugins/inputs/cgroup/cgroup_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package cgroup
 
diff --git a/plugins/inputs/conntrack/conntrack.go b/plugins/inputs/conntrack/conntrack.go
index 9756fbe58..2ed8bc3db 100644
--- a/plugins/inputs/conntrack/conntrack.go
+++ b/plugins/inputs/conntrack/conntrack.go
@@ -1,6 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build linux
-// +build linux
 
 package conntrack
 
diff --git a/plugins/inputs/conntrack/conntrack_notlinux.go b/plugins/inputs/conntrack/conntrack_notlinux.go
index 6ad8e4a10..c63736254 100644
--- a/plugins/inputs/conntrack/conntrack_notlinux.go
+++ b/plugins/inputs/conntrack/conntrack_notlinux.go
@@ -1,4 +1,3 @@
 //go:build !linux
-// +build !linux
 
 package conntrack
diff --git a/plugins/inputs/conntrack/conntrack_test.go b/plugins/inputs/conntrack/conntrack_test.go
index 790489ccc..2d8460477 100644
--- a/plugins/inputs/conntrack/conntrack_test.go
+++ b/plugins/inputs/conntrack/conntrack_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package conntrack
 
diff --git a/plugins/inputs/diskio/diskio_linux_test.go b/plugins/inputs/diskio/diskio_linux_test.go
index 8a76e230c..ab891505e 100644
--- a/plugins/inputs/diskio/diskio_linux_test.go
+++ b/plugins/inputs/diskio/diskio_linux_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package diskio
 
diff --git a/plugins/inputs/diskio/diskio_other.go b/plugins/inputs/diskio/diskio_other.go
index 458a64c13..40cf4ef7a 100644
--- a/plugins/inputs/diskio/diskio_other.go
+++ b/plugins/inputs/diskio/diskio_other.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package diskio
 
diff --git a/plugins/inputs/dmcache/dmcache_linux.go b/plugins/inputs/dmcache/dmcache_linux.go
index 349cb55a9..309df1494 100644
--- a/plugins/inputs/dmcache/dmcache_linux.go
+++ b/plugins/inputs/dmcache/dmcache_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package dmcache
 
diff --git a/plugins/inputs/dmcache/dmcache_linux_test.go b/plugins/inputs/dmcache/dmcache_linux_test.go
index 93cd1e85e..237915bf0 100644
--- a/plugins/inputs/dmcache/dmcache_linux_test.go
+++ b/plugins/inputs/dmcache/dmcache_linux_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package dmcache
 
diff --git a/plugins/inputs/dmcache/dmcache_notlinux.go b/plugins/inputs/dmcache/dmcache_notlinux.go
index 96aa0c657..111f5ed80 100644
--- a/plugins/inputs/dmcache/dmcache_notlinux.go
+++ b/plugins/inputs/dmcache/dmcache_notlinux.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package dmcache
 
diff --git a/plugins/inputs/dpdk/dpdk.go b/plugins/inputs/dpdk/dpdk.go
index 12d577a4b..7d4daeb37 100644
--- a/plugins/inputs/dpdk/dpdk.go
+++ b/plugins/inputs/dpdk/dpdk.go
@@ -1,6 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build linux
-// +build linux
 
 package dpdk
 
diff --git a/plugins/inputs/dpdk/dpdk_connector.go b/plugins/inputs/dpdk/dpdk_connector.go
index 9cd9c81c4..c8538f77f 100644
--- a/plugins/inputs/dpdk/dpdk_connector.go
+++ b/plugins/inputs/dpdk/dpdk_connector.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package dpdk
 
diff --git a/plugins/inputs/dpdk/dpdk_connector_test.go b/plugins/inputs/dpdk/dpdk_connector_test.go
index f5580417c..d803b43ab 100644
--- a/plugins/inputs/dpdk/dpdk_connector_test.go
+++ b/plugins/inputs/dpdk/dpdk_connector_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package dpdk
 
diff --git a/plugins/inputs/dpdk/dpdk_notlinux.go b/plugins/inputs/dpdk/dpdk_notlinux.go
index 1831b1212..80599e31c 100644
--- a/plugins/inputs/dpdk/dpdk_notlinux.go
+++ b/plugins/inputs/dpdk/dpdk_notlinux.go
@@ -1,4 +1,3 @@
 //go:build !linux
-// +build !linux
 
 package dpdk
diff --git a/plugins/inputs/dpdk/dpdk_test.go b/plugins/inputs/dpdk/dpdk_test.go
index ea000f5be..7da3c4ce1 100644
--- a/plugins/inputs/dpdk/dpdk_test.go
+++ b/plugins/inputs/dpdk/dpdk_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package dpdk
 
diff --git a/plugins/inputs/dpdk/dpdk_utils.go b/plugins/inputs/dpdk/dpdk_utils.go
index b7049d836..461754bea 100644
--- a/plugins/inputs/dpdk/dpdk_utils.go
+++ b/plugins/inputs/dpdk/dpdk_utils.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package dpdk
 
diff --git a/plugins/inputs/dpdk/dpdk_utils_test.go b/plugins/inputs/dpdk/dpdk_utils_test.go
index 87e8a6c82..0cc98668e 100644
--- a/plugins/inputs/dpdk/dpdk_utils_test.go
+++ b/plugins/inputs/dpdk/dpdk_utils_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package dpdk
 
diff --git a/plugins/inputs/ethtool/ethtool_linux.go b/plugins/inputs/ethtool/ethtool_linux.go
index 717541a35..afca35e00 100644
--- a/plugins/inputs/ethtool/ethtool_linux.go
+++ b/plugins/inputs/ethtool/ethtool_linux.go
@@ -1,6 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build linux
-// +build linux
 
 package ethtool
 
diff --git a/plugins/inputs/ethtool/ethtool_notlinux.go b/plugins/inputs/ethtool/ethtool_notlinux.go
index ce149ecd6..aff85dc3d 100644
--- a/plugins/inputs/ethtool/ethtool_notlinux.go
+++ b/plugins/inputs/ethtool/ethtool_notlinux.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package ethtool
 
diff --git a/plugins/inputs/ethtool/ethtool_test.go b/plugins/inputs/ethtool/ethtool_test.go
index 2046e00fe..e77d0865a 100644
--- a/plugins/inputs/ethtool/ethtool_test.go
+++ b/plugins/inputs/ethtool/ethtool_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package ethtool
 
diff --git a/plugins/inputs/exec/exec_test.go b/plugins/inputs/exec/exec_test.go
index 2fa77d392..958f9dcac 100644
--- a/plugins/inputs/exec/exec_test.go
+++ b/plugins/inputs/exec/exec_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 // TODO: Windows - should be enabled for Windows when super asterisk is fixed on Windows
 // https://github.com/influxdata/telegraf/issues/6248
diff --git a/plugins/inputs/execd/execd_posix.go b/plugins/inputs/execd/execd_posix.go
index a90b1a92d..94d0bd478 100644
--- a/plugins/inputs/execd/execd_posix.go
+++ b/plugins/inputs/execd/execd_posix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package execd
 
diff --git a/plugins/inputs/execd/execd_windows.go b/plugins/inputs/execd/execd_windows.go
index 9b1f22204..3396a6a3f 100644
--- a/plugins/inputs/execd/execd_windows.go
+++ b/plugins/inputs/execd/execd_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package execd
 
diff --git a/plugins/inputs/execd/shim/goshim_posix.go b/plugins/inputs/execd/shim/goshim_posix.go
index c1a3d0ea2..ddf9eba12 100644
--- a/plugins/inputs/execd/shim/goshim_posix.go
+++ b/plugins/inputs/execd/shim/goshim_posix.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package shim
 
diff --git a/plugins/inputs/execd/shim/goshim_windows.go b/plugins/inputs/execd/shim/goshim_windows.go
index 90adfeff6..b2d03d41b 100644
--- a/plugins/inputs/execd/shim/goshim_windows.go
+++ b/plugins/inputs/execd/shim/goshim_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package shim
 
diff --git a/plugins/inputs/execd/shim/shim_posix_test.go b/plugins/inputs/execd/shim/shim_posix_test.go
index 36e0afcd8..310d50dc4 100644
--- a/plugins/inputs/execd/shim/shim_posix_test.go
+++ b/plugins/inputs/execd/shim/shim_posix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package shim
 
diff --git a/plugins/inputs/file/file_test.go b/plugins/inputs/file/file_test.go
index 8eb0c7cb0..ffcc02dd1 100644
--- a/plugins/inputs/file/file_test.go
+++ b/plugins/inputs/file/file_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 // TODO: Windows - should be enabled for Windows when super asterisk is fixed on Windows
 // https://github.com/influxdata/telegraf/issues/6248
diff --git a/plugins/inputs/filecount/filecount_test.go b/plugins/inputs/filecount/filecount_test.go
index d02c28fb6..1da8c0989 100644
--- a/plugins/inputs/filecount/filecount_test.go
+++ b/plugins/inputs/filecount/filecount_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 // TODO: Windows - should be enabled for Windows when super asterisk is fixed on Windows
 // https://github.com/influxdata/telegraf/issues/6248
diff --git a/plugins/inputs/filecount/filesystem_helpers_test.go b/plugins/inputs/filecount/filesystem_helpers_test.go
index a3a3310d3..67670fb24 100644
--- a/plugins/inputs/filecount/filesystem_helpers_test.go
+++ b/plugins/inputs/filecount/filesystem_helpers_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 // TODO: Windows - should be enabled for Windows when super asterisk is fixed on Windows
 // https://github.com/influxdata/telegraf/issues/6248
diff --git a/plugins/inputs/filestat/filestat_test.go b/plugins/inputs/filestat/filestat_test.go
index ac2a9f9a9..998e1ef5e 100644
--- a/plugins/inputs/filestat/filestat_test.go
+++ b/plugins/inputs/filestat/filestat_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 // TODO: Windows - should be enabled for Windows when super asterisk is fixed on Windows
 // https://github.com/influxdata/telegraf/issues/6248
diff --git a/plugins/inputs/http_response/http_response_test.go b/plugins/inputs/http_response/http_response_test.go
index 0d537f535..c218ce0f8 100644
--- a/plugins/inputs/http_response/http_response_test.go
+++ b/plugins/inputs/http_response/http_response_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 // TODO: Windows - should be enabled for Windows when https://github.com/influxdata/telegraf/issues/8451 is fixed
 
diff --git a/plugins/inputs/hugepages/hugepages.go b/plugins/inputs/hugepages/hugepages.go
index c99bc92a5..949328a11 100644
--- a/plugins/inputs/hugepages/hugepages.go
+++ b/plugins/inputs/hugepages/hugepages.go
@@ -1,6 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build linux
-// +build linux
 
 package hugepages
 
diff --git a/plugins/inputs/hugepages/hugepages_notlinux.go b/plugins/inputs/hugepages/hugepages_notlinux.go
index c2bd4f5c6..173ac532e 100644
--- a/plugins/inputs/hugepages/hugepages_notlinux.go
+++ b/plugins/inputs/hugepages/hugepages_notlinux.go
@@ -1,4 +1,3 @@
 //go:build !linux
-// +build !linux
 
 package hugepages
diff --git a/plugins/inputs/hugepages/hugepages_test.go b/plugins/inputs/hugepages/hugepages_test.go
index fa67ea7d6..8540e3b9e 100644
--- a/plugins/inputs/hugepages/hugepages_test.go
+++ b/plugins/inputs/hugepages/hugepages_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package hugepages
 
diff --git a/plugins/inputs/infiniband/infiniband_linux.go b/plugins/inputs/infiniband/infiniband_linux.go
index 9ccb7dc2f..9a7fddab0 100644
--- a/plugins/inputs/infiniband/infiniband_linux.go
+++ b/plugins/inputs/infiniband/infiniband_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package infiniband
 
diff --git a/plugins/inputs/infiniband/infiniband_notlinux.go b/plugins/inputs/infiniband/infiniband_notlinux.go
index 8ad6731c1..49a81f1b0 100644
--- a/plugins/inputs/infiniband/infiniband_notlinux.go
+++ b/plugins/inputs/infiniband/infiniband_notlinux.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package infiniband
 
diff --git a/plugins/inputs/infiniband/infiniband_test.go b/plugins/inputs/infiniband/infiniband_test.go
index c382a1fdf..ccaded0fc 100644
--- a/plugins/inputs/infiniband/infiniband_test.go
+++ b/plugins/inputs/infiniband/infiniband_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package infiniband
 
diff --git a/plugins/inputs/intel_pmu/activators.go b/plugins/inputs/intel_pmu/activators.go
index 1750c7278..03a55013a 100644
--- a/plugins/inputs/intel_pmu/activators.go
+++ b/plugins/inputs/intel_pmu/activators.go
@@ -1,5 +1,4 @@
 //go:build linux && amd64
-// +build linux,amd64
 
 package intel_pmu
 
diff --git a/plugins/inputs/intel_pmu/activators_test.go b/plugins/inputs/intel_pmu/activators_test.go
index 28f05710d..8c8a20289 100644
--- a/plugins/inputs/intel_pmu/activators_test.go
+++ b/plugins/inputs/intel_pmu/activators_test.go
@@ -1,5 +1,4 @@
 //go:build linux && amd64
-// +build linux,amd64
 
 package intel_pmu
 
diff --git a/plugins/inputs/intel_pmu/config.go b/plugins/inputs/intel_pmu/config.go
index c788744e9..92547f001 100644
--- a/plugins/inputs/intel_pmu/config.go
+++ b/plugins/inputs/intel_pmu/config.go
@@ -1,5 +1,4 @@
 //go:build linux && amd64
-// +build linux,amd64
 
 package intel_pmu
 
diff --git a/plugins/inputs/intel_pmu/config_test.go b/plugins/inputs/intel_pmu/config_test.go
index 5a0f288e3..c064b310a 100644
--- a/plugins/inputs/intel_pmu/config_test.go
+++ b/plugins/inputs/intel_pmu/config_test.go
@@ -1,5 +1,4 @@
 //go:build linux && amd64
-// +build linux,amd64
 
 package intel_pmu
 
diff --git a/plugins/inputs/intel_pmu/intel_pmu.go b/plugins/inputs/intel_pmu/intel_pmu.go
index 6b6617882..e86b4f7be 100644
--- a/plugins/inputs/intel_pmu/intel_pmu.go
+++ b/plugins/inputs/intel_pmu/intel_pmu.go
@@ -1,6 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build linux && amd64
-// +build linux,amd64
 
 package intel_pmu
 
diff --git a/plugins/inputs/intel_pmu/intel_pmu_notamd64linux.go b/plugins/inputs/intel_pmu/intel_pmu_notamd64linux.go
index 64c7f5bbf..06cbfbebe 100644
--- a/plugins/inputs/intel_pmu/intel_pmu_notamd64linux.go
+++ b/plugins/inputs/intel_pmu/intel_pmu_notamd64linux.go
@@ -1,4 +1,3 @@
 //go:build !linux || !amd64
-// +build !linux !amd64
 
 package intel_pmu
diff --git a/plugins/inputs/intel_pmu/intel_pmu_test.go b/plugins/inputs/intel_pmu/intel_pmu_test.go
index 5b3cd2ca7..3569a4acc 100644
--- a/plugins/inputs/intel_pmu/intel_pmu_test.go
+++ b/plugins/inputs/intel_pmu/intel_pmu_test.go
@@ -1,5 +1,4 @@
 //go:build linux && amd64
-// +build linux,amd64
 
 package intel_pmu
 
diff --git a/plugins/inputs/intel_pmu/mocks.go b/plugins/inputs/intel_pmu/mocks.go
index 82799b26f..4417d988f 100644
--- a/plugins/inputs/intel_pmu/mocks.go
+++ b/plugins/inputs/intel_pmu/mocks.go
@@ -1,5 +1,4 @@
 //go:build linux && amd64
-// +build linux,amd64
 
 package intel_pmu
 
diff --git a/plugins/inputs/intel_pmu/reader.go b/plugins/inputs/intel_pmu/reader.go
index 2df72a966..b3ef24111 100644
--- a/plugins/inputs/intel_pmu/reader.go
+++ b/plugins/inputs/intel_pmu/reader.go
@@ -1,5 +1,4 @@
 //go:build linux && amd64
-// +build linux,amd64
 
 package intel_pmu
 
diff --git a/plugins/inputs/intel_pmu/reader_test.go b/plugins/inputs/intel_pmu/reader_test.go
index 409393383..71ba6e434 100644
--- a/plugins/inputs/intel_pmu/reader_test.go
+++ b/plugins/inputs/intel_pmu/reader_test.go
@@ -1,5 +1,4 @@
 //go:build linux && amd64
-// +build linux,amd64
 
 package intel_pmu
 
diff --git a/plugins/inputs/intel_pmu/resolver.go b/plugins/inputs/intel_pmu/resolver.go
index 8457f48ca..7517603eb 100644
--- a/plugins/inputs/intel_pmu/resolver.go
+++ b/plugins/inputs/intel_pmu/resolver.go
@@ -1,5 +1,4 @@
 //go:build linux && amd64
-// +build linux,amd64
 
 package intel_pmu
 
diff --git a/plugins/inputs/intel_pmu/resolver_test.go b/plugins/inputs/intel_pmu/resolver_test.go
index 176b6d133..f761d233f 100644
--- a/plugins/inputs/intel_pmu/resolver_test.go
+++ b/plugins/inputs/intel_pmu/resolver_test.go
@@ -1,5 +1,4 @@
 //go:build linux && amd64
-// +build linux,amd64
 
 package intel_pmu
 
diff --git a/plugins/inputs/intel_powerstat/file.go b/plugins/inputs/intel_powerstat/file.go
index 349228bd8..fb4689b28 100644
--- a/plugins/inputs/intel_powerstat/file.go
+++ b/plugins/inputs/intel_powerstat/file.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package intel_powerstat
 
diff --git a/plugins/inputs/intel_powerstat/intel_powerstat.go b/plugins/inputs/intel_powerstat/intel_powerstat.go
index 9291272e5..b3f87964b 100644
--- a/plugins/inputs/intel_powerstat/intel_powerstat.go
+++ b/plugins/inputs/intel_powerstat/intel_powerstat.go
@@ -1,6 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build linux
-// +build linux
 
 package intel_powerstat
 
diff --git a/plugins/inputs/intel_powerstat/intel_powerstat_notlinux.go b/plugins/inputs/intel_powerstat/intel_powerstat_notlinux.go
index 256e64970..046fbd6c7 100644
--- a/plugins/inputs/intel_powerstat/intel_powerstat_notlinux.go
+++ b/plugins/inputs/intel_powerstat/intel_powerstat_notlinux.go
@@ -1,4 +1,3 @@
 //go:build !linux
-// +build !linux
 
 package intel_powerstat
diff --git a/plugins/inputs/intel_powerstat/intel_powerstat_test.go b/plugins/inputs/intel_powerstat/intel_powerstat_test.go
index 14a7f59b1..095626585 100644
--- a/plugins/inputs/intel_powerstat/intel_powerstat_test.go
+++ b/plugins/inputs/intel_powerstat/intel_powerstat_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package intel_powerstat
 
diff --git a/plugins/inputs/intel_powerstat/msr.go b/plugins/inputs/intel_powerstat/msr.go
index 4a2ee1be6..5fc49b6b0 100644
--- a/plugins/inputs/intel_powerstat/msr.go
+++ b/plugins/inputs/intel_powerstat/msr.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package intel_powerstat
 
diff --git a/plugins/inputs/intel_powerstat/msr_test.go b/plugins/inputs/intel_powerstat/msr_test.go
index 921e7f90e..5090d10a6 100644
--- a/plugins/inputs/intel_powerstat/msr_test.go
+++ b/plugins/inputs/intel_powerstat/msr_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package intel_powerstat
 
diff --git a/plugins/inputs/intel_powerstat/rapl.go b/plugins/inputs/intel_powerstat/rapl.go
index e89b04d50..57e04ab85 100644
--- a/plugins/inputs/intel_powerstat/rapl.go
+++ b/plugins/inputs/intel_powerstat/rapl.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package intel_powerstat
 
diff --git a/plugins/inputs/intel_powerstat/rapl_test.go b/plugins/inputs/intel_powerstat/rapl_test.go
index 5333ec13a..f89330bd5 100644
--- a/plugins/inputs/intel_powerstat/rapl_test.go
+++ b/plugins/inputs/intel_powerstat/rapl_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package intel_powerstat
 
diff --git a/plugins/inputs/intel_powerstat/unit_converter.go b/plugins/inputs/intel_powerstat/unit_converter.go
index 7dd8c0d0d..229255218 100644
--- a/plugins/inputs/intel_powerstat/unit_converter.go
+++ b/plugins/inputs/intel_powerstat/unit_converter.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package intel_powerstat
 
diff --git a/plugins/inputs/intel_rdt/intel_rdt.go b/plugins/inputs/intel_rdt/intel_rdt.go
index 389e6ebb5..35691b35d 100644
--- a/plugins/inputs/intel_rdt/intel_rdt.go
+++ b/plugins/inputs/intel_rdt/intel_rdt.go
@@ -1,6 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build !windows
-// +build !windows
 
 package intel_rdt
 
diff --git a/plugins/inputs/intel_rdt/intel_rdt_test.go b/plugins/inputs/intel_rdt/intel_rdt_test.go
index 18dd2e93a..42fa4beb9 100644
--- a/plugins/inputs/intel_rdt/intel_rdt_test.go
+++ b/plugins/inputs/intel_rdt/intel_rdt_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package intel_rdt
 
diff --git a/plugins/inputs/intel_rdt/intel_rdt_windows.go b/plugins/inputs/intel_rdt/intel_rdt_windows.go
index 64f9ebbe9..91794a312 100644
--- a/plugins/inputs/intel_rdt/intel_rdt_windows.go
+++ b/plugins/inputs/intel_rdt/intel_rdt_windows.go
@@ -1,4 +1,3 @@
 //go:build windows
-// +build windows
 
 package intel_rdt
diff --git a/plugins/inputs/intel_rdt/processes.go b/plugins/inputs/intel_rdt/processes.go
index dd172b6d9..b8f56d74f 100644
--- a/plugins/inputs/intel_rdt/processes.go
+++ b/plugins/inputs/intel_rdt/processes.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package intel_rdt
 
diff --git a/plugins/inputs/intel_rdt/publisher.go b/plugins/inputs/intel_rdt/publisher.go
index 4fdb91dc7..1dd095126 100644
--- a/plugins/inputs/intel_rdt/publisher.go
+++ b/plugins/inputs/intel_rdt/publisher.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package intel_rdt
 
diff --git a/plugins/inputs/intel_rdt/publisher_test.go b/plugins/inputs/intel_rdt/publisher_test.go
index 2529a2235..844873db0 100644
--- a/plugins/inputs/intel_rdt/publisher_test.go
+++ b/plugins/inputs/intel_rdt/publisher_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package intel_rdt
 
diff --git a/plugins/inputs/iptables/iptables.go b/plugins/inputs/iptables/iptables.go
index 18898e630..e352fbe4d 100644
--- a/plugins/inputs/iptables/iptables.go
+++ b/plugins/inputs/iptables/iptables.go
@@ -1,6 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build linux
-// +build linux
 
 package iptables
 
diff --git a/plugins/inputs/iptables/iptables_nocompile.go b/plugins/inputs/iptables/iptables_nocompile.go
index 17c0eaced..60c272640 100644
--- a/plugins/inputs/iptables/iptables_nocompile.go
+++ b/plugins/inputs/iptables/iptables_nocompile.go
@@ -1,4 +1,3 @@
 //go:build !linux
-// +build !linux
 
 package iptables
diff --git a/plugins/inputs/iptables/iptables_test.go b/plugins/inputs/iptables/iptables_test.go
index 4c62ef6d6..9c97adae3 100644
--- a/plugins/inputs/iptables/iptables_test.go
+++ b/plugins/inputs/iptables/iptables_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package iptables
 
diff --git a/plugins/inputs/ipvs/ipvs.go b/plugins/inputs/ipvs/ipvs.go
index efc2b4edb..0e783761e 100644
--- a/plugins/inputs/ipvs/ipvs.go
+++ b/plugins/inputs/ipvs/ipvs.go
@@ -1,6 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build linux
-// +build linux
 
 package ipvs
 
diff --git a/plugins/inputs/ipvs/ipvs_notlinux.go b/plugins/inputs/ipvs/ipvs_notlinux.go
index b46035f2c..fee19aece 100644
--- a/plugins/inputs/ipvs/ipvs_notlinux.go
+++ b/plugins/inputs/ipvs/ipvs_notlinux.go
@@ -1,4 +1,3 @@
 //go:build !linux
-// +build !linux
 
 package ipvs
diff --git a/plugins/inputs/jti_openconfig_telemetry/jti_openconfig_telemetry.go b/plugins/inputs/jti_openconfig_telemetry/jti_openconfig_telemetry.go
index 2ba1deff5..cc703d125 100644
--- a/plugins/inputs/jti_openconfig_telemetry/jti_openconfig_telemetry.go
+++ b/plugins/inputs/jti_openconfig_telemetry/jti_openconfig_telemetry.go
@@ -10,7 +10,7 @@ import (
 	"sync"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials"
diff --git a/plugins/inputs/jti_openconfig_telemetry/jti_openconfig_telemetry_test.go b/plugins/inputs/jti_openconfig_telemetry/jti_openconfig_telemetry_test.go
index efc9d7e99..fac18e0c9 100644
--- a/plugins/inputs/jti_openconfig_telemetry/jti_openconfig_telemetry_test.go
+++ b/plugins/inputs/jti_openconfig_telemetry/jti_openconfig_telemetry_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"golang.org/x/net/context"
+	"context"
 	"google.golang.org/grpc"
 
 	"github.com/influxdata/telegraf/config"
diff --git a/plugins/inputs/kernel/kernel.go b/plugins/inputs/kernel/kernel.go
index 99c740236..efbddf41a 100644
--- a/plugins/inputs/kernel/kernel.go
+++ b/plugins/inputs/kernel/kernel.go
@@ -1,6 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build linux
-// +build linux
 
 package kernel
 
diff --git a/plugins/inputs/kernel/kernel_notlinux.go b/plugins/inputs/kernel/kernel_notlinux.go
index 838a97071..cfe32f831 100644
--- a/plugins/inputs/kernel/kernel_notlinux.go
+++ b/plugins/inputs/kernel/kernel_notlinux.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package kernel
 
diff --git a/plugins/inputs/kernel/kernel_test.go b/plugins/inputs/kernel/kernel_test.go
index f174017fa..9f37f2829 100644
--- a/plugins/inputs/kernel/kernel_test.go
+++ b/plugins/inputs/kernel/kernel_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package kernel
 
diff --git a/plugins/inputs/kernel_vmstat/kernel_vmstat.go b/plugins/inputs/kernel_vmstat/kernel_vmstat.go
index 5437672de..464b2c55f 100644
--- a/plugins/inputs/kernel_vmstat/kernel_vmstat.go
+++ b/plugins/inputs/kernel_vmstat/kernel_vmstat.go
@@ -1,6 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build linux
-// +build linux
 
 package kernel_vmstat
 
diff --git a/plugins/inputs/kernel_vmstat/kernel_vmstat_notlinux.go b/plugins/inputs/kernel_vmstat/kernel_vmstat_notlinux.go
index d687b13a9..46578b9ed 100644
--- a/plugins/inputs/kernel_vmstat/kernel_vmstat_notlinux.go
+++ b/plugins/inputs/kernel_vmstat/kernel_vmstat_notlinux.go
@@ -1,4 +1,3 @@
 //go:build !linux
-// +build !linux
 
 package kernel_vmstat
diff --git a/plugins/inputs/kernel_vmstat/kernel_vmstat_test.go b/plugins/inputs/kernel_vmstat/kernel_vmstat_test.go
index 6590e3feb..6691b9f2b 100644
--- a/plugins/inputs/kernel_vmstat/kernel_vmstat_test.go
+++ b/plugins/inputs/kernel_vmstat/kernel_vmstat_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package kernel_vmstat
 
diff --git a/plugins/inputs/logparser/logparser.go b/plugins/inputs/logparser/logparser.go
index 16015848c..c34b1152d 100644
--- a/plugins/inputs/logparser/logparser.go
+++ b/plugins/inputs/logparser/logparser.go
@@ -1,6 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build !solaris
-// +build !solaris
 
 package logparser
 
diff --git a/plugins/inputs/logparser/logparser_solaris.go b/plugins/inputs/logparser/logparser_solaris.go
index da482b97d..df8b02a13 100644
--- a/plugins/inputs/logparser/logparser_solaris.go
+++ b/plugins/inputs/logparser/logparser_solaris.go
@@ -1,4 +1,3 @@
 //go:build solaris
-// +build solaris
 
 package logparser
diff --git a/plugins/inputs/lustre2/lustre2.go b/plugins/inputs/lustre2/lustre2.go
index 5d569cf8c..863fe7663 100644
--- a/plugins/inputs/lustre2/lustre2.go
+++ b/plugins/inputs/lustre2/lustre2.go
@@ -1,6 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build !windows
-// +build !windows
 
 // Package lustre2 (doesn't aim for Windows)
 // Lustre 2.x Telegraf plugin
diff --git a/plugins/inputs/lustre2/lustre2_test.go b/plugins/inputs/lustre2/lustre2_test.go
index 3da003ee6..4f2c21aec 100644
--- a/plugins/inputs/lustre2/lustre2_test.go
+++ b/plugins/inputs/lustre2/lustre2_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package lustre2
 
diff --git a/plugins/inputs/lustre2/lustre2_windows.go b/plugins/inputs/lustre2/lustre2_windows.go
index cd3aea1b5..c9f1af38d 100644
--- a/plugins/inputs/lustre2/lustre2_windows.go
+++ b/plugins/inputs/lustre2/lustre2_windows.go
@@ -1,4 +1,3 @@
 //go:build windows
-// +build windows
 
 package lustre2
diff --git a/plugins/inputs/mdstat/mdstat.go b/plugins/inputs/mdstat/mdstat.go
index d41c0b5af..926399636 100644
--- a/plugins/inputs/mdstat/mdstat.go
+++ b/plugins/inputs/mdstat/mdstat.go
@@ -1,6 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build linux
-// +build linux
 
 // Copyright 2018 The Prometheus Authors
 // Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/plugins/inputs/mdstat/mdstat_notlinux.go b/plugins/inputs/mdstat/mdstat_notlinux.go
index 409ae7761..ee5874849 100644
--- a/plugins/inputs/mdstat/mdstat_notlinux.go
+++ b/plugins/inputs/mdstat/mdstat_notlinux.go
@@ -1,4 +1,3 @@
 //go:build !linux
-// +build !linux
 
 package mdstat
diff --git a/plugins/inputs/mdstat/mdstat_test.go b/plugins/inputs/mdstat/mdstat_test.go
index 9f76021dc..94b73ad75 100644
--- a/plugins/inputs/mdstat/mdstat_test.go
+++ b/plugins/inputs/mdstat/mdstat_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package mdstat
 
diff --git a/plugins/inputs/nats/nats.go b/plugins/inputs/nats/nats.go
index a994cf22c..ec0e5f676 100644
--- a/plugins/inputs/nats/nats.go
+++ b/plugins/inputs/nats/nats.go
@@ -1,6 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build !freebsd || (freebsd && cgo)
-// +build !freebsd freebsd,cgo
 
 package nats
 
diff --git a/plugins/inputs/nats/nats_freebsd.go b/plugins/inputs/nats/nats_freebsd.go
index f50ba2cfc..c68801db6 100644
--- a/plugins/inputs/nats/nats_freebsd.go
+++ b/plugins/inputs/nats/nats_freebsd.go
@@ -1,4 +1,3 @@
 //go:build freebsd && !cgo
-// +build freebsd,!cgo
 
 package nats
diff --git a/plugins/inputs/nats/nats_test.go b/plugins/inputs/nats/nats_test.go
index 135951405..906bf14e9 100644
--- a/plugins/inputs/nats/nats_test.go
+++ b/plugins/inputs/nats/nats_test.go
@@ -1,5 +1,4 @@
 //go:build !freebsd || (freebsd && cgo)
-// +build !freebsd freebsd,cgo
 
 package nats
 
diff --git a/plugins/inputs/phpfpm/phpfpm_test.go b/plugins/inputs/phpfpm/phpfpm_test.go
index 680ba9d30..890ca6aa9 100644
--- a/plugins/inputs/phpfpm/phpfpm_test.go
+++ b/plugins/inputs/phpfpm/phpfpm_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 // TODO: Windows - should be enabled for Windows when super asterisk is fixed on Windows
 // https://github.com/influxdata/telegraf/issues/6248
diff --git a/plugins/inputs/ping/ping_notwindows.go b/plugins/inputs/ping/ping_notwindows.go
index 3d5644950..e088aa039 100644
--- a/plugins/inputs/ping/ping_notwindows.go
+++ b/plugins/inputs/ping/ping_notwindows.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package ping
 
diff --git a/plugins/inputs/ping/ping_test.go b/plugins/inputs/ping/ping_test.go
index 94a65075e..26d3492af 100644
--- a/plugins/inputs/ping/ping_test.go
+++ b/plugins/inputs/ping/ping_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package ping
 
diff --git a/plugins/inputs/ping/ping_windows.go b/plugins/inputs/ping/ping_windows.go
index 1d3d933e7..7f411ba97 100644
--- a/plugins/inputs/ping/ping_windows.go
+++ b/plugins/inputs/ping/ping_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package ping
 
diff --git a/plugins/inputs/ping/ping_windows_test.go b/plugins/inputs/ping/ping_windows_test.go
index 77137b170..301580395 100644
--- a/plugins/inputs/ping/ping_windows_test.go
+++ b/plugins/inputs/ping/ping_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package ping
 
diff --git a/plugins/inputs/postfix/postfix.go b/plugins/inputs/postfix/postfix.go
index b0908924e..fbd21d64e 100644
--- a/plugins/inputs/postfix/postfix.go
+++ b/plugins/inputs/postfix/postfix.go
@@ -1,6 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build !windows
-// +build !windows
 
 // postfix doesn't aim for Windows
 
diff --git a/plugins/inputs/postfix/postfix_test.go b/plugins/inputs/postfix/postfix_test.go
index 5215fe291..11d17ecba 100644
--- a/plugins/inputs/postfix/postfix_test.go
+++ b/plugins/inputs/postfix/postfix_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package postfix
 
diff --git a/plugins/inputs/postfix/postfix_windows.go b/plugins/inputs/postfix/postfix_windows.go
index 3a2c5e5cb..83f69876f 100644
--- a/plugins/inputs/postfix/postfix_windows.go
+++ b/plugins/inputs/postfix/postfix_windows.go
@@ -1,4 +1,3 @@
 //go:build windows
-// +build windows
 
 package postfix
diff --git a/plugins/inputs/postfix/stat_ctim.go b/plugins/inputs/postfix/stat_ctim.go
index 06ddccb17..2fe261295 100644
--- a/plugins/inputs/postfix/stat_ctim.go
+++ b/plugins/inputs/postfix/stat_ctim.go
@@ -1,5 +1,4 @@
 //go:build dragonfly || linux || netbsd || openbsd || solaris
-// +build dragonfly linux netbsd openbsd solaris
 
 package postfix
 
diff --git a/plugins/inputs/postfix/stat_ctimespec.go b/plugins/inputs/postfix/stat_ctimespec.go
index 03f4e0a43..5decb5ab6 100644
--- a/plugins/inputs/postfix/stat_ctimespec.go
+++ b/plugins/inputs/postfix/stat_ctimespec.go
@@ -1,5 +1,4 @@
 //go:build darwin || freebsd
-// +build darwin freebsd
 
 package postfix
 
diff --git a/plugins/inputs/postfix/stat_none.go b/plugins/inputs/postfix/stat_none.go
index c1ca6a41c..07c82a92b 100644
--- a/plugins/inputs/postfix/stat_none.go
+++ b/plugins/inputs/postfix/stat_none.go
@@ -1,5 +1,4 @@
 //go:build !dragonfly && !linux && !netbsd && !openbsd && !solaris && !darwin && !freebsd
-// +build !dragonfly,!linux,!netbsd,!openbsd,!solaris,!darwin,!freebsd
 
 package postfix
 
diff --git a/plugins/inputs/processes/processes_notwindows.go b/plugins/inputs/processes/processes_notwindows.go
index 9395d3443..e46c5ee9a 100644
--- a/plugins/inputs/processes/processes_notwindows.go
+++ b/plugins/inputs/processes/processes_notwindows.go
@@ -1,6 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build !windows
-// +build !windows
 
 package processes
 
diff --git a/plugins/inputs/processes/processes_test.go b/plugins/inputs/processes/processes_test.go
index fd4bfeb79..eeaca47f4 100644
--- a/plugins/inputs/processes/processes_test.go
+++ b/plugins/inputs/processes/processes_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package processes
 
diff --git a/plugins/inputs/processes/processes_windows.go b/plugins/inputs/processes/processes_windows.go
index f798a1668..04e63034e 100644
--- a/plugins/inputs/processes/processes_windows.go
+++ b/plugins/inputs/processes/processes_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package processes
 
diff --git a/plugins/inputs/procstat/native_finder_notwindows.go b/plugins/inputs/procstat/native_finder_notwindows.go
index 89af58799..ed5bf164e 100644
--- a/plugins/inputs/procstat/native_finder_notwindows.go
+++ b/plugins/inputs/procstat/native_finder_notwindows.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package procstat
 
diff --git a/plugins/inputs/procstat/win_service_notwindows.go b/plugins/inputs/procstat/win_service_notwindows.go
index b7efcee17..733b8d249 100644
--- a/plugins/inputs/procstat/win_service_notwindows.go
+++ b/plugins/inputs/procstat/win_service_notwindows.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package procstat
 
diff --git a/plugins/inputs/procstat/win_service_windows.go b/plugins/inputs/procstat/win_service_windows.go
index 5d9c196e3..d838ec5dc 100644
--- a/plugins/inputs/procstat/win_service_windows.go
+++ b/plugins/inputs/procstat/win_service_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package procstat
 
diff --git a/plugins/inputs/ras/ras.go b/plugins/inputs/ras/ras.go
index c988c1f86..ed66a85a4 100644
--- a/plugins/inputs/ras/ras.go
+++ b/plugins/inputs/ras/ras.go
@@ -1,7 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build linux && (386 || amd64 || arm || arm64)
-// +build linux
-// +build 386 amd64 arm arm64
 
 package ras
 
diff --git a/plugins/inputs/ras/ras_notlinux.go b/plugins/inputs/ras/ras_notlinux.go
index b0795fd79..83b49fcb8 100644
--- a/plugins/inputs/ras/ras_notlinux.go
+++ b/plugins/inputs/ras/ras_notlinux.go
@@ -1,4 +1,3 @@
 //go:build !linux || (linux && !386 && !amd64 && !arm && !arm64)
-// +build !linux linux,!386,!amd64,!arm,!arm64
 
 package ras
diff --git a/plugins/inputs/ras/ras_test.go b/plugins/inputs/ras/ras_test.go
index d4e87dfe5..d2bd040fe 100644
--- a/plugins/inputs/ras/ras_test.go
+++ b/plugins/inputs/ras/ras_test.go
@@ -1,6 +1,4 @@
 //go:build linux && (386 || amd64 || arm || arm64)
-// +build linux
-// +build 386 amd64 arm arm64
 
 package ras
 
diff --git a/plugins/inputs/rethinkdb/rethinkdb_server_test.go b/plugins/inputs/rethinkdb/rethinkdb_server_test.go
index 0584dcc90..6eeabe78a 100644
--- a/plugins/inputs/rethinkdb/rethinkdb_server_test.go
+++ b/plugins/inputs/rethinkdb/rethinkdb_server_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package rethinkdb
 
diff --git a/plugins/inputs/rethinkdb/rethinkdb_test.go b/plugins/inputs/rethinkdb/rethinkdb_test.go
index 651042ab1..56ecb9edc 100644
--- a/plugins/inputs/rethinkdb/rethinkdb_test.go
+++ b/plugins/inputs/rethinkdb/rethinkdb_test.go
@@ -1,5 +1,4 @@
 //go:build integration
-// +build integration
 
 package rethinkdb
 
diff --git a/plugins/inputs/sensors/sensors.go b/plugins/inputs/sensors/sensors.go
index e6e1e8b8f..d3a75aeaa 100644
--- a/plugins/inputs/sensors/sensors.go
+++ b/plugins/inputs/sensors/sensors.go
@@ -1,6 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build linux
-// +build linux
 
 package sensors
 
diff --git a/plugins/inputs/sensors/sensors_notlinux.go b/plugins/inputs/sensors/sensors_notlinux.go
index 424e96181..39a84a6d3 100644
--- a/plugins/inputs/sensors/sensors_notlinux.go
+++ b/plugins/inputs/sensors/sensors_notlinux.go
@@ -1,4 +1,3 @@
 //go:build !linux
-// +build !linux
 
 package sensors
diff --git a/plugins/inputs/sensors/sensors_test.go b/plugins/inputs/sensors/sensors_test.go
index ac2bf498e..7e5fbc713 100644
--- a/plugins/inputs/sensors/sensors_test.go
+++ b/plugins/inputs/sensors/sensors_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package sensors
 
diff --git a/plugins/inputs/slab/slab.go b/plugins/inputs/slab/slab.go
index 332739f37..7c0abcf30 100644
--- a/plugins/inputs/slab/slab.go
+++ b/plugins/inputs/slab/slab.go
@@ -1,6 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build linux
-// +build linux
 
 package slab
 
diff --git a/plugins/inputs/slab/slab_notlinux.go b/plugins/inputs/slab/slab_notlinux.go
index 77ec3e6e6..5c64b4229 100644
--- a/plugins/inputs/slab/slab_notlinux.go
+++ b/plugins/inputs/slab/slab_notlinux.go
@@ -1,4 +1,3 @@
 //go:build !linux
-// +build !linux
 
 package slab
diff --git a/plugins/inputs/slab/slab_test.go b/plugins/inputs/slab/slab_test.go
index a4b26e6e6..f51558e81 100644
--- a/plugins/inputs/slab/slab_test.go
+++ b/plugins/inputs/slab/slab_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package slab
 
diff --git a/plugins/inputs/snmp/snmp_mocks_generate.go b/plugins/inputs/snmp/snmp_mocks_generate.go
index f87f9029b..f77e56901 100644
--- a/plugins/inputs/snmp/snmp_mocks_generate.go
+++ b/plugins/inputs/snmp/snmp_mocks_generate.go
@@ -1,5 +1,4 @@
 //go:build generate
-// +build generate
 
 package main
 
diff --git a/plugins/inputs/socketstat/socketstat.go b/plugins/inputs/socketstat/socketstat.go
index 228bce17e..7ab11b80e 100644
--- a/plugins/inputs/socketstat/socketstat.go
+++ b/plugins/inputs/socketstat/socketstat.go
@@ -1,6 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build !windows
-// +build !windows
 
 // iproute2 doesn't exist on Windows
 
diff --git a/plugins/inputs/socketstat/socketstat_test.go b/plugins/inputs/socketstat/socketstat_test.go
index bd73051d7..03b38e919 100644
--- a/plugins/inputs/socketstat/socketstat_test.go
+++ b/plugins/inputs/socketstat/socketstat_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package socketstat
 
diff --git a/plugins/inputs/socketstat/socketstat_windows.go b/plugins/inputs/socketstat/socketstat_windows.go
index 4804257c9..049d2574b 100644
--- a/plugins/inputs/socketstat/socketstat_windows.go
+++ b/plugins/inputs/socketstat/socketstat_windows.go
@@ -1,4 +1,3 @@
 //go:build windows
-// +build windows
 
 package socketstat
diff --git a/plugins/inputs/sql/drivers_sqlite.go b/plugins/inputs/sql/drivers_sqlite.go
index 5c23b37bb..ba5052033 100644
--- a/plugins/inputs/sql/drivers_sqlite.go
+++ b/plugins/inputs/sql/drivers_sqlite.go
@@ -1,8 +1,4 @@
 //go:build linux && freebsd && darwin && (!mips || !mips64)
-// +build linux
-// +build freebsd
-// +build darwin
-// +build !mips !mips64
 
 package sql
 
diff --git a/plugins/inputs/synproxy/synproxy_linux.go b/plugins/inputs/synproxy/synproxy_linux.go
index 93cd26e33..86e26f26d 100644
--- a/plugins/inputs/synproxy/synproxy_linux.go
+++ b/plugins/inputs/synproxy/synproxy_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package synproxy
 
diff --git a/plugins/inputs/synproxy/synproxy_notlinux.go b/plugins/inputs/synproxy/synproxy_notlinux.go
index f12fc7065..151295de9 100644
--- a/plugins/inputs/synproxy/synproxy_notlinux.go
+++ b/plugins/inputs/synproxy/synproxy_notlinux.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package synproxy
 
diff --git a/plugins/inputs/synproxy/synproxy_test.go b/plugins/inputs/synproxy/synproxy_test.go
index 0f5032266..7dc43ac4c 100644
--- a/plugins/inputs/synproxy/synproxy_test.go
+++ b/plugins/inputs/synproxy/synproxy_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package synproxy
 
diff --git a/plugins/inputs/sysstat/sysstat.go b/plugins/inputs/sysstat/sysstat.go
index c6b8369c2..24d57ef93 100644
--- a/plugins/inputs/sysstat/sysstat.go
+++ b/plugins/inputs/sysstat/sysstat.go
@@ -1,6 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build linux
-// +build linux
 
 package sysstat
 
diff --git a/plugins/inputs/sysstat/sysstat_interval_test.go b/plugins/inputs/sysstat/sysstat_interval_test.go
index d9cf7b54b..6bd3438ea 100644
--- a/plugins/inputs/sysstat/sysstat_interval_test.go
+++ b/plugins/inputs/sysstat/sysstat_interval_test.go
@@ -1,5 +1,4 @@
 //go:build !race && linux
-// +build !race,linux
 
 package sysstat
 
diff --git a/plugins/inputs/sysstat/sysstat_notlinux.go b/plugins/inputs/sysstat/sysstat_notlinux.go
index 6b5dd6fcf..a9de9d9bb 100644
--- a/plugins/inputs/sysstat/sysstat_notlinux.go
+++ b/plugins/inputs/sysstat/sysstat_notlinux.go
@@ -1,4 +1,3 @@
 //go:build !linux
-// +build !linux
 
 package sysstat
diff --git a/plugins/inputs/sysstat/sysstat_test.go b/plugins/inputs/sysstat/sysstat_test.go
index 646ea80a4..5ea06fa13 100644
--- a/plugins/inputs/sysstat/sysstat_test.go
+++ b/plugins/inputs/sysstat/sysstat_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package sysstat
 
diff --git a/plugins/inputs/systemd_units/systemd_units_notlinux.go b/plugins/inputs/systemd_units/systemd_units_notlinux.go
index 32f5b97cc..99e970e78 100644
--- a/plugins/inputs/systemd_units/systemd_units_notlinux.go
+++ b/plugins/inputs/systemd_units/systemd_units_notlinux.go
@@ -1,4 +1,3 @@
 //go:build !linux
-// +build !linux
 
 package systemd_units
diff --git a/plugins/inputs/tail/tail.go b/plugins/inputs/tail/tail.go
index 692e7dbde..d44d3bb7c 100644
--- a/plugins/inputs/tail/tail.go
+++ b/plugins/inputs/tail/tail.go
@@ -1,6 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build !solaris
-// +build !solaris
 
 package tail
 
diff --git a/plugins/inputs/tail/tail_solaris.go b/plugins/inputs/tail/tail_solaris.go
index 093dd16a0..bf9915a89 100644
--- a/plugins/inputs/tail/tail_solaris.go
+++ b/plugins/inputs/tail/tail_solaris.go
@@ -1,6 +1,5 @@
 // Skipping plugin on Solaris due to fsnotify support
 //
 //go:build solaris
-// +build solaris
 
 package tail
diff --git a/plugins/inputs/varnish/varnish.go b/plugins/inputs/varnish/varnish.go
index fa6829e82..c84a55816 100644
--- a/plugins/inputs/varnish/varnish.go
+++ b/plugins/inputs/varnish/varnish.go
@@ -1,6 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build !windows
-// +build !windows
 
 package varnish
 
diff --git a/plugins/inputs/varnish/varnish_test.go b/plugins/inputs/varnish/varnish_test.go
index c0f12a485..d22008b32 100644
--- a/plugins/inputs/varnish/varnish_test.go
+++ b/plugins/inputs/varnish/varnish_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package varnish
 
diff --git a/plugins/inputs/varnish/varnish_windows.go b/plugins/inputs/varnish/varnish_windows.go
index 9fed7dfc2..22cf2de44 100644
--- a/plugins/inputs/varnish/varnish_windows.go
+++ b/plugins/inputs/varnish/varnish_windows.go
@@ -1,4 +1,3 @@
 //go:build windows
-// +build windows
 
 package varnish
diff --git a/plugins/inputs/win_eventlog/event.go b/plugins/inputs/win_eventlog/event.go
index 51f1849ae..4da45cf13 100644
--- a/plugins/inputs/win_eventlog/event.go
+++ b/plugins/inputs/win_eventlog/event.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 // Package win_eventlog Input plugin to collect Windows Event Log messages
 //
diff --git a/plugins/inputs/win_eventlog/syscall_windows.go b/plugins/inputs/win_eventlog/syscall_windows.go
index 510f5d802..14c7ffe08 100644
--- a/plugins/inputs/win_eventlog/syscall_windows.go
+++ b/plugins/inputs/win_eventlog/syscall_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 // Package win_eventlog Input plugin to collect Windows Event Log messages
 //
diff --git a/plugins/inputs/win_eventlog/util.go b/plugins/inputs/win_eventlog/util.go
index c4c2b7a35..398992844 100644
--- a/plugins/inputs/win_eventlog/util.go
+++ b/plugins/inputs/win_eventlog/util.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 // Package win_eventlog Input plugin to collect Windows Event Log messages
 //
diff --git a/plugins/inputs/win_eventlog/util_test.go b/plugins/inputs/win_eventlog/util_test.go
index 37b947ccb..4b17353b0 100644
--- a/plugins/inputs/win_eventlog/util_test.go
+++ b/plugins/inputs/win_eventlog/util_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 // Package win_eventlog Input plugin to collect Windows Event Log messages
 //
diff --git a/plugins/inputs/win_eventlog/win_eventlog.go b/plugins/inputs/win_eventlog/win_eventlog.go
index ae2c2eb99..2e68ac43d 100644
--- a/plugins/inputs/win_eventlog/win_eventlog.go
+++ b/plugins/inputs/win_eventlog/win_eventlog.go
@@ -1,6 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build windows
-// +build windows
 
 // Package win_eventlog Input plugin to collect Windows Event Log messages
 //
diff --git a/plugins/inputs/win_eventlog/win_eventlog_notwindows.go b/plugins/inputs/win_eventlog/win_eventlog_notwindows.go
index 4b40f3dc8..33fff9022 100644
--- a/plugins/inputs/win_eventlog/win_eventlog_notwindows.go
+++ b/plugins/inputs/win_eventlog/win_eventlog_notwindows.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 // Package win_eventlog Input plugin to collect Windows Event Log messages
 //
diff --git a/plugins/inputs/win_eventlog/win_eventlog_test.go b/plugins/inputs/win_eventlog/win_eventlog_test.go
index e0d88b7bd..8d86c0e75 100644
--- a/plugins/inputs/win_eventlog/win_eventlog_test.go
+++ b/plugins/inputs/win_eventlog/win_eventlog_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 // Package win_eventlog Input plugin to collect Windows Event Log messages
 //
diff --git a/plugins/inputs/win_eventlog/zsyscall_windows.go b/plugins/inputs/win_eventlog/zsyscall_windows.go
index 7b3d02b67..e07837130 100644
--- a/plugins/inputs/win_eventlog/zsyscall_windows.go
+++ b/plugins/inputs/win_eventlog/zsyscall_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 // Package win_eventlog Input plugin to collect Windows Event Log messages
 //
diff --git a/plugins/inputs/win_perf_counters/kernel32.go b/plugins/inputs/win_perf_counters/kernel32.go
index 09cbd4be5..92470c3b2 100644
--- a/plugins/inputs/win_perf_counters/kernel32.go
+++ b/plugins/inputs/win_perf_counters/kernel32.go
@@ -29,7 +29,6 @@
 // Kevin Pors <krpors@gmail.com>
 
 //go:build windows
-// +build windows
 
 package win_perf_counters
 
diff --git a/plugins/inputs/win_perf_counters/pdh.go b/plugins/inputs/win_perf_counters/pdh.go
index c8510867b..34aaf2c39 100644
--- a/plugins/inputs/win_perf_counters/pdh.go
+++ b/plugins/inputs/win_perf_counters/pdh.go
@@ -29,7 +29,6 @@
 // Kevin Pors <krpors@gmail.com>
 
 //go:build windows
-// +build windows
 
 package win_perf_counters
 
diff --git a/plugins/inputs/win_perf_counters/pdh_386.go b/plugins/inputs/win_perf_counters/pdh_386.go
index f74e63d6b..06e12f536 100644
--- a/plugins/inputs/win_perf_counters/pdh_386.go
+++ b/plugins/inputs/win_perf_counters/pdh_386.go
@@ -29,7 +29,6 @@
 // Kevin Pors <krpors@gmail.com>
 
 //go:build windows
-// +build windows
 
 package win_perf_counters
 
diff --git a/plugins/inputs/win_perf_counters/pdh_amd64.go b/plugins/inputs/win_perf_counters/pdh_amd64.go
index 56c84af3c..7c96fae69 100644
--- a/plugins/inputs/win_perf_counters/pdh_amd64.go
+++ b/plugins/inputs/win_perf_counters/pdh_amd64.go
@@ -29,7 +29,6 @@
 // Kevin Pors <krpors@gmail.com>
 
 //go:build windows
-// +build windows
 
 package win_perf_counters
 
diff --git a/plugins/inputs/win_perf_counters/performance_query.go b/plugins/inputs/win_perf_counters/performance_query.go
index e6469c702..fdb3b85a4 100644
--- a/plugins/inputs/win_perf_counters/performance_query.go
+++ b/plugins/inputs/win_perf_counters/performance_query.go
@@ -1,6 +1,5 @@
 // Go API over pdh syscalls
 //go:build windows
-// +build windows
 
 package win_perf_counters
 
diff --git a/plugins/inputs/win_perf_counters/win_perf_counters.go b/plugins/inputs/win_perf_counters/win_perf_counters.go
index 2e87e0b2f..51b0b384f 100644
--- a/plugins/inputs/win_perf_counters/win_perf_counters.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters.go
@@ -1,6 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build windows
-// +build windows
 
 package win_perf_counters
 
diff --git a/plugins/inputs/win_perf_counters/win_perf_counters_integration_test.go b/plugins/inputs/win_perf_counters/win_perf_counters_integration_test.go
index 344cdc4ed..d2588ef53 100644
--- a/plugins/inputs/win_perf_counters/win_perf_counters_integration_test.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters_integration_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package win_perf_counters
 
diff --git a/plugins/inputs/win_perf_counters/win_perf_counters_notwindows.go b/plugins/inputs/win_perf_counters/win_perf_counters_notwindows.go
index 00af92b72..6a552a808 100644
--- a/plugins/inputs/win_perf_counters/win_perf_counters_notwindows.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters_notwindows.go
@@ -1,4 +1,3 @@
 //go:build !windows
-// +build !windows
 
 package win_perf_counters
diff --git a/plugins/inputs/win_perf_counters/win_perf_counters_test.go b/plugins/inputs/win_perf_counters/win_perf_counters_test.go
index 292047c25..6295d603c 100644
--- a/plugins/inputs/win_perf_counters/win_perf_counters_test.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package win_perf_counters
 
diff --git a/plugins/inputs/win_services/win_services.go b/plugins/inputs/win_services/win_services.go
index 7c7eb0a77..cddbb11d1 100644
--- a/plugins/inputs/win_services/win_services.go
+++ b/plugins/inputs/win_services/win_services.go
@@ -1,6 +1,5 @@
 //go:generate ../../../tools/readme_config_includer/generator
 //go:build windows
-// +build windows
 
 package win_services
 
diff --git a/plugins/inputs/win_services/win_services_integration_test.go b/plugins/inputs/win_services/win_services_integration_test.go
index dcddaa72f..4a002ce5a 100644
--- a/plugins/inputs/win_services/win_services_integration_test.go
+++ b/plugins/inputs/win_services/win_services_integration_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 // these tests must be run under administrator account
 package win_services
diff --git a/plugins/inputs/win_services/win_services_notwindows.go b/plugins/inputs/win_services/win_services_notwindows.go
index aa2f3534c..0bcf9e963 100644
--- a/plugins/inputs/win_services/win_services_notwindows.go
+++ b/plugins/inputs/win_services/win_services_notwindows.go
@@ -1,4 +1,3 @@
 //go:build !windows
-// +build !windows
 
 package win_services
diff --git a/plugins/inputs/win_services/win_services_test.go b/plugins/inputs/win_services/win_services_test.go
index e48a5fef9..1f33d3a00 100644
--- a/plugins/inputs/win_services/win_services_test.go
+++ b/plugins/inputs/win_services/win_services_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package win_services
 
diff --git a/plugins/inputs/wireless/wireless_linux.go b/plugins/inputs/wireless/wireless_linux.go
index dcca07c95..11996961b 100644
--- a/plugins/inputs/wireless/wireless_linux.go
+++ b/plugins/inputs/wireless/wireless_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package wireless
 
diff --git a/plugins/inputs/wireless/wireless_notlinux.go b/plugins/inputs/wireless/wireless_notlinux.go
index 435559ca5..55c70f815 100644
--- a/plugins/inputs/wireless/wireless_notlinux.go
+++ b/plugins/inputs/wireless/wireless_notlinux.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package wireless
 
diff --git a/plugins/inputs/wireless/wireless_test.go b/plugins/inputs/wireless/wireless_test.go
index dbf2f7aea..f16c80ea6 100644
--- a/plugins/inputs/wireless/wireless_test.go
+++ b/plugins/inputs/wireless/wireless_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package wireless
 
diff --git a/plugins/inputs/zfs/zfs_freebsd.go b/plugins/inputs/zfs/zfs_freebsd.go
index e493e3fc9..f7d6df1a1 100644
--- a/plugins/inputs/zfs/zfs_freebsd.go
+++ b/plugins/inputs/zfs/zfs_freebsd.go
@@ -1,5 +1,4 @@
 //go:build freebsd
-// +build freebsd
 
 package zfs
 
diff --git a/plugins/inputs/zfs/zfs_freebsd_test.go b/plugins/inputs/zfs/zfs_freebsd_test.go
index 816f82b6d..e910e5f98 100644
--- a/plugins/inputs/zfs/zfs_freebsd_test.go
+++ b/plugins/inputs/zfs/zfs_freebsd_test.go
@@ -1,5 +1,4 @@
 //go:build freebsd
-// +build freebsd
 
 package zfs
 
diff --git a/plugins/inputs/zfs/zfs_linux.go b/plugins/inputs/zfs/zfs_linux.go
index 571e9fede..1a5ab8297 100644
--- a/plugins/inputs/zfs/zfs_linux.go
+++ b/plugins/inputs/zfs/zfs_linux.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package zfs
 
diff --git a/plugins/inputs/zfs/zfs_linux_test.go b/plugins/inputs/zfs/zfs_linux_test.go
index e5736dd3f..91e4248d0 100644
--- a/plugins/inputs/zfs/zfs_linux_test.go
+++ b/plugins/inputs/zfs/zfs_linux_test.go
@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package zfs
 
diff --git a/plugins/inputs/zfs/zfs_other.go b/plugins/inputs/zfs/zfs_other.go
index 963afd358..be17dbd9b 100644
--- a/plugins/inputs/zfs/zfs_other.go
+++ b/plugins/inputs/zfs/zfs_other.go
@@ -1,5 +1,4 @@
 //go:build !linux && !freebsd
-// +build !linux,!freebsd
 
 package zfs
 
diff --git a/plugins/outputs/sql/sqlite.go b/plugins/outputs/sql/sqlite.go
index 15666101a..5bee84cc0 100644
--- a/plugins/outputs/sql/sqlite.go
+++ b/plugins/outputs/sql/sqlite.go
@@ -1,8 +1,4 @@
 //go:build linux && freebsd && darwin && (!mips || !mips64)
-// +build linux
-// +build freebsd
-// +build darwin
-// +build !mips !mips64
 
 package sql
 
diff --git a/plugins/outputs/sql/sqlite_test.go b/plugins/outputs/sql/sqlite_test.go
index ddb76f884..c67ae9eef 100644
--- a/plugins/outputs/sql/sqlite_test.go
+++ b/plugins/outputs/sql/sqlite_test.go
@@ -1,7 +1,4 @@
 //go:build linux && freebsd && (!mips || !mips64)
-// +build linux
-// +build freebsd
-// +build !mips !mips64
 
 package sql
 
diff --git a/plugins/processors/filepath/filepath_test.go b/plugins/processors/filepath/filepath_test.go
index c6a326292..4aa2de43d 100644
--- a/plugins/processors/filepath/filepath_test.go
+++ b/plugins/processors/filepath/filepath_test.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package filepath
 
diff --git a/plugins/processors/port_name/services_path.go b/plugins/processors/port_name/services_path.go
index 1cb054dcd..291d4eb1b 100644
--- a/plugins/processors/port_name/services_path.go
+++ b/plugins/processors/port_name/services_path.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package port_name
 
diff --git a/plugins/processors/port_name/services_path_notwindows.go b/plugins/processors/port_name/services_path_notwindows.go
index 54e85b41c..6bc71c4d8 100644
--- a/plugins/processors/port_name/services_path_notwindows.go
+++ b/plugins/processors/port_name/services_path_notwindows.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package port_name
 
diff --git a/testutil/container.go b/testutil/container.go
index 30dd5b414..4da93f153 100644
--- a/testutil/container.go
+++ b/testutil/container.go
@@ -1,5 +1,4 @@
 //go:build !freebsd
-// +build !freebsd
 
 package testutil