rails_performance 0.9.8 → 1.0.0.beta4

data/lib/rails_performance/reports/recent_requests_report.rb

@@ -4,53 +4,16 @@ module RailsPerformance
       TIME_WINDOW = 60.minutes
 
       def set_defaults
-        @sort ||= :datetime
+        @sort ||= :datetimei
       end
 
-      def data(type = :requests) # most popular type
-        db.data.collect do |record|
-          case type
-          when :requests
-            record_hash(record)
-          when :jobs
-            job_hash(record)
-          end
-        end
-        .select{|e| e if e[:datetime] >= TIME_WINDOW.ago}
-        .sort{|a, b| b[sort] <=> a[sort]}
-      end
-
-      private
-
-      def record_hash(record)
-        {
-          controller: record.controller,
-          action: record.action,
-          format: record.format,
-          status: record.status,
-          method: record.method,
-          path: record.path,
-          request_id: record.request_id,
-          datetime: Time.at(record.datetimei.to_i),
-          duration: record.value['duration'],
-          db_runtime: record.value['db_runtime'],
-          view_runtime: record.value['view_runtime'],
-        }
-      end
-
-      def job_hash(record)
-        {
-          worker: record.worker,
-          queue: record.queue,
-          
-          jid: record.jid,
-          status: record.status,
-          datetime: Time.at(record.start_timei.to_i),
-          duration: record.value['duration'],
-        }
+      def data
+        time_agoi = TIME_WINDOW.ago.to_i
+        db.data
+          .collect{|e| e.record_hash}
+          .select{|e| e if e[sort] >= time_agoi}
+          .sort{|a, b| b[sort] <=> a[sort]}
       end
     end
-
-
   end
 end

data/lib/rails_performance/reports/trace_report.rb

@@ -8,8 +8,8 @@ module RailsPerformance
       end
 
       def data
-        key   = "trace|#{request_id}"
-        JSON.parse(RP.redis.get(key).presence || '[]')
+        key   = "trace|#{request_id}|END|#{RailsPerformance::SCHEMA}"
+        JSON.parse(RailsPerformance.redis.get(key).presence || '[]')
       end
     end
 

data/lib/rails_performance/{models → thread}/current_request.rb

@@ -1,6 +1,7 @@
 module RailsPerformance
   class CurrentRequest
-    attr_reader :request_id, :storage
+    attr_reader :request_id, :tracings, :ignore
+    attr_accessor :data
     attr_accessor :record
 
     def CurrentRequest.init
@@ -12,17 +13,21 @@ module RailsPerformance
     end
 
     def CurrentRequest.cleanup
+      RailsPerformance.log "----------------------------------------------------> CurrentRequest.cleanup !!!!!!!!!!!! -------------------------\n\n"
+      RailsPerformance.skip = false
       Thread.current[:rp_current_request] = nil
     end
 
     def initialize(request_id)
       @request_id = request_id
-      @storage    = []
+      @tracings   = []
+      @ignore     = Set.new
+      @data       = nil
       @record     = nil
     end
 
-    def store(options = {})
-      @storage << options.merge(time: Time.now.to_i)
+    def trace(options = {})
+      @tracings << options.merge(time: Time.now.to_i)
     end
 
   end

data/lib/rails_performance/utils.rb

@@ -12,35 +12,29 @@ module RailsPerformance
       now.strftime("%H:%M")
     end
 
-    def Utils.log_job_in_redis(e)
-      key   = "jobs|queue|#{e[:queue]}|worker|#{e[:worker]}|jid|#{e[:jid]}|datetime|#{e[:datetime]}|created_ati|#{e[:created_ati]}|enqueued_ati|#{e[:enqueued_ati]}|start_timei|#{e[:start_timei]}|status|#{e[:status]}|END"
-      value = { message: e[:message], duration: e[:duration] }
-      Utils.save_to_redis(key, value)
-    end
-
-    def Utils.log_request_in_redis(e)
-      value = e.slice(:view_runtime, :db_runtime, :duration, :HTTP_REFERER)
-      key   = "performance|controller|#{e[:controller]}|action|#{e[:action]}|format|#{e[:format]}|status|#{e[:status]}|datetime|#{e[:datetime]}|datetimei|#{e[:datetimei]}|method|#{e[:method]}|path|#{e[:path]}|request_id|#{e[:request_id]}|END"
-      Utils.save_to_redis(key, value)
-    end
-
-    def Utils.log_trace_in_redis(request_id, value)
-      key = "trace|#{request_id}"
-      Utils.save_to_redis(key, value, RailsPerformance::Reports::RecentRequestsReport::TIME_WINDOW.to_i)
-    end
-
     def Utils.fetch_from_redis(query)
-      #puts "\n\n   [REDIS QUERY]   -->   #{query}\n\n"
+      RailsPerformance.log "\n\n   [REDIS QUERY]   -->   #{query}\n\n"
 
-      keys   = RP.redis.keys(query)
+      keys   = RailsPerformance.redis.keys(query)
       return [] if keys.blank?
-      values = RP.redis.mget(keys)
+      values = RailsPerformance.redis.mget(keys)
+
+      RailsPerformance.log "\n\n   [FOUND]   -->   #{values.size}\n\n"
 
       [keys, values]
     end
 
+    def Utils.save_to_redis(key, value, expire = RailsPerformance.duration.to_i)
+      # TODO think here if add return
+      #return if value.empty?
+
+      RailsPerformance.log "  [SAVE]    key  --->  #{key}\n"
+      RailsPerformance.log "  [SAVE]    value  --->  #{value.to_json}\n\n"
+      RailsPerformance.redis.set(key, value.to_json, ex: expire.to_i)
+    end
+
     def Utils.days
-      (RP.duration / 1.day) + 1
+      (RailsPerformance.duration / 1.day) + 1
     end
 
     def Utils.median(array)
@@ -56,12 +50,5 @@ module RailsPerformance
         sorted[center]
       end
     end
-
-    def Utils.save_to_redis(key, value, expire = RP.duration.to_i)
-      # puts "  [SAVE]    key  --->  #{key}\n"
-      # puts "          value  --->  #{value.to_json}\n\n"
-      RP.redis.set(key, value.to_json, ex: expire.to_i)
-    end
-
   end
 end

data/lib/rails_performance/version.rb

@@ -1,3 +1,4 @@
 module RailsPerformance
-  VERSION = '0.9.8'
+  VERSION = '1.0.0.beta4'
+  SCHEMA  = '1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_performance
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 1.0.0.beta4
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2021-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: grape
+  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: otr-activerecord
+  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: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +122,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mimemagic
+  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: delayed_job_active_record
+  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: daemons
+  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:
@@ -130,10 +200,14 @@ files:
 - 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
+- app/views/rails_performance/rails_performance/custom.html.erb
+- app/views/rails_performance/rails_performance/delayed_job.html.erb
+- app/views/rails_performance/rails_performance/grape.html.erb
 - app/views/rails_performance/rails_performance/index.html.erb
-- app/views/rails_performance/rails_performance/jobs.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/requests.html.erb
+- app/views/rails_performance/rails_performance/sidekiq.html.erb
 - 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
@@ -148,14 +222,22 @@ files:
 - lib/rails_performance.rb
 - lib/rails_performance/data_source.rb
 - lib/rails_performance/engine.rb
-- lib/rails_performance/extensions/capture_everything.rb
-- lib/rails_performance/gems/sidekiq.rb
+- lib/rails_performance/extensions/trace.rb
+- lib/rails_performance/gems/custom_ext.rb
+- lib/rails_performance/gems/delayed_job_ext.rb
+- lib/rails_performance/gems/grape_ext.rb
+- lib/rails_performance/gems/rake_ext.rb
+- lib/rails_performance/gems/sidekiq_ext.rb
 - lib/rails_performance/instrument/metrics_collector.rb
 - lib/rails_performance/models/base_record.rb
 - lib/rails_performance/models/collection.rb
-- lib/rails_performance/models/current_request.rb
-- lib/rails_performance/models/job_record.rb
-- lib/rails_performance/models/record.rb
+- lib/rails_performance/models/custom_record.rb
+- lib/rails_performance/models/delayed_job_record.rb
+- lib/rails_performance/models/grape_record.rb
+- lib/rails_performance/models/rake_record.rb
+- lib/rails_performance/models/request_record.rb
+- lib/rails_performance/models/sidekiq_record.rb
+- lib/rails_performance/models/trace_record.rb
 - lib/rails_performance/rails/middleware.rb
 - lib/rails_performance/rails/query_builder.rb
 - lib/rails_performance/reports/base_report.rb
@@ -166,6 +248,7 @@ files:
 - lib/rails_performance/reports/response_time_report.rb
 - lib/rails_performance/reports/throughput_report.rb
 - lib/rails_performance/reports/trace_report.rb
+- lib/rails_performance/thread/current_request.rb
 - lib/rails_performance/utils.rb
 - lib/rails_performance/version.rb
 homepage: https://github.com/igorkasyanchuk/rails_performance
@@ -183,9 +266,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: 

data/lib/rails_performance/models/job_record.rb

@@ -1,48 +0,0 @@
-module RailsPerformance
-  module Models
-    class JobRecord < BaseRecord
-      attr_reader :queue, :worker, :jid, :created_ati, :enqueued_ati, :datetime, :start_timei, :status
-
-      # key = job-performance
-      # |queue|default
-      # |worker|SimpleWorker
-      # |jid|7d48fbf20976c224510dbc60
-      # |datetime|20200124T0523
-      # |created_ati|1583146613
-      # |enqueued_ati|1583146613
-      # |start_timei|1583146614
-      # |status|success|END
-      # value = JSON
-      def initialize(key, value)
-        @json = value
-
-        items = key.split("|")
-
-        @queue        = items[2]
-        @worker       = items[4]
-        @jid          = items[6]
-        @datetime     = items[8]
-        @created_ati  = items[10]
-        @enqueued_ati = items[12]
-        @start_timei  = items[14]
-        @status       = items[16]
-      end
-
-      def to_h
-        {
-          queue: queue,
-          worker: worker,
-          jid: jid,
-          datetime: datetime,
-          created_ati: created_ati,
-          enqueued_ati: enqueued_ati,
-          start_timei: start_timei,
-          duration: duration,
-          status: status,
-          message: value['message']
-        }
-      end
-
-    end
-  end
-end

data/lib/rails_performance/models/record.rb

@@ -1,68 +0,0 @@
-module RailsPerformance
-  module Models
-    class Record < BaseRecord
-      attr_reader :controller, :action, :format, :status, :datetime, :datetimei, :method, :path, :request_id
-
-      def Record.find_by(request_id:)
-        keys, values = RP::Utils.fetch_from_redis("performance|*|request_id|#{request_id}|*")
-
-        return nil if keys.blank?
-        return nil if values.blank?
-
-        RP::Models::Record.new(keys[0], values[0])
-      end
-
-      # key = performance|
-      # controller|HomeController|
-      # action|index|
-      # format|html|
-      # status|200|
-      # datetime|20200124T0523|
-      # datetimei|1579861423|
-      # method|GET|
-      # path|/|
-      # request_id|454545454545454545|
-      # END
-      # = {"view_runtime":8.444603008683771,"db_runtime":0,"duration":9.216095000000001}
-      # value = JSON
-      def initialize(key, value)
-        @json = value
-
-        items = key.split("|")
-
-        @controller = items[2]
-        @action     = items[4]
-        @format     = items[6]
-        @status     = items[8]
-        @datetime   = items[10]
-        @datetimei  = items[12]
-        @method     = items[14]
-        @path       = items[16]
-        @request_id = items[18]
-      end
-
-      def controller_action
-        "#{controller}##{action}"
-      end
-
-      def controller_action_format
-        "#{controller}##{action}|#{format}"
-      end
-
-      def to_h
-        {
-          controller: controller,
-          action: action,
-          format: format,
-          method: method,
-          path: path,
-          duration: ms(duration),
-          view_runtime: ms(value['view_runtime']),
-          db_runtime: ms(value['db_runtime']),
-          HTTP_REFERER: value['HTTP_REFERER']
-        }
-      end
-
-    end
-  end
-end