raygun-apm-sidekiq 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fde53b06b1150e3cbf5c9583e59624c44390014da4645786f0848dec62abc1f
-  data.tar.gz: 0b460eb533f2da95e624e71a3436aa96cc8f2eee111719bceea09a5b276a6fb3
+  metadata.gz: c5fc6b9bda748d50bb29765022b36871e2f19496e33d7514db0ac9b77413b309
+  data.tar.gz: c068cf98e27b072454263dbe9397d388ef6e6793daa3d744de780e7463a8f5da
 SHA512:
-  metadata.gz: c8b870360400b4510a5d7db4eac6dc18a219a05a2894ef7e85941c9044f86324a35dcb31d22b5f8536089150c6f6caeafa198a46f59dd94c138e8d2c1a0602ee
-  data.tar.gz: 74ac9375c761063527d26034f6856823b1a1321e99a4cbe76d0246df075d9561262b43572363388d2895a3e6f7e1b6a5802a0afd2e0a860cd26b7cd091606845
+  metadata.gz: f5c0d359d0c962459877623398dd7be3de36998f84bdbff8a06ed2cb5e5a9c7f0ee25e8079696a6a7d9d05fbc0ac48df464dd22d1a6a0beba39da3757038f5cc
+  data.tar.gz: c4da6201e7bfbdca63853292c1cf7d13d1c41a274d1073fdeeaea232236fc723bf2c323101e6bdfa8358d33a389b82294ed9cf0a51b6fc0421ef1cd98658e30c

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

@@ -17,18 +17,19 @@ module Raygun
 
         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
               yield
-              fake_http_in_handler(@tracer, @worker_started, job_hash, queue, nil) if @tracer
+              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
@@ -65,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
@@ -89,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
@@ -125,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

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

@@ -1,7 +1,7 @@
 module Raygun
   module Apm
     module Sidekiq
-      VERSION = "1.1.4"
+      VERSION = "1.1.5"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-sidekiq
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Raygun Limited
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-13 00:00:00.000000000 Z
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raygun-apm