raygun-apm-sidekiq 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 983d18c44dad05861403a92a3bdea42df25f39e312cd4a441137a2cdee76c1f2
-  data.tar.gz: 8f706e3487836cd6a8953f5c6c8fa436fafba79ff9297ede0af20d85db9c6b95
+  metadata.gz: 8eb60a5d5debbf6e3bdde1ca25277c32a3c4c73338534b286f8454ef1710123e
+  data.tar.gz: 7d5332c206419c65d64350b4c96ad9b036ee700e3545135013c1e25eb4125252
 SHA512:
-  metadata.gz: 1e5822a24b86b23059fceb1c8053f47b218f35cef606cf748b6eb747a98ad55f6c684292912bd72e51e9165d5ae6334637e94f335d5dec860814d354edbb1140
-  data.tar.gz: f59cd1281bea3d057668cf710576438e5f8f17ac3621b646521534430bd81ba1d1d9d85a84ca87886a5a347f73772b5c4eb53d9b62b2fe9ce48831a023c0e12a
+  metadata.gz: 63827daad6dfae46726984fcea163ab7fbc93b69e26fe4dad55e33983dbcc9964de5f38a98a4f1048263a538f8bf8926af40c77c9318e8e61420523f96e8b2cd
+  data.tar.gz: 7bf386f072d834afb4fe51c112b95f601e435133b607f192b5b8cfeb909698e4cb42077fc4baf53badbf1eed2054eb8e6d7a9a042b11fa5648bbb4b35fa8e337

data/lib/raygun/apm/sidekiq/{hook.rb → middleware.rb}

@@ -4,22 +4,18 @@ require 'sidekiq/processor'
 module Raygun
   module Apm
     module Sidekiq
-      module Hook
+      class Middleware
         def self.finalize(tracer)
           proc {tracer.process_ended}
         end
 
         def initialize(*args)
-          super
-          @mutex = Mutex.new
-          @mutex.synchronize do
+          Raygun::Apm::Tracer.synchronize do
             @tracer = Raygun::Apm::Tracer.instance || init_tracer          
           end
         end
 
-        def process(work)
-          job_hash = ::Sidekiq.load_json(work.job)
-          queue = work.queue_name
+        def call(worker, job_hash, queue)
           # Can be nil if we had a fatal error
           if @tracer
              @worker_started = @tracer.now
@@ -28,7 +24,7 @@ module Raygun
           exception = nil
           Ruby_APM_profiler_trace do
             begin
-              super
+              yield
               fake_http_in_handler(@tracer, @worker_started, job_hash, queue, nil) if @tracer
             rescue => e
               crash_report_exception(e)
@@ -51,7 +47,7 @@ module Raygun
         def init_tracer
           tracer = Raygun::Apm::Tracer.new
           tracer.udp_sink!
-          ObjectSpace.define_finalizer(self, Hook.finalize(tracer))
+          ObjectSpace.define_finalizer(self, Middleware.finalize(tracer))
 
           ActiveSupport::Notifications.unsubscribe(@sql_subscriber) if @sql_subscriber
           @sql_subscriber = ActiveSupport::Notifications.subscribe('sql.active_record') do |*args|
@@ -147,4 +143,8 @@ module Raygun
   end
 end
 
-Sidekiq::Processor.prepend Raygun::Apm::Sidekiq::Hook
+Sidekiq.configure_server do |config|
+  config.server_middleware do |chain|
+    chain.add Raygun::Apm::Sidekiq::Middleware
+  end
+end

data/lib/raygun/apm/sidekiq/railtie.rb

@@ -4,7 +4,7 @@ module Raygun
       class Railtie < ::Rails::Railtie
         initializer "raygun.apm.sidekiq" do |app|
           require "raygun/apm"
-          require "raygun/apm/sidekiq/hook"
+          require "raygun/apm/sidekiq/middleware"
           Raygun::Apm::Blacklist.extend_with Raygun::Apm::Sidekiq::BLACKLIST
           # Explictly enable instrumenting HTTP until a good control API is figured out
           require "raygun/apm/hooks/net_http"

data/lib/raygun/apm/sidekiq/version.rb

@@ -1,7 +1,7 @@
 module Raygun
   module Apm
     module Sidekiq
-      VERSION = "1.1.2"
+      VERSION = "1.1.3"
     end
   end
 end

data/lib/raygun/apm/sidekiq.rb

@@ -7,7 +7,7 @@ module Raygun
 
         BLACKLIST = %w{
           Sidekiq
-          +Raygun::Apm::Sidekiq::Hook#Ruby_APM_profiler_trace
+          +Raygun::Apm::Sidekiq::Middleware#Ruby_APM_profiler_trace
         }
 
         def self.raygun4ruby?(configured = true)

data/raygun-apm-sidekiq.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "raygun-apm"
+  spec.add_dependency "raygun-apm", "~> 1.1.10"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-sidekiq
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Raygun Limited
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-13 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raygun-apm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.10
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +79,7 @@ files:
 - bin/console
 - bin/setup
 - lib/raygun/apm/sidekiq.rb
-- lib/raygun/apm/sidekiq/hook.rb
+- lib/raygun/apm/sidekiq/middleware.rb
 - lib/raygun/apm/sidekiq/railtie.rb
 - lib/raygun/apm/sidekiq/version.rb
 - raygun-apm-sidekiq.gemspec