From fb86148539247a7acbf59c7a458c1e3c0d0de8b8 Mon Sep 17 00:00:00 2001
From: Oliver <ohardt@gmail.com>
Date: Sun, 3 Sep 2017 11:15:34 +0900
Subject: [PATCH 1/2] fix sanitizeMetricName()

---
 exporter/redis.go      |  2 +-
 exporter/redis_test.go | 14 +++++++++++++-
 glide.lock             |  6 +++---
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/exporter/redis.go b/exporter/redis.go
index 26f9891d..d876fc74 100644
--- a/exporter/redis.go
+++ b/exporter/redis.go
@@ -268,7 +268,7 @@ func includeMetric(s string) bool {
 }
 
 func sanitizeMetricName(n string) string {
-	n = strings.Replace(n, "-", "_", 0)
+	n = strings.Replace(n, "-", "_", -1)
 	return n
 }
 
diff --git a/exporter/redis_test.go b/exporter/redis_test.go
index 03a505be..11745af7 100644
--- a/exporter/redis_test.go
+++ b/exporter/redis_test.go
@@ -414,7 +414,6 @@ func TestKeyValuesAndSizes(t *testing.T) {
 
 func TestKeyValuesAndSizesWildcard(t *testing.T) {
 	s := dbNumStrFull + "=wild*"
-	fmt.Println(s)
 	e, _ := NewRedisExporter(defaultRedisHost, "test", s)
 
 	setupDBKeys(t, defaultRedisHost.Addrs[0])
@@ -703,6 +702,19 @@ func TestMoreThanOneHost(t *testing.T) {
 	}
 }
 
+func TestSanitizeMetricName(t *testing.T) {
+	tsts := map[string]string{
+		"cluster_stats_messages_auth-req_received":  "cluster_stats_messages_auth_req_received",
+		"cluster_stats_messages_auth_req_received": "cluster_stats_messages_auth_req_received",
+	}
+
+	for m, want := range tsts {
+		if got := sanitizeMetricName(m); got != want {
+			t.Errorf("sanitizeMetricName( %s ) error, want: %s, got: %s", m, want, got)
+		}
+	}
+}
+
 func init() {
 	for _, n := range []string{"john", "paul", "ringo", "george"} {
 		key := fmt.Sprintf("key:%s-%d", n, ts)
diff --git a/glide.lock b/glide.lock
index 59488de6..cee6bbef 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
 hash: 5a0ff94f19448703bd2b88935d52c9bc4685cb8cc45fb326a4b4a1a5a7b22f11
-updated: 2017-01-18T09:40:25.9066986-05:00
+updated: 2017-09-03T10:53:14.664603139+09:00
 imports:
 - name: github.com/beorn7/perks
   version: 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
@@ -11,7 +11,7 @@ imports:
   - internal
   - redis
 - name: github.com/golang/protobuf
-  version: 8ee79997227bf9b34611aee7946ae64735e6fd93
+  version: 2402d76f3d41f928c7902a765dfc872356dd3aad
   subpackages:
   - proto
 - name: github.com/matttproud/golang_protobuf_extensions
@@ -37,7 +37,7 @@ imports:
 - name: github.com/Sirupsen/logrus
   version: d26492970760ca5d33129d2d799e34be5c4782eb
 - name: golang.org/x/sys
-  version: d75a52659825e75fff6158388dddc6a5b04f9ba5
+  version: 90796e5a05ce440b41c768bd9af257005e470461
   subpackages:
   - unix
 testImports: []

From aceb68f86ca465c6f67cbd2bd91795a88d851544 Mon Sep 17 00:00:00 2001
From: Oliver <ohardt@gmail.com>
Date: Sun, 3 Sep 2017 11:24:52 +0900
Subject: [PATCH 2/2] gofmt

---
 exporter/redis_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exporter/redis_test.go b/exporter/redis_test.go
index 11745af7..cdc77a90 100644
--- a/exporter/redis_test.go
+++ b/exporter/redis_test.go
@@ -704,7 +704,7 @@ func TestMoreThanOneHost(t *testing.T) {
 
 func TestSanitizeMetricName(t *testing.T) {
 	tsts := map[string]string{
-		"cluster_stats_messages_auth-req_received":  "cluster_stats_messages_auth_req_received",
+		"cluster_stats_messages_auth-req_received": "cluster_stats_messages_auth_req_received",
 		"cluster_stats_messages_auth_req_received": "cluster_stats_messages_auth_req_received",
 	}