From 956bc409c51bde44e52d43d12554261460c2b0f9 Mon Sep 17 00:00:00 2001
From: Stefan Safar <stefan.safar@showmax.com>
Date: Mon, 13 May 2019 10:42:08 +0200
Subject: [PATCH] Address Matt's comments - remove double pointers, use range

---
 collector.go |  8 ++------
 main.go      | 16 ++++++++--------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/collector.go b/collector.go
index ae7e28f..5d04246 100644
--- a/collector.go
+++ b/collector.go
@@ -29,11 +29,8 @@ var (
 	labelNames = []string{"ip", "host"}
 )
 
-func init() {
-}
-
-func newPingResponseHistogram(buckets []float64) **prometheus.HistogramVec {
-	pingResponseSeconds := prometheus.NewHistogramVec(
+func newPingResponseHistogram(buckets []float64) *prometheus.HistogramVec {
+	return prometheus.NewHistogramVec(
 		prometheus.HistogramOpts{
 			Namespace: namespace,
 			Name:      "response_duration_seconds",
@@ -42,7 +39,6 @@ func newPingResponseHistogram(buckets []float64) **prometheus.HistogramVec {
 		},
 		labelNames,
 	)
-	return &pingResponseSeconds
 }
 
 // SmokepingCollector collects metrics from the pinger.
diff --git a/main.go b/main.go
index 6f913dc..93634bf 100644
--- a/main.go
+++ b/main.go
@@ -62,15 +62,15 @@ func init() {
 	prometheus.MustRegister(version.NewCollector("smokeping_prober"))
 }
 
-func parseBuckets(buckets *string) ([]float64, error) {
-	bucketstrings := strings.Split(*buckets, ",")
+func parseBuckets(buckets string) ([]float64, error) {
+	bucketstrings := strings.Split(buckets, ",")
 	bucketlist := make([]float64, len(bucketstrings))
-	for n := 0; n < len(bucketstrings); n++ {
-		value, err := strconv.ParseFloat(bucketstrings[n], 64)
+	for i := range bucketstrings {
+		value, err := strconv.ParseFloat(bucketstrings[i], 64)
 		if err != nil {
 			return nil, err
 		}
-		bucketlist[n] = value
+		bucketlist[i] = value
 	}
 	return bucketlist, nil
 }
@@ -98,14 +98,14 @@ func main() {
 		bucketlist = prometheus.ExponentialBuckets(0.00005, 2, 20)
 	} else {
 		var err error
-		bucketlist, err = parseBuckets(buckets)
+		bucketlist, err = parseBuckets(*buckets)
 		if err != nil {
 			log.Errorf("ERROR: %s\n", err.Error())
 			return
 		}
 	}
 	pingResponseSeconds := newPingResponseHistogram(bucketlist)
-	prometheus.MustRegister(*pingResponseSeconds)
+	prometheus.MustRegister(pingResponseSeconds)
 
 	pingers := make([]*ping.Pinger, len(*hosts))
 	for i, host := range *hosts {
@@ -124,7 +124,7 @@ func main() {
 		pingers[i] = pinger
 	}
 
-	prometheus.MustRegister(NewSmokepingCollector(&pingers, **pingResponseSeconds))
+	prometheus.MustRegister(NewSmokepingCollector(&pingers, *pingResponseSeconds))
 
 	http.Handle(*metricsPath, promhttp.Handler())
 	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {