sentry-sidekiq 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2381c7e962b8461b17f09da04d9a729960f62d6be46e12149fd732dc8e41d23
-  data.tar.gz: acf0beaefce9d7a176a7446b25b6010eac1c6d55af2a69a9040b4ab40a00240c
+  metadata.gz: 4370fdcec568ea785e549d24e250575ad8bb93b7a46bd27e777e9c6776407a57
+  data.tar.gz: 99a527bf321e1645843a159f9706ea8215976485833b8c20dcb243b56bce6016
 SHA512:
-  metadata.gz: b5c0b869fda22432123e2317943085a2636c8b911a140f98b3b2cb1435f09271861d63320b6426ba8bc36f8d9cd5e5d68beb63a76d2ee1f8719f72f7517aa96c
-  data.tar.gz: f142b51cb00cfc48c36d0d0612caba41bb7e0f02720e491843b0bfecc46f1438afdd5121c461b3bd681956913a7887e17116b8a0797c48e34c712e7070375e5f
+  metadata.gz: 6fdd057e634833b1ee467af9800ba759d2bca7a88ae9a1a8f84d844c8afa99b6aeb5d241b3f267275b5e42176c56943286a2b89407f5b7cc135fac520d04e833
+  data.tar.gz: 53ca304f50dc403af8a7f5d7011c2d1d6850ce111859796bac193736b8c6a5778428822db519eae7c0e412290a56b709e09fd59031093613b089b96379f9d38c

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 4.1.2
+
+- Fix sidekiq middleware [#1175](https://github.com/getsentry/sentry-ruby/pull/1175)
+  - Fixes [#1173](https://github.com/getsentry/sentry-ruby/issues/1173)
+- Adopt Integrable module [#1177](https://github.com/getsentry/sentry-ruby/pull/1177)
+
 ## 4.1.1
 
 - Use stricter dependency declaration [#1159](https://github.com/getsentry/sentry-ruby/pull/1159)

data/Gemfile

@@ -5,7 +5,7 @@ gemspec
 
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
-gem "codecov"
+gem "codecov", "0.2.12"
 
 gem "sidekiq"
 gem "activejob"

data/lib/sentry-sidekiq.rb

@@ -1,24 +1,23 @@
 require "sidekiq"
 require "sentry-ruby"
+require "sentry/integrable"
 require "sentry/sidekiq/version"
 require "sentry/sidekiq/error_handler"
-require "sentry/sidekiq/cleanup_middleware"
+require "sentry/sidekiq/sentry_context_middleware"
 # require "sentry/sidekiq/configuration"
 
 module Sentry
   module Sidekiq
-    META = { "name" => "sentry.ruby.sidekiq", "version" => Sentry::Sidekiq::VERSION }.freeze
-  end
+    extend Sentry::Integrable
 
-  def self.sdk_meta
-    Sentry::Sidekiq::META
+    register_integration name: "sidekiq", version: Sentry::Sidekiq::VERSION
   end
 end
 
 Sidekiq.configure_server do |config|
   config.error_handlers << Sentry::Sidekiq::ErrorHandler.new
   config.server_middleware do |chain|
-    chain.add Sentry::Sidekiq::CleanupMiddleware
+    chain.add Sentry::Sidekiq::SentryContextMiddleware
   end
 end
 

data/lib/sentry/sidekiq/cleanup_middleware.rb

@@ -12,7 +12,7 @@ module Sentry
           begin
             yield
           rescue => ex
-            Sentry.capture_exception(ex, hint: { background: false })
+            Sentry::Sidekiq.capture_exception(ex, hint: { background: false })
           end
         end
       end

data/lib/sentry/sidekiq/error_handler.rb

@@ -8,15 +8,14 @@ module Sentry
       def call(ex, context)
         return unless Sentry.initialized?
         context = Sentry::Sidekiq::ContextFilter.new.filter_context(context)
+        scope = Sentry.get_current_scope
+        scope.set_transaction_name(transaction_from_context(context)) unless scope.transaction_name
 
-        Sentry.with_scope do |scope|
-          scope.set_transaction_name transaction_from_context(context)
-          Sentry.capture_exception(
-            ex,
-            extra: { sidekiq: context },
-            hint: { background: false }
-          )
-        end
+        Sentry::Sidekiq.capture_exception(
+          ex,
+          extra: { sidekiq: context },
+          hint: { background: false }
+        )
       end
 
       private

data/lib/sentry/sidekiq/sentry_context_middleware.rb

@@ -0,0 +1,20 @@
+module Sentry
+  module Sidekiq
+    class SentryContextMiddleware
+      def call(_worker, job, queue)
+        return yield unless Sentry.initialized?
+
+        Sentry.clone_hub_to_current_thread
+        scope = Sentry.get_current_scope
+        scope.set_extras(sidekiq: job.merge("queue" => queue))
+        scope.set_transaction_name("Sidekiq/#{job["class"]}")
+
+        yield
+
+        # don't need to use ensure here
+        # if the job failed, we need to keep the scope for error handler. and the scope will be cleared there
+        scope.clear
+      end
+    end
+  end
+end

data/lib/sentry/sidekiq/version.rb

@@ -1,5 +1,5 @@
 module Sentry
   module Sidekiq
-    VERSION = "4.1.1"
+    VERSION = "4.1.2"
   end
 end

data/sentry-sidekiq.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "sentry-ruby", "~> 4.1.0"
+  spec.add_dependency "sentry-ruby", "~> 4.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-sidekiq
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-21 00:00:00.000000000 Z
+date: 2020-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sentry-ruby
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.1.2
 description: A gem that provides Sidekiq integration for the Sentry error logger
 email: accounts@sentry.io
 executables: []
@@ -52,6 +52,7 @@ files:
 - lib/sentry/sidekiq/cleanup_middleware.rb
 - lib/sentry/sidekiq/context_filter.rb
 - lib/sentry/sidekiq/error_handler.rb
+- lib/sentry/sidekiq/sentry_context_middleware.rb
 - lib/sentry/sidekiq/version.rb
 - sentry-sidekiq.gemspec
 homepage: https://github.com/getsentry/sentry-ruby