rails_performance 0.0.1.6 → 0.0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a1fe4e6d5f14c9d084580147243e3276892bbebdbc6ac301949db7b29295aee
-  data.tar.gz: c54c0c66a44cd8a5acee8de72c7455c0190e926983f28142a078f407249a6b5d
+  metadata.gz: ad863c06b721b0cc4310bc0ed47ea24260d1d4506b84ff77dc89884efe039407
+  data.tar.gz: 4cd6dfae47e6331e1c0094566f9777e65b8eaec9eaf4b4defdbc0e26e0b8a758
 SHA512:
-  metadata.gz: f3eaaee2a6d6d31c2552c0688d7a4ae14643fee8632761f84452416abf9afe703eda7dd76f3c758421fc0bd3b43d579e6d4abfc9b5a38d902ec5d0ba320a459f
-  data.tar.gz: e1a68247409672778b646d6d9b58b96f697fbb7f01c8a21d59f91bfa24d41a21f2c52d2b5d86c5448181e3e2c6810ab8ce0d349f1d5fd06c358c0261182fa6ad
+  metadata.gz: 9199bca9141f1e8a9753b71cd517f592ab611ae8b00bf2b41bb7f4585b2189661f9ebcead00614483e0878b2cc6c87569edc978efa252f9a27767d87ef169adf
+  data.tar.gz: 40cacc58ffbbe33da582912aee967ab64cf71f527ce5bcc60d684d84787f21c967e2ce4e6ddbba33580c544a275776a09ed8e166dce41b833958432544c5f524

data/app/controllers/rails_performance_controller.rb

@@ -1,8 +1,8 @@
 class RailsPerformanceController < ActionController::Base
 
   def index
-    @datasource = RP::DataSource.new(RP::QueryBuilder.compose_from(params))
-    db          = @datasource.db
+    @datasource                = RP::DataSource.new(RP::Rails::QueryBuilder.compose_from(params))
+    db                         = @datasource.db
 
     @throughput_report         = RP::Reports::ThroughputReport.new(db)
     @throughput_report_data    = @throughput_report.data
@@ -12,10 +12,17 @@ class RailsPerformanceController < ActionController::Base
 
     @global_report             = RP::Reports::RequestsReport.new(db, group: :controller_action_format, sort: :db_runtime_slowest)
     @global_report_data        = @global_report.data
+
+    @crash_ds                  = RP::DataSource.new(RP::Rails::QueryBuilder.compose_from({status_eq: 500}))
+    crash_db                   = @crash_ds.db
+    @crash_report              = RP::Reports::CrashReport.new(crash_db)
+    @crash_report_data         = @crash_report.data
+
+#    binding.pry
   end
 
   def breakdown
-    @datasource = RP::DataSource.new(RP::QueryBuilder.compose_from(params))
+    @datasource = RP::DataSource.new(RP::Rails::QueryBuilder.compose_from(params))
     db          = @datasource.db
 
     @breakdown_report      = RP::Reports::BreakdownReport.new(db, title: "Breakdown Report: #{@datasource.q.to_param}")

data/app/helpers/rails_performance_helper.rb

@@ -23,7 +23,26 @@ module RailsPerformanceHelper
     link_to title, rails_performance_path(options), target: '_blank'
   end
 
+  def status_tag(status)
+    klass = case status.to_s
+    when /^5/
+      "tag is-danger"
+    when /^4/
+      "tag is-warning"
+    when /^3/
+      "tag is-info"
+    when /^2/
+      "tag is-success"
+    else
+      nil
+    end
+    content_tag(:span, class: klass) do
+      status
+    end
+  end
+
   def stats_icon
+    # https://www.iconfinder.com/iconsets/vivid
     '<?xml version="1.0" ?><svg height="48" id="graph-bar" viewBox="0 0 48 48" width="48" xmlns="http://www.w3.org/2000/svg"><defs><style>      .vi-primary {        fill: #FF6E6E;      }      .vi-primary, .vi-accent {        stroke: #fff;        stroke-linecap: round;        stroke-width: 0;      }      .vi-accent {        fill: #0C0058;      }    </style></defs><rect class="vi-accent" height="4" width="36" x="6" y="35"/><path class="vi-primary" d="M9,20h5V35H9V20Zm8,5h5V35H17V25Zm8-9h5V35H25V16Zm8-7h5V35H33V9Z"/></svg>'
   end
 

data/app/views/javascripts/app.js

@@ -10,6 +10,23 @@ function showTIRChart(div, data) {
       title: {
           text: ''
       },
+      tooltip: {
+          borderWidth: 0,
+          backgroundColor: 'yellow',
+          pointFormat: '{point.y}',
+          //headerFormat: '',
+          shadow: false,
+          style: {
+              fontSize: '16px',
+              color: '#000',
+          },
+          formatter: function() {
+              if (this.y == 0) {
+                return "";
+              }
+              return this.y + ' rpm';
+          }
+      },
       xAxis: {
           crosshair: true,
           type: 'datetime',
@@ -52,10 +69,15 @@ function showTIRChart(div, data) {
       },
       series: [{
           type: 'area',
-          name: 'Requests per minute',
+          name: 'RPM',
           data: data,
           fillOpacity: 0.3,
-          lineWidth: 1
+          lineWidth: 1,
+          states: {
+            hover: {
+              lineWidth: 1
+            }
+          }
       }]
   });
 };
@@ -74,15 +96,8 @@ function showRTChart(div, data) {
       },
 
       tooltip: {
-          // positioner: function () {
-          //     return {
-          //         // right aligned
-          //         x: this.chart.chartWidth - this.label.width - 30,
-          //         y: 5 // align to title
-          //     };
-          // },
           borderWidth: 0,
-          backgroundColor: 'none',
+          backgroundColor: 'yellow',
           pointFormat: '{point.y}',
           //headerFormat: '',
           shadow: false,
@@ -142,7 +157,12 @@ function showRTChart(div, data) {
           name: 'Response Time',
           data: data,
           fillOpacity: 0.3,
-          lineWidth: 1
+          lineWidth: 1,
+          states: {
+            hover: {
+              lineWidth: 1
+            }
+          }
       }]
   });
 };

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

@@ -0,0 +1,41 @@
+<div class="card">
+  <div class="card-content">
+    <h2 class="title">Crash Report<h1>
+    <table class="table is-fullwidth is-hoverable is-narrow">
+      <thead>
+        <tr>
+          <th>Datetime</th>
+          <th>Controller#Action</th>
+          <th>Format</th>
+          <th>Method</th>
+          <th>Path</th>
+          <th>Status</th>
+          <th>Duration</th>
+          <th>Views</th>
+          <th>DB</th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @crash_report_data.each do |e| %>
+          <tr>
+            <td><%= l e[:datetime], format: :short %></td>
+            <td><%= e[:controller] + '#' + e[:action] %></td>
+            <td><%= e[:format] %></td>
+            <td><%= e[:method] %></td>
+            <td>
+              <% if e[:method] == 'GET' %>
+                <%= link_to e[:path], e[:path], target: '_blank' %>
+              <% else %>
+                <%= e[:path] %>
+              <% end %>
+            </td>
+            <td><%= status_tag e[:status] %></td>
+            <td><%= round_it e[:duration] %> ms</td>
+            <td><%= round_it e[:view_runtime] %> ms</td>
+            <td><%= round_it e[:db_runtime] %> ms</td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>

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

@@ -3,30 +3,38 @@
 <div class="card">
   <div class="card-content">
     <h1 class="title"><%= @breakdown_report.title %><h1>
-    <table class="table is-fullwidth">
+    <table class="table is-fullwidth is-hoverable is-narrow">
       <thead>
         <tr>
-          <th>Controller # Action</th>
-          <th>Path</th>
+          <th>Datetime</th>
+          <th>Controller#Action</th>
           <th>Method</th>
+          <th>Path</th>
           <th>Format</th>
+          <th>Status</th>
           <th>Duration</th>
           <th>Views</th>
           <th>DB</th>
-          <th>Datetime</th>
         </tr>
       </thead>
       <tbody>
         <% @breakdown_report_data.each do |e| %>
           <tr>
+            <td><%= l e[:datetime], format: :short %></td>
             <td><%= e[:controller] + '#' + e[:action]  %></td>
-            <td><%= e[:path] %></td>
             <td><%= e[:method] %></td>
+            <td>
+              <% if e[:method] == 'GET' %>
+                <%= link_to e[:path], e[:path], target: '_blank' %>
+              <% else %>
+                <%= e[:path] %>
+              <% end %>
+            </td>
             <td><%= e[:format] %></td>
-            <td><%= round_it e[:duration] %></td>
-            <td><%= round_it e[:view_runtime] %></td>
-            <td><%= round_it e[:db_runtime] %></td>
-            <td><%= l e[:datetime], format: :short %></td>
+            <td><%= status_tag e[:status] %></td>
+            <td><%= round_it e[:duration] %> ms</td>
+            <td><%= round_it e[:view_runtime] %> ms</td>
+            <td><%= round_it e[:db_runtime] %> ms</td>
           </tr>
         <% end %>
       </tbody>

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

@@ -12,6 +12,8 @@
   </div>
 </div>
 
+<br/>
+
 <div class="card">
   <div class="card-content">
     <h2 class="title">Average Response Time Report<h1>
@@ -20,15 +22,17 @@
   </div>
 </div>
 
+<br/>
+
 <div class="card">
   <div class="card-content">
     <h2 class="title">Requests (path, total number, average response time)<h1>
-    <table class="table is-fullwidth">
+    <table class="table is-fullwidth is-hoverable is-narrow">
       <thead>
         <tr>
           <th colspan='3'>Name</th>
-          <th colspan='3'>Average (ms)</th>
-          <th colspan='3'>Slowest (ms)</th>
+          <th colspan='3'>Average</th>
+          <th colspan='3'>Slowest</th>
         </tr>
         <tr>
           <th>Controller#Action</th>
@@ -53,14 +57,14 @@
                 <%= raw(stats_icon) %>
               <% end %>
             </td>
-            <td><%= groups[1]&.upcase %></td>
+            <td><%= statistics_link groups[1]&.upcase, @global_report, e[:group] %></td>
             <td><%= e[:count] %></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>
+            <td><%= round_it e[:duration_average] %> ms</td>
+            <td><%= round_it e[:view_runtime_average] %> ms</td>
+            <td><%= round_it e[:db_runtime_average] %> ms</td>
+            <td><%= round_it e[:duration_slowest] %> ms</td>
+            <td><%= round_it e[:view_runtime_slowest] %> ms</td>
+            <td><%= round_it e[:db_runtime_slowest] %> ms</td>
           </tr>
         <% end %>
       </tbody>
@@ -68,6 +72,10 @@
   </div>
 </div>
 
+<br/>
+
+<%= render '/rails_performance/crash_report' %>
+
 <% content_for :on_load do %>
   <script>
     var data1 = <%= raw @throughput_report_data.to_json %>;

data/lib/rails_performance.rb

@@ -1,12 +1,13 @@
 require "redis"
 require "redis-namespace"
-require_relative "rails_performance/query_builder.rb"
-require_relative "rails_performance/middleware.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/record.rb"
 require_relative "rails_performance/utils.rb"
 require_relative "rails_performance/reports/base_report.rb"
 require_relative "rails_performance/reports/requests_report.rb"
+require_relative "rails_performance/reports/crash_report.rb"
 require_relative "rails_performance/reports/response_time_report.rb"
 require_relative "rails_performance/reports/throughput_report.rb"
 require_relative "rails_performance/reports/breakdown_report.rb"
@@ -14,8 +15,10 @@ require_relative "rails_performance/reports/breakdown_report.rb"
 require "rails_performance/engine"
 
 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 = 24.hours

data/lib/rails_performance/data_source.rb

@@ -11,7 +11,7 @@ module RailsPerformance
 
     def db
       result = RP::Models::Collection.new
-      RP::Utils.days.times do |e|
+      (RP::Utils.days + 1).times do |e|
         RP::DataSource.new(q: self.q.merge({ on: e.days.ago.to_date })).add_to(result)
       end
       result
@@ -29,7 +29,7 @@ module RailsPerformance
     end
 
     def store
-#      puts "\n\n   [REDIS QUERY]   -->   #{query}\n\n"
+      #puts "\n\n   [REDIS QUERY]   -->   #{query}\n\n"
 
       keys   = RP.redis.keys(query)
       return [] if keys.blank?

data/lib/rails_performance/engine.rb

@@ -1,17 +1,17 @@
-require_relative './middleware.rb'
+require_relative './rails/middleware.rb'
 require_relative './models/collection.rb'
-require_relative './metrics_collector.rb'
+require_relative './instrument/metrics_collector.rb'
 
 module RailsPerformance
   class Engine < ::Rails::Engine
 
     #config.app_middleware.use RailsPerformance::Middleware
-    config.app_middleware.insert_after ActionDispatch::Executor, RailsPerformance::Middleware
+    config.app_middleware.insert_after ActionDispatch::Executor, RailsPerformance::Rails::Middleware
 
     initializer :configure_metrics, after: :initialize_logger do
       ActiveSupport::Notifications.subscribe(
         "process_action.action_controller",
-        RailsPerformance::MetricsCollector.new
+        RailsPerformance::Instrument::MetricsCollector.new
       )
     end
 

data/lib/rails_performance/instrument/metrics_collector.rb

@@ -0,0 +1,39 @@
+module RailsPerformance
+  module Instrument
+    class MetricsCollector
+      # payload
+      # {
+      #   controller: "PostsController",
+      #   action: "index",
+      #   params: {"action" => "index", "controller" => "posts"},
+      #   headers: #<ActionDispatch::Http::Headers:0x0055a67a519b88>,
+      #   format: :html,
+      #   method: "GET",
+      #   path: "/posts",
+      #   status: 200,
+      #   view_runtime: 46.848,
+      #   db_runtime: 0.157
+      # }
+
+      def call(event_name, started, finished, event_id, payload)
+        event = ActiveSupport::Notifications::Event.new(event_name, started, finished, event_id, payload)
+
+        record = {
+          controller: event.payload[:controller],
+          action: event.payload[:action],
+          format: event.payload[:format],
+          status: event.payload[:status],
+          datetime: finished.strftime(RailsPerformance::FORMAT),
+          datetimei: finished.to_i,
+          method: event.payload[:method],
+          path: event.payload[:path],
+          view_runtime: event.payload[:view_runtime],
+          db_runtime: event.payload[:db_runtime],
+          duration: event.duration
+        }
+
+        Thread.current["RP_request_info"] = record
+      end
+    end
+  end
+end

data/lib/rails_performance/models/record.rb

@@ -31,7 +31,7 @@ module RailsPerformance
       end
 
       def value
-        @value ||= JSON.parse(@json)
+        @value ||= JSON.parse(@json || "{}")
       end
 
       def controller_action

data/lib/rails_performance/rails/middleware.rb

@@ -0,0 +1,34 @@
+module RailsPerformance
+  module Rails
+    class Middleware
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        @status, @headers, @response = @app.call(env)
+
+        if record = Thread.current["RP_request_info"]
+          record[:status] ||= @status
+
+          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_in_redis(record)
+          end
+
+          RP::Utils.log_in_redis(record)
+
+          Thread.current["RP_request_info"] = nil
+        end
+
+        [@status, @headers, @response]
+      end
+
+    end
+  end
+end

data/lib/rails_performance/rails/query_builder.rb

@@ -0,0 +1,20 @@
+module RailsPerformance
+  module Rails  
+    class QueryBuilder
+
+      def QueryBuilder.compose_from(params)
+        result = {}
+
+        result[:controller] = params[:controller_eq]
+        result[:action]     = params[:action_eq]
+        result[:format]     = params[:format_eq]
+        result[:status]     = params[:status_eq]
+
+        result.delete_if {|k, v| v.nil?}
+
+        { q: result }
+      end
+
+    end
+  end
+end

data/lib/rails_performance/reports/crash_report.rb

@@ -0,0 +1,28 @@
+module RailsPerformance
+  module Reports
+    class CrashReport < BaseReport
+      def set_defaults
+        @sort ||= :datetime
+      end
+
+      def data
+        db.data.collect do |record|
+          {
+            controller: record.controller,
+            action: record.action,
+            format: record.format,
+            status: record.status,
+            method: record.method,
+            path: record.path,
+            datetime: Time.parse(record.datetime),
+            duration: record.value['duration'],
+            db_runtime: record.value['db_runtime'],
+            view_runtime: record.value['view_runtime'],
+          }
+        end.sort{|a, b| b[sort] <=> a[sort]}
+      end
+    end
+
+
+  end
+end

data/lib/rails_performance/reports/response_time_report.rb

@@ -24,7 +24,7 @@ module RailsPerformance
 
         # add blank columns
         while current <= stop
-          views = all[current.strftime(MetricsCollector::FORMAT)] || 0
+          views = all[current.strftime(RailsPerformance::FORMAT)] || 0
           @data << [(current.to_i + offset) * 1000, views.round(2)]
           current += 1.minute
         end

data/lib/rails_performance/reports/throughput_report.rb

@@ -23,7 +23,7 @@ module RailsPerformance
 
         # add blank columns
         while current <= stop
-          views = all[current.strftime(MetricsCollector::FORMAT)] || 0
+          views = all[current.strftime(RailsPerformance::FORMAT)] || 0
           @data << [(current.to_i + offset) * 1000, views.to_i]
           current += 1.minute
         end

data/lib/rails_performance/version.rb

@@ -1,3 +1,3 @@
 module RailsPerformance
-  VERSION = '0.0.1.6'
+  VERSION = '0.0.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_performance
 version: !ruby/object:Gem::Version
-  version: 0.0.1.6
+  version: 0.0.1.8
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2020-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -96,6 +96,7 @@ files:
 - app/views/javascripts/_javascripts.html.erb
 - app/views/javascripts/app.js
 - app/views/layouts/rails_performance.html.erb
+- app/views/rails_performance/_crash_report.html.erb
 - app/views/rails_performance/breakdown.html.erb
 - app/views/rails_performance/index.html.erb
 - app/views/stylesheets/_stylesheets.html.erb
@@ -105,13 +106,14 @@ files:
 - lib/rails_performance.rb
 - lib/rails_performance/data_source.rb
 - lib/rails_performance/engine.rb
-- lib/rails_performance/metrics_collector.rb
-- lib/rails_performance/middleware.rb
+- lib/rails_performance/instrument/metrics_collector.rb
 - lib/rails_performance/models/collection.rb
 - lib/rails_performance/models/record.rb
-- lib/rails_performance/query_builder.rb
+- lib/rails_performance/rails/middleware.rb
+- lib/rails_performance/rails/query_builder.rb
 - lib/rails_performance/reports/base_report.rb
 - lib/rails_performance/reports/breakdown_report.rb
+- lib/rails_performance/reports/crash_report.rb
 - lib/rails_performance/reports/requests_report.rb
 - lib/rails_performance/reports/response_time_report.rb
 - lib/rails_performance/reports/throughput_report.rb

data/lib/rails_performance/metrics_collector.rb

@@ -1,40 +0,0 @@
-module RailsPerformance
-  class MetricsCollector
-    FORMAT = "%Y%m%dT%H%M"
-
-    # payload
-    # {
-    #   controller: "PostsController",
-    #   action: "index",
-    #   params: {"action" => "index", "controller" => "posts"},
-    #   headers: #<ActionDispatch::Http::Headers:0x0055a67a519b88>,
-    #   format: :html,
-    #   method: "GET",
-    #   path: "/posts",
-    #   status: 200,
-    #   view_runtime: 46.848,
-    #   db_runtime: 0.157
-    # }
-
-    def call(event_name, started, finished, event_id, payload)
-      event = ActiveSupport::Notifications::Event.new(event_name, started, finished, event_id, payload)
-
-      record = {
-        controller: event.payload[:controller],
-        action: event.payload[:action],
-        format: event.payload[:format],
-        status: event.payload[:status],
-        datetime: finished.strftime(RailsPerformance::MetricsCollector::FORMAT),
-        datetimei: finished.to_i,
-        method: event.payload[:method],
-        path: event.payload[:path],
-        view_runtime: event.payload[:view_runtime],
-        db_runtime: event.payload[:db_runtime],
-        duration: event.duration
-      }
-
-      Thread.current["RP_request_info"] = record
-    end
-
-  end
-end

data/lib/rails_performance/middleware.rb

@@ -1,32 +0,0 @@
-module RailsPerformance
-  class Middleware
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      @status, @headers, @response = @app.call(env)
-
-      if record = Thread.current["RP_request_info"]
-        record[:status] ||= @status
-
-        # rand(100).times do |e|
-        #   finished               = Time.now - rand(2000).minutes
-        #   record[:datetime]      = finished.strftime(RailsPerformance::MetricsCollector::FORMAT)
-        #   record[:datetimei]     = finished.to_i
-        #   record[:duration]      = 50 + rand(100) + rand(50.0)
-        #   record[:db_runtime]    = rand(50.0)
-        #   record[:view_runtime]  = rand(50.0)
-        #   RP::Utils.log_in_redis(record)
-        # end
-
-        RP::Utils.log_in_redis(record)
-
-        Thread.current["RP_request_info"] = nil
-      end
-
-      [@status, @headers, @response]
-    end
-
-  end
-end

data/lib/rails_performance/query_builder.rb

@@ -1,17 +0,0 @@
-module RailsPerformance
-  class QueryBuilder
-
-    def QueryBuilder.compose_from(params)
-      result = {}
-
-      result[:controller] = params[:controller_eq]
-      result[:action]     = params[:action_eq]
-      result[:format]     = params[:format_eq]
-
-      result.delete_if {|k, v| v.nil?}
-
-      { q: result }
-    end
-
-  end
-end