prometheus-client 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7017e1e3c284f9558d758e91d4855ad97b5df63fdef115cee035aa0948aed30
-  data.tar.gz: 52a7abaadf1addf7bf9303d73a31a14338429882b488eb80c2144a6817cfdb7d
+  metadata.gz: d86fc24651a441455a293ead401451df5f6954499943f9c752117fe5f879b5cd
+  data.tar.gz: 5aaa58ced22e1050e7a4687a44b251710d5f12281f1572a2375d71f733c4ffc0
 SHA512:
-  metadata.gz: 1e3b2ff9368dacbdc175ea8cb709e1ad7be73b0d8e644468f65bf36f44b517798a28d7f5dab73b538519fc1a918f977e083e101986a761fdf2fe42ab719fcc1d
-  data.tar.gz: 7fb5a1887a88f7687f2af5ef4839e26030da25cc0c51a03445bbb43706caf8d2231c65108cf3265cc024bc286d5dc8a38ec5d29145b39b2f0cbd0277f29f1972
+  metadata.gz: 81ddb196287e2d977e6210c6b56a58459cbf4eab56e6e38ac55929a4a59d9749c64f043153b64ae120c591ed35a364b088df3f156b9825b79c69df8bfecbb240
+  data.tar.gz: dfe9c36fc511b3adde97198d6e53705d62d7502af016e6636cd9191cb94434126ee4a0d80e73eccddf8ad3c2d0fe116319c1f769b8fdedfcd0213a3d1176abce

data/lib/prometheus/client/version.rb

@@ -2,6 +2,6 @@
 
 module Prometheus
   module Client
-    VERSION = '3.0.0'
+    VERSION = '4.0.0'
   end
 end

data/lib/prometheus/middleware/collector.rb

@@ -72,12 +72,12 @@ module Prometheus
         counter_labels = {
           code:   code,
           method: env['REQUEST_METHOD'].downcase,
-          path:   strip_ids_from_path(path),
+          path:   path,
         }
 
         duration_labels = {
           method: env['REQUEST_METHOD'].downcase,
-          path:   strip_ids_from_path(path),
+          path:   path,
         }
 
         @requests.increment(labels: counter_labels)
@@ -87,52 +87,10 @@ module Prometheus
         nil
       end
 
-      # While `PATH_INFO` is framework agnostic, and works for any Rack app, some Ruby web
-      # frameworks pass a more useful piece of information into the request env - the
-      # route that the request matched.
-      #
-      # This means that rather than using our generic `:id` and `:uuid` replacements in
-      # the `path` label for any path segments that look like dynamic IDs, we can put the
-      # actual route that matched in there, with correctly named parameters. For example,
-      # if a Sinatra app defined a route like:
-      #
-      # get "/foo/:bar" do
-      #   ...
-      # end
-      #
-      # instead of containing `/foo/:id`, the `path` label would contain `/foo/:bar`.
-      #
-      # Sadly, Rails is a notable exception, and (as far as I can tell at the time of
-      # writing) doesn't provide this info in the request env.
       def generate_path(env)
-        if env['sinatra.route']
-          route = env['sinatra.route'].partition(' ').last
-        elsif env['grape.routing_args']
-          # We are deep in the weeds of an object that Grape passes into the request env,
-          # but don't document any explicit guarantees about. Let's have a fallback in
-          # case they change it down the line.
-          #
-          # This code would be neater with the safe navigation operator (`&.`) here rather
-          # than the much more verbose `respond_to?` calls, but unlike Rails' `try`
-          # method, it still raises an error if the object is non-nil, but doesn't respond
-          # to the method being called on it.
-          route = nil
-
-          route_info = env.dig('grape.routing_args', :route_info)
-          if route_info.respond_to?(:pattern)
-            pattern = route_info.pattern
-            if pattern.respond_to?(:origin)
-              route = pattern.origin
-            end
-          end
-
-          # Fall back to PATH_INFO if Grape change the structure of `grape.routing_args`
-          route ||= env['PATH_INFO']
-        else
-          route = env['PATH_INFO']
-        end
-
-        [env['SCRIPT_NAME'], route].join
+        full_path = [env['SCRIPT_NAME'], env['PATH_INFO']].join
+
+        strip_ids_from_path(full_path)
       end
 
       def strip_ids_from_path(path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Ben Kochie
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-05 00:00:00.000000000 Z
+date: 2022-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -71,7 +71,7 @@ files:
 - lib/prometheus/middleware/exporter.rb
 homepage: https://github.com/prometheus/client_ruby
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.4
 signing_key:
 specification_version: 4
 summary: A suite of instrumentation metric primitivesthat can be exposed through a