Make jvm_info use an Info. UNTYPED -> UNKNOWN.

Signed-off-by: Brian Brazil <[email protected]>

Author: brian-brazil

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

@@ -20,7 +20,7 @@ public abstract class Collector {
    */
   public abstract List<MetricFamilySamples> collect();
   public enum Type {
-    UNTYPED, // XXX This is Unknown in OpenMetrics.
+    UNKNOWN, // This is untyped in Prometheus text format.
     COUNTER,
     GAUGE,
     STATE_SET,

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

@@ -58,7 +58,7 @@
  * </pre>
  */
 public class Enumeration extends SimpleCollector<Enumeration.Child> implements Counter.Describable {
-  
+
   private final Set<String> states;
 
   Enumeration(Builder b) {
@@ -166,7 +166,7 @@ public void state(String s) {
     public void state(Enum e) {
       state(e.name());
     }
- 
+
     /**
      * Get the state.
      */

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

@@ -36,7 +36,7 @@
  * </pre>
  */
 public class Info extends SimpleCollector<Info.Child> implements Counter.Describable {
-  
+
   Info(Builder b) {
     super(b);
   }

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

@@ -59,7 +59,7 @@ public void testLabels() {
     labels.labels("b").info("baz", "meh");
     assertEquals(1.0, getInfo("labels", "l", "a", "foo", "bar"), .001);
     assertEquals(1.0, getInfo("labels", "l", "b", "baz", "meh"), .001);
-    
+
     assertEquals(null, getInfo("nolabels", "l", "a"));
     assertEquals(null, getInfo("nolabels", "l", "b"));
   }

simpleclient_common/src/main/java/io/prometheus/client/exporter/common/TextFormat.java

@@ -16,7 +16,7 @@ public class TextFormat {
    * Content-type for Prometheus text version 0.0.4.
    */
   public final static String CONTENT_TYPE_004 = "text/plain; version=0.0.4; charset=utf-8";
-  
+
   /**
    * Content-type for Openmetrics text version 1.0.0.
    */
@@ -29,7 +29,7 @@ public static String chooseContentType(String acceptHeader) {
     if (acceptHeader == null) {
       return CONTENT_TYPE_004;
     }
- 
+
     for (String accepts : acceptHeader.split(",")) {
       if ("application/openmetrics-text".equals(accepts.split(";")[0].trim())) {
         return CONTENT_TYPE_OPENMETRICS_100;
@@ -193,13 +193,13 @@ public static void writeOpenMetrics100(Writer writer, Enumeration<Collector.Metr
     while(mfs.hasMoreElements()) {
       Collector.MetricFamilySamples metricFamilySamples = mfs.nextElement();
       String name = metricFamilySamples.name;
- 
+
       writer.write("# TYPE ");
       writer.write(name);
       writer.write(' ');
       writer.write(omTypeString(metricFamilySamples.type));
       writer.write('\n');
- 
+
       if (!metricFamilySamples.unit.isEmpty()) {
         writer.write("# UNIT ");
         writer.write(name);

simpleclient_common/src/test/java/io/prometheus/client/exporter/common/TextFormatOpenMetricsTest.java

@@ -108,11 +108,11 @@ public List<MetricFamilySamples> collect() {
         ArrayList<MetricFamilySamples.Sample> samples = new ArrayList<Collector.MetricFamilySamples.Sample>();
         MetricFamilySamples.Sample sample = new MetricFamilySamples.Sample("nolabels", labelNames, labelValues, 1.0, 1518123006L);
         samples.add(sample);
-        mfs.add(new MetricFamilySamples("nolabels", Collector.Type.UNTYPED, "help", samples));
+        mfs.add(new MetricFamilySamples("nolabels", Collector.Type.UNKNOWN, "help", samples));
         return mfs;
       }
     }
-    
+
     new CustomCollector().register(registry);
     TextFormat.writeOpenMetrics100(writer, registry.metricFamilySamples());
     assertEquals("# TYPE nolabels unknown\n"

simpleclient_common/src/test/java/io/prometheus/client/exporter/common/TextFormatTest.java

@@ -121,7 +121,7 @@ public List<MetricFamilySamples> collect() {
         ArrayList<MetricFamilySamples.Sample> samples = new ArrayList<Collector.MetricFamilySamples.Sample>();
         MetricFamilySamples.Sample sample = new MetricFamilySamples.Sample("nolabels", labelNames, labelValues, 1.0, 1518123456L);
         samples.add(sample);
-        mfs.add(new MetricFamilySamples("nolabels", Collector.Type.UNTYPED, "help", samples));
+        mfs.add(new MetricFamilySamples("nolabels", Collector.Type.UNKNOWN, "help", samples));
         return mfs;
       }
     }

simpleclient_hotspot/src/main/java/io/prometheus/client/hotspot/VersionInfoExports.java

@@ -1,7 +1,7 @@
 package io.prometheus.client.hotspot;
 
 import io.prometheus.client.Collector;
-import io.prometheus.client.GaugeMetricFamily;
+import io.prometheus.client.Info;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -26,20 +26,12 @@ public class VersionInfoExports extends Collector {
 
 
     public List<MetricFamilySamples> collect() {
-        List<MetricFamilySamples> mfs = new ArrayList<MetricFamilySamples>();
-
-        GaugeMetricFamily jvmInfo = new GaugeMetricFamily(
-                "jvm_info",
-                "JVM version info",
-                Arrays.asList("version", "vendor", "runtime"));
-        jvmInfo.addMetric(
-                Arrays.asList(
-                    System.getProperty("java.runtime.version", "unknown"),
-                    System.getProperty("java.vm.vendor", "unknown"),
-                    System.getProperty("java.runtime.name", "unknown")),
-                    1L);
-        mfs.add(jvmInfo);
-
-        return mfs;
+        Info i = Info.build().name("jvm").help("VM version info").create();
+        i.info(
+            "version", System.getProperty("java.runtime.version", "unknown"),
+            "vendor", System.getProperty("java.vm.vendor", "unknown"),
+            "runtime", System.getProperty("java.runtime.name", "unknown")
+        );
+        return i.collect();
     }
 }

simpleclient_hotspot/src/test/java/io/prometheus/client/hotspot/VersionInfoExportsTest.java

@@ -21,7 +21,11 @@ public void testVersionInfo() {
         assertEquals(
                 1L,
                 registry.getSampleValue(
-                        "jvm_info", new String[]{"version", "vendor", "runtime"}, new String[]{System.getProperty("java.runtime.version", "unknown"), System.getProperty("java.vm.vendor", "unknown"), System.getProperty("java.runtime.name", "unknown")}),
+                        "jvm_info", new String[]{"runtime", "vendor", "version"},
+                        new String[]{
+                          System.getProperty("java.runtime.name", "unknown"),
+                          System.getProperty("java.vm.vendor", "unknown"),
+                          System.getProperty("java.runtime.version", "unknown")}),
                 .0000001);
     }
 }

simpleclient_httpserver/src/test/java/io/prometheus/client/exporter/TestHTTPServer.java

@@ -75,7 +75,6 @@ String requestWithAccept(String accept) throws IOException {
     return s.hasNext() ? s.next() : "";
   }
 
-  @Test
   @Test(expected = IllegalArgumentException.class)
   public void testRefuseUsingUnbound() throws IOException {
     CollectorRegistry registry = new CollectorRegistry();