reportsmash 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1bdce2079cc27dd030216c1bf9a0ab336573d8e
-  data.tar.gz: 37667eb9450942119dfcdd3c90aeff97e800cdd2
+  metadata.gz: d6a2e361441ac51e42db6603aa00f9e91c0abd8a
+  data.tar.gz: 0b56f90a9bcf219ae89699ae5454206a161e4e65
 SHA512:
-  metadata.gz: cee6a4972d2c3f64e571fda4e24d057d98d1e58510176800cb1d23094d4846978056edf2e57a0e10a6399d31aee012a2e2e23ad04ab8d9a72c18df1e0f56b1d1
-  data.tar.gz: 1faaf595786390e617b8046eee987c622fb2f64e8a30f174bb201a8c04bf5681347815eec8c8a201a03d91cb806226525a42e4749a08185e1c1084dcedc75a6f
+  metadata.gz: 1e180024c55614e74a246ee4a493412c669f6a508868676b9b9f5e55c3e2a838dd0c80ad3c9183b547bc464d25e7a697ec951d520e7f2fb25c7ebfdedb482292
+  data.tar.gz: d2bde30cc76bfdb3047ca736ee35a464a5daa00c1c272fedf5d6a3d505039ce2aff1ad3c747ce4dc7272d930a169918e5519fff3b667da57d3aa6d38d63bed51

data/lib/reportsmash/engine/transaction.rb

@@ -39,7 +39,7 @@ module ReportsMash::Engine
       @total_duration_ms = (stop_time - start_time) * 1000.0
       path_params = @request["action_dispatch.request.path_parameters"]
       controller_action = "static_file_server"
-      if path_params.key?(:controller) && path_params.key?(:action)
+      if path_params && path_params.key?(:controller) && path_params.key?(:action)
         controller_action = path_params[:controller]+"#"+path_params[:action]
       end
 
@@ -106,7 +106,6 @@ module ReportsMash::Engine
         :external_http_requests => @external_http_requests,
         :external_memcache_requests => @memcached_stats,
         :external_redis_requests => @redis_stats,
-        
         :custom_attributes => @user_params
       }
     end

data/lib/reportsmash/engine/transaction.rb~

@@ -0,0 +1,116 @@
+module ReportsMash::Engine
+  class Transaction
+    attr_accessor :user_params
+    attr_accessor :payload
+    attr_accessor :db_transactions, :db_duration_ms, :render_transactions, :render_duration_ms
+    attr_accessor :external_http_requests, :external_http_duration_ms
+    attr_accessor :memcached_ops, :redis_ops
+
+    def initialize(engine, request)
+      @engine = engine
+      @request = request
+      @response = nil
+      @tid = SecureRandom.uuid
+      @user_params = []
+      @start_time = nil
+      @total_duration_ms = 0
+      @db_duration_ms = 0
+      @render_duration_ms = 0
+      @payload = {}
+      @db_transactions = []
+      @render_transactions = []
+      @external_http_requests = []
+      @external_http_duration_ms = 0
+      @memcached_ops = []
+      @redis_ops = []
+    end
+
+    def tid
+      @tid
+    end   
+
+    def add_user_params(new_params)
+      @user_params.merge!(new_params) if new_params.is_a? Hash
+    end
+ 
+    def end(start_time, stop_time, status_code, headers)
+      @start_time = start_time
+      response_content_type = (headers && headers["Content-Type"]) ? headers["Content-Type"] : ""
+      @total_duration_ms = (stop_time - start_time) * 1000.0
+      path_params = @request["action_dispatch.request.path_parameters"]
+      controller_action = "static_file_server"
+      if path_params.key?(:controller) && path_params.key?(:action)
+        controller_action = path_params[:controller]+"#"+path_params[:action]
+      end
+
+      @memcached_stats = {}
+      mc_duration_ms = 0
+      mc_counter = 0
+      if @memcached_ops.count > 0
+        %w[get set get_multi].each do |op|
+          stat = {count: 0, duration_ms: 0, avg_ms: 0}
+          @memcached_ops.select{|h| h.key? op.to_sym}.each do |trace|
+            stat[:count] += 1
+            stat[:duration_ms] += trace[op.to_sym]
+            stat[:avg_ms] = (stat[:duration_ms]/Float(stat[:count])).round(2)
+            @memcached_stats[op.to_sym] = stat
+            mc_duration_ms += stat[:duration_ms]
+            mc_counter += 1
+          end
+        end
+        #puts "GOT MC_OPS #{@memcached_ops.inspect}: #{@memcached_stats.inspect}"
+      end
+
+      @redis_stats = {}
+      redis_duration_ms = 0
+      redis_counter = 0
+      if @redis_ops.count > 0
+        %w[get set].each do |op|
+          stat = {count: 0, duration_ms: 0, avg_ms: 0}
+          @redis_ops.select{|h| h.key? op.to_sym}.each do |trace|
+            stat[:count] += 1
+            stat[:duration_ms] += trace[op.to_sym]
+            stat[:avg_ms] = (stat[:duration_ms]/Float(stat[:count])).round(2)
+            @redis_stats[op.to_sym] = stat
+            redis_duration_ms += stat[:duration_ms]
+            redis_counter += 1
+          end
+        end
+        #puts "GOT REDIS_OPS #{@redis_ops.inspect}: #{@redis_stats.inspect}"
+      end
+
+      @payload = {
+        :time_utc => @start_time.utc.to_i,
+        :user_ip => @request["REMOTE_ADDR"],
+        :user_agent => @request["HTTP_USER_AGENT"],
+        :method => @request["REQUEST_METHOD"],
+        :http_host => @request["HTTP_HOST"],
+        :request_uri => @request["REQUEST_URI"],
+        :request_path => @request["REQUEST_PATH"],
+        :controller_action => controller_action,
+        :response_content_type => response_content_type,
+        :status => status_code,
+        :total_duration_ms => @total_duration_ms.round(2),
+        :db_duration_ms => @db_duration_ms.round(2),
+        :render_duration_ms => @render_duration_ms.round(2),
+        :external_http_duration_ms => @external_http_duration_ms.round(2),
+        :external_memcache_duration_ms => mc_duration_ms.round(2),
+        :external_redis_duration_ms => redis_duration_ms.round(2),
+        :db_counter => @db_transactions.count,
+        :render_counter => @render_transactions.count,
+        :external_http_counter => @external_http_requests.count,
+        :external_memcache_counter => mc_counter,
+        :external_redis_counter => redis_counter,
+        :db_transactions => @db_transactions,
+        :render_transactions => @render_transactions,
+        :external_http_requests => @external_http_requests,
+        :external_memcache_requests => @memcached_stats,
+        :external_redis_requests => @redis_stats,
+        
+        :custom_attributes => @user_params
+      }
+    end
+  end
+
+end
+

data/lib/reportsmash/version.rb

@@ -1,3 +1,3 @@
 module ReportsMash
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

data/lib/reportsmash/version.rb~

@@ -1,3 +1,3 @@
 module ReportsMash
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reportsmash
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Zeljko Tomic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-08 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -79,6 +79,7 @@ files:
 - lib/reportsmash/engine/thread_state.rb
 - lib/reportsmash/engine/threading.rb
 - lib/reportsmash/engine/transaction.rb
+- lib/reportsmash/engine/transaction.rb~
 - lib/reportsmash/engine/worker.rb
 - lib/reportsmash/engine/worker.rb~
 - lib/reportsmash/rack.rb