rails_performance 1.2.2 → 1.3.0

data/lib/rails_performance/rails/middleware.rb

@@ -1,76 +1,75 @@
-module RailsPerformance
-  module Rails
-    class MiddlewareTraceStorerAndCleanup
-      def initialize(app)
-        @app = app
-      end
-
-      def call(env)
-        dup.call!(env)
-      end
-
-      def call!(env)
-        if %r{#{RailsPerformance.mount_at}}.match?(env["PATH_INFO"])
-          RailsPerformance.skip = true
-        end
-
-        @status, @headers, @response = @app.call(env)
-
-        if !RailsPerformance.skip
-          RailsPerformance::Models::TraceRecord.new(
-            request_id: CurrentRequest.current.request_id,
-            value: CurrentRequest.current.tracings
-          ).save
-        end
-
-        CurrentRequest.cleanup
-
-        [@status, @headers, @response]
-      end
-    end
-
-    class Middleware
-      def initialize(app)
-        @app = app
-      end
-
-      def call(env)
-        dup.call!(env)
-      end
-
-      def call!(env)
-        @status, @headers, @response = @app.call(env)
-
-        #t = Time.current
-        if !RailsPerformance.skip
-          if !CurrentRequest.current.ignore.include?(:performance) # grape is executed first, and than ignore regular future storage of "controller"-like request
-            if data = CurrentRequest.current.data
-              record = RailsPerformance::Models::RequestRecord.new(**data.merge({request_id: CurrentRequest.current.request_id}))
-
-              # for 500 errors
-              record.status ||= @status
-
-              # capture referer from where this page was opened
-              record.http_referer = env["HTTP_REFERER"] if record.status == 404
-
-              # we can add custom data, for example Http User-Agent
-              # or even devise current_user
-              if RailsPerformance.custom_data_proc
-                # just to be sure it won't break format how we store in redis
-                record.custom_data = RailsPerformance.custom_data_proc.call(env)
-              end
-
-              # store for section "recent requests"
-              # store request information (regular rails request)
-              record.save
-            end
-          end
-        end
-        #puts "==> store performance data: #{(Time.current - t).round(3)}ms"
-
-        [@status, @headers, @response]
-      end
-
-    end
-  end
-end
+module RailsPerformance
+  module Rails
+    class MiddlewareTraceStorerAndCleanup
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        dup.call!(env)
+      end
+
+      def call!(env)
+        if %r{#{RailsPerformance.mount_at}}.match?(env["PATH_INFO"])
+          RailsPerformance.skip = true
+        end
+
+        @status, @headers, @response = @app.call(env)
+
+        if !RailsPerformance.skip
+          RailsPerformance::Models::TraceRecord.new(
+            request_id: CurrentRequest.current.request_id,
+            value: CurrentRequest.current.tracings
+          ).save
+        end
+
+        CurrentRequest.cleanup
+
+        [@status, @headers, @response]
+      end
+    end
+
+    class Middleware
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        dup.call!(env)
+      end
+
+      def call!(env)
+        @status, @headers, @response = @app.call(env)
+
+        # t = Time.current
+        if !RailsPerformance.skip
+          if !CurrentRequest.current.ignore.include?(:performance) # grape is executed first, and than ignore regular future storage of "controller"-like request
+            if (data = CurrentRequest.current.data)
+              record = RailsPerformance::Models::RequestRecord.new(**data.merge({request_id: CurrentRequest.current.request_id}))
+
+              # for 500 errors
+              record.status ||= @status
+
+              # capture referer from where this page was opened
+              record.http_referer = env["HTTP_REFERER"] if record.status == 404
+
+              # we can add custom data, for example Http User-Agent
+              # or even devise current_user
+              if RailsPerformance.custom_data_proc
+                # just to be sure it won't break format how we store in redis
+                record.custom_data = RailsPerformance.custom_data_proc.call(env)
+              end
+
+              # store for section "recent requests"
+              # store request information (regular rails request)
+              record.save
+            end
+          end
+        end
+        # puts "==> store performance data: #{(Time.current - t).round(3)}ms"
+
+        [@status, @headers, @response]
+      end
+    end
+  end
+end

data/lib/rails_performance/rails/query_builder.rb

@@ -1,20 +1,18 @@
-module RailsPerformance
-  module Rails
-    class QueryBuilder
-
-      def QueryBuilder.compose_from(params)
-        result = {}
-
-        result[:controller] = params[:controller_eq]
-        result[:action]     = params[:action_eq]
-        result[:format]     = params[:format_eq]
-        result[:status]     = params[:status_eq]
-
-        result.delete_if {|k, v| v.nil?}
-
-        { q: result }
-      end
-
-    end
-  end
-end
+module RailsPerformance
+  module Rails
+    class QueryBuilder
+      def self.compose_from(params)
+        result = {}
+
+        result[:controller] = params[:controller_eq]
+        result[:action] = params[:action_eq]
+        result[:format] = params[:format_eq]
+        result[:status] = params[:status_eq]
+
+        result.delete_if { |k, v| v.nil? }
+
+        {q: result}
+      end
+    end
+  end
+end

data/lib/rails_performance/reports/base_report.rb

@@ -1,60 +1,60 @@
-module RailsPerformance
-  module Reports
-    class BaseReport
-      attr_reader :db, :group, :sort, :title
-
-      def initialize(db, group: nil, sort: nil, title: nil)
-        @db     = db
-        @group  = group
-        @sort   = sort
-        @title  = title
-
-        set_defaults
-      end
-
-      def collect
-        db.group_by(group).inject([]) do |res, (k,v)|
-          res << yield(k, v)
-          res
-        end
-      end
-
-      def set_defaults; end
-
-      def self.time_in_app_time_zone(time)
-        app_time_zone = ::Rails.application.config.time_zone
-        if app_time_zone.present?
-          time.in_time_zone(app_time_zone)
-        else
-          time
-        end
-      end
-
-      def calculate_data
-        now        = Time.current
-        stop       = Time.at(60 * ((now.to_i)/ 60))
-        offset     = RailsPerformance::Reports::BaseReport::time_in_app_time_zone(now).utc_offset
-        current    = stop - RailsPerformance.duration
-
-        @data      = []
-        all        = {}
-
-        # read current values
-        db.group_by(group).each do |(k, v)|
-          yield(all, k, v)
-        end
-
-        # add blank columns
-        while current <= stop
-          key   = (current).strftime(RailsPerformance::FORMAT)
-          views = all[key].presence || 0
-          @data << [(current.to_i + offset) * 1000, views.round(2)]
-          current += 1.minute
-        end
-
-        # sort by time
-        @data.sort!
-      end
-    end
-  end
-end
+module RailsPerformance
+  module Reports
+    class BaseReport
+      attr_reader :db, :group, :sort, :title
+
+      def initialize(db, group: nil, sort: nil, title: nil)
+        @db = db
+        @group = group
+        @sort = sort
+        @title = title
+
+        set_defaults
+      end
+
+      def collect
+        db.group_by(group).each_with_object([]) do |(k, v), res|
+          res << yield(k, v)
+        end
+      end
+
+      def set_defaults
+      end
+
+      def self.time_in_app_time_zone(time)
+        app_time_zone = ::Rails.application.config.time_zone
+        if app_time_zone.present?
+          time.in_time_zone(app_time_zone)
+        else
+          time
+        end
+      end
+
+      def calculate_data
+        now = Time.current
+        stop = Time.at(60 * (now.to_i / 60))
+        offset = RailsPerformance::Reports::BaseReport.time_in_app_time_zone(now).utc_offset
+        current = stop - RailsPerformance.duration
+
+        @data = []
+        all = {}
+
+        # read current values
+        db.group_by(group).each do |(k, v)|
+          yield(all, k, v)
+        end
+
+        # add blank columns
+        while current <= stop
+          key = current.strftime(RailsPerformance::FORMAT)
+          views = all[key].presence || 0
+          @data << [(current.to_i + offset) * 1000, views.round(2)]
+          current += 1.minute
+        end
+
+        # sort by time
+        @data.sort!
+      end
+    end
+  end
+end

data/lib/rails_performance/reports/breakdown_report.rb

@@ -1,18 +1,15 @@
-module RailsPerformance
-  module Reports
-    class BreakdownReport < BaseReport
-
-      def set_defaults
-        @sort ||= :datetimei
-      end
-
-      def data
-        db.data
-          .collect{|e| e.record_hash}
-          .sort{|a, b| b[sort] <=> a[sort]}
-      end
-    end
-
-
-  end
-end
+module RailsPerformance
+  module Reports
+    class BreakdownReport < BaseReport
+      def set_defaults
+        @sort ||= :datetimei
+      end
+
+      def data
+        db.data
+          .collect { |e| e.record_hash }
+          .sort { |a, b| b[sort] <=> a[sort] }
+      end
+    end
+  end
+end

data/lib/rails_performance/reports/crash_report.rb

@@ -1,17 +1,15 @@
-module RailsPerformance
-  module Reports
-    class CrashReport < BaseReport
-      def set_defaults
-        @sort ||= :datetimei
-      end
-
-      def data
-        db.data
-          .collect{|e| e.record_hash}
-          .sort{|a, b| b[sort] <=> a[sort]}
-      end
-    end
-
-
-  end
-end
+module RailsPerformance
+  module Reports
+    class CrashReport < BaseReport
+      def set_defaults
+        @sort ||= :datetimei
+      end
+
+      def data
+        db.data
+          .collect { |e| e.record_hash }
+          .sort { |a, b| b[sort] <=> a[sort] }
+      end
+    end
+  end
+end

data/lib/rails_performance/reports/recent_requests_report.rb

@@ -1,24 +1,24 @@
-module RailsPerformance
-  module Reports
-    class RecentRequestsReport < BaseReport
-      def set_defaults
-        @sort ||= :datetimei
-      end
-
-      def data(from_timei = nil)
-        time_agoi = [RailsPerformance.recent_requests_time_window.ago.to_i, from_timei.to_i].reject(&:blank?).max
-        db.data
-          .collect{|e| e.record_hash}
-          .select{|e| e if e[sort] > time_agoi}
-          .sort{|a, b| b[sort] <=> a[sort]}
-          .first(limit)
-      end
-
-      private
-
-      def limit
-        RailsPerformance.recent_requests_limit ? RailsPerformance.recent_requests_limit.to_i : 100_000
-      end
-    end
-  end
-end
+module RailsPerformance
+  module Reports
+    class RecentRequestsReport < BaseReport
+      def set_defaults
+        @sort ||= :datetimei
+      end
+
+      def data(from_timei = nil)
+        time_agoi = [RailsPerformance.recent_requests_time_window.ago.to_i, from_timei.to_i].reject(&:blank?).max
+        db.data
+          .collect { |e| e.record_hash }
+          .select { |e| e if e[sort] > time_agoi }
+          .sort { |a, b| b[sort] <=> a[sort] }
+          .first(limit)
+      end
+
+      private
+
+      def limit
+        RailsPerformance.recent_requests_limit ? RailsPerformance.recent_requests_limit.to_i : 100_000
+      end
+    end
+  end
+end

data/lib/rails_performance/reports/requests_report.rb

@@ -1,27 +1,27 @@
-module RailsPerformance
-  module Reports
-    class RequestsReport < BaseReport
-      def set_defaults
-        @sort ||= :count
-      end
-
-      def data
-        collect do |k, v|
-          durations     = v.collect{|e| e["duration"]}.compact
-          view_runtimes = v.collect{|e| e["view_runtime"]}.compact
-          db_runtimes   = v.collect{|e| e["db_runtime"]}.compact
-          {
-            group:                k,
-            count:                v.size,
-            duration_average:     durations.sum.to_f / durations.size,
-            view_runtime_average: view_runtimes.sum.to_f / view_runtimes.size,
-            db_runtime_average:   db_runtimes.sum.to_f / db_runtimes.size,
-            duration_slowest:     durations.max,
-            view_runtime_slowest: view_runtimes.max,
-            db_runtime_slowest:   db_runtimes.max,
-          }
-        end.sort_by{|e| -e[sort].to_f} # to_f because could ne NaN or nil
-      end
-    end
-  end
-end
+module RailsPerformance
+  module Reports
+    class RequestsReport < BaseReport
+      def set_defaults
+        @sort ||= :count
+      end
+
+      def data
+        collect do |k, v|
+          durations = v.collect { |e| e["duration"] }.compact
+          view_runtimes = v.collect { |e| e["view_runtime"] }.compact
+          db_runtimes = v.collect { |e| e["db_runtime"] }.compact
+          {
+            group: k,
+            count: v.size,
+            duration_average: durations.sum.to_f / durations.size,
+            view_runtime_average: view_runtimes.sum.to_f / view_runtimes.size,
+            db_runtime_average: db_runtimes.sum.to_f / db_runtimes.size,
+            duration_slowest: durations.max,
+            view_runtime_slowest: view_runtimes.max,
+            db_runtime_slowest: db_runtimes.max
+          }
+        end.sort_by { |e| -e[sort].to_f } # to_f because could ne NaN or nil
+      end
+    end
+  end
+end

data/lib/rails_performance/reports/response_time_report.rb

@@ -1,17 +1,17 @@
-module RailsPerformance
-  module Reports
-    class ResponseTimeReport < BaseReport
-      def set_defaults
-        @group ||= :datetime
-      end
-
-      def data
-        calculate_data do |all, k, v|
-          durations = v.collect{|e| e["duration"]}.compact
-          next if durations.empty?
-          all[k] = durations.sum.to_f / durations.count
-        end
-      end
-    end
-  end
-end
+module RailsPerformance
+  module Reports
+    class ResponseTimeReport < BaseReport
+      def set_defaults
+        @group ||= :datetime
+      end
+
+      def data
+        calculate_data do |all, k, v|
+          durations = v.collect { |e| e["duration"] }.compact
+          next if durations.empty?
+          all[k] = durations.sum.to_f / durations.count
+        end
+      end
+    end
+  end
+end

data/lib/rails_performance/reports/slow_requests_report.rb

@@ -7,10 +7,10 @@ module RailsPerformance
 
       def data
         db.data
-          .collect{|e| e.record_hash}
-          .select{|e| e if e[sort] > RailsPerformance.slow_requests_time_window.ago.to_i}
-          .sort{|a, b| b[sort] <=> a[sort]}
-          .filter{|e| e[:duration] > RailsPerformance.slow_requests_threshold.to_i}
+          .collect { |e| e.record_hash }
+          .select { |e| e if e[sort] > RailsPerformance.slow_requests_time_window.ago.to_i }
+          .sort { |a, b| b[sort] <=> a[sort] }
+          .filter { |e| e[:duration] > RailsPerformance.slow_requests_threshold.to_i }
           .first(limit)
       end
 

data/lib/rails_performance/reports/throughput_report.rb

@@ -1,17 +1,15 @@
-module RailsPerformance
-  module Reports
-    class ThroughputReport < BaseReport
-
-      def set_defaults
-        @group ||= :datetime
-      end
-
-      def data
-        calculate_data do |all, k, v|
-          all[k] = v.count
-        end
-      end
-
-    end
-  end
-end
+module RailsPerformance
+  module Reports
+    class ThroughputReport < BaseReport
+      def set_defaults
+        @group ||= :datetime
+      end
+
+      def data
+        calculate_data do |all, k, v|
+          all[k] = v.count
+        end
+      end
+    end
+  end
+end

data/lib/rails_performance/reports/trace_report.rb

@@ -1,18 +1,16 @@
-module RailsPerformance
-  module Reports
-    class TraceReport
-      attr_reader :request_id
-
-      def initialize(request_id:)
-        @request_id = request_id
-      end
-
-      def data
-        key   = "trace|#{request_id}|END|#{RailsPerformance::SCHEMA}"
-        JSON.parse(RailsPerformance.redis.get(key).presence || '[]')
-      end
-    end
-
-
-  end
-end
+module RailsPerformance
+  module Reports
+    class TraceReport
+      attr_reader :request_id
+
+      def initialize(request_id:)
+        @request_id = request_id
+      end
+
+      def data
+        key = "trace|#{request_id}|END|#{RailsPerformance::SCHEMA}"
+        JSON.parse(RailsPerformance.redis.get(key).presence || "[]")
+      end
+    end
+  end
+end