raygun-apm-sidekiq 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95e0d6120faf33879735ee5fdf79c9f1c02811b1dc37302408597c6d2858d132
-  data.tar.gz: 676ffb5e73117d303c434f0af95cb14bac52cb1472701a3832db2d7f617d372c
+  metadata.gz: 5d47af0b57af919bbbcfd30f03f6170f48544ea379f3a112504b77b04a21f728
+  data.tar.gz: 768d91496b52936ecab2582091943b997768922ce196ebba17c33ffbc1c5edb0
 SHA512:
-  metadata.gz: 62d74bf1bb52950794ceb9d06501fd7567903c1e8f112ae371c53a712d19b7fad51a9bce7973b32109c912a87a76734a87914a762ad8bdcab88cd77fa5b91557
-  data.tar.gz: 48bf45bbb2225efb071959173cb8344b08acfae4f0d3d1474ca0cdc7770a8089d8b791859b18f6f009aaa4182b26205f2b968bd8a278e35ae444484d15c4383f
+  metadata.gz: 46eddc75761d8f7acf5ce5089ac33c340aaac03b915804237bba61ae19e594c0c56cca68bc504304ddcaa2005f900232a09b6d4b61b8fc150af7119ab0ed77f2
+  data.tar.gz: e0a2196341004b863bc00966e86ea7bd8b7c52cdab655c1c9002277f41f896e12e5bd41ba85418bcd4adadf5ef3e64c5b95630a402f5834409ffe55aa0b2904b

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

@@ -3,28 +3,10 @@ module Raygun
       module Sidekiq
         class Middleware
           def initialize
-            @tracer_initialized = nil
-          end
-
-          def initialize_tracer
-            @tracer = Raygun::Apm::Tracer.new
-            @tracer.udp_sink!
-            @tracer.process_started
-            ObjectSpace.define_finalizer(self, self.class.finalize(@tracer))
-  
-            @sql_subscriber = ActiveSupport::Notifications.subscribe('sql.active_record') do |*args|
-              sql_handler(args)
-            end
-
-            GC.stress = true if ENV['RAYGUN_STRESS_GC']
-
-            # If any fatal errors on init, shutdown the tracer
-          rescue Raygun::Apm::FatalError => e
-            raygun_shutdown_handler(e)
+            @tracer = self.class.init_tracer
           end
 
           def call(worker_instance, msg, queue)
-            @tracer_initialized ||= initialize_tracer
             # Can be nil if we had a fatal error
             if @tracer
               started = @tracer.now
@@ -39,14 +21,34 @@ module Raygun
             end
             # Can be nil if we had a fatal error
             if @tracer
-              fake_http_in_handler(started, worker_instance, msg, queue, exception)
+              self.class.fake_http_in_handler(started, worker_instance, msg, queue, exception)
               @tracer.end_trace
             end
           rescue Raygun::Apm::FatalError => e
-            raygun_shutdown_handler(e)
+            self.class.raygun_shutdown_handler(e)
           end
+
+          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))
   
-          def raygun_shutdown_handler(exception)
+            @sql_subscriber = ActiveSupport::Notifications.subscribe('sql.active_record') do |*args|
+              sql_handler(args)
+            end
+
+            GC.stress = true if ENV['RAYGUN_STRESS_GC']
+            @tracer
+            # If any fatal errors on init, shutdown the tracer
+          rescue Raygun::Apm::FatalError => e
+            raygun_shutdown_handler(e)
+          end
+
+          def self.raygun_shutdown_handler(exception)
             warn "Raygun APM shutting down due to error - %s", exception.message
             # Kill extended event subcriptions
             ActiveSupport::Notifications.unsubscribe(@sql_subscriber)
@@ -57,7 +59,7 @@ module Raygun
             raise(exception) unless (Raygun::Apm::FatalError === exception)
           end
   
-          def fake_http_in_handler(started, worker_instance, msg, queue, exception)
+          def self.fake_http_in_handler(started, worker_instance, msg, queue, exception)
             ended = @tracer.now
             event = http_in_event
             event[:url] = "sidekiq://#{queue}/#{msg["class"]}?#{msg["jid"]}"
@@ -72,7 +74,7 @@ module Raygun
             raygun_shutdown_handler(e)
           end
 
-          def http_in_event
+          def self.http_in_event
             @http_in_event ||= begin
               event = Raygun::Apm::Event::HttpIn.new
               event[:pid] = Process.pid
@@ -81,7 +83,7 @@ module Raygun
             end
           end
 
-          def sql_handler(args)
+          def self.sql_handler(args)
             notification = ActiveSupport::Notifications::Event.new *args
             connection = if notification.payload[:connection]
               notification.payload[:connection]
@@ -108,7 +110,7 @@ module Raygun
             raygun_shutdown_handler(e)
           end
 
-          def sql_event
+          def self.sql_event
             @sql_event ||= begin
               event = Raygun::Apm::Event::Sql.new
               event[:pid] = Process.pid

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-sidekiq
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Raygun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raygun-apm