sentry-sidekiq 5.4.2 → 5.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53659362d3b216b6fecb61f4248e7f3fda05f4ee88c5f8c1806e8c803c8d00dc
-  data.tar.gz: 6f31c87f55e00ecbe173c491a9f94b35599040f473bee8075211e9bd3c1d2318
+  metadata.gz: 2a74e240c74c160e6803e8943c2899a94742e5b045bec665ff8eb7f9f1ff24b3
+  data.tar.gz: 83c53553c74be876cbb5c8d9f70a8aa55dd1e25e068c3a9e4a7fbf389474eb9a
 SHA512:
-  metadata.gz: 37a5e6593a7189eb0b183ea7f36b69c628f039573f9bf0b9b73de59966cbe52cf5aedb26489e3ec39c1a1a7bc56adf0c15724d8dd939ee8f97bdd19d7e4697a0
-  data.tar.gz: 49253e2afe2bf91f25f4b3dfae74bd81b0d327050172c7926ef8520f89c46355ccaf284014dbc795743c819b5100d9f28c14dc410e3d3e05a33dbbd29ea985bc
+  metadata.gz: cda383f40aa3cb8fc416000503135a0f10f55a65f47ad23a567e24c900259af132dafb6bac6a77eef665299b5efbbca0f79f60ba4240ced47969d168447a5c6b
+  data.tar.gz: e9f10851a01c71e6ebf7b7402448fb7bad78db354056eac18f4de1ed94afba243fa69e6051892d300bb5a7eaf7c825c03f65156cdbedaa15e7c34377e5b4dc54

data/lib/sentry/sidekiq/error_handler.rb

@@ -3,13 +3,15 @@ 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?
 
         context_filter = Sentry::Sidekiq::ContextFilter.new(context)
 
         scope = Sentry.get_current_scope
-        scope.set_transaction_name(context_filter.transaction_name) unless scope.transaction_name
+        scope.set_transaction_name(context_filter.transaction_name, source: :task) unless scope.transaction_name
 
         if Sentry.configuration.sidekiq.report_after_job_retries && retryable?(context)
           retry_count = context.dig(:job, "retry_count")
@@ -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?
 
@@ -16,8 +18,8 @@ module Sentry
         scope.set_tags(queue: queue, jid: job["jid"])
         scope.set_tags(build_tags(job["tags"]))
         scope.set_contexts(sidekiq: job.merge("queue" => queue))
-        scope.set_transaction_name(context_filter.transaction_name)
-        transaction = start_transaction(scope.transaction_name, job["sentry_trace"])
+        scope.set_transaction_name(context_filter.transaction_name, source: :task)
+        transaction = start_transaction(scope, job["sentry_trace"])
         scope.set_span(transaction) if transaction
 
         begin
@@ -37,8 +39,8 @@ module Sentry
         Array(tags).each_with_object({}) { |name, tags_hash| tags_hash[:"sidekiq.#{name}"] = true }
       end
 
-      def start_transaction(transaction_name, sentry_trace)
-        options = { name: transaction_name, op: "sidekiq" }
+      def start_transaction(scope, sentry_trace)
+        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.4.2"
+    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.4.2"
+  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.4.2
+  version: 5.6.0
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-17 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.4.2
+        version: 5.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.4.2
+        version: 5.6.0
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement