ezmetrics 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55610b1357968e974ca2e525a6d09bd2245c8f5e
-  data.tar.gz: efef7c5d22cc0c4d9eb27e91b2149a23e3eb4832
+  metadata.gz: 1bd4e2f35cc2cf1b50efbac72d107041dc68129e
+  data.tar.gz: 179ed567aac638d1ab0d3a4ed86eaad458c55fd1
 SHA512:
-  metadata.gz: a161d7d0715d82958a89131e31c3344dcd4553d78909406bedd0041c0d91e05486be64b2c7c382783b540ca837a57bc97763cc9fc1a88a821f7e19083b22e0ce
-  data.tar.gz: 32073d20b467a1c2e98b0efe561f8513d7e2de23dd75740c42cc3628a62112b1ee69658d533f2b91c99453c375556815dda4515d159b90d7ccf1b7b9cba602e8
+  metadata.gz: e805073975368174e1ce2fd62ce3ddeece44a50bb0141f4a2d7fb9a1b8392c1083667656f29217a1beef6f9add360af0bbba3fe4016263dfa20421af247e1bbf
+  data.tar.gz: 7364788497b995a02cb3385220a7f9e861cc4d7db6377f29850c6d22e25d99b25b6fdbaaa00a6ffb224573739262219136d9739e3676f65af6b4ba03a72c6606

data/README.md

@@ -15,32 +15,33 @@ gem 'ezmetrics'
 
 ### Getting started
 
-This tool captures and aggregates metrics such as 
-- `status`
+This tool captures and aggregates metrics such as
 - `duration`
-- `queries`
+- `views`
 - `db`
+- `queries`
+- `status`
 
 for a 60 seconds timeframe by default.
 
-You can change the timeframe according to your needs and save the metrics by calling `log` method: 
+You can change the timeframe according to your needs and save the metrics by calling `log` method:
 
 ```ruby
   # Store the metrics for 60 seconds (default behaviour)
-  EZmetrics.new.log(status: 200, db: 300.45, duration: 320.45, queries: 5)
+  EZmetrics.new.log(duration: 100.5, views: 40.7, db: 59.8, queries: 4, status: 200)
 ```
 or
 
 ```ruby
   # Store the metrics for 10 minutes
-  EZmetrics.new(10.minutes).log(status: 200, db: 300.45, duration: 320.45, queries: 5) 
+  EZmetrics.new(10.minutes).log(duration: 100.5, views: 40.7, db: 59.8, queries: 4, status: 200)
 ```
 
 For displaying metrics you need call `show` method:
 
 ```ruby
   # Aggregate and show metrics for last 60 seconds (default behaviour)
-  EZmetrics.new.show 
+  EZmetrics.new.show
 ```
 
 or
@@ -69,10 +70,11 @@ end
 ActiveSupport::Notifications.subscribe("process_action.action_controller") do |*args|
   event = ActiveSupport::Notifications::Event.new(*args)
   EZmetrics.new.log(
-    queries:  Thread.current[:queries].to_i,
-    db:       event.payload[:db_runtime].to_f,
     duration: event.duration.to_f,
-    status:   event.payload[:status].to_i || 500
+    views:    event.payload[:view_runtime].to_f,
+    db:       event.payload[:db_runtime].to_f,
+    status:   event.payload[:status].to_i || 500,
+    queries:  Thread.current[:queries].to_i,
   )
 end
 ```
@@ -91,6 +93,10 @@ This will return a hash with the following structure:
     avg: 5569,
     max: 9675
   },
+  views: {
+    avg: 12,
+    max: 240
+  },
   db: {
     avg: 155,
     max: 4382

data/lib/ezmetrics.rb

@@ -8,36 +8,39 @@ class EZmetrics
     @storage_key      = "ez-metrics"
   end
 
-  def log(payload={db: 0.0, duration: 0.0, queries: 0, status: 200})
-    payload = {
+  def log(payload={duration: 0.0, views: 0.0, db: 0.0, queries: 0, status: 200})
+    @safe_payload = {
+      duration: payload[:duration].to_f,
+      views:    payload[:views].to_f,
       db:       payload[:db].to_f,
       queries:  payload[:queries].to_i,
-      duration: payload[:duration].to_f,
       status:   payload[:status].to_i
     }
 
-    this_second         = Time.now.to_i
-    status_group        = "#{payload[:status].to_s[0]}xx"
-    this_second_metrics = redis.get("#{storage_key}:#{this_second}")
+    this_second          = Time.now.to_i
+    status_group         = "#{payload[:status].to_s[0]}xx"
+    @this_second_metrics = redis.get("#{storage_key}:#{this_second}")
 
     if this_second_metrics
-      this_second_metrics = JSON.parse(this_second_metrics)
-      this_second_metrics["db_sum"]                 += payload[:db]
-      this_second_metrics["queries_sum"]            += payload[:queries]
-      this_second_metrics["duration_sum"]           += payload[:duration]
+      @this_second_metrics = JSON.parse(this_second_metrics)
+
+      [:duration, :views, :db, :queries].each do |metrics_type|
+        update_sum(metrics_type)
+        update_max(metrics_type)
+      end
+
       this_second_metrics["statuses"]["all"]        += 1
       this_second_metrics["statuses"][status_group] += 1
-      this_second_metrics["db_max"]                 = [payload[:db], this_second_metrics["db_max"]].max
-      this_second_metrics["queries_max"]            = [payload[:queries], this_second_metrics["queries_max"]].max
-      this_second_metrics["duration_max"]           = [payload[:duration], this_second_metrics["duration_max"]].max
     else
-      this_second_metrics = {
-        "db_sum"       => payload[:db],
-        "db_max"       => payload[:db],
-        "queries_sum"  => payload[:queries],
-        "queries_max"  => payload[:queries],
-        "duration_sum" => payload[:duration],
-        "duration_max" => payload[:duration],
+      @this_second_metrics = {
+        "duration_sum" => safe_payload[:duration],
+        "duration_max" => safe_payload[:duration],
+        "views_sum"    => safe_payload[:views],
+        "views_max"    => safe_payload[:views],
+        "db_sum"       => safe_payload[:db],
+        "db_max"       => safe_payload[:db],
+        "queries_sum"  => safe_payload[:queries],
+        "queries_max"  => safe_payload[:queries],
         "statuses"     => { "2xx" => 0, "3xx" => 0, "4xx" => 0, "5xx" => 0, "all" => 1 }
       }
 
@@ -67,7 +70,17 @@ class EZmetrics
 
   private
 
-  attr_reader :redis, :interval_seconds, :interval_metrics, :requests, :storage_key
+  attr_reader :redis, :interval_seconds, :interval_metrics, :requests, :storage_key,
+    :safe_payload, :this_second_metrics
+
+  def update_sum(metrics)
+    this_second_metrics["#{metrics}_sum"] += safe_payload[metrics.to_sym]
+  end
+
+  def update_max(metrics)
+    max_value = [safe_payload[metrics.to_sym], this_second_metrics["#{metrics}_max"]].max
+    this_second_metrics["#{metrics}_max"] = max_value
+  end
 
   def avg(metrics)
     (interval_metrics.map { |h| h[metrics.to_s] }.sum.to_f / requests).round
@@ -95,6 +108,10 @@ class EZmetrics
         avg: avg(:duration_sum),
         max: max(:duration_max)
       },
+      views: {
+        avg: avg(:views_sum),
+        max: max(:views_max)
+      },
       db: {
         avg: avg(:db_sum),
         max: max(:db_max)
@@ -121,6 +138,10 @@ class EZmetrics
         avg: 0,
         max: 0
       },
+      views: {
+        avg: 0,
+        max: 0
+      },
       db: {
         avg: 0,
         max: 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ezmetrics
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Nicolae Rotaru