Fix formatting and variable names.

collector/netdev_freebsd.go

@@ -20,11 +20,8 @@ import (
 */
 import "C"
 
-const (
-	subsystem  = "network"
-)
-
 type netDevCollector struct {
+	subsystem   string
 	metricDescs map[string]*prometheus.Desc
 }
 
@@ -36,6 +33,7 @@ func init() {
 // Network device stats.
 func NewNetDevCollector() (Collector, error) {
 	return &netDevCollector{
+		subsystem:   "network",
 		metricDescs: map[string]*prometheus.Desc{},
 	}, nil
 }
@@ -50,10 +48,8 @@ func (c *netDevCollector) Update(ch chan<- prometheus.Metric) (err error) {
 			desc, ok := c.metricDescs[key]
 			if !ok {
 				desc = prometheus.NewDesc(
-                                        prometheus.BuildFQName(
+					prometheus.BuildFQName(Namespace, c.subsystem, key),
-                                                Namespace, subsystem, key),
+					fmt.Sprintf("%s from getifaddrs().", key),
-                                        fmt.Sprintf(
-                                                "%s from getifaddrs().", key),
 					[]string{"device"},
 					nil,
 				)
@@ -61,12 +57,9 @@ func (c *netDevCollector) Update(ch chan<- prometheus.Metric) (err error) {
 			}
 			v, err := strconv.ParseFloat(value, 64)
 			if err != nil {
-				return fmt.Errorf(
+				return fmt.Errorf("invalid value %s in netstats: %s", value, err)
-					"Invalid value %s in netstats: %s",
-					value, err)
 			}
-			ch <- prometheus.MustNewConstMetric(
+			ch <- prometheus.MustNewConstMetric(desc, prometheus.GaugeValue, v, dev)
-				desc, prometheus.GaugeValue, v, dev)
 		}
 	}
 	return nil

collector/netdev_linux.go

@@ -18,17 +18,17 @@ import (
 
 const (
 	procNetDev = "/proc/net/dev"
-	subsystem  = "network"
 )
 
 var (
-	fieldSep	     = regexp.MustCompile("[ :] *")
+	procNetDevFieldSep   = regexp.MustCompile("[ :] *")
 	netdevIgnoredDevices = flag.String(
 		"collector.netdev.ignored-devices", "^$",
 		"Regexp of net devices to ignore for netdev collector.")
 )
 
 type netDevCollector struct {
+	subsystem             string
 	ignoredDevicesPattern *regexp.Regexp
 	metricDescs           map[string]*prometheus.Desc
 }
@@ -42,6 +42,7 @@ func init() {
 func NewNetDevCollector() (Collector, error) {
 	pattern := regexp.MustCompile(*netdevIgnoredDevices)
 	return &netDevCollector{
+		subsystem:             "network",
 		ignoredDevicesPattern: pattern,
 		metricDescs:           map[string]*prometheus.Desc{},
 	}, nil
@@ -50,17 +51,15 @@ func NewNetDevCollector() (Collector, error) {
 func (c *netDevCollector) Update(ch chan<- prometheus.Metric) (err error) {
 	netDev, err := getNetDevStats(c.ignoredDevicesPattern)
 	if err != nil {
-		return fmt.Errorf("Couldn't get netstats: %s", err)
+		return fmt.Errorf("couldn't get netstats: %s", err)
 	}
 	for dev, devStats := range netDev {
 		for key, value := range devStats {
 			desc, ok := c.metricDescs[key]
 			if !ok {
 				desc = prometheus.NewDesc(
-                                        prometheus.BuildFQName(
+					prometheus.BuildFQName(Namespace, c.subsystem, key),
-                                                Namespace, subsystem, key),
+					fmt.Sprintf("%s from /proc/net/dev.", key),
-                                        fmt.Sprintf(
-                                                "%s from /proc/net/dev.", key),
 					[]string{"device"},
 					nil,
 				)
@@ -68,12 +67,9 @@ func (c *netDevCollector) Update(ch chan<- prometheus.Metric) (err error) {
 			}
 			v, err := strconv.ParseFloat(value, 64)
 			if err != nil {
-				return fmt.Errorf(
+				return fmt.Errorf("invalid value %s in netstats: %s", value, err)
-					"Invalid value %s in netstats: %s",
-					value, err)
 			}
-			ch <- prometheus.MustNewConstMetric(
+			ch <- prometheus.MustNewConstMetric(desc, prometheus.GaugeValue, v, dev)
-				desc, prometheus.GaugeValue, v, dev)
 		}
 	}
 	return nil
@@ -95,7 +91,7 @@ func parseNetDevStats(r io.Reader, ignore *regexp.Regexp) (map[string]map[string
 	scanner.Scan()
 	parts := strings.Split(string(scanner.Text()), "|")
 	if len(parts) != 3 { // interface + receive + transmit
-		return nil, fmt.Errorf("Invalid header line in %s: %s",
+		return nil, fmt.Errorf("invalid header line in %s: %s",
 			procNetDev, scanner.Text())
 	}
 
@@ -103,10 +99,9 @@ func parseNetDevStats(r io.Reader, ignore *regexp.Regexp) (map[string]map[string
 	netDev := map[string]map[string]string{}
 	for scanner.Scan() {
 		line := strings.TrimLeft(string(scanner.Text()), " ")
-		parts := fieldSep.Split(line, -1)
+		parts := procNetDevFieldSep.Split(line, -1)
 		if len(parts) != 2*len(header)+1 {
-			return nil, fmt.Errorf("Invalid line in %s: %s",
+			return nil, fmt.Errorf("invalid line in %s: %s", procNetDev, scanner.Text())
-				procNetDev, scanner.Text())
 		}
 
 		dev := parts[0][:len(parts[0])]