rails_performance 1.3.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3252836acfb4bfe1d62ace64e6c49633df64761b41f8aedf7286f41d9f11e889
-  data.tar.gz: 234011eabad7794de9d5fc6c367a3cd74d6db14db48907e8f0552f67229b4160
+  metadata.gz: 0a55d30b55b9b21648f47e913b5fc80277338d64265c4b652dd7c3b66080f7a2
+  data.tar.gz: d402afddcd43f8328dcb12b4749657d4ed2e60159722a73524cf81aa3b91dff3
 SHA512:
-  metadata.gz: c6b3e38a15d53cf1518542972fb5d5dfcaffff218ef325d97b6bb776d987c699936fa6237de1b0f191370185dad2ecbcc52821e0d13bd0fb21b0200c063e3f51
-  data.tar.gz: e7e77fb6229377c2550e70813f7276041c542b2bf0fa2c2c0ef00edca95d6ab82cc9802dfde0a995f4374559f0159c5224c4b21452e74fd392d9c91e9552ae69
+  metadata.gz: 7497bf5420d086bb8ea1f18cee0ff029f50d5df03065f3866456560912f4cb07207c1abeb94a1c3df0f117df083e24cc118938012241f911631e5bfff0868751
+  data.tar.gz: 895b554629a924b4afcfb7c3e1b18126ec7e56bad780f1a95d8ab3a80bd2e8dcb17ee5782b6566d930e0937770e00d8624d5a04960de65e5021841455f9085c2

data/README.md

@@ -51,7 +51,7 @@ Create `config/initializers/rails_performance.rb` in your app:
 
 ```ruby
 RailsPerformance.setup do |config|
-  config.redis    = Redis::Namespace.new("#{Rails.env}-rails-performance", redis: Redis.new(url: ENV["REDIS_URL"].presence || "redis://127.0.0.1:6379/0"))
+  config.redis    = Redis.new(url: ENV["REDIS_URL"].presence || "redis://127.0.0.1:6379/0") # or Redis::Namespace.new("rails-performance", redis: Redis.new), see below in README
   config.duration = 4.hours
 
   config.debug    = false # currently not used>
@@ -173,6 +173,18 @@ RailsPerformance.measure("some label", "some namespace") do
 end
 ```
 
+## Using with Rails Namespace
+
+```ruby
+  config.redis = Redis::Namespace.new("#{Rails.env}-rails-performance", redis: Redis.new(url: ENV["REDIS_URL"].presence || "redis://127.0.0.1:6379/0"))
+```
+
+and add a gem dependency to the Gemfile:
+
+```ruby
+gem 'redis-namespace'
+```
+
 ## How it works
 
 ![Schema](docs/rails_performance.png)

data/app/controllers/rails_performance/rails_performance_controller.rb

@@ -6,9 +6,7 @@ module RailsPerformance
 
     if RailsPerformance.enabled
       def index
-        @datasource = RailsPerformance::DataSource.new(
-          **prepare_query, type: :requests
-        )
+        @datasource = RailsPerformance::DataSource.new(**prepare_query(params), type: :requests)
         db = @datasource.db
 
         @throughput_report_data = RailsPerformance::Reports::ThroughputReport.new(db).data
@@ -17,16 +15,12 @@ module RailsPerformance
       end
 
       def summary
-        @datasource = RailsPerformance::DataSource.new(
-          **prepare_query, type: :requests
-        )
+        @datasource = RailsPerformance::DataSource.new(**prepare_query(params), type: :requests)
         db = @datasource.db
 
         @throughput_report_data = RailsPerformance::Reports::ThroughputReport.new(db).data
         @response_time_report_data = RailsPerformance::Reports::ResponseTimeReport.new(db).data
-        @data = RailsPerformance::Reports::BreakdownReport.new(
-          db, title: "Requests"
-        ).data
+        @data = RailsPerformance::Reports::BreakdownReport.new(db, title: "Requests").data
         respond_to do |format|
           format.js {}
           format.any do
@@ -47,9 +41,7 @@ module RailsPerformance
       end
 
       def crashes
-        @datasource = RailsPerformance::DataSource.new(
-          **prepare_query({status_eq: 500}), type: :requests
-        )
+        @datasource = RailsPerformance::DataSource.new(**prepare_query({status_eq: 500}), type: :requests)
         db = @datasource.db
         @data = RailsPerformance::Reports::CrashReport.new(db).data
 
@@ -62,11 +54,9 @@ module RailsPerformance
       end
 
       def requests
-        @datasource = RailsPerformance::DataSource.new(**prepare_query,
-type: :requests)
+        @datasource = RailsPerformance::DataSource.new(**prepare_query(params), type: :requests)
         db = @datasource.db
-        @data = RailsPerformance::Reports::RequestsReport.new(db,
-          group: :controller_action_format, sort: :count).data
+        @data = RailsPerformance::Reports::RequestsReport.new(db, group: :controller_action_format, sort: :count).data
         respond_to do |format|
           format.html
           format.csv do
@@ -76,8 +66,7 @@ type: :requests)
       end
 
       def recent
-        @datasource = RailsPerformance::DataSource.new(**prepare_query,
-type: :requests)
+        @datasource = RailsPerformance::DataSource.new(**prepare_query(params), type: :requests)
         db = @datasource.db
         @data = RailsPerformance::Reports::RecentRequestsReport.new(db).data(params[:from_timei])
 
@@ -110,8 +99,7 @@ type: :requests)
       end
 
       def slow
-        @datasource = RailsPerformance::DataSource.new(**prepare_query,
-type: :requests)
+        @datasource = RailsPerformance::DataSource.new(**prepare_query(params), type: :requests)
         db = @datasource.db
         @data = RailsPerformance::Reports::SlowRequestsReport.new(db).data
 
@@ -124,9 +112,7 @@ type: :requests)
       end
 
       def sidekiq
-        @datasource = RailsPerformance::DataSource.new(
-          **prepare_query, type: :sidekiq
-        )
+        @datasource = RailsPerformance::DataSource.new(**prepare_query(params), type: :sidekiq)
         db = @datasource.db
         @throughput_report_data = RailsPerformance::Reports::ThroughputReport.new(db).data
         @response_time_report_data = RailsPerformance::Reports::ResponseTimeReport.new(db).data
@@ -134,9 +120,7 @@ type: :requests)
       end
 
       def delayed_job
-        @datasource = RailsPerformance::DataSource.new(
-          **prepare_query, type: :delayed_job
-        )
+        @datasource = RailsPerformance::DataSource.new(**prepare_query(params), type: :delayed_job)
         db = @datasource.db
         @throughput_report_data = RailsPerformance::Reports::ThroughputReport.new(db).data
         @response_time_report_data = RailsPerformance::Reports::ResponseTimeReport.new(db).data
@@ -144,9 +128,7 @@ type: :requests)
       end
 
       def custom
-        @datasource = RailsPerformance::DataSource.new(
-          **prepare_query, type: :custom
-        )
+        @datasource = RailsPerformance::DataSource.new(**prepare_query(params), type: :custom)
         db = @datasource.db
         @throughput_report_data = RailsPerformance::Reports::ThroughputReport.new(db).data
         @response_time_report_data = RailsPerformance::Reports::ResponseTimeReport.new(db).data
@@ -154,18 +136,14 @@ type: :requests)
       end
 
       def grape
-        @datasource = RailsPerformance::DataSource.new(
-          **prepare_query, type: :grape
-        )
+        @datasource = RailsPerformance::DataSource.new(**prepare_query(params), type: :grape)
         db = @datasource.db
         @throughput_report_data = RailsPerformance::Reports::ThroughputReport.new(db).data
         @recent_report_data = RailsPerformance::Reports::RecentRequestsReport.new(db).data
       end
 
       def rake
-        @datasource = RailsPerformance::DataSource.new(
-          **prepare_query, type: :rake
-        )
+        @datasource = RailsPerformance::DataSource.new(**prepare_query(params), type: :rake)
         db = @datasource.db
         @throughput_report_data = RailsPerformance::Reports::ThroughputReport.new(db).data
         @recent_report_data = RailsPerformance::Reports::RecentRequestsReport.new(db).data
@@ -173,7 +151,7 @@ type: :requests)
 
       private
 
-      def prepare_query(query = params)
+      def prepare_query(query)
         RailsPerformance::Rails::QueryBuilder.compose_from(query)
       end
     end

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

@@ -9,24 +9,36 @@
     <%= render '/rails_performance/stylesheets/stylesheets' %>
     <link rel="shortcut icon" href="/favicon.ico">
   </head>
-  <body>
+
+  <body class="has-sticky-footer">
     <div class="loader-wrapper">
         <div class="loader is-loading"></div>
     </div>
-    <section class="section">
-      <div class="container is-fluid is-size-7">
-        <%= render '/rails_performance/shared/header' %>
-        <%= yield %>
-        <div class="footer-box">
-          © Rails Performance <span class='red'><i class="fas fa-heart"></i></span> <%= link_to 'https://github.com/igorkasyanchuk/rails_performance', 'https://github.com/igorkasyanchuk/rails_performance', target: '_blank' %>
-          <div class="is-pulled-right">v.<%= RailsPerformance::VERSION %></div>
+
+    <div class="main-content">
+      <section class="section">
+        <div class="container is-fluid is-size-7">
+          <%= render '/rails_performance/shared/header' %>
+          <%= yield %>
         </div>
+      </section>
+    </div>
+
+    <footer class="footer footer-box">
+      <div class="container is-fluid is-size-7">
+        © Rails Performance <span class='red'><i class="fas fa-heart"></i></span>
+        <%= link_to 'https://github.com/igorkasyanchuk/rails_performance', 'https://github.com/igorkasyanchuk/rails_performance', target: '_blank' %>
+        <div class="is-pulled-right">v.<%= RailsPerformance::VERSION %></div>
       </div>
-    </section>
+    </footer>
+
     <%= render '/rails_performance/panel' %>
-    <div class="panel-overlay">
+
+    <div class="panel-overlay"></div>
+
     <%= render '/rails_performance/javascripts/javascripts' %>
-    <%= yield :on_load %>
 
+    <%= yield :on_load %>
   </body>
+
 </html>

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

@@ -8,7 +8,7 @@
         <%= render "export" %>
       </div>
     </div>
-    <table class="table is-fullwidth is-hoverable is-narrow">
+    <table class="table is-fullwidth is-hoverable">
       <thead>
         <tr>
           <th colspan='3'>Name</th>

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

@@ -1,5 +1,5 @@
 <% if @record %>
-  window.panel.header.html(window.panel.close + "<%= j report_name(@record.record_hash) %>");
+  window.panel.header.html(window.panel.close + "<%= j report_name(@record.record_hash.with_indifferent_access.except(*RailsPerformance.ignore_trace_headers)) %>");
 <% else %>
   window.panel.header.html(window.panel.close);
 <% end %>

data/app/views/rails_performance/shared/_header.html.erb

@@ -16,9 +16,9 @@
     <div class="navbar-start">
       <%= link_to 'Dashboard', rails_performance.rails_performance_url, class: "navbar-item #{active?(:dashboard)}" %>
       <%= link_to 'Requests Analysis', rails_performance.rails_performance_requests_url, class: "navbar-item #{active?(:requests)}" %>
-      <%= link_to '500 Errors', rails_performance.rails_performance_crashes_url, class: "navbar-item #{active?(:crashes)}" %>
       <%= link_to 'Recent Requests', rails_performance.rails_performance_recent_url, class: "navbar-item #{active?(:recent)}" %>
       <%= link_to 'Slow Requests', rails_performance.rails_performance_slow_url, class: "navbar-item #{active?(:slow)}" %>
+      <%= link_to '500 Errors', rails_performance.rails_performance_crashes_url, class: "navbar-item #{active?(:crashes)}" %>
       <% if defined?(Sidekiq) %>
         <%= link_to 'Sidekiq', rails_performance.rails_performance_sidekiq_url, class: "navbar-item #{active?(:sidekiq)}" %>
       <% end %>

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

@@ -72,11 +72,11 @@
 }
 
 .chart {
-  height: 245px;
+  height: 300px;
 }
 
 .chart_mini {
-  height: 150px;
+  height: 200px;
   width: 720px;
 }
 
@@ -125,3 +125,18 @@ table th[data-sort] {
 .attention {
   background-color: #f6f5f5;
 }
+
+body.has-sticky-footer {
+  display: flex;
+  min-height: 100vh;
+  flex-direction: column;
+}
+
+.main-content {
+  flex: 1;
+}
+
+.footer-box {
+  background-color: #f5f5f5;
+  padding: 1rem 0;
+}

data/lib/generators/rails_performance/install/templates/initializer.rb

@@ -1,7 +1,7 @@
 if defined?(RailsPerformance)
   RailsPerformance.setup do |config|
     # Redis configuration
-    config.redis = Redis::Namespace.new("#{Rails.env}-rails-performance", redis: Redis.new(url: ENV["REDIS_URL"].presence || "redis://127.0.0.1:6379/0"))
+    config.redis = Redis.new(url: ENV["REDIS_URL"].presence || "redis://127.0.0.1:6379/0")
 
     # All data we collect
     config.duration = 4.hours
@@ -36,7 +36,7 @@ if defined?(RailsPerformance)
 
     # You can ignore request paths by specifying the beginning of the path.
     # For example, all routes starting with '/admin' can be ignored:
-    config.ignored_paths = ['/rails/performance']
+    config.ignored_paths = ["/rails/performance"]
 
     # store custom data for the request
     # config.custom_data_proc = proc do |env|

data/lib/rails_performance/models/request_record.rb

@@ -30,7 +30,11 @@ module RailsPerformance
       def self.from_db(key, value)
         items = key.split("|")
 
-        parsed_value = JSON.parse(value) rescue {}
+        parsed_value = begin
+          JSON.parse(value)
+        rescue
+          {}
+        end
 
         RequestRecord.new(
           controller: items[2],
@@ -45,7 +49,7 @@ module RailsPerformance
           json: value,
           duration: parsed_value["duration"],
           view_runtime: parsed_value["view_runtime"],
-          db_runtime: parsed_value["db_runtime"],
+          db_runtime: parsed_value["db_runtime"]
         )
       end
 

data/lib/rails_performance/reports/percentile_report.rb

@@ -2,7 +2,7 @@ module RailsPerformance
   module Reports
     class PercentileReport < BaseReport
       def data
-        durations = db.data.collect(&:duration)
+        durations = db.data.collect(&:duration).compact
         {
           p50: RailsPerformance::Utils.percentile(durations, 50),
           p95: RailsPerformance::Utils.percentile(durations, 95),

data/lib/rails_performance/reports/requests_report.rb

@@ -21,7 +21,7 @@ module RailsPerformance
             db_runtime_slowest: db_runtimes.max,
             p50_duration: RailsPerformance::Utils.percentile(durations, 50),
             p95_duration: RailsPerformance::Utils.percentile(durations, 95),
-            p99_duration: RailsPerformance::Utils.percentile(durations, 99),
+            p99_duration: RailsPerformance::Utils.percentile(durations, 99)
           }
         end.sort_by { |e| -e[sort].to_f } # to_f because could ne NaN or nil
       end

data/lib/rails_performance/version.rb

@@ -1,4 +1,4 @@
 module RailsPerformance
-  VERSION = "1.3.1"
+  VERSION = "1.3.3"
   SCHEMA = "1.0.1"
 end

data/lib/rails_performance.rb

@@ -113,6 +113,10 @@ module RailsPerformance
   mattr_accessor :include_custom_events
   @@include_custom_events = true
 
+  # Trace details view configuration
+  mattr_accessor :ignore_trace_headers
+  @@ignore_trace_headers = ["datetimei"]
+
   def self.setup
     yield(self)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_performance
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.3
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-08 00:00:00.000000000 Z
+date: 2024-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties