raygun-apm-sidekiq 1.0.12 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d7f0de52da00010cd3d499c15ceecf7f687983fd5a03b938768ec997e70a966
-  data.tar.gz: 3dd1bbf9171539d4ec427cef365d712ccb02b54d02ba748e7d3882a7a13b1cd7
+  metadata.gz: 849fd2aaca44d53e5d5387365898898e08476a1d7da0d04cfde9ef5f99de8ea2
+  data.tar.gz: d6832067056044c52a85c804f399075253c1707f773d9fe6f2b3b31ea4a66249
 SHA512:
-  metadata.gz: d38d374b6b8c4e29d015abbbca69b513cb934e4e5c942bfba619f9d23bcd85bb84c392080245ee578e0aa95ab74e04ff175732fedbf27503ecd4838afd25c9ee
-  data.tar.gz: 42f5e127cdc0f3be52f953b3b73807a6fdd2097f77bde16b8663bce030e122073e6f266a7500072e927dcb238111e6ffbb6dc9b1a4689a3e530765e4caeaefea
+  metadata.gz: 30b050b41a163c363f9b30c6a5a2e615c9933c06d6c358c8b081587a55b6bf47b0b6d66236bf8af5b5401844bb5c638207b28d5bee6d43eebfd908d8cc198577
+  data.tar.gz: 19c8201d2bff549a23990e1851b819ee6e88e76aaed3cb609a8e0757dc3b49c3bea2981b10f25cd0aad4e08b22c10fbae43319658a25b2024f561fe68bc5bafe

data/.gitignore

@@ -0,0 +1 @@
+*.gem

data/CHANGELOG.rdoc

@@ -1,5 +1,27 @@
 = Changelog
 
+== 1.0.17 (June 17, 2020)
+
+* Align with rubyesque blacklist syntax support from profiler version 1.0.44
+
+== 1.0.16 (June 8, 2020)
+
+* Integrate exception correlation with rayrun4ruby
+* Move raygun4ruby whitelisting and blacklisting out to profiler core
+
+== 1.0.15 (May 17, 2020)
+
+* Remove the Tracer#process_started callback (set on begin transaction command now)
+
+== 1.0.14 (May 15, 2020)
+
+* Introduce support for Redis as client adapter
+* Prefer hooking Sidekiq::Processor as Middleware does not wrap enough to intercept the raygun4ruby error handler as an HTTP OUT event
+
+== 1.0.13 (April 2, 2020)
+
+* Prefer hooking Sidekiq::Processor as Middleware does not wrap enough to intercept the raygun4ruby error handler as an HTTP OUT event
+
 == 1.0.12 (March 25, 2020)
 
 * Do not cache PID on HTTP OUT and SQL events

data/Gemfile.lock

@@ -1,24 +1,24 @@
 PATH
   remote: .
   specs:
-    raygun-apm-rails (0.1.0)
-      raygun-apm (~> 0.0.8)
+    raygun-apm-sidekiq (1.0.17)
+      raygun-apm (~> 1.0.15)
 
 GEM
   remote: https://rubygems.org/
   specs:
     minitest (5.13.0)
     rake (10.5.0)
-    raygun-apm (0.0.8-x86-linux)
+    raygun-apm (1.0.44-x86-linux)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.17)
+  bundler
   minitest (~> 5.0)
   rake (~> 10.0)
-  raygun-apm-rails!
+  raygun-apm-sidekiq!
 
 BUNDLED WITH
    1.17.3

data/lib/raygun/apm/sidekiq.rb

@@ -7,9 +7,9 @@ module Raygun
 
         BLACKLIST = %w{
           Sidekiq
-          Redis
-          +Raygun::Apm::Sidekiq::Middleware::Ruby_APM_profiler_trace
+          +Raygun::Apm::Sidekiq::Hook#Ruby_APM_profiler_trace
         }
+
     end
   end
 end

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

@@ -0,0 +1,135 @@
+require "sidekiq"
+require 'sidekiq/processor'
+
+module Raygun
+  module Apm
+    module Sidekiq
+      module Hook
+        def self.finalize(tracer)
+          proc {tracer.process_ended}
+        end
+
+        def initialize(mgr)
+          super
+          @tracer = Raygun::Apm::Tracer.instance || init_tracer          
+        end
+
+        def process(work)
+          job_hash = ::Sidekiq.load_json(work.job)
+          queue = work.queue_name
+          # Can be nil if we had a fatal error
+          if @tracer
+             @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
+            rescue => e
+              fake_http_in_handler(@tracer, @worker_started, job_hash, queue, e) if @tracer
+              exception = e
+            end
+          end
+          # Can be nil if we had a fatal error
+          @tracer.end_trace if @tracer
+          raise exception if exception
+        rescue Raygun::Apm::FatalError => e
+          raygun_shutdown_handler(e)
+        end
+
+        private
+
+        def init_tracer
+          tracer = Raygun::Apm::Tracer.new
+          tracer.udp_sink!
+          ObjectSpace.define_finalizer(self, Hook.finalize(tracer))
+
+          ActiveSupport::Notifications.unsubscribe(@sql_subscriber) if @sql_subscriber
+          @sql_subscriber = ActiveSupport::Notifications.subscribe('sql.active_record') do |*args|
+            sql_handler(tracer, args)
+          end
+
+          GC.stress = true if ENV['RAYGUN_STRESS_GC']
+          Raygun::Apm::Tracer.instance = tracer
+          # If any fatal errors on init, shutdown the tracer
+        rescue Raygun::Apm::FatalError => e
+          raygun_shutdown_handler(e)
+        end
+
+        def raygun_shutdown_handler(exception)
+          warn "[Raygun APM] shutting down due to error - #{exception.message} #{exception.backtrace.join("\n")}"
+          # Kill extended event subcriptions
+          ActiveSupport::Notifications.unsubscribe(@sql_subscriber)
+          warn "[Raygun APM] notification hooks unsubscribed"
+          # Let the GC clean up the sink thread through the finalizer below
+          @tracer = nil
+          Raygun::Apm::Tracer.instance = nil
+          raise(exception) unless (Raygun::Apm::FatalError === exception)
+        end
+
+        def fake_http_in_handler(tracer, started, msg, queue, exception)
+          ended = tracer.now
+          event = http_in_event
+          event[:pid] = Process.pid
+          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)
+        rescue => e
+          warn "[Raygun APM] error reporting HTTP IN event #{e.class} #{e.backtrace.join("\n")}"
+          raygun_shutdown_handler(e)
+        end
+
+        def http_in_event
+          @http_in_event ||= begin
+            event = Raygun::Apm::Event::HttpIn.new
+            event[:verb] = "POST"
+            event
+          end
+        end
+
+        def sql_handler(tracer, args)
+          notification = ActiveSupport::Notifications::Event.new *args
+          connection = if notification.payload[:connection]
+            notification.payload[:connection]
+          else
+            ObjectSpace._id2ref(notification.payload[:connection_id])
+          end
+          event = sql_event
+          event[:pid] = Process.pid
+          event[:query] = notification.payload[:sql]
+  
+          # XXX this is hacky
+          if config = connection.instance_variable_get('@config')
+            event[:provider] = config[:adapter]
+            event[:host] = config[:host]
+            event[:database] = config[:database]
+          end
+  
+          # 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)
+        rescue => e
+          warn "[Raygun APM] error reporting SQL event"
+          raygun_shutdown_handler(e)
+        end
+
+        def sql_event
+          @sql_event ||= Raygun::Apm::Event::Sql.new
+        end
+
+        def Ruby_APM_profiler_trace
+          yield
+        end
+      end
+    end
+  end
+end
+
+Sidekiq::Processor.prepend Raygun::Apm::Sidekiq::Hook

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

@@ -4,18 +4,16 @@ module Raygun
       class Railtie < ::Rails::Railtie
         initializer "raygun.apm.sidekiq" do |app|
           require "raygun/apm"
-          require "raygun/apm/sidekiq/middleware"
-          require "sidekiq"
+          require "raygun/apm/sidekiq/hook"
           Raygun::Apm::Blacklist.extend_with Raygun::Apm::Sidekiq::BLACKLIST
-
-          ::Sidekiq.configure_server do |config|
-            config.server_middleware do |chain|
-              chain.prepend Raygun::Apm::Sidekiq::Middleware
-            end
-          end
-
           # 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"
+          rescue LoadError
+          end
         end
       end
     end

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

@@ -1,7 +1,7 @@
 module Raygun
   module Apm
     module Sidekiq
-      VERSION = "1.0.12"
+      VERSION = "1.0.17"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-sidekiq
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.17
 platform: ruby
 authors:
 - Raygun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-25 00:00:00.000000000 Z
+date: 2020-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raygun-apm
@@ -75,6 +75,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - CHANGELOG.rdoc
 - Gemfile
 - Gemfile.lock
@@ -83,10 +84,9 @@ files:
 - bin/console
 - bin/setup
 - lib/raygun/apm/sidekiq.rb
-- lib/raygun/apm/sidekiq/middleware.rb
+- lib/raygun/apm/sidekiq/hook.rb
 - lib/raygun/apm/sidekiq/railtie.rb
 - lib/raygun/apm/sidekiq/version.rb
-- raygun-apm-sidekiq-1.0.0.gem
 - raygun-apm-sidekiq.gemspec
 homepage: https://raygun.com/platform/apm
 licenses: []

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

@@ -1,124 +0,0 @@
-module Raygun
-    module Apm
-      module Sidekiq
-        class Middleware
-          def initialize
-            @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
-              @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
-              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
-            @tracer.end_trace if @tracer
-          rescue Raygun::Apm::FatalError => e
-            self.class.raygun_shutdown_handler(e)
-          end
-
-          private
-
-          def self.init_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(tracer, args)
-            end
-
-            GC.stress = true if ENV['RAYGUN_STRESS_GC']
-            Raygun::Apm::Tracer.instance = 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)
-            warn "[Raygun APM] notification hooks unsubscribed"
-            # Let the GC clean up the sink thread through the finalizer below
-            @tracer = nil
-            Raygun::Apm::Tracer.instance = nil
-            raise(exception) unless (Raygun::Apm::FatalError === exception)
-          end
-  
-          def self.fake_http_in_handler(tracer, started, worker_instance, msg, queue, exception)
-            ended = tracer.now
-            event = http_in_event
-            event[:pid] = Process.pid
-            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)
-            raise(exception) if exception
-          rescue => e
-            warn "[Raygun APM] error reporting HTTP IN event"
-            raygun_shutdown_handler(e)
-          end
-
-          def self.http_in_event
-            @http_in_event ||= begin
-              event = Raygun::Apm::Event::HttpIn.new
-              event[:verb] = "POST"
-              event
-            end
-          end
-
-          def self.sql_handler(tracer, args)
-            notification = ActiveSupport::Notifications::Event.new *args
-            connection = if notification.payload[:connection]
-              notification.payload[:connection]
-            else
-              ObjectSpace._id2ref(notification.payload[:connection_id])
-            end
-            event = sql_event
-            event[:pid] = Process.pid
-            event[:query] = notification.payload[:sql]
-  
-            # XXX this is hacky
-            if config = connection.instance_variable_get('@config')
-              event[:provider] = config[:adapter]
-              event[:host] = config[:host]
-              event[:database] = config[:database]
-            end
-  
-            # 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)
-          rescue => e
-            warn "[Raygun APM] error reporting SQL event"
-            raygun_shutdown_handler(e)
-          end
-
-          def self.sql_event
-            @sql_event ||= Raygun::Apm::Event::Sql.new
-          end
-
-          def Ruby_APM_profiler_trace
-            yield
-          end
-
-          def self.finalize(tracer)
-            proc {tracer.process_ended}
-          end
-        end
-      end
-    end
-  end