Don't throw NPE if .help() wasn't called (prometheus#458)

dlazerka · brian-brazil · commit b61dd232a504 · 2019-11-14T12:58:07.000Z
See issue prometheus#457 Signed-off-by: Dzmitry Lazerka <dlazerka@gmail.com>
diff --git a/simpleclient/src/main/java/io/prometheus/client/SimpleCollector.java b/simpleclient/src/main/java/io/prometheus/client/SimpleCollector.java
@@ -162,7 +162,7 @@ protected SimpleCollector(Builder b) {
     }
     fullname = name;
     checkMetricName(fullname);
-    if (b.help.isEmpty()) throw new IllegalStateException("Help hasn't been set.");
+    if (b.help != null && b.help.isEmpty()) throw new IllegalStateException("Help hasn't been set.");
     help = b.help;
     labelNames = Arrays.asList(b.labelNames);
 

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ protected SimpleCollector(Builder b) {`
`162`	`162`	`}`
`163`	`163`	`fullname = name;`
`164`	`164`	`checkMetricName(fullname);`
`165`		`- if (b.help.isEmpty()) throw new IllegalStateException("Help hasn't been set.");`
	`165`	`+ if (b.help != null && b.help.isEmpty()) throw new IllegalStateException("Help hasn't been set.");`
`166`	`166`	`help = b.help;`
`167`	`167`	`labelNames = Arrays.asList(b.labelNames);`
`168`	`168`