Merge pull request prometheus#413 from prometheus/beorn7/registry

Be more robust about nil pointers in protobuf
Percona-Lab · May 29, 2018 · 42bc0a1 · 42bc0a1
2 parents c51dc75 + 1b56b5c
commit 42bc0a1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/prometheus/registry.go b/prometheus/registry.go
@@ -727,8 +727,8 @@ func checkMetricConsistency(
 	}
 
 	for _, labelPair := range dtoMetric.GetLabel() {
-		if !utf8.ValidString(*labelPair.Value) {
-			return fmt.Errorf("collected metric's label %s is not utf8: %#v", *labelPair.Name, *labelPair.Value)
+		if !utf8.ValidString(labelPair.GetValue()) {
+			return fmt.Errorf("collected metric's label %s is not utf8: %#v", labelPair.GetName(), labelPair.GetValue())
 		}
 	}