upfluence-utils 0.10.0 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8c88069b0d18a4f8f01315a252a691a7410d3dfcfdf268f3c99508b8a31e504
-  data.tar.gz: 536742411a6e92e68787c5fdb64f5542f9fcdb6f0e138d9bfa6e3d3d5857e697
+  metadata.gz: 5e5e3018756c335b480c5ccfcd42964c183789228edb4be10f5348c4c9b4a678
+  data.tar.gz: 46f34226defdc5e3de22ac837ec7f41c2c3938cd58d77ff1dbb747b23baa5ea6
 SHA512:
-  metadata.gz: d3defd0c55f04af0751f337e50ed62a32915b83d2f9b90ac9aed21513ca38ae37b89d8db49d3614f634596fdad2876316643967c21d5d54bcaf3e543a3068b09
-  data.tar.gz: b5ca86d6ca49687d46f5ea3b4b1e2de8b5907f4928335f10212d74ac6772b28d5a16f3891f7f7365828f6c5a49cdc8b72e7260d828e893284cb6641e81c25377
+  metadata.gz: '0032398f8a0bf1f604e29d0c5ba8ddbcc8214e898ff752c8a3a6201336a9657d48c7623ecf1b8a15b774876f9f1ae3f602640f70ff33e7ec96ec245fd62439dc'
+  data.tar.gz: eb3d4d5f34bb3949adfcccee69a0e09616714ed882a2750f1ff348958a15bcb4537bf612fd2fd828a8a899c1cb5632dd2dcdbb29424b0b4ef002233df738c7a1

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/thrift/middleware/error_catcher.rb

@@ -3,6 +3,12 @@ module Upfluence
     module Thrift
       module Middleware
         class ErrorCatcher
+          STANDARD_THRIFT_EXCEPTIONS = [
+            ::Thrift::ApplicationException,
+            ::Thrift::TransportException,
+            ::Thrift::ProtocolException
+          ].freeze
+
           def initialize(app, error_logger)
             @app = app
             @error_logger = error_logger
@@ -11,6 +17,10 @@ module Upfluence
           def method_missing(method, *args, &block)
             @app.send(method, *args, &block)
           rescue ::Thrift::Exception => e
+            if STANDARD_THRIFT_EXCEPTIONS.include? e.class
+              @error_logger.notify(e, method, *args)
+            end
+
             raise e
           rescue => e
             @error_logger.notify(e, method, *args)

data/lib/upfluence/utils/thrift.rb

@@ -1 +1,2 @@
+require 'thrift'
 require 'upfluence/utils/thrift/middleware'

data/lib/upfluence/utils/version.rb

@@ -1,5 +1,5 @@
 module Upfluence
   module Utils
-    VERSION = '0.10.0'.freeze
+    VERSION = '0.10.4'.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.4
 platform: ruby
 authors:
 - Upfluence
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-22 00:00:00.000000000 Z
+date: 2021-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler