traxor 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6a5f1c3f6e8e601f0e10067aff36a1c98043ed5a1e9f67d2a29c0c93a4a00c5
-  data.tar.gz: e8570fa252f2b6540bdc1da0e6af33a761815f11d30a945930bf89131501078a
+  metadata.gz: cedd3c6bbff0b1550fed56d2bbbc8aa6d3aa4381b26441ab9382e0cd79ad9d95
+  data.tar.gz: f3c9c247555018ba407bc8390a1d42d19153e1df8b4db259e180d8ece047d9d4
 SHA512:
-  metadata.gz: '09b00e3b1bb0f3c090a52c1b31c94ea94216dd590b1cf4a93f328a5213505f39236b18011b8df1ad4e85264059242ae9436f83fd9c8ae5022738341bb36b394c'
-  data.tar.gz: e03db5db0aa0c3b4e519fd365b007768af5208f6acca8ed0cafd6a537c488123039e44a208bb3f0f61f8a787a10903dd56fc914033e2f0631c66ad1eef7759e2
+  metadata.gz: 0cc091b94559ec5463d6b1c9ec7133518847305e536fa043ef9b26ec115f2decf36b04a2c77ac4d5e81c60d3bf703a0127abd4143e81eb8533a6dcf39d9f4f25
+  data.tar.gz: 9227bb0baf351efeef9b2364c2c38dd3d3153c5e8c185d2cdf9ceb4bd9415587386dcf63c149d067afac8add77ec6ccc14cf462f05da3e8f38f0092facde92d2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    traxor (0.1.3)
+    traxor (0.1.4)
       activesupport
 
 GEM

data/lib/traxor/rails/action_controller.rb

@@ -16,6 +16,9 @@ module Traxor
     Metric.count 'rails.action_controller.count', 1, tags
     Metric.count "rails.action_controller.count.#{controller_path}", 1, tags
 
+    Metric.measure 'rails.action_controller.total.duration', "#{duration.to_f.round(2)}ms", tags
+    Metric.measure "rails.action_controller.total.duration.#{controller_path}", "#{duration.to_f.round(2)}ms", tags
+
     Metric.measure 'rails.action_controller.ruby.duration', "#{ruby_runtime.to_f.round(2)}ms", tags
     Metric.measure "rails.action_controller.ruby.duration.#{controller_path}", "#{ruby_runtime.to_f.round(2)}ms", tags
 

data/lib/traxor/rails.rb

@@ -5,11 +5,6 @@ module Traxor
         config.logger = ::Rails.logger
       end
 
-      require 'traxor/rack/middleware/pre'
-      require 'traxor/rack/middleware/post'
-      app.config.middleware.insert 0, Traxor::Rack::Middleware::Pre
-      app.config.middleware.use Traxor::Rack::Middleware::Post
-
       ActiveSupport.on_load :action_controller do
         require 'traxor/rails/action_controller'
       end

data/lib/traxor/version.rb

@@ -1,3 +1,3 @@
 module Traxor
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.4'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traxor
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Ryan Hansen
@@ -217,8 +217,6 @@ files:
 - lib/traxor.rb
 - lib/traxor/faraday.rb
 - lib/traxor/metric.rb
-- lib/traxor/rack/middleware/post.rb
-- lib/traxor/rack/middleware/pre.rb
 - lib/traxor/rails.rb
 - lib/traxor/rails/action_controller.rb
 - lib/traxor/rails/action_mailer.rb

data/lib/traxor/rack/middleware/post.rb

@@ -1,19 +0,0 @@
-module Traxor
-  module Rack
-    module Middleware
-      class Post
-        def initialize(app)
-          @app = app
-        end
-
-        def call(env)
-          env['traxor.rack.middleware.pre_middleware_end'] = Time.now.to_f
-          status, headers, response = @app.call(env)
-          env['traxor.rack.middleware.post_middleware_start'] = Time.now.to_f
-
-          [status, headers, response]
-        end
-      end
-    end
-  end
-end

data/lib/traxor/rack/middleware/pre.rb

@@ -1,51 +0,0 @@
-module Traxor
-  module Rack
-    module Middleware
-      class Pre
-        def initialize(app)
-          @app = app
-        end
-
-        def call(env)
-          env['traxor.rack.middleware.pre_middleware_start'] = Time.now.to_f
-          status, headers, body = @app.call(env)
-          env['traxor.rack.middleware.post_middleware_end'] = Time.now.to_f
-
-          controller = env['action_controller.instance']
-          times = [
-            'traxor.rack.middleware.pre_middleware_start',
-            'traxor.rack.middleware.pre_middleware_end',
-            'traxor.rack.middleware.post_middleware_start',
-            'traxor.rack.middleware.post_middleware_end'
-          ]
-
-          tags = {}
-
-          if times.all? { |t| env[t].present? }
-            pre_time = (env['traxor.rack.middleware.pre_middleware_end'].to_f - env['traxor.rack.middleware.pre_middleware_start'].to_f)
-            post_time = (env['traxor.rack.middleware.post_middleware_end'].to_f - env['traxor.rack.middleware.post_middleware_start'].to_f)
-            middleware_time = (pre_time + post_time) * 1_000
-            total_time = (env['traxor.rack.middleware.post_middleware_end'].to_f - env['traxor.rack.middleware.pre_middleware_start'].to_f) * 1_000
-
-            if controller
-              method = env['REQUEST_METHOD'].to_s
-              tags = { controller: Traxor.normalize_name(controller.class), action: Traxor.normalize_name(controller.action_name), method: Traxor.normalize_name(method) }
-              controller_path = tags.values.join('.')
-
-              Metric.measure 'rack.request.middleware.duration', "#{middleware_time.round(2)}ms", tags
-              Metric.measure "rack.request.middleware.duration.#{controller_path}", "#{middleware_time.round(2)}ms", tags
-              Metric.measure "rack.request.duration.#{controller_path}", "#{total_time.round(2)}ms", tags
-              Metric.count "rack.request.count.#{controller_path}", 1, tags
-            end
-
-            Metric.measure 'rack.request.duration', "#{total_time.round(2)}ms", tags
-          end
-
-          Metric.count 'rack.request.count', 1, tags
-
-          [status, headers, body]
-        end
-      end
-    end
-  end
-end