rails_performance 1.2.3 → 1.3.1

data/lib/rails_performance/gems/grape_ext.rb

@@ -1,35 +1,33 @@
-module RailsPerformance
-  module Gems
-    class GrapeExt
-
-      def self.init
-        ActiveSupport::Notifications.subscribe(/grape/) do |name, start, finish, id, payload|
-          # TODO change to set
-          CurrentRequest.current.ignore.add(:performance)
-
-          now                                         = Time.current
-          CurrentRequest.current.data               ||= {}
-          CurrentRequest.current.record             ||= RailsPerformance::Models::GrapeRecord.new(request_id: CurrentRequest.current.request_id)
-          CurrentRequest.current.record.datetimei   ||= now.to_i
-          CurrentRequest.current.record.datetime    ||= now.strftime(RailsPerformance::FORMAT)
-
-          if ['endpoint_render.grape', 'endpoint_run.grape', 'format_response.grape'].include?(name)
-            CurrentRequest.current.record.send(name.gsub(".", "_") + "=", (finish - start) * 1000)
-          end
-
-          if payload[:env]
-            CurrentRequest.current.record.status      = payload[:env]['api.endpoint'].status
-            CurrentRequest.current.record.format      = payload[:env]["api.format"]
-            CurrentRequest.current.record.method      = payload[:env]['REQUEST_METHOD']
-            CurrentRequest.current.record.path        = payload[:env]["PATH_INFO"]
-          end
-
-          if name == 'format_response.grape'
-            CurrentRequest.current.record.save
-          end
-        end
-      end
-
-    end
-  end
-end
+module RailsPerformance
+  module Gems
+    class GrapeExt
+      def self.init
+        ActiveSupport::Notifications.subscribe(/grape/) do |name, start, finish, id, payload|
+          # TODO change to set
+          CurrentRequest.current.ignore.add(:performance)
+
+          now = Time.current
+          CurrentRequest.current.data ||= {}
+          CurrentRequest.current.record ||= RailsPerformance::Models::GrapeRecord.new(request_id: CurrentRequest.current.request_id)
+          CurrentRequest.current.record.datetimei ||= now.to_i
+          CurrentRequest.current.record.datetime ||= now.strftime(RailsPerformance::FORMAT)
+
+          if ["endpoint_render.grape", "endpoint_run.grape", "format_response.grape"].include?(name)
+            CurrentRequest.current.record.send(name.tr(".", "_") + "=", (finish - start) * 1000)
+          end
+
+          if payload[:env]
+            CurrentRequest.current.record.status = payload[:env]["api.endpoint"].status
+            CurrentRequest.current.record.format = payload[:env]["api.format"]
+            CurrentRequest.current.record.method = payload[:env]["REQUEST_METHOD"]
+            CurrentRequest.current.record.path = payload[:env]["PATH_INFO"]
+          end
+
+          if name == "format_response.grape"
+            CurrentRequest.current.record.save
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rails_performance/gems/rake_ext.rb

@@ -1,44 +1,41 @@
-module RailsPerformance
-  module Gems
-
-    class RakeExt
-      def self.init
-        ::Rake::Task.class_eval do
-          def invoke_with_rails_performance(*args)
-            begin
-              now    = Time.current
-              status = 'success'
-              invoke_without_new_rails_performance(*args)
-            rescue Exception => ex
-              status = 'error'
-              raise(ex)
-            ensure
-              if !RailsPerformance.skipable_rake_tasks.include?(self.name)
-                task_info = RailsPerformance::Gems::RakeExt.find_task_name(*args)
-                task_info = [self.name] if task_info.empty?
-                RailsPerformance::Models::RakeRecord.new(
-                  task: task_info,
-                  datetime: now.strftime(RailsPerformance::FORMAT),
-                  datetimei: now.to_i,
-                  duration: (Time.current - now) * 1000,
-                  status: status,
-                ).save
-              end
-            end
-          end
-
-          alias_method :invoke_without_new_rails_performance, :invoke
-          alias_method :invoke, :invoke_with_rails_performance
-
-          def invoke(*args)
-            invoke_with_rails_performance(*args)
-          end
-        end
-      end
-
-      def self.find_task_name(*args)
-        (ARGV + args).compact
-      end
-    end
-  end
-end
+module RailsPerformance
+  module Gems
+    class RakeExt
+      def self.init
+        ::Rake::Task.class_eval do
+          def invoke_with_rails_performance(*args)
+            now = Time.current
+            status = "success"
+            invoke_without_new_rails_performance(*args)
+          rescue Exception => ex # rubocop:disable Lint/RescueException
+            status = "error"
+            raise(ex)
+          ensure
+            if !RailsPerformance.skipable_rake_tasks.include?(name)
+              task_info = RailsPerformance::Gems::RakeExt.find_task_name(*args)
+              task_info = [name] if task_info.empty?
+              RailsPerformance::Models::RakeRecord.new(
+                task: task_info,
+                datetime: now.strftime(RailsPerformance::FORMAT),
+                datetimei: now.to_i,
+                duration: (Time.current - now) * 1000,
+                status: status
+              ).save
+            end
+          end
+
+          alias_method :invoke_without_new_rails_performance, :invoke
+          alias_method :invoke, :invoke_with_rails_performance
+
+          def invoke(*args) # rubocop:disable Lint/DuplicateMethods
+            invoke_with_rails_performance(*args)
+          end
+        end
+      end
+
+      def self.find_task_name(*args)
+        (ARGV + args).compact
+      end
+    end
+  end
+end

data/lib/rails_performance/gems/sidekiq_ext.rb

@@ -1,37 +1,34 @@
-module RailsPerformance
-  module Gems
-    class SidekiqExt
-
-      def initialize(options=nil)
-      end
-
-      def call(worker, msg, queue)
-        now    = Time.current
-        record = RailsPerformance::Models::SidekiqRecord.new(
-          enqueued_ati: msg['enqueued_at'].to_i,
-          datetimei: msg['created_at'].to_i,
-          jid: msg['jid'],
-          queue: queue,
-          start_timei: now.to_i,
-          datetime: now.strftime(RailsPerformance::FORMAT),
-          worker: msg['wrapped'.freeze] || worker.class.to_s
-        )
-        begin
-          result = yield
-          record.status = "success"
-          result
-        rescue Exception => ex
-          record.status   = "exception"
-          record.message  = ex.message
-          raise ex
-        ensure
-          # store in ms instead of seconds
-          record.duration = (Time.current - now) * 1000
-          record.save
-          result
-        end
-      end
-
-    end
-  end
-end
+module RailsPerformance
+  module Gems
+    class SidekiqExt
+      def initialize(options = nil)
+      end
+
+      def call(worker, msg, queue)
+        now = Time.current
+        record = RailsPerformance::Models::SidekiqRecord.new(
+          enqueued_ati: msg["enqueued_at"].to_i,
+          datetimei: msg["created_at"].to_i,
+          jid: msg["jid"],
+          queue: queue,
+          start_timei: now.to_i,
+          datetime: now.strftime(RailsPerformance::FORMAT),
+          worker: msg["wrapped".freeze] || worker.class.to_s
+        )
+        begin
+          result = yield
+          record.status = "success"
+          result
+        rescue Exception => ex # rubocop:disable Lint/RescueException
+          record.status = "exception"
+          record.message = ex.message
+          raise ex
+        ensure
+          # store in ms instead of seconds
+          record.duration = (Time.current - now) * 1000
+          record.save
+        end
+      end
+    end
+  end
+end

data/lib/rails_performance/instrument/metrics_collector.rb

@@ -1,50 +1,50 @@
-module RailsPerformance
-  module Instrument
-    class MetricsCollector
-      # payload
-      # {
-      #   controller: "PostsController",
-      #   action: "index",
-      #   params: {"action" => "index", "controller" => "posts"},
-      #   headers: #<ActionDispatch::Http::Headers:0x0055a67a519b88>,
-      #   format: :html,
-      #   method: "GET",
-      #   path: "/posts",
-      #   status: 200,
-      #   view_runtime: 46.848,
-      #   db_runtime: 0.157
-      # }
-
-      def call(event_name, started, finished, event_id, payload)
-        return if RailsPerformance.skip
-        return if CurrentRequest.current.data
-
-        # TODO do we need this new?
-        event = ActiveSupport::Notifications::Event.new(event_name, started, finished, event_id, payload)
-
-        return if RailsPerformance.ignored_endpoints.include? "#{event.payload[:controller]}##{event.payload[:action]}"
-        return if RailsPerformance.ignored_paths.any? { |p| event.payload[:path].start_with?(p) }
-
-        record = {
-          controller: event.payload[:controller],
-          action: event.payload[:action],
-          format: event.payload[:format],
-          status: event.payload[:status],
-          datetime: finished.strftime(RailsPerformance::FORMAT),
-          datetimei: finished.to_i,
-          method: event.payload[:method],
-          path: event.payload[:path],
-          view_runtime: event.payload[:view_runtime],
-          db_runtime: event.payload[:db_runtime],
-          duration: event.duration,
-          exception: event.payload[:exception],
-          exception_object: event.payload[:exception_object]
-        }
-
-        # pass the record to Thread.current
-        # and saves later in middleware
-        CurrentRequest.current.data = record
-      end
-    end
-  end
-end
+module RailsPerformance
+  module Instrument
+    class MetricsCollector
+      # payload
+      # {
+      #   controller: "PostsController",
+      #   action: "index",
+      #   params: {"action" => "index", "controller" => "posts"},
+      #   headers: #<ActionDispatch::Http::Headers:0x0055a67a519b88>,
+      #   format: :html,
+      #   method: "GET",
+      #   path: "/posts",
+      #   status: 200,
+      #   view_runtime: 46.848,
+      #   db_runtime: 0.157
+      # }
+
+      def call(event_name, started, finished, event_id, payload)
+        return if RailsPerformance.skip
+        return if CurrentRequest.current.data
+
+        # TODO do we need this new?
+        event = ActiveSupport::Notifications::Event.new(event_name, started, finished, event_id, payload)
+
+        return if RailsPerformance.ignored_endpoints.include? "#{event.payload[:controller]}##{event.payload[:action]}"
+        return if RailsPerformance.ignored_paths.any? { |p| event.payload[:path].start_with?(p) }
+
+        record = {
+          controller: event.payload[:controller],
+          action: event.payload[:action],
+          format: event.payload[:format],
+          status: event.payload[:status],
+          datetime: finished.strftime(RailsPerformance::FORMAT),
+          datetimei: finished.to_i,
+          method: event.payload[:method],
+          path: event.payload[:path],
+          view_runtime: event.payload[:view_runtime],
+          db_runtime: event.payload[:db_runtime],
+          duration: event.duration,
+          exception: event.payload[:exception],
+          exception_object: event.payload[:exception_object]
+        }
+
+        # pass the record to Thread.current
+        # and saves later in middleware
+        CurrentRequest.current.data = record
+      end
+    end
+  end
+end

data/lib/rails_performance/models/base_record.rb

@@ -1,36 +1,33 @@
-module RailsPerformance
-  module Models
-    class BaseRecord
-      def self.from_db(key, value)
-        raise 'implement me'
-      end
-
-      def save
-        raise 'implement me'
-      end
-
-      def record_hash
-        raise 'implement me'
-      end
-
-      def value
-        @value ||= JSON.parse(@json || "{}")
-      end
-
-      def duration
-        value['duration']
-      end
-
-      private
-
-      def ms(e)
-        if e
-          e.to_f.round(1).to_s + " ms"
-        else
-          nil
-        end
-      end
-
-    end
-  end
-end
+module RailsPerformance
+  module Models
+    class BaseRecord
+      def self.from_db(key, value)
+        raise "implement me"
+      end
+
+      def save
+        raise "implement me"
+      end
+
+      def record_hash
+        raise "implement me"
+      end
+
+      def value
+        @value ||= JSON.parse(@json || "{}")
+      end
+
+      def duration
+        value["duration"]
+      end
+
+      private
+
+      def ms(e)
+        if e
+          e.to_f.round(1).to_s + " ms"
+        end
+      end
+    end
+  end
+end

data/lib/rails_performance/models/collection.rb

@@ -1,36 +1,35 @@
-module RailsPerformance
-  module Models
-    class Collection
-      attr_reader :data
-
-      def initialize
-        @data = []
-      end
-
-      def add(record)
-        @data << record
-      end
-
-      def group_by(type)
-        case type
-        when :controller_action, :controller_action_format, :datetime, :path
-          fetch_values @data.group_by(&type)
-        else
-          {}
-        end
-      end
-
-      def fetch_values(groupped_collection)
-        result = {}
-        groupped_collection.each do |key, records|
-          result[key] ||= []
-          records.each do |record|
-            result[key] << record.value
-          end
-        end
-        result
-      end
-
-    end
-  end
-end
+module RailsPerformance
+  module Models
+    class Collection
+      attr_reader :data
+
+      def initialize
+        @data = []
+      end
+
+      def add(record)
+        @data << record
+      end
+
+      def group_by(type)
+        case type
+        when :controller_action, :controller_action_format, :datetime, :path
+          fetch_values @data.group_by(&type)
+        else
+          {}
+        end
+      end
+
+      def fetch_values(groupped_collection)
+        result = {}
+        groupped_collection.each do |key, records|
+          result[key] ||= []
+          records.each do |record|
+            result[key] << record.value
+          end
+        end
+        result
+      end
+    end
+  end
+end

data/lib/rails_performance/models/custom_record.rb

@@ -1,48 +1,47 @@
-module RailsPerformance
-  module Models
-    class CustomRecord < BaseRecord
-      attr_accessor :tag_name, :namespace_name, :duration, :datetime, :datetimei, :status, :json
-
-      def CustomRecord.from_db(key, value)
-        items = key.split("|")
-
-        CustomRecord.new(
-          tag_name: items[2],
-          namespace_name: items[4],
-          datetime: items[6],
-          datetimei: items[8],
-          status: items[10],
-          json: value
-        )
-      end
-
-      def initialize(tag_name:, namespace_name: nil, duration: nil, datetime:, datetimei:, status:, json: '{}')
-        @tag_name       = tag_name
-        @namespace_name = namespace_name
-        @duration       = duration
-        @datetime       = datetime
-        @datetimei      = datetimei.to_i
-        @status         = status
-        @json           = json
-      end
-
-      def record_hash
-        {
-          tag_name: self.tag_name,
-          namespace_name: self.namespace_name,
-          status: self.status,
-          datetimei: datetimei,
-          datetime: Time.at(self.datetimei.to_i),
-          duration: self.value['duration'],
-        }
-      end
-
-      def save
-        key   = "custom|tag_name|#{tag_name}|namespace_name|#{namespace_name}|datetime|#{datetime}|datetimei|#{datetimei}|status|#{status}|END|#{RailsPerformance::SCHEMA}"
-        value = { duration: duration }
-        Utils.save_to_redis(key, value)
-      end
-
-    end
-  end
-end
+module RailsPerformance
+  module Models
+    class CustomRecord < BaseRecord
+      attr_accessor :tag_name, :namespace_name, :duration, :datetime, :datetimei, :status, :json
+
+      def self.from_db(key, value)
+        items = key.split("|")
+
+        CustomRecord.new(
+          tag_name: items[2],
+          namespace_name: items[4],
+          datetime: items[6],
+          datetimei: items[8],
+          status: items[10],
+          json: value
+        )
+      end
+
+      def initialize(tag_name:, datetime:, datetimei:, status:, namespace_name: nil, duration: nil, json: "{}")
+        @tag_name = tag_name
+        @namespace_name = namespace_name
+        @duration = duration
+        @datetime = datetime
+        @datetimei = datetimei.to_i
+        @status = status
+        @json = json
+      end
+
+      def record_hash
+        {
+          tag_name: tag_name,
+          namespace_name: namespace_name,
+          status: status,
+          datetimei: datetimei,
+          datetime: Time.at(datetimei.to_i),
+          duration: value["duration"]
+        }
+      end
+
+      def save
+        key = "custom|tag_name|#{tag_name}|namespace_name|#{namespace_name}|datetime|#{datetime}|datetimei|#{datetimei}|status|#{status}|END|#{RailsPerformance::SCHEMA}"
+        value = {duration: duration}
+        Utils.save_to_redis(key, value)
+      end
+    end
+  end
+end