From dda51ad06a024ea3a75b3399de46c0ce3ebab418 Mon Sep 17 00:00:00 2001 From: Ralf Horstmann Date: Tue, 5 Feb 2019 07:46:50 +0100 Subject: [PATCH] Fix staticcheck ST1003 warnings (#1249) This fixes a few staticcheck ST1003 warnings in OpenBSD CPU collector. No functional change. Signed-off-by: Ralf Horstmann --- collector/cpu_openbsd.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/collector/cpu_openbsd.go b/collector/cpu_openbsd.go index 996e50ec..cddc204f 100644 --- a/collector/cpu_openbsd.go +++ b/collector/cpu_openbsd.go @@ -34,10 +34,10 @@ type cpuCollector struct { } func init() { - registerCollector("cpu", defaultEnabled, NewCpuCollector) + registerCollector("cpu", defaultEnabled, NewCPUCollector) } -func NewCpuCollector() (Collector, error) { +func NewCPUCollector() (Collector, error) { return &cpuCollector{ cpu: typedDesc{nodeCPUSecondsDesc, prometheus.CounterValue}, }, nil @@ -56,18 +56,18 @@ func (c *cpuCollector) Update(ch chan<- prometheus.Metric) (err error) { return err } - var cp_time [][C.CPUSTATES]C.int64_t + var cpTime [][C.CPUSTATES]C.int64_t for i := 0; i < int(ncpus); i++ { - cp_timeb, err := unix.SysctlRaw("kern.cp_time2", i) + cpb, err := unix.SysctlRaw("kern.cp_time2", i) if err != nil && err != unix.ENODEV { return err } if err != unix.ENODEV { - cp_time = append(cp_time, *(*[C.CPUSTATES]C.int64_t)(unsafe.Pointer(&cp_timeb[0]))) + cpTime = append(cpTime, *(*[C.CPUSTATES]C.int64_t)(unsafe.Pointer(&cpb[0]))) } } - for cpu, time := range cp_time { + for cpu, time := range cpTime { lcpu := strconv.Itoa(cpu) ch <- c.cpu.mustNewConstMetric(float64(time[C.CP_USER])/hz, lcpu, "user") ch <- c.cpu.mustNewConstMetric(float64(time[C.CP_NICE])/hz, lcpu, "nice")