peek-sidekiq 1.0.1 → 1.0.3

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 1.0.3
+
+- Fixed incorrect placement of the instrumented methods in the class.
+
+# 1.0.2
+
+- Now rendering duration & calls generated by the page, not global, as per issue #1.
+
+Thanks to @mperham for advice on how to do that!
+
 # 1.0.1
 
 - Renamed glimpse to peek.

data/README.md

@@ -4,9 +4,8 @@ Provide a peek into the Sidekiq calls made within your Rails application.
 
 Things this peek view provides:
 
-- Processed jobs
-- Failed jobs
-- Enqueued jobs
+- Duration spent in Sidekiq calls
+- Number of calls this page created
 
 ## Installation
 
@@ -50,10 +49,10 @@ Build the gem:
 
 Push to rubygems.org:
 
-    gem push peek-sidekiq-1.0.1.gem
+    gem push peek-sidekiq-1.0.3.gem
 
 ## Testing the gem locally
 
-    gem install peek-sidekiq-1.0.1.gem
+    gem install peek-sidekiq-1.0.3.gem
 
 

data/app/views/peek/views/_sidekiq.html.erb

@@ -1,5 +1,4 @@
 <strong>
-  P: <span data-defer-to="<%= view.defer_key %>-processed"></span>
-  F: <span data-defer-to="<%= view.defer_key %>-failed"></span>
-  E: <span data-defer-to="<%= view.defer_key %>-enqueued"></span>
+  <span data-defer-to="<%= view.defer_key %>-duration"></span>
+  <span data-defer-to="<%= view.defer_key %>-calls"></span>
 </strong> sidekiq

data/lib/peek-sidekiq/version.rb

@@ -1,5 +1,5 @@
 module Peek
   module Sidekiq
-    VERSION = '1.0.1'
+    VERSION = '1.0.3'
   end
 end

data/lib/peek/views/sidekiq.rb

@@ -1,35 +1,67 @@
 require 'sidekiq'
+require 'atomic'
+
+class Sidekiq::Client
+  class << self
+    attr_accessor :query_time, :query_count
+
+    def push_with_timing(*args)
+      start = Time.now
+      push_without_timing(*args)
+    ensure
+      duration = (Time.now - start)
+      @query_time.update { |value| value + duration }
+      @query_count.update { |value| value + 1 }
+    end
+    alias_method_chain :push, :timing
+
+    def push_bulk_with_timing(*args)
+      start = Time.now
+      push_bulk_without_timing(*args)
+    ensure
+      duration = (Time.now - start)
+      @query_time.update { |value| value + duration }
+      @query_count.update { |value| value + 1 }
+    end
+  end
+
+  self.query_count = Atomic.new(0)
+  self.query_time = Atomic.new(0)
+end
 
 module Peek
   module Views
     class Sidekiq < View
-      def processed
-        stats.processed
+      def duration
+        ::Sidekiq::Client.query_time.value
       end
 
-      def failed
-        stats.failed
+      def formatted_duration
+        ms = duration * 1000
+        if ms >= 1000
+          "%.2fms" % ms
+        else
+          "%.0fms" % ms
+        end
       end
 
-      def enqueued
-        stats.enqueued
+      def calls
+        ::Sidekiq::Client.query_count.value
       end
 
       def results
-        {
-          processed: processed,
-          failed: failed,
-          enqueued: enqueued
-         }
+        {:duration => formatted_duration, :calls => calls}
       end
 
       private
-      def stats
-        @stats ||= ::Sidekiq::Stats.new
-        Rails.logger.debug @stats.processed
-        @stats
-      end
 
+      def setup_subscribers
+        # Reset each counter when a new request starts
+        before_request do
+          ::Sidekiq::Client.query_time.value = 0
+          ::Sidekiq::Client.query_count.value = 0
+        end
+      end
     end
   end
 end

data/peek-sidekiq.gemspec

@@ -19,4 +19,6 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'peek'
   gem.add_dependency 'sidekiq'
+  gem.add_dependency 'atomic', '>= 1.0.0'
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: peek-sidekiq
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: atomic
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: Provide a peek into the Sidekiq calls made within your Rails application.
 email:
 - david.parry@suranyami.com