rails_performance 0.0.1.1 → 0.0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51b705efba63ca09c41d8d2bae1ca38a24ac5b61d02ebf04900b32e4741b6715
-  data.tar.gz: 738cf597eebf005575d85c9054ea1cbb75d61d60a814ad53c12d782b053b4388
+  metadata.gz: 68f35c4eec4521b60ad740040da1a980e517f951444f52563dedf1f9e5958c8a
+  data.tar.gz: 0b384d8bda35a86b7fbc384b2834829eb2f8bd92edf01d974bd75d139748f749
 SHA512:
-  metadata.gz: a37ee64f11e1670baef0eeeb42ab5d926851f29351a027cecdfcc1ef618f603fd08456e1aaeaae0262179b79a930fe6bbbd5a04995bda83dcdfb0a56b7e2e3f8
-  data.tar.gz: c2fdee215cef0eb8f070c9249f1d4ffc518ae069d96128bb65e7414dbf4888204d48a6b50a5836919efc7ec98337ee81c20e99f45693670c2e59a9cca65d00ba
+  metadata.gz: ad282e2024c5eadf23eade5c6b02dc31255f8bd1fe34b9b03c2557f5a5d2a1ab640f9b23d13d2e2c0dbf081b6fd4cec2b6ac34bacf6e722e81b8c2de69b5c321
+  data.tar.gz: 3ef27d25873473bfd87369356ecbd28d57471ce27240513f01d0a546c80ab8790c983b0ad9e9ecc61bddfe0b9c9a64dad8dd274981890dd2e34e69b697724664

data/app/controllers/rails_performance_controller.rb

@@ -8,7 +8,7 @@ class RailsPerformanceController < ActionController::Base
       })
 
     @data   = RailsPerformance::ThroughputReport.new(@datasource.db).data
-    @global = RailsPerformance::RequestsReport.new(@datasource.db, group: :controller_action_format).data
+    @global = RailsPerformance::RequestsReport.new(@datasource.db, group: :controller_action_format, sort: :db_runtime_slowest).data
     #@full   = RailsPerformance::FullReport.new.data(:controller_action).sort{|a, b| b[:count] <=> a[:count]}
   end
 

data/app/helpers/rails_performance_helper.rb

@@ -0,0 +1,8 @@
+module RailsPerformanceHelper
+  def round_it(value)
+    return nil unless value
+    return value if value.is_a?(Integer)
+
+    value.nan? ? nil : value.round(2)
+  end
+end

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

@@ -19,7 +19,7 @@
 
   #chart {
     width: 100%;
-    min-height: 600px;
+    min-height: 500px;
   }
 
   .card {

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

@@ -21,11 +21,20 @@
   <table>
     <thead>
       <tr>
-        <th></th>
+        <th colspan='3'>Name</th>
+        <th colspan='3'>Average (ms)</th>
+        <th colspan='3'>Slowest (ms)</th>
+      </tr>
+      <tr>
+        <th>Controller#Action</th>
         <th>Format</th>
         <th>Requests</th>
-        <th>Average (ms)</th>
-        <th>Slowest (ms)</th>
+        <th>Duration</th>
+        <th>Views</th>
+        <th>DB</th>
+        <th>Duration</th>
+        <th>Views</th>
+        <th>DB</th>
       </tr>
     </thead>
     <tbody>
@@ -35,8 +44,12 @@
           <td><%= groups[0] %></td>
           <td><%= groups[1]&.upcase %></td>
           <td><%= e[:count] %></td>
-          <td><%= e[:average].round(2) %></td>
-          <td><%= e[:slowest].round(2) %></td>
+          <td><%= round_it e[:duration_average] %></td>
+          <td><%= round_it e[:view_runtime_average] %></td>
+          <td><%= round_it e[:db_runtime_average] %></td>
+          <td><%= round_it e[:duration_slowest] %></td>
+          <td><%= round_it e[:view_runtime_slowest] %></td>
+          <td><%= round_it e[:db_runtime_slowest] %></td>
         </tr>
       <% end %>
     </tbody>

data/lib/rails_performance/base_report.rb

@@ -1,10 +1,13 @@
 module RailsPerformance
   class BaseReport
-    attr_reader :db, :group
+    attr_reader :db, :group, :sort
 
-    def initialize(db, group: nil)
+    def initialize(db, group: nil, sort: nil)
       @db     = db
       @group  = group
+      @sort   = sort
+
+      set_defaults
     end
 
     def collect
@@ -13,5 +16,8 @@ module RailsPerformance
         res
       end
     end
+
+    def set_defaults
+    end
   end
 end

data/lib/rails_performance/engine.rb

@@ -15,5 +15,11 @@ module RailsPerformance
       )
     end
 
+    # initializer 'rails_performance.helpers' do
+    #   ActiveSupport.on_load :action_view do
+    #     ActionView::Base.send :include, RailsPerformance::RailsPerformanceHelper
+    #   end
+    # end
+
   end
 end

data/lib/rails_performance/metrics_listener.rb

@@ -19,6 +19,8 @@ module RailsPerformance
     def call(event_name, started, finished, event_id, payload)
       event = ActiveSupport::Notifications::Event.new(event_name, started, finished, event_id, payload)
 
+      #finished = Time.now - rand(180).minutes
+
       record = {
         controller: event.payload[:controller],
         action: event.payload[:action],

data/lib/rails_performance/requests_report.rb

@@ -1,14 +1,26 @@
 module RailsPerformance
   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,
-          average: v.sum{|e| e["duration"]}.to_f / v.size,
-          count: v.size,
-          slowest: v.max_by{|e| e["duration"]}.try(:[], "duration")
+          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{|a, b| b[:count] <=> a[:count]}
+      end.sort{|a, b| b[sort] <=> a[sort]}
     end
   end
 end

data/lib/rails_performance/throughput_report.rb

@@ -1,8 +1,8 @@
 module RailsPerformance
   class ThroughputReport < BaseReport
 
-    def initialize(ds)
-      super(ds, group: :datetime)
+    def set_defaults
+      @group ||= :datetime
     end
 
     def data

data/lib/rails_performance/version.rb

@@ -1,3 +1,3 @@
 module RailsPerformance
-  VERSION = '0.0.1.1'
+  VERSION = '0.0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_performance
 version: !ruby/object:Gem::Version
-  version: 0.0.1.1
+  version: 0.0.1.2
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-24 00:00:00.000000000 Z
+date: 2020-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -92,6 +92,7 @@ files:
 - Rakefile
 - app/assets/config/rails_performance_manifest.js
 - app/controllers/rails_performance_controller.rb
+- app/helpers/rails_performance_helper.rb
 - app/views/rails_performance/_css.html.erb
 - app/views/rails_performance/_js.html.erb
 - app/views/rails_performance/index.html.erb