sidekiq_queue_metrics 0.0.4 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daf0f1ea2f12028ed178c494e10dfd964b698694fe7130eaac119f3bfa3a6d67
-  data.tar.gz: e5c478e522f27ac57cccbdb96de47def08eeada6ed8fff075503bf7965e79014
+  metadata.gz: 616f7d90c5c36572b23161d8fcc09fdac5e05aa3fc4a4770445ecadd916854fa
+  data.tar.gz: e7ef6953e73d4c64a7bab64a3d6302be8f9aebd51152667be1815f76956d1a1c
 SHA512:
-  metadata.gz: 4dd1d9e899a40948311352572bdb055a868f16ccecf17351156b1bc1a8dbf13364f4f70c770871d86d199735310bfc52fbddd2ccd00bbbe052c48c8bc9c6991b
-  data.tar.gz: b0986216491cfd4cbaf3e2e5669bc23386550ee354418579301eeef178999c25427d2719e7d647fd9b1d551ea2a833e80bc0c891b3e8ea386abdf1d8d1c3677c
+  metadata.gz: 5457ea650cfb8a27175bd07a480695ac8105d4a31f4115a6fd2fd17b6b9e1fd4640deb332b94818eae24e24e487c4e7c4308839a3be776852d5e2bd6bda22284
+  data.tar.gz: 8a0425708609f2a8d0887b695261c2b9d354c038952cb597c26163c6f92e050aed980c0981c6667b4469c40dc3cc26c5518b3a02a229e7f1193bccc83f82f8b6

data/README.md

@@ -42,6 +42,14 @@ Output:
 }
 ```
 
+## Contributing
+
+1. Fork it ( https://github.com/ajitsing/sidekiq_queue_metrics/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request
+
 ## License
 ```LICENSE
 MIT License

data/lib/sidekiq_queue_metrics/queue_metrics.rb

@@ -4,7 +4,7 @@ module Sidekiq::QueueMetrics
   class << self
     def fetch
       queues = []
-      success_and_failed_stats = enqueued_jobs = retry_stats = {}
+      success_and_failed_stats = enqueued_jobs =  scheduled_jobs = retry_stats = {}
       together do
         async do
           queues = Sidekiq::Queue.all.map(&:name).map(&:to_s)
@@ -13,6 +13,7 @@ module Sidekiq::QueueMetrics
 
         async {success_and_failed_stats = fetch_success_and_failed_stats}
         async {retry_stats = fetch_retry_stats}
+        async {scheduled_jobs = fetch_scheduled_stats}
       end
 
       queues.map do |queue|
@@ -24,6 +25,7 @@ module Sidekiq::QueueMetrics
 
         stats['enqueued'] = val_or_default(enqueued_jobs[queue])
         stats['in_retry'] = val_or_default(retry_stats[queue])
+        stats['scheduled'] = val_or_default(scheduled_jobs[queue])
         {queue => stats}
       end.reduce({}, :merge)
     end
@@ -40,6 +42,10 @@ module Sidekiq::QueueMetrics
       Sidekiq::RetrySet.new.group_by(&:queue).map {|queue, jobs| [queue, jobs.count]}.to_h
     end
 
+    def fetch_scheduled_stats
+      Sidekiq::ScheduledSet.new.group_by(&:queue).map {|queue, jobs| [queue, jobs.count]}.to_h
+    end
+
     private
     def val_or_default(val, default = 0)
       val || default

data/lib/sidekiq_queue_metrics/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module QueueMetrics
-    VERSION = '0.0.4'
+    VERSION = '1.0'
   end
 end

data/lib/sidekiq_queue_metrics/views/queue_metrics.erb

@@ -1,3 +1,33 @@
+<style>
+  .queue_metrics {
+    margin-right: 3.3%;
+    float: left;
+    width: 30%;
+  }
+
+  .heading {
+    display: block;
+    font-size: 1em;
+    font-weight: bold;
+  }
+
+  .processed_count {
+    color: rgba(35, 130, 13, 0.9);
+    font-size: 1.1em;
+    font-weight: bold;
+  }
+
+  .failed_count {
+    color: rgba(158, 19, 19, 0.96);
+    font-size: 1.1em;
+    font-weight: bold;
+  }
+
+  .center {
+    text-align: center;
+  }
+</style>
+
 <header class="row">
   <div class="col-sm-10">
     <h3>Queue Metrics</h3>
@@ -5,17 +35,17 @@
 </header>
 
 <% @queue_metrics.each do |queue, metrics| %>
-  <table class="table table-striped table-bordered table-white">
+  <table class="table table-striped table-bordered table-white queue_metrics">
     <thead>
     <tr>
-      <th><%= queue %></th>
-      <th style="width: 150px">Count</th>
+      <th><span class="heading"><%= queue %></span></th>
+      <th style="width: 30%"  class="center"><span class="heading">Count</span></th>
     </tr>
     </thead>
-    <% metrics.each do |q, count| %>
+    <% metrics.each do |metric_name, count| %>
       <tr>
-        <td><%= q %></td>
-        <td><%= count %></td>
+        <td><%= metric_name.split('_').map(&:capitalize).join(' ') %></td>
+        <td class="center"><span class="<%= metric_name %>_count"><%= count %></span></td>
       </tr>
     <% end %>
   </table>

data/spec/lib/sidekiq_queue_metrics/queue_stats_spec.rb

@@ -8,9 +8,11 @@ describe Sidekiq::QueueMetrics do
     it 'should fetch current queue stats' do
       stats = {mailer_queue: {processed: 2, failed: 1}, heavy_jobs_queue: {processed: 1, failed: 0}}
       jobs_in_retry_queue = [OpenStruct.new(queue: 'mailer_queue'), OpenStruct.new(queue: 'heavy_jobs_queue')]
+      scheduled_jobs = [OpenStruct.new(queue: 'mailer_queue'), OpenStruct.new(queue: 'heavy_jobs_queue')]
 
       expect(Sidekiq::QueueMetrics::Storage).to receive(:get_stats).and_return(stats.to_json)
       expect(Sidekiq::RetrySet).to receive(:new).and_return(jobs_in_retry_queue)
+      expect(Sidekiq::ScheduledSet).to receive(:new).and_return(scheduled_jobs)
       expect(Sidekiq::Queue).to receive(:new).with('mailer_queue').and_return(OpenStruct.new(size: 1))
       expect(Sidekiq::Queue).to receive(:new).with('heavy_jobs_queue').and_return(OpenStruct.new(size: 1))
 
@@ -20,19 +22,22 @@ describe Sidekiq::QueueMetrics do
       expect(queue_stats['mailer_queue']['failed']).to eq(1)
       expect(queue_stats['mailer_queue']['enqueued']).to eq(1)
       expect(queue_stats['mailer_queue']['in_retry']).to eq(1)
+      expect(queue_stats['mailer_queue']['scheduled']).to eq(1)
 
       expect(queue_stats['heavy_jobs_queue']['processed']).to eq(1)
       expect(queue_stats['heavy_jobs_queue']['failed']).to eq(0)
       expect(queue_stats['heavy_jobs_queue']['enqueued']).to eq(1)
       expect(queue_stats['heavy_jobs_queue']['in_retry']).to eq(1)
+      expect(queue_stats['heavy_jobs_queue']['scheduled']).to eq(1)
     end
 
     it 'should have default value as zero' do
       stats = {mailer_queue: {processed: 2}, heavy_jobs_queue: {failed: 1}}
-      jobs_in_retry_queue = []
+      scheduled_jobs = jobs_in_retry_queue = []
 
       expect(Sidekiq::QueueMetrics::Storage).to receive(:get_stats).and_return(stats.to_json)
       expect(Sidekiq::RetrySet).to receive(:new).and_return(jobs_in_retry_queue)
+      expect(Sidekiq::ScheduledSet).to receive(:new).and_return(scheduled_jobs)
       expect(Sidekiq::Queue).to receive(:new).with('mailer_queue').and_return(OpenStruct.new(size: 0))
       expect(Sidekiq::Queue).to receive(:new).with('heavy_jobs_queue').and_return(OpenStruct.new(size: 0))
 
@@ -42,6 +47,7 @@ describe Sidekiq::QueueMetrics do
       expect(queue_stats['mailer_queue']['failed']).to be_zero
       expect(queue_stats['mailer_queue']['enqueued']).to be_zero
       expect(queue_stats['mailer_queue']['in_retry']).to be_zero
+      expect(queue_stats['mailer_queue']['scheduled']).to be_zero
     end
 
     it 'should return Sidekiq::QueueMetrics for all sidekiq queues' do
@@ -58,11 +64,13 @@ describe Sidekiq::QueueMetrics do
       expect(queue_stats['mailer_queue']['failed']).to be_zero
       expect(queue_stats['mailer_queue']['enqueued']).to be_zero
       expect(queue_stats['mailer_queue']['in_retry']).to be_zero
+      expect(queue_stats['mailer_queue']['scheduled']).to be_zero
 
       expect(queue_stats['heavy_jobs_queue']['processed']).to be_zero
       expect(queue_stats['heavy_jobs_queue']['failed']).to be_zero
       expect(queue_stats['heavy_jobs_queue']['enqueued']).to be_zero
       expect(queue_stats['heavy_jobs_queue']['in_retry']).to be_zero
+      expect(queue_stats['heavy_jobs_queue']['scheduled']).to be_zero
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_queue_metrics
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: '1.0'
 platform: ruby
 authors:
 - Ajit Singh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2018-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq