rails_performance 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d7ef7cc9ce348212f4857dd78032c84766dec51b7fa78fd0ab3206f08bb0b8c
-  data.tar.gz: 380ae54a89db6e34827459e768333a39cfe5de6e3cffb8104b70ef8af8fc11cf
+  metadata.gz: b27b8bf73e30b04e7ae40afca4598b348457dcd09bbf30a2ca124e16caa2cf17
+  data.tar.gz: 36afe9bec764881de9cb6a29510903d7036ae80c8af072ea31018f8a85abbab9
 SHA512:
-  metadata.gz: 3265a68a5f3c9a29d6ff0db5e65094f036b9f58fb082a03d177ac4d105bdd532824fb7e757919f512edf103dfc75156f920c70b65ef134005bc3f0447e2c46a6
-  data.tar.gz: 544fec0f5be1aa315e8185dd3abac2e2055f069c6290a0b68ed95e09b387d59bd3f82a5965c6175bc9e0c611e80890ae0d88e4acedffeae09324d34a6262935e
+  metadata.gz: f974e6a2ee2ed369a9e73bccd64ae62c150ec2e6dd9324a41f880eaefc7063d309cc597a3a78db9f10d51214cf3949d6a7e784cc5b77b74082dc583913ab6cfd
+  data.tar.gz: 495d009f627564c2474dfecbd8b50d5b80f4b327fb5e18868443147a7327e1ca2d0ff078b5b8973583ab4aff52989a75213c6aa59d10e99a13b6562f2fd6f09a

data/README.md

@@ -12,6 +12,7 @@ This is **simple and free alternative** to the New Relic APM, Datadog or other s
 
 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

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(`/rails/performance/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

@@ -88,4 +88,8 @@ table th[data-sort] {
 
 .very-small-text {
   font-size: 8px;
+}
+
+#autoupdate_label {
+  cursor: pointer;
 }

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.3'
   SCHEMA  = '1.0.1'
 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.3
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-02 00:00:00.000000000 Z
+date: 2022-05-14 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