rails_performance 0.0.1.3 → 0.0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57398ce57cc6e6707959d81156ffb0b48f8b32f55e25657f1f0a714c89c1bc2c
-  data.tar.gz: 1250f710f15e028d1c8ed187cd6e1e9849ad8e0d440cb6eb6bd5eb67ec09d491
+  metadata.gz: 457bfaa0d79609d19c413eba29dd8d859bdd44914f1b89575479670e93f7cd4c
+  data.tar.gz: 5ba7326c5428c8619c7f8d00762e2e4c93f94706fa62c05d6568c4888b22400f
 SHA512:
-  metadata.gz: a1d3edeb648e2cd152e479c03c4d52e6c697963ba8c677f42bceb6fa373896cd353f24e0f0bababed286cd323b71db265a98fccaa9ea5f425eb46027b7873e04
-  data.tar.gz: 74936554df31a3672f68985ff68f640f33faa4a798a2f7a53bcb2169eebcea6bf62a65ab3863771936013a166313a8f04cd5d564678481786cdaf1807bee1580
+  metadata.gz: b0092789df6c6f941c5625bdeab09e3428a18454eb146d5bb2e861939b117288be7f3fae207bc73acf6b2e357cd40d15fbff507a3270ef3c7eb96739c84152bf
+  data.tar.gz: e40e5f82fbd08e70fe0d279824b3ecb75dbc0e303e27a9dd53be38b7b9519aef7c08565e76d2a4640c32f586a3aa6d6d673ec9b26d5c8342cdf0b371bc56923d

data/app/controllers/rails_performance_controller.rb

@@ -3,11 +3,14 @@ class RailsPerformanceController < ActionController::Base
   def index
     @datasource = RailsPerformance::DataSource.new(RailsPerformance::QueryBuilder.compose_from(params))
 
-    @throughput_report      = RailsPerformance::ThroughputReport.new(@datasource.db)
-    @throughput_report_data = @throughput_report.data
+    @throughput_report         = RailsPerformance::Reports::ThroughputReport.new(@datasource.db)
+    @throughput_report_data    = @throughput_report.data
 
-    @global_report          = RailsPerformance::RequestsReport.new(@datasource.db, group: :controller_action_format, sort: :db_runtime_slowest)
-    @global_report_data     = @global_report.data
+    @response_time_report      = RailsPerformance::Reports::ResponseTimeReport.new(@datasource.db)
+    @response_time_report_data = @response_time_report.data
+
+    @global_report             = RailsPerformance::Reports::RequestsReport.new(@datasource.db, group: :controller_action_format, sort: :db_runtime_slowest)
+    @global_report_data        = @global_report.data
   end
 
   # def RailsPerformanceController.x

data/app/helpers/rails_performance_helper.rb

@@ -20,6 +20,6 @@ module RailsPerformanceHelper
       {}
     end
 
-    link_to title, rails_performance_path(options)
+    link_to title, rails_performance_path(options), target: '_blank'
   end
 end

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

@@ -5,7 +5,7 @@
 <%= javascript_include_tag 'https://code.highcharts.com/modules/accessibility.js' %>
 
 <script>
-  function showRequestsChart(div, data) {
+  function showTIRChart(div, data) {
     Highcharts.chart(div, {
         time: {
           timezone: 'Europe/Kiev'
@@ -65,4 +65,74 @@
         }]
     });
   };
+
+  function showRTChart(div, data) {
+    Highcharts.chart(div, {
+        time: {
+          timezone: 'Europe/Kiev'
+        },
+        chart: {
+            type: 'area',
+            zoomType: 'x',
+            backgroundColor: '#323a46'
+        },
+        title: {
+            text: ''
+        },
+        tooltip: {
+            formatter: function() {
+                if (this.y == 0) {
+                  return null;
+                }
+
+                return this.y + ' ms';
+            }
+        },
+        xAxis: {
+            type: 'datetime',
+            labels: {
+              style: {
+                color: "#a6b0cf"
+              }
+            }
+        },
+        yAxis: {
+            min: 0,
+            title: {
+                text: 'Time',
+                style: {
+                  color: "#f6f6f6"
+                }
+            },
+            labels: {
+              style: {
+                color: "#a6b0cf"
+              }
+            }
+        },
+        legend: {
+            enabled: false
+        },
+        exporting: {
+          buttons: {
+            contextButton: {
+              theme: {
+                fill: "#a6b0cf"
+              }
+            }
+          }
+        },
+        plotOptions: {
+            area: {
+              color: '#ff5b5b',
+              borderColor: '#ff5b5b',
+            }
+        },
+        series: [{
+            type: 'area',
+            name: 'Response Time',
+            data: data
+        }]
+    });
+  };
 </script>

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

@@ -12,7 +12,17 @@
 
 <div class="card">
   <h1>Throughput Report<h1>
-  <div id="chart"></div>
+  <div id="throughput_report_chart"></div>
+  <p class="hint">All requests (site visitors, search engines, bots, etc)</p>
+</div>
+
+<br/>
+<br/>
+<br/>
+
+<div class="card">
+  <h1>Average Response Time Report<h1>
+  <div id="response_time_report_chart"></div>
   <p class="hint">All requests (site visitors, search engines, bots, etc)</p>
 </div>
 
@@ -68,7 +78,10 @@
 <%= render '/rails_performance/js' %>
 
 <script>
-  var data = <%= raw @throughput_report_data.to_json %>;
-  showRequestsChart('chart', data);
+  var data1 = <%= raw @throughput_report_data.to_json %>;
+  showTIRChart('throughput_report_chart', data1);
+
+  var data2 = <%= raw @response_time_report_data.to_json %>;
+  showRTChart('response_time_report_chart', data2);
 </script>
 

data/lib/rails_performance.rb

@@ -5,9 +5,10 @@ require_relative "rails_performance/middleware.rb"
 require_relative "rails_performance/data_source.rb"
 require_relative "rails_performance/record.rb"
 require_relative "rails_performance/utils.rb"
-require_relative "rails_performance/base_report.rb"
-require_relative "rails_performance/requests_report.rb"
-require_relative "rails_performance/throughput_report.rb"
+require_relative "rails_performance/reports/base_report.rb"
+require_relative "rails_performance/reports/requests_report.rb"
+require_relative "rails_performance/reports/response_time_report.rb"
+require_relative "rails_performance/reports/throughput_report.rb"
 
 require "rails_performance/engine"
 

data/lib/rails_performance/reports/base_report.rb

@@ -0,0 +1,24 @@
+module RailsPerformance
+  module Reports
+    class BaseReport
+      attr_reader :db, :group, :sort
+
+      def initialize(db, group: nil, sort: nil)
+        @db     = db
+        @group  = group
+        @sort   = sort
+
+        set_defaults
+      end
+
+      def collect
+        db.group_by(group).values.inject([]) do |res, (k,v)|
+          res << yield(k, v)
+          res
+        end
+      end
+
+      def set_defaults; end
+    end
+  end
+end

data/lib/rails_performance/reports/requests_report.rb

@@ -0,0 +1,28 @@
+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{|a, b| b[sort] <=> a[sort]}
+      end
+    end
+  end
+end

data/lib/rails_performance/reports/response_time_report.rb

@@ -0,0 +1,37 @@
+module RailsPerformance
+  module Reports
+    class ResponseTimeReport < BaseReport
+      def set_defaults
+        @group ||= :datetime
+      end
+
+      def data
+        all     = {}
+        stop    = Time.at(60 * (Time.now.to_i / 60))
+        current = stop - RailsPerformance.duration
+        @data   = []
+        offset  = Time.current.utc_offset
+
+        # puts "current: #{current}"
+        # puts "stop: #{stop}"
+
+        # read current values
+        db.group_by(group).values.each do |(k, v)|
+          durations = v.collect{|e| e["duration"]}.compact
+          next if durations.empty?
+          all[k] = durations.sum.to_f / durations.count
+        end
+
+        # add blank columns
+        while current <= stop
+          views = all[current.strftime(MetricsCollector::FORMAT)] || 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/throughput_report.rb

@@ -0,0 +1,37 @@
+module RailsPerformance
+  module Reports
+    class ThroughputReport < BaseReport
+
+      def set_defaults
+        @group ||= :datetime
+      end
+
+      def data
+        all     = {}
+        stop    = Time.at(60 * (Time.now.to_i / 60))
+        current = stop - RailsPerformance.duration
+        @data   = []
+        offset  = Time.current.utc_offset
+
+        # puts "current: #{current}"
+        # puts "stop: #{stop}"
+
+        # read current values
+        db.group_by(group).values.each do |(k, v)|
+          all[k] = v.count
+        end
+
+        # add blank columns
+        while current <= stop
+          views = all[current.strftime(MetricsCollector::FORMAT)] || 0
+          @data << [(current.to_i + offset) * 1000, views.to_i]
+          current += 1.minute
+        end
+
+        # sort by time
+        @data.sort!
+      end
+
+    end
+  end
+end

data/lib/rails_performance/utils.rb

@@ -43,13 +43,5 @@ module RailsPerformance
       end
     end
 
-    # populate test data
-    # run in rails c
-    def Utils.populate_test_data(seed = 20, limit = 10000, days = 7)
-      limit.times do
-        t = rand(86400*days).seconds.ago # within last 7 days
-        RP.redis.hincrby(cache_key(t.to_date), field_key(t), rand(seed))
-      end
-    end
   end
 end

data/lib/rails_performance/version.rb

@@ -1,3 +1,3 @@
 module RailsPerformance
-  VERSION = '0.0.1.3'
+  VERSION = '0.0.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_performance
 version: !ruby/object:Gem::Version
-  version: 0.0.1.3
+  version: 0.0.1.4
 platform: ruby
 authors:
 - Igor Kasyanchuk
@@ -98,7 +98,6 @@ files:
 - app/views/rails_performance/index.html.erb
 - config/routes.rb
 - lib/rails_performance.rb
-- lib/rails_performance/base_report.rb
 - lib/rails_performance/collection.rb
 - lib/rails_performance/data_source.rb
 - lib/rails_performance/engine.rb
@@ -106,8 +105,10 @@ files:
 - lib/rails_performance/middleware.rb
 - lib/rails_performance/query_builder.rb
 - lib/rails_performance/record.rb
-- lib/rails_performance/requests_report.rb
-- lib/rails_performance/throughput_report.rb
+- lib/rails_performance/reports/base_report.rb
+- lib/rails_performance/reports/requests_report.rb
+- lib/rails_performance/reports/response_time_report.rb
+- lib/rails_performance/reports/throughput_report.rb
 - lib/rails_performance/utils.rb
 - lib/rails_performance/version.rb
 homepage: https://github.com/igorkasyanchuk/rails_performance

data/lib/rails_performance/base_report.rb

@@ -1,23 +0,0 @@
-module RailsPerformance
-  class BaseReport
-    attr_reader :db, :group, :sort
-
-    def initialize(db, group: nil, sort: nil)
-      @db     = db
-      @group  = group
-      @sort   = sort
-
-      set_defaults
-    end
-
-    def collect
-      db.group_by(group).values.inject([]) do |res, (k,v)|
-        res << yield(k, v)
-        res
-      end
-    end
-
-    def set_defaults
-    end
-  end
-end

data/lib/rails_performance/requests_report.rb

@@ -1,26 +0,0 @@
-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,
-          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[sort] <=> a[sort]}
-    end
-  end
-end

data/lib/rails_performance/throughput_report.rb

@@ -1,35 +0,0 @@
-module RailsPerformance
-  class ThroughputReport < BaseReport
-
-    def set_defaults
-      @group ||= :datetime
-    end
-
-    def data
-      all     = {}
-      stop    = Time.at(60 * (Time.now.to_i / 60))
-      current = stop - RailsPerformance.duration
-      @data   = []
-      offset  = Time.current.utc_offset
-
-      # puts "current: #{current}"
-      # puts "stop: #{stop}"
-
-      # read current values
-      db.group_by(group).values.each do |(k, v)|
-        all[k] = v.count
-      end
-
-      # add blank columns
-      while current <= stop
-        views = all[current.strftime(MetricsCollector::FORMAT)] || 0
-        @data << [(current.to_i + offset) * 1000, views.to_i]
-        current += 1.minute
-      end
-
-      # sort by time
-      @data.sort!
-    end
-
-  end
-end