raygun-apm-sidekiq 1.0.21 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e41645a5376a6598004df9f071e586eb4ac5c0238558d1eedbaee6893b2a5b1
-  data.tar.gz: 851f549c3c7e9ecce675a2b56e1ffd0a32c711549d5b74c59d4e7feb3f711f75
+  metadata.gz: 8eb60a5d5debbf6e3bdde1ca25277c32a3c4c73338534b286f8454ef1710123e
+  data.tar.gz: 7d5332c206419c65d64350b4c96ad9b036ee700e3545135013c1e25eb4125252
 SHA512:
-  metadata.gz: 4e8ef2f24f187c0f1633869b4a976b79a582865554ec588bbfb25f728478f5828b79f9cd4a8d7ae2a4b65553adbaa8332291cfe7acf4c184f1c3c593c9ff3bde
-  data.tar.gz: 02245eeb72996eed8ffe6ffb8344ba932bd1b0aff9e9295c505da99d593bcd4999b504efe829b810d5a2f3e0d15b681462e88644c0a8447d37008a82ff60d25d
+  metadata.gz: 63827daad6dfae46726984fcea163ab7fbc93b69e26fe4dad55e33983dbcc9964de5f38a98a4f1048263a538f8bf8926af40c77c9318e8e61420523f96e8b2cd
+  data.tar.gz: 7bf386f072d834afb4fe51c112b95f601e435133b607f192b5b8cfeb909698e4cb42077fc4baf53badbf1eed2054eb8e6d7a9a042b11fa5648bbb4b35fa8e337

data/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2021 Raygun Limited
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

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

@@ -4,22 +4,18 @@ 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
           if @tracer
              @worker_started = @tracer.now
@@ -28,9 +24,10 @@ module Raygun
           exception = nil
           Ruby_APM_profiler_trace do
             begin
-              super
+              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
               exception = e
             end
@@ -50,7 +47,7 @@ module Raygun
         def init_tracer
           tracer = Raygun::Apm::Tracer.new
           tracer.udp_sink!
-          ObjectSpace.define_finalizer(self, Hook.finalize(tracer))
+          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|
@@ -72,6 +69,7 @@ module Raygun
           # Let the GC clean up the sink thread through the finalizer below
           @tracer = nil
           Raygun::Apm::Tracer.instance = nil
+          crash_report_exception(exception)
           raise(exception) unless (Raygun::Apm::FatalError === exception)
         end
 
@@ -133,9 +131,20 @@ module Raygun
         def Ruby_APM_profiler_trace
           yield
         end
+
+        def crash_report_exception(exception, env = {})
+          if Raygun::Apm::Sidekiq.raygun4ruby?
+            env.merge!(correlation_id: exception.instance_variable_get(:@__raygun_correlation_id))
+            Raygun.track_exception(exception, env)
+          end
+        end
       end
     end
   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,7 +4,7 @@ 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"

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

@@ -1,7 +1,7 @@
 module Raygun
   module Apm
     module Sidekiq
-      VERSION = "1.0.21"
+      VERSION = "1.1.3"
     end
   end
 end

data/lib/raygun/apm/sidekiq.rb

@@ -7,9 +7,16 @@ 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)
+          if configured
+            defined?(Raygun) && Raygun.respond_to?(:configured?) && Raygun.configured?
+          else
+            defined?(Raygun) && Raygun.respond_to?(:configured?)
+          end
+        end
     end
   end
 end

data/raygun-apm-sidekiq.gemspec

@@ -6,19 +6,19 @@ require "raygun/apm/sidekiq/version"
 Gem::Specification.new do |spec|
   spec.name          = "raygun-apm-sidekiq"
   spec.version       = Raygun::Apm::Sidekiq::VERSION
-  spec.authors       = ["Raygun", "Erkki Eilonen"]
-  spec.email         = ["support@raygun.com", "info@bearmetal.eu"]
+  spec.authors       = ["Raygun Limited"]
+  spec.email         = ["ruby-apm@raygun.io", "support@raygun.com"]
 
   spec.summary       = %q{Raygun application performance monitoring for Sidekiq}
   spec.homepage      = "https://raygun.com/platform/apm"
-  #spec.license       = "MIT"
+  spec.license       = "MIT"
 
-  spec.files         = Dir['README.rdoc', 'raygun-apm-sidekiq.gemspec', 'lib/**/*', 'bin/**/*']
+  spec.files         = Dir['README.rdoc', 'LICENSE', 'raygun-apm-sidekiq.gemspec', 'lib/**/*', 'bin/**/*']
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "raygun-apm", "~> 1.0.44"
+  spec.add_dependency "raygun-apm", "~> 1.1.10"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-sidekiq
 version: !ruby/object:Gem::Version
-  version: 1.0.21
+  version: 1.1.3
 platform: ruby
 authors:
-- Raygun
-- Erkki Eilonen
+- Raygun Limited
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-31 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raygun-apm
@@ -17,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.44
+        version: 1.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.44
+        version: 1.1.10
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -69,22 +68,24 @@ dependencies:
         version: '5.0'
 description: 
 email:
+- ruby-apm@raygun.io
 - support@raygun.com
-- info@bearmetal.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - README.rdoc
 - 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
 homepage: https://raygun.com/platform/apm
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []