Hotfix prometheus_client_model to avoid dual global initializations

uber-go · May 17, 2018 · 1ce146c · 1ce146c
1 parent 51e5c45
commit 1ce146c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -10,7 +10,7 @@ import:
   subpackages:
   - prometheus
 - package: github.com/m3db/prometheus_client_model
-  version: fa8ad6fec33561be4280a8f0514318c79d7f6cb6
+  version: 8b2299a4bf7d7fc10835527021716d4b4a6e8700
 - package: github.com/m3db/prometheus_common
   version: 25aaa3dff79bb48116615ebe1dea6a494b74ce77
 - package: github.com/m3db/prometheus_procfs

diff --git a/prometheus/sanitize.go b/prometheus/sanitize.go
@@ -29,15 +29,15 @@ var (
 	DefaultSanitizerOpts = tally.SanitizeOptions{
 		NameCharacters: tally.ValidCharacters{
 			Ranges:     tally.AlphanumericRange,
-			Characters: tally.UnderscoreDashCharacters,
+			Characters: tally.UnderscoreCharacters,
 		},
 		KeyCharacters: tally.ValidCharacters{
 			Ranges:     tally.AlphanumericRange,
-			Characters: tally.UnderscoreDashCharacters,
+			Characters: tally.UnderscoreCharacters,
 		},
 		ValueCharacters: tally.ValidCharacters{
 			Ranges:     tally.AlphanumericRange,
-			Characters: tally.UnderscoreDashCharacters,
+			Characters: tally.UnderscoreCharacters,
 		},
 		ReplacementCharacter: tally.DefaultReplacementCharacter,
 	}

diff --git a/sanitize.go b/sanitize.go
@@ -35,6 +35,10 @@ var (
 		{rune('A'), rune('Z')},
 		{rune('0'), rune('9')}}
 
+	// UnderscoreCharacters is just an underscore character.
+	UnderscoreCharacters = []rune{
+		'_'}
+
 	// UnderscoreDashCharacters is a slice of underscore, and
 	// dash characters.
 	UnderscoreDashCharacters = []rune{