raygun-apm-sidekiq 1.1.0 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8009f547af850699fce5145572da672ce3e31da22264435c5b58c9d7dd0e2a1
-  data.tar.gz: 0f2ba61a145143c585242ce8fcff91743dd0325d51a3014bc0c8bc218f20adc0
+  metadata.gz: 3fde53b06b1150e3cbf5c9583e59624c44390014da4645786f0848dec62abc1f
+  data.tar.gz: 0b460eb533f2da95e624e71a3436aa96cc8f2eee111719bceea09a5b276a6fb3
 SHA512:
-  metadata.gz: 32095b0d4fbf7be62815d0ae5f1666173d28a4e55a0f4a75aeedc78acedb7e73f5b2fe3b247f368e1261fbcdb73d575eaa3686b38975659a394c3ab2d56567be
-  data.tar.gz: b273df052ed2538ab6928433074ae743f20d941c451ca09994e2a765957a176e8df068c8c4829944463f07c1d0694de996bc328f4dc1bf2b8965b9c7896b15fd
+  metadata.gz: c8b870360400b4510a5d7db4eac6dc18a219a05a2894ef7e85941c9044f86324a35dcb31d22b5f8536089150c6f6caeafa198a46f59dd94c138e8d2c1a0602ee
+  data.tar.gz: 74ac9375c761063527d26034f6856823b1a1321e99a4cbe76d0246df075d9561262b43572363388d2895a3e6f7e1b6a5802a0afd2e0a860cd26b7cd091606845

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
@@ -49,8 +46,8 @@ module Raygun
 
         def init_tracer
           tracer = Raygun::Apm::Tracer.new
-          tracer.udp_sink!
-          ObjectSpace.define_finalizer(self, Hook.finalize(tracer))
+          tracer.enable_sink!
+          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,11 +4,8 @@ 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"
-          require "raygun/apm/hooks/redis" if defined?(Redis::Client)
           # Attempt to explicitly require the raygun4ruby sidekiq integration
           begin
             require "raygun/sidekiq"

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

@@ -1,7 +1,7 @@
 module Raygun
   module Apm
     module Sidekiq
-      VERSION = "1.1.0"
+      VERSION = "1.1.4"
     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"
+  spec.add_dependency "raygun-apm", "~> 1.1.11"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"

metadata

@@ -1,30 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: raygun-apm-sidekiq
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.4
 platform: ruby
 authors:
-- Raygun
-- Erkki Eilonen
+- Raygun Limited
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-16 00:00:00.000000000 Z
+date: 2022-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raygun-apm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.11
 - !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: []