Merge pull request #1112 from breed808/remove_init

Remove init functions from collectors

collector/ad.go

@@ -11,10 +11,6 @@ import (
 	"github.com/yusufpapurcu/wmi"
 )
 
-func init() {
-	registerCollector("ad", NewADCollector)
-}
-
 // A ADCollector is a Prometheus collector for WMI Win32_PerfRawData_DirectoryServices_DirectoryServices metrics
 type ADCollector struct {
 	AddressBookOperationsTotal                          *prometheus.Desc
@@ -80,8 +76,8 @@ type ADCollector struct {
 	TombstonedObjectsVisitedTotal                       *prometheus.Desc
 }
 
-// NewADCollector ...
-func NewADCollector() (Collector, error) {
+// newADCollector ...
+func newADCollector() (Collector, error) {
 	const subsystem = "ad"
 	return &ADCollector{
 		AddressBookOperationsTotal: prometheus.NewDesc(

collector/ad_test.go

@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkADCollector(b *testing.B) {
-	benchmarkCollector(b, "ad", NewADCollector)
+	benchmarkCollector(b, "ad", newADCollector)
 }

collector/adcs.go

@@ -10,10 +10,6 @@ import (
 	"strings"
 )
 
-func init() {
-	registerCollector("adcs", adcsCollectorMethod, "Certification Authority")
-}
-
 type adcsCollector struct {
 	RequestsPerSecond                            *prometheus.Desc
 	RequestProcessingTime                        *prometheus.Desc

collector/adfs.go

@@ -8,10 +8,6 @@ import (
 	"math"
 )
 
-func init() {
-	registerCollector("adfs", newADFSCollector, "AD FS")
-}
-
 type adfsCollector struct {
 	adLoginConnectionFailures                          *prometheus.Desc
 	certificateAuthentications                         *prometheus.Desc

collector/cache.go

@@ -8,10 +8,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-func init() {
-	registerCollector("cache", newCacheCollector, "Cache")
-}
-
 // A CacheCollector is a Prometheus collector for Perflib Cache metrics
 type CacheCollector struct {
 	AsyncCopyReadsTotal         *prometheus.Desc

collector/container.go

@@ -9,10 +9,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-func init() {
-	registerCollector("container", NewContainerMetricsCollector)
-}
-
 // A ContainerMetricsCollector is a Prometheus collector for containers metrics
 type ContainerMetricsCollector struct {
 	// Presence
@@ -45,8 +41,8 @@ type ContainerMetricsCollector struct {
 	WriteSizeBytes       *prometheus.Desc
 }
 
-// NewContainerMetricsCollector constructs a new ContainerMetricsCollector
-func NewContainerMetricsCollector() (Collector, error) {
+// newContainerMetricsCollector constructs a new ContainerMetricsCollector
+func newContainerMetricsCollector() (Collector, error) {
 	const subsystem = "container"
 	return &ContainerMetricsCollector{
 		ContainerAvailable: prometheus.NewDesc(

collector/container_test.go

@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkContainerCollector(b *testing.B) {
-	benchmarkCollector(b, "container", NewContainerMetricsCollector)
+	benchmarkCollector(b, "container", newContainerMetricsCollector)
 }

collector/cpu.go

@@ -9,17 +9,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-func init() {
-	var deps string
-	// See below for 6.05 magic value
-	if getWindowsVersion() > 6.05 {
-		deps = "Processor Information"
-	} else {
-		deps = "Processor"
-	}
-	registerCollector("cpu", newCPUCollector, deps)
-}
-
 type cpuCollectorBasic struct {
 	CStateSecondsTotal *prometheus.Desc
 	TimeTotal          *prometheus.Desc

collector/cpu_info.go

@@ -13,10 +13,6 @@ import (
 	"github.com/yusufpapurcu/wmi"
 )
 
-func init() {
-	registerCollector("cpu_info", newCpuInfoCollector)
-}
-
 // If you are adding additional labels to the metric, make sure that they get added in here as well. See below for explanation.
 const (
 	win32ProcessorQuery = "SELECT Architecture, DeviceId, Description, Family, L2CacheSize, L3CacheSize, Name FROM Win32_Processor"

collector/cs.go

@@ -10,10 +10,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-func init() {
-	registerCollector("cs", NewCSCollector)
-}
-
 // A CSCollector is a Prometheus collector for WMI metrics
 type CSCollector struct {
 	PhysicalMemoryBytes *prometheus.Desc
@@ -21,8 +17,8 @@ type CSCollector struct {
 	Hostname            *prometheus.Desc
 }
 
-// NewCSCollector ...
-func NewCSCollector() (Collector, error) {
+// newCSCollector ...
+func newCSCollector() (Collector, error) {
 	const subsystem = "cs"
 
 	return &CSCollector{

collector/cs_test.go

@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkCsCollector(b *testing.B) {
-	benchmarkCollector(b, "cs", NewCSCollector)
+	benchmarkCollector(b, "cs", newCSCollector)
 }

collector/dfsr.go

@@ -11,16 +11,6 @@ import (
 
 var dfsrEnabledCollectors = kingpin.Flag("collectors.dfsr.sources-enabled", "Comma-seperated list of DFSR Perflib sources to use.").Default("connection,folder,volume").String()
 
-func init() {
-	// Perflib sources are dynamic, depending on the enabled child collectors
-	var perflibDependencies []string
-	for _, source := range expandEnabledChildCollectors(*dfsrEnabledCollectors) {
-		perflibDependencies = append(perflibDependencies, dfsrGetPerfObjectName(source))
-	}
-
-	registerCollector("dfsr", NewDFSRCollector, perflibDependencies...)
-}
-
 // DFSRCollector contains the metric and state data of the DFSR collectors.
 type DFSRCollector struct {
 	// Connection source
@@ -92,8 +82,8 @@ func dfsrGetPerfObjectName(collector string) string {
 	return (prefix + suffix)
 }
 
-// NewDFSRCollector is registered
-func NewDFSRCollector() (Collector, error) {
+// newDFSRCollector is registered
+func newDFSRCollector() (Collector, error) {
 	log.Info("dfsr collector is in an experimental state! Metrics for this collector have not been tested.")
 	const subsystem = "dfsr"
 

collector/dfsr_test.go

@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkDFSRCollector(b *testing.B) {
-	benchmarkCollector(b, "dfsr", NewDFSRCollector)
+	benchmarkCollector(b, "dfsr", newDFSRCollector)
 }

collector/dhcp.go

@@ -7,10 +7,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-func init() {
-	registerCollector("dhcp", NewDhcpCollector, "DHCP Server")
-}
-
 // A DhcpCollector is a Prometheus collector perflib DHCP metrics
 type DhcpCollector struct {
 	PacketsReceivedTotal                             *prometheus.Desc
@@ -40,7 +36,7 @@ type DhcpCollector struct {
 	FailoverBndupdDropped                            *prometheus.Desc
 }
 
-func NewDhcpCollector() (Collector, error) {
+func newDhcpCollector() (Collector, error) {
 	const subsystem = "dhcp"
 
 	return &DhcpCollector{

collector/dhcp_test.go

@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkDHCPCollector(b *testing.B) {
-	benchmarkCollector(b, "dhcp", NewDhcpCollector)
+	benchmarkCollector(b, "dhcp", newDhcpCollector)
 }

collector/diskdrive.go

@@ -12,10 +12,6 @@ import (
 	"github.com/yusufpapurcu/wmi"
 )
 
-func init() {
-	registerCollector("disk_drive", newDiskDriveInfoCollector)
-}
-
 const (
 	win32DiskQuery = "SELECT DeviceID, Model, Caption, Name, Partitions, Size, Status, Availability FROM WIN32_DiskDrive"
 )

collector/dns.go

@@ -11,10 +11,6 @@ import (
 	"github.com/yusufpapurcu/wmi"
 )
 
-func init() {
-	registerCollector("dns", NewDNSCollector)
-}
-
 // A DNSCollector is a Prometheus collector for WMI Win32_PerfRawData_DNS_DNS metrics
 type DNSCollector struct {
 	ZoneTransferRequestsReceived  *prometheus.Desc
@@ -41,8 +37,8 @@ type DNSCollector struct {
 	UnmatchedResponsesReceived    *prometheus.Desc
 }
 
-// NewDNSCollector ...
-func NewDNSCollector() (Collector, error) {
+// newDNSCollector ...
+func newDNSCollector() (Collector, error) {
 	const subsystem = "dns"
 	return &DNSCollector{
 		ZoneTransferRequestsReceived: prometheus.NewDesc(

collector/dns_test.go

@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkDNSCollector(b *testing.B) {
-	benchmarkCollector(b, "dns", NewDNSCollector)
+	benchmarkCollector(b, "dns", newDNSCollector)
 }

collector/exchange.go

@@ -13,20 +13,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-func init() {
-	registerCollector("exchange", newExchangeCollector,
-		"MSExchange ADAccess Processes",
-		"MSExchangeTransport Queues",
-		"MSExchange HttpProxy",
-		"MSExchange ActiveSync",
-		"MSExchange Availability Service",
-		"MSExchange OWA",
-		"MSExchangeAutodiscover",
-		"MSExchange WorkloadManagement Workloads",
-		"MSExchange RpcClientAccess",
-	)
-}
-
 type exchangeCollector struct {
 	LDAPReadTime                            *prometheus.Desc
 	LDAPSearchTime                          *prometheus.Desc

collector/fsrmquota.go

@@ -6,10 +6,6 @@ import (
 	"github.com/yusufpapurcu/wmi"
 )
 
-func init() {
-	registerCollector("fsrmquota", newFSRMQuotaCollector)
-}
-
 type FSRMQuotaCollector struct {
 	QuotasCount *prometheus.Desc
 	Path        *prometheus.Desc

collector/hyperv.go

@@ -11,10 +11,6 @@ import (
 	"github.com/yusufpapurcu/wmi"
 )
 
-func init() {
-	registerCollector("hyperv", NewHyperVCollector)
-}
-
 // HyperVCollector is a Prometheus collector for hyper-v
 type HyperVCollector struct {
 	// Win32_PerfRawData_VmmsVirtualMachineStats_HyperVVirtualMachineHealthSummary
@@ -130,8 +126,8 @@ type HyperVCollector struct {
 	VMMemoryRemovedMemory              *prometheus.Desc
 }
 
-// NewHyperVCollector ...
-func NewHyperVCollector() (Collector, error) {
+// newHyperVCollector ...
+func newHyperVCollector() (Collector, error) {
 	buildSubsystemName := func(component string) string { return "hyperv_" + component }
 	return &HyperVCollector{
 		HealthCritical: prometheus.NewDesc(

collector/hyperv_test.go

@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkHypervCollector(b *testing.B) {
-	benchmarkCollector(b, "hyperv", NewHyperVCollector)
+	benchmarkCollector(b, "hyperv", newHyperVCollector)
 }

collector/iis.go

@@ -13,10 +13,6 @@ import (
 	"golang.org/x/sys/windows/registry"
 )
 
-func init() {
-	registerCollector("iis", NewIISCollector, "Web Service", "APP_POOL_WAS", "Web Service Cache", "W3SVC_W3WP")
-}
-
 var (
 	siteWhitelist = kingpin.Flag("collector.iis.site-whitelist", "Regexp of sites to whitelist. Site name must both match whitelist and not match blacklist to be included.").Default(".+").String()
 	siteBlacklist = kingpin.Flag("collector.iis.site-blacklist", "Regexp of sites to blacklist. Site name must both match whitelist and not match blacklist to be included.").String()
@@ -195,7 +191,7 @@ type IISCollector struct {
 	iis_version simple_version
 }
 
-func NewIISCollector() (Collector, error) {
+func newIISCollector() (Collector, error) {
 	const subsystem = "iis"
 
 	return &IISCollector{

collector/iis_test.go

@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkIISCollector(b *testing.B) {
-	benchmarkCollector(b, "iis", NewIISCollector)
+	benchmarkCollector(b, "iis", newIISCollector)
 }

collector/init.go

@@ -0,0 +1,309 @@
+package collector
+
+// collectorInit represents the required initialisation config for a collector.
+type collectorInit struct {
+	// Name of collector to be initialised
+	name string
+	// Builder function for the collector
+	builder collectorBuilder
+	// Perflib counter names for the collector.
+	// These will be included in the Perflib scrape scope by the exporter.
+	perfCounterNames []string
+}
+
+func getCPUCollectorDeps() string {
+	// See below for 6.05 magic value
+	if getWindowsVersion() > 6.05 {
+		return "Processor Information"
+	}
+	return "Processor"
+
+}
+
+func getDFSRCollectorDeps() []string {
+	// Perflib sources are dynamic, depending on the enabled child collectors
+	var perflibDependencies []string
+	for _, source := range expandEnabledChildCollectors(*dfsrEnabledCollectors) {
+		perflibDependencies = append(perflibDependencies, dfsrGetPerfObjectName(source))
+	}
+
+	return perflibDependencies
+}
+
+var collectors = []collectorInit{
+	{
+		name:             "ad",
+		builder:          newADCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "adcs",
+		builder:          adcsCollectorMethod,
+		perfCounterNames: []string{"Certification Authority"},
+	},
+	{
+		name:             "adfs",
+		builder:          newADFSCollector,
+		perfCounterNames: []string{"AD FS"},
+	},
+	{
+		name:             "cache",
+		builder:          newCacheCollector,
+		perfCounterNames: []string{"Cache"},
+	},
+	{
+		name:             "container",
+		builder:          newContainerMetricsCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "cpu",
+		builder:          newCPUCollector,
+		perfCounterNames: []string{getCPUCollectorDeps()},
+	},
+	{
+		name:             "cpu_info",
+		builder:          newCpuInfoCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "cs",
+		builder:          newCSCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "dfsr",
+		builder:          newDFSRCollector,
+		perfCounterNames: getDFSRCollectorDeps(),
+	},
+	{
+		name:             "dhcp",
+		builder:          newDhcpCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "disk_drive",
+		builder:          newDiskDriveInfoCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "dns",
+		builder:          newDNSCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:    "exchange",
+		builder: newExchangeCollector,
+		perfCounterNames: []string{
+			"MSExchange ADAccess Processes",
+			"MSExchangeTransport Queues",
+			"MSExchange HttpProxy",
+			"MSExchange ActiveSync",
+			"MSExchange Availability Service",
+			"MSExchange OWA",
+			"MSExchangeAutodiscover",
+			"MSExchange WorkloadManagement Workloads",
+			"MSExchange RpcClientAccess",
+		},
+	},
+	{
+		name:             "fsrmquota",
+		builder:          newFSRMQuotaCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "hyperv",
+		builder:          newHyperVCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:    "iis",
+		builder: newIISCollector,
+		perfCounterNames: []string{"Web Service",
+			"APP_POOL_WAS",
+			"Web Service Cache",
+			"W3SVC_W3WP",
+		},
+	},
+	{
+		name:             "logical_disk",
+		builder:          newLogicalDiskCollector,
+		perfCounterNames: []string{"LogicalDisk"},
+	},
+	{
+		name:             "logon",
+		builder:          newLogonCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "memory",
+		builder:          newMemoryCollector,
+		perfCounterNames: []string{"Memory"},
+	},
+	{
+		name:             "mscluster_cluster",
+		builder:          newMSCluster_ClusterCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "mscluster_network",
+		builder:          newMSCluster_NetworkCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "mscluster_node",
+		builder:          newMSCluster_NodeCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "mscluster_resource",
+		builder:          newMSCluster_ResourceCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "mscluster_resourcegroup",
+		builder:          newMSCluster_ResourceGroupCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "msmq",
+		builder:          newMSMQCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "mssql",
+		builder:          newMSSQLCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "net",
+		builder:          newNetworkCollector,
+		perfCounterNames: []string{"Network Interface"},
+	},
+	{
+		name:             "netframework_clrexceptions",
+		builder:          newNETFramework_NETCLRExceptionsCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "netframework_clrinterop",
+		builder:          newNETFramework_NETCLRInteropCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "netframework_clrjit",
+		builder:          newNETFramework_NETCLRJitCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "netframework_clrloading",
+		builder:          newNETFramework_NETCLRLoadingCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "netframework_clrlocksandthreads",
+		builder:          newNETFramework_NETCLRLocksAndThreadsCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "netframework_clrmemory",
+		builder:          newNETFramework_NETCLRMemoryCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "netframework_clrremoting",
+		builder:          newNETFramework_NETCLRRemotingCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "netframework_clrsecurity",
+		builder:          newNETFramework_NETCLRSecurityCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "os",
+		builder:          newOSCollector,
+		perfCounterNames: []string{"Paging File"},
+	},
+	{
+		name:             "process",
+		builder:          newProcessCollector,
+		perfCounterNames: []string{"Process"},
+	},
+	{
+		name:             "remote_fx",
+		builder:          newRemoteFx,
+		perfCounterNames: []string{"RemoteFX Network"},
+	},
+	{
+		name:             "scheduled_task",
+		builder:          newScheduledTask,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "service",
+		builder:          newserviceCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "smtp",
+		builder:          newSMTPCollector,
+		perfCounterNames: []string{"SMTP Server"},
+	},
+	{
+		name:             "system",
+		builder:          newSystemCollector,
+		perfCounterNames: []string{"System"},
+	},
+	{
+		name:             "teradici_pcoip",
+		builder:          newTeradiciPcoipCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "tcp",
+		builder:          newTCPCollector,
+		perfCounterNames: []string{"TCPv4"},
+	},
+	{
+		name:    "terminal_services",
+		builder: newTerminalServicesCollector,
+		perfCounterNames: []string{
+			"Terminal Services",
+			"Terminal Services Session",
+			"Remote Desktop Connection Broker Counterset",
+		},
+	},
+	{
+		name:             "textfile",
+		builder:          newTextFileCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "thermalzone",
+		builder:          newThermalZoneCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "time",
+		builder:          newTimeCollector,
+		perfCounterNames: []string{"Windows Time Service"},
+	},
+	{
+		name:             "vmware",
+		builder:          newVmwareCollector,
+		perfCounterNames: nil,
+	},
+	{
+		name:             "vmware_blast",
+		builder:          newVmwareBlastCollector,
+		perfCounterNames: nil,
+	},
+}
+
+// To be called by the exporter for collector initialisation
+func RegisterCollectors() {
+	for _, v := range collectors {
+		registerCollector(v.name, v.builder, v.perfCounterNames...)
+	}
+}

collector/logical_disk.go

@@ -12,10 +12,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-func init() {
-	registerCollector("logical_disk", NewLogicalDiskCollector, "LogicalDisk")
-}
-
 var (
 	volumeWhitelist = kingpin.Flag(
 		"collector.logical_disk.volume-whitelist",
@@ -50,8 +46,8 @@ type LogicalDiskCollector struct {
 	volumeBlacklistPattern *regexp.Regexp
 }
 
-// NewLogicalDiskCollector ...
-func NewLogicalDiskCollector() (Collector, error) {
+// newLogicalDiskCollector ...
+func newLogicalDiskCollector() (Collector, error) {
 	const subsystem = "logical_disk"
 
 	return &LogicalDiskCollector{

collector/logical_disk_test.go

@@ -9,5 +9,5 @@ func BenchmarkLogicalDiskCollector(b *testing.B) {
 	localVolumeWhitelist := ".+"
 	volumeWhitelist = &localVolumeWhitelist
 
-	benchmarkCollector(b, "logical_disk", NewLogicalDiskCollector)
+	benchmarkCollector(b, "logical_disk", newLogicalDiskCollector)
 }

collector/logon.go

@@ -11,17 +11,13 @@ import (
 	"github.com/yusufpapurcu/wmi"
 )
 
-func init() {
-	registerCollector("logon", NewLogonCollector)
-}
-
 // A LogonCollector is a Prometheus collector for WMI metrics
 type LogonCollector struct {
 	LogonType *prometheus.Desc
 }
 
-// NewLogonCollector ...
-func NewLogonCollector() (Collector, error) {
+// newLogonCollector ...
+func newLogonCollector() (Collector, error) {
 	const subsystem = "logon"
 
 	return &LogonCollector{

collector/logon_test.go

@@ -6,5 +6,5 @@ import (
 
 func BenchmarkLogonCollector(b *testing.B) {
 	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewLogonCollector)
+	benchmarkCollector(b, "", newLogonCollector)
 }

collector/memory.go

@@ -11,10 +11,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-func init() {
-	registerCollector("memory", NewMemoryCollector, "Memory")
-}
-
 // A MemoryCollector is a Prometheus collector for perflib Memory metrics
 type MemoryCollector struct {
 	AvailableBytes                  *prometheus.Desc
@@ -51,8 +47,8 @@ type MemoryCollector struct {
 	WriteCopiesTotal                *prometheus.Desc
 }
 
-// NewMemoryCollector ...
-func NewMemoryCollector() (Collector, error) {
+// newMemoryCollector ...
+func newMemoryCollector() (Collector, error) {
 	const subsystem = "memory"
 
 	return &MemoryCollector{

collector/memory_test.go

@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkMemoryCollector(b *testing.B) {
-	benchmarkCollector(b, "memory", NewMemoryCollector)
+	benchmarkCollector(b, "memory", newMemoryCollector)
 }

collector/mscluster_cluster.go

@@ -5,10 +5,6 @@ import (
 	"github.com/yusufpapurcu/wmi"
 )
 
-func init() {
-	registerCollector("mscluster_cluster", newMSCluster_ClusterCollector)
-}
-
 // A MSCluster_ClusterCollector is a Prometheus collector for WMI MSCluster_Cluster metrics
 type MSCluster_ClusterCollector struct {
 	AddEvictDelay                           *prometheus.Desc

collector/mscluster_network.go

@@ -5,10 +5,6 @@ import (
 	"github.com/yusufpapurcu/wmi"
 )
 
-func init() {
-	registerCollector("mscluster_network", newMSCluster_NetworkCollector)
-}
-
 // A MSCluster_NetworkCollector is a Prometheus collector for WMI MSCluster_Network metrics
 type MSCluster_NetworkCollector struct {
 	Characteristics *prometheus.Desc

collector/mscluster_node.go

@@ -5,10 +5,6 @@ import (
 	"github.com/yusufpapurcu/wmi"
 )
 
-func init() {
-	registerCollector("mscluster_node", newMSCluster_NodeCollector)
-}
-
 // A MSCluster_NodeCollector is a Prometheus collector for WMI MSCluster_Node metrics
 type MSCluster_NodeCollector struct {
 	BuildNumber           *prometheus.Desc

collector/mscluster_resource.go

@@ -5,10 +5,6 @@ import (
 	"github.com/yusufpapurcu/wmi"
 )
 
-func init() {
-	registerCollector("mscluster_resource", newMSCluster_ResourceCollector)
-}
-
 // A MSCluster_ResourceCollector is a Prometheus collector for WMI MSCluster_Resource metrics
 type MSCluster_ResourceCollector struct {
 	Characteristics        *prometheus.Desc

collector/mscluster_resourcegroup.go

@@ -5,10 +5,6 @@ import (
 	"github.com/yusufpapurcu/wmi"
 )
 
-func init() {
-	registerCollector("mscluster_resourcegroup", newMSCluster_ResourceGroupCollector)
-}
-
 // A MSCluster_ResourceGroupCollector is a Prometheus collector for WMI MSCluster_ResourceGroup metrics
 type MSCluster_ResourceGroupCollector struct {
 	AutoFailbackType    *prometheus.Desc

collector/msmq.go

@@ -12,10 +12,6 @@ import (
 	"github.com/yusufpapurcu/wmi"
 )
 
-func init() {
-	registerCollector("msmq", NewMSMQCollector)
-}
-
 var (
 	msmqWhereClause = kingpin.Flag("collector.msmq.msmq-where", "WQL 'where' clause to use in WMI metrics query. Limits the response to the msmqs you specify and reduces the size of the response.").String()
 )
@@ -31,7 +27,7 @@ type Win32_PerfRawData_MSMQ_MSMQQueueCollector struct {
 }
 
 // NewWin32_PerfRawData_MSMQ_MSMQQueueCollector ...
-func NewMSMQCollector() (Collector, error) {
+func newMSMQCollector() (Collector, error) {
 	const subsystem = "msmq"
 
 	if *msmqWhereClause == "" {

collector/msmq_test.go

@@ -6,5 +6,5 @@ import (
 
 func BenchmarkMsmqCollector(b *testing.B) {
 	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewMSMQCollector)
+	benchmarkCollector(b, "", newMSMQCollector)
 }

collector/mssql.go

@@ -129,10 +129,6 @@ func mssqlGetPerfObjectName(sqlInstance string, collector string) string {
 	return (prefix + suffix)
 }
 
-func init() {
-	registerCollector("mssql", NewMSSQLCollector)
-}
-
 // A MSSQLCollector is a Prometheus collector for various WMI Win32_PerfRawData_MSSQLSERVER_* metrics
 type MSSQLCollector struct {
 	// meta
@@ -405,8 +401,8 @@ type MSSQLCollector struct {
 	mssqlChildCollectorFailure int
 }
 
-// NewMSSQLCollector ...
-func NewMSSQLCollector() (Collector, error) {
+// newMSSQLCollector ...
+func newMSSQLCollector() (Collector, error) {
 
 	const subsystem = "mssql"
 

collector/mssql_test.go

@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkMSSQLCollector(b *testing.B) {
-	benchmarkCollector(b, "mssql", NewMSSQLCollector)
+	benchmarkCollector(b, "mssql", newMSSQLCollector)
 }

collector/net.go

@@ -12,10 +12,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-func init() {
-	registerCollector("net", NewNetworkCollector, "Network Interface")
-}
-
 var (
 	nicWhitelist = kingpin.Flag(
 		"collector.net.nic-whitelist",
@@ -48,8 +44,8 @@ type NetworkCollector struct {
 	nicBlacklistPattern *regexp.Regexp
 }
 
-// NewNetworkCollector ...
-func NewNetworkCollector() (Collector, error) {
+// newNetworkCollector ...
+func newNetworkCollector() (Collector, error) {
 	const subsystem = "net"
 
 	return &NetworkCollector{

collector/net_test.go

@@ -23,5 +23,5 @@ func BenchmarkNetCollector(b *testing.B) {
 	// Whitelist is not set in testing context (kingpin flags not parsed), causing the collector to skip all interfaces.
 	localNicWhitelist := ".+"
 	nicWhitelist = &localNicWhitelist
-	benchmarkCollector(b, "net", NewNetworkCollector)
+	benchmarkCollector(b, "net", newNetworkCollector)
 }

collector/netframework_clrexceptions.go

@@ -9,10 +9,6 @@ import (
 	"github.com/yusufpapurcu/wmi"
 )
 
-func init() {
-	registerCollector("netframework_clrexceptions", NewNETFramework_NETCLRExceptionsCollector)
-}
-
 // A NETFramework_NETCLRExceptionsCollector is a Prometheus collector for WMI Win32_PerfRawData_NETFramework_NETCLRExceptions metrics
 type NETFramework_NETCLRExceptionsCollector struct {
 	NumberofExcepsThrown *prometheus.Desc
@@ -21,8 +17,8 @@ type NETFramework_NETCLRExceptionsCollector struct {
 	ThrowToCatchDepth    *prometheus.Desc
 }
 
-// NewNETFramework_NETCLRExceptionsCollector ...
-func NewNETFramework_NETCLRExceptionsCollector() (Collector, error) {
+// newNETFramework_NETCLRExceptionsCollector ...
+func newNETFramework_NETCLRExceptionsCollector() (Collector, error) {
 	const subsystem = "netframework_clrexceptions"
 	return &NETFramework_NETCLRExceptionsCollector{
 		NumberofExcepsThrown: prometheus.NewDesc(

collector/netframework_clrexceptions_test.go

@@ -6,5 +6,5 @@ import (
 
 func BenchmarkNetFrameworkNETCLRExceptionsCollector(b *testing.B) {
 	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewNETFramework_NETCLRExceptionsCollector)
+	benchmarkCollector(b, "", newNETFramework_NETCLRExceptionsCollector)
 }

collector/netframework_clrinterop.go

@@ -9,10 +9,6 @@ import (
 	"github.com/yusufpapurcu/wmi"
 )
 
-func init() {
-	registerCollector("netframework_clrinterop", NewNETFramework_NETCLRInteropCollector)
-}
-
 // A NETFramework_NETCLRInteropCollector is a Prometheus collector for WMI Win32_PerfRawData_NETFramework_NETCLRInterop metrics
 type NETFramework_NETCLRInteropCollector struct {
 	NumberofCCWs        *prometheus.Desc
@@ -20,8 +16,8 @@ type NETFramework_NETCLRInteropCollector struct {
 	NumberofStubs       *prometheus.Desc
 }
 
-// NewNETFramework_NETCLRInteropCollector ...
-func NewNETFramework_NETCLRInteropCollector() (Collector, error) {
+// newNETFramework_NETCLRInteropCollector ...
+func newNETFramework_NETCLRInteropCollector() (Collector, error) {
 	const subsystem = "netframework_clrinterop"
 	return &NETFramework_NETCLRInteropCollector{
 		NumberofCCWs: prometheus.NewDesc(

collector/netframework_clrinterop_test.go

@@ -6,5 +6,5 @@ import (
 
 func BenchmarkNETFrameworkNETCLRInteropCollector(b *testing.B) {
 	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewNETFramework_NETCLRInteropCollector)
+	benchmarkCollector(b, "", newNETFramework_NETCLRInteropCollector)
 }

collector/netframework_clrjit.go

@@ -9,10 +9,6 @@ import (
 	"github.com/yusufpapurcu/wmi"
 )
 
-func init() {
-	registerCollector("netframework_clrjit", NewNETFramework_NETCLRJitCollector)
-}
-
 // A NETFramework_NETCLRJitCollector is a Prometheus collector for WMI Win32_PerfRawData_NETFramework_NETCLRJit metrics
 type NETFramework_NETCLRJitCollector struct {
 	NumberofMethodsJitted      *prometheus.Desc
@@ -21,8 +17,8 @@ type NETFramework_NETCLRJitCollector struct {
 	TotalNumberofILBytesJitted *prometheus.Desc
 }
 
-// NewNETFramework_NETCLRJitCollector ...
-func NewNETFramework_NETCLRJitCollector() (Collector, error) {
+// newNETFramework_NETCLRJitCollector ...
+func newNETFramework_NETCLRJitCollector() (Collector, error) {
 	const subsystem = "netframework_clrjit"
 	return &NETFramework_NETCLRJitCollector{
 		NumberofMethodsJitted: prometheus.NewDesc(

collector/netframework_clrjit_test.go

@@ -6,5 +6,5 @@ import (
 
 func BenchmarkNETFrameworkNETCLRJitCollector(b *testing.B) {
 	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewNETFramework_NETCLRJitCollector)
+	benchmarkCollector(b, "", newNETFramework_NETCLRJitCollector)
 }

collector/netframework_clrloading.go

@@ -9,10 +9,6 @@ import (
 	"github.com/yusufpapurcu/wmi"
 )
 
-func init() {
-	registerCollector("netframework_clrloading", NewNETFramework_NETCLRLoadingCollector)
-}
-
 // A NETFramework_NETCLRLoadingCollector is a Prometheus collector for WMI Win32_PerfRawData_NETFramework_NETCLRLoading metrics
 type NETFramework_NETCLRLoadingCollector struct {
 	BytesinLoaderHeap         *prometheus.Desc
@@ -26,8 +22,8 @@ type NETFramework_NETCLRLoadingCollector struct {
 	TotalNumberofLoadFailures *prometheus.Desc
 }
 
-// NewNETFramework_NETCLRLoadingCollector ...
-func NewNETFramework_NETCLRLoadingCollector() (Collector, error) {
+// newNETFramework_NETCLRLoadingCollector ...
+func newNETFramework_NETCLRLoadingCollector() (Collector, error) {
 	const subsystem = "netframework_clrloading"
 	return &NETFramework_NETCLRLoadingCollector{
 		BytesinLoaderHeap: prometheus.NewDesc(

collector/netframework_clrloading_test.go

@@ -6,5 +6,5 @@ import (
 
 func BenchmarkNETFrameworkNETCLRLoadingCollector(b *testing.B) {
 	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewNETFramework_NETCLRLoadingCollector)
+	benchmarkCollector(b, "", newNETFramework_NETCLRLoadingCollector)
 }

collector/netframework_clrlocksandthreads.go

@@ -9,10 +9,6 @@ import (
 	"github.com/yusufpapurcu/wmi"
 )
 
-func init() {
-	registerCollector("netframework_clrlocksandthreads", NewNETFramework_NETCLRLocksAndThreadsCollector)
-}
-
 // A NETFramework_NETCLRLocksAndThreadsCollector is a Prometheus collector for WMI Win32_PerfRawData_NETFramework_NETCLRLocksAndThreads metrics
 type NETFramework_NETCLRLocksAndThreadsCollector struct {
 	CurrentQueueLength               *prometheus.Desc
@@ -24,8 +20,8 @@ type NETFramework_NETCLRLocksAndThreadsCollector struct {
 	TotalNumberofContentions         *prometheus.Desc
 }
 
-// NewNETFramework_NETCLRLocksAndThreadsCollector ...
-func NewNETFramework_NETCLRLocksAndThreadsCollector() (Collector, error) {
+// newNETFramework_NETCLRLocksAndThreadsCollector ...
+func newNETFramework_NETCLRLocksAndThreadsCollector() (Collector, error) {
 	const subsystem = "netframework_clrlocksandthreads"
 	return &NETFramework_NETCLRLocksAndThreadsCollector{
 		CurrentQueueLength: prometheus.NewDesc(

collector/netframework_clrlocksandthreads_test.go

@@ -6,5 +6,5 @@ import (
 
 func BenchmarkNETFrameworkNETCLRLocksAndThreadsCollector(b *testing.B) {
 	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewNETFramework_NETCLRLocksAndThreadsCollector)
+	benchmarkCollector(b, "", newNETFramework_NETCLRLocksAndThreadsCollector)
 }

collector/netframework_clrmemory.go

@@ -9,10 +9,6 @@ import (
 	"github.com/yusufpapurcu/wmi"
 )
 
-func init() {
-	registerCollector("netframework_clrmemory", NewNETFramework_NETCLRMemoryCollector)
-}
-
 // A NETFramework_NETCLRMemoryCollector is a Prometheus collector for WMI Win32_PerfRawData_NETFramework_NETCLRMemory metrics
 type NETFramework_NETCLRMemoryCollector struct {
 	AllocatedBytes                     *prometheus.Desc
@@ -32,8 +28,8 @@ type NETFramework_NETCLRMemoryCollector struct {
 	PromotedMemoryfromGen1             *prometheus.Desc
 }
 
-// NewNETFramework_NETCLRMemoryCollector ...
-func NewNETFramework_NETCLRMemoryCollector() (Collector, error) {
+// newNETFramework_NETCLRMemoryCollector ...
+func newNETFramework_NETCLRMemoryCollector() (Collector, error) {
 	const subsystem = "netframework_clrmemory"
 	return &NETFramework_NETCLRMemoryCollector{
 		AllocatedBytes: prometheus.NewDesc(

collector/netframework_clrmemory_test.go

@@ -6,5 +6,5 @@ import (
 
 func BenchmarkNETFrameworkNETCLRMemoryCollector(b *testing.B) {
 	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewNETFramework_NETCLRMemoryCollector)
+	benchmarkCollector(b, "", newNETFramework_NETCLRMemoryCollector)
 }

collector/netframework_clrremoting.go

@@ -9,10 +9,6 @@ import (
 	"github.com/yusufpapurcu/wmi"
 )
 
-func init() {
-	registerCollector("netframework_clrremoting", NewNETFramework_NETCLRRemotingCollector)
-}
-
 // A NETFramework_NETCLRRemotingCollector is a Prometheus collector for WMI Win32_PerfRawData_NETFramework_NETCLRRemoting metrics
 type NETFramework_NETCLRRemotingCollector struct {
 	Channels                  *prometheus.Desc
@@ -23,8 +19,8 @@ type NETFramework_NETCLRRemotingCollector struct {
 	TotalRemoteCalls          *prometheus.Desc
 }
 
-// NewNETFramework_NETCLRRemotingCollector ...
-func NewNETFramework_NETCLRRemotingCollector() (Collector, error) {
+// newNETFramework_NETCLRRemotingCollector ...
+func newNETFramework_NETCLRRemotingCollector() (Collector, error) {
 	const subsystem = "netframework_clrremoting"
 	return &NETFramework_NETCLRRemotingCollector{
 		Channels: prometheus.NewDesc(

collector/netframework_clrremoting_test.go

@@ -6,5 +6,5 @@ import (
 
 func BenchmarkNETFrameworkNETCLRRemotingCollector(b *testing.B) {
 	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewNETFramework_NETCLRRemotingCollector)
+	benchmarkCollector(b, "", newNETFramework_NETCLRRemotingCollector)
 }

collector/netframework_clrsecurity.go

@@ -9,10 +9,6 @@ import (
 	"github.com/yusufpapurcu/wmi"
 )
 
-func init() {
-	registerCollector("netframework_clrsecurity", NewNETFramework_NETCLRSecurityCollector)
-}
-
 // A NETFramework_NETCLRSecurityCollector is a Prometheus collector for WMI Win32_PerfRawData_NETFramework_NETCLRSecurity metrics
 type NETFramework_NETCLRSecurityCollector struct {
 	NumberLinkTimeChecks *prometheus.Desc
@@ -21,8 +17,8 @@ type NETFramework_NETCLRSecurityCollector struct {
 	TotalRuntimeChecks   *prometheus.Desc
 }
 
-// NewNETFramework_NETCLRSecurityCollector ...
-func NewNETFramework_NETCLRSecurityCollector() (Collector, error) {
+// newNETFramework_NETCLRSecurityCollector ...
+func newNETFramework_NETCLRSecurityCollector() (Collector, error) {
 	const subsystem = "netframework_clrsecurity"
 	return &NETFramework_NETCLRSecurityCollector{
 		NumberLinkTimeChecks: prometheus.NewDesc(

collector/netframework_clrsecurity_test.go

@@ -6,5 +6,5 @@ import (
 
 func BenchmarkNETFrameworkNETCLRSecurityCollector(b *testing.B) {
 	// No context name required as collector source is WMI
-	benchmarkCollector(b, "", NewNETFramework_NETCLRSecurityCollector)
+	benchmarkCollector(b, "", newNETFramework_NETCLRSecurityCollector)
 }

collector/os.go

@@ -17,10 +17,6 @@ import (
 	"golang.org/x/sys/windows/registry"
 )
 
-func init() {
-	registerCollector("os", NewOSCollector, "Paging File")
-}
-
 // A OSCollector is a Prometheus collector for WMI metrics
 type OSCollector struct {
 	OSInformation           *prometheus.Desc
@@ -44,8 +40,8 @@ type pagingFileCounter struct {
 	UsagePeak float64 `perflib:"% Usage Peak"`
 }
 
-// NewOSCollector ...
-func NewOSCollector() (Collector, error) {
+// newOSCollector ...
+func newOSCollector() (Collector, error) {
 	const subsystem = "os"
 
 	return &OSCollector{

collector/os_test.go

@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkOSCollector(b *testing.B) {
-	benchmarkCollector(b, "os", NewOSCollector)
+	benchmarkCollector(b, "os", newOSCollector)
 }

collector/process.go

@@ -15,10 +15,6 @@ import (
 	"github.com/yusufpapurcu/wmi"
 )
 
-func init() {
-	registerCollector("process", newProcessCollector, "Process")
-}
-
 var (
 	processWhitelist = kingpin.Flag(
 		"collector.process.whitelist",

collector/remote_fx.go

@@ -10,10 +10,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-func init() {
-	registerCollector("remote_fx", NewRemoteFx, "RemoteFX Network", "RemoteFX Graphics")
-}
-
 // A RemoteFxNetworkCollector is a Prometheus collector for
 // WMI Win32_PerfRawData_Counters_RemoteFXNetwork & Win32_PerfRawData_Counters_RemoteFXGraphics metrics
 // https://wutils.com/wmi/root/cimv2/win32_perfrawdata_counters_remotefxnetwork/
@@ -42,8 +38,8 @@ type RemoteFxCollector struct {
 	SourceFramesPerSecond                       *prometheus.Desc
 }
 
-// NewRemoteFx ...
-func NewRemoteFx() (Collector, error) {
+// newRemoteFx ...
+func newRemoteFx() (Collector, error) {
 	const subsystem = "remote_fx"
 	return &RemoteFxCollector{
 		// net

collector/remote_fx_test.go

@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkRemoteFXCollector(b *testing.B) {
-	benchmarkCollector(b, "remote_fx", NewRemoteFx)
+	benchmarkCollector(b, "remote_fx", newRemoteFx)
 }

collector/scheduled_task.go

@@ -63,12 +63,8 @@ type ScheduledTask struct {
 
 type ScheduledTasks []ScheduledTask
 
-func init() {
-	registerCollector("scheduled_task", NewScheduledTask)
-}
-
-// NewScheduledTask ...
-func NewScheduledTask() (Collector, error) {
+// newScheduledTask ...
+func newScheduledTask() (Collector, error) {
 	const subsystem = "scheduled_task"
 
 	runtime.LockOSThread()

collector/scheduled_task_test.go

@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkScheduledTaskCollector(b *testing.B) {
-	benchmarkCollector(b, "scheduled_task", NewScheduledTask)
+	benchmarkCollector(b, "scheduled_task", newScheduledTask)
 }

collector/service.go

@@ -16,10 +16,6 @@ import (
 	"golang.org/x/sys/windows/svc/mgr"
 )
 
-func init() {
-	registerCollector("service", NewserviceCollector)
-}
-
 var (
 	serviceWhereClause = kingpin.Flag(
 		"collector.service.services-where",
@@ -41,8 +37,8 @@ type serviceCollector struct {
 	queryWhereClause string
 }
 
-// NewserviceCollector ...
-func NewserviceCollector() (Collector, error) {
+// newserviceCollector ...
+func newserviceCollector() (Collector, error) {
 	const subsystem = "service"
 
 	if *serviceWhereClause == "" {

collector/service_test.go

@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkServiceCollector(b *testing.B) {
-	benchmarkCollector(b, "service", NewserviceCollector)
+	benchmarkCollector(b, "service", newserviceCollector)
 }

collector/smtp.go

@@ -11,10 +11,6 @@ import (
 	"regexp"
 )
 
-func init() {
-	registerCollector("smtp", NewSMTPCollector, "SMTP Server")
-}
-
 var (
 	serverWhitelist = kingpin.Flag("collector.smtp.server-whitelist", "Regexp of virtual servers to whitelist. Server name must both match whitelist and not match blacklist to be included.").Default(".+").String()
 	serverBlacklist = kingpin.Flag("collector.smtp.server-blacklist", "Regexp of virtual servers to blacklist. Server name must both match whitelist and not match blacklist to be included.").String()
@@ -68,7 +64,7 @@ type SMTPCollector struct {
 	serverBlacklistPattern *regexp.Regexp
 }
 
-func NewSMTPCollector() (Collector, error) {
+func newSMTPCollector() (Collector, error) {
 	log.Info("smtp collector is in an experimental state! Metrics for this collector have not been tested.")
 	const subsystem = "smtp"
 

collector/smtp_test.go

@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkSmtpCollector(b *testing.B) {
-	benchmarkCollector(b, "smtp", NewSMTPCollector)
+	benchmarkCollector(b, "smtp", newSMTPCollector)
 }

collector/system.go

@@ -8,10 +8,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-func init() {
-	registerCollector("system", NewSystemCollector, "System")
-}
-
 // A SystemCollector is a Prometheus collector for WMI metrics
 type SystemCollector struct {
 	ContextSwitchesTotal     *prometheus.Desc
@@ -22,8 +18,8 @@ type SystemCollector struct {
 	Threads                  *prometheus.Desc
 }
 
-// NewSystemCollector ...
-func NewSystemCollector() (Collector, error) {
+// newSystemCollector ...
+func newSystemCollector() (Collector, error) {
 	const subsystem = "system"
 
 	return &SystemCollector{

collector/system_test.go

@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkSystemCollector(b *testing.B) {
-	benchmarkCollector(b, "system", NewSystemCollector)
+	benchmarkCollector(b, "system", newSystemCollector)
 }

collector/tcp.go

@@ -8,10 +8,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-func init() {
-	registerCollector("tcp", NewTCPCollector, "TCPv4", "TCPv6")
-}
-
 // A TCPCollector is a Prometheus collector for WMI Win32_PerfRawData_Tcpip_TCPv{4,6} metrics
 type TCPCollector struct {
 	ConnectionFailures         *prometheus.Desc
@@ -25,8 +21,8 @@ type TCPCollector struct {
 	SegmentsSentTotal          *prometheus.Desc
 }
 
-// NewTCPCollector ...
-func NewTCPCollector() (Collector, error) {
+// newTCPCollector ...
+func newTCPCollector() (Collector, error) {
 	const subsystem = "tcp"
 
 	return &TCPCollector{

collector/tcp_test.go

@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkTCPCollector(b *testing.B) {
-	benchmarkCollector(b, "tcp", NewTCPCollector)
+	benchmarkCollector(b, "tcp", newTCPCollector)
 }

collector/teradici_pcoip.go

@@ -11,10 +11,6 @@ import (
 	"github.com/yusufpapurcu/wmi"
 )
 
-func init() {
-	registerCollector("teradici_pcoip", newTeradiciPcoipCollector)
-}
-
 // A teradiciPcoipCollector is a Prometheus collector for WMI metrics:
 // win32_PerfRawData_TeradiciPerf_PCoIPSessionAudioStatistics
 // win32_PerfRawData_TeradiciPerf_PCoIPSessionGeneralStatistics

collector/terminal_services.go

@@ -14,10 +14,6 @@ import (
 
 const ConnectionBrokerFeatureID uint32 = 133
 
-func init() {
-	registerCollector("terminal_services", NewTerminalServicesCollector, "Terminal Services", "Terminal Services Session", "Remote Desktop Connection Broker Counterset")
-}
-
 var (
 	connectionBrokerEnabled = isConnectionBrokerServer()
 )
@@ -65,8 +61,8 @@ type TerminalServicesCollector struct {
 	WorkingSetPeak              *prometheus.Desc
 }
 
-// NewTerminalServicesCollector ...
-func NewTerminalServicesCollector() (Collector, error) {
+// newTerminalServicesCollector ...
+func newTerminalServicesCollector() (Collector, error) {
 	const subsystem = "terminal_services"
 	return &TerminalServicesCollector{
 		LocalSessionCount: prometheus.NewDesc(

collector/terminal_services_test.go

@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkTerminalServicesCollector(b *testing.B) {
-	benchmarkCollector(b, "terminal_services", NewTerminalServicesCollector)
+	benchmarkCollector(b, "terminal_services", newTerminalServicesCollector)
 }

collector/textfile.go

@@ -55,13 +55,9 @@ type textFileCollector struct {
 	mtime *float64
 }
 
-func init() {
-	registerCollector("textfile", NewTextFileCollector)
-}
-
-// NewTextFileCollector returns a new Collector exposing metrics read from files
+// newTextFileCollector returns a new Collector exposing metrics read from files
 // in the given textfile directory.
-func NewTextFileCollector() (Collector, error) {
+func newTextFileCollector() (Collector, error) {
 	return &textFileCollector{
 		path: *textFileDirectory,
 	}, nil

collector/thermalzone.go

@@ -8,10 +8,6 @@ import (
 	"github.com/yusufpapurcu/wmi"
 )
 
-func init() {
-	registerCollector("thermalzone", NewThermalZoneCollector)
-}
-
 // A thermalZoneCollector is a Prometheus collector for WMI Win32_PerfRawData_Counters_ThermalZoneInformation metrics
 type thermalZoneCollector struct {
 	PercentPassiveLimit *prometheus.Desc
@@ -19,8 +15,8 @@ type thermalZoneCollector struct {
 	ThrottleReasons     *prometheus.Desc
 }
 
-// NewThermalZoneCollector ...
-func NewThermalZoneCollector() (Collector, error) {
+// newThermalZoneCollector ...
+func newThermalZoneCollector() (Collector, error) {
 	const subsystem = "thermalzone"
 	return &thermalZoneCollector{
 		Temperature: prometheus.NewDesc(

collector/thermalzone_test.go

@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkThermalZoneCollector(b *testing.B) {
-	benchmarkCollector(b, "thermalzone", NewThermalZoneCollector)
+	benchmarkCollector(b, "thermalzone", newThermalZoneCollector)
 }

collector/time.go

@@ -10,10 +10,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-func init() {
-	registerCollector("time", newTimeCollector, "Windows Time Service")
-}
-
 // TimeCollector is a Prometheus collector for Perflib counter metrics
 type TimeCollector struct {
 	ClockFrequencyAdjustmentPPBTotal *prometheus.Desc

collector/vmware.go

@@ -11,10 +11,6 @@ import (
 	"github.com/yusufpapurcu/wmi"
 )
 
-func init() {
-	registerCollector("vmware", NewVmwareCollector)
-}
-
 // A VmwareCollector is a Prometheus collector for WMI Win32_PerfRawData_vmGuestLib_VMem/Win32_PerfRawData_vmGuestLib_VCPU metrics
 type VmwareCollector struct {
 	MemActive      *prometheus.Desc
@@ -39,8 +35,8 @@ type VmwareCollector struct {
 	HostProcessorSpeedMHz *prometheus.Desc
 }
 
-// NewVmwareCollector constructs a new VmwareCollector
-func NewVmwareCollector() (Collector, error) {
+// newVmwareCollector constructs a new VmwareCollector
+func newVmwareCollector() (Collector, error) {
 	const subsystem = "vmware"
 	return &VmwareCollector{
 		MemActive: prometheus.NewDesc(

collector/vmware_blast.go

@@ -9,10 +9,6 @@ import (
 	"github.com/yusufpapurcu/wmi"
 )
 
-func init() {
-	registerCollector("vmware_blast", newVmwareBlastCollector)
-}
-
 // A vmwareBlastCollector is a Prometheus collector for WMI metrics:
 // win32_PerfRawData_Counters_VMwareBlastAudioCounters
 // win32_PerfRawData_Counters_VMwareBlastCDRCounters

collector/vmware_test.go

@@ -5,5 +5,5 @@ import (
 )
 
 func BenchmarkVmwareCollector(b *testing.B) {
-	benchmarkCollector(b, "vmware", NewVmwareCollector)
+	benchmarkCollector(b, "vmware", newVmwareCollector)
 }

exporter.go

@@ -333,6 +333,9 @@ func main() {
 
 	initWbem()
 
+	// Initialize collectors before loading
+	collector.RegisterCollectors()
+
 	collectors, err := loadCollectors(*enabledCollectors)
 	if err != nil {
 		log.Fatalf("Couldn't load collectors: %s", err)