prometheus-client 1.0.0 → 4.1.0

data/lib/prometheus/middleware/collector.rb

@@ -67,15 +67,17 @@ module Prometheus
       end
 
       def record(env, code, duration)
+        path = generate_path(env)
+
         counter_labels = {
           code:   code,
           method: env['REQUEST_METHOD'].downcase,
-          path:   strip_ids_from_path(env['PATH_INFO']),
+          path:   path,
         }
 
         duration_labels = {
           method: env['REQUEST_METHOD'].downcase,
-          path:   strip_ids_from_path(env['PATH_INFO']),
+          path:   path,
         }
 
         @requests.increment(labels: counter_labels)
@@ -85,10 +87,16 @@ module Prometheus
         nil
       end
 
+      def generate_path(env)
+        full_path = [env['SCRIPT_NAME'], env['PATH_INFO']].join
+
+        strip_ids_from_path(full_path)
+      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')
+          .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

data/lib/prometheus/middleware/exporter.rb

@@ -21,11 +21,12 @@ module Prometheus
         @app = app
         @registry = options[:registry] || Client.registry
         @path = options[:path] || '/metrics'
+        @port = options[:port]
         @acceptable = build_dictionary(FORMATS, FALLBACK)
       end
 
       def call(env)
-        if env['PATH_INFO'] == @path
+        if metrics_port?(env['SERVER_PORT']) && env['PATH_INFO'] == @path
           format = negotiate(env, @acceptable)
           format ? respond_with(format) : not_acceptable(FORMATS)
         else
@@ -65,7 +66,7 @@ module Prometheus
       def respond_with(format)
         [
           200,
-          { 'Content-Type' => format::CONTENT_TYPE },
+          { 'content-type' => format::CONTENT_TYPE },
           [format.marshal(@registry)],
         ]
       end
@@ -75,7 +76,7 @@ module Prometheus
 
         [
           406,
-          { 'Content-Type' => 'text/plain' },
+          { 'content-type' => 'text/plain' },
           ["Supported media types: #{types.join(', ')}"],
         ]
       end
@@ -86,6 +87,10 @@ module Prometheus
           memo[format::MEDIA_TYPE] = format
         end
       end
+
+      def metrics_port?(request_port)
+        @port.nil? || @port.to_s == request_port
+      end
     end
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Ben Kochie
 - Chris Sinjakli
 - Daniel Magliola
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-04 00:00:00.000000000 Z
+date: 2023-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -40,15 +40,16 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - superq@gmail.com
-- chris@gocardless.com
+- chris@sinjakli.co.uk
 - dmagliola@crystalgears.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - README.md
 - lib/prometheus.rb
 - lib/prometheus/client.rb
@@ -71,9 +72,9 @@ files:
 - lib/prometheus/middleware/exporter.rb
 homepage: https://github.com/prometheus/client_ruby
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -88,9 +89,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: A suite of instrumentation metric primitivesthat can be exposed through a
   web services interface.