rails_performance 1.5.2 → 1.6.0.pre2

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

@@ -7,7 +7,9 @@
 <div class="card">
   <div class="card-content">
     <h2 class="subtitle">Grape Throughput Report</h2>
-    <div id="throughput_report_chart" class="chart"></div>
+    <rails-performance-chart id="throughput_report_chart" type="TIR" legend="Requests" units="requests / minute" class="chart">
+      <%= raw @throughput_report_data.to_json %>
+    </rails-performance-chart>
     <p class="content is-small"></p>
   </div>
 </div>
@@ -54,11 +56,3 @@
     </table>
   </div>
 </div>
-
-
-<% content_for :on_load do %>
-  <script>
-    var data1 = <%= raw @throughput_report_data.to_json %>;
-    showTIRChart('throughput_report_chart', data1, ' requests / minute', 'Requests');
-  </script>
-<% end %>

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

@@ -2,13 +2,21 @@
 
 <% unless @datasource.default? %>
   <%#= link_to raw("&larr; Back"), rails_performance_path, class: "back_link" %>
-<% end %>
-
-<div class="columns">
-  <div class="column">
-    <div class="card">
-      <div class="card-content">
-        <h2 class="subtitle is-size-1"><%= ms @percentile_report_data[:p50] %></h2>
+<% end %>
+
+<div class="has-text-right mb-4">
+  <rails-performance-autoupdate interval="10s">
+    <label id="autoupdate_label">
+      <input type="checkbox" /> Auto-update
+    </label>
+  </rails-performance-autoupdate>
+</div>
+
+<div class="columns">
+  <div class="column">
+    <div class="card">
+      <div class="card-content">
+        <h2 class="subtitle is-size-1"><%= ms @percentile_report_data[:p50] %></h2>
         <p class="content is-size-4">p50</p>
       </div>
     </div>
@@ -36,7 +44,9 @@
 <div class="card">
   <div class="card-content">
     <h2 class="subtitle">Throughput Report</h2>
-    <div id="throughput_report_chart" class="chart"></div>
+    <rails-performance-chart id="throughput_report_chart" type="TIR" legend="RPM" units="rpm" class="chart">
+      <%= raw @throughput_report_data.to_json %>
+    </rails-performance-chart>
     <p class="content is-small">All requests (site visitors, search engines, bots, etc)</p>
   </div>
 </div>
@@ -46,17 +56,9 @@
 <div class="card">
   <div class="card-content">
     <h2 class="subtitle">Average Response Time Report</h2>
-    <div id="response_time_report_chart" class="chart"></div>
+    <rails-performance-chart id="response_time_report_chart" type="RT" legend="Response Time" class="chart">
+      <%= raw @response_time_report_data.to_json %>
+    </rails-performance-chart>
     <p class="content is-small">All requests (site visitors, search engines, bots, etc)</p>
   </div>
 </div>
-
-<% content_for :on_load do %>
-  <script>
-    var data1 = <%= raw @throughput_report_data.to_json %>;
-    showTIRChart('throughput_report_chart', data1, ' rpm', 'RPM');
-
-    var data2 = <%= raw @response_time_report_data.to_json %>;
-    showRTChart('response_time_report_chart', data2);
-  </script>
-<% end %>

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

@@ -41,15 +41,9 @@
 <div class="card">
   <div class="card-content">
     <h2 class="subtitle">Rake Throughput Report</h2>
-    <div id="throughput_report_chart" class="chart"></div>
+    <rails-performance-chart id="throughput_report_chart" type="TIR" legend="Tasks" units="tasks / minute" class="chart">
+      <%= raw @throughput_report_data.to_json %>
+    </rails-performance-chart>
     <p class="content is-small">All rake tasks in the application</p>
   </div>
 </div>
-
-
-<% content_for :on_load do %>
-  <script>
-    var data1 = <%= raw @throughput_report_data.to_json %>;
-    showTIRChart('throughput_report_chart', data1, ' tasks / minute', 'Tasks');
-  </script>
-<% end %>

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

@@ -7,14 +7,15 @@
         <h2 class="subtitle">Recent Requests (last <%= RailsPerformance.recent_requests_time_window / 60 %> minutes)<h2>
       </div>
       <div class="column is-narrow">
-        <%= render "export" %> 
+        <%= render "export" %>
       </div>
     </div>
     <div class="has-text-right">
-      <label id="autoupdate_label">
-        <input id="autoupdate" type="checkbox" />
-        Auto-update
-      </label>
+      <rails-performance-autoupdate interval="3s">
+        <label>
+          <input type="checkbox" /> Auto-update
+        </label>
+      </rails-performance-autoupdate>
     </div>
     <table id="recent" class="table is-fullwidth is-hoverable is-narrow">
       <thead>

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

@@ -1,23 +1,26 @@
 <title>System Resources</title>
 
+<div class="has-text-right mb-4">
+  <rails-performance-autoupdate interval="10s">
+    <label id="autoupdate_label">
+      <input type="checkbox" /> Auto-update
+    </label>
+  </rails-performance-autoupdate>
+</div>
+
 <% @resources_report.servers.each do |server| %>
   <h1 class="title mt-8 pt-8"><%= server.name %></h1>
 
-  <% server.charts.each.with_index(1) do |chart, index| %>
+  <% server.charts.each do |chart| %>
     <div class="card">
       <div class="card-content">
         <h2 class="subtitle"><%= chart.subtitle %></h2>
-        <div class="chart" id="<%= chart.id %>"></div>
+        <rails-performance-chart id="<%= chart.id %>" type="<%= chart.type %>" legend="<%= chart.legend %>" class="chart">
+          <%= raw chart.data.to_json %>
+        </rails-performance-chart>
         <p class="content is-small"><%= chart.description %></p>
       </div>
     </div>
-
     <br>
-
-    <% content_for :on_load do %>
-      <script>
-        show<%= chart.type %>Chart('<%= chart.id %>', <%= raw chart.data.to_json %>, '<%= chart.legend %>', <%= index %>);
-      </script>
-    <% end %>
   <% end %>
 <% end %>

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

@@ -7,7 +7,9 @@
 <div class="card">
   <div class="card-content">
     <h2 class="subtitle">Sidekiq Workers Throughput Report</h2>
-    <div id="throughput_report_chart" class="chart"></div>
+    <rails-performance-chart id="throughput_report_chart" type="TIR" legend="Jobs" units="jobs / minute" class="chart">
+      <%= raw @throughput_report_data.to_json %>
+    </rails-performance-chart>
     <p class="content is-small">All workers in the application</p>
   </div>
 </div>
@@ -17,7 +19,9 @@
 <div class="card">
   <div class="card-content">
     <h2 class="subtitle">Average Execution Time</h2>
-    <div id="response_time_report_chart" class="chart"></div>
+    <rails-performance-chart id="response_time_report_chart" type="RT" legend="Response Time" class="chart">
+      <%= raw @response_time_report_data.to_json %>
+    </rails-performance-chart>
     <p class="content is-small">All workers in the application</p>
   </div>
 </div>
@@ -61,14 +65,3 @@
     </table>
   </div>
 </div>
-
-
-<% content_for :on_load do %>
-  <script>
-    var data1 = <%= raw @throughput_report_data.to_json %>;
-    showTIRChart('throughput_report_chart', data1, ' jobs / minute', 'Jobs');
-
-    var data2 = <%= raw @response_time_report_data.to_json %>;
-    showRTChart('response_time_report_chart', data2);
-  </script>
-<% end %>

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

@@ -7,7 +7,7 @@
         <h2 class="subtitle">Slow Requests (last <%= RailsPerformance.slow_requests_time_window / 60 %> minutes + slower than <%= RailsPerformance.slow_requests_threshold %>ms)<h2>
       </div>
       <div class="column is-narrow">
-        <%= render "export" %> 
+        <%= render "export" %>
       </div>
     </div>
 

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

@@ -1,10 +1,3 @@
 window.panel.header.html(window.panel.close + '<%= j report_name(@datasource.q) %>');
 window.panel.content.html("<%= j render '/rails_performance/rails_performance/summary', title: "Requests" %>");
-
-var data1 = <%= raw @throughput_report_data.to_json %>;
-showTIRChart('throughput_report_chart_mini', data1, ' rpm', 'RPM');
-
-var data2 = <%= raw @response_time_report_data.to_json %>;
-showRTChart('response_time_report_chart_mini', data2);
-
 showPanel();

data/lib/rails_performance/engine.rb

@@ -8,6 +8,10 @@ module RailsPerformance
   class Engine < ::Rails::Engine
     isolate_namespace RailsPerformance
 
+    initializer "rails_performance.engine_assets", before: :set_routes_reloader do
+      RailsPerformance.engine_assets = EngineAssets.new(engine: self)
+    end
+
     initializer "rails_performance.resource_monitor" do
       # check required gems are available
       RailsPerformance._resource_monitor_enabled = !!(defined?(Sys::Filesystem) && defined?(Sys::CPU) && defined?(GetProcessMem))

data/lib/rails_performance/engine_assets/controller.rb

@@ -0,0 +1,42 @@
+module RailsPerformance
+  class EngineAssets
+    class Controller < ActionController::Base
+      def show
+        file_path = safe_file_path
+
+        if file_path && File.exist?(file_path)
+          send_file file_path,
+            type: content_type,
+            disposition: "inline"
+
+          fresh_when(etag: File.mtime(file_path), public: true)
+          expires_in 1.year, public: true
+        else
+          head :not_found
+        end
+      end
+
+      private
+
+      cattr_accessor :engine_assets
+
+      def safe_file_path
+        requested = params[:file].gsub("..", "")
+        format = params[:format] || request.format.symbol.to_s
+        engine_assets.asset_path(requested, format)
+      end
+
+      def content_type
+        format = params[:format] || request.format.symbol.to_s
+        engine_assets.content_type(format)
+      end
+
+      # Override to allow cross-origin JavaScript embedding
+      # This is really dumb because it IS the same origin, but Chrome's import apparently doesn't send the Origin header.
+      # Is there a better way to resolve this?
+      def verify_same_origin_request
+        # no-op
+      end
+    end
+  end
+end

data/lib/rails_performance/engine_assets/helper.rb

@@ -0,0 +1,49 @@
+module RailsPerformance
+  class EngineAssets
+    module Helper
+      mattr_accessor :engine_assets
+
+      def engine_asset_url(source, type)
+        fingerprint_value = engine_assets.fingerprint(source, type)
+        normalized_type = case type.to_s
+        when "javascript" then "js"
+        when "stylesheet" then "css"
+        else type.to_s
+        end
+        engine_asset_path("#{source}.#{normalized_type}", v: fingerprint_value)
+      end
+
+      def engine_stylesheet_link_tag(source, **options)
+        tag.link(
+          rel: "stylesheet",
+          href: engine_asset_url(source, "css"),
+          **options
+        )
+      end
+
+      def engine_javascript_include_tag(source, **options)
+        tag.script(
+          src: engine_asset_url(source, "js"),
+          **options
+        )
+      end
+
+      def engine_javascript_importmap_tags(entry_point = "application", imports = {})
+        assets_root = engine_assets.engine.root.join("app/#{engine_assets.assets_subdir}/javascripts")
+        engine_imports = engine_assets.javascript_files.each_with_object({}) do |path, hash|
+          relative_path = path.relative_path_from(assets_root).to_s
+          key = "#{engine_assets.engine.engine_name}/#{relative_path.sub(/\.js\z/, "")}"
+          hash[key] = engine_asset_url(relative_path.sub(/\.js\z/, ""), "js")
+        end
+        [
+          tag.script(type: "importmap") do
+            JSON.pretty_generate({"imports" => imports.merge(engine_imports)}).html_safe
+          end,
+          tag.script(<<~JS.html_safe, type: "module")
+            import "#{engine_assets.engine.engine_name}/#{entry_point}"
+          JS
+        ].join("\n").html_safe
+      end
+    end
+  end
+end

data/lib/rails_performance/engine_assets.rb

@@ -0,0 +1,90 @@
+require "digest/sha2"
+require_relative "engine_assets/controller"
+require_relative "engine_assets/helper"
+
+module RailsPerformance
+  class EngineAssets
+    attr_reader :engine, :assets_subdir
+
+    def initialize(engine:, assets_subdir: "engine_assets")
+      @engine = engine
+      @assets_subdir = assets_subdir
+      @fingerprints = {}
+      draw_routes
+    end
+
+    def asset_path(source, type)
+      case type.to_s
+      when "js", "javascript"
+        engine.root.join("app/#{assets_subdir}/javascripts", "#{source}.js")
+      when "css", "stylesheet"
+        engine.root.join("app/#{assets_subdir}/stylesheets", "#{source}.css")
+      end
+    end
+
+    def asset_url(source, type)
+      fingerprint_value = fingerprint(source, type)
+      engine.routes.url_helpers.engine_asset_path("#{source}.#{normalize_type(type)}", v: fingerprint_value)
+    end
+
+    def fingerprint(source, type)
+      cache_key = "#{source}.#{type}"
+
+      if ::Rails.env.production?
+        @fingerprints[cache_key] ||= calculate_fingerprint(source, type)
+      else
+        calculate_fingerprint(source, type)
+      end
+    end
+
+    def content_type(type)
+      case type.to_s
+      when "js", "javascript"
+        "application/javascript"
+      when "css", "stylesheet"
+        "text/css"
+      else
+        "application/octet-stream"
+      end
+    end
+
+    def javascript_files
+      engine.root.glob("app/#{assets_subdir}/javascripts/**/*.js")
+    end
+
+    def helper
+      Helper.engine_assets = self
+      Helper
+    end
+
+    private
+
+    def draw_routes
+      Controller.engine_assets = self
+      engine.routes.prepend do
+        get "/assets/*file", to: Controller.action(:show), as: :engine_asset
+      end
+    end
+
+    def normalize_type(type)
+      case type.to_s
+      when "javascript"
+        "js"
+      when "stylesheet"
+        "css"
+      else
+        type.to_s
+      end
+    end
+
+    def calculate_fingerprint(source, type)
+      file_path = asset_path(source, type)
+
+      if file_path && File.exist?(file_path)
+        Digest::SHA256.file(file_path).hexdigest[0...8]
+      else
+        "missing"
+      end
+    end
+  end
+end

data/lib/rails_performance/gems/grape_ext.rb

@@ -23,7 +23,9 @@ module RailsPerformance
             CurrentRequest.current.record.path = payload[:env]["PATH_INFO"]
           end
 
-          if name == "format_response.grape"
+          expects_no_content = Rack::Utils::STATUS_WITH_NO_ENTITY_BODY.include?(CurrentRequest.current.record.status)
+          if name == "format_response.grape" ||
+              (name == "endpoint_run.grape" && (payload[:endpoint]&.body.nil? || expects_no_content))
             CurrentRequest.current.record.save
             CurrentRequest.cleanup
           end

data/lib/rails_performance/reports/recent_requests_report.rb

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

data/lib/rails_performance/version.rb

@@ -1,5 +1,5 @@
 module RailsPerformance
-  VERSION = "1.5.2"
+  VERSION = "1.6.0.pre2"
   SCHEMA = "1.0.2"
   EVENTS_SCHEMA = "1.0.0"
 end

data/lib/rails_performance.rb

@@ -31,6 +31,7 @@ require_relative "rails_performance/events/record"
 require_relative "rails_performance/extensions/trace"
 require_relative "rails_performance/thread/current_request"
 require_relative "rails_performance/interface"
+require_relative "rails_performance/engine_assets"
 
 module RailsPerformance
   extend RailsPerformance::Interface
@@ -153,6 +154,8 @@ module RailsPerformance
   mattr_accessor :_resource_monitor_enabled
   @@_resource_monitor_enabled = false
 
+  mattr_accessor :engine_assets
+
   def self.setup
     yield(self)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_performance
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0.pre2
 platform: ruby
 authors:
 - Igor Kasyanchuk
@@ -304,17 +304,18 @@ files:
 - app/controllers/rails_performance/base_controller.rb
 - app/controllers/rails_performance/concerns/csv_exportable.rb
 - app/controllers/rails_performance/rails_performance_controller.rb
+- app/engine_assets/javascripts/apex_ext.js
+- app/engine_assets/javascripts/application.js
+- app/engine_assets/javascripts/autoupdate.js
+- app/engine_assets/javascripts/charts.js
+- app/engine_assets/javascripts/navbar.js
+- app/engine_assets/javascripts/panel.js
+- app/engine_assets/javascripts/table.js
+- app/engine_assets/stylesheets/panel.css
+- app/engine_assets/stylesheets/responsive.css
+- app/engine_assets/stylesheets/style.css
 - app/helpers/rails_performance/rails_performance_helper.rb
 - app/views/rails_performance/_panel.html.erb
-- app/views/rails_performance/javascripts/_javascripts.html.erb
-- app/views/rails_performance/javascripts/apexcharts.min.js
-- app/views/rails_performance/javascripts/app.js
-- app/views/rails_performance/javascripts/jquery-3.4.1.min.js
-- app/views/rails_performance/javascripts/navbar.js
-- app/views/rails_performance/javascripts/panel.js
-- app/views/rails_performance/javascripts/rails.js
-- 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/_export.html.erb
 - app/views/rails_performance/rails_performance/_recent_row.html.erb
@@ -327,7 +328,6 @@ 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/resources.html.erb
 - app/views/rails_performance/rails_performance/sidekiq.html.erb
@@ -335,11 +335,6 @@ files:
 - app/views/rails_performance/rails_performance/summary.js.erb
 - app/views/rails_performance/rails_performance/trace.js.erb
 - app/views/rails_performance/shared/_header.html.erb
-- app/views/rails_performance/stylesheets/_stylesheets.html.erb
-- app/views/rails_performance/stylesheets/bulma.min.css
-- app/views/rails_performance/stylesheets/panel.css
-- app/views/rails_performance/stylesheets/responsive.css
-- app/views/rails_performance/stylesheets/style.css
 - config/routes.rb
 - lib/generators/rails_performance/install/USAGE
 - lib/generators/rails_performance/install/install_generator.rb
@@ -347,6 +342,9 @@ files:
 - lib/rails_performance.rb
 - lib/rails_performance/data_source.rb
 - lib/rails_performance/engine.rb
+- lib/rails_performance/engine_assets.rb
+- lib/rails_performance/engine_assets/controller.rb
+- lib/rails_performance/engine_assets/helper.rb
 - lib/rails_performance/events/record.rb
 - lib/rails_performance/extensions/trace.rb
 - lib/rails_performance/gems/custom_ext.rb
@@ -403,7 +401,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Simple Rails Performance tracker. Alternative to the NewRelic, Datadog or
   other services.

data/app/views/rails_performance/javascripts/_javascripts.html.erb

@@ -1,11 +0,0 @@
-<%= insert_js_file 'jquery-3.4.1.min.js' %>
-<%= insert_js_file 'rails.js' %>
-<%= insert_js_file 'stupidtable.min.js' %>
-<%= insert_js_file 'apexcharts.min.js' %>
-
-<%= javascript_include_tag 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.1/js/all.min.js' %>
-
-<%= insert_js_file 'app.js' %>
-<%= insert_js_file 'panel.js' %>
-<%= insert_js_file 'table.js' %>
-<%= insert_js_file 'navbar.js' %>