rails_performance 1.2.0.alpha4 → 1.2.0.alpha5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71e33d8156df40c792e33f03eae39a06c12f1622aa2c8071291c4e81c803d3ac
-  data.tar.gz: 288c78335fec92abede6d72f82b841fd128ff079baad62d3a1ea3900003c5171
+  metadata.gz: 62aee36c96f068b8caf8a8f9ba1eb7b0c00f8c6493a8f609f0adaca7e0c11f9b
+  data.tar.gz: b61d9ade77df9d29364694937e28fa57a029b497dc327872dc435006d412a136
 SHA512:
-  metadata.gz: 2617feffb5ceeb2c644679a4de52ecc60797350c883776cfd706b4d7a3c4fca77c93e15ad7243f4fe18c2612728b241f9584a5a7135947b7e8f66dec6f05ae59
-  data.tar.gz: 8bff9d4b572f7bb41de93850651c210e0e59d6e03395e78d10ca777ace00ad31fb85f40c1153fe60062d3ac1a4094b1e6c0e64bef3c44757b3b8f102a776afb6
+  metadata.gz: cb30056a19056d5b18c6f59af939e22bb4dda67adc0afb08d71ff4b215f4abac53bdd916e359e3655fa2e264be89d1b54af4dd8780bbfd1076e1b9d426c8d50a
+  data.tar.gz: f4806fa7db15d691a9ecc95597b7d262ad28a739840ccfe949bf8815a1ac83dfa411a26cc13bb7343009b878f30a250ae9a43fc004b04253e3cb437f6f40aac1

data/app/helpers/rails_performance/application_helper.rb

@@ -100,12 +100,12 @@ module RailsPerformance
 
       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") do
           icon("user")
         end
       end

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/stylesheets/style.css

@@ -61,6 +61,10 @@
   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.alpha4'
+  VERSION = '1.2.0.alpha5'
   SCHEMA  = '1.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_performance
 version: !ruby/object:Gem::Version
-  version: 1.2.0.alpha4
+  version: 1.2.0.alpha5
 platform: ruby
 authors:
 - Igor Kasyanchuk