prometheus-client 0.10.0 → 0.11.0.pre.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be821ad9a35fc316970961619d14342baa8166ff6143e21e30e527e0dc1bd325
-  data.tar.gz: bf6583e5e6b45cc96ffa9424abe5707e3f17ba5782ba6e42c89a994e8233a0f6
+  metadata.gz: a558dc9a9c12b948a111369fd378ef1f41135695b0f7fb30eb2691a86a05ea3f
+  data.tar.gz: 0d8554c3e1a4cec8e6db066158247c7a1c8e0fc86653e9a252bc3c08c04d1618
 SHA512:
-  metadata.gz: ff408a86bebf88bc757850dc69c3faf9b56dc8d556f0c837d350496ee37810390e5cf6f0b319785e3c9a79968f67467b1fd2a5213c07468a907bd5eae907363c
-  data.tar.gz: df5a509d431e8d7a9ca03f984400cfd3d0705d3322f9f2a336653f6956a828135b75efb99aa3817398c1f559bf4722d2580a5608b598f1d8312b24d97d18098c
+  metadata.gz: 91b4d4bb9f606b33f77bc0fab83a523d0cf61d6f875f5c42de738513aebc2e6a44994c9098c103b51b54eb2c80957c82616aab4fadb07e583c1b5b0ef3821697
+  data.tar.gz: d956b78c30fff9db52e45f9826f739f1088501ebd12ad71b016e0d58abe3262c320180fd68ba74dbc898a279141e6e27b9f51d2d8471b0d28f7e5bb5eef95595

data/README.md

@@ -66,8 +66,6 @@ The Ruby client can also be used to push its collected metrics to a
 where it's not possible or feasible to let a Prometheus server scrape a Ruby
 process. TLS and basic access authentication are supported.
 
-**Attention**: The implementation still uses the legacy API of the pushgateway.
-
 ```ruby
 require 'prometheus/client'
 require 'prometheus/client/push'

data/lib/prometheus/client/data_stores/direct_file_store.rb

@@ -150,7 +150,7 @@ module Prometheus
               labels[:pid] = process_id
             end
 
-            labels.map{|k,v| "#{CGI::escape(k.to_s)}=#{CGI::escape(v.to_s)}"}.join('&')
+            labels.to_a.sort.map{|k,v| "#{CGI::escape(k.to_s)}=#{CGI::escape(v.to_s)}"}.join('&')
           end
 
           def internal_store
@@ -215,11 +215,7 @@ module Prometheus
 
             if @used > 0
               # File already has data. Read the existing values
-              with_file_lock do
-                read_all_values.each do |key, _, pos|
-                  @positions[key] = pos
-                end
-              end
+              with_file_lock { populate_positions }
             else
               # File is empty. Init the `used` counter, if we're in write mode
               if !readonly
@@ -230,10 +226,14 @@ module Prometheus
             end
           end
 
-          # Yield (key, value, pos). No locking is performed.
+          # Return a list of key-value pairs
           def all_values
             with_file_lock do
-              read_all_values.map { |k, v, p| [k, v] }
+              @positions.map do |key, pos|
+                @f.seek(pos)
+                value = @f.read(8).unpack('d')[0]
+                [key, value]
+              end
             end
           end
 
@@ -309,22 +309,18 @@ module Prometheus
             @positions[key] = @used - 8
           end
 
-          # Yield (key, value, pos). No locking is performed.
-          def read_all_values
+          # Read position of all keys. No locking is performed.
+          def populate_positions
             @f.seek(8)
-            values = []
             while @f.pos < @used
               padded_len = @f.read(4).unpack('l')[0]
-              encoded = @f.read(padded_len).unpack("A#{padded_len}")[0]
-              value = @f.read(8).unpack('d')[0]
-              values << [encoded.strip, value, @f.pos - 8]
+              key = @f.read(padded_len).unpack("A#{padded_len}")[0].strip
+              @positions[key] = @f.pos
+              @f.seek(8, :CUR)
             end
-            values
           end
         end
       end
     end
   end
 end
-
-

data/lib/prometheus/client/version.rb

@@ -2,6 +2,6 @@
 
 module Prometheus
   module Client
-    VERSION = '0.10.0'
+    VERSION = '0.11.0-alpha.1'
   end
 end

data/lib/prometheus/middleware/collector.rb

@@ -11,20 +11,11 @@ module Prometheus
     # By default metrics are registered on the global registry. Set the
     # `:registry` option to use a custom registry.
     #
-    # By default metrics all have the prefix "http_server". Set to something
-    # else if you like.
+    # By default metrics all have the prefix "http_server". Set
+    # `:metrics_prefix` to something else if you like.
     #
-    # The request counter metric is broken down by code, method and path by
-    # default. Set the `:counter_label_builder` option to use a custom label
-    # builder.
-    #
-    # The request duration metric is broken down by method and path by default.
-    # Set the `:duration_label_builder` option to use a custom label builder.
-    #
-    # Label Builder functions will receive a Rack env and a status code, and must
-    # return a hash with the labels for that request. They must also accept an empty
-    # env, and return a hash with the correct keys. This is necessary to initialize
-    # the metrics with the correct set of labels.
+    # The request counter metric is broken down by code, method and path.
+    # The request duration metric is broken down by method and path.
     class Collector
       attr_reader :app, :registry
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0.pre.alpha.1
 platform: ruby
 authors:
 - Ben Kochie
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-07 00:00:00.000000000 Z
+date: 2019-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -84,11 +84,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A suite of instrumentation metric primitivesthat can be exposed through a