Merge pull request prometheus#111 from prometheus/parse-untyped

brian-brazil · web-flow · commit facada34ff21 · 2016-11-03T17:31:23.000Z
For unknown types, suffix should be empty string.
diff --git a/prometheus_client/parser.py b/prometheus_client/parser.py
@@ -197,7 +197,7 @@ def build_metric(name, documentation, typ, samples):
                     'gauge': [''],
                     'summary': ['_count', '_sum', ''],
                     'histogram': ['_count', '_sum', '_bucket'],
-                    }.get(typ, [parts[2]])
+                    }.get(typ, [''])
                 allowed_names = [name + n for n in allowed_names]
             else:
                 # Ignore other comment tokens
diff --git a/tests/test_parser.py b/tests/test_parser.py
@@ -66,6 +66,21 @@ def test_no_metadata(self):
         metric_family.add_sample("a", {}, 1)
         self.assertEqual([metric_family], list(families))
 
+    def test_untyped(self):
+        # https://github.com/prometheus/client_python/issues/79
+        families = text_string_to_metric_families("""# HELP redis_connected_clients Redis connected clients
+# TYPE redis_connected_clients untyped
+redis_connected_clients{instance="rough-snowflake-web",port="6380"} 10.0
+redis_connected_clients{instance="rough-snowflake-web",port="6381"} 12.0
+""")
+        m = Metric("redis_connected_clients", "Redis connected clients", "untyped")
+        m.samples = [
+            ("redis_connected_clients", {"instance": "rough-snowflake-web", "port": "6380"}, 10),
+            ("redis_connected_clients", {"instance": "rough-snowflake-web", "port": "6381"}, 12),
+        ]
+        self.assertEqual([m], list(families))
+
+
     def test_type_help_switched(self):
         families = text_string_to_metric_families("""# HELP a help
 # TYPE a counter
