rails_performance 1.4.0.alpha4 → 1.4.0.alpha5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ef083c7a88c7f7f263c3e5fe97049c589889e19494736b839de788c97e88aea
-  data.tar.gz: 361e9148f1ee28ebebb0e22a3c3dd6b9cf9ab440a4d2a594d534d6824ba300f3
+  metadata.gz: f9541b647e5e0ae0e49c8ffe55befda74884e9a8c53c9557cffd4b8c42ca23fc
+  data.tar.gz: 8b1ada0884c84dbbab0306cffab9bbb4f4b04b0fc4107a55747eae5416ed26ea
 SHA512:
-  metadata.gz: d5d56892de5cc66ce1b324b4cc00f021bd582b4cda43d11e36e1a0506ff38f82448ade9785a17662d575867236b424a5a165506753b872012514895370f58c72
-  data.tar.gz: 7fa77548d06a0c157fd5f7ceb46578e91e6d3a6ce239df3701c5abb74dab25eb5aaa53e849fc8fcae2aca6a013d5e83eda80d3d70289f99f6450331d58e6e984
+  metadata.gz: e2db12562f40ce01aa3bffa6a545e4567469972ec5ab79a0e7318dbe526b09c62e6c2f6f2fecadecb44485e5ea6f3bb4a7a4d632d7938e9a347af86144ea19b9
+  data.tar.gz: 7e7bed31f33b4f0af24362ec621f7d066b33d3225103e08b2819bc33b9b69a1fbc1d5c4ba65221d1c47186b6ab9d954d403eddf6317c7b9a94dfd445ca8f9004

data/README.md

@@ -117,9 +117,21 @@ RailsPerformance.setup do |config|
 
   # To monitor custom events with `RailsPerformance.measure` block
   # config.include_custom_events = true
+
+  # To monitor system resources (CPU, memory, disk)
+  # to enabled add required gems (see README)
+  # config.system_monitor_duration = 24.hours
 end if defined?(RailsPerformance)
 ```
 
+Additionally you might need to configure app time zone. You can do it in `config/application.rb`:
+
+```ruby
+config.time_zone = 'Eastern Time (US & Canada)'
+```
+
+Gem will present charts/tables in the app timezone. If it's not set, it will use UTC.
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/app/controllers/rails_performance/rails_performance_controller.rb

@@ -15,7 +15,7 @@ module RailsPerformance
       end
 
       def resources
-        @datasource = RailsPerformance::DataSource.new(**prepare_query(params), type: :resources)
+        @datasource = RailsPerformance::DataSource.new(**prepare_query(params), type: :resources, days: RailsPerformance::Utils.days(RailsPerformance.system_monitor_duration))
         db = @datasource.db
 
         @resources_report = RailsPerformance::Reports::ResourcesReport.new(db)

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

@@ -52,5 +52,9 @@ if defined?(RailsPerformance)
     config.skipable_rake_tasks = ["webpacker:compile"]
     config.include_rake_tasks = false
     config.include_custom_events = true
+
+    # If enabled, the system monitor will be displayed on the dashboard
+    # to enabled add required gems (see README)
+    # config.system_monitor_duration = 24.hours
   end
 end

data/lib/rails_performance/data_source.rb

@@ -10,19 +10,20 @@ module RailsPerformance
       resources: RailsPerformance::Models::ResourceRecord
     }
 
-    attr_reader :q, :klass, :type
+    attr_reader :q, :klass, :type, :days
 
-    def initialize(type:, q: {})
+    def initialize(type:, q: {}, days: RailsPerformance::Utils.days(RailsPerformance.duration))
       @type = type
       @klass = KLASSES[type]
       q[:on] ||= Date.today
       @q = q
+      @days = days
     end
 
     def db
       result = RailsPerformance::Models::Collection.new
       now = RailsPerformance::Utils.time
-      (0..(RailsPerformance::Utils.days)).to_a.reverse_each do |e|
+      (0..days).to_a.reverse_each do |e|
         RailsPerformance::DataSource.new(q: q.merge({on: (now - e.days).to_date}), type: type).add_to(result)
       end
       result

data/lib/rails_performance/models/resource_record.rb

@@ -40,7 +40,8 @@ module RailsPerformance
 
       def save
         key = "resource|server|#{server}|context|#{context}|role|#{role}|datetime|#{datetime}|datetimei|#{datetimei}|END|#{RailsPerformance::SCHEMA}"
-        Utils.save_to_redis(key, json)
+        # with longer expiration time
+        Utils.save_to_redis(key, json, RailsPerformance.system_monitor_duration.to_i)
       end
     end
   end

data/lib/rails_performance/reports/base_report.rb

@@ -63,14 +63,14 @@ module RailsPerformance
       #   1732125550000 => 0,
       #   ....
       # }
-      def nil_data
+      def nil_data(duration = RailsPerformance.duration)
         @nil_data ||= begin
           result = {}
           now = RailsPerformance::Utils.time
           now = now.change(sec: 0, usec: 0)
           stop = now # Time.at(60 * (now.to_i / 60))
           offset = 0 # RailsPerformance::Reports::BaseReport.time_in_app_time_zone(now).utc_offset
-          current = stop - RailsPerformance.duration
+          current = stop - duration
 
           while current <= stop
             current.strftime(RailsPerformance::FORMAT)
@@ -86,8 +86,8 @@ module RailsPerformance
       #   1732125540000 => 1,
       #   1732125550000 => 0,
       # }
-      def nullify_data(input)
-        nil_data.merge(input).sort
+      def nullify_data(input, duration = RailsPerformance.duration)
+        nil_data(duration).merge(input).sort
       end
     end
   end

data/lib/rails_performance/reports/resources_report.rb

@@ -5,13 +5,13 @@ module RailsPerformance
         @data ||= db.data
           .collect { |e| e.record_hash }
           .group_by { |e| e[:server] + "///" + e[:context] + "///" + e[:role] }
-          .transform_values { |v| v.sort { |a, b| b[sort] <=> a[sort] } }
+          # .transform_values { |v| v.sort { |a, b| b[sort] <=> a[sort] } }
           .transform_values { |v| v.map { |e| e.merge({datetimei: e[:datetimei].to_i}) } }
       end
 
       def cpu
         @cpu ||= data.transform_values do |v|
-          nullify_data(v.each_with_object({}) do |e, res|
+          prepare_report(v.each_with_object({}) do |e, res|
             res[e[:datetimei] * 1000] = e[:cpu]["one_min"].to_f.round(2)
           end)
         end
@@ -19,7 +19,7 @@ module RailsPerformance
 
       def memory
         @memory ||= data.transform_values do |v|
-          nullify_data(v.each_with_object({}) do |e, res|
+          prepare_report(v.each_with_object({}) do |e, res|
             res[e[:datetimei] * 1000] = e[:memory].to_f.round(2)
           end)
         end
@@ -27,11 +27,17 @@ module RailsPerformance
 
       def disk
         @disk ||= data.transform_values do |v|
-          nullify_data(v.each_with_object({}) do |e, res|
+          prepare_report(v.each_with_object({}) do |e, res|
             res[e[:datetimei] * 1000] = e[:disk]["available"].to_f.round(2)
           end)
         end
       end
+
+      private
+
+      def prepare_report(input)
+        nullify_data(input, RailsPerformance.system_monitor_duration)
+      end
     end
   end
 end

data/lib/rails_performance/utils.rb

@@ -40,8 +40,8 @@ module RailsPerformance
       RailsPerformance.redis.set(key, value.to_json, ex: expire.to_i)
     end
 
-    def self.days
-      (RailsPerformance.duration / 1.day) + 1
+    def self.days(duration = RailsPerformance.duration)
+      (duration / 1.day) + 1
     end
 
     def self.median(array)

data/lib/rails_performance/version.rb

@@ -1,4 +1,4 @@
 module RailsPerformance
-  VERSION = "1.4.0.alpha4"
+  VERSION = "1.4.0.alpha5"
   SCHEMA = "1.0.2"
 end

data/lib/rails_performance.rb

@@ -119,6 +119,14 @@ module RailsPerformance
   mattr_accessor :ignore_trace_headers
   @@ignore_trace_headers = ["datetimei"]
 
+  # System monitor duration (expiration time)
+  mattr_accessor :system_monitor_duration
+  @@system_monitor_duration = 24.hours
+
+  # -- internal usage --
+  #
+  #
+  # to store the resource monitor instance
   mattr_accessor :_resource_monitor
   @@_resource_monitor = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_performance
 version: !ruby/object:Gem::Version
-  version: 1.4.0.alpha4
+  version: 1.4.0.alpha5
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-21 00:00:00.000000000 Z
+date: 2024-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties