sidekiq-benchmark 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: fdb92d78be7c844f1accc1fe2fbce4da0bf3c452
-  data.tar.gz: 0da7b23ced5a5ffe697c7a22d369630ce8f95a38
+  metadata.gz: !binary |-
+    ZThkMDFhZjE3ZThiNmZiMzcyYzNlYTczYmNkNDk5M2UzM2JjMmExZQ==
+  data.tar.gz: !binary |-
+    OTNiNGJkMzZlNjhkMDU0NDJkZGNhNTEwN2FiNDg2MWZmYmExNTY0Zg==
 SHA512:
-  metadata.gz: fcaa38d5d66d0e2740aa97fa9a35924b90d9cb42913efdc7a3122f414c1d2965a67ca29f5bd920deaad745099ed6bf4adc74e2b9e1d4cf97df425705a7f8dda2
-  data.tar.gz: 2ede84bb4dfa5fad54438391b5528e221317d980074ac7955cb7f0da5c71842a7e69e719d92f8a41dcebb79f6a57312de936f409a142e2d4dc639186e3259a75
+  metadata.gz: !binary |-
+    NTQzY2QxODYxNjQwMDUwNTQ5NGFlMGM5NzFhY2U1MTk2NDQ5NGJkOGNlYzBj
+    MTQwZTg3NjdiZjlhMTQ5MjY5NGE5Zjk1MDA3ZmQxYjFjYjBkZTZiZWMxZmIy
+    Yjk5MGIzMzMwMmY1NWVhMTMxNzk1MWU2NTU1YmQwOTE2NDUxNTQ=
+  data.tar.gz: !binary |-
+    NmE3OTY0ZGUxMDcyMTc3Yjk2YzkyYmYwYjdhOGQ3YWNkMDNlNTgyNDIxZTkz
+    OTA2ZGIzMDk2ZjBlZTAyNDQ0YjVmNDFhNDc4MzhjNTFlMGU3MTQwZGIxYjI1
+    NGM4NjcyODg2ZGY4ZDFhOTU2YWIwMmY3YTEyODQ4M2ZkNDFmMjg=

data/.travis.yml

@@ -2,5 +2,6 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
 services:
   - redis-server

data/README.md

@@ -71,6 +71,16 @@ end
 
 [Heroku App](http://sidekiq-benchmark.herokuapp.com/benchmarks)
 
+## Testing sidekiq workers
+
+When you use [Sidekiq::Testing](https://github.com/mperham/sidekiq/wiki/Testing) you
+must load `sidekiq-benchmark/testing` to stop saving benchmark data to redis.
+Just add next code to your test or spec helper:
+
+```ruby
+require 'sidekiq-benchmark/testing'
+```
+
 ## Contributing
 
 1. Fork it

data/lib/sidekiq-benchmark.rb

@@ -7,7 +7,6 @@ Sidekiq::Web.tabs["Benchmarks"] = "benchmarks"
 module Sidekiq
   module Benchmark
     autoload :Worker, 'sidekiq-benchmark/worker'
-    autoload :Version, 'sidekiq-benchmark/version'
   end
 end
 

data/lib/sidekiq-benchmark/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Benchmark
-    VERSION = "0.3.5"
+    VERSION = "0.4.0"
   end
 end

data/lib/sidekiq-benchmark/worker.rb

@@ -3,7 +3,7 @@ module Sidekiq
     module Worker
 
       def benchmark(options = {})
-        @benchmark ||= Benchmark.new Time.now, benchmark_redis_type_key, options
+        @benchmark ||= Benchmark.new self, benchmark_redis_type_key, options
 
         if block_given?
           yield @benchmark
@@ -22,34 +22,51 @@ module Sidekiq
 
         attr_reader :metrics, :start_time, :finish_time, :redis_key
 
-        def initialize(start_time, redis_key, options)
+        def initialize(worker, redis_key, options)
           @metrics = {}
+          @worker = worker
           @options = options
-          @start_time = start_time.to_f
+          @start_time = Time.now
 
           @redis_key = "#{REDIS_NAMESPACE}:#{redis_key}"
           set_redis_key redis_key
         end
 
         def finish
-          @finish_time = Time.now.to_f
-          @metrics[:job_time] = @finish_time - start_time
+          @finish_time = Time.now
+          self[:job_time] = finish_time - start_time
           save
         end
 
-        def method_missing(name, *args)
-          if block_given?
-            start_time = Time.now
+        def measure(name)
+          t0  = Time.now
+          ret = yield
+
+          self[name] = Time.now - t0
+
+          ret
+        end
+        alias_method :bm, :measure
 
-            yield
+        def call(name, *args)
+          measure(name) { @worker.send(name, *args) }
+        end
 
-            finish_time = Time.now
-            value = finish_time.to_f - start_time.to_f
+        def []=(name, value)
+          @metrics[name] = value.to_f
+        end
+
+        def [](name)
+          @metrics[name]
+        end
+
+        def method_missing(name, *args, &block)
+          if block_given?
+            measure(name, &block)
+            self[name]
           else
-            value = args[0].to_f
+            self[name] = args[0]
           end
-
-          @metrics[name] = value
         end
 
         def set_redis_key(key)
@@ -70,7 +87,6 @@ module Sidekiq
               conn.hincrby "#{redis_key}:stats", job_time_key, 1
 
               conn.hsetnx "#{redis_key}:total", "start_time", start_time
-              conn.hincrbyfloat "#{redis_key}:total", "job_time", @metrics[:job_time]
               conn.hset "#{redis_key}:total", "finish_time", finish_time
             end
           end

data/test/lib/testing.rb

@@ -14,5 +14,9 @@ class Sidekiq::Benchmark::TestingTest < Minitest::Spec
         total_time.must_be_nil
       end
     end
+
+    it "run code in bm blocks" do
+      @worker.counter.wont_equal 0
+    end
   end
 end

data/test/lib/web_test.rb

@@ -23,7 +23,7 @@ module Sidekiq
           WorkerMock.new
 
           get '/benchmarks'
-          last_response.status.must_equal 200, last_response.body
+          last_response.status.must_equal 200
         end
 
         it "should remove benchmarks data" do

data/test/lib/worker_test.rb

@@ -59,6 +59,14 @@ module Sidekiq
           end
         end
 
+        it "should allow benchmark methods" do
+          worker = AlterWorkerMock.new
+          value  = worker.benchmark.call(:multiply, 4, 4)
+
+          value.must_equal 16
+          worker.benchmark.metrics[:multiply].wont_be_nil
+        end
+
       end
     end
   end

data/test/test_helper.rb

@@ -25,16 +25,18 @@ module Sidekiq
         include Sidekiq::Worker
         include Sidekiq::Benchmark::Worker
 
-        attr_reader :bm_obj, :metric_names, :assigned_metric
+        attr_reader :bm_obj, :metric_names, :assigned_metric, :counter
 
         def initialize
           @assigned_metric = 0.1
+          @counter = 0
 
           benchmark do |bm|
             bm.test_metric do
               2.times do |i|
                 bm.send("nested_test_metric_#{i}") do
-                  100500.times do |i|
+                  100500.times do |j|
+                    @counter += 1
                   end
                 end
               end
@@ -62,6 +64,10 @@ module Sidekiq
           @metric_names = [:test_metric, :other_metric]
         end
 
+        def multiply(a, b)
+          a * b
+        end
+
         def finish
           benchmark.finish
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-benchmark
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Konstantin Kosmatov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Adds benchmarking methods to Sidekiq workers, keeps metrics and adds tab
@@ -177,3 +177,4 @@ test_files:
 - test/lib/web_test.rb
 - test/lib/worker_test.rb
 - test/test_helper.rb
+has_rdoc: