Merge pull request #246 from prometheus/beorn7/process_collector

Convert process collector to const metrics

prometheus/process_collector.go

@@ -19,10 +19,10 @@ type processCollector struct {
 	pid             int
 	collectFn       func(chan<- Metric)
 	pidFn           func() (int, error)
-	cpuTotal        Counter
+	cpuTotal        *Desc
-	openFDs, maxFDs Gauge
+	openFDs, maxFDs *Desc
-	vsize, rss      Gauge
+	vsize, rss      *Desc
-	startTime       Gauge
+	startTime       *Desc
 }
 
 // NewProcessCollector returns a collector which exports the current state of
@@ -48,36 +48,36 @@ func NewProcessCollectorPIDFn(
 		pidFn:     pidFn,
 		collectFn: func(chan<- Metric) {},
 
-		cpuTotal: NewCounter(CounterOpts{
+		cpuTotal: NewDesc(
-			Namespace: namespace,
+			namespace+"_process_cpu_seconds_total",
-			Name:      "process_cpu_seconds_total",
+			"Total user and system CPU time spent in seconds.",
-			Help:      "Total user and system CPU time spent in seconds.",
+			nil, nil,
-		}),
+		),
-		openFDs: NewGauge(GaugeOpts{
+		openFDs: NewDesc(
-			Namespace: namespace,
+			namespace+"_process_open_fds",
-			Name:      "process_open_fds",
+			"Number of open file descriptors.",
-			Help:      "Number of open file descriptors.",
+			nil, nil,
-		}),
+		),
-		maxFDs: NewGauge(GaugeOpts{
+		maxFDs: NewDesc(
-			Namespace: namespace,
+			namespace+"_process_max_fds",
-			Name:      "process_max_fds",
+			"Maximum number of open file descriptors.",
-			Help:      "Maximum number of open file descriptors.",
+			nil, nil,
-		}),
+		),
-		vsize: NewGauge(GaugeOpts{
+		vsize: NewDesc(
-			Namespace: namespace,
+			namespace+"_process_virtual_memory_bytes",
-			Name:      "process_virtual_memory_bytes",
+			"Virtual memory size in bytes.",
-			Help:      "Virtual memory size in bytes.",
+			nil, nil,
-		}),
+		),
-		rss: NewGauge(GaugeOpts{
+		rss: NewDesc(
-			Namespace: namespace,
+			namespace+"_process_resident_memory_bytes",
-			Name:      "process_resident_memory_bytes",
+			"Resident memory size in bytes.",
-			Help:      "Resident memory size in bytes.",
+			nil, nil,
-		}),
+		),
-		startTime: NewGauge(GaugeOpts{
+		startTime: NewDesc(
-			Namespace: namespace,
+			namespace+"_process_start_time_seconds",
-			Name:      "process_start_time_seconds",
+			"Start time of the process since unix epoch in seconds.",
-			Help:      "Start time of the process since unix epoch in seconds.",
+			nil, nil,
-		}),
+		),
 	}
 
 	// Set up process metric collection if supported by the runtime.
@@ -90,12 +90,12 @@ func NewProcessCollectorPIDFn(
 
 // Describe returns all descriptions of the collector.
 func (c *processCollector) Describe(ch chan<- *Desc) {
-	ch <- c.cpuTotal.Desc()
+	ch <- c.cpuTotal
-	ch <- c.openFDs.Desc()
+	ch <- c.openFDs
-	ch <- c.maxFDs.Desc()
+	ch <- c.maxFDs
-	ch <- c.vsize.Desc()
+	ch <- c.vsize
-	ch <- c.rss.Desc()
+	ch <- c.rss
-	ch <- c.startTime.Desc()
+	ch <- c.startTime
 }
 
 // Collect returns the current state of all metrics of the collector.
@@ -117,26 +117,19 @@ func (c *processCollector) processCollect(ch chan<- Metric) {
 	}
 
 	if stat, err := p.NewStat(); err == nil {
-		c.cpuTotal.Set(stat.CPUTime())
+		ch <- MustNewConstMetric(c.cpuTotal, CounterValue, stat.CPUTime())
-		ch <- c.cpuTotal
+		ch <- MustNewConstMetric(c.vsize, GaugeValue, float64(stat.VirtualMemory()))
-		c.vsize.Set(float64(stat.VirtualMemory()))
+		ch <- MustNewConstMetric(c.rss, GaugeValue, float64(stat.ResidentMemory()))
-		ch <- c.vsize
-		c.rss.Set(float64(stat.ResidentMemory()))
-		ch <- c.rss
-
 		if startTime, err := stat.StartTime(); err == nil {
-			c.startTime.Set(startTime)
+			ch <- MustNewConstMetric(c.startTime, GaugeValue, startTime)
-			ch <- c.startTime
 		}
 	}
 
 	if fds, err := p.FileDescriptorsLen(); err == nil {
-		c.openFDs.Set(float64(fds))
+		ch <- MustNewConstMetric(c.openFDs, GaugeValue, float64(fds))
-		ch <- c.openFDs
 	}
 
 	if limits, err := p.NewLimits(); err == nil {
-		c.maxFDs.Set(float64(limits.OpenFiles))
+		ch <- MustNewConstMetric(c.maxFDs, GaugeValue, float64(limits.OpenFiles))
-		ch <- c.maxFDs
 	}
 }