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

data/lib/prometheus/client/version.rb

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

data/lib/prometheus/middleware/collector.rb

@@ -20,6 +20,11 @@ module Prometheus
     #
     # 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.
     class Collector
       attr_reader :app, :registry
 
@@ -27,8 +32,6 @@ module Prometheus
         @app = app
         @registry = options[:registry] || Client.registry
         @metrics_prefix = options[:metrics_prefix] || 'http_server'
-        @counter_lb = options[:counter_label_builder] || COUNTER_LB
-        @duration_lb = options[:duration_label_builder] || DURATION_LB
 
         init_request_metrics
         init_exception_metrics
@@ -40,42 +43,25 @@ module Prometheus
 
       protected
 
-      aggregation = lambda do |str|
-        str
-          .gsub(%r{/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}(/|$)}, '/:uuid\\1')
-          .gsub(%r{/\d+(/|$)}, '/:id\\1')
-      end
-
-      COUNTER_LB = proc do |env, code|
-        {
-          code:   code,
-          method: env['REQUEST_METHOD'].downcase,
-          path:   aggregation.call(env['PATH_INFO']),
-        }
-      end
-
-      DURATION_LB = proc do |env, _|
-        {
-          method: env['REQUEST_METHOD'].downcase,
-          path:   aggregation.call(env['PATH_INFO']),
-        }
-      end
-
       def init_request_metrics
         @requests = @registry.counter(
           :"#{@metrics_prefix}_requests_total",
-          'The total number of HTTP requests handled by the Rack application.',
+          docstring:
+            'The total number of HTTP requests handled by the Rack application.',
+          labels: %i[code method path]
         )
         @durations = @registry.histogram(
           :"#{@metrics_prefix}_request_duration_seconds",
-          'The HTTP response duration of the Rack application.',
+          docstring: 'The HTTP response duration of the Rack application.',
+          labels: %i[method path]
         )
       end
 
       def init_exception_metrics
         @exceptions = @registry.counter(
           :"#{@metrics_prefix}_exceptions_total",
-          'The total number of exceptions raised by the Rack application.',
+          docstring: 'The total number of exceptions raised by the Rack application.',
+          labels: [:exception]
         )
       end
 
@@ -85,17 +71,34 @@ module Prometheus
         record(env, response.first.to_s, duration)
         return response
       rescue => exception
-        @exceptions.increment(exception: exception.class.name)
+        @exceptions.increment(labels: { exception: exception.class.name })
         raise
       end
 
       def record(env, code, duration)
-        @requests.increment(@counter_lb.call(env, code))
-        @durations.observe(@duration_lb.call(env, code), duration)
+        counter_labels = {
+          code:   code,
+          method: env['REQUEST_METHOD'].downcase,
+          path:   strip_ids_from_path(env['PATH_INFO']),
+        }
+
+        duration_labels = {
+          method: env['REQUEST_METHOD'].downcase,
+          path:   strip_ids_from_path(env['PATH_INFO']),
+        }
+
+        @requests.increment(labels: counter_labels)
+        @durations.observe(duration, labels: duration_labels)
       rescue
         # TODO: log unexpected exception during request recording
         nil
       end
+
+      def strip_ids_from_path(path)
+        path
+          .gsub(%r{/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}(/|$)}, '/:uuid\\1')
+          .gsub(%r{/\d+(/|$)}, '/:id\\1')
+      end
     end
   end
 end

metadata

@@ -1,32 +1,50 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0.pre.alpha.1
 platform: ruby
 authors:
-- Tobias Schmidt
+- Ben Kochie
+- Chris Sinjakli
+- Daniel Magliola
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-25 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: quantile
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark-ips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
-- ts@soundcloud.com
+- superq@gmail.com
+- chris@gocardless.com
+- dmagliola@crystalgears.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -34,7 +52,12 @@ files:
 - README.md
 - lib/prometheus.rb
 - lib/prometheus/client.rb
+- lib/prometheus/client/config.rb
 - lib/prometheus/client/counter.rb
+- lib/prometheus/client/data_stores/README.md
+- lib/prometheus/client/data_stores/direct_file_store.rb
+- lib/prometheus/client/data_stores/single_threaded.rb
+- lib/prometheus/client/data_stores/synchronized.rb
 - lib/prometheus/client/formats/text.rb
 - lib/prometheus/client/gauge.rb
 - lib/prometheus/client/histogram.rb
@@ -61,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.2
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A suite of instrumentation metric primitivesthat can be exposed through a