raygun-apm-sidekiq 1.1.2 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 983d18c44dad05861403a92a3bdea42df25f39e312cd4a441137a2cdee76c1f2
-  data.tar.gz: 8f706e3487836cd6a8953f5c6c8fa436fafba79ff9297ede0af20d85db9c6b95
+  metadata.gz: c5fc6b9bda748d50bb29765022b36871e2f19496e33d7514db0ac9b77413b309
+  data.tar.gz: c068cf98e27b072454263dbe9397d388ef6e6793daa3d744de780e7463a8f5da
 SHA512:
-  metadata.gz: 1e5822a24b86b23059fceb1c8053f47b218f35cef606cf748b6eb747a98ad55f6c684292912bd72e51e9165d5ae6334637e94f335d5dec860814d354edbb1140
-  data.tar.gz: f59cd1281bea3d057668cf710576438e5f8f17ac3621b646521534430bd81ba1d1d9d85a84ca87886a5a347f73772b5c4eb53d9b62b2fe9ce48831a023c0e12a
+  metadata.gz: f5c0d359d0c962459877623398dd7be3de36998f84bdbff8a06ed2cb5e5a9c7f0ee25e8079696a6a7d9d05fbc0ac48df464dd22d1a6a0beba39da3757038f5cc
+  data.tar.gz: c4da6201e7bfbdca63853292c1cf7d13d1c41a274d1073fdeeaea232236fc723bf2c323101e6bdfa8358d33a389b82294ed9cf0a51b6fc0421ef1cd98658e30c

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

@@ -4,35 +4,32 @@ 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
+          worker_started = nil
           if @tracer
-             @worker_started = @tracer.now
+             worker_started = @tracer.now
              @tracer.start_trace
           end
           exception = nil
           Ruby_APM_profiler_trace do
             begin
-              super
-              fake_http_in_handler(@tracer, @worker_started, job_hash, queue, nil) if @tracer
+              yield
+              fake_http_in_handler(@tracer, worker_started, job_hash, queue, nil) if @tracer
             rescue => e
               crash_report_exception(e)
-              fake_http_in_handler(@tracer, @worker_started, job_hash, queue, e) if @tracer
+              fake_http_in_handler(@tracer, worker_started, job_hash, queue, e) if @tracer
               exception = e
             end
           end
@@ -50,8 +47,8 @@ module Raygun
 
         def init_tracer
           tracer = Raygun::Apm::Tracer.new
-          tracer.udp_sink!
-          ObjectSpace.define_finalizer(self, Hook.finalize(tracer))
+          tracer.enable_sink!
+          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|
@@ -69,6 +66,7 @@ module Raygun
           warn "[Raygun APM] shutting down due to error - #{exception.message} #{exception.backtrace.join("\n")}"
           # Kill extended event subcriptions
           ActiveSupport::Notifications.unsubscribe(@sql_subscriber)
+          @sql_subscriber = nil
           warn "[Raygun APM] notification hooks unsubscribed"
           # Let the GC clean up the sink thread through the finalizer below
           @tracer = nil
@@ -93,7 +91,7 @@ module Raygun
         end
 
         def http_in_event
-          @http_in_event ||= begin
+          Thread.current[:_raygun_http_in_event] ||= begin
             event = Raygun::Apm::Event::HttpIn.new
             event[:verb] = "POST"
             event
@@ -129,7 +127,7 @@ module Raygun
         end
 
         def sql_event
-          @sql_event ||= Raygun::Apm::Event::Sql.new
+          Thread.current[:_raygun_sql_event] ||= Raygun::Apm::Event::Sql.new
         end
 
         def Ruby_APM_profiler_trace
@@ -147,4 +145,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,11 +4,8 @@ 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"
-          require "raygun/apm/hooks/redis" if defined?(Redis::Client)
           # Attempt to explicitly require the raygun4ruby sidekiq integration
           begin
             require "raygun/sidekiq"

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

@@ -1,7 +1,7 @@
 module Raygun
   module Apm
     module Sidekiq
-      VERSION = "1.1.2"
+      VERSION = "1.1.5"
     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.11"
   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.5
 platform: ruby
 authors:
 - Raygun Limited
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-13 00:00:00.000000000 Z
+date: 2022-05-12 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.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.11
 - !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