prometheus-client-mmap 0.7.0.beta43 → 0.7.0.beta44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4521825ca75920135fbbaf6fb8e5c96bd0d191ee
-  data.tar.gz: '06686cb19e896c65356e2ed44c6398adb69d4a01'
+  metadata.gz: dcb6db082557b7ed883ec9c4be354709f73e8b28
+  data.tar.gz: 6a31e7b0c550e70e970deafd5abd8a7d0d38e68c
 SHA512:
-  metadata.gz: 262ea3d30cce8cc62b56c098cb983c0c43a55bad40b6374c7ea72df8c45404e0fc978bd9e0b0498ae512ee9818cd2742f823bf583dbcff02ae1be01e1591063d
-  data.tar.gz: 7cd7db57d62f2f9bbf5da3940ce12d6ca849d17e09530a52ca351475a5eea7fbfadeacf65af2793613be20363ebff46696c8248af0019e10bc3b768d3bdd978c
+  metadata.gz: 713b6f7a0e91092fe37394ec7c17f1f6754ab88cf71662b20fafc093e51a7d90455d736bd3670dca1c6ae4cee71413c67bd5bf5a5fea684da3d8fee0ab6a72e0
+  data.tar.gz: 69b124138852ff02e07c6d5f278dbc74da4e7800a202958fa019f38c2f3f601e55acca79d0590be81042ac5c17bfdecb69fe6e813df0fefa673cc2a065af71ad

data/ext/fast_mmaped_file/rendering.c

@@ -10,6 +10,8 @@
 #define DBL_DECIMAL_DIG 17
 #endif
 
+#define LABELS_START_OFFSET 4
+
 static inline int is_valid(const jsmntok_t *token) { return token->start < token->end && token->start >= 0; }
 static inline int valid_not_null(const entry_t *entry, const jsmntok_t *token) {
     static const char null_s[] = "null";
@@ -41,74 +43,95 @@ static inline int append_token(VALUE string, const entry_t *entry, const jsmntok
     return 1;
 }
 
+static int append_labels(VALUE string, const entry_t *entry, const int label_count, const jsmntok_t *tokens) {
+    if (label_count <= 0) {
+        return 1;
+    }
+
+    rb_str_cat(string, "{", 1);
+
+    for (int i = 0; i < label_count; i++) {
+        int key = LABELS_START_OFFSET + i;
+        int val = LABELS_START_OFFSET + label_count + 1 + i;
+
+        if (!append_token(string, entry, &tokens[key])) {
+            return 0;
+        }
+        rb_str_cat(string, "=", 1);
+
+        rb_str_cat(string, "\"", 1);
+        if (valid_not_null(entry, &tokens[val])) {
+            append_token(string, entry, &tokens[val]);
+        }
+        rb_str_cat(string, "\"", 1);
+
+        if (i < label_count - 1) {
+            rb_str_cat(string, ",", 1);
+        }
+    }
+
+    if (is_pid_significant(entry)) {
+        rb_str_cat(string, ",pid=\"", 6);
+        rb_str_append(string, entry->pid);
+        rb_str_cat(string, "\"", 1);
+    }
+
+    rb_str_cat(string, "}", 1);
+    return 1;
+}
+
+static int validate_token_count(const int token_count, const entry_t *entry) {
+    if (token_count < 0) {
+        save_exception(prom_eParsingError, "too many labels or malformed json: %s", entry->json);
+        return 0;
+    }
+
+    if (token_count < LABELS_START_OFFSET) {
+        save_exception(prom_eParsingError, "malformed json: %s", entry->json);
+        return 0;
+    }
+
+    if ((token_count - (LABELS_START_OFFSET + 1)) % 2 != 0) {
+        save_exception(prom_eParsingError, "mismatched number of labels: %s", entry->json);
+        return 0;
+    }
+
+    return 1;
+}
+
 static int append_entry(VALUE string, const entry_t *entry) {
     jsmn_parser parser;
     jsmn_init(&parser);
 
     jsmntok_t tokens[200];
-    int r = jsmn_parse(&parser, entry->json, entry->json_size, tokens, sizeof(tokens) / sizeof(tokens[0]));
+    jsmntok_t *name_token = &tokens[2];
 
-    if (r < 0) {
-        save_exception(prom_eParsingError, "too many labels or malformed json: %s", entry->json);
-        return 0;
-    }
+    int token_count = jsmn_parse(&parser, entry->json, entry->json_size, tokens, sizeof(tokens) / sizeof(tokens[0]));
+    int label_count = (token_count - (LABELS_START_OFFSET + 1)) / 2;
 
     //
-    // Example JSON "['name', 'name',['label_a','label_b'],['value_a', 'value_b']]"
+    // Example JSON "['metric', 'name',['label_a','label_b'],['value_a', 'value_b']]"
     // will be  parsed into following token list:
     //
-    // [ "'name', 'name',['label_a','label_b'],['value_a', 'value_b']",
-    // "name", "name",
+    // [ "'metric', 'name',['label_a','label_b'],['value_a', 'value_b']",
+    // "metric", "name",
     // "['label_a','label_b']", "label_a", "label_b",
     // "['value_a', 'value_b']", "value_a", "value_b" ]
-    static int labels_start_offset = 4;
+    //
+    // where 'metric' is the name of the metric, while 'name'
+    // is in summaries and histograms to store names of "submetrics" like:
+    // histogram_name_bucket or histogram_name_sum
 
-    if (r < labels_start_offset) {
-        save_exception(prom_eParsingError, "malformed json: %s", entry->json);
+    if (!validate_token_count(token_count, entry)) {
         return 0;
     }
 
-    int label_cnt = (r - 5) / 2;
-    jsmntok_t *name_token = &tokens[2];
-
     if (!append_token(string, entry, name_token)) {
         return 0;
     }
-    if (label_cnt > 0) {
-        if ((r - 5) % 2 != 0) {
-            save_exception(prom_eParsingError, "mismatched number of labels: %s", entry->json);
-            return 0;
-        }
-
-        rb_str_cat(string, "{", 1);
-
-        for (int i = 0; i < label_cnt; i++) {
-            int key = labels_start_offset + i;
-            int val = labels_start_offset + label_cnt + 1 + i;
-
-            if (!append_token(string, entry, &tokens[key])) {
-                return 0;
-            }
-            rb_str_cat(string, "=", 1);
 
-            rb_str_cat(string, "\"", 1);
-            if (valid_not_null(entry, &tokens[val])) {
-                append_token(string, entry, &tokens[val]);
-            }
-            rb_str_cat(string, "\"", 1);
-
-            if (i < label_cnt - 1) {
-                rb_str_cat(string, ",", 1);
-            }
-        }
-
-        if (is_pid_significant(entry)) {
-            rb_str_cat(string, ",pid=\"", 6);
-            rb_str_append(string, entry->pid);
-            rb_str_cat(string, "\"", 1);
-        }
-
-        rb_str_cat(string, "}", 1);
+    if (!append_labels(string, entry, label_count, tokens)) {
+        return 0;
     }
 
     char value[255];

data/lib/prometheus/client/histogram.rb

@@ -10,21 +10,22 @@ module Prometheus
       # Value represents the state of a Histogram at a given point.
       class Value < Hash
         include UsesValueType
-        attr_accessor :sum, :total
+        attr_accessor :sum, :total, :total_inf
 
         def initialize(type, name, labels, buckets)
           @sum = value_object(type, name, "#{name}_sum", labels)
-          # TODO: get rid of total and use +Inf bucket instead.
           @total = value_object(type, name, "#{name}_count", labels)
+          @total_inf = value_object(type, name, "#{name}_bucket", labels.merge(le: "+Inf"))
 
           buckets.each do |bucket|
-            self[bucket] = value_object(type, name, "#{name}_bucket", labels.merge({ :le => bucket.to_s }))
+            self[bucket] = value_object(type, name, "#{name}_bucket", labels.merge(le: bucket.to_s))
           end
         end
 
         def observe(value)
           @sum.increment(value)
           @total.increment()
+          @total_inf.increment()
 
           each_key do |bucket|
             self[bucket].increment() if value <= bucket

data/lib/prometheus/client/version.rb

@@ -1,5 +1,5 @@
 module Prometheus
   module Client
-    VERSION = '0.7.0.beta43'.freeze
+    VERSION = '0.7.0.beta44'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client-mmap
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta43
+  version: 0.7.0.beta44
 platform: ruby
 authors:
 - Tobias Schmidt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-06 00:00:00.000000000 Z
+date: 2017-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fuzzbert