rails_performance 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d7ef7cc9ce348212f4857dd78032c84766dec51b7fa78fd0ab3206f08bb0b8c
-  data.tar.gz: 380ae54a89db6e34827459e768333a39cfe5de6e3cffb8104b70ef8af8fc11cf
+  metadata.gz: da39e641dcac93526efb39f08e39cff972b5c09c04956b48bf1a30a6988fc24f
+  data.tar.gz: b7b0615aab822ec3742cc43ee74f45b63f1141cb79c246e4bc58c1d1b30b01f0
 SHA512:
-  metadata.gz: 3265a68a5f3c9a29d6ff0db5e65094f036b9f58fb082a03d177ac4d105bdd532824fb7e757919f512edf103dfc75156f920c70b65ef134005bc3f0447e2c46a6
-  data.tar.gz: 544fec0f5be1aa315e8185dd3abac2e2055f069c6290a0b68ed95e09b387d59bd3f82a5965c6175bc9e0c611e80890ae0d88e4acedffeae09324d34a6262935e
+  metadata.gz: 9ed2ae6cbd21422811df03088d04c036129ccf1bd527cf18964d6c1ff7c3781f7d5ab251041900a264ee89d7f0598b154f8426921f4cd3a5628a18b477580e6c
+  data.tar.gz: 55c864e62678514bf2b9c03cd648dfb8faa454d42061e8f454572c2d0083f367105540e0533c5b9efcd587e08dadabedc583fce842269aaa6b3659f26eb72d56

data/README.md

@@ -6,12 +6,13 @@
 
 A self-hosted tool to monitor the performance of your Ruby on Rails application.
 
-This is **simple and free alternative** to the New Relic APM, Datadog or other similar services.
+This is a **simple and free alternative** to the New Relic APM, Datadog or other similar services.
 
 ![Demo](docs/rails_performance.gif)
 
 It allows you to track:
 
+- real-time monitoring on the Recent tab
 - throughput report (see amount of RPM (requests per minute))
 - an average response time
 - the slowest controllers & actions
@@ -71,6 +72,8 @@ RailsPerformance.setup do |config|
 
   # config home button link
   config.home_link = '/'
+
+  config.skipable_rake_tasks = ['webpacker:compile']
 end if defined?(RailsPerformance)
 ```
 
@@ -208,10 +211,11 @@ If "schema" how records are stored i Redis is changed, and this is a breacking c
 - https://github.com/PedroAugustoRamalhoDuarte
 - https://github.com/haffla
 - https://github.com/D1ceWard
+- https://github.com/carl-printreleaf
 
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
 
 [<img src="https://github.com/igorkasyanchuk/rails_time_travel/blob/main/docs/more_gems.png?raw=true"
-/>](https://www.railsjazz.com/)
+/>](https://www.railsjazz.com/?utm_source=github&utm_medium=bottom&utm_campaign=rails_performance)

data/app/controllers/rails_performance/rails_performance_controller.rb

@@ -4,6 +4,8 @@ module RailsPerformance
   class RailsPerformanceController < RailsPerformance::BaseController
     include RailsPerformance::ApplicationHelper
 
+    protect_from_forgery except: :recent
+
     if RailsPerformance.enabled
       def index
         @datasource                = RailsPerformance::DataSource.new(**prepare_query, type: :requests)
@@ -51,7 +53,12 @@ module RailsPerformance
       def recent
         @datasource = RailsPerformance::DataSource.new(**prepare_query, type: :requests)
         db          = @datasource.db
-        @data       = RailsPerformance::Reports::RecentRequestsReport.new(db).data
+        @data       = RailsPerformance::Reports::RecentRequestsReport.new(db).data(params[:from_timei])
+
+        respond_to do |page|
+          page.html
+          page.js
+        end
       end
 
       def sidekiq

data/app/views/rails_performance/javascripts/app.js

@@ -165,4 +165,30 @@ function showRTChart(div, data) {
           }
       }]
   });
-};
+};
+
+const recent = document.getElementById("recent")
+const autoupdate = document.getElementById("autoupdate")
+
+if(recent) {
+  const tbody = recent.querySelector("tbody")
+
+  setInterval(() => {
+    tr = tbody.children[0];
+    from_timei = tr.getAttribute("from_timei") || ''
+
+    if (!autoupdate.checked) {
+      return;
+    }
+
+    fetch(`recent.js?from_timei=${from_timei}`, {
+      headers: {
+        "X-CSRF-Token": document.querySelector("[name='csrf-token']").content,
+      },
+    })
+      .then(res => res.text())
+      .then(html => {
+        tbody.innerHTML = html + tbody.innerHTML;
+    })
+  }, 3000);
+}

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

@@ -0,0 +1,25 @@
+<tr from_timei="<%= e[:datetimei] %>">
+  <td>
+    <% if e[:request_id].present? %>
+      <%= link_to rails_performance.rails_performance_trace_path(id: e[:request_id]), remote: true do %>
+        <span class="stats_icon_max"><%= icon 'activity' %></span>
+      <% end %>
+    <% end %>
+  </td>
+  <td><%= format_datetime e[:datetime] %></td>
+  <td><%= link_to e[:controller] + '#' + e[:action], rails_performance.rails_performance_summary_path({controller_eq: e[:controller], action_eq: e[:action]}), remote: true %></td>
+  <td><%= e[:method] %></td>
+  <td><%= e[:format] %></td>
+  <td><%= link_to_path(e) %></td>
+  <td><%= status_tag e[:status] %></td>
+  <td class="nowrap"><%= ms e[:duration] %></td>
+  <td class="nowrap"><%= ms e[:view_runtime] %></td>
+  <td class="nowrap"><%= ms e[:db_runtime] %></td>
+  <td>
+    <% if e[:request_id].present? %>
+      <%= link_to rails_performance.rails_performance_trace_path(id: e[:request_id]), remote: true do %>
+        <span class="stats_icon_max"><%= icon 'activity' %></span>
+      <% end %>
+    <% end %>
+  </td>
+</tr>

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

@@ -2,9 +2,19 @@
 
 <div class="card">
   <div class="card-content">
-    <h2 class="subtitle">Recent Requests (last <%= RailsPerformance::Reports::RecentRequestsReport::TIME_WINDOW / 60 %> minutes)<h2>
+    <div class="columns">
+      <div class="column">
+        <h2 class="subtitle">Recent Requests (last <%= RailsPerformance::Reports::RecentRequestsReport::TIME_WINDOW / 60 %> minutes)<h2>
+      </div>
+      <div class="column right-text is-size-5 has-text-right">
+        <label id="autoupdate_label">
+          <input id="autoupdate" type="checkbox" checked/>
+          Auto-update
+        </label>
+      </div>
+    </div>
 
-    <table class="table is-fullwidth is-hoverable is-narrow">
+    <table id="recent" class="table is-fullwidth is-hoverable is-narrow">
       <thead>
         <tr>
           <th data-sort="string"></th>
@@ -27,33 +37,10 @@
           </tr>
         <% end %>
         <% @data.each do |e| %>
-          <tr>
-            <td>
-              <% if e[:request_id].present? %>
-                <%= link_to rails_performance.rails_performance_trace_path(id: e[:request_id]), remote: true do %>
-                  <span class="stats_icon_max"><%= icon 'activity' %></span>
-                <% end %>
-              <% end %>
-            </td>
-            <td><%= format_datetime e[:datetime] %></td>
-            <td><%= link_to e[:controller] + '#' + e[:action], rails_performance.rails_performance_summary_path({controller_eq: e[:controller], action_eq: e[:action]}), remote: true %></td>
-            <td><%= e[:method] %></td>
-            <td><%= e[:format] %></td>
-            <td><%= link_to_path(e) %></td>
-            <td><%= status_tag e[:status] %></td>
-            <td class="nowrap"><%= ms e[:duration] %></td>
-            <td class="nowrap"><%= ms e[:view_runtime] %></td>
-            <td class="nowrap"><%= ms e[:db_runtime] %></td>
-            <td>
-              <% if e[:request_id].present? %>
-                <%= link_to rails_performance.rails_performance_trace_path(id: e[:request_id]), remote: true do %>
-                  <span class="stats_icon_max"><%= icon 'activity' %></span>
-                <% end %>
-              <% end %>
-            </td>
-          </tr>
+          <%= render 'recent_row', e: e %>
         <% end %>
       </tbody>
     </table>
   </div>
 </div>
+

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

@@ -0,0 +1,3 @@
+<% @data.each do |e| %>
+  <%= render 'recent_row', e: e %>
+<% end %>

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

@@ -81,6 +81,9 @@
   border-bottom: 1px solid red;
 }
 
+.card-content {
+  overflow-x: scroll;
+}
 
 table th[data-sort] {
   cursor: pointer;
@@ -88,4 +91,8 @@ table th[data-sort] {
 
 .very-small-text {
   font-size: 8px;
-}
+}
+
+#autoupdate_label {
+  cursor: pointer;
+}

data/lib/rails_performance/gems/rake_ext.rb

@@ -13,13 +13,15 @@ module RailsPerformance
               status = 'error'
               raise(ex)
             ensure
-              RailsPerformance::Models::RakeRecord.new(
-                task: RailsPerformance::Gems::RakeExt.find_task_name(*args),
-                datetime: now.strftime(RailsPerformance::FORMAT),
-                datetimei: now.to_i,
-                duration: (Time.now - now) * 1000,
-                status: status,
-              ).save
+              if !RailsPerformance.skipable_rake_tasks.include?(self.name)
+                RailsPerformance::Models::RakeRecord.new(
+                  task: RailsPerformance::Gems::RakeExt.find_task_name(*args),
+                  datetime: now.strftime(RailsPerformance::FORMAT),
+                  datetimei: now.to_i,
+                  duration: (Time.now - now) * 1000,
+                  status: status,
+                ).save
+              end
             end
           end
 

data/lib/rails_performance/reports/recent_requests_report.rb

@@ -7,11 +7,11 @@ module RailsPerformance
         @sort ||= :datetimei
       end
 
-      def data
-        time_agoi = TIME_WINDOW.ago.to_i
+      def data(from_timei = nil)
+        time_agoi = [TIME_WINDOW.ago.to_i, from_timei.to_i].reject(&:blank?).max
         db.data
           .collect{|e| e.record_hash}
-          .select{|e| e if e[sort] >= time_agoi}
+          .select{|e| e if e[sort] > time_agoi}
           .sort{|a, b| b[sort] <=> a[sort]}
       end
     end

data/lib/rails_performance/version.rb

@@ -1,4 +1,4 @@
 module RailsPerformance
-  VERSION = '1.0.2'
+  VERSION = '1.0.4'
   SCHEMA  = '1.0.1'
-end
+end

data/lib/rails_performance.rb

@@ -73,6 +73,10 @@ module RailsPerformance
   mattr_accessor :home_link
   @@home_link = '/'
 
+  # skip performance tracking for these rake tasks
+  mattr_accessor :skipable_rake_tasks
+  @@skipable_rake_tasks = []
+
   def RailsPerformance.setup
     yield(self)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_performance
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-02 00:00:00.000000000 Z
+date: 2022-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -164,6 +164,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: wrapped_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 3rd party dependency-free solution how to monitor performance of your
   Rails applications.
 email:
@@ -198,6 +226,7 @@ files:
 - app/views/rails_performance/javascripts/stupidtable.min.js
 - app/views/rails_performance/javascripts/table.js
 - app/views/rails_performance/layouts/rails_performance.html.erb
+- app/views/rails_performance/rails_performance/_recent_row.html.erb
 - app/views/rails_performance/rails_performance/_summary.html.erb
 - app/views/rails_performance/rails_performance/_trace.html.erb
 - app/views/rails_performance/rails_performance/crashes.html.erb
@@ -207,6 +236,7 @@ files:
 - app/views/rails_performance/rails_performance/index.html.erb
 - app/views/rails_performance/rails_performance/rake.html.erb
 - app/views/rails_performance/rails_performance/recent.html.erb
+- app/views/rails_performance/rails_performance/recent.js.erb
 - app/views/rails_performance/rails_performance/requests.html.erb
 - app/views/rails_performance/rails_performance/sidekiq.html.erb
 - app/views/rails_performance/rails_performance/summary.js.erb