resque-metrics 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/resque/metrics.rb

@@ -76,9 +76,9 @@ module Resque
         increment_metric "fork_count:queue:#{queue}"
         increment_metric "fork_count:job:#{job_class}"
       end
-      set_metric "avg_fork_time", total_fork_time / total_fork_count
-      set_metric "avg_fork_time:queue:#{queue}", total_fork_time_by_queue(queue) / total_fork_count_by_queue(queue)
-      set_metric "avg_fork_time:job:#{job_class}", total_fork_time_by_job(job_class) / total_fork_count_by_job(job_class)
+      set_avg "avg_fork_time", total_fork_time , total_fork_count
+      set_avg "avg_fork_time:queue:#{queue}", total_fork_time_by_queue(queue) , total_fork_count_by_queue(queue)
+      set_avg "avg_fork_time:job:#{job_class}", total_fork_time_by_job(job_class) , total_fork_count_by_job(job_class)
       run_callback(:on_job_fork, job_class, queue, time)
     end
 
@@ -94,9 +94,9 @@ module Resque
         increment_metric "payload_size:queue:#{queue}", size
         increment_metric "payload_size:job:#{job_class}", size
       end
-      set_metric "avg_payload_size", total_payload_size / total_enqueue_count
-      set_metric "avg_payload_size:queue:#{queue}", total_payload_size_by_queue(queue) / total_enqueue_count_by_queue(queue)
-      set_metric "avg_payload_size:job:#{job_class}", total_payload_size_by_job(job_class) / total_enqueue_count_by_job(job_class)
+      set_avg "avg_payload_size", total_payload_size , total_enqueue_count
+      set_avg "avg_payload_size:queue:#{queue}", total_payload_size_by_queue(queue) , total_enqueue_count_by_queue(queue)
+      set_avg "avg_payload_size:job:#{job_class}", total_payload_size_by_job(job_class) , total_enqueue_count_by_job(job_class)
       run_callback(:on_job_enqueue, job_class, queue, size)
       true
     end
@@ -111,9 +111,9 @@ module Resque
         increment_metric "job_count:queue:#{queue}"
         increment_metric "job_count:job:#{job_class}"
       end
-      set_metric "avg_job_time", total_job_time / total_job_count
-      set_metric "avg_job_time:queue:#{queue}", total_job_time_by_queue(queue) / total_job_count_by_queue(queue)
-      set_metric "avg_job_time:job:#{job_class}", total_job_time_by_job(job_class) / total_job_count_by_job(job_class)
+      set_avg "avg_job_time", total_job_time, total_job_count
+      set_avg "avg_job_time:queue:#{queue}", total_job_time_by_queue(queue) , total_job_count_by_queue(queue)
+      set_avg "avg_job_time:job:#{job_class}", total_job_time_by_job(job_class) , total_job_count_by_job(job_class)
       run_callback(:on_job_complete, job_class, queue, time)
     end
 
@@ -125,6 +125,11 @@ module Resque
       redis.set("_metrics_:#{metric}", val)
     end
 
+    def self.set_avg(metric, num, total)
+      val = total < 1 ? 0 : num / total
+      set_metric(metric, val)
+    end
+
     def self.get_metric(metric)
       redis.get("_metrics_:#{metric}").to_i
     end

data/resque-metrics.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "resque-metrics"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Quint"]
-  s.date = "2012-11-15"
+  s.date = "2012-11-28"
   s.description = "A simple Resque plugin that times and saves some simple metrics for Resque jobs back into redis. Based on this system\nyou could build some simple auto-scaling mechanism based on the speed and ETA of queues. Also includes a hook/callback\nmechanism for recording/sending the metrics to your favorite tool (AKA statsd/graphite).\n"
   s.email = "aaron@quirkey.com"
   s.extra_rdoc_files = [

data/test/helper.rb

@@ -42,8 +42,8 @@ at_exit do
 
   pid = `ps -e -o pid,command | grep [r]edis-test`.split(" ")[0]
   puts "Killing test redis server..."
-  `rm -f #{dir}/dump.rdb`
   Process.kill("KILL", pid.to_i)
+  FileUtils.rm_rf("#{dir}/dump.rdb")
   exit exit_code
 end
 

data/test/test_resque-metrics.rb

@@ -71,20 +71,6 @@ class TestResqueMetrics < MiniTest::Unit::TestCase
     assert_equal 2, recorded_count
   end
 
-  def test_should_record_fork_times
-    Resque::Metrics.watch_fork
-    Resque.after_fork do |job|
-      sleep 0.1
-      Resque::Metrics.after_fork.call(job)
-    end
-    work_job
-    work_job
-    assert_equal 2, Resque::Metrics.total_fork_count
-    assert Resque::Metrics.avg_fork_time > 0
-    assert Resque::Metrics.avg_fork_time_by_queue(:jobs) > 0
-    assert Resque::Metrics.avg_fork_time_by_job(SomeJob) > 0
-  end
-
   private
   def work_job
     Resque.enqueue(SomeJob, 20, '/tmp')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-metrics
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -135,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2293482959919047765
+      hash: -517852637179208795
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: