rails_performance 0.0.1.15 → 0.0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b34ea6487b91922afd52e68bbd16cb1b5c4b40abd319331d99582b1f9ce582a8
-  data.tar.gz: 1ced2dab20079d409e3f16d4d87b551d732ab7cd793cbc53a3ff2f9aa7f407ba
+  metadata.gz: 2976dbd35d4929faa65ab1779fc84bdd8fbdaff9468c362db1cbe99d40d8067d
+  data.tar.gz: 2aba4eae55dec21500dcef2ab3fb80ddf3ff06858ab074d4f250e945603f84f2
 SHA512:
-  metadata.gz: 4fe53e913ddfb6a592022040537f6633edbb9ade17e021b2533d3095092a23cfecd127f8ec6d819e7566854c8f4cc4e0562b88717ef2ab61ec6f6d3ff0bd0838
-  data.tar.gz: 197b952a0d4144e01da79ed1315dab76adda1568f3078424c05f6c0b035196c7a827bd2d5d5384b23f8105eb5e93970772afaec59ba2b60d25bbddafffe60a2d
+  metadata.gz: fadbdb32d306a26c160c83c3e7976dc72b83665a98d2ceff97b36681258103f93fffcf12eff1124717c3e81207b9650addcdfbf3fbc2c413b86cd50d17376a15
+  data.tar.gz: e20f2d4a84a65299beff4b3d489db1af59c2dab792330ff8bacb7997970a159efeb4598ef15a8758b930c6eef3d3e7651239cb761844510b41c107f7b80f07ac

data/README.md

@@ -25,7 +25,7 @@ Create `config/initializers/rails_performance.rb`
 ```ruby
 RailsPerformance.setup do |config|
   config.redis    = Redis::Namespace.new("#{Rails.env}-rails-performance", redis: Redis.new)
-  config.duration = 24.hours
+  config.duration = 4.hours
 
   config.debug    = false # currently not used>
   config.enabled  = true
@@ -106,6 +106,11 @@ The idea of this gem grew from curriosity how many RPM my app receiving per day.
 - monitor active job (sidekiq)?
 - 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
 
 ## Contributing
 

data/app/controllers/base_controller.rb

@@ -1,6 +1,7 @@
 class BaseController < ActionController::Base
   layout 'rails_performance/layouts/rails_performance'
 
+  before_action :leave_finger_print
   before_action :verify_access
 
   if RailsPerformance.http_basic_authentication_enabled
@@ -11,6 +12,10 @@ class BaseController < ActionController::Base
 
   private
 
+  def leave_finger_print
+    Thread.current[:in_rails_performance] = true
+  end
+
   def verify_access
     result = RailsPerformance.verify_access_proc.call(self)
     redirect_to('/', error: 'Access Denied', status: 401) unless result

data/app/controllers/rails_performance_controller.rb

@@ -33,6 +33,15 @@ class RailsPerformanceController < BaseController
       end
     end
 
+    def trace
+      @report = RP::Reports::TraceReport.new(request_id: params[:id])
+      @data   = @report.data
+      respond_to do |format|
+        format.js {}
+        format.any { render plain: "Doesn't open in new window" }
+      end
+    end
+
     def crashes
       @datasource   = RP::DataSource.new(prepare_query({status_eq: 500}))
       db            = @datasource.db

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

@@ -0,0 +1,21 @@
+<table class="table is-fullwidth is-hoverable is-narrow is-size-7">
+  <tbody>
+    <% @data.each do |e| %>
+      <tr>
+        <td><%= e["group"] %></td>
+        <% if e["group"] == 'db' %>
+          <td>
+            <%= e["duration"] %> ms
+          </td>
+          <td>
+            <%= e["sql"] %>
+          </td>
+        <% elsif e["group"] == 'view' %>
+          <td colspan="2">
+            <%= e["message"] %>
+          </td>
+        <% end %>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

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

@@ -15,6 +15,7 @@
           <th data-sort="float">Duration</th>
           <th data-sort="float">Views</th>
           <th data-sort="float">DB</th>
+          <th></th>
         </tr>
       </thead>
       <tbody>
@@ -29,6 +30,11 @@
             <td><%= ms e[:duration] %></td>
             <td><%= ms e[:view_runtime] %></td>
             <td><%= ms e[:db_runtime] %></td>
+            <td>
+              <%= link_to rails_performance.rails_performance_trace_path(id: e[:request_id]), remote: true do %>
+                <span class="stats_icon_max"><%= icon 'activity' %></span>
+              <% end %>
+            </td>
           </tr>
         <% end %>
       </tbody>

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

@@ -41,6 +41,11 @@
   height: 16px;
 }
 
+.stats_icon_max svg {
+  width: 24px;
+  height: 24px;
+}
+
 .home_icon svg {
   width: 24px;
   height: 24px;

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

@@ -0,0 +1,4 @@
+window.panel.header.html(window.panel.close);
+window.panel.content.html("<%= j render '/rails_performance/trace' %>");
+
+showPanel();

data/config/routes.rb

@@ -5,6 +5,7 @@ RailsPerformance::Engine.routes.draw do
   get '/crashes'   => 'rails_performance#crashes', as: :rails_performance_crashes
   get '/recent'    => 'rails_performance#recent', as: :rails_performance_recent
 
+  get '/trace/:id'  => 'rails_performance#trace', as: :rails_performance_trace
   get '/summary'    => 'rails_performance#summary', as: :rails_performance_summary
 end
 

data/lib/rails_performance.rb

@@ -13,8 +13,9 @@ require_relative "rails_performance/reports/response_time_report.rb"
 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 "rails_performance/engine"
+require_relative "rails_performance/reports/trace_report.rb"
+require_relative "rails_performance/extensions/capture_everything.rb"
+require_relative "rails_performance/models/current_request.rb"
 
 module RailsPerformance
   FORMAT = "%Y%m%dT%H%M"
@@ -23,7 +24,7 @@ module RailsPerformance
   @@redis = Redis::Namespace.new("#{::Rails.env}-rails-performance", redis: Redis.new)
 
   mattr_accessor :duration
-  @@duration = 24.hours
+  @@duration = 4.hours
 
   mattr_accessor :debug
   @@debug = false
@@ -53,4 +54,6 @@ module RailsPerformance
 
 end
 
-RP = RailsPerformance
+RP = RailsPerformance
+
+require "rails_performance/engine"

data/lib/rails_performance/engine.rb

@@ -5,21 +5,20 @@ 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::Rails::Middleware
+    if RailsPerformance.enabled
+      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::Instrument::MetricsCollector.new
+        )
 
-    initializer :configure_metrics, after: :initialize_logger do
-      ActiveSupport::Notifications.subscribe(
-        "process_action.action_controller",
-        RailsPerformance::Instrument::MetricsCollector.new
-      )
+        config.after_initialize do |app|
+          ActionView::LogSubscriber.send :prepend, RailsPerformance::Extensions::View
+          ActiveRecord::LogSubscriber.send :prepend, RailsPerformance::Extensions::Db
+        end
+      end
     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/extensions/capture_everything.rb

@@ -0,0 +1,33 @@
+module RailsPerformance
+  module Extensions
+    module View
+
+      def info(&block)
+        CurrentRequest.current.store({
+          group: :view,
+          message: block.call
+        })
+        super(&block)
+      end
+
+    end
+  end
+end
+
+module RailsPerformance
+  module Extensions
+    module Db
+
+      def sql(event)
+        CurrentRequest.current.store({
+          group: :db,
+          duration: event.duration.round(2),
+          sql: event.payload[:sql]
+        })
+        super(event)
+      end
+
+    end
+  end
+end
+

data/lib/rails_performance/models/current_request.rb

@@ -0,0 +1,27 @@
+module RailsPerformance
+  class CurrentRequest
+    attr_reader :request_id, :storage
+
+    def CurrentRequest.init
+      Thread.current[:rp_current_request] ||= CurrentRequest.new(SecureRandom.hex(16))
+    end
+
+    def CurrentRequest.current
+      CurrentRequest.init
+    end
+
+    def CurrentRequest.cleanup
+      Thread.current[:rp_current_request] = nil
+    end
+
+    def initialize(request_id)
+      @request_id = request_id
+      @storage    = []
+    end
+
+    def store(options = {})
+      @storage << options.merge(time: Time.now.to_i)
+    end
+
+  end
+end

data/lib/rails_performance/models/record.rb

@@ -1,7 +1,7 @@
 module RailsPerformance
   module Models
     class Record
-      attr_reader :controller, :action, :format, :status, :datetime, :datetimei, :method, :path
+      attr_reader :controller, :action, :format, :status, :datetime, :datetimei, :method, :path, :request_id
 
       # key = performance|
       # controller|HomeController|
@@ -12,6 +12,7 @@ module RailsPerformance
       # datetimei|1579861423|
       # method|GET|
       # path|/|
+      # request_id|454545454545454545|
       # END
       # = {"view_runtime":8.444603008683771,"db_runtime":0,"duration":9.216095000000001}
       # value = JSON
@@ -28,6 +29,7 @@ module RailsPerformance
         @datetimei  = items[12]
         @method     = items[14]
         @path       = items[16]
+        @request_id = items[18]
       end
 
       def value

data/lib/rails_performance/rails/middleware.rb

@@ -8,8 +8,9 @@ module RailsPerformance
       def call(env)
         @status, @headers, @response = @app.call(env)
 
-        if record = Thread.current["RP_request_info"]
-          record[:status] ||= @status
+        if !Thread.current[:in_rails_performance] && record = Thread.current["RP_request_info"]
+          record[:status]   ||= @status
+          record[:request_id] = CurrentRequest.current.request_id
 
           # rand(500).times do |e|
           #   finished               = Time.now - rand(2000).minutes
@@ -18,12 +19,13 @@ module RailsPerformance
           #   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)
+          #   RP::Utils.log_request_in_redis(record)
           # end
 
-          RP::Utils.log_in_redis(record)
-
+          RP::Utils.log_trace_in_redis(CurrentRequest.current.request_id, CurrentRequest.current.storage)
+          RP::Utils.log_request_in_redis(record)
           Thread.current["RP_request_info"] = nil
+          CurrentRequest.cleanup
         end
 
         [@status, @headers, @response]

data/lib/rails_performance/reports/recent_requests_report.rb

@@ -1,7 +1,7 @@
 module RailsPerformance
   module Reports
     class RecentRequestsReport < BaseReport
-      TIME_WINDOW = 60 # 60 minutes
+      TIME_WINDOW = 60.minutes
 
       def set_defaults
         @sort ||= :datetime
@@ -16,13 +16,14 @@ module RailsPerformance
             status: record.status,
             method: record.method,
             path: record.path,
+            request_id: record.request_id,
             datetime: Time.at(record.datetimei.to_i),
             duration: record.value['duration'],
             db_runtime: record.value['db_runtime'],
             view_runtime: record.value['view_runtime'],
           }
         end
-        .select{|e| e if e[:datetime] >= TIME_WINDOW.minutes.ago}
+        .select{|e| e if e[:datetime] >= TIME_WINDOW.ago}
         .sort{|a, b| b[sort] <=> a[sort]}
       end
     end

data/lib/rails_performance/reports/trace_report.rb

@@ -0,0 +1,18 @@
+module RailsPerformance
+  module Reports
+    class TraceReport
+      attr_reader :request_id
+
+      def initialize(request_id:)
+        @request_id = request_id
+      end
+
+      def data
+        key   = "trace|#{request_id}"
+        JSON.parse(RP.redis.get(key).presence || '[]')
+      end
+    end
+
+
+  end
+end

data/lib/rails_performance/utils.rb

@@ -12,9 +12,9 @@ module RailsPerformance
       now.strftime("%H:%M")
     end
 
-    def Utils.log_in_redis(e)
+    def Utils.log_request_in_redis(e)
       value = e.slice(:view_runtime, :db_runtime, :duration)
-      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]}|END"
+      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"
       # puts "          value  --->  #{value.to_json}\n\n"
@@ -25,6 +25,17 @@ module RailsPerformance
       true
     end
 
+    def Utils.log_trace_in_redis(request_id, value)
+      key = "trace|#{request_id}"
+
+      # puts "  [SAVE]    key  --->  #{key}\n"
+      # puts "          value  --->  #{value.to_json}\n\n"
+      # pp value
+
+      RP.redis.set(key, value.to_json)
+      RP.redis.expire(key, RailsPerformance::Reports::RecentRequestsReport::TIME_WINDOW.to_i)
+    end
+
     def Utils.fetch_from_redis(query)
       #puts "\n\n   [REDIS QUERY]   -->   #{query}\n\n"
 

data/lib/rails_performance/version.rb

@@ -1,3 +1,3 @@
 module RailsPerformance
-  VERSION = '0.0.1.15'
+  VERSION = '0.0.1.16'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_performance
 version: !ruby/object:Gem::Version
-  version: 0.0.1.15
+  version: 0.0.1.16
 platform: ruby
 authors:
 - Igor Kasyanchuk
@@ -105,6 +105,7 @@ files:
 - app/helpers/rails_performance_helper.rb
 - app/views/rails_performance/_panel.html.erb
 - app/views/rails_performance/_summary.html.erb
+- app/views/rails_performance/_trace.html.erb
 - app/views/rails_performance/crashes.html.erb
 - app/views/rails_performance/index.html.erb
 - app/views/rails_performance/javascripts/_javascripts.html.erb
@@ -123,12 +124,15 @@ files:
 - app/views/rails_performance/stylesheets/panel.css
 - app/views/rails_performance/stylesheets/style.css
 - app/views/rails_performance/summary.js.erb
+- app/views/rails_performance/trace.js.erb
 - config/routes.rb
 - lib/rails_performance.rb
 - lib/rails_performance/data_source.rb
 - lib/rails_performance/engine.rb
+- lib/rails_performance/extensions/capture_everything.rb
 - lib/rails_performance/instrument/metrics_collector.rb
 - lib/rails_performance/models/collection.rb
+- lib/rails_performance/models/current_request.rb
 - lib/rails_performance/models/record.rb
 - lib/rails_performance/rails/middleware.rb
 - lib/rails_performance/rails/query_builder.rb
@@ -139,6 +143,7 @@ files:
 - 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/reports/trace_report.rb
 - lib/rails_performance/utils.rb
 - lib/rails_performance/version.rb
 homepage: https://github.com/igorkasyanchuk/rails_performance
@@ -160,8 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Track number of requests to your app