Convert remaining collectors to use ConstMetrics

1 files changed, 10 insertions, 14 deletions

diff --git a/collector/cpu_freebsd.go b/collector/cpu_freebsd.go
index a5bc33f..f22b027 100644
--- a/collector/cpu_freebsd.go
+++ b/collector/cpu_freebsd.go
@@ -89,14 +89,11 @@ func init() {
 // CPU stats.
 func NewStatCollector() (Collector, error) {
         return &statCollector{
-                cpu: prometheus.NewCounterVec(
-                        prometheus.CounterOpts{
-                                Namespace: Namespace,
-                                Name:      "cpu_seconds_total",
-                                Help:      "Seconds the CPU spent in each mode.",
-                        },
-                        []string{"cpu", "mode"},
-                ),
+                cpu: typedDesc{prometheus.NewDesc(
+                        prometheus.BuildFQName(Namespace, "cpu", "seconds_total"),
+                        "Seconds the CPU spent in each mode.",
+                        []string{"cpu", "mode"}, nil,
+                ), prometheus.CounterValue},
         }, nil
 }
 
@@ -118,12 +115,11 @@ func (c *statCollector) Update(ch chan<- prometheus.Metric) (err error) {
                 return err
         }
         for cpu, t := range cpuTimes {
-                c.cpu.With(prometheus.Labels{"cpu": strconv.Itoa(cpu), "mode": "user"}).Set(t.user)
-                c.cpu.With(prometheus.Labels{"cpu": strconv.Itoa(cpu), "mode": "nice"}).Set(t.nice)
-                c.cpu.With(prometheus.Labels{"cpu": strconv.Itoa(cpu), "mode": "system"}).Set(t.sys)
-                c.cpu.With(prometheus.Labels{"cpu": strconv.Itoa(cpu), "mode": "interrupt"}).Set(t.intr)
-                c.cpu.With(prometheus.Labels{"cpu": strconv.Itoa(cpu), "mode": "idle"}).Set(t.idle)
+                ch <- c.cpu.mustNewConstMetric(float64(cpuTimes[base_idx+C.CP_USER]), strconv.Itoa(cpu), "user")
+                ch <- c.cpu.mustNewConstMetric(float64(cpuTimes[base_idx+C.CP_NICE]), strconv.Itoa(cpu), "nice")
+                ch <- c.cpu.mustNewConstMetric(float64(cpuTimes[base_idx+C.CP_SYS]), strconv.Itoa(cpu), "system")
+                ch <- c.cpu.mustNewConstMetric(float64(cpuTimes[base_idx+C.CP_INTR]), strconv.Itoa(cpu), "interrupt")
+                ch <- c.cpu.mustNewConstMetric(float64(cpuTimes[base_idx+C.CP_IDLE]), strconv.Itoa(cpu), "idle")
         }
-        c.cpu.Collect(ch)
         return err
 }