rails_performance 1.2.0.alpha4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71e33d8156df40c792e33f03eae39a06c12f1622aa2c8071291c4e81c803d3ac
-  data.tar.gz: 288c78335fec92abede6d72f82b841fd128ff079baad62d3a1ea3900003c5171
+  metadata.gz: e9f2906db73d1a2227a6479131dded794f1b9bc734fe85883f91938ef28b4b7d
+  data.tar.gz: 04fbf2f661f9873878b36a10906eb2346883d9f44c236557bbbc423270506c66
 SHA512:
-  metadata.gz: 2617feffb5ceeb2c644679a4de52ecc60797350c883776cfd706b4d7a3c4fca77c93e15ad7243f4fe18c2612728b241f9584a5a7135947b7e8f66dec6f05ae59
-  data.tar.gz: 8bff9d4b572f7bb41de93850651c210e0e59d6e03395e78d10ca777ace00ad31fb85f40c1153fe60062d3ac1a4094b1e6c0e64bef3c44757b3b8f102a776afb6
+  metadata.gz: e3be04836a44e3c1eddc5b5f338667952128ee1d99b70bbb635bf252205f21e99a4c4d60157a3517927801de5342671d02f9648918074ecd60152fd7ec7c5222
+  data.tar.gz: ec663b71500e15c4c29bada3d11111629c3130281a0140a7a3e872068ac0eecc6e13cd50b0a867254a3ff03d472dfc6b29d0bb2cdea84ae212a48b04c3b8beaa

data/app/helpers/rails_performance/application_helper.rb

@@ -95,17 +95,13 @@ module RailsPerformance
     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? || rand(2) == 1
+      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") do
+        content_tag(:span, class: "user-agent-icon user-agent-icon-user", title: "Real User") do
           icon("user")
         end
       end

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

@@ -7,13 +7,13 @@
     <% 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 %>
   </td>
   <td><%= e[:method] %></td>
   <td><%= e[:format] %></td>
+  <td><%= bot_icon e["user_agent"] %></td>
   <td><%= link_to_path(e) %></td>
   <td><%= status_tag e[:status] %></td>
   <td class="nowrap"><%= ms e[:duration] %></td>

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

@@ -5,11 +5,12 @@
 <div id="response_time_report_chart_mini" class="chart_mini"></div>
 
 <h2 class="subtitle"><%= title %></h2>
-<table class="table is-fullwidth is-hoverable is-narrow is-size-7">
+<table class="table is-fullwidth is-hoverable is-narrow is-size-9">
   <thead>
     <tr>
       <th data-sort="string">Datetime</th>
       <th data-sort="string">Method</th>
+      <th></th>
       <th data-sort="string">Path</th>
       <th data-sort="string">Format</th>
       <th data-sort="int">Status</th>
@@ -23,6 +24,7 @@
       <tr>
         <td><%= format_datetime e[:datetime] %></td>
         <td><%= e[:method] %></td>
+        <td><%= bot_icon e["user_agent"] %></td>
         <td><%= link_to_path(e) %></td>
         <td><%= e[:format] %></td>
         <td><%= status_tag e[:status] %></td>
@@ -32,4 +34,4 @@
       </tr>
     <% end %>
   </tbody>
-</table>
+</table>

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

@@ -8,6 +8,7 @@
           <th data-sort="string">Controller#action</th>
           <th data-sort="string">Method</th>
           <th data-sort="string">Format</th>
+          <th></th>
           <th data-sort="string">Path</th>
           <th data-sort="string">Exception</th>
           <th data-sort="string">Backtrace</th>
@@ -30,6 +31,7 @@
             <td><%= link_to e[:controller] + '#' + e[:action], rails_performance.rails_performance_summary_path({controller_eq: e[:controller], action_eq: e[:action]}), remote: true %></td>
             <td><%= e[:method] %></td>
             <td><%= e[:format] %></td>
+            <td><%= bot_icon e["user_agent"] %></td>
             <td><%= link_to_path(e) %></td>
             <td><%= e[:exception] %></td>
             <td class="very-small-text">

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,10 +19,10 @@
         <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>
+          <th></th>
           <th data-sort="string">Path</th>
           <th data-sort="string">Status</th>
           <th data-sort="float">Duration</th>

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

@@ -13,10 +13,10 @@
         <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>
+          <th></th>
           <th data-sort="string">Path</th>
           <th data-sort="string">Status</th>
           <th data-sort="float">Duration</th>

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

@@ -61,6 +61,10 @@
   height: 12px;
 }
 
+.user-agent-icon-user svg path {
+  fill: hsl(141, 53%, 53%) !important;
+}
+
 .chart {
   height: 245px;
 }
@@ -101,3 +105,13 @@ table th[data-sort] {
 #autoupdate_label {
   cursor: pointer;
 }
+
+.is-size-8, .is-size-8 * {
+  font-size: 10px !important;
+  line-height: 20px !important;
+}
+
+.is-size-9, .is-size-9 * {
+  font-size: 7px !important;
+  line-height: 20px !important;
+}

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,32 @@ 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        = {}
+
+        # read current values
+        db.group_by(group).each do |(k, v)|
+          yield(all, k, v)
+        end
+
+        # add blank columns
+        while current <= stop
+          key   = (current).strftime(RailsPerformance::FORMAT)
+          views = all[key].presence || 0
+          @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,10 @@ module RailsPerformance
         @group ||= :datetime
       end
 
-      # 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.alpha4'
+  VERSION = '1.2.0'
   SCHEMA  = '1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_performance
 version: !ruby/object:Gem::Version
-  version: 1.2.0.alpha4
+  version: 1.2.0
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-24 00:00:00.000000000 Z
+date: 2023-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -330,9 +330,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.4.13
 signing_key: