prometheus-client 0.3.0.pre.rc.1 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjNjNjA5ODM2MDg5NzA0Mjk5ZmFhY2Q3MzgzYzU5NmQ0MmEwNjIzYw==
+    NTg5OWIzZmEwM2Y5ZTJlYTZhYmZiYmJjNWQ2YzllZDY3ODE0NzZlMA==
   data.tar.gz: !binary |-
-    MWM4NWNhOWY5ZjA0YmUyNjY2YzJiZTA3Zjk0OTRkNjAyZTFhZDAzZg==
+    OGViMTA5YzQ5ODNiMGMwOTg0OGRkMGYwYjQ4Mjg5ZDMxZjYxYjkxMg==
 SHA512:
   metadata.gz: !binary |-
-    M2JlODIxYWUwZGE0ZDQxODJkODdlNzNmYmYzZjU5NDhiYmYzOTQxYTVlNDg0
-    ZGQ2NzE3MmEzZDk1ZTUzZmExMDc5ZGE0NDEyMmU5ZjQyZWUyODdmOWE5YWQ0
-    NThkZDRkNmYzM2Q4YTI0YmM1ZjliOWJmY2Q4OGJhZGZhMDg1NjY=
+    YjdhODgyNjgyYzQyMmRmNzQyM2FjMzg2MDQ5NDIwNjM3MzBlNmQwMGVhNTlk
+    NWFhNzE0NjU0Mjg2OGE2ZWQzNTNlNmVjODU3MDlmMzZjNmExMmY5ZjkxYzlh
+    NmQ3ZDVkOTUzZTk0Yzk3ODAyZTk4ZmZiNGU2M2M1NmU1YzFmMjI=
   data.tar.gz: !binary |-
-    ZWZjODRiYzFiNjMxNzliYWM3M2E4M2ZhYTM2Y2Q0MjYyNmRhOWMzZDdiMzU3
-    ZTBmNDkzYjk1Y2IwMGY2ZTliYmNhYTk1NGEzYTU4YzAyNDc2YzNkZWRlOGY2
-    NjllNTA2OTFlMGY4ZjQ4NmZjNWFiNDMzODE3YWMyNzljZWYyNzE=
+    ODMzOGU1MzVjN2M2NzFmZDQyZjc4MjgwMzRmYjViZDY4MTliNzM2ZDYwNDlm
+    MjE0YWQ5ZWI1MDA5MjZlY2U0NGExNzA2MWJlYjk2YWU1NjkwNjdkOWJjZWJj
+    ZGMzNmJhZDZiZTgyMTkzYmY1YmFmMmZmNDUzYmQ1ZjE3MDU5NWI=

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

@@ -28,8 +28,7 @@ module Prometheus
             lines << format(HELP_LINE, metric.name, escape(metric.docstring))
 
             metric.values.each do |label_set, value|
-              set = metric.base_labels.merge(label_set)
-              representation(metric, set, value) { |l| lines << l }
+              representation(metric, label_set, value) { |l| lines << l }
             end
           end
 
@@ -39,20 +38,26 @@ module Prometheus
 
         private
 
-        def self.representation(metric, set, value)
-          if metric.type == :summary
-            value.each do |q, v|
-              yield metric(metric.name, labels(set.merge(quantile: q)), v)
-            end
+        def self.representation(metric, label_set, value, &block)
+          set = metric.base_labels.merge(label_set)
 
-            l = labels(set)
-            yield metric("#{metric.name}_sum", l, value.sum)
-            yield metric("#{metric.name}_total", l, value.total)
+          if metric.type == :summary
+            summary(metric.name, set, value, &block)
           else
             yield metric(metric.name, labels(set), value)
           end
         end
 
+        def self.summary(name, set, value)
+          value.each do |q, v|
+            yield metric(name, labels(set.merge(quantile: q)), v)
+          end
+
+          l = labels(set)
+          yield metric("#{name}_sum", l, value.sum)
+          yield metric("#{name}_total", l, value.total)
+        end
+
         def self.metric(name, labels, value)
           format(METRIC_LINE, name, labels, value)
         end

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

@@ -47,14 +47,22 @@ module Prometheus
         def parse(header)
           header.to_s.split(/\s*,\s*/).map do |type|
             attributes = type.split(/\s*;\s*/)
-            quality = 1.0
-            attributes.delete_if do |attr|
-              quality = attr.split('q=').last.to_f if attr.start_with?('q=')
-            end
+            quality = extract_quality(attributes)
+
             [attributes.join('; '), quality]
           end.sort_by(&:last).reverse
         end
 
+        def extract_quality(attributes, default = 1.0)
+          quality = default
+
+          attributes.delete_if do |attr|
+            quality = attr.split('q=').last.to_f if attr.start_with?('q=')
+          end
+
+          quality
+        end
+
         def respond_with(format)
           [
             200,

data/lib/prometheus/client/version.rb

@@ -2,6 +2,6 @@
 
 module Prometheus
   module Client
-    VERSION = '0.3.0-rc.1'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre.rc.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Tobias Schmidt
@@ -61,9 +61,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.1.11