Fix special case when normalizing label metric names

cloudfoundry · Jul 7, 2017 · ec9e1d1 · ec9e1d1
1 parent 6a978c8
commit ec9e1d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/utils/normalize_name.go b/utils/normalize_name.go
@@ -16,7 +16,7 @@ func NormalizeName(name string) string {
 
 	words := camelcase.Split(name)
 	for _, word := range words {
-		safeWord := strings.Trim(safeNameRE.ReplaceAllLiteralString(word, "_"), "_")
+		safeWord := strings.Trim(safeNameRE.ReplaceAllLiteralString(strings.Trim(word, "_"), "_"), "_")
 		lowerWord := strings.TrimSpace(strings.ToLower(safeWord))
 		if lowerWord != "" {
 			normalizedName = append(normalizedName, lowerWord)

diff --git a/utils/normalize_name_test.go b/utils/normalize_name_test.go
@@ -9,7 +9,7 @@ import (
 
 var _ = Describe("NormalizeName", func() {
 	It("normalizes a name", func() {
-		Expect(NormalizeName("This_is__a-MetricName.Example/with:0totals")).To(Equal("this_is_a_metric_name_example_with_0_totals"))
+		Expect(NormalizeName("This_is_-_a-MetricName.Example/with:0totals")).To(Equal("this_is_a_metric_name_example_with_0_totals"))
 	})
 })