rails_performance 1.2.0.alpha3 → 1.2.0.alpha5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4cc5606eeacc1d036f322a9eda07cea2d2151c23ad96052f2e7a695ea288e5a
-  data.tar.gz: 51fe7e76287eb361e0d2135039f4f95c03f559ca575bae8883b1a94c107762e2
+  metadata.gz: 62aee36c96f068b8caf8a8f9ba1eb7b0c00f8c6493a8f609f0adaca7e0c11f9b
+  data.tar.gz: b61d9ade77df9d29364694937e28fa57a029b497dc327872dc435006d412a136
 SHA512:
-  metadata.gz: fc80d1c5713b87b6338778086bc6b4180f36bfd9d38b96753bf92e733f985fa9101ea53c8a426a0cf41c1916dc83266d7f53868b2ceaf6aa4c7c7be11f3ab158
-  data.tar.gz: 8a54a10c63673d143fe07cfddf03db2000d6f957b3d913edfebf5f0c06f598c5808732dedbb0e3b37e4b280cd00f21b5ba21dbe36248103c5f930015870e81f9
+  metadata.gz: cb30056a19056d5b18c6f59af939e22bb4dda67adc0afb08d71ff4b215f4abac53bdd916e359e3655fa2e264be89d1b54af4dd8780bbfd1076e1b9d426c8d50a
+  data.tar.gz: f4806fa7db15d691a9ecc95597b7d262ad28a739840ccfe949bf8815a1ac83dfa411a26cc13bb7343009b878f30a250ae9a43fc004b04253e3cb437f6f40aac1

data/app/assets/images/bot.svg

@@ -0,0 +1 @@
+<?xml version="1.0" ?><svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="M21.928 11.607c-.202-.488-.635-.605-.928-.633V8c0-1.103-.897-2-2-2h-6V4.61c.305-.274.5-.668.5-1.11a1.5 1.5 0 0 0-3 0c0 .442.195.836.5 1.11V6H5c-1.103 0-2 .897-2 2v2.997l-.082.006A1 1 0 0 0 1.99 12v2a1 1 0 0 0 1 1H3v5c0 1.103.897 2 2 2h14c1.103 0 2-.897 2-2v-5a1 1 0 0 0 1-1v-1.938a1.006 1.006 0 0 0-.072-.455zM5 20V8h14l.001 3.996L19 12v2l.001.005.001 5.995H5z"/><ellipse cx="8.5" cy="12" rx="1.5" ry="2"/><ellipse cx="15.5" cy="12" rx="1.5" ry="2"/><path d="M8 16h8v2H8z"/></svg>

data/app/assets/images/user.svg

@@ -0,0 +1 @@
+<?xml version="1.0" ?><svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="M12 2A10.13 10.13 0 0 0 2 12a10 10 0 0 0 4 7.92V20h.1a9.7 9.7 0 0 0 11.8 0h.1v-.08A10 10 0 0 0 22 12 10.13 10.13 0 0 0 12 2zM8.07 18.93A3 3 0 0 1 11 16.57h2a3 3 0 0 1 2.93 2.36 7.75 7.75 0 0 1-7.86 0zm9.54-1.29A5 5 0 0 0 13 14.57h-2a5 5 0 0 0-4.61 3.07A8 8 0 0 1 4 12a8.1 8.1 0 0 1 8-8 8.1 8.1 0 0 1 8 8 8 8 0 0 1-2.39 5.64z"/><path d="M12 6a3.91 3.91 0 0 0-4 4 3.91 3.91 0 0 0 4 4 3.91 3.91 0 0 0 4-4 3.91 3.91 0 0 0-4-4zm0 6a1.91 1.91 0 0 1-2-2 1.91 1.91 0 0 1 2-2 1.91 1.91 0 0 1 2 2 1.91 1.91 0 0 1-2 2z"/></svg>

data/app/controllers/rails_performance/rails_performance_controller.rb

@@ -55,6 +55,25 @@ module RailsPerformance
         db          = @datasource.db
         @data       = RailsPerformance::Reports::RecentRequestsReport.new(db).data(params[:from_timei])
 
+        # example
+        # :controller=>"HomeController",
+        # :action=>"index",
+        # :format=>"html",
+        # :status=>"200",
+        # :method=>"GET",
+        # :path=>"/",
+        # :request_id=>"9c9bff5f792a5b3f77cb07fa325f8ddf",
+        # :datetime=>2023-06-24 21:22:46 +0300,
+        # :datetimei=>1687630966,
+        # :duration=>207.225830078125,
+        # :db_runtime=>2.055999994277954,
+        # :view_runtime=>67.8370000096038,
+        # :exception=>nil,
+        # :backtrace=>nil,
+        # :http_referer=>nil,
+        # "email"=>nil,
+        # "user_agent"=>"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36"}]
+
         respond_to do |page|
           page.html
           page.js

data/app/helpers/rails_performance/application_helper.rb

@@ -92,9 +92,31 @@ module RailsPerformance
       end
     end
 
+    def bot_icon(user_agent)
+      return nil if user_agent.blank?
+
+      # TODO: clean this up
+      # user_agent = "Mozilla/5.0 (Linux; Android 6.0.1; Nexus 5X Build/MMB29P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/W.X.Y.Z Mobile Safari/537.36 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)"
+
+      browser = Browser.new(user_agent)
+
+      if browser.bot?
+        content_tag(:span, class: "user-agent-icon", title: browser.bot&.name) do
+          icon("bot")
+        end
+      else
+        content_tag(:span, class: "user-agent-icon user-agent-icon-user") do
+          icon("user")
+        end
+      end
+    end
+
     def icon(name)
-      # https://www.iconfinder.com/iconsets/vivid
-      raw File.read(File.expand_path(File.dirname(__FILE__) +  "/../../assets/images/#{name}.svg"))
+      @icons ||= {}
+      @icons[name] ||= begin
+        # https://www.iconfinder.com/iconsets/vivid
+        raw File.read(File.expand_path(File.dirname(__FILE__) +  "/../../assets/images/#{name}.svg"))
+      end
     end
 
     def insert_css_file(file)

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

@@ -7,6 +7,7 @@
     <% end %>
   </td>
   <td><%= format_datetime e[:datetime] %></td>
+  <td><%= bot_icon e["user_agent"] %></td>
   <td>
     <% controller_action_info = e[:controller] + '#' + e[:action]%>
     <%= link_to truncate(controller_action_info, length: 40), rails_performance.rails_performance_summary_path({controller_eq: e[:controller], action_eq: e[:action]}), remote: true, title: controller_action_info %>

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

@@ -30,4 +30,4 @@
     var data2 = <%= raw @response_time_report_data.to_json %>;
     showRTChart('response_time_report_chart', data2);
   </script>
-<% end %>
+<% end %>

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

@@ -19,6 +19,7 @@
         <tr>
           <th data-sort="string"></th>
           <th data-sort="string">Datetime</th>
+          <th></th>
           <th data-sort="string">Controller#action</th>
           <th data-sort="string">Method</th>
           <th data-sort="string">Format</th>

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

@@ -13,6 +13,7 @@
         <tr>
           <th data-sort="string"></th>
           <th data-sort="string">Datetime</th>
+          <th></th>
           <th data-sort="string">Controller#action</th>
           <th data-sort="string">Method</th>
           <th data-sort="string">Format</th>

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

@@ -56,6 +56,15 @@
   height: 24px;
 }
 
+.user-agent-icon svg {
+  width: 12px;
+  height: 12px;
+}
+
+.user-agent-icon-user svg path {
+  fill: hsl(141, 53%, 53%) !important;
+}
+
 .chart {
   height: 245px;
 }

data/lib/rails_performance/data_source.rb

@@ -21,7 +21,7 @@ module RailsPerformance
     def db
       result = RailsPerformance::Models::Collection.new
       (0..(RailsPerformance::Utils.days + 1)).to_a.reverse.each do |e|
-        RailsPerformance::DataSource.new(q: self.q.merge({ on: (Time.now - e.days).to_date }), type: type).add_to(result)
+        RailsPerformance::DataSource.new(q: self.q.merge({ on: (Time.current - e.days).to_date }), type: type).add_to(result)
       end
       result
     end

data/lib/rails_performance/gems/custom_ext.rb

@@ -7,7 +7,7 @@ module RailsPerformance
         return yield unless RailsPerformance.enabled
 
         begin
-          now    = Time.now
+          now    = Time.current
           status = 'success'
           result = yield
           result
@@ -19,7 +19,7 @@ module RailsPerformance
             tag_name: tag_name,
             namespace_name: namespace_name,
             status: status,
-            duration: (Time.now - now) * 1000,
+            duration: (Time.current - now) * 1000,
             datetime: now.strftime(RailsPerformance::FORMAT),
             datetimei: now.to_i,
           ).save

data/lib/rails_performance/gems/delayed_job_ext.rb

@@ -6,7 +6,7 @@ module RailsPerformance
         callbacks do |lifecycle|
           lifecycle.around(:invoke_job) do |job, *args, &block|
             begin
-              now = Time.now
+              now = Time.current
               block.call(job, *args)
               status = 'success'
             rescue Exception => error
@@ -16,7 +16,7 @@ module RailsPerformance
               meta_data = RailsPerformance::Gems::DelayedJobExt::Plugin.meta(job.payload_object)
               record    = RailsPerformance::Models::DelayedJobRecord.new(
                 jid: job.id,
-                duration: (Time.now - now) * 1000,
+                duration: (Time.current - now) * 1000,
                 datetime: now.strftime(RailsPerformance::FORMAT),
                 datetimei: now.to_i,
                 source_type: meta_data[0],

data/lib/rails_performance/gems/grape_ext.rb

@@ -7,7 +7,7 @@ module RailsPerformance
           # TODO change to set
           CurrentRequest.current.ignore.add(:performance)
 
-          now                                         = Time.now
+          now                                         = Time.current
           CurrentRequest.current.data               ||= {}
           CurrentRequest.current.record             ||= RailsPerformance::Models::GrapeRecord.new(request_id: CurrentRequest.current.request_id)
           CurrentRequest.current.record.datetimei   ||= now.to_i

data/lib/rails_performance/gems/rake_ext.rb

@@ -6,7 +6,7 @@ module RailsPerformance
         ::Rake::Task.class_eval do
           def invoke_with_rails_performance(*args)
             begin
-              now    = Time.now
+              now    = Time.current
               status = 'success'
               invoke_without_new_rails_performance(*args)
             rescue Exception => ex
@@ -18,7 +18,7 @@ module RailsPerformance
                   task: RailsPerformance::Gems::RakeExt.find_task_name(*args),
                   datetime: now.strftime(RailsPerformance::FORMAT),
                   datetimei: now.to_i,
-                  duration: (Time.now - now) * 1000,
+                  duration: (Time.current - now) * 1000,
                   status: status,
                 ).save
               end

data/lib/rails_performance/gems/sidekiq_ext.rb

@@ -6,7 +6,7 @@ module RailsPerformance
       end
 
       def call(worker, msg, queue)
-        now    = Time.now
+        now    = Time.current
         record = RailsPerformance::Models::SidekiqRecord.new(
           enqueued_ati: msg['enqueued_at'].to_i,
           datetimei: msg['created_at'].to_i,
@@ -26,7 +26,7 @@ module RailsPerformance
           raise ex
         ensure
           # store in ms instead of seconds
-          record.duration = (Time.now - now) * 1000
+          record.duration = (Time.current - now) * 1000
           record.save
           result
         end

data/lib/rails_performance/rails/middleware.rb

@@ -41,7 +41,7 @@ module RailsPerformance
       def call!(env)
         @status, @headers, @response = @app.call(env)
 
-        #t = Time.now
+        #t = Time.current
         if !RailsPerformance.skip
           if !CurrentRequest.current.ignore.include?(:performance) # grape is executed first, and than ignore regular future storage of "controller"-like request
             if data = CurrentRequest.current.data
@@ -66,7 +66,7 @@ module RailsPerformance
             end
           end
         end
-        #puts "==> store performance data: #{(Time.now - t).round(3)}ms"
+        #puts "==> store performance data: #{(Time.current - t).round(3)}ms"
 
         [@status, @headers, @response]
       end

data/lib/rails_performance/reports/base_report.rb

@@ -29,6 +29,42 @@ module RailsPerformance
           time
         end
       end
+
+      def calculate_data
+        now        = Time.current
+        stop       = Time.at(60 * ((now.to_i)/ 60))
+        offset     = RailsPerformance::Reports::BaseReport::time_in_app_time_zone(now).utc_offset
+        current    = stop - RailsPerformance.duration
+
+        @data      = []
+        all        = {}
+
+        # puts "current: #{current}"
+        # puts "stop: #{stop}"
+
+        # read current values
+        db.group_by(group).each do |(k, v)|
+          yield(all, k, v)
+        end
+
+        # puts '----'
+        # puts all
+        # puts '----'
+        # puts "offset: #{offset}"
+        # puts '======='
+
+        # add blank columns
+        while current <= stop
+          key = (current).strftime(RailsPerformance::FORMAT)
+          views = all[key].presence || 0
+          # puts "#{key} -> #{views}"
+          @data << [(current.to_i + offset) * 1000, views.round(2)]
+          current += 1.minute
+        end
+
+        # sort by time
+        @data.sort!
+      end
     end
   end
 end

data/lib/rails_performance/reports/response_time_report.rb

@@ -6,32 +6,11 @@ module RailsPerformance
       end
 
       def data
-        all     = {}
-        stop    = RailsPerformance::Reports::BaseReport::time_in_app_time_zone(Time.at(60 * (Time.now.to_i / 60)))
-        offset  = RailsPerformance::Reports::BaseReport::time_in_app_time_zone(Time.now).utc_offset
-        current = stop - RailsPerformance.duration
-        @data   = []
-
-        # puts "current: #{current}"
-        # puts "stop: #{stop}"
-
-        # read current values
-        db.group_by(group).each do |(k, v)|
+        calculate_data do |all, k, v|
           durations = v.collect{|e| e["duration"]}.compact
           next if durations.empty?
           all[k] = durations.sum.to_f / durations.count
         end
-
-        # add blank columns
-        while current <= stop
-          views = all[current.strftime(RailsPerformance::FORMAT)] || 0
-          # time = RailsPerformance::Reports::BaseReport::time_in_app_time_zone(current)
-          @data << [(current.to_i + offset) * 1000, views.round(2)]
-          current += 1.minute
-        end
-
-        # sort by time
-        @data.sort!
       end
     end
   end

data/lib/rails_performance/reports/throughput_report.rb

@@ -6,33 +6,18 @@ module RailsPerformance
         @group ||= :datetime
       end
 
+      # def prepare_query(query = {})
+      #   RailsPerformance::Rails::QueryBuilder.compose_from({})
+      # end
+      # @datasource                = RailsPerformance::DataSource.new(**prepare_query({}), type: :requests)
+      # db                         = @datasource.db
       # RailsPerformance::Reports::ThroughputReport.new(db).data
       # Time.at(RailsPerformance::Reports::ThroughputReport.new(db).data.last[0] / 1000)
 
       def data
-        all     = {}
-        stop    = RailsPerformance::Reports::BaseReport::time_in_app_time_zone(Time.at(60 * (Time.now.to_i / 60)))
-        offset  = RailsPerformance::Reports::BaseReport::time_in_app_time_zone(Time.now).utc_offset
-        current = stop - RailsPerformance.duration
-        @data   = []
-
-        # puts "current: #{current}"
-        # puts "stop: #{stop}"
-
-        # read current values
-        db.group_by(group).each do |(k, v)|
+        calculate_data do |all, k, v|
           all[k] = v.count
         end
-
-        # add blank columns
-        while current <= stop
-          views = all[current.strftime(RailsPerformance::FORMAT)] || 0
-          @data << [(current.to_i + offset) * 1000, views.round(2)]
-          current += 1.minute
-        end
-
-        # sort by time
-        @data.sort!
       end
 
     end

data/lib/rails_performance/thread/current_request.rb

@@ -27,7 +27,7 @@ module RailsPerformance
     end
 
     def trace(options = {})
-      @tracings << options.merge(time: Time.now.to_i)
+      @tracings << options.merge(time: Time.current.to_i)
     end
 
   end

data/lib/rails_performance/utils.rb

@@ -8,7 +8,7 @@ module RailsPerformance
 
     # write to current slot
     # time - date -minute
-    def Utils.field_key(now = Time.now)
+    def Utils.field_key(now = Time.current)
       now.strftime("%H:%M")
     end
 

data/lib/rails_performance/version.rb

@@ -1,4 +1,4 @@
 module RailsPerformance
-  VERSION = '1.2.0.alpha3'
+  VERSION = '1.2.0.alpha5'
   SCHEMA  = '1.0.1'
 end

data/lib/rails_performance.rb

@@ -1,5 +1,6 @@
 require "redis"
 require "redis-namespace"
+require "browser"
 require_relative "./rails_performance/version.rb"
 require_relative "rails_performance/rails/query_builder.rb"
 require_relative "rails_performance/rails/middleware.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_performance
 version: !ruby/object:Gem::Version
-  version: 1.2.0.alpha3
+  version: 1.2.0.alpha5
 platform: ruby
 authors:
 - Igor Kasyanchuk
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: browser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -219,6 +233,7 @@ files:
 - Rakefile
 - app/assets/config/rails_performance_manifest.js
 - app/assets/images/activity.svg
+- app/assets/images/bot.svg
 - app/assets/images/close.svg
 - app/assets/images/export.svg
 - app/assets/images/git.svg
@@ -227,6 +242,7 @@ files:
 - app/assets/images/import.svg
 - app/assets/images/menu.svg
 - app/assets/images/stat.svg
+- app/assets/images/user.svg
 - app/controllers/rails_performance/base_controller.rb
 - app/controllers/rails_performance/rails_performance_controller.rb
 - app/helpers/rails_performance/application_helper.rb