sidekiq-worker_stats 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a919bfb3641622d0bd058fa20bb8b6f5dade45cc
-  data.tar.gz: bb83a5cfb20634e1c55d1c0375df33b0a1b0154c
+  metadata.gz: a2dfa84049939f2b9e106c0c952210cc8ca4f775
+  data.tar.gz: 5247578e6a5277f95954a64b002d8e1d9f13b4ab
 SHA512:
-  metadata.gz: b4406690214aaea0283b2e7dec63749f13625fe99dc7b3bbe70b14e58d01cdd5e4002dd57997a40a265deff4c20c21d87b46a88c7755a8b9e15788708949983a
-  data.tar.gz: 488d49ebcf49273c7bc832f04c5a8c59b449a981c72701bb7599c9c4d59c0818029ce73f4b6fcaa5d02d34f403315708674886e7dc2980cbe0634ae7d3222fbb
+  metadata.gz: 755fab1f88cbd2e373f706644e9b8f977fbec17804311ccf6f0baa9787feab1f81922392a8fd4fd1e78bc723f6d29a319da2b85494d588a7b4dce8ef9f7e53d3
+  data.tar.gz: 0f513ff1b469ad9e7d948a6e79b0485e9b7dc78f6601a5d310505ece41982bd706c978a2c81a19821e481ef0f22f9d46aaefd838ec9153e0a3474fc524b95742

data/README.md

@@ -50,5 +50,5 @@ All configurations you can include on `sidekiq_options`
 |---------------|------|---------|-------------|
 | `worker_stats_enabled` | boolean | false | Whether `worker_stats` should be enabled for this worker or not |
 | `worker_stats_mem_sleep ` | number | 5 | How many seconds to wait between each memory measurement |
-
+| `worker_stats_max_samples ` | number | 1000 | How many samples to keep for a given worker, it will delete the oldest samples first |
 

data/lib/sidekiq/worker_stats/configuration.rb

@@ -3,6 +3,7 @@ module Sidekiq
     class Configuration
       DEFAULT_MEM_SLEEP = 5.freeze
       DEFAULT_ENABLED = false.freeze
+      DEFAULT_MAX_SAMPLES = 1000
 
       attr_reader :klass
 
@@ -17,7 +18,10 @@ module Sidekiq
       def enabled
         @klass.get_sidekiq_options['worker_stats_enabled'] || Sidekiq::WorkerStats::Configuration::DEFAULT_ENABLED
       end
+
+      def max_samples
+        @klass.get_sidekiq_options['worker_stats_max_samples'] || Sidekiq::WorkerStats::Configuration::DEFAULT_MAX_SAMPLES
+      end
     end
   end
 end
-

data/lib/sidekiq/worker_stats/stats.rb

@@ -65,6 +65,8 @@ module Sidekiq
         Sidekiq.redis do |redis|
           redis.hset ::Sidekiq::WorkerStats::REDIS_HASH, worker_key, JSON.generate(data)
         end
+
+        remove_old_samples
       end
 
       private
@@ -83,6 +85,29 @@ module Sidekiq
       def current_memory
         `awk '{ print $2 }' /proc/#{@pid}/statm`.strip.to_i * @page_size
       end
+
+      # Remove old samples if number of samples > @config.max_samples
+      def remove_old_samples
+        keys = nil
+        Sidekiq.redis do |redis|
+          keys = redis.hkeys ::Sidekiq::WorkerStats::REDIS_HASH
+        end
+
+        return if keys.length <= @config.max_samples
+
+        keys = keys.map { |k| k.split(':') if k.start_with?(@klass.to_s) }.compact
+
+        return if keys.length <= @config.max_samples
+
+        keys.sort! { |x, y| x[1] <=> y[1] }
+        keys = keys.map { |k| k.join(':') }
+
+        Sidekiq.redis do |redis|
+          keys[0..keys.length - @config.max_samples - 1].each do |k|
+            redis.hdel ::Sidekiq::WorkerStats::REDIS_HASH, k
+          end
+        end
+      end
     end
   end
 end

data/lib/sidekiq/worker_stats/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module WorkerStats
-    VERSION = '0.0.6'.freeze
+    VERSION = '0.0.7'.freeze
   end
 end

data/test/worker_stats/test_middleware.rb

@@ -7,15 +7,15 @@ require 'sidekiq/worker_stats'
 class BasicWorker
   include Sidekiq::Worker
 
-  sidekiq_options({
+  sidekiq_options(
     worker_stats_enabled: true,
     worker_stats_mem_sleep: 1
-  })
+  )
 
-  def perform(arg1)
+  def perform(_arg1)
     # Let's use some memory
     a = []
-    for i in 1..5000000
+    (1..5_000_000).each do |i|
       a << i.to_s * 10
     end
   end
@@ -24,9 +24,9 @@ end
 class NoStatsWorker
   include Sidekiq::Worker
 
-  sidekiq_options({
+  sidekiq_options(
     worker_stats_enabled: false
-  })
+  )
 
   def perform
   end
@@ -35,13 +35,26 @@ end
 class ErrorWorker
   include Sidekiq::Worker
 
-  sidekiq_options({
+  sidekiq_options(
     worker_stats_enabled: true,
     worker_stats_mem_sleep: 1
-  })
+  )
+
+  def perform
+    raise StandardError.new('Error')
+  end
+end
+
+class Max2Worker
+  include Sidekiq::Worker
+
+  sidekiq_options(
+    worker_stats_enabled: true,
+    worker_stats_mem_sleep: 1,
+    worker_stats_max_samples: 2
+  )
 
   def perform
-    raise StandardError.new("Error")
   end
 end
 
@@ -54,7 +67,7 @@ class TestMiddleware < Minitest::Test
 
   def test_basic_worker_stats_are_saved
     Sidekiq::Testing.inline! do
-      BasicWorker.perform_async("teste")
+      BasicWorker.perform_async('teste')
     end
   end
 
@@ -71,9 +84,19 @@ class TestMiddleware < Minitest::Test
       end
     end
   end
-  
+
+  def test_max_samples
+    Sidekiq::Testing.inline! do
+      Max2Worker.perform_async
+      Max2Worker.perform_async
+      Max2Worker.perform_async
+      Max2Worker.perform_async
+    end
+
+    # Should only mantain record for 2 elements
+  end
+
   def test_that_middleware_reports_end
     skip 'todo'
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-worker_stats
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Alexandre Jesus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq