reformat the code

conf/constlables.go

@@ -22,12 +22,11 @@ import (
 )
 
 // MergeConstLabels merge const labels from all probers.
-//
-// Prometheus requires all metric of the same name have the same set of labels in a collector
+// Prometheus requires all metric of the same name have the same set of labels in a collector
 func MergeConstLabels(ps []probe.Prober) {
  var constLabels = make(map[string]bool)
  for _, p := range ps {
- for k, _ := range p.LabelMap() {
+ for k := range p.LabelMap() {
  constLabels[k] = true
  }
  }
@@ -44,7 +43,7 @@ func buildConstLabels(p probe.Prober, constLabels map[string]bool) {
  p.SetLabelMap(ls)
  }
 
- for k, _ := range constLabels {
+ for k := range constLabels {
  if _, ok := ls[k]; !ok {
  ls[k] = ""
  }

metric/prometheus.go

@@ -80,7 +80,6 @@ func NewCounter(namespace, subsystem, name, metric string,
  mergeLabels(labels, constLabels),
  )
 
- // registries[len(registries)-1].MustRegister(m)
  prometheus.MustRegister(counterMap[metricName])
  log.Infof("[%s] Counter <%s> is created!", module, metricName)
  return counterMap[metricName]
@@ -129,16 +128,16 @@ func mergeLabels(labels []string, constLabels prometheus.Labels) []string {
 func getAndValid(namespace, subsystem, name, metric string, labels []string, constLabels prometheus.Labels) (string, error) {
  metricName := GetName(namespace, subsystem, name, metric)
  if ValidMetricName(metricName) == false {
- return "", fmt.Errorf("Invalid metric name: %s", metricName)
+ return "", fmt.Errorf("invalid metric name: %s", metricName)
  }
 
  for _, l := range labels {
  if ValidLabelName(l) == false {
- return "", fmt.Errorf("Invalid label name: %s", l)
+ return "", fmt.Errorf("invalid label name: %s", l)
  }
  }
 
- for l, _ := range constLabels {
+ for l := range constLabels {
  if !ValidLabelName(l) {
  return "", fmt.Errorf("invalid const label name: %s", l)
  }