Merge pull request #2 from mokpro/tick_sidekiq_version

add support Sidekiq 6.x

.travis.yml

@@ -1,12 +1,14 @@
 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

lib/sidekiq/instrument/middleware/client.rb

@@ -5,7 +5,8 @@ class ClientMiddleware
     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

lib/sidekiq/instrument/version.rb

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

sidekiq-instrument.gemspec

@@ -16,10 +16,10 @@ 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.2', '< 6'
+  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 '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/sidekiq-instrument/client_middleware_spec.rb

@@ -18,10 +18,20 @@
       end
     end
 
-    it 'increments the enqueue counter' do
-      expect {
-        MyWorker.perform_async
-      }.to trigger_statsd_increment('shared.sidekiq.default.MyWorker.enqueue')
+    context 'without statsd_metric_name' do
+      it 'increments the enqueue counter' do
+        expect {
+          MyWorker.perform_async
+        }.to trigger_statsd_increment('shared.sidekiq.default.MyWorker.enqueue')
+      end
+    end
+
+    context 'with statsd_metric_name' do
+      it 'increments the enqueue counter' do
+        expect {
+          MyOtherWorker.perform_async
+        }.to trigger_statsd_increment('my_other_worker.enqueue')
+      end
     end
   end
 end

spec/spec_helper.rb

@@ -17,3 +17,13 @@ class MyWorker
 
   def perform; end
 end
+
+class MyOtherWorker
+  include Sidekiq::Worker
+
+  def perform; end
+
+  def statsd_metric_name(event)
+    "my_other_worker.#{event}"
+  end
+end