sentry-sidekiq 5.3.0 → 5.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1584357111f05e18e82d62df9b3b048177f2c0383d8e40d4a01f4f69d068289a
-  data.tar.gz: 76ba2a9c731b52e99bf2945e30a4a6dcbcb62d7ccaf41466721f3af7f41ccd6f
+  metadata.gz: 44c8479eaa5470e9bd28d1987bb089a511d24edc9cc0a3ba86f46157c3b1741f
+  data.tar.gz: 2150561d2d2bef72a8111e70d43ec30515686c998dbc484ecd1871010c90aba0
 SHA512:
-  metadata.gz: 4367783995f3910ada62d72e7cecafd40dfba48735ec65ddbc13a9726a7dee865b1c2a59d47a80df4cac919df482d4552fd41df0b2fb60d13a219a932920c109
-  data.tar.gz: 5fec11d42210ed3f12b295bbee5a1c7f01fe421a872c560b8910cea28024597f9d615a8e2424091fc7a9860723a4c0059c7b8eb5bc136f8aa67e14fcf8762b18
+  metadata.gz: 5bd47c75a78d878945390e63dffe90ae0bc7834203bb47577f5fedc1898f582552fd3ada4373b0cd84c9c707a4f180954d34e1ae4501cf7abc83104b2f0b0a83
+  data.tar.gz: 0e7a96c232c43fa318348c6b1cb70687444686b4fd88771c53bbb5e7bff21e5b09728d07f6e73c04033f589eb8b1f191f8d61913c31b195a5dccf743a0622cdb

data/lib/sentry/sidekiq/context_filter.rb

@@ -26,6 +26,9 @@ module Sentry
           end
         end
 
+        # Sidekiq 7.0 started adding `_config` to the context, which is not easily serialisable
+        # And it's presence could be confusing so it's better to remove it until we decided to add it for a reason
+        filtered_context.delete(:_config)
         filtered_context
       end
 

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.3.0"
+    VERSION = "5.8.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-core", "~> 5.3.0"
+  spec.add_dependency "sentry-ruby", "~> 5.8.0"
   spec.add_dependency "sidekiq", ">= 3.0"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sentry-sidekiq
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.8.0
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-27 00:00:00.000000000 Z
+date: 2023-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sentry-ruby-core
+  name: sentry-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.0
+        version: 5.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.0
+        version: 5.8.0
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement