rails_performance 0.9.9 → 1.0.0.beta1

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

@@ -0,0 +1,64 @@
+<title>Grape</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">Grape Throughput Report</h2>
+    <div id="throughput_report_chart" class="chart"></div>
+    <p class="content is-small"></p>
+  </div>
+</div>
+
+<br/>
+
+<div class="card">
+  <div class="card-content">
+    <h2 class="subtitle">Recent Requests (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">Method</th>
+          <th data-sort="string">Path</th>
+          <th data-sort="string">Status</th>
+          <th data-sort="float">endpoint_render.grape</th>
+          <th data-sort="float">format_response.grape</th>
+          <th data-sort="float">endpoint_run.grape</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 the main app.</td>
+          </tr>
+        <% end %>
+        <% @recent_report_data.each do |e| %>
+          <tr>
+            <td><%= format_datetime e[:datetime] %></td>
+            <td><%= e[:method] %></td>
+            <td><%= e[:path] %></td>
+            <td><%= status_tag e[:status] %></td>
+            <td class="nowrap"><%= ms e["endpoint_render.grape"] %></td>
+            <td class="nowrap"><%= ms e["format_response.grape"] %></td>
+            <td class="nowrap">
+              <%= ms e["endpoint_run.grape"] %>
+            </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, ' requests / minute', 'Requests');
+  </script>
+<% end %>

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

@@ -0,0 +1,55 @@
+<title>Rake</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">Recent Rake tasks (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">Details</th>
+          <th data-sort="float">Duration</th>
+          <th data-sort="string">Status</th>
+        </tr>
+      </thead>
+      <tbody>
+        <% if @recent_report_data.empty? %>
+          <tr>
+            <td colspan="10">Nothing to show here. Try to make a few requests in the main app.</td>
+          </tr>
+        <% end %>
+        <% @recent_report_data.each do |e| %>
+          <tr>
+            <td><%= format_datetime e[:datetime] %></td>
+            <td>[<%= e[:task].join(" ") %>]</td>
+            <td class="nowrap"><%= ms e[:duration] %></td>
+            <td><%= status_tag e[:status] %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>
+
+<br/>
+
+<div class="card">
+  <div class="card-content">
+    <h2 class="subtitle">Rake Throughput Report</h2>
+    <div id="throughput_report_chart" class="chart"></div>
+    <p class="content is-small">All rake tasks in the application</p>
+  </div>
+</div>
+
+
+<% content_for :on_load do %>
+  <script>
+    var data1 = <%= raw @throughput_report_data.to_json %>;
+    showTIRChart('throughput_report_chart', data1, ' tasks / minute', 'Tasks');
+  </script>
+<% end %>

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

@@ -1,3 +1,5 @@
+<title>Recent Requests</title>
+
 <div class="card">
   <div class="card-content">
     <h2 class="subtitle">Recent Requests (last <%= RailsPerformance::Reports::RecentRequestsReport::TIME_WINDOW / 60 %> minutes)<h2>
@@ -21,7 +23,7 @@
       <tbody>
         <% if @data.empty? %>
           <tr>
-            <td colspan="10">Nothing to show here. Try to make a few requests in main app.</td>
+            <td colspan="10">Nothing to show here. Try to make a few requests in the main app.</td>
           </tr>
         <% end %>
         <% @data.each do |e| %>

data/app/views/rails_performance/rails_performance/{jobs.html.erb → sidekiq.html.erb}

@@ -1,4 +1,4 @@
-<title>Number of Requests to the Application</title>
+<title>Sidekiq</title>
 
 <% unless @datasource.default? %>
   <%#= link_to raw("&larr; Back"), rails_performance_path, class: "back_link" %>
@@ -22,6 +22,8 @@
   </div>
 </div>
 
+<br/>
+
 <div class="card">
   <div class="card-content">
     <h2 class="subtitle">Recent Jobs (last <%= RailsPerformance::Reports::RecentRequestsReport::TIME_WINDOW / 60 %> minutes)<h2>
@@ -36,13 +38,12 @@
           <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>
+            <td colspan="10">Nothing to show here. Try to make a few requests in the main app.</td>
           </tr>
         <% end %>
         <% @recent_report_data.each do |e| %>
@@ -53,7 +54,7 @@
             <td><%= e[:jid] %></td>
             <td><%= status_tag e[:status] %></td>
             <td class="nowrap"><%= ms e[:duration] %></td>
-            <td><%= e[:message] %></td>
+            <td><%= e[:message].presence || '-' %></td>
           </tr>
         <% end %>
       </tbody>

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

@@ -1,5 +1,5 @@
 window.panel.header.html(window.panel.close + '<%= j report_name(@datasource.q) %>');
-window.panel.content.html("<%= j render '/rails_performance/rails_performance/summary' %>");
+window.panel.content.html("<%= j render '/rails_performance/rails_performance/summary', title: "Requests" %>");
 
 var data1 = <%= raw @throughput_report_data.to_json %>;
 showTIRChart('throughput_report_chart_mini', data1, ' rpm', 'RPM');

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

@@ -1,5 +1,5 @@
 <% if @record %>
-  window.panel.header.html(window.panel.close + "<%= j report_name(@record.to_h) %>");
+  window.panel.header.html(window.panel.close + "<%= j report_name(@record.record_hash) %>");
 <% else %>
   window.panel.header.html(window.panel.close);
 <% end %>

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

@@ -19,8 +19,16 @@
       <%= 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)}" %>
+        <%= link_to 'Sidekiq', rails_performance.rails_performance_sidekiq_url, class: "navbar-item #{active?(:sidekiq)}" %>
       <% end %>
+      <% if defined?(Delayed::Job) %>
+        <%= link_to 'Delayed::Job', rails_performance.rails_performance_delayed_job_url, class: "navbar-item #{active?(:delayed_job)}" %>
+      <% end %>
+      <% if defined?(Grape) %>
+        <%= link_to 'Grape', rails_performance.rails_performance_grape_url, class: "navbar-item #{active?(:grape)}" %>
+      <% end %>
+      <%= link_to 'Rake', rails_performance.rails_performance_rake_url, class: "navbar-item #{active?(:rake)}" %>
+      <%= link_to 'Custom Events', rails_performance.rails_performance_custom_url, class: "navbar-item #{active?(:custom)}" %>
     </div>
 
     <div class="navbar-end">

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

@@ -36,6 +36,11 @@
   opacity: 0.7;
 }
 
+.footer-box a {
+  color: #4a4a4a;
+  text-decoration: underline;
+}
+
 .stats_icon svg {
   width: 16px;
   height: 16px;

data/config/routes.rb

@@ -8,7 +8,11 @@ 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
+  get '/sidekiq'    => 'rails_performance#sidekiq', as: :rails_performance_sidekiq
+  get '/delayed_job'=> 'rails_performance#delayed_job', as: :rails_performance_delayed_job
+  get '/grape'      => 'rails_performance#grape', as: :rails_performance_grape
+  get '/rake'       => 'rails_performance#rake', as: :rails_performance_rake
+  get '/custom'     => 'rails_performance#custom', as: :rails_performance_custom
 end
 
 Rails.application.routes.draw do

data/lib/rails_performance.rb

@@ -3,10 +3,15 @@ require "redis-namespace"
 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/models/request_record.rb"
+require_relative "rails_performance/models/sidekiq_record.rb"
+require_relative "rails_performance/models/delayed_job_record.rb"
+require_relative "rails_performance/models/grape_record.rb"
+require_relative "rails_performance/models/trace_record.rb"
+require_relative "rails_performance/models/rake_record.rb"
+require_relative "rails_performance/models/custom_record.rb"
+require_relative "rails_performance/data_source.rb"
 require_relative "rails_performance/utils.rb"
 require_relative "rails_performance/reports/base_report.rb"
 require_relative "rails_performance/reports/requests_report.rb"
@@ -16,14 +21,14 @@ require_relative "rails_performance/reports/throughput_report.rb"
 require_relative "rails_performance/reports/recent_requests_report.rb"
 require_relative "rails_performance/reports/breakdown_report.rb"
 require_relative "rails_performance/reports/trace_report.rb"
-require_relative "rails_performance/extensions/capture_everything.rb"
-require_relative "rails_performance/models/current_request.rb"
+require_relative "rails_performance/extensions/trace.rb"
+require_relative "rails_performance/thread/current_request.rb"
 
 module RailsPerformance
   FORMAT = "%Y%m%dT%H%M"
 
   mattr_accessor :redis
-  @@redis = Redis::Namespace.new("#{::Rails.env}-rails-performance", redis: Redis.new)
+  @@redis = Redis::Namespace.new("{#{::Rails.env}-rails-performance}", redis: Redis.new)
 
   mattr_accessor :duration
   @@duration = 4.hours
@@ -60,12 +65,30 @@ module RailsPerformance
   end
   @@ignored_endpoints = []
 
+  # skip requests if it's inside Rails Performance view
+  mattr_accessor :skip
+  @@skip = false
+
   def self.setup
     yield(self)
   end
 
+  def self.log(message)
+    return
+
+    if ::Rails.logger
+      # puts(message)
+      ::Rails.logger.debug(message)
+    else
+      puts(message)
+    end
+  end
+
 end
 
 RP = RailsPerformance
 
 require "rails_performance/engine"
+
+require_relative './rails_performance/gems/custom_ext.rb'
+RailsPerformance.send :extend, RailsPerformance::Gems::CustomExtension

data/lib/rails_performance/data_source.rb

@@ -1,20 +1,27 @@
 module RailsPerformance
   class DataSource
+    KLASSES = {
+      requests: RailsPerformance::Models::RequestRecord,
+      sidekiq: RailsPerformance::Models::SidekiqRecord,
+      delayed_job: RailsPerformance::Models::DelayedJobRecord,
+      grape: RailsPerformance::Models::GrapeRecord,
+      rake: RailsPerformance::Models::RakeRecord,
+      custom: RailsPerformance::Models::CustomRecord,
+    }
+
     attr_reader :q, :klass, :type
 
-    def initialize(q: {}, type:, klass:)
-      @klass   = klass
+    def initialize(q: {}, type:)
       @type    = type
+      @klass   = KLASSES[type]
       q[:on] ||= Date.today
       @q       = q
-
-      #puts "  [DataSource Q]  -->  #{@q.inspect}\n\n"
     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 }), klass: klass, type: type).add_to(result)
+        RP::DataSource.new(q: self.q.merge({ on: e.days.ago.to_date }), type: type).add_to(result)
       end
       result
     end
@@ -36,7 +43,7 @@ module RailsPerformance
       return [] if keys.blank?
 
       keys.each_with_index do |key, index|
-        yield klass.new(key, values[index])
+        yield klass.from_db(key, values[index])
       end
     end
 
@@ -45,9 +52,17 @@ module RailsPerformance
     def query
       case type
       when :requests
-        "performance|*#{compile_requests_query}*|END"
-      when :jobs
-        "jobs|*#{compile_jobs_query}*|END"
+        "performance|*#{compile_requests_query}*|END|#{RailsPerformance::VERSION}"
+      when :sidekiq
+        "sidekiq|*#{compile_sidekiq_query}*|END|#{RailsPerformance::VERSION}"
+      when :delayed_job
+        "delayed_job|*#{compile_delayed_job_query}*|END|#{RailsPerformance::VERSION}"
+      when :grape
+        "grape|*#{compile_grape_query}*|END|#{RailsPerformance::VERSION}"
+      when :rake
+        "rake|*#{compile_rake_query}*|END|#{RailsPerformance::VERSION}"
+      when :custom
+        "custom|*#{compile_custom_query}*|END|#{RailsPerformance::VERSION}"
       else
         raise "wrong type for datasource query builder"
       end
@@ -55,7 +70,6 @@ module RailsPerformance
 
     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?
@@ -63,18 +77,43 @@ module RailsPerformance
       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 compile_jobs_query
+    def compile_sidekiq_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
+
+    def compile_delayed_job_query
+      str = []
+      str << "datetime|#{q[:on].strftime('%Y%m%d')}*|" if q[:on].present?
+      str << "status|#{q[:status]}|" if q[:status].present?
+      str.join("*")
+    end
+
+    def compile_rake_query
+      str = []
+      str << "datetime|#{q[:on].strftime('%Y%m%d')}*|" if q[:on].present?
+      str << "status|#{q[:status]}|" if q[:status].present?
+      str.join("*")
+    end
+
+    def compile_custom_query
+      str = []
+      str << "datetime|#{q[:on].strftime('%Y%m%d')}*|" if q[:on].present?
+      str << "status|#{q[:status]}|" if q[:status].present?
+      str.join("*")
+    end
 
+    def compile_grape_query
+      str = []
+      str << "datetime|#{q[:on].strftime('%Y%m%d')}*|" if q[:on].present?
+      str << "status|#{q[:status]}|" if q[:status].present?
       str.join("*")
     end
 

data/lib/rails_performance/engine.rb

@@ -15,15 +15,27 @@ module RailsPerformance
       else
         app.middleware.insert_after ActionDispatch::Static, RailsPerformance::Rails::Middleware
       end
+      # look like it works in reverse order?
+      app.middleware.insert_before RailsPerformance::Rails::Middleware, RailsPerformance::Rails::MiddlewareTraceStorerAndCleanup
 
-      if defined?(Sidekiq)
-        require_relative './gems/sidekiq.rb'
+      if defined?(::Sidekiq)
+        require_relative './gems/sidekiq_ext.rb'
         Sidekiq.configure_server do |config|
           config.server_middleware do |chain|
-            chain.add RailsPerformance::Gems::Sidekiq
+            chain.add RailsPerformance::Gems::SidekiqExt
           end
         end
       end
+
+      if defined?(::Grape)
+        require_relative './gems/grape_ext.rb'
+        RailsPerformance::Gems::GrapeExt.init
+      end
+
+      if defined?(::Delayed::Job)
+        require_relative './gems/delayed_job_ext.rb'
+        RailsPerformance::Gems::DelayedJobExt.init
+      end
     end
 
     initializer :configure_metrics, after: :initialize_logger do
@@ -41,5 +53,10 @@ 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
+    end
   end
 end