resque-analytics 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17ae0b32a8358b7f91cbec473ec1ce6262eb42c9
-  data.tar.gz: 15252ab1873d1204e8c09d1fe01bd83623bd6a26
+  metadata.gz: d34a98fb442788fefc0a49735c2fab53284a1cd4
+  data.tar.gz: 65663fbffa2183494ab24091c5bf3f4342afa1df
 SHA512:
-  metadata.gz: a1abe2a07366bf72ea85e6f80726f4379f0305f65f0412eb0cdc668efc73fefaffb4d0efd1ff62d288f2b7bffc530eba48c0d3d7ca18b6e0ce363d4298c07e6d
-  data.tar.gz: 5bb4c49cf4b2560315eca59e70519e931858db7debc64e5b0eed3d7502cba13db08768829f2fc76984a6a66b68690ffc8c3e793c8225f8fadab00e10d5684b5f
+  metadata.gz: 043b5a5aad5f9d9c8edae96b262e8a2b9572b6a00326b83362ea308d58f60c062d5f2b3382f27dd2b5cad218065703258766e4f86d52255c7603c28985d6d4e3
+  data.tar.gz: eea25ad9de22a490d44fe8d160107a7621faec14350c971de69efabd4b8be248751db988d078549dc83e92f27fb8ca9a54b08af58c2018d22a14a7b53afe2c62

data/Changelog

@@ -1,3 +1,7 @@
+## 0.7.0 (August 11, 2014)
+
+* Move statistics to summary format, keep a single value for each key per day
+
 ## 0.6.3 (June 23, 2014)
 
 * Add ability to select worker jobs on index screen

data/Rakefile

@@ -2,6 +2,7 @@
 
 require 'rubygems'
 require 'bundler'
+require 'resque'
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -49,3 +50,17 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+desc "Convert multiple queues to a single summarized value"
+task :multi_convert do
+  require 'byebug'
+  Resque.redis.keys("analytics:*").each do |key|
+    _, kpi, job, date = key.split(":")
+    if Resque.redis.type(key) == "string"
+      Resque.redis.hincrby("resque-analytics:#{date}", "#{job}:#{kpi}", Resque.redis.get(key))
+    else
+      Resque.redis.hincrbyfloat("resque-analytics:#{date}", "#{job}:#{kpi}", Resque.redis.lrange(key, 0, -1).inject(0) {|sum,x| sum+x.to_f})
+    end
+    puts "handling #{key}\n"
+  end
+end

data/VERSION

@@ -1 +1 @@
-0.6.3
+0.7.0

data/lib/resque/plugins/analytics.rb

@@ -13,7 +13,7 @@ module Resque
   class Job
     # Override Job initialization to extract the timestamp
     def initialize(queue, payload)
-      timestamp = payload.delete('analytics_timestamp')
+      timestamp = payload && payload.delete('analytics_timestamp')
       @queue = queue
       @payload = payload
       @failure_hooks_ran = false
@@ -39,9 +39,13 @@ module Resque
         @ignore_classes || []
       end
 
-      def key(kpi)
+      def key
         date = Time.now.strftime("%y_%m_%d")
-        "analytics:#{kpi}:#{self.name}:#{date}"
+        "resque-analytics:#{date}"
+      end
+
+      def field(kpi)
+        "#{self.name}:#{kpi}"
       end
 
       def around_perform_analytics(*args)
@@ -49,23 +53,23 @@ module Resque
         yield
         total_time = Time.now - start
 
-        Resque.redis.lpush(key(TOTAL_TIME), total_time)
-        Resque.redis.expire(key(WAIT_TIME), EXPIRE)
+        Resque.redis.hincrbyfloat(key, field(TOTAL_TIME), total_time)
+        Resque.redis.expire(key, EXPIRE)
       end
 
       def after_perform_analytics(*args)
-        Resque.redis.incr(key(PERFORMED))
-        Resque.redis.expire(key(WAIT_TIME), EXPIRE)
+        Resque.redis.hincrby(key, field(PERFORMED), 1)
+        Resque.redis.expire(key, EXPIRE)
       end
 
       def on_failure_analytics(error, *args)
-        Resque.redis.incr(key(FAILED))
-        Resque.redis.expire(key(WAIT_TIME), EXPIRE)
+        Resque.redis.hincrby(key, field(FAILED), 1)
+        Resque.redis.expire(key, EXPIRE)
       end
 
       def analytics_timestamp(timestamp)
-        Resque.redis.lpush(key(WAIT_TIME), Time.now - Time.parse(timestamp))
-        Resque.redis.expire(key(WAIT_TIME), EXPIRE)
+        Resque.redis.hincrbyfloat(key, field(WAIT_TIME), Time.now - Time.parse(timestamp))
+        Resque.redis.expire(key, EXPIRE)
       end
 
     end

data/lib/resque-analytics/server.rb

@@ -9,20 +9,15 @@ module Resque
 
         module Helpers
           def counters_for(job, kpi)
-            kpi_keys = Resque.redis.keys("analytics:#{kpi}:#{job}:*").sort { |a,b| a <=> b }
-            kpi_keys.inject({}) { |res, key| res[key.split(':').last] = key_value(key); res}
+            kpi_keys = Resque.redis.keys("resque-analytics:*").sort { |a,b| a <=> b }
+            kpi_keys.inject({}) { |res, key| res[key.split(':').last] = Resque.redis.hget(key, "#{job}:#{kpi}"); res}
           end
 
           def measured_jobs
-            Resque.redis.keys("analytics*").map { |key| key.split(':')[2] }.uniq
-          end
-
-          def key_value(key)
-            if Resque.redis.type(key) == "string"
-              Resque.redis.get(key)
-            else
-              Resque.redis.lrange(key, 0, -1).map(&:to_f).sum
-            end
+            yesterday = 1.day.ago.strftime("%y_%m_%d")
+            today = Time.now.strftime("%y_%m_%d")
+            fields = Resque.redis.hkeys("resque-analytics:#{yesterday}") + Resque.redis.hkeys("resque-analytics:#{today}")
+            fields.map { |field| field.split(':').first }.uniq.sort { |a,b| a <=> b }
           end
 
           def legend_keys

data/resque-analytics.gemspec

@@ -2,15 +2,15 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: resque-analytics 0.6.3 ruby lib
+# stub: resque-analytics 0.7.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "resque-analytics"
-  s.version = "0.6.3"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nir Tzur"]
-  s.date = "2014-06-23"
+  s.date = "2014-08-11"
   s.description = "Shows Resque jobs key performance indciators over time"
   s.email = "nir.tzur@samanage.com"
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque-analytics
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Nir Tzur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque