rails_performance 0.0.1.2 → 0.0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68f35c4eec4521b60ad740040da1a980e517f951444f52563dedf1f9e5958c8a
-  data.tar.gz: 0b384d8bda35a86b7fbc384b2834829eb2f8bd92edf01d974bd75d139748f749
+  metadata.gz: 57398ce57cc6e6707959d81156ffb0b48f8b32f55e25657f1f0a714c89c1bc2c
+  data.tar.gz: 1250f710f15e028d1c8ed187cd6e1e9849ad8e0d440cb6eb6bd5eb67ec09d491
 SHA512:
-  metadata.gz: ad282e2024c5eadf23eade5c6b02dc31255f8bd1fe34b9b03c2557f5a5d2a1ab640f9b23d13d2e2c0dbf081b6fd4cec2b6ac34bacf6e722e81b8c2de69b5c321
-  data.tar.gz: 3ef27d25873473bfd87369356ecbd28d57471ce27240513f01d0a546c80ab8790c983b0ad9e9ecc61bddfe0b9c9a64dad8dd274981890dd2e34e69b697724664
+  metadata.gz: a1d3edeb648e2cd152e479c03c4d52e6c697963ba8c677f42bceb6fa373896cd353f24e0f0bababed286cd323b71db265a98fccaa9ea5f425eb46027b7873e04
+  data.tar.gz: 74936554df31a3672f68985ff68f640f33faa4a798a2f7a53bcb2169eebcea6bf62a65ab3863771936013a166313a8f04cd5d564678481786cdaf1807bee1580

data/app/controllers/rails_performance_controller.rb

@@ -1,15 +1,13 @@
 class RailsPerformanceController < ActionController::Base
 
   def index
-    @datasource = RailsPerformance::DataSource.new(
-      q: {
-        #  controller: "HomeController",
-        #  action: "about"
-      })
+    @datasource = RailsPerformance::DataSource.new(RailsPerformance::QueryBuilder.compose_from(params))
 
-    @data   = RailsPerformance::ThroughputReport.new(@datasource.db).data
-    @global = RailsPerformance::RequestsReport.new(@datasource.db, group: :controller_action_format, sort: :db_runtime_slowest).data
-    #@full   = RailsPerformance::FullReport.new.data(:controller_action).sort{|a, b| b[:count] <=> a[:count]}
+    @throughput_report      = RailsPerformance::ThroughputReport.new(@datasource.db)
+    @throughput_report_data = @throughput_report.data
+
+    @global_report          = RailsPerformance::RequestsReport.new(@datasource.db, group: :controller_action_format, sort: :db_runtime_slowest)
+    @global_report_data     = @global_report.data
   end
 
   # def RailsPerformanceController.x

data/app/helpers/rails_performance_helper.rb

@@ -5,4 +5,21 @@ module RailsPerformanceHelper
 
     value.nan? ? nil : value.round(2)
   end
+
+  def statistics_link(title, report, group)
+    options = case report.group
+    when :controller_action_format
+      ca = group.split("|")
+      c, a = ca[0].split("#")
+      {
+        controller_eq: c,
+        action_eq: a,
+        format_eq: ca[1]
+      }
+    else
+      {}
+    end
+
+    link_to title, rails_performance_path(options)
+  end
 end

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

@@ -102,5 +102,13 @@
     color: white;
     background-color: #282e38;
   }
+  table a {
+    color: white;
+  }
+
+  .back_link {
+    color: white;
+    font-size: 20px;
+  }
 
 </style>

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

@@ -2,6 +2,10 @@
 
 <title>Number of Requests to the Application</title>
 
+<% unless @datasource.default? %>
+  <%= link_to raw("&larr; Back"), rails_performance_path, class: "back_link" %>
+<% end %>
+
 <br/>
 <br/>
 <br/>
@@ -38,10 +42,10 @@
       </tr>
     </thead>
     <tbody>
-      <% @global.each do |e| %>
+      <% @global_report_data.each do |e| %>
         <% groups = e[:group].split("|") %>
         <tr>
-          <td><%= groups[0] %></td>
+          <td><%= statistics_link groups[0], @global_report, e[:group] %></td>
           <td><%= groups[1]&.upcase %></td>
           <td><%= e[:count] %></td>
           <td><%= round_it e[:duration_average] %></td>
@@ -64,7 +68,7 @@
 <%= render '/rails_performance/js' %>
 
 <script>
-  var data = <%= raw @data.to_json %>;
+  var data = <%= raw @throughput_report_data.to_json %>;
   showRequestsChart('chart', data);
 </script>
 

data/lib/rails_performance.rb

@@ -1,5 +1,6 @@
 require "redis"
 require "redis-namespace"
+require_relative "rails_performance/query_builder.rb"
 require_relative "rails_performance/middleware.rb"
 require_relative "rails_performance/data_source.rb"
 require_relative "rails_performance/record.rb"

data/lib/rails_performance/data_source.rb

@@ -5,26 +5,31 @@ module RailsPerformance
     def initialize(q: {})
       q[:on] ||= Date.today
       @q       = q
+
+      #puts "  [DataSource Q]  -->  #{@q.inspect}\n\n"
     end
 
-    def DataSource.all
+    def db
       result = RP::Collection.new
       RP::Utils.days.times do |e|
-        RP::DataSource.new(q: { on: e.days.ago.to_date }).add_to(result)
+        RP::DataSource.new(q: self.q.merge({ on: e.days.ago.to_date })).add_to(result)
       end
       result
     end
 
-    def db(storage = RP::Collection.new)
+    def default?
+      @q.keys == [:on]
+    end
+
+    def add_to(storage = RP::Collection.new)
       store do |record|
         storage.add(record)
       end
       storage
     end
-    alias :add_to :db
 
     def store
-      #puts "\n\n   [REDIS]   -->   #{query}\n\n"
+#      puts "\n\n   [REDIS QUERY]   -->   #{query}\n\n"
 
       keys   = RP.redis.keys(query)
       return [] if keys.blank?

data/lib/rails_performance/engine.rb

@@ -1,6 +1,6 @@
 require_relative './middleware.rb'
 require_relative './collection.rb'
-require_relative './metrics_listener.rb'
+require_relative './metrics_collector.rb'
 
 module RailsPerformance
   class Engine < ::Rails::Engine
@@ -11,7 +11,7 @@ module RailsPerformance
     initializer :configure_metrics, after: :initialize_logger do
       ActiveSupport::Notifications.subscribe(
         "process_action.action_controller",
-        RailsPerformance::MetricsListener.new
+        RailsPerformance::MetricsCollector.new
       )
     end
 

data/lib/rails_performance/{metrics_listener.rb → metrics_collector.rb}

@@ -1,5 +1,5 @@
 module RailsPerformance
-  class MetricsListener
+  class MetricsCollector
     FORMAT = "%Y%m%dT%H%M"
 
     # payload
@@ -19,14 +19,12 @@ module RailsPerformance
     def call(event_name, started, finished, event_id, payload)
       event = ActiveSupport::Notifications::Event.new(event_name, started, finished, event_id, payload)
 
-      #finished = Time.now - rand(180).minutes
-
       record = {
         controller: event.payload[:controller],
         action: event.payload[:action],
         format: event.payload[:format],
         status: event.payload[:status],
-        datetime: finished.strftime(FORMAT),
+        datetime: finished.strftime(RailsPerformance::MetricsCollector::FORMAT),
         datetimei: finished.to_i,
         method: event.payload[:method],
         path: event.payload[:path],

data/lib/rails_performance/middleware.rb

@@ -9,7 +9,19 @@ module RailsPerformance
 
       if record = Thread.current["RP_request_info"]
         record[:status] ||= @status
+
+        # rand(100).times do |e|
+        #   finished = Time.now - rand(2000).minutes
+        #   record[:datetime]  = finished.strftime(RailsPerformance::MetricsCollector::FORMAT)
+        #   record[:datetimei] = finished.to_i
+        #   record[:duration]      = rand(record[:duration].to_f * 2)
+        #   record[:db_runtime]    = rand(record[:db_runtime].to_f * 2)
+        #   record[:view_runtime]  = rand(record[:view_runtime].to_f * 2)
+        #   RP::Utils.log_in_redis(record)
+        # end
+
         RP::Utils.log_in_redis(record)
+
         Thread.current["RP_request_info"] = nil
       end
 

data/lib/rails_performance/query_builder.rb

@@ -0,0 +1,17 @@
+module RailsPerformance
+  class QueryBuilder
+
+    def QueryBuilder.compose_from(params)
+      result = {}
+
+      result[:controller] = params[:controller_eq]
+      result[:action]     = params[:action_eq]
+      result[:format]     = params[:format_eq]
+
+      result.delete_if {|k, v| v.nil?}
+
+      { q: result }
+    end
+
+  end
+end

data/lib/rails_performance/throughput_report.rb

@@ -12,6 +12,9 @@ module RailsPerformance
       @data   = []
       offset  = Time.current.utc_offset
 
+      # puts "current: #{current}"
+      # puts "stop: #{stop}"
+
       # read current values
       db.group_by(group).values.each do |(k, v)|
         all[k] = v.count
@@ -19,7 +22,7 @@ module RailsPerformance
 
       # add blank columns
       while current <= stop
-        views = all[current.strftime(MetricsListener::FORMAT)] || 0
+        views = all[current.strftime(MetricsCollector::FORMAT)] || 0
         @data << [(current.to_i + offset) * 1000, views.to_i]
         current += 1.minute
       end

data/lib/rails_performance/utils.rb

@@ -16,11 +16,12 @@ module RailsPerformance
       value = e.slice(:view_runtime, :db_runtime, :duration)
       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]}|END"
 
-      #puts "  [SAVE]    key  --->  #{key}\n"
-      #puts "          value  --->  #{value.to_json}\n\n"
+      # puts "  [SAVE]    key  --->  #{key}\n"
+      # puts "          value  --->  #{value.to_json}\n\n"
 
       RP.redis.set(key, value.to_json)
       RP.redis.expire(key, RP.duration.to_i)
+
       true
     end
 

data/lib/rails_performance/version.rb

@@ -1,3 +1,3 @@
 module RailsPerformance
-  VERSION = '0.0.1.2'
+  VERSION = '0.0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_performance
 version: !ruby/object:Gem::Version
-  version: 0.0.1.2
+  version: 0.0.1.3
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-25 00:00:00.000000000 Z
+date: 2020-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -102,8 +102,9 @@ files:
 - lib/rails_performance/collection.rb
 - lib/rails_performance/data_source.rb
 - lib/rails_performance/engine.rb
-- lib/rails_performance/metrics_listener.rb
+- lib/rails_performance/metrics_collector.rb
 - lib/rails_performance/middleware.rb
+- lib/rails_performance/query_builder.rb
 - lib/rails_performance/record.rb
 - lib/rails_performance/requests_report.rb
 - lib/rails_performance/throughput_report.rb