upfluence-utils 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8c88069b0d18a4f8f01315a252a691a7410d3dfcfdf268f3c99508b8a31e504
-  data.tar.gz: 536742411a6e92e68787c5fdb64f5542f9fcdb6f0e138d9bfa6e3d3d5857e697
+  metadata.gz: cb4e2632e8587838d13ca2d29e049d3d59b796d559f7db7d32e75deb06d76b4c
+  data.tar.gz: c31a5166ee3bc02a871e463bca091e6c9310062c639ea1350e010e1edba8e073
 SHA512:
-  metadata.gz: d3defd0c55f04af0751f337e50ed62a32915b83d2f9b90ac9aed21513ca38ae37b89d8db49d3614f634596fdad2876316643967c21d5d54bcaf3e543a3068b09
-  data.tar.gz: b5ca86d6ca49687d46f5ea3b4b1e2de8b5907f4928335f10212d74ac6772b28d5a16f3891f7f7365828f6c5a49cdc8b72e7260d828e893284cb6641e81c25377
+  metadata.gz: 70ef607f2ecc4b24d0b954ba320fb0d61e357a4403c8b2b1253eaf28e3d2c1e677f46926e074f923fe9a1f3552f6c678ec59bee085b770c85c085975a27a48bf
+  data.tar.gz: f469721246b7a276e7ab028d2d45ef5a6b51840bdf5e2aa5f8a2baf5fe48d3b4fefcb1330d182234f7e93e70a9ee0b496c5970ef115354326c98242d1cc78ef8

data/lib/upfluence/http/middleware/prometheus.rb

@@ -44,9 +44,11 @@ module Upfluence
         end
 
         def record(env, code, duration)
+          path = parse_route(env, code)
+
           @request_total_count.increment(
             labels: {
-              path:   parse_route(env),
+              path:   path,
               method: env['REQUEST_METHOD'].downcase,
               status: code,
               env:    Upfluence.env.to_s
@@ -56,16 +58,16 @@ module Upfluence
           @request_histogram.observe(
             duration,
             labels: {
-              path:   parse_route(env),
+              path:   path,
               method: env['REQUEST_METHOD'].downcase,
               env:    Upfluence.env.to_s
             }
           )
         end
 
-        def parse_route(env)
+        def parse_route(env, code)
           parse_route_sinatra(env) || parse_route_rails(env) ||
-            parse_route_default(env)
+            parse_route_default(env, code)
         end
 
         def parse_route_rails(env)
@@ -90,7 +92,9 @@ module Upfluence
           end.reverse.join('/')
         end
 
-        def parse_route_default(env)
+        def parse_route_default(env, code)
+          return 'unexpected-route' if code.eql? 404
+
           Rack::Request.new(env).path.gsub(%r{/\d+(/|$)}, '/:id\\1')
         end
       end

data/lib/upfluence/utils/version.rb

@@ -1,5 +1,5 @@
 module Upfluence
   module Utils
-    VERSION = '0.10.0'.freeze
+    VERSION = '0.10.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upfluence-utils
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Upfluence
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-22 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler