sentry-sidekiq 5.5.0 → 5.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e43da1dcac270fdb233815a56b4ed74b1c7e2cbeedea4ecc1df3bbbcb67b48d1
-  data.tar.gz: c7fb07d32b2515479a3775795016fd7d1447fd0e2d37cd94e7f53c3cacb5615c
+  metadata.gz: 2a74e240c74c160e6803e8943c2899a94742e5b045bec665ff8eb7f9f1ff24b3
+  data.tar.gz: 83c53553c74be876cbb5c8d9f70a8aa55dd1e25e068c3a9e4a7fbf389474eb9a
 SHA512:
-  metadata.gz: c6361d8d77cda58d1943a5dab098d98ef71328c0165fe93cecb8afc03e2757fa97359a51e1da2f92e9591ea40acdfdf79a914570f8794f08a29808bc660a3c5b
-  data.tar.gz: 3c002641917778ad5ec4eebe84914a33ba7a16fc2ce10bc86fa11467492ed6e2cafa6555d864768be0bea0402e290a0d623b149a056605eae8e9e38eb0242b20
+  metadata.gz: cda383f40aa3cb8fc416000503135a0f10f55a65f47ad23a567e24c900259af132dafb6bac6a77eef665299b5efbbca0f79f60ba4240ced47969d168447a5c6b
+  data.tar.gz: e9f10851a01c71e6ebf7b7402448fb7bad78db354056eac18f4de1ed94afba243fa69e6051892d300bb5a7eaf7c825c03f65156cdbedaa15e7c34377e5b4dc54

data/lib/sentry/sidekiq/error_handler.rb

@@ -3,6 +3,8 @@ require 'sentry/sidekiq/context_filter'
 module Sentry
   module Sidekiq
     class ErrorHandler
+      WITH_SIDEKIQ_7 = ::Gem::Version.new(::Sidekiq::VERSION) >= ::Gem::Version.new("7.0")
+
       def call(ex, context)
         return unless Sentry.initialized?
 
@@ -40,7 +42,13 @@ module Sentry
         when Integer
           limit
         when TrueClass
-          ::Sidekiq.options[:max_retries] || 25
+          max_retries =
+            if WITH_SIDEKIQ_7
+              ::Sidekiq.default_configuration[:max_retries]
+            else
+              ::Sidekiq.options[:max_retries]
+            end
+          max_retries || 25
         else
           0
         end

data/lib/sentry/sidekiq/sentry_context_middleware.rb

@@ -3,6 +3,8 @@ require 'sentry/sidekiq/context_filter'
 module Sentry
   module Sidekiq
     class SentryContextServerMiddleware
+      OP_NAME = "queue.sidekiq".freeze
+
       def call(_worker, job, queue)
         return yield unless Sentry.initialized?
 
@@ -38,7 +40,7 @@ module Sentry
       end
 
       def start_transaction(scope, sentry_trace)
-        options = { name: scope.transaction_name, source: scope.transaction_source, op: "sidekiq" }
+        options = { name: scope.transaction_name, source: scope.transaction_source, op: OP_NAME }
         transaction = Sentry::Transaction.from_sentry_trace(sentry_trace, **options) if sentry_trace
         Sentry.start_transaction(transaction: transaction, **options)
       end

data/lib/sentry/sidekiq/version.rb

@@ -1,5 +1,5 @@
 module Sentry
   module Sidekiq
-    VERSION = "5.5.0"
+    VERSION = "5.6.0"
   end
 end

data/sentry-sidekiq.gemspec

@@ -22,6 +22,6 @@ 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", "~> 5.5.0"
+  spec.add_dependency "sentry-ruby", "~> 5.6.0"
   spec.add_dependency "sidekiq", ">= 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-sidekiq
 version: !ruby/object:Gem::Version
-  version: 5.5.0
+  version: 5.6.0
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-03 00:00:00.000000000 Z
+date: 2022-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sentry-ruby
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.5.0
+        version: 5.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.5.0
+        version: 5.6.0
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement