sentry-sidekiq 5.23.0 → 5.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f148056f19ce53c66ebaf8333a6b3c709e86a8e7969de532ebe533b7ab85bc56
-  data.tar.gz: ee4b228e87bade38000c0611bf7ff30c97f9760a6bb4c6124749f29047d02a1b
+  metadata.gz: 8059c79e6f44f60a67c9014d92ec376d1f4a5d5f848c0f8f2317bcba96b312a3
+  data.tar.gz: 6a8a566a5f5c73de22dd903528ff1100f73d0ff0beb3cd5805e5c14d9b0c7bb7
 SHA512:
-  metadata.gz: aebc7d66e3784931eb99880ab5cc57b68aa3e9fa5c3869bba9ae6ccb0e1ed30b3094efda604fe14f96c1cddd0816628e7c9fcc40046fe6fd01de1371221662ef
-  data.tar.gz: 389145a410e38c17e9504e2fb43102086328fa32cb17fc68dd4314376cde96fee336bd65749deddc707beb87f5a380b4ca91c30ba6a0536f2cde6f4caeddeb88
+  metadata.gz: 010cce88c774bc2dc1d75738ebb006a8dc044475c775f0778bc759c881dcde4ef8b1d388e4789e777095271fde6e3d610b6e06b25a92362f1aa78533ac97e6cd
+  data.tar.gz: 9d321e52221456ff95f6ebb68a7a36b7689c02c0109749271d5af083b82041bbe55d3aa732688d98acd83302a044df2464b0f39f7823a7ba6842b2dbaf74b984

data/Gemfile

@@ -15,17 +15,29 @@ gem "sentry-rails", path: "../sentry-rails"
 # loofah changed the required ruby version in a patch so we need to explicitly pin it
 gem "loofah", "2.20.0" if RUBY_VERSION.to_f < 2.5
 
-sidekiq_version = ENV["SIDEKIQ_VERSION"]
-sidekiq_version = "7.0" if sidekiq_version.nil?
-sidekiq_version = Gem::Version.new(sidekiq_version)
-
-gem "sidekiq", "~> #{sidekiq_version}"
+if ENV["SIDEKIQ_MAIN"]
+  gem "sidekiq", github: "sidekiq/sidekiq", branch: "main"
+  sidekiq_version = "main"
+else
+  sidekiq_version = ENV["SIDEKIQ_VERSION"]
+  sidekiq_version = "7.0" if sidekiq_version.nil?
+  sidekiq_version = Gem::Version.new(sidekiq_version)
+
+  gem "sidekiq", "~> #{sidekiq_version}"
+end
 
-if RUBY_VERSION.to_f >= 2.7 && sidekiq_version >= Gem::Version.new("6.0")
+if sidekiq_version == "main" || RUBY_VERSION.to_f >= 2.7 && sidekiq_version >= Gem::Version.new("6.0")
   gem "sidekiq-cron"
-  gem "sidekiq-scheduler"
+
+  if sidekiq_version == "main" || sidekiq_version >= Gem::Version.new("8.0")
+    gem "sidekiq-scheduler", "~> 6.0.0.beta"
+  else
+    gem "sidekiq-scheduler", "~> 5.0.0"
+  end
 end
 
 gem "rails", "> 5.0.0"
 
 gem "timecop"
+
+gem "vernier", platforms: :ruby if RUBY_VERSION >= "3.2.1"

data/lib/sentry/sidekiq/configuration.rb

@@ -21,8 +21,16 @@ module Sentry
       # retry if it fails.
       attr_accessor :report_after_job_retries
 
+      # Only report jobs that don't have `dead: false` set in the job's `sidekiq_options`
+      attr_accessor :report_only_dead_jobs
+
+      # Whether we should inject headers while enqueuing the job in order to have a connected trace
+      attr_accessor :propagate_traces
+
       def initialize
         @report_after_job_retries = false
+        @report_only_dead_jobs = false
+        @propagate_traces = true
       end
     end
   end

data/lib/sentry/sidekiq/cron/job.rb

@@ -45,11 +45,17 @@ module Sentry
           # fail gracefully if can't find class
           klass_const =
             begin
-              ::Sidekiq::Cron::Support.constantize(klass.to_s)
+              if ::Sidekiq::Cron::Support.respond_to?(:safe_constantize)
+                ::Sidekiq::Cron::Support.safe_constantize(klass.to_s)
+              else
+                ::Sidekiq::Cron::Support.constantize(klass.to_s)
+              end
             rescue NameError
               return true
             end
 
+          return true if klass_const.nil? # Sidekiq::Cron returns nil if class is not found
+
           # only patch if not explicitly included in job by user
           unless klass_const.send(:ancestors).include?(Sentry::Cron::MonitorCheckIns)
             klass_const.send(:include, Sentry::Cron::MonitorCheckIns)

data/lib/sentry/sidekiq/error_handler.rb

@@ -31,6 +31,9 @@ module Sentry
           end
         end
 
+        # See if we want to ignore jobs that have dead: false
+        return if Sentry.configuration.sidekiq.report_only_dead_jobs && context.dig(:job, "dead") == false
+
         # Check if the retry count is below the attempt_threshold
         attempt_threshold = context.dig(:job, "attempt_threshold")
         if attempt_threshold && retryable?(context)

data/lib/sentry/sidekiq/sentry_context_middleware.rb

@@ -13,6 +13,20 @@ module Sentry
         span.set_data(Span::DataConventions::MESSAGING_MESSAGE_RECEIVE_LATENCY, latency) if latency
         span.set_data(Span::DataConventions::MESSAGING_MESSAGE_RETRY_COUNT, retry_count) if retry_count
       end
+
+      if ::Gem::Version.new(::Sidekiq::VERSION) >= ::Gem::Version.new("8.0.0")
+        def calculate_latency(job)
+          now_in_ms - job["enqueued_at"] if job["enqueued_at"]
+        end
+      else
+        def calculate_latency(job)
+          ((Time.now.to_f - job["enqueued_at"]) * 1000).round if job["enqueued_at"]
+        end
+      end
+
+      def now_in_ms
+        ::Process.clock_gettime(::Process::CLOCK_REALTIME, :millisecond)
+      end
     end
 
     class SentryContextServerMiddleware
@@ -40,7 +54,8 @@ module Sentry
         if transaction
           scope.set_span(transaction)
 
-          latency = ((Time.now.to_f - job["enqueued_at"]) * 1000).to_i if job["enqueued_at"]
+          latency = calculate_latency(job)
+
           set_span_data(
             transaction,
             id: job["jid"],
@@ -95,7 +110,10 @@ module Sentry
 
         user = Sentry.get_current_scope.user
         job["sentry_user"] = user unless user.empty?
-        job["trace_propagation_headers"] ||= Sentry.get_trace_propagation_headers
+
+        if Sentry.configuration.sidekiq.propagate_traces
+          job["trace_propagation_headers"] ||= Sentry.get_trace_propagation_headers
+        end
 
         Sentry.with_child_span(op: "queue.publish", description: worker_class.to_s) do |span|
           set_span_data(span, id: job["jid"], queue: queue)

data/lib/sentry/sidekiq/version.rb

@@ -2,6 +2,6 @@
 
 module Sentry
   module Sidekiq
-    VERSION = "5.23.0"
+    VERSION = "5.24.0"
   end
 end

data/sentry-sidekiq.gemspec

@@ -30,6 +30,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.23.0"
+  spec.add_dependency "sentry-ruby", "~> 5.24.0"
   spec.add_dependency "sidekiq", ">= 3.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sentry-sidekiq
 version: !ruby/object:Gem::Version
-  version: 5.23.0
+  version: 5.24.0
 platform: ruby
 authors:
 - Sentry Team
 bindir: exe
 cert_chain: []
-date: 2025-03-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sentry-ruby
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.23.0
+        version: 5.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.23.0
+        version: 5.24.0
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -42,8 +42,8 @@ email: accounts@sentry.io
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.md
 - LICENSE.txt
+- README.md
 files:
 - ".gitignore"
 - ".rspec"
@@ -69,15 +69,15 @@ files:
 - lib/sentry/sidekiq/sentry_context_middleware.rb
 - lib/sentry/sidekiq/version.rb
 - sentry-sidekiq.gemspec
-homepage: https://github.com/getsentry/sentry-ruby/tree/5.23.0/sentry-sidekiq
+homepage: https://github.com/getsentry/sentry-ruby/tree/5.24.0/sentry-sidekiq
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/getsentry/sentry-ruby/tree/5.23.0/sentry-sidekiq
-  source_code_uri: https://github.com/getsentry/sentry-ruby/tree/5.23.0/sentry-sidekiq
-  changelog_uri: https://github.com/getsentry/sentry-ruby/blob/5.23.0/CHANGELOG.md
+  homepage_uri: https://github.com/getsentry/sentry-ruby/tree/5.24.0/sentry-sidekiq
+  source_code_uri: https://github.com/getsentry/sentry-ruby/tree/5.24.0/sentry-sidekiq
+  changelog_uri: https://github.com/getsentry/sentry-ruby/blob/5.24.0/CHANGELOG.md
   bug_tracker_uri: https://github.com/getsentry/sentry-ruby/issues
-  documentation_uri: http://www.rubydoc.info/gems/sentry-sidekiq/5.23.0
+  documentation_uri: http://www.rubydoc.info/gems/sentry-sidekiq/5.24.0
 rdoc_options: []
 require_paths:
 - lib
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: A gem that provides Sidekiq integration for the Sentry error logger
 test_files: []