sidekiq-monitor-stats 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 73fd4b85bc69425e68f711dbb9a84137de8be68b
-  data.tar.gz: 2fcb4138c6b257b52b3eefa777bd96944e753e5a
+SHA256:
+  metadata.gz: fec6d8d7005afd117c9e7a599624709eb16a8a17b182f4f0514812ea887bcb6b
+  data.tar.gz: cb55b235e81cd97919bdba20355896a18d15a758dfb17af513ec37842dae2f4c
 SHA512:
-  metadata.gz: eda4badd95add8277d122bf44681dc38283fa72ef91e9402aae8254878f8eeb2e55b766406931890f4b9e02f1ab89f1c9f907b44a5178c868f5533f4d142bcc4
-  data.tar.gz: 558188e16c440559cb24a9ae9d35d8cc6ea917d33997803ef4f879defa3fece2499b8f157c193d379685a451d04c9cf19995230d354ed71472f90aff7b0bfeaf
+  metadata.gz: 1b17637e5e4a412bcde74d1de22eca11625ef30821180130d456d8a37ac2ccf18cb71b2a33557114a09a506cebf9b4bc060780519656bba73362473a55e7d01e
+  data.tar.gz: 1640fc7a3c88050a18b37bcbcf3b6f29098dfd320593f1a0c127f7965fa4ae4ea6d185a36a2f4118572490e8c1da06af8f428700f2b4bfa65e223f9b08a207f2

data/.travis.yml

@@ -5,6 +5,8 @@ services:
 rvm:
   - 2.3.4
   - 2.4.1
+  - 2.5
+  - 2.6
 gemfile:
   - gemfiles/sidekiq_5.gemfile
   - gemfiles/sidekiq_4.gemfile

data/README.md

@@ -79,6 +79,16 @@ This is an example of the output you'll get:
       "concurrency":5,
       "busy":5
     }
+  ],
+  "jobs": [
+    {
+      "process": "foo:1234",
+      "thread": "1001",
+      "jid": "1234abc",
+      "queue": "default",
+      "job": "WebWorker",
+      "run_at": "2015-04-10T15:07:52+00:00"
+    }
   ]
 }
 ```

data/gemfiles/sidekiq_4.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    sidekiq-monitor-stats (0.0.1)
+    sidekiq-monitor-stats (0.0.3)
       sidekiq
 
 GEM
@@ -53,4 +53,4 @@ DEPENDENCIES
   sinatra
 
 BUNDLED WITH
-   1.14.6
+   1.17.2

data/gemfiles/sidekiq_5.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    sidekiq-monitor-stats (0.0.1)
+    sidekiq-monitor-stats (0.0.3)
       sidekiq
 
 GEM
@@ -53,4 +53,4 @@ DEPENDENCIES
   sinatra
 
 BUNDLED WITH
-   1.14.6
+   1.17.2

data/lib/sidekiq/monitor/stats.rb

@@ -28,6 +28,21 @@ module Sidekiq
           }
         end
       end
+
+      def job_metrics
+        Sidekiq::Workers.new.map do |process, thread, msg|
+          job = Sidekiq::Job.new(msg['payload'])
+
+          {
+            process: process,
+            thread:  thread,
+            jid:     job.jid,
+            queue:   msg['queue'],
+            job:     job.display_class,
+            run_at:  Time.at(msg['run_at'])
+          }
+        end
+      end
     end
   end
 end

data/lib/sidekiq/monitor/web.rb

@@ -9,7 +9,8 @@ module Sidekiq
 
           data = {
             queues:    monitor_stats.queue_metrics,
-            processes: monitor_stats.process_metrics
+            processes: monitor_stats.process_metrics,
+            jobs:      monitor_stats.job_metrics
           }
 
           if Sidekiq::VERSION >= "5.0.0"

data/sidekiq-monitor-stats.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "sidekiq-monitor-stats"
-  spec.version       = "0.0.2"
+  spec.version       = "0.0.3"
   spec.authors       = ["Albert Llop"]
   spec.email         = ["albert@getharvest.com"]
   spec.summary       = %q{Add an endpoint to your running application that is running Sidekiq that returns useful data in JSON format.}

data/test/sidekiq-monitor-stats_test.rb

@@ -8,6 +8,7 @@ class Sidekiq::Monitor::StatsTest < Minitest::Test
   def test_returns_empty_data
     assert_equal({}, stats.queue_metrics)
     assert_equal([], stats.process_metrics)
+    assert_equal([], stats.job_metrics)
   end
 
   def test_with_some_data
@@ -30,6 +31,18 @@ class Sidekiq::Monitor::StatsTest < Minitest::Test
       }
 
       conn.hmset('foo:1234', 'info', Sidekiq.dump_json(process_stats), 'at', @started_at.to_f, 'busy', 4)
+
+      job_stats = {
+        queue: 'default',
+        payload: {
+          class: 'WebWorker',
+          args: [1,'abc'],
+          jid: '1234abc'
+        },
+        run_at: @started_at.to_f
+      }
+
+      conn.hmset('foo:1234:workers', 1001, Sidekiq.dump_json(job_stats))
     end
 
     assert_equal({ backlog: 1, latency: 0 }, stats.queue_metrics['default'])
@@ -43,6 +56,14 @@ class Sidekiq::Monitor::StatsTest < Minitest::Test
     assert_equal 25,           process[:concurrency]
     assert_equal 4,            process[:busy]
     assert_in_delta @started_at, process[:started_at], 0.01
+
+    job = stats.job_metrics.first
+    assert_equal 'foo:1234',  job[:process]
+    assert_equal '1001',      job[:thread]
+    assert_equal '1234abc',   job[:jid]
+    assert_equal 'default',   job[:queue]
+    assert_equal 'WebWorker', job[:job]
+    assert_in_delta @started_at, job[:run_at], 0.01
   end
 
   private

data/test/sidekiq-monitor-web_test.rb

@@ -16,6 +16,7 @@ class Sidekiq::Monitor::WebTest < Minitest::Test
     body = Sidekiq.load_json(last_response.body)
     assert_equal({}, body['queues'])
     assert_equal([], body['processes'])
+    assert_equal([], body['jobs'])
   end
 
   def test_monitor_stats_with_some_data
@@ -27,6 +28,13 @@ class Sidekiq::Monitor::WebTest < Minitest::Test
         'queues'     => ['default', 'high'],
         'concurrency'=> 25,
         'busy'       => 4
+      ],
+      job_metrics: [
+        'process' => 'foo:1234',
+        'thread'  => '1001',
+        'jid'     => '1234abc',
+        'queue'   => 'default',
+        'job'     => 'WebWorker',
       ]
     )
     get '/monitor-stats'
@@ -44,6 +52,14 @@ class Sidekiq::Monitor::WebTest < Minitest::Test
     assert_equal ['default','high'], process['queues']
     assert_equal 25,                 process['concurrency']
     assert_equal 4,                  process['busy']
+
+    assert_equal 1, body['jobs'].size
+    job = body['jobs'].first
+    assert_equal 'foo:1234',  job['process']
+    assert_equal '1001',      job['thread']
+    assert_equal '1234abc',   job['jid']
+    assert_equal 'default',   job['queue']
+    assert_equal 'WebWorker', job['job']
   end
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-monitor-stats
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Albert Llop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2019-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -165,8 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Add an endpoint to your running application that is running Sidekiq that