Merge pull request #98 from oliver006/oh_fix_sanitize_metric_name

fix sanitizeMetricName()

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
 }
 

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)