sidekiq-skylight 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e2c60a848b24d3651ca7f79732057f783341c1e
-  data.tar.gz: acf95b402036e11b68a1216f8775fb7018e359c5
+  metadata.gz: d2f0ec4578edffc9fc43d5df36444c00276bc034
+  data.tar.gz: e0c93d6fe050b749dc287ec499c2475af04fe123
 SHA512:
-  metadata.gz: 100a2d39ce801249bfad8327b181e8a23c1ea2ee4a56e6ffcf392364b6a9739420551eb39b0a2d66f6bae225b14aa1132bf0b4d2bbdf365215a0aecf306f9b45
-  data.tar.gz: 34292932066fd99422bb8ad14591481503d0b6a36e74b906a59e3e7d1971d4a6ad709cad15404b15ea17e2927d13e0c06e357e08e7a35106dbc8f1f3a320eb04
+  metadata.gz: c1f0b59e037b2260385b354a301f4909d9067c5b61a69ab208f6e9a4cd446f226ff92a2a506619e073b77f88e064673694de906736b541a60126115b70f249f3
+  data.tar.gz: 212a5c9e276053772bed67d1978815632dd22a7359e97ca7a0ed2fc461f66825b8f41df90e939a60c9ca8335fef10ea1207860e7708405d234b4362bd124b3e6

data/README.md

@@ -33,6 +33,10 @@ end
 
 Any workers with the class names you specify will be ignored from any Skylight tracing.
 
+## ActiveJob
+
+If you use Sidekiq as a backend to ActiveJob, your ActiveJob name will be passed to Skylight.
+
 ## Usage
 
 Make sure you've setup skylight.io for your project already. Everything else should be automatic.

data/lib/sidekiq/skylight/server_middleware.rb

@@ -3,17 +3,24 @@ require 'skylight'
 module Sidekiq
   module Skylight
     class ServerMiddleware
-      def call(worker, _job, _queue)
-        if config.blacklisted_workers.include?(worker.class.name)
+      def call(worker, job, _queue)
+        name = expand_worker_name(worker, job)
+        if config.blacklisted_workers.include?(name)
           yield
         else
-          ::Skylight.trace("#{worker.class}#perform", 'app.sidekiq.worker', 'process', &Proc.new)
+          ::Skylight.trace("#{name}#perform", 'app.sidekiq.worker', 'process', &Proc.new)
         end
       end
 
       def config
         Sidekiq::Skylight.config
       end
+
+      private
+
+      def expand_worker_name(worker, job)
+        job['wrapped'] || worker.class.name
+      end
     end
   end
 end

data/lib/sidekiq/skylight/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Skylight
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/spec/sidekiq/skylight/server_middleware_spec.rb

@@ -11,7 +11,7 @@ describe Sidekiq::Skylight::ServerMiddleware do
       block.call
     end
 
-    expect{|probe| middleware.call(FakeWorker.new, double(:job), double(:queue), &probe)}.to yield_control
+    expect{|probe| middleware.call(FakeWorker.new, {}, double(:queue), &probe)}.to yield_control
   end
 
   context 'with blacklisted workers' do
@@ -27,7 +27,7 @@ describe Sidekiq::Skylight::ServerMiddleware do
     it 'does not instrument a blacklisted worker' do
       expect(::Skylight).to_not receive(:trace)
 
-      expect{|probe| middleware.call(BlacklistedWorker.new, double(:job), double(:queue), &probe)}.to yield_control
+      expect{|probe| middleware.call(BlacklistedWorker.new, {}, double(:queue), &probe)}.to yield_control
     end
 
     it 'still instruments non-blacklisted workers' do
@@ -35,7 +35,32 @@ describe Sidekiq::Skylight::ServerMiddleware do
         block.call
       end
 
-      expect{|probe| middleware.call(FakeWorker.new, double(:job), double(:queue), &probe)}.to yield_control
+      expect{|probe| middleware.call(FakeWorker.new, {}, double(:queue), &probe)}.to yield_control
+    end
+  end
+
+  context 'with a wrapped job' do
+    around(:each) do |example|
+      previous_blacklisted = Sidekiq::Skylight.config.blacklisted_workers
+      Sidekiq::Skylight.config.blacklisted_workers = %w(BlacklistedWrappedWorker)
+
+      example.run
+
+      Sidekiq::Skylight.config.blacklisted_workers = previous_blacklisted
+    end
+
+    it 'does not instrument a blacklisted worker' do
+      expect(::Skylight).to_not receive(:trace)
+
+      expect{|probe| middleware.call(FakeWorker.new, {'wrapped' => 'BlacklistedWrappedWorker'}, double(:queue), &probe)}.to yield_control
+    end
+
+    it 'still instruments non-blacklisted workers' do
+      expect(::Skylight).to receive(:trace).with('WrappedWorker#perform', 'app.sidekiq.worker', 'process') do |&block|
+        block.call
+      end
+
+      expect{|probe| middleware.call(FakeWorker.new, {'wrapped' => 'WrappedWorker'}, double(:queue), &probe)}.to yield_control
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-skylight
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Allen Madsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq