prometheus-client-mmap 0.7.0.beta2 → 0.7.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82b0822293d2669014f8790678dc824da3281383
-  data.tar.gz: 7b9d4e382530810a0db3ea9074afd23cd806d0d2
+  metadata.gz: cbf674d68c795209cafac2fd8084b48243ce83bf
+  data.tar.gz: 57ce2be5c369876f6f0783cbb33b5a0b8f6f1ebd
 SHA512:
-  metadata.gz: e100f0a72eadec532716e375bca0c7899484cb62f7fca463730e7cdcdf09fb90517de079642e66dbceef8b0e1013d845b165a5c5a9a0d5f91897ee81ac78f8e5
-  data.tar.gz: 36379031c3797f6a88e2a2376e4341de1f0dbc057322c25b8881ec4679117bcd5b56a7aef010ea18e727d7e1fb42d04f43b946c77af543f25615397d8e33c08d
+  metadata.gz: 41b21a3ccbcf1ba6b7e96d9c3d83f66e214f4818f06a6ba4b7ffebb057a81a6204156e37e0aac45607e593c41fe87d30564fce30362877c54241f916ad4f7a0c
+  data.tar.gz: dfe1456e7b4d279a981efb28080e4616e473700a5fc5e44f4bc51325bc580785b196cc1bfb89ea66e1142c2d7eadd08f57a263cbbdeefc2662e82f5d85e89373

data/lib/prometheus/client/formats/text.rb

@@ -85,38 +85,13 @@ module Prometheus
                 else # all/liveall
                   samples[[name, labels]] = value
                 end
-              when :histogram
-                bucket = labels.select{|l| l[0] == 'le' }.map {|k, v| v.to_f}.first
-                if bucket
-                  without_le = labels.select{ |l| l[0] != 'le' }
-                  b = buckets.fetch(without_le, {})
-                  v = b.fetch(bucket, 0.0) + value
-                  if !buckets.has_key?(without_le)
-                    buckets[without_le] = {}
-                  end
-                  buckets[without_le][bucket] = v
-                else
-                  s = samples.fetch([name, labels], 0.0)
-                  samples[[name, labels]] = s + value
-                end
               else
-                # Counter and Summary.
+                # Counter, Histogram and Summary.
+                without_pid = labels.select{ |l| l[0] != 'pid' }
                 s = samples.fetch([name, without_pid], 0.0)
                 samples[[name, without_pid]] = s + value
               end
 
-              if metric[:type] == :histogram
-                buckets.each do |labels, values|
-                  acc = 0.0
-                  values.sort.each do |bucket, value|
-                    acc += value
-                    # TODO: handle Infinity
-                    samples[[metric[:metric_name] + '_bucket', labels + [['le', bucket.to_s]]]] = acc
-                  end
-                  samples[[metric[:metric_name] + '_count', labels]] = acc
-                end
-              end
-
               metric[:samples] = samples.map do |name_labels, value|
                 name, labels = name_labels
                 [name, labels.to_h, value]

data/lib/prometheus/client/histogram.rb

@@ -13,13 +13,12 @@ module Prometheus
         attr_accessor :sum, :total
 
         def initialize(type, name, labels, buckets)
-          @sum = ValueClass.new(type, name, name.to_s + '_sum', labels)
+          @sum = ValueClass.new(type, name, "#{name}_sum", labels)
           # TODO: get rid of total and use +Inf bucket instead.
-          @total = ValueClass.new(type, name, name.to_s + '_count', labels)
+          @total = ValueClass.new(type, name, "#{name}_count", labels)
 
           buckets.each do |bucket|
-            # TODO: check that there are no user-defined "le" labels.
-            self[bucket] = ValueClass.new(type, name, name.to_s + '_bucket', labels.merge({'le' => bucket.to_s}))
+            self[bucket] = ValueClass.new(type, name, "#{name}_bucket", labels.merge({:le => bucket.to_s}))
           end
         end
 
@@ -61,10 +60,6 @@ module Prometheus
       end
 
       def observe(labels, value)
-        if labels[:le]
-          raise ArgumentError, 'Label with name "le" is not permitted'
-        end
-
         label_set = label_set_for(labels)
         synchronize { @values[label_set].observe(value) }
       end

data/lib/prometheus/client/label_set_validator.rb

@@ -13,7 +13,8 @@ module Prometheus
       class InvalidLabelError < LabelSetError; end
       class ReservedLabelError < LabelSetError; end
 
-      def initialize
+      def initialize(reserved_labels = [])
+        @reserved_labels = (reserved_labels + RESERVED_LABELS).freeze
         @validated = {}
       end
 
@@ -60,7 +61,7 @@ module Prometheus
       end
 
       def validate_reserved_key(key)
-        return true unless RESERVED_LABELS.include?(key)
+        return true unless @reserved_labels.include?(key)
 
         raise ReservedLabelError, "#{key} is reserved"
       end

data/lib/prometheus/client/metric.rb

@@ -12,7 +12,14 @@ module Prometheus
 
       def initialize(name, docstring, base_labels = {})
         @mutex = Mutex.new
-        @validator = LabelSetValidator.new
+        case type
+        when :summary
+          @validator = LabelSetValidator.new(['quantile'])
+        when :histogram
+          @validator = LabelSetValidator.new(['le'])
+        else
+          @validator = LabelSetValidator.new
+        end
         @values = Hash.new { |hash, key| hash[key] = default(key) }
 
         validate_name(name)

data/lib/prometheus/client/rack/collector.rb

@@ -41,6 +41,10 @@ module Prometheus
           )
           @durations = @registry.summary(
             :http_request_duration_seconds,
+            'A summary of the response latency.',
+          )
+          @durations_hist = @registry.histogram(
+            :http_req_duration_seconds,
             'A histogram of the response latency.',
           )
         end
@@ -72,8 +76,10 @@ module Prometheus
         def record(labels, duration)
           @requests.increment(labels)
           @durations.observe(labels, duration)
-        rescue
-          # TODO: log unexpected exception during request recording
+          @durations_hist.observe(labels, duration)
+        rescue => exception
+          @exceptions.increment(exception: exception.class.name)
+          raise
           nil
         end
       end

data/lib/prometheus/client/summary.rb

@@ -14,17 +14,30 @@ module Prometheus
       class Value < Hash
         attr_accessor :sum, :total
 
-        def initialize(name, labels, estimator)
-          @sum = ValueClass.new(name, name + '_sum', labels, estimator.sum)
-          @total = ValueClass.new(name, name + '_count', labels, estimator.observations)
+        def initialize(type, name, labels)
+          @sum = ValueClass.new(type, name, "#{name}_sum", labels)
+          @total = ValueClass.new(type, name, "#{name}_count", labels)
+          @estimator = Quantile::Estimator.new
+          @estimator.invariants.each do |invariant|
+            self[invariant.quantile] = ValueClass.new(type, name, "#{name}_summary", labels.merge({:quantile => invariant.quantile}))
+          end
+        end
 
-          estimator.invariants.each do |invariant|
-            self[invariant.quantile] = ValueClass.new(type, name, labels, estimator.query(invariant.quantile), nil)
+        def observe(value)
+          @sum.increment(value)
+          @total.increment()
+          # TODO: The quantile info is innaccurate as it only contains
+          #       observations per-process.  What needs to happen is for
+          #       observations to be read into the estimator and then reported.
+          #       Alternatively it could be done in the exporter.
+          @estimator.observe(value)
+          @estimator.invariants.each do |invariant|
+            self[invariant.quantile].set(@estimator.query(invariant.quantile))
           end
         end
       end
 
-      def initialize(name, docstring, base_labels = {}, multiprocess_mode)
+      def initialize(name, docstring, base_labels = {})
         super(name, docstring, base_labels)
       end
 
@@ -45,7 +58,7 @@ module Prometheus
         @validator.valid?(labels)
 
         synchronize do
-          Value.new(@values[labels])
+          Value.new(@values[labels].sum)
         end
       end
 
@@ -53,7 +66,7 @@ module Prometheus
       def values
         synchronize do
           @values.each_with_object({}) do |(labels, value), memo|
-            memo[labels] = value
+            memo[labels] = value.sum
           end
         end
       end
@@ -61,7 +74,7 @@ module Prometheus
       private
 
       def default(labels)
-        Value.new(type, @name, labels, Quantile::Estimator.new)
+        Value.new(type, @name, labels)
       end
     end
   end

data/lib/prometheus/client/version.rb

@@ -2,6 +2,6 @@
 
 module Prometheus
   module Client
-    VERSION = '0.7.0.beta2'
+    VERSION = '0.7.0.beta3'
   end
 end

data/lib/prometheus/client/version.rb.orig

@@ -0,0 +1,11 @@
+# encoding: UTF-8
+
+module Prometheus
+  module Client
+<<<<<<< HEAD
+    VERSION = '0.7.0.beta3'
+=======
+    VERSION = '0.7.0.beta2'
+>>>>>>> prometheus-client-mmap
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client-mmap
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta2
+  version: 0.7.0.beta3
 platform: ruby
 authors:
 - Tobias Schmidt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-09 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quantile
@@ -47,6 +47,7 @@ files:
 - lib/prometheus/client/summary.rb
 - lib/prometheus/client/valuetype.rb
 - lib/prometheus/client/version.rb
+- lib/prometheus/client/version.rb.orig
 homepage: https://github.com/pchojnacki/client_ruby
 licenses:
 - Apache 2.0