*: Collector API cleanup 2 (#1552)

pkg/collector/memory/memory.go

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