switched to use a static variable. test tweaks.

Author: mindw

simpleclient/src/main/java/io/prometheus/client/Collector.java

@@ -149,27 +149,27 @@ public MetricFamilySamples filter(Predicate<String> sampleNameFilter) {
      * {@code # HELP}), and as this name <a href="https://github.com/prometheus/common/issues/319">must be unique</a>
      * we include the name without suffix here as well.
      */
-    public String[] getNames() {
+    public List<String> getNames() {
       List<String> names = new ArrayList<String>();
       switch (type) {
         case COUNTER:
           names.add(name + "_total");
-          if (getUseCreated()) {
+          if (USE_CREATED) {
             names.add(name + "_created");
           }
           break;
         case SUMMARY:
           names.add(name + "_count");
           names.add(name + "_sum");
-          if (getUseCreated()) {
+          if (USE_CREATED) {
             names.add(name + "_created");
           }
           break;
         case HISTOGRAM:
           names.add(name + "_count");
           names.add(name + "_sum");
           names.add(name + "_bucket");
-          if (getUseCreated()) {
+          if (USE_CREATED) {
             names.add(name + "_created");
           }
           break;
@@ -185,7 +185,7 @@ public String[] getNames() {
           // NOP - `name` is added to all
       }
       names.add(name);
-      return names.toArray(new String[0]);
+      return names;
     }
 
 
@@ -398,6 +398,8 @@ public static String doubleToGoString(double d) {
   protected static final String DISABLE_CREATED_SERIES = "PROMETHEUS_DISABLE_CREATED_SERIES";
   private static final List<String> TRUTHS = Arrays.asList("true", "1", "t");
 
+  protected static boolean USE_CREATED = getUseCreated();
+
   protected static boolean getUseCreated() {
     String disable_series = System.getenv(DISABLE_CREATED_SERIES);
     if (disable_series != null) {

simpleclient/src/main/java/io/prometheus/client/CollectorRegistry.java

@@ -117,7 +117,7 @@ private List<String> collectorNames(Collector m) {
 
     List<String> names = new ArrayList<String>();
     for (Collector.MetricFamilySamples family : mfs) {
-      names.addAll(Arrays.asList(family.getNames()));
+      names.addAll(family.getNames());
     }
     return names;
   }

simpleclient/src/main/java/io/prometheus/client/Counter.java

@@ -355,7 +355,7 @@ public List<MetricFamilySamples> collect() {
     List<MetricFamilySamples.Sample> samples = new ArrayList<MetricFamilySamples.Sample>(children.size());
     for(Map.Entry<List<String>, Child> c: children.entrySet()) {
       samples.add(new MetricFamilySamples.Sample(fullname + "_total", labelNames, c.getKey(), c.getValue().get(), c.getValue().getExemplar()));
-      if (getUseCreated()) {
+      if (USE_CREATED) {
         samples.add(new MetricFamilySamples.Sample(fullname + "_created", labelNames, c.getKey(), c.getValue().created() / 1000.0));
       }
     }

simpleclient/src/main/java/io/prometheus/client/Histogram.java

@@ -574,7 +574,7 @@ public List<MetricFamilySamples> collect() {
       }
       samples.add(new MetricFamilySamples.Sample(fullname + "_count", labelNames, c.getKey(), v.buckets[buckets.length-1]));
       samples.add(new MetricFamilySamples.Sample(fullname + "_sum", labelNames, c.getKey(), v.sum));
-      if (getUseCreated()) {
+      if (USE_CREATED) {
         samples.add(new MetricFamilySamples.Sample(fullname + "_created", labelNames, c.getKey(), v.created / 1000.0));
       }
     }

simpleclient/src/main/java/io/prometheus/client/Summary.java

@@ -404,7 +404,7 @@ public List<MetricFamilySamples> collect() {
       }
       samples.add(new MetricFamilySamples.Sample(fullname + "_count", labelNames, c.getKey(), v.count));
       samples.add(new MetricFamilySamples.Sample(fullname + "_sum", labelNames, c.getKey(), v.sum));
-      if (getUseCreated()) {
+      if (USE_CREATED) {
         samples.add(new MetricFamilySamples.Sample(fullname + "_created", labelNames, c.getKey(), v.created / 1000.0));
       }
     }

simpleclient/src/test/java/io/prometheus/client/DisableCreatedTest.java

@@ -18,7 +18,7 @@ public void setUp() {
     }
 
     @Test
-    public void testDisableCreatedAll() {
+    public void testDisableCreatedAll() throws Exception {
         EnvironmentVariables env = new EnvironmentVariables(Collector.DISABLE_CREATED_SERIES, "true");
         Counter counter1 = Counter.build()
                 .name("counter1")
@@ -47,12 +47,14 @@ public void testDisableCreatedAll() {
         List<Collector.MetricFamilySamples> mfsList;
         try {
             env.setup();
+            Collector.USE_CREATED = Collector.getUseCreated();
             mfsList = Collections.list(registry.metricFamilySamples());
             String extracted = System.getenv(Collector.DISABLE_CREATED_SERIES);
             Assert.assertEquals("Env isn't set", "true", extracted);
+        }
+        finally {
             env.teardown();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
+            Collector.USE_CREATED = Collector.getUseCreated();
         }
         assertSamplesInclude(mfsList, "counter1_total", 2);
         assertSamplesInclude(mfsList, "counter1_created", 0);

simpleclient/src/test/java/io/prometheus/client/HistogramTest.java

@@ -299,7 +299,7 @@ private void assertExemplar(Histogram histogram, double value, String... labels)
       }
       if (lowerBound < value && value <= upperBound) {
         Assert.assertNotNull("No exemplar found in bucket [" + lowerBound + ", " + upperBound + "]", bucket.exemplar);
-        Assert.assertEquals(value, bucket.exemplar.getValue(), 0.001);
+        Assert.assertEquals(value, bucket.exemplar.getValue(), 0.01);
         Assert.assertEquals(labels.length/2, bucket.exemplar.getNumberOfLabels());
         for (int i=0; i<labels.length; i+=2) {
           Assert.assertEquals(labels[i], bucket.exemplar.getLabelName(i/2));