rails_performance 1.0.0.beta2 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 136a862da6c0d5b7d7d458e6c5389314cfe776d0437272d319d89a95eeaa8a11
-  data.tar.gz: 913394396bb6d45c8a9d12d8b2f115bc135cf9fe61eee19c79a3a88165c50551
+  metadata.gz: 372161a3472691a4bf4c51d4625fbdc743d3c307af1e98779af2838f8523418a
+  data.tar.gz: 7d3e7f3adc3b3fd55f80173796271f85c238f4a8a2c6fe69fa89791295b45b1b
 SHA512:
-  metadata.gz: 4e07938ad437c12dfc911ca66d06717eded983694436b9936bc038876c685bcd9bc432c42ddc35279eb96e5511220781d790f3322f1f1acd6cfce4cce1fc27c2
-  data.tar.gz: 6fd601401eba7c250a31481df0f4bf1bf92c5d856ea9f5c454f3eefd45fbccc669fb1f088538a2a56a0a0decf5627eb87b2e1e93557b0515fd34ee0b575608df
+  metadata.gz: b3212e91b066f04165c9dc8dd77c15c77ba38709ceda23056c11e4fc7a2b1bc4238f64a6bc819c84d83f487ff73d70a8b876ce0c2af252b1e8777a40df4bb48f
+  data.tar.gz: a5146bfc66664841d89e8e0e51c7d3f3a47207e00f821504cd97a635d503cd263d7f2b33d34ebdf5827a764f10d0ad74c7140481aff91f1ec01297704ce304ce

data/README.md

@@ -119,7 +119,13 @@ Rails.application.routes.draw do
 end
 ```
 
+### Custom events
 
+```ruby
+RailsPerformance.measure("some label", "some namespace") do
+   # your code
+end
+```
 
 ## How it works
 

data/app/controllers/rails_performance/rails_performance_controller.rb

@@ -6,20 +6,20 @@ module RailsPerformance
 
     if RailsPerformance.enabled
       def index
-        @datasource                = RP::DataSource.new(**prepare_query, type: :requests)
+        @datasource                = RailsPerformance::DataSource.new(**prepare_query, type: :requests)
         db                         = @datasource.db
 
-        @throughput_report_data    = RP::Reports::ThroughputReport.new(db).data
-        @response_time_report_data = RP::Reports::ResponseTimeReport.new(db).data
+        @throughput_report_data    = RailsPerformance::Reports::ThroughputReport.new(db).data
+        @response_time_report_data = RailsPerformance::Reports::ResponseTimeReport.new(db).data
       end
 
       def summary
-        @datasource                = RP::DataSource.new(**prepare_query, type: :requests)
+        @datasource                = RailsPerformance::DataSource.new(**prepare_query, type: :requests)
         db                         = @datasource.db
 
-        @throughput_report_data    = RP::Reports::ThroughputReport.new(db).data
-        @response_time_report_data = RP::Reports::ResponseTimeReport.new(db).data
-        @data                      = RP::Reports::BreakdownReport.new(db, title: "Requests").data
+        @throughput_report_data    = RailsPerformance::Reports::ThroughputReport.new(db).data
+        @response_time_report_data = RailsPerformance::Reports::ResponseTimeReport.new(db).data
+        @data                      = RailsPerformance::Reports::BreakdownReport.new(db, title: "Requests").data
 
         respond_to do |format|
           format.js {}
@@ -28,8 +28,8 @@ module RailsPerformance
       end
 
       def trace
-        @record = RP::Models::RequestRecord.find_by(request_id: params[:id])
-        @data   = RP::Reports::TraceReport.new(request_id: params[:id]).data
+        @record = RailsPerformance::Models::RequestRecord.find_by(request_id: params[:id])
+        @data   = RailsPerformance::Reports::TraceReport.new(request_id: params[:id]).data
         respond_to do |format|
           format.js {}
           format.any { render plain: "Doesn't open in new window. Wait until full page load." }
@@ -37,65 +37,65 @@ module RailsPerformance
       end
 
       def crashes
-        @datasource   = RP::DataSource.new(**prepare_query({status_eq: 500}), type: :requests)
+        @datasource   = RailsPerformance::DataSource.new(**prepare_query({status_eq: 500}), type: :requests)
         db            = @datasource.db
-        @data         = RP::Reports::CrashReport.new(db).data
+        @data         = RailsPerformance::Reports::CrashReport.new(db).data
       end
 
       def requests
-        @datasource = RP::DataSource.new(**prepare_query, type: :requests)
+        @datasource = RailsPerformance::DataSource.new(**prepare_query, type: :requests)
         db          = @datasource.db
-        @data       = RP::Reports::RequestsReport.new(db, group: :controller_action_format, sort: :count).data
+        @data       = RailsPerformance::Reports::RequestsReport.new(db, group: :controller_action_format, sort: :count).data
       end
 
       def recent
-        @datasource = RP::DataSource.new(**prepare_query, type: :requests)
+        @datasource = RailsPerformance::DataSource.new(**prepare_query, type: :requests)
         db          = @datasource.db
-        @data       = RP::Reports::RecentRequestsReport.new(db).data
+        @data       = RailsPerformance::Reports::RecentRequestsReport.new(db).data
       end
 
       def sidekiq
-        @datasource                = RP::DataSource.new(**prepare_query, type: :sidekiq)
+        @datasource                = RailsPerformance::DataSource.new(**prepare_query, type: :sidekiq)
         db                         = @datasource.db
-        @throughput_report_data    = RP::Reports::ThroughputReport.new(db).data
-        @response_time_report_data = RP::Reports::ResponseTimeReport.new(db).data
-        @recent_report_data        = RP::Reports::RecentRequestsReport.new(db).data
+        @throughput_report_data    = RailsPerformance::Reports::ThroughputReport.new(db).data
+        @response_time_report_data = RailsPerformance::Reports::ResponseTimeReport.new(db).data
+        @recent_report_data        = RailsPerformance::Reports::RecentRequestsReport.new(db).data
       end
 
       def delayed_job
-        @datasource                = RP::DataSource.new(**prepare_query, type: :delayed_job)
+        @datasource                = RailsPerformance::DataSource.new(**prepare_query, type: :delayed_job)
         db                         = @datasource.db
-        @throughput_report_data    = RP::Reports::ThroughputReport.new(db).data
-        @response_time_report_data = RP::Reports::ResponseTimeReport.new(db).data
-        @recent_report_data        = RP::Reports::RecentRequestsReport.new(db).data
+        @throughput_report_data    = RailsPerformance::Reports::ThroughputReport.new(db).data
+        @response_time_report_data = RailsPerformance::Reports::ResponseTimeReport.new(db).data
+        @recent_report_data        = RailsPerformance::Reports::RecentRequestsReport.new(db).data
       end
 
       def custom
-        @datasource                = RP::DataSource.new(**prepare_query, type: :custom)
+        @datasource                = RailsPerformance::DataSource.new(**prepare_query, type: :custom)
         db                         = @datasource.db
-        @throughput_report_data    = RP::Reports::ThroughputReport.new(db).data
-        @response_time_report_data = RP::Reports::ResponseTimeReport.new(db).data
-        @recent_report_data        = RP::Reports::RecentRequestsReport.new(db).data
+        @throughput_report_data    = RailsPerformance::Reports::ThroughputReport.new(db).data
+        @response_time_report_data = RailsPerformance::Reports::ResponseTimeReport.new(db).data
+        @recent_report_data        = RailsPerformance::Reports::RecentRequestsReport.new(db).data
       end
 
       def grape
-        @datasource                = RP::DataSource.new(**prepare_query, type: :grape)
+        @datasource                = RailsPerformance::DataSource.new(**prepare_query, type: :grape)
         db                         = @datasource.db
-        @throughput_report_data    = RP::Reports::ThroughputReport.new(db).data
-        @recent_report_data        = RP::Reports::RecentRequestsReport.new(db).data
+        @throughput_report_data    = RailsPerformance::Reports::ThroughputReport.new(db).data
+        @recent_report_data        = RailsPerformance::Reports::RecentRequestsReport.new(db).data
       end
 
       def rake
-        @datasource                = RP::DataSource.new(**prepare_query, type: :rake)
+        @datasource                = RailsPerformance::DataSource.new(**prepare_query, type: :rake)
         db                         = @datasource.db
-        @throughput_report_data    = RP::Reports::ThroughputReport.new(db).data
-        @recent_report_data        = RP::Reports::RecentRequestsReport.new(db).data
+        @throughput_report_data    = RailsPerformance::Reports::ThroughputReport.new(db).data
+        @recent_report_data        = RailsPerformance::Reports::RecentRequestsReport.new(db).data
       end
 
       private
 
       def prepare_query(query = params)
-        RP::Rails::QueryBuilder.compose_from(query)
+        RailsPerformance::Rails::QueryBuilder.compose_from(query)
       end
     end
 

data/app/views/rails_performance/layouts/rails_performance.html.erb

@@ -19,7 +19,7 @@
         <%= yield %>
         <div class="footer-box">
           © Rails Performance <span class='red'><i class="fas fa-heart"></i></span> <%= link_to 'https://github.com/igorkasyanchuk/rails_performance', 'https://github.com/igorkasyanchuk/rails_performance', target: '_blank' %>
-          <div class="is-pulled-right">v.<%= RP::VERSION %></div>
+          <div class="is-pulled-right">v.<%= RailsPerformance::VERSION %></div>
         </div>
       </div>
     </section>

data/app/views/rails_performance/rails_performance/crashes.html.erb

@@ -9,6 +9,8 @@
           <th data-sort="string">Method</th>
           <th data-sort="string">Format</th>
           <th data-sort="string">Path</th>
+          <th data-sort="string">Exception</th>
+          <th data-sort="string">Backtrace</th>
           <th data-sort="string">Status</th>
           <th data-sort="float">Duration</th>
           <th data-sort="float">Views</th>
@@ -29,6 +31,10 @@
             <td><%= e[:method] %></td>
             <td><%= e[:format] %></td>
             <td><%= link_to_path(e) %></td>
+            <td><%= e[:exception] %></td>
+            <td class="very-small-text">
+              <%= raw e[:backtrace]&.join("<br/>") %>
+            </td>
             <td><%= status_tag e[:status] %></td>
             <td class="nowrap"><%= ms e[:duration] %></td>
             <td class="nowrap"><%= ms e[:view_runtime] %></td>

data/app/views/rails_performance/stylesheets/style.css

@@ -84,4 +84,8 @@
 
 table th[data-sort] {
   cursor: pointer;
+}
+
+.very-small-text {
+  font-size: 8px;
 }

data/lib/rails_performance.rb

@@ -69,11 +69,11 @@ module RailsPerformance
   mattr_accessor :skip
   @@skip = false
 
-  def self.setup
+  def RailsPerformance.setup
     yield(self)
   end
 
-  def self.log(message)
+  def RailsPerformance.log(message)
     return
 
     if ::Rails.logger
@@ -86,8 +86,6 @@ module RailsPerformance
 
 end
 
-RP = RailsPerformance
-
 require "rails_performance/engine"
 
 require_relative './rails_performance/gems/custom_ext.rb'

data/lib/rails_performance/data_source.rb

@@ -19,9 +19,9 @@ module RailsPerformance
     end
 
     def db
-      result = RP::Models::Collection.new
-      (RP::Utils.days + 1).times do |e|
-        RP::DataSource.new(q: self.q.merge({ on: e.days.ago.to_date }), type: type).add_to(result)
+      result = RailsPerformance::Models::Collection.new
+      (RailsPerformance::Utils.days + 1).times do |e|
+        RailsPerformance::DataSource.new(q: self.q.merge({ on: e.days.ago.to_date }), type: type).add_to(result)
       end
       result
     end
@@ -30,7 +30,7 @@ module RailsPerformance
       @q.keys == [:on]
     end
 
-    def add_to(storage = RP::Models::Collection.new)
+    def add_to(storage = RailsPerformance::Models::Collection.new)
       store do |record|
         storage.add(record)
       end

data/lib/rails_performance/engine.rb

@@ -13,7 +13,11 @@ module RailsPerformance
       if ::Rails::VERSION::MAJOR.to_i >= 5
         app.middleware.insert_after ActionDispatch::Executor, RailsPerformance::Rails::Middleware
       else
-        app.middleware.insert_after ActionDispatch::Static, RailsPerformance::Rails::Middleware
+        begin
+          app.middleware.insert_after ActionDispatch::Static, RailsPerformance::Rails::Middleware
+        rescue
+          app.middleware.insert_after Rack::SendFile, RailsPerformance::Rails::Middleware
+        end
       end
       # look like it works in reverse order?
       app.middleware.insert_before RailsPerformance::Rails::Middleware, RailsPerformance::Rails::MiddlewareTraceStorerAndCleanup
@@ -52,11 +56,11 @@ module RailsPerformance
 
       ActionView::LogSubscriber.send :prepend, RailsPerformance::Extensions::View
       ActiveRecord::LogSubscriber.send :prepend, RailsPerformance::Extensions::Db
-    end
 
-    if defined?(::Rake::Task)
-      require_relative './gems/rake_ext.rb'
-      RailsPerformance::Gems::RakeExt.init
+      if defined?(::Rake::Task)
+        require_relative './gems/rake_ext.rb'
+        RailsPerformance::Gems::RakeExt.init
+      end
     end
   end
 end

data/lib/rails_performance/gems/sidekiq_ext.rb

@@ -7,7 +7,7 @@ module RailsPerformance
 
       def call(worker, msg, queue)
         now    = Time.now
-        record = RP::Models::SidekiqRecord.new(
+        record = RailsPerformance::Models::SidekiqRecord.new(
           enqueued_ati: msg['enqueued_at'].to_i,
           datetimei: msg['created_at'].to_i,
           jid: msg['jid'],

data/lib/rails_performance/instrument/metrics_collector.rb

@@ -17,6 +17,8 @@ module RailsPerformance
 
       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)
 
@@ -33,9 +35,13 @@ module RailsPerformance
           path: event.payload[:path],
           view_runtime: event.payload[:view_runtime],
           db_runtime: event.payload[:db_runtime],
-          duration: event.duration
+          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

data/lib/rails_performance/models/request_record.rb

@@ -3,14 +3,15 @@ module RailsPerformance
     class RequestRecord < BaseRecord
       attr_accessor :controller, :action, :format, :status, :datetime, :datetimei, :method, :path, :request_id, :json
       attr_accessor :view_runtime, :db_runtime, :duration, :http_referer
+      attr_accessor :exception, :exception_object
 
       def RequestRecord.find_by(request_id:)
-        keys, values = RP::Utils.fetch_from_redis("performance|*|request_id|#{request_id}|*")
+        keys, values = RailsPerformance::Utils.fetch_from_redis("performance|*|request_id|#{request_id}|*")
 
         return nil if keys.blank?
         return nil if values.blank?
 
-        RP::Models::RequestRecord.from_db(keys[0], values[0])
+        RailsPerformance::Models::RequestRecord.from_db(keys[0], values[0])
       end
 
       # key = performance|
@@ -24,7 +25,7 @@ module RailsPerformance
       # path|/|
       # request_id|454545454545454545|
       # END|1.0.0
-      # = {"view_runtime":8.444603008683771,"db_runtime":0,"duration":9.216095000000001}
+      # = {"view_runtime":null,"db_runtime":0,"duration":27.329741000000002,"http_referer":null,"exception":"ZeroDivisionError divided by 0","backtrace":["/root/projects/rails_performance/test/dummy/app/controllers/account/site_controller.rb:17:in `/'","/root/projects/rails_performance/test/dummy/app/controllers/account/site_controller.rb:17:in `crash'","/usr/local/rvm/gems/ruby-2.6.3/gems/actionpack-6.1.3.1/lib/action_controller/metal/basic_implicit_render.rb:6:in `send_action'"]}
       # value = JSON
       def RequestRecord.from_db(key, value)
         items = key.split("|")
@@ -43,7 +44,7 @@ module RailsPerformance
         )
       end
 
-      def initialize(controller:, action:, format:, status:, datetime:, datetimei:, method:, path:, request_id:, view_runtime: nil, db_runtime: nil, duration: nil, http_referer: nil, json: '{}')
+      def initialize(controller:, action:, format:, status:, datetime:, datetimei:, method:, path:, request_id:, view_runtime: nil, db_runtime: nil, duration: nil, http_referer: nil, exception: nil, exception_object: nil, json: '{}')
         @controller = controller
         @action     = action
         @format     = format
@@ -59,6 +60,9 @@ module RailsPerformance
         @duration     = duration
         @http_referer = http_referer
 
+        @exception        = Array.wrap(exception).compact.join(" ")
+        @exception_object = exception_object
+
         @json       = json
       end
 
@@ -84,12 +88,21 @@ module RailsPerformance
           duration: self.value['duration'],
           db_runtime: self.value['db_runtime'],
           view_runtime: self.value['view_runtime'],
+          exception: self.value['exception'],
+          backtrace: self.value['backtrace']
         }
       end
 
       def save
-        value = { view_runtime: view_runtime, db_runtime: db_runtime, duration: duration, http_referer: http_referer }
         key   = "performance|controller|#{controller}|action|#{action}|format|#{format}|status|#{status}|datetime|#{datetime}|datetimei|#{datetimei}|method|#{method}|path|#{path}|request_id|#{request_id}|END|#{RailsPerformance::SCHEMA}"
+        value = {
+          view_runtime: view_runtime,
+          db_runtime: db_runtime,
+          duration: duration,
+          http_referer: http_referer,
+        }
+        value[:exception] = exception if exception.present?
+        value[:backtrace] = exception_object.backtrace.take(3) if exception_object
         Utils.save_to_redis(key, value)
       end
 

data/lib/rails_performance/reports/trace_report.rb

@@ -9,7 +9,7 @@ module RailsPerformance
 
       def data
         key   = "trace|#{request_id}|END|#{RailsPerformance::SCHEMA}"
-        JSON.parse(RP.redis.get(key).presence || '[]')
+        JSON.parse(RailsPerformance.redis.get(key).presence || '[]')
       end
     end
 

data/lib/rails_performance/version.rb

@@ -1,4 +1,4 @@
 module RailsPerformance
-  VERSION = '1.0.0.beta2'
-  SCHEMA  = '1.0.0'
+  VERSION = '1.0.1'
+  SCHEMA  = '1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_performance
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.1
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -266,11 +266,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Simple Rails Performance tracker. Alternative to the NewRelic, Datadog or