rails_performance 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce8db107a23bdd7c902fa8edcc2ebe260998e1cf7712f0a710131983b28c3fa9
-  data.tar.gz: 82e818c24db06fb74d6d477aba06f0841174894c23f45fab785dd6dd0f808aa8
+  metadata.gz: 0a55d30b55b9b21648f47e913b5fc80277338d64265c4b652dd7c3b66080f7a2
+  data.tar.gz: d402afddcd43f8328dcb12b4749657d4ed2e60159722a73524cf81aa3b91dff3
 SHA512:
-  metadata.gz: 49d48df321943a17cd226f68ace96bbebca96ab6b47dde70e6cc95fd21276338562d3e0dbe365d1133aa6cd93981d2dd0980790cac8f52512ac2fbdb3558263d
-  data.tar.gz: 6c3ec9d24045abc760cba57d2f3d12fe6c3ea0e35a49a138bad3bfec06ae9c8a0ebc11721c5a3c92a9f3dcad6dc80ac98d1b0d6e3fd0a2a8063b11a715dfb5e8
+  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/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.2"
+  VERSION = "1.3.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.3.2
+  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