ezmetrics 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ba2e24bca76b2786c1264b779e72764e123094150855cae241d673505df95ad
-  data.tar.gz: 3c297b92a53c51b8b881fbbafb15929b9bac36eb53164c3faab37c2caa72db02
+  metadata.gz: 518d9350ed026801311bdc695857fdd057856f6b7fe40715bf8072c990e8e5b8
+  data.tar.gz: 7d36fbd3e63994789ce8ac04212fb44c30041fd33f7173fbfdf1a6257beea99a
 SHA512:
-  metadata.gz: 4d1e8118d48cac15dca166c6c4f0d8e38344b28bfcc85343fa87ff4877d34bc7f12b9841241de563723261df5a48210cf1838c09eece3bc15d5f2dde6a58c8c2
-  data.tar.gz: 8e62b7b53f73a6343c8fd6f11e0e8a9f856314dd262c10611cd9bf061636c8801255de58818a1736069679525bed73c949e6f61778910de8a306da30c352e2a2
+  metadata.gz: 42e990916d474ed52f08330bd7210b4c6f464a0199354cfc1fe3710817b9d57790d445d0d1f88c8fccd6daeb627638a80dd8b578c685544f6a4f9c7765522a5f
+  data.tar.gz: 5b49eec021acaef39af2c9401681fa85f02d368f36231a60a64faf595e5b0c1432ce07a67fb86ce9c8b3041835fd4480da86ea5d91f7ca0939ef5b40592e6a49

data/README.md

@@ -31,22 +31,20 @@ You can change the timeframe according to your needs and save the metrics by cal
   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(duration: 100.5, views: 40.7, db: 59.8, queries: 4, status: 200)
 ```
 
-For displaying metrics you need call `show` method:
+---
+
+For displaying metrics you need to call `show` method:
 
 ```ruby
   # Aggregate and show metrics for last 60 seconds (default behaviour)
   EZmetrics.new.show
 ```
 
-or
-
 ```ruby
   # Aggregate and show metrics for last 10 minutes
   EZmetrics.new(10.minutes).show
@@ -121,11 +119,11 @@ This will return a hash with the following structure:
 }
 ```
 
-### Output configuration
+### Aggregation options
 
-The output can be easily configured by specifying aggregation options as in the following examples:
+The aggregation can be easily configured by specifying aggregation options as in the following examples:
 
-1. Single
+**1. Single**
 
 ```ruby
 EZmetrics.new.show(duration: :max)
@@ -139,7 +137,9 @@ EZmetrics.new.show(duration: :max)
 }
 ```
 
-2. Multiple
+---
+
+**2. Multiple**
 
 ```ruby
 EZmetrics.new.show(queries: [:max, :avg])
@@ -154,7 +154,9 @@ EZmetrics.new.show(queries: [:max, :avg])
 }
 ```
 
-3. Requests
+---
+
+**3. Requests**
 
 ```ruby
 EZmetrics.new.show(requests: true)
@@ -174,7 +176,9 @@ EZmetrics.new.show(requests: true)
 }
 ```
 
-4. Combined
+---
+
+**4. Combined**
 
 ```ruby
 EZmetrics.new.show(views: :avg, :db: [:avg, :max], requests: true)
@@ -203,13 +207,7 @@ EZmetrics.new.show(views: :avg, :db: [:avg, :max], requests: true)
 
 ### Performance
 
-The implementation is based on **Redis** commands such as:
-
-- [`get`](https://redis.io/commands/get)
-- [`mget`](https://redis.io/commands/mget)
-- [`setex`](https://redis.io/commands/setex)
-
-which are extremely fast.
+The aggregation speed relies on the performance of **Redis** (data storage) and **Oj** (json serialization/parsing).
 
 You can check the **aggregation** time by running:
 
@@ -222,7 +220,7 @@ The result of running this benchmark on a _2017 Macbook Pro 2.9 GHz Intel Core i
 | Interval | Duration (seconds) |
 | :------: | :----------------: |
 | 1 minute |        0.0         |
-|  1 hour  |        0.05        |
-| 12 hours |        0.66        |
-| 24 hours |        1.83        |
-| 48 hours |        4.06        |
+|  1 hour  |        0.04        |
+| 12 hours |        0.49        |
+| 24 hours |        1.51        |
+| 48 hours |        3.48        |

data/lib/ezmetrics.rb

@@ -9,7 +9,6 @@ class EZmetrics
   def initialize(interval_seconds=60)
     @interval_seconds = interval_seconds.to_i
     @redis            = Redis.new
-    @storage_key      = "ez-metrics"
   end
 
   def log(payload={duration: 0.0, views: 0.0, db: 0.0, queries: 0, status: 200})
@@ -23,7 +22,7 @@ class EZmetrics
 
     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_metrics = redis.get(this_second)
 
     if this_second_metrics
       @this_second_metrics = Oj.load(this_second_metrics)
@@ -51,7 +50,7 @@ class EZmetrics
       this_second_metrics["statuses"][status_group] = 1
     end
 
-    redis.setex("#{storage_key}:#{this_second}", interval_seconds, Oj.dump(this_second_metrics))
+    redis.setex(this_second, interval_seconds, Oj.dump(this_second_metrics))
     true
   rescue => error
     formatted_error(error)
@@ -60,12 +59,12 @@ class EZmetrics
   def show(options=nil)
     @options          = options || default_options
     interval_start    = Time.now.to_i - interval_seconds
-    interval_keys     = (interval_start..Time.now.to_i).to_a.map { |second| "#{storage_key}:#{second}" }
+    interval_keys     = (interval_start..Time.now.to_i).to_a
     @interval_metrics = redis.mget(interval_keys).compact.map { |hash| Oj.load(hash) }
 
     return {} unless interval_metrics.any?
 
-    @requests = interval_metrics.map { |hash| hash["statuses"]["all"] }.compact.sum
+    @requests = interval_metrics.sum { |hash| hash["statuses"]["all"] }
     build_result
   rescue
     {}
@@ -79,17 +78,7 @@ class EZmetrics
   def build_result
     result = {}
 
-    if options[:requests]
-      result[:requests] = {
-        all: requests,
-        grouped: {
-          "2xx" => count("2xx"),
-          "3xx" => count("3xx"),
-          "4xx" => count("4xx"),
-          "5xx" => count("5xx")
-        }
-      }
-    end
+    result[:requests] = { all: requests, grouped: count_all_status_groups } if options[:requests]
 
     options.each do |metrics, aggregation_functions|
       next unless METRICS.include?(metrics)
@@ -108,29 +97,35 @@ class EZmetrics
 
   def aggregate(metrics, aggregation_function)
     return unless AGGREGATION_FUNCTIONS.include?(aggregation_function)
-    return avg("#{metrics}_sum".to_sym) if aggregation_function == :avg
-    return max("#{metrics}_max".to_sym) if aggregation_function == :max
+    return avg("#{metrics}_sum") if aggregation_function == :avg
+    return max("#{metrics}_max") if aggregation_function == :max
   end
 
   def update_sum(metrics)
-    this_second_metrics["#{metrics}_sum"] += safe_payload[metrics.to_sym]
+    this_second_metrics["#{metrics}_sum"] += safe_payload[metrics]
   end
 
   def update_max(metrics)
-    max_value = [safe_payload[metrics.to_sym], this_second_metrics["#{metrics}_max"]].max
+    max_value = [safe_payload[metrics], 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
+    (interval_metrics.sum { |h| h[metrics] }.to_f / requests).round
   end
 
   def max(metrics)
-    interval_metrics.map { |h| h[metrics.to_s] }.max.round
+    interval_metrics.max { |h| h[metrics] }[metrics].round
   end
 
-  def count(group)
-    interval_metrics.map { |h| h["statuses"][group.to_s] }.sum
+  def count_all_status_groups
+    interval_metrics.inject({ "2xx" => 0, "3xx" => 0, "4xx" => 0, "5xx" => 0 }) do |result, h|
+      result["2xx"] += h["statuses"]["2xx"]
+      result["3xx"] += h["statuses"]["3xx"]
+      result["4xx"] += h["statuses"]["4xx"]
+      result["5xx"] += h["statuses"]["5xx"]
+      result
+    end
   end
 
   def default_options

data/lib/ezmetrics/benchmark.rb

@@ -52,14 +52,14 @@ class EZmetrics::Benchmark
           "all" => rand(40)
         }
       }
-      redis.setex("ez-metrics:#{second}", seconds, Oj.dump(payload))
+      redis.setex(second, seconds, Oj.dump(payload))
     end
     nil
   end
 
   def cleanup_metrics
     interval_start = Time.now.to_i - intervals.values.max - 100
-    interval_keys  = (interval_start..Time.now.to_i).to_a.map { |second| "ez-metrics:#{second}" }
+    interval_keys  = (interval_start..Time.now.to_i).to_a
     redis.del(interval_keys)
   end
 

metadata

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