raygun-apm-sidekiq 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d47af0b57af919bbbcfd30f03f6170f48544ea379f3a112504b77b04a21f728
-  data.tar.gz: 768d91496b52936ecab2582091943b997768922ce196ebba17c33ffbc1c5edb0
+  metadata.gz: ada58e6aa2ff6b48c268217c38693cac278aa306f682eb2dc69f73edb53b3b2e
+  data.tar.gz: 379565ec5a6a69f2f1f895bdbe60c7506a6eccd7cc913a773591021bb8a44003
 SHA512:
-  metadata.gz: 46eddc75761d8f7acf5ce5089ac33c340aaac03b915804237bba61ae19e594c0c56cca68bc504304ddcaa2005f900232a09b6d4b61b8fc150af7119ab0ed77f2
-  data.tar.gz: e0a2196341004b863bc00966e86ea7bd8b7c52cdab655c1c9002277f41f896e12e5bd41ba85418bcd4adadf5ef3e64c5b95630a402f5834409ffe55aa0b2904b
+  metadata.gz: bba188aa02c29dea66a6e8936da18a744328fa583e848aebb7fa37a524a0d79ba726b675106663c707252bf4b2179a288e7ec3f3149ee2426aeee0b65f8b0906
+  data.tar.gz: e9302fe170f3eb1b848303908399b5e9b507dcd6234cda89157eb0ccd0594ec95fdc7551385cbbb676050c0c32247d50595c781a39f31a7f514a9d0e9bb2877d

data/CHANGELOG.rdoc

@@ -0,0 +1,6 @@
+= Changelog
+
+== 1.0.11 (March 15, 2020)
+
+* Emit the happy path and error state HTTP IN events for Sidekiq jobs WITHIN the entrypoint function for the agent to pick it up
+* Prefer the singleton interface on the Tracer

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

@@ -3,27 +3,24 @@ module Raygun
       module Sidekiq
         class Middleware
           def initialize
-            @tracer = self.class.init_tracer
+            @tracer = Raygun::Apm::Tracer.instance || self.class.init_tracer
           end
 
           def call(worker_instance, msg, queue)
             # Can be nil if we had a fatal error
             if @tracer
               started = @tracer.now
-              Thread.current.thread_variable_set(:_raygun_apm_tracer, @tracer)
               @tracer.start_trace
             end
             exception = nil
             Ruby_APM_profiler_trace do
               yield
+              self.class.fake_http_in_handler(@tracer, started, worker_instance, msg, queue, nil) if @tracer
             rescue => e
-              exception = e
+              self.class.fake_http_in_handler(@tracer, started, worker_instance, msg, queue, exception) if @tracer
             end
             # Can be nil if we had a fatal error
-            if @tracer
-              self.class.fake_http_in_handler(started, worker_instance, msg, queue, exception)
-              @tracer.end_trace
-            end
+            @tracer.end_trace if @tracer
           rescue Raygun::Apm::FatalError => e
             self.class.raygun_shutdown_handler(e)
           end
@@ -31,18 +28,17 @@ module Raygun
           private
 
           def self.init_tracer
-            return @tracer if @tracer
-            @tracer = Raygun::Apm::Tracer.new
-            @tracer.udp_sink!
-            @tracer.process_started
-            ObjectSpace.define_finalizer(self, self.finalize(@tracer))
+            tracer = Raygun::Apm::Tracer.new
+            tracer.udp_sink!
+            tracer.process_started
+            ObjectSpace.define_finalizer(self, self.finalize(tracer))
   
             @sql_subscriber = ActiveSupport::Notifications.subscribe('sql.active_record') do |*args|
-              sql_handler(args)
+              sql_handler(tracer, args)
             end
 
             GC.stress = true if ENV['RAYGUN_STRESS_GC']
-            @tracer
+            Raygun::Apm::Tracer.instance = tracer
             # If any fatal errors on init, shutdown the tracer
           rescue Raygun::Apm::FatalError => e
             raygun_shutdown_handler(e)
@@ -55,19 +51,19 @@ module Raygun
             warn "[Raygun APM] notification hooks unsubscribed"
             # Let the GC clean up the sink thread through the finalizer below
             @tracer = nil
-            Thread.current.thread_variable_set(:_raygun_apm_tracer, nil)
+            Raygun::Apm::Tracer.instance = nil
             raise(exception) unless (Raygun::Apm::FatalError === exception)
           end
   
-          def self.fake_http_in_handler(started, worker_instance, msg, queue, exception)
-            ended = @tracer.now
+          def self.fake_http_in_handler(tracer, started, worker_instance, msg, queue, exception)
+            ended = tracer.now
             event = http_in_event
             event[:url] = "sidekiq://#{queue}/#{msg["class"]}?#{msg["jid"]}"
             event[:status] = exception ? 500 : 200
             event[:duration] = ended - started
-            event[:timestamp] = @tracer.now
-            event[:tid] = @tracer.get_thread_id(Thread.current)
-            @tracer.emit(event)
+            event[:timestamp] = tracer.now
+            event[:tid] = tracer.get_thread_id(Thread.current)
+            tracer.emit(event)
             raise(exception) if exception
           rescue => e
             warn "[Raygun APM] error reporting HTTP IN event"
@@ -83,7 +79,7 @@ module Raygun
             end
           end
 
-          def self.sql_handler(args)
+          def self.sql_handler(tracer, args)
             notification = ActiveSupport::Notifications::Event.new *args
             connection = if notification.payload[:connection]
               notification.payload[:connection]
@@ -103,8 +99,8 @@ module Raygun
             # XXX constant milliseconds to microseconds
             event[:duration] = notification.duration * 1000
             event[:timestamp] = notification.time.to_f * 1000000
-            event[:tid] = @tracer.get_thread_id(Thread.current)
-            @tracer.emit(event)
+            event[:tid] = tracer.get_thread_id(Thread.current)
+            tracer.emit(event)
           rescue => e
             warn "[Raygun APM] error reporting SQL event"
             raygun_shutdown_handler(e)

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

@@ -1,7 +1,7 @@
 module Raygun
   module Apm
     module Sidekiq
-      VERSION = "1.0.10"
+      VERSION = "1.0.11"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-sidekiq
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Raygun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2020-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raygun-apm
@@ -75,6 +75,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.rdoc
 - Gemfile
 - Gemfile.lock
 - README.rdoc