rails_performance 0.0.1.19 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56c91669685f1dc4c4ee8830b921acde7a98642b7065c9ffbcb939fca355abcf
-  data.tar.gz: 14d2bb35561e4af0a563791ae4efdae812e98235c7e692cf735346f4bd61e8f4
+  metadata.gz: fe073c7658af65303c6efc61dbaa973edba22d21c2991e715d523b6f4c96dc5f
+  data.tar.gz: bf7780ef55eab59d2974b990eba4e2afad26b78683f685fb8383b4df4d8ada30
 SHA512:
-  metadata.gz: a9ab71a3a5140b1c1d403f08a6fe5c36a023b3c5839ed88b3976d0e35315364a7b335b5ec17b007b5fd2bf32067a1a7f687b6e8e356e44bd8ecd9d85af061162
-  data.tar.gz: 7c956c17f1e3b4b24f715331c1df68afb8ea9f2a45876a6a8bf1bd097a17982035a2de528d18a7a7ca5becd63c06a0e6edd50aa7ee2f20e129c2c5a4acaee8fd
+  metadata.gz: b223eb60dc1dc48c64a577d39d2bf34073ff916d0b73ad5f507a74bedc0f9a2aa5af5cc33ec9bc063b12cc441a572f99d4e8c68362935f74f2f9084c6d8b6ca0
+  data.tar.gz: 7b030743ca075f02c38b4448ec0c1ad369a09d094dc381aba5c834c40ee245ccfe9511c939fa7d08e0e42d253c9b06817d4b6bc7d80c6b9d5f8bab7835472e7e

data/README.md

@@ -6,11 +6,12 @@ This is **simple and free alternative** to New Relic, Datadog or other similar s
 
 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 log in recent requests
+- simple 500-crashes reports
 
 All data is stored in local Redis and not sent to 3rd party servers.
 
@@ -83,6 +84,8 @@ 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.
@@ -91,27 +94,20 @@ The idea of this gem grew from curriosity how many RPM my app receiving per day.
 
 - documentation in Readme
 - 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?
 
 ## Contributing
 

data/app/controllers/rails_performance_controller.rb

@@ -34,6 +34,7 @@ class RailsPerformanceController < BaseController
     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|

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 >= 100
+        '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)

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>
@@ -19,4 +20,6 @@
       </tr>
     <% end %>
   </tbody>
-</table>
+</table>
+
+<br/>

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/recent.html.erb

@@ -1,7 +1,7 @@
 <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 +19,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/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/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",
@@ -17,7 +19,9 @@ module RailsPerformance
           ActionView::LogSubscriber.send :prepend, RailsPerformance::Extensions::View
           ActiveRecord::LogSubscriber.send :prepend, RailsPerformance::Extensions::Db
         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/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/record.rb

@@ -3,6 +3,16 @@ module RailsPerformance
     class Record
       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|
@@ -43,6 +53,31 @@ 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(value['duration']),
+          view_runtime: ms(value['view_runtime']),
+          db_runtime: ms(value['db_runtime']),
+          HTTP_REFERER: value['HTTP_REFERER']
+        }
+      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/rails/middleware.rb

@@ -8,17 +8,28 @@ module RailsPerformance
       def call(env)
         @status, @headers, @response = @app.call(env)
 
-        if record = Thread.current["RP_request_info"]
+        #t = Time.now
+        if record = CurrentRequest.current.record
           begin
-            record[:status]   ||= @status
+            record[:status]   ||= @status # for 500 errors
             record[:request_id] = CurrentRequest.current.request_id
+
+            # capture referer from where this page was opened
+            if record[:status] == 404
+              record[:HTTP_REFERER] = env["HTTP_REFERER"]
+            end
+
+            # 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
-            Thread.current["RP_request_info"] = nil
+            # 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/utils.rb

@@ -13,7 +13,7 @@ module RailsPerformance
     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"

data/lib/rails_performance/version.rb

@@ -1,3 +1,3 @@
 module RailsPerformance
-  VERSION = '0.0.1.19'
-end
+  VERSION = '0.9.0'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_performance
 version: !ruby/object:Gem::Version
-  version: 0.0.1.19
+  version: 0.9.0
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-10 00:00:00.000000000 Z
+date: 2020-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails