sidekiq-instrument 0.1.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b91f56b76bb74cae296dabe8f002fd50a22eed0e
-  data.tar.gz: 648a7a5fd46007137612630b37782574e38441ee
+SHA256:
+  metadata.gz: dd77f1ee5edcd60e2324d19918471de25acc187767efba7589b954f74be805f5
+  data.tar.gz: 1d3bcf29596e43cc2f7fcadfed175f136a6d1458fe163320eb8d542d7a96823d
 SHA512:
-  metadata.gz: 42284f2bbb7ed52d15dd7271ef428cce8e8b891dffb6c4ed8698f9f1f8c1757260aea3fd4edcd61b0a0f2b67ce8c7ada6d3583cb15f54de710d0d714da760ab5
-  data.tar.gz: 9f5a83e2f9f77812345aec2f60dceb2ca8421615a34c1354edf89cb6db0e9a592e9e5cf7942f2f7465a58b39a00f11eeb28ce3410e62c0440339c3ce5e9fd3e2
+  metadata.gz: 70eefc1dfc213f83c8b7705d40448f8846d59f7214d3bbfc2e0accd21152a893f798bad42e1832cc799a3be8c5f731e3543bf09d8561c078fb0669709651dffb
+  data.tar.gz: ded09a65f9e8e92567f8562566393509bdf718d867ba2fd793488c57d2b3e614297d5b2f5d1787ff1bb125ec90b545ad100ee1fd7ed51a6951652e48ee0d9714

data/.travis.yml

@@ -1,9 +1,20 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.0
+  - 2.5.8
+  - 2.6.6
+  - 2.7.2
 
 services:
   - redis-server
 
-before_install: gem install bundler -v 1.12.1
+before_install: gem install bundler -v 2.0.2
+
+deploy:
+  provider: rubygems
+  api_key:
+    secure: T0S2ipyvGkY2qL6oxcgZgBl+krGR3qFlL4vNyzy+rvaZAV8YNijQiM7YyggTLhnKai3SxuHjzN1ZiT7vzlklJn9k2qRhU1uVq4xW+YX6yVNBBbugJGqNuyw3p2BUOga83ES2jA/Kby9mLAJEebS5LmupapSCeElsmhYzXIlV9SYH1mZV4CHQ06Luv3r1DQ8z1cwrB+5N+Y9TNV1wXa/LbuxJPl6jgxN0oJ+RFU7lTHtovMwyL+wRXLiRpZc2k6dH0IUo03QxYVCUDIvShdX26WfzF+fpSPRgOHnbJeaBTbeuxntFzEDy6Td2hpRQWP31i+/8BzPWGCLqUfS55uQqFM06UI/vnZnbe8NlI57gzw6yJHPsFoyg8Cw/3TABhw+SEOoMyBdued4RGKF6EgYsx3hW+KUhEvncnBg6F7jRdZgtHmk6s8iU+/d39pgQh4AiCJQOhINErAnnH2P5hM3TDoZYQlkUjw0FQ0F8bTmRKJq4JhMyvtwMutvMuSIN+8q7utNTxzFquvYcmAcNYafsmuC7Qtvpqi0iVzQ3f3c+SCljcvEnUEf66+xufkn79eSAYcCrL/FdZOdBEiXpaY2wdtJO7Kr66BMhzGCjlO8YQoDw0pgsES9Uy5H1JtfphjWzHWYdiYDBoofFURE1jO/pJ9V9dp9ezzOcvW4faZhL8ho=
+  gem: sidekiq-instrument
+  on:
+    tags: true
+    repo: enova/sidekiq-instrument

data/lib/sidekiq/instrument.rb

@@ -1,7 +1,9 @@
 require "sidekiq/instrument/version"
+require "sidekiq/instrument/worker"
+require "sidekiq/instrument/middleware/client"
+require "sidekiq/instrument/middleware/server"
 
 module Sidekiq
   module Instrument
-    # Your code goes here...
   end
 end

data/lib/sidekiq/instrument/middleware/client.rb

@@ -5,7 +5,8 @@ module Sidekiq::Instrument
     include Sidekiq::Instrument::MetricNames
 
     def call(worker_class, job, queue, redis_pool)
-      klass = Object.const_get(worker_class)
+      # worker_class is a const in sidekiq >= 6.x
+      klass = Object.const_get(worker_class.to_s)
       StatsD.increment metric_name(klass.new, 'enqueue')
 
       yield

data/lib/sidekiq/instrument/mixin.rb

@@ -4,8 +4,8 @@ module Sidekiq::Instrument
       if worker.respond_to?(:statsd_metric_name)
         worker.send(:statsd_metric_name, event)
       else
-        queue = worker.sidekiq_options_hash['queue']
-        name = worker.class.name
+        queue = worker.class.get_sidekiq_options['queue']
+        name = worker.class.name.gsub('::', '_')
 
         "shared.sidekiq.#{queue}.#{name}.#{event}"
       end

data/lib/sidekiq/instrument/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Instrument
-    VERSION = "0.1.0"
+    VERSION = "0.3.1"
   end
 end

data/lib/sidekiq/instrument/worker.rb

@@ -25,8 +25,11 @@ module Sidekiq::Instrument
       end
 
       working = Sidekiq::ProcessSet.new.select { |p| p[:busy] == 1 }.count
-
       StatsD.gauge "shared.sidekiq.stats.working", working
+
+      info.queues.each do |name, size|
+        StatsD.gauge "shared.sidekiq.#{name}.size", size
+      end
     end
   end
 end

data/sidekiq-instrument.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'sidekiq', '~> 4.0'
+  spec.add_dependency 'sidekiq', '>= 4.2', '< 7'
   spec.add_dependency 'statsd-instrument', '~> 2.0', '>= 2.0.4'
 
-  spec.add_development_dependency 'bundler', '~> 1.12'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '~> 2.0', '>= 2.0.2'
+  spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'pry-byebug', '~> 3.4'
   spec.add_development_dependency 'coveralls', '~> 0.8'

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-instrument
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Matt Larraz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2020-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: statsd-instrument
   requirement: !ruby/object:Gem::Requirement
@@ -50,28 +56,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -157,8 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: StatsD instrumentation for Sidekiq