sidekiq-benchmark 0.1.2 → 0.2.0

data/README.md

@@ -30,6 +30,23 @@ class SampleWorker
   include Sidekiq::Worker
   include Sidekiq::Benchmark::Worker
 
+  def perform(id)
+    benchmark.first_metric do
+      100500.times do something end
+    end
+
+    benchmark.second_metric do
+      42.times do anything end
+    end
+
+    benchmark.finish
+  end
+end
+
+class OtherSampleWorker
+  include Sidekiq::Worker
+  include Sidekiq::Benchmark::Worker
+
   def perform(id)
     benchmark do |bm|
       bm.some_metric do
@@ -41,13 +58,21 @@ class SampleWorker
         something_code
       end
     end
+    # if block given, yield and finish
   end
 
 end
 ```
-## Web UI
+## Examples
+
+### Web UI
+
 ![Web UI](https://github.com/kosmatov/sidekiq-benchmark/raw/master/examples/web-ui.png)
 
+### Sample Apps
+
+![Heroku App](http://sidekiq-benchmark.herokuapp.com)
+
 ## Contributing
 
 1. Fork it

data/lib/sidekiq-benchmark/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Benchmark
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

data/lib/sidekiq-benchmark/worker.rb

@@ -3,36 +3,38 @@ module Sidekiq
     module Worker
 
       def benchmark(options = {})
-        bm = Benchmark.new Time.now
+        @benchmark ||= Benchmark.new Time.now, benchmark_redis_type_key, options
 
-        yield(bm)
-
-        bm.finish_time = Time.now
-        bm.save benchmark_redis_base_key, options
+        if block_given?
+          yield @benchmark
+          @benchmark.finish
+        end
 
-        bm.set_redis_key benchmark_redis_type_key
-        bm
+        @benchmark
       end
 
       def benchmark_redis_type_key
         @benchmark_redis_type_key ||= self.class.name.gsub('::', '_').downcase
       end
 
-      def benchmark_redis_base_key
-        @benchmark_redis_base_key ||= "benchmark:#{benchmark_redis_type_key}"
-      end
-
       class Benchmark
-        attr_reader :metrics, :start_time, :finish_time
+        REDIS_NAMESPACE = :benchmark
+
+        attr_reader :metrics, :start_time, :finish_time, :redis_key
 
-        def initialize(start_time)
+        def initialize(start_time, redis_key, options)
           @metrics = {}
+          @options = options
           @start_time = start_time.to_f
+
+          @redis_key = "#{REDIS_NAMESPACE}:#{redis_key}"
+          set_redis_key redis_key
         end
 
-        def finish_time=(value)
-          @finish_time = value.to_f
+        def finish
+          @finish_time = Time.now.to_f
           @metrics[:job_time] = @finish_time - start_time
+          save
         end
 
         def method_missing(name, *args)
@@ -52,29 +54,24 @@ module Sidekiq
 
         def set_redis_key(key)
           Sidekiq.redis do |conn|
-            conn.sadd "benchmark:types", key
+            conn.sadd "#{REDIS_NAMESPACE}:types", key
           end
         end
 
-        def save(redis_base_key, options = {})
-          options.merge! start_time: start_time, finish_time: finish_time
-          options.merge! @metrics
-
+        def save
           job_time_key = @metrics[:job_time].round(1)
 
           Sidekiq.redis do |conn|
             conn.multi do
-              # Isn't usefull at this moment
-              #conn.lpush "#{redis_base_key}:jobs", Sidekiq.dump_json(options)
-
               @metrics.each do |key, value|
-                conn.hincrbyfloat "#{redis_base_key}:total", key, value
-                conn.hincrby "#{redis_base_key}:stats", job_time_key, 1
+                conn.hincrbyfloat "#{redis_key}:total", key, value
               end
 
-              conn.hsetnx "#{redis_base_key}:total", "start_time", start_time
-              conn.hincrbyfloat "#{redis_base_key}:total", "job_time", @metrics[:job_time]
-              conn.hset "#{redis_base_key}:total", "finish_time", finish_time
+              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
         end

data/test/lib/worker_test.rb

@@ -13,26 +13,52 @@ module Sidekiq
         end
 
         it "should collect metrics" do
-          metrics = @worker.bm_obj.metrics
+          metrics = @worker.benchmark.metrics
 
           @worker.metric_names.each do |metric_name|
             metrics[metric_name].wont_be_nil
           end
 
-          @worker.bm_obj.start_time.wont_be_nil
-          @worker.bm_obj.finish_time.wont_be_nil
+          @worker.benchmark.start_time.wont_be_nil
+          @worker.benchmark.finish_time.wont_be_nil
           metrics[:assigned_metric].must_equal @worker.assigned_metric
         end
 
         it "should save metrics to redis" do
           Sidekiq.redis do |conn|
-            total_time = conn.hget("#{@worker.benchmark_redis_base_key}:total", :job_time)
+            total_time = conn.hget("#{@worker.benchmark.redis_key}:total", :job_time)
             total_time.wont_be_nil
 
-            metrics = conn.hkeys("#{@worker.benchmark_redis_base_key}:stats")
+            metrics = conn.hkeys("#{@worker.benchmark.redis_key}:stats")
             metrics.wont_be_empty
           end
         end
+
+        it "should collect metrics with alter syntax" do
+          worker = AlterWorkerMock.new
+          metrics = worker.benchmark.metrics
+
+          Sidekiq.redis do |conn|
+            metric_set = conn.hkeys("#{worker.benchmark.redis_key}:stats")
+            metric_set.must_be_empty
+          end
+
+          worker.metric_names.each do |metric_name|
+            metrics[metric_name].wont_be_nil
+          end
+
+          worker.benchmark.finish_time.must_be_nil
+
+          worker.finish
+
+          worker.benchmark.finish_time.wont_be_nil
+
+          Sidekiq.redis do |conn|
+            metric_set = conn.hkeys("#{worker.benchmark.redis_key}:stats")
+            metric_set.wont_be_empty
+          end
+        end
+
       end
     end
   end

data/test/test_helper.rb

@@ -29,7 +29,7 @@ module Sidekiq
         def initialize
           @assigned_metric = 0.1
 
-          @bm_obj = benchmark do |bm|
+          benchmark do |bm|
             bm.test_metric do
               2.times do |i|
                 bm.send("nested_test_metric_#{i}") do
@@ -46,6 +46,26 @@ module Sidekiq
         end
       end
 
+      class AlterWorkerMock < WorkerMock
+        def initialize
+          benchmark.test_metric do
+            42.times do
+            end
+          end
+
+          benchmark.other_metric do
+            100500.times do
+            end
+          end
+
+          @metric_names = [:test_metric, :other_metric]
+        end
+
+        def finish
+          benchmark.finish
+        end
+      end
+
       def self.flush_db
         Sidekiq.redis = REDIS
         Sidekiq.redis do |conn|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-benchmark
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors: