rails_performance 0.0.1.18 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39436989afe127c5268d13685c11384a13051b44efdc4dac1705e671c44a0147
-  data.tar.gz: 72988c7f770d87482c82d4699c3a2956acc4268addb22820a4093de20d1de9e8
+  metadata.gz: 016c0a4dada04d91fb392c7be96962f28bd65d7a55ca436379eff445ac6f2c76
+  data.tar.gz: c14155acbc63d8c043f60ddf719e33da0f9dc1d6809fb279c34dc4ba39ea6afe
 SHA512:
-  metadata.gz: 9ed81e6a440c901d68b78bda24c00340a905ac18559499f5e58f341f82961b1e3c2cfda239fbd3c286fcf4b94a61675972db1fb64e696e805df99cc8b56e2577
-  data.tar.gz: faf3d55fb96cd5afa23c39ecc4dc0bcb76ec0caa84e9520229ead2660f8b7557bc4497b8ba5aee8c0e1342de5b3cd38ac272db70616f8ca041da1c61e0567bbc
+  metadata.gz: 14be1cffee56e247f968e1001788c2c716d3d4e622b2c584bb8cfb60399bcca20f4665324cd7b15f4bcaf3102af331cba0b20950b67de005b48cb1faa3533374
+  data.tar.gz: e982081222f459103fc3d801f2fb18add3f2e93b2efc1073c33ed6501138ca5b536cce7ba6e763849724ab3673e0c3ca3f2a9aa4583665d6c0397b4652c04aad

data/README.md

@@ -1,26 +1,44 @@
 # Rails Performance
 
-Self-hosted tool to monitor the performance of your Ruby on Rails application.
+[![Build Status](https://travis-ci.org/igorkasyanchuk/rails_performance.svg?branch=master)](https://travis-ci.org/igorkasyanchuk/rails_performance)
 
-This is **simple and free alternative** to New Relic, Datadog or other similar services.
+A self-hosted tool to monitor the performance of your Ruby on Rails application.
+
+This is **simple and free alternative** to the New Relic APM, Datadog or other similar services.
+
+![Demo](docs/rails_performance.gif)
 
 It allows you to track:
 
-- throughput report (see amount of requests per minute)
+- throughput report (see amount of RPM (requests per minute))
 - an average response time
 - the slowest controllers & actions
-- duration of total time spent per request, views rendering, DB execution
-- simple crash reports
+- total duration of time spent per request, views rendering, DB
+- SQL queries, rendering logs in "Recent Requests" section
+- simple 500-crashes reports
+- track Sidekiq jobs performance
 
-All data is stored in local Redis and not sent to 3rd party servers.
+All data are stored in `local` Redis and not sent to any 3rd party servers.
 
 ## Production
 
-Gem is production-ready. At least on my applications with ~800 unique users per day it works well.
+Gem is production-ready. At least on my 2 applications with ~800 unique users per day it works perfectly. 
+
+Just don't forget to protect performance dashboard with http basic auth or check of current_user.
 
 ## Usage
 
-Create `config/initializers/rails_performance.rb`
+```
+1. Add gem to the Gemfile (in appropriate group if needed)
+2. Start rails server
+3. Make a few requests to your app
+4. open localhost:3000/rails/performance
+5. Tune the configuration and deploy to production
+```
+
+Default configulation is listed below. But you can overide it.
+
+Create `config/initializers/rails_performance.rb` in your app:
 
 ```ruby
 RailsPerformance.setup do |config|
@@ -47,6 +65,12 @@ Add this line to your application's Gemfile:
 
 ```ruby
 gem 'rails_performance'
+
+# or 
+
+group :development, :production do
+  gem 'rails_performance'
+end
 ```
 
 And then execute:
@@ -58,16 +82,21 @@ You must also have installed Redis server, because this gem is storing data into
 
 After installation and configuration, start your Rails application, make a few requests, and open `https://localhost:3000/rails/performance` URL.
 
+## How it works
+
+![Schema](docs/rails_performance.png)
+
 ## Limitations
 
 - it doesn't track params of POST/PUT requests
-- it doesn't track SQL queries (at least for now)
 - it doesn't track Redis/ElasticSearch or other apps
 - it can't compare historical data
 - depending on your load you may need to reduce time of for how long you store data, because all calculations are done in memory and it could take some time for high-load apps
 
 ## Redis
 
+Gem is using Redis. This is the only one dependency.
+
 All information is stored into Redis. The default expiration time is set to `config.duration` from the configuration.
 
 ## Development & Testing
@@ -77,12 +106,14 @@ Just clone the repo, setup dummy app (`rails db:migrate`).
 After this:
 
 - rails s
-- rake tests
+- rake test
 
 Like a regular web development.
 
 Please note that to simplify integration with other apps all CSS/JS are bundled inside, and delivered in body of the request. This is to avoid integration with assets pipeline or webpacker.
 
+For UI changes you need to use Bulma CSS (https://bulma.io/documentation).
+
 ## Why
 
 The idea of this gem grew from curriosity how many RPM my app receiving per day. Later it evolutionated to something more powerful.
@@ -90,32 +121,33 @@ The idea of this gem grew from curriosity how many RPM my app receiving per day.
 ## TODO
 
 - documentation in Readme
+- capture stacktrace of 500 errors and show in side panel
 - generator for initial config
-- gif with demo
-- time/zone config?
 - CI for tests
-- connected charts
-- ability to zoom to see requests withing specific datime range
-- better hint
+- time/zone config?
+- connected charts on dashboard, when zoom, when hover?
+- ability to zoom to see requests withing specific datetime range
+- better hints?
 - export to csv
-- http basic auth config
-- current_user auth config
 - better stats tooltip, do not show if nothing to show
-- dark mode toggle? save to the cookies
-- integration with elastic search
+- dark mode toggle? save to the cookies?
+- integration with elastic search? or other?
 - monitor active job (sidekiq)?
-- logo?
+- better logo?
 - number of requests last 24 hours, hour, etc.
-- integration with logger, to see the details of request?
-- no results if empty table (on crash page)
-- capture referal for 404 page?
-- SQL
-- Rendering
-- scroll to the top details
+- collect deprecation.rails
+- fix misspellings?
+- show "loading banner" until jquery is loaded?
+- better UI on smaller screens? Recent requests when URL's are long? Truncate with CSS?
+- rules for highlighting durations? how many ms to show warning, alert
 
 ## Contributing
 
-You are welcome to contribute.
+You are welcome to contribute. I've a big list of TODO.
+
+## Big thanks to contributors
+
+- https://github.com/synth
 
 ## License
 

data/app/controllers/base_controller.rb

@@ -1,7 +1,6 @@
 class BaseController < ActionController::Base
   layout 'rails_performance/layouts/rails_performance'
 
-  before_action :leave_finger_print
   before_action :verify_access
 
   if RailsPerformance.http_basic_authentication_enabled
@@ -12,10 +11,6 @@ class BaseController < ActionController::Base
 
   private
 
-  def leave_finger_print
-    Thread.current[:in_rails_performance] = true
-  end
-
   def verify_access
     result = RailsPerformance.verify_access_proc.call(self)
     redirect_to('/', error: 'Access Denied', status: 401) unless result

data/app/controllers/rails_performance_controller.rb

@@ -4,7 +4,7 @@ class RailsPerformanceController < BaseController
 
   if RailsPerformance.enabled
     def index
-      @datasource                = RP::DataSource.new(prepare_query)
+      @datasource                = RP::DataSource.new(**prepare_query, type: :requests, klass: RP::Models::Record)
       db                         = @datasource.db
 
       @throughput_report         = RP::Reports::ThroughputReport.new(db)
@@ -15,7 +15,7 @@ class RailsPerformanceController < BaseController
     end
 
     def summary
-      @datasource                = RP::DataSource.new(prepare_query)
+      @datasource                = RP::DataSource.new(**prepare_query, type: :requests, klass: RP::Models::Record)
       db                         = @datasource.db
 
       @throughput_report         = RP::Reports::ThroughputReport.new(db)
@@ -29,40 +29,55 @@ class RailsPerformanceController < BaseController
 
       respond_to do |format|
         format.js {}
-        format.any { render plain: "Doesn't open in new window" }
+        format.any { render plain: "Doesn't open in new window. Wait until full page load." }
       end
     end
 
     def trace
+      @record = RP::Models::Record.find_by(request_id: params[:id])
       @report = RP::Reports::TraceReport.new(request_id: params[:id])
       @data   = @report.data
       respond_to do |format|
         format.js {}
-        format.any { render plain: "Doesn't open in new window" }
+        format.any { render plain: "Doesn't open in new window. Wait until full page load." }
       end
     end
 
     def crashes
-      @datasource   = RP::DataSource.new(prepare_query({status_eq: 500}))
+      @datasource   = RP::DataSource.new(**prepare_query({status_eq: 500}), type: :requests, klass: RP::Models::Record)
       db            = @datasource.db
       @report       = RP::Reports::CrashReport.new(db)
       @data         = @report.data
     end
 
     def requests
-      @datasource = RP::DataSource.new(prepare_query)
+      @datasource = RP::DataSource.new(**prepare_query, type: :requests, klass: RP::Models::Record)
       db          = @datasource.db
       @report     = RP::Reports::RequestsReport.new(db, group: :controller_action_format, sort: :count)
       @data       = @report.data
     end
 
     def recent
-      @datasource = RP::DataSource.new(prepare_query)
+      @datasource = RP::DataSource.new(**prepare_query, type: :requests, klass: RP::Models::Record)
       db          = @datasource.db
       @report     = RP::Reports::RecentRequestsReport.new(db)
       @data       = @report.data
     end
 
+    def jobs
+      @datasource                = RP::DataSource.new(**prepare_query, type: :jobs, klass: RP::Models::JobRecord)
+      db                         = @datasource.db
+
+      @throughput_report         = RP::Reports::ThroughputReport.new(db)
+      @throughput_report_data    = @throughput_report.data
+
+      @response_time_report      = RP::Reports::ResponseTimeReport.new(db)
+      @response_time_report_data = @response_time_report.data
+
+      @recent_report             = RP::Reports::RecentRequestsReport.new(db)
+      @recent_report_data        = @recent_report.data(:jobs)
+    end
+
     private
 
     def prepare_query(query = params)

data/app/helpers/rails_performance_helper.rb

@@ -6,6 +6,29 @@ module RailsPerformanceHelper
     value.nan? ? nil : value.round(1)
   end
 
+  def duraction_alert_class(duration_str)
+    if duration_str.to_s =~ /(\d+.?\d+?)/
+      duration = $1.to_f
+      if duration >= 500
+        'has-background-danger has-text-white-bis'
+      elsif duration >= 200
+        'has-background-warning has-text-black-ter'
+      else
+        'has-background-success has-text-white-bis'
+      end
+    else
+      'has-background-light'
+    end
+  end
+
+  def extract_duration(str)
+    if (str =~ /Duration: (\d+.?\d+?ms)/i)
+      $1
+    else
+      '-'
+    end
+  end
+
   def ms(value)
     result = round_it(value)
     result && result != 0 ? "#{result} ms" : '-'
@@ -27,14 +50,16 @@ module RailsPerformanceHelper
 
   def report_name(h)
     h.except(:on).collect do |k, v|
+      next if v.blank?
+
       %Q{
       <div class="control">
         <span class="tags has-addons">
           <span class="tag">#{k}</span>
-          <span class="tag is-success">#{v}</span>
+          <span class="tag is-info is-light">#{v}</span>
         </span>
       </div>}
-    end.join.html_safe
+    end.compact.join.html_safe
   end
 
   def status_tag(status)
@@ -82,6 +107,8 @@ module RailsPerformanceHelper
       "is-active" if controller_name == "rails_performance" && action_name == "requests"
     when :recent
       "is-active" if controller_name == "rails_performance" && action_name == "recent"
+    when :jobs
+      "is-active" if controller_name == "rails_performance" && action_name == "jobs"
     end
   end
 end

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

@@ -2,16 +2,17 @@
   <tbody>
     <% @data.each do |e| %>
       <tr>
-        <td><%= e["group"] %></td>
         <% if e["group"] == 'db' %>
-          <td class="nowrap">
+          <td class="nowrap has-text-right <%= duraction_alert_class(e['duration']) %>">
             <%= e["duration"] %> ms
           </td>
           <td>
             <%= e["sql"] %>
           </td>
         <% elsif e["group"] == 'view' %>
-          <td>-</td>
+          <td class="nowrap has-text-right <%= duraction_alert_class(extract_duration(e['message'])) %>">
+            <%= extract_duration(e["message"]) %>
+          </td>
           <td>
             <%= e["message"] %>
           </td>

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

@@ -16,6 +16,12 @@
         </tr>
       </thead>
       <tbody>
+        <% if @data.empty? %>
+          <tr>
+            <td colspan="9">We are glad that this list is empty ;)</td>
+          </tr>
+        <% end %>
+
         <% @data.each do |e| %>
           <tr>
             <td><%= format_datetime e[:datetime] %></td>

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

@@ -25,7 +25,7 @@
 <% content_for :on_load do %>
   <script>
     var data1 = <%= raw @throughput_report_data.to_json %>;
-    showTIRChart('throughput_report_chart', data1);
+    showTIRChart('throughput_report_chart', data1, ' rpm', 'RPM');
 
     var data2 = <%= raw @response_time_report_data.to_json %>;
     showRTChart('response_time_report_chart', data2);

data/app/views/rails_performance/javascripts/app.js

@@ -1,4 +1,4 @@
-function showTIRChart(div, data) {
+function showTIRChart(div, data, addon, name) {
   Highcharts.chart(div, {
       time: {
         timezone: 'Europe/Kiev'
@@ -24,7 +24,7 @@ function showTIRChart(div, data) {
               if (this.y == 0) {
                 return '';
               }
-              return this.y + ' rpm';
+            return this.y + addon;
           }
       },
       xAxis: {
@@ -69,7 +69,7 @@ function showTIRChart(div, data) {
       },
       series: [{
           type: 'area',
-          name: 'RPM',
+          name: name,
           data: data,
           fillOpacity: 0.3,
           lineWidth: 1,

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

@@ -0,0 +1,73 @@
+<title>Number of Requests to the Application</title>
+
+<% unless @datasource.default? %>
+  <%#= link_to raw("&larr; Back"), rails_performance_path, class: "back_link" %>
+<% end %>
+
+<div class="card">
+  <div class="card-content">
+    <h2 class="subtitle">Sidekiq Workers Throughput Report</h2>
+    <div id="throughput_report_chart" class="chart"></div>
+    <p class="content is-small">All workers in the application</p>
+  </div>
+</div>
+
+<br/>
+
+<div class="card">
+  <div class="card-content">
+    <h2 class="subtitle">Average Execution Time</h2>
+    <div id="response_time_report_chart" class="chart"></div>
+    <p class="content is-small">All workers in the application</p>
+  </div>
+</div>
+
+<div class="card">
+  <div class="card-content">
+    <h2 class="subtitle">Recent Jobs (last <%= RailsPerformance::Reports::RecentRequestsReport::TIME_WINDOW / 60 %> minutes)<h2>
+
+    <table class="table is-fullwidth is-hoverable is-narrow">
+      <thead>
+        <tr>
+          <th data-sort="string">Datetime</th>
+          <th data-sort="string">Queue</th>
+          <th data-sort="string">Worker</th>
+          <th data-sort="string">Job ID</th>
+          <th data-sort="string">Status</th>
+          <th data-sort="float">Duration</th>
+          <th>Message</th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% if @recent_report_data.empty? %>
+          <tr>
+            <td colspan="10">Nothing to show here. Try to make a few requests in main app.</td>
+          </tr>
+        <% end %>
+        <% @recent_report_data.each do |e| %>
+          <tr>
+            <td><%= format_datetime e[:datetime] %></td>
+            <td><%= e[:queue] %></td>
+            <td><%= e[:worker] %></td>
+            <td><%= e[:jid] %></td>
+            <td><%= status_tag e[:status] %></td>
+            <td class="nowrap"><%= ms e[:duration] %></td>
+            <td><%= e[:message] %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>
+
+
+<% content_for :on_load do %>
+  <script>
+    var data1 = <%= raw @throughput_report_data.to_json %>;
+    showTIRChart('throughput_report_chart', data1, ' jobs / minute', 'Jobs');
+
+    var data2 = <%= raw @response_time_report_data.to_json %>;
+    showRTChart('response_time_report_chart', data2);
+  </script>
+<% end %>

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

@@ -1,7 +1,6 @@
 <div class="card">
   <div class="card-content">
-
-    <h2 class="subtitle">Recent Requests (last <%= RailsPerformance::Reports::RecentRequestsReport::TIME_WINDOW %> minutes)<h2>
+    <h2 class="subtitle">Recent Requests (last <%= RailsPerformance::Reports::RecentRequestsReport::TIME_WINDOW / 60 %> minutes)<h2>
 
     <table class="table is-fullwidth is-hoverable is-narrow">
       <thead>
@@ -19,6 +18,11 @@
         </tr>
       </thead>
       <tbody>
+        <% if @data.empty? %>
+          <tr>
+            <td colspan="10">Nothing to show here. Try to make a few requests in main app.</td>
+          </tr>
+        <% end %>
         <% @data.each do |e| %>
           <tr>
             <td><%= format_datetime e[:datetime] %></td>

data/app/views/rails_performance/shared/_header.html.erb

@@ -18,6 +18,9 @@
       <%= link_to 'Requests Analysis', rails_performance.rails_performance_requests_url, class: "navbar-item #{active?(:requests)}" %>
       <%= link_to '500 Errors', rails_performance.rails_performance_crashes_url, class: "navbar-item #{active?(:crashes)}" %>
       <%= link_to 'Recent Requests', rails_performance.rails_performance_recent_url, class: "navbar-item #{active?(:recent)}" %>
+      <% if defined?(Sidekiq) %>
+        <%= link_to 'Sidekiq', rails_performance.rails_performance_jobs_url, class: "navbar-item #{active?(:jobs)}" %>
+      <% end %>
     </div>
 
     <div class="navbar-end">

data/app/views/rails_performance/summary.js.erb

@@ -2,7 +2,7 @@ window.panel.header.html(window.panel.close + '<%= j report_name(@datasource.q)
 window.panel.content.html("<%= j render '/rails_performance/summary' %>");
 
 var data1 = <%= raw @throughput_report_data.to_json %>;
-showTIRChart('throughput_report_chart_mini', data1);
+showTIRChart('throughput_report_chart_mini', data1, ' rpm', 'RPM');
 
 var data2 = <%= raw @response_time_report_data.to_json %>;
 showRTChart('response_time_report_chart_mini', data2);

data/app/views/rails_performance/trace.js.erb

@@ -1,4 +1,9 @@
-window.panel.header.html(window.panel.close);
+<% if @record %>
+  window.panel.header.html(window.panel.close + "<%= j report_name(@record.to_h) %>");
+<% else %>
+  window.panel.header.html(window.panel.close);
+<% end %>
+
 window.panel.content.html("<%= j render '/rails_performance/trace' %>");
 
 showPanel();

data/config/routes.rb

@@ -7,6 +7,8 @@ RailsPerformance::Engine.routes.draw do
 
   get '/trace/:id'  => 'rails_performance#trace', as: :rails_performance_trace
   get '/summary'    => 'rails_performance#summary', as: :rails_performance_summary
+
+  get '/jobs'       => 'rails_performance#jobs', as: :rails_performance_jobs
 end
 
 Rails.application.routes.draw do

data/lib/rails_performance.rb

@@ -4,7 +4,9 @@ require_relative "./rails_performance/version.rb"
 require_relative "rails_performance/rails/query_builder.rb"
 require_relative "rails_performance/rails/middleware.rb"
 require_relative "rails_performance/data_source.rb"
+require_relative "rails_performance/models/base_record.rb"
 require_relative "rails_performance/models/record.rb"
+require_relative "rails_performance/models/job_record.rb"
 require_relative "rails_performance/utils.rb"
 require_relative "rails_performance/reports/base_report.rb"
 require_relative "rails_performance/reports/requests_report.rb"

data/lib/rails_performance/data_source.rb

@@ -1,8 +1,10 @@
 module RailsPerformance
   class DataSource
-    attr_reader :q
+    attr_reader :q, :klass, :type
 
-    def initialize(q: {})
+    def initialize(q: {}, type:, klass:)
+      @klass   = klass
+      @type    = type
       q[:on] ||= Date.today
       @q       = q
 
@@ -12,7 +14,7 @@ module RailsPerformance
     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 })).add_to(result)
+        RP::DataSource.new(q: self.q.merge({ on: e.days.ago.to_date }), klass: klass, type: type).add_to(result)
       end
       result
     end
@@ -34,41 +36,46 @@ module RailsPerformance
       return [] if keys.blank?
 
       keys.each_with_index do |key, index|
-        yield RP::Models::Record.new(key, values[index])
+        yield klass.new(key, values[index])
       end
     end
 
     private
 
-    # key = performance|
-    # controller|HomeController|
-    # action|index|
-    # format|html|
-    # status|200|
-    # datetime|20200124T0523|
-    # datetimei|1579861423|
-    # method|GET|
-    # path|/|
-    # END
-
-    def compile_query
+    def query
+      case type
+      when :requests
+        "performance|*#{compile_requests_query}*|END"
+      when :jobs
+        "jobs|*#{compile_jobs_query}*|END"
+      else
+        raise "wrong type for datasource query builder"
+      end
+    end
+
+    def compile_requests_query
       str = []
 
       str << "controller|#{q[:controller]}|" if q[:controller].present?
       str << "action|#{q[:action]}|" if q[:action].present?
       str << "format|#{q[:format]}|" if q[:format].present?
       str << "status|#{q[:status]}|" if q[:status].present?
-
       str << "datetime|#{q[:on].strftime('%Y%m%d')}*|" if q[:on].present?
-
       str << "method|#{q[:method]}|" if q[:method].present?
       str << "path|#{q[:path]}|" if q[:path].present?
 
       str.join("*")
     end
 
-    def query
-      "performance|*#{compile_query}*|END"
+    def compile_jobs_query
+      str = []
+
+      str << "queue|#{q[:queue]}|" if q[:queue].present?
+      str << "worker|#{q[:worker]}|" if q[:worker].present?
+      str << "datetime|#{q[:on].strftime('%Y%m%d')}*|" if q[:on].present?
+      str << "status|#{q[:status]}|" if q[:status].present?
+
+      str.join("*")
     end
 
   end

data/lib/rails_performance/engine.rb

@@ -5,8 +5,10 @@ require_relative './instrument/metrics_collector.rb'
 module RailsPerformance
   class Engine < ::Rails::Engine
 
-    if RailsPerformance.enabled
+    if RailsPerformance.try(:enabled) # for rails c
+
       config.app_middleware.insert_after ActionDispatch::Executor, RailsPerformance::Rails::Middleware
+
       initializer :configure_metrics, after: :initialize_logger do
         ActiveSupport::Notifications.subscribe(
           "process_action.action_controller",
@@ -18,6 +20,16 @@ module RailsPerformance
           ActiveRecord::LogSubscriber.send :prepend, RailsPerformance::Extensions::Db
         end
       end
+
+      if const_defined?("Sidekiq")
+        require_relative './gems/sidekiq.rb'
+        Sidekiq.configure_server do |config|
+          config.server_middleware do |chain|
+            chain.add RailsPerformance::Gems::Sidekiq
+          end
+        end
+      end
+
     end
 
   end

data/lib/rails_performance/gems/sidekiq.rb

@@ -0,0 +1,35 @@
+module RailsPerformance
+  module Gems
+    class Sidekiq
+
+      def initialize(options=nil)
+      end
+
+      def call(worker, msg, queue)
+        now  = Time.now
+        data = {
+          enqueued_ati: msg['enqueued_at'].to_i,
+          created_ati: 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
+          yield
+          data[:status]   = "success"
+        rescue Exception => ex
+          data[:status]   = "exception"
+          data[:message]  = ex.message
+        ensure
+          # store in ms instead of seconds
+          data[:duration] = (Time.now - now) * 1000
+          #puts data
+          RailsPerformance::Utils.log_job_in_redis(data)
+        end
+      end
+
+    end
+  end
+end

data/lib/rails_performance/instrument/metrics_collector.rb

@@ -18,6 +18,8 @@ module RailsPerformance
       def call(event_name, started, finished, event_id, payload)
         event = ActiveSupport::Notifications::Event.new(event_name, started, finished, event_id, payload)
 
+        return if event.payload[:path] =~ /^\/rails\/performance/
+
         record = {
           controller: event.payload[:controller],
           action: event.payload[:action],
@@ -32,7 +34,7 @@ module RailsPerformance
           duration: event.duration
         }
 
-        Thread.current["RP_request_info"] = record
+        CurrentRequest.current.record = record
       end
     end
   end

data/lib/rails_performance/models/base_record.rb

@@ -0,0 +1,24 @@
+module RailsPerformance
+  module Models
+    class BaseRecord
+      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

data/lib/rails_performance/models/current_request.rb

@@ -1,6 +1,7 @@
 module RailsPerformance
   class CurrentRequest
     attr_reader :request_id, :storage
+    attr_accessor :record
 
     def CurrentRequest.init
       Thread.current[:rp_current_request] ||= CurrentRequest.new(SecureRandom.hex(16))
@@ -17,6 +18,7 @@ module RailsPerformance
     def initialize(request_id)
       @request_id = request_id
       @storage    = []
+      @record     = nil
     end
 
     def store(options = {})

data/lib/rails_performance/models/job_record.rb

@@ -0,0 +1,48 @@
+module RailsPerformance
+  module Models
+    class JobRecord < BaseRecord
+      attr_reader :queue, :worker, :jid, :created_ati, :enqueued_ati, :datetime, :start_timei, :status
+
+      # key = job-performance
+      # |queue|default
+      # |worker|SimpleWorker
+      # |jid|7d48fbf20976c224510dbc60
+      # |datetime|20200124T0523
+      # |created_ati|1583146613
+      # |enqueued_ati|1583146613
+      # |start_timei|1583146614
+      # |status|success|END
+      # value = JSON
+      def initialize(key, value)
+        @json = value
+
+        items = key.split("|")
+
+        @queue        = items[2]
+        @worker       = items[4]
+        @jid          = items[6]
+        @datetime     = items[8]
+        @created_ati  = items[10]
+        @enqueued_ati = items[12]
+        @start_timei  = items[14]
+        @status       = items[16]
+      end
+
+      def to_h
+        {
+          queue: queue,
+          worker: worker,
+          jid: jid,
+          datetime: datetime,
+          created_ati: created_ati,
+          enqueued_ati: enqueued_ati,
+          start_timei: start_timei,
+          duration: duration,
+          status: status,
+          message: value['message']
+        }
+      end
+
+    end
+  end
+end

data/lib/rails_performance/models/record.rb

@@ -1,8 +1,17 @@
 module RailsPerformance
   module Models
-    class Record
+    class Record < BaseRecord
       attr_reader :controller, :action, :format, :status, :datetime, :datetimei, :method, :path, :request_id
 
+      def Record.find_by(request_id:)
+        keys, values = RP::Utils.fetch_from_redis("performance|*|request_id|#{request_id}|*")
+
+        return nil if keys.blank?
+        return nil if values.blank?
+
+        RP::Models::Record.new(keys[0], values[0])
+      end
+
       # key = performance|
       # controller|HomeController|
       # action|index|
@@ -32,10 +41,6 @@ module RailsPerformance
         @request_id = items[18]
       end
 
-      def value
-        @value ||= JSON.parse(@json || "{}")
-      end
-
       def controller_action
         "#{controller}##{action}"
       end
@@ -43,6 +48,21 @@ module RailsPerformance
       def controller_action_format
         "#{controller}##{action}|#{format}"
       end
+
+      def to_h
+        {
+          controller: controller,
+          action: action,
+          format: format,
+          method: method,
+          path: path,
+          duration: ms(duration),
+          view_runtime: ms(value['view_runtime']),
+          db_runtime: ms(value['db_runtime']),
+          HTTP_REFERER: value['HTTP_REFERER']
+        }
+      end
+
     end
   end
 end

data/lib/rails_performance/rails/middleware.rb

@@ -8,25 +8,28 @@ module RailsPerformance
       def call(env)
         @status, @headers, @response = @app.call(env)
 
-        if !Thread.current[:in_rails_performance] && record = Thread.current["RP_request_info"]
-          record[:status]   ||= @status
-          record[:request_id] = CurrentRequest.current.request_id
+        #t = Time.now
+        if record = CurrentRequest.current.record
+          begin
+            record[:status]   ||= @status # for 500 errors
+            record[:request_id] = CurrentRequest.current.request_id
 
-          # rand(500).times do |e|
-          #   finished               = Time.now - rand(2000).minutes
-          #   record[:datetime]      = finished.strftime(RailsPerformance::FORMAT)
-          #   record[:datetimei]     = finished.to_i
-          #   record[:duration]      = 50 + rand(100) + rand(50.0) + rand(e)
-          #   record[:db_runtime]    = rand(50.0)
-          #   record[:view_runtime]  = rand(50.0)
-          #   RP::Utils.log_request_in_redis(record)
-          # end
+            # capture referer from where this page was opened
+            if record[:status] == 404
+              record[:HTTP_REFERER] = env["HTTP_REFERER"]
+            end
 
-          RP::Utils.log_trace_in_redis(CurrentRequest.current.request_id, CurrentRequest.current.storage)
-          RP::Utils.log_request_in_redis(record)
-          Thread.current["RP_request_info"] = nil
-          CurrentRequest.cleanup
+            # store for section "recent requests"
+            RP::Utils.log_trace_in_redis(CurrentRequest.current.request_id, CurrentRequest.current.storage)
+
+            # store request information
+            RP::Utils.log_request_in_redis(record)
+          ensure
+            # we don't want to have a memory leak
+            CurrentRequest.cleanup
+          end
         end
+        #puts "==> store performance data: #{(Time.now - t).round(3)}ms"
 
         [@status, @headers, @response]
       end

data/lib/rails_performance/reports/recent_requests_report.rb

@@ -7,25 +7,48 @@ module RailsPerformance
         @sort ||= :datetime
       end
 
-      def data
+      def data(type = :requests) # most popular type
         db.data.collect do |record|
-          {
-            controller: record.controller,
-            action: record.action,
-            format: record.format,
-            status: record.status,
-            method: record.method,
-            path: record.path,
-            request_id: record.request_id,
-            datetime: Time.at(record.datetimei.to_i),
-            duration: record.value['duration'],
-            db_runtime: record.value['db_runtime'],
-            view_runtime: record.value['view_runtime'],
-          }
+          case type
+          when :requests
+            record_hash(record)
+          when :jobs
+            job_hash(record)
+          end
         end
         .select{|e| e if e[:datetime] >= TIME_WINDOW.ago}
         .sort{|a, b| b[sort] <=> a[sort]}
       end
+
+      private
+
+      def record_hash(record)
+        {
+          controller: record.controller,
+          action: record.action,
+          format: record.format,
+          status: record.status,
+          method: record.method,
+          path: record.path,
+          request_id: record.request_id,
+          datetime: Time.at(record.datetimei.to_i),
+          duration: record.value['duration'],
+          db_runtime: record.value['db_runtime'],
+          view_runtime: record.value['view_runtime'],
+        }
+      end
+
+      def job_hash(record)
+        {
+          worker: record.worker,
+          queue: record.queue,
+          
+          jid: record.jid,
+          status: record.status,
+          datetime: Time.at(record.start_timei.to_i),
+          duration: record.value['duration'],
+        }
+      end
     end
 
 

data/lib/rails_performance/utils.rb

@@ -12,28 +12,21 @@ module RailsPerformance
       now.strftime("%H:%M")
     end
 
+    def Utils.log_job_in_redis(e)
+      key   = "jobs|queue|#{e[:queue]}|worker|#{e[:worker]}|jid|#{e[:jid]}|datetime|#{e[:datetime]}|created_ati|#{e[:created_ati]}|enqueued_ati|#{e[:enqueued_ati]}|start_timei|#{e[:start_timei]}|status|#{e[:status]}|END"
+      value = { message: e[:message], duration: e[:duration] }
+      Utils.save_to_redis(key, value)
+    end
+
     def Utils.log_request_in_redis(e)
-      value = e.slice(:view_runtime, :db_runtime, :duration)
+      value = e.slice(:view_runtime, :db_runtime, :duration, :HTTP_REFERER)
       key   = "performance|controller|#{e[:controller]}|action|#{e[:action]}|format|#{e[:format]}|status|#{e[:status]}|datetime|#{e[:datetime]}|datetimei|#{e[:datetimei]}|method|#{e[:method]}|path|#{e[:path]}|request_id|#{e[:request_id]}|END"
-
-      # puts "  [SAVE]    key  --->  #{key}\n"
-      # puts "          value  --->  #{value.to_json}\n\n"
-
-      RP.redis.set(key, value.to_json)
-      RP.redis.expire(key, RP.duration.to_i)
-
-      true
+      Utils.save_to_redis(key, value)
     end
 
     def Utils.log_trace_in_redis(request_id, value)
       key = "trace|#{request_id}"
-
-      # puts "  [SAVE]    key  --->  #{key}\n"
-      # puts "          value  --->  #{value.to_json}\n\n"
-      # pp value
-
-      RP.redis.set(key, value.to_json)
-      RP.redis.expire(key, RailsPerformance::Reports::RecentRequestsReport::TIME_WINDOW.to_i)
+      Utils.save_to_redis(key, value, RailsPerformance::Reports::RecentRequestsReport::TIME_WINDOW.to_i)
     end
 
     def Utils.fetch_from_redis(query)
@@ -47,7 +40,7 @@ module RailsPerformance
     end
 
     def Utils.days
-      (RP.duration % 24.days).parts[:days] + 1
+      (RP.duration / 1.day) + 1
     end
 
     def Utils.median(array)
@@ -64,5 +57,12 @@ module RailsPerformance
       end
     end
 
+    def Utils.save_to_redis(key, value, expire = RP.duration.to_i)
+      # puts "  [SAVE]    key  --->  #{key}\n"
+      # puts "          value  --->  #{value.to_json}\n\n"
+      RP.redis.set(key, value.to_json)
+      RP.redis.expire(key, expire.to_i)
+    end
+
   end
-end
+end

data/lib/rails_performance/version.rb

@@ -1,3 +1,3 @@
 module RailsPerformance
-  VERSION = '0.0.1.18'
-end
+  VERSION = '0.9.2'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_performance
 version: !ruby/object:Gem::Version
-  version: 0.0.1.18
+  version: 0.9.2
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-10 00:00:00.000000000 Z
+date: 2020-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,7 +80,22 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Track number of requests to your app
+- !ruby/object:Gem::Dependency
+  name: sidekiq
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: 3rd party dependency-free solution how to monitor performance of your
+  Rails applications.
 email:
 - igorkasyanchuk@gmail.com
 executables: []
@@ -115,6 +130,7 @@ files:
 - app/views/rails_performance/javascripts/rails.js
 - app/views/rails_performance/javascripts/stupidtable.min.js
 - app/views/rails_performance/javascripts/table.js
+- app/views/rails_performance/jobs.html.erb
 - app/views/rails_performance/layouts/rails_performance.html.erb
 - app/views/rails_performance/recent.html.erb
 - app/views/rails_performance/requests.html.erb
@@ -130,9 +146,12 @@ files:
 - lib/rails_performance/data_source.rb
 - lib/rails_performance/engine.rb
 - lib/rails_performance/extensions/capture_everything.rb
+- lib/rails_performance/gems/sidekiq.rb
 - lib/rails_performance/instrument/metrics_collector.rb
+- lib/rails_performance/models/base_record.rb
 - lib/rails_performance/models/collection.rb
 - lib/rails_performance/models/current_request.rb
+- lib/rails_performance/models/job_record.rb
 - lib/rails_performance/models/record.rb
 - lib/rails_performance/rails/middleware.rb
 - lib/rails_performance/rails/query_builder.rb
@@ -165,8 +184,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Track number of requests to your app
+summary: Simple Rails Performance tracker. Alternative to the NewRelic, Datadog or
+  other services.
 test_files: []