sentry-sidekiq 5.22.1 → 5.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2aa3f4ae82ab8d6fc5fba46337262b12da3a0dd00d5e62ff4489ecf533b93869
-  data.tar.gz: 0f337deae3dd7d56fcf5309ba511ed42aa5f97ea6754e77cf931dc91eea9f099
+  metadata.gz: f148056f19ce53c66ebaf8333a6b3c709e86a8e7969de532ebe533b7ab85bc56
+  data.tar.gz: ee4b228e87bade38000c0611bf7ff30c97f9760a6bb4c6124749f29047d02a1b
 SHA512:
-  metadata.gz: 611488068db6136aa27ec043d01e5787f0e8d7199ffbc3a6628ab1fd6bab8692f50e19dd42718e14c15623422704b53a8ca052bbdf1d194bbec7dfeb6ef5609c
-  data.tar.gz: 896d0b90b5ef1992d0137ba905e2db8b1c6a5c04ab2f6d3ee9b7f9cb1fc016796bb3dbcf42b550074c83677701c825e4609c019ef8fd91412bb02328ad3f2920
+  metadata.gz: aebc7d66e3784931eb99880ab5cc57b68aa3e9fa5c3869bba9ae6ccb0e1ed30b3094efda604fe14f96c1cddd0816628e7c9fcc40046fe6fd01de1371221662ef
+  data.tar.gz: 389145a410e38c17e9504e2fb43102086328fa32cb17fc68dd4314376cde96fee336bd65749deddc707beb87f5a380b4ca91c30ba6a0536f2cde6f4caeddeb88

data/Gemfile

@@ -3,8 +3,11 @@
 source "https://rubygems.org"
 git_source(:github) { |name| "https://github.com/#{name}.git" }
 
+eval_gemfile "../Gemfile"
+
 # Specify your gem's dependencies in sentry-ruby.gemspec
 gemspec
+
 gem "sentry-ruby", path: "../sentry-ruby"
 gem "sentry-rails", path: "../sentry-rails"
 
@@ -26,5 +29,3 @@ end
 gem "rails", "> 5.0.0"
 
 gem "timecop"
-
-eval_gemfile File.expand_path("../Gemfile", __dir__)

data/lib/sentry/sidekiq/configuration.rb

@@ -11,7 +11,10 @@ module Sentry
   end
 
   module Sidekiq
-    IGNORE_DEFAULT = ["Sidekiq::JobRetry::Skip"]
+    IGNORE_DEFAULT = [
+      "Sidekiq::JobRetry::Skip",
+      "Sidekiq::JobRetry::Handled"
+    ]
 
     class Configuration
       # Set this option to true if you want Sentry to only capture the last job

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Sentry
+  module Sidekiq
+    module Cron
+      module Helpers
+        # This is used by Cron::Job and Scheduler
+        def self.monitor_config(cron)
+          cron_parts = cron.strip.split(" ")
+
+          if cron_parts.length > 5
+            timezone = cron_parts.pop
+            cron_without_timezone = cron_parts.join(" ")
+
+            Sentry::Cron::MonitorConfig.from_crontab(cron_without_timezone, timezone: timezone)
+          else
+            Sentry::Cron::MonitorConfig.from_crontab(cron)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -55,7 +55,7 @@ module Sentry
             klass_const.send(:include, Sentry::Cron::MonitorCheckIns)
             klass_const.send(:sentry_monitor_check_ins,
                              slug: name.to_s,
-                             monitor_config: Sentry::Cron::MonitorConfig.from_crontab(parsed_cron.original))
+                             monitor_config: Sentry::Sidekiq::Cron::Helpers.monitor_config(parsed_cron.original))
           end
 
           true

data/lib/sentry/sidekiq/error_handler.rb

@@ -31,6 +31,19 @@ module Sentry
           end
         end
 
+        # Check if the retry count is below the attempt_threshold
+        attempt_threshold = context.dig(:job, "attempt_threshold")
+        if attempt_threshold && retryable?(context)
+          attempt_threshold = attempt_threshold.to_i
+          retry_count = context.dig(:job, "retry_count")
+          # attempt 1 - retry_count is nil
+          # attempt 2 - this is your first retry so retry_count is 0
+          # attempt 3 - you have retried once, retry_count is 1
+          attempt = retry_count.nil? ? 1 : retry_count.to_i + 2
+
+          return if attempt < attempt_threshold
+        end
+
         Sentry::Sidekiq.capture_exception(
           ex,
           contexts: { sidekiq: context_filter.filtered },

data/lib/sentry/sidekiq/version.rb

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

data/lib/sentry/sidekiq-scheduler/scheduler.rb

@@ -38,19 +38,7 @@ module Sentry
         monitor_config =
           case interval_type
           when "cron"
-            # fugit is a second order dependency of sidekiq-scheduler via rufus-scheduler
-            parsed_cron = ::Fugit.parse_cron(schedule)
-            timezone = parsed_cron.timezone
-
-            # fugit supports having the timezone part of the cron string,
-            # so we need to pull that with some hacky stuff
-            if timezone
-              parsed_cron.instance_variable_set(:@timezone, nil)
-              cron_without_timezone = parsed_cron.to_cron_s
-              Sentry::Cron::MonitorConfig.from_crontab(cron_without_timezone, timezone: timezone.name)
-            else
-              Sentry::Cron::MonitorConfig.from_crontab(schedule)
-            end
+            Sentry::Sidekiq::Cron::Helpers.monitor_config(schedule)
           when "every", "interval"
             Sentry::Cron::MonitorConfig.from_interval(rufus_job.frequency.to_i / 60, :minute)
           end

data/lib/sentry-sidekiq.rb

@@ -43,5 +43,6 @@ Sidekiq.configure_client do |config|
 end
 
 # patches
+require "sentry/sidekiq/cron/helpers"
 require "sentry/sidekiq/cron/job"
 require "sentry/sidekiq-scheduler/scheduler"

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.22.1"
+  spec.add_dependency "sentry-ruby", "~> 5.23.0"
   spec.add_dependency "sidekiq", ">= 3.0"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sentry-sidekiq
 version: !ruby/object:Gem::Version
-  version: 5.22.1
+  version: 5.23.0
 platform: ruby
 authors:
 - Sentry Team
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-12-16 00:00:00.000000000 Z
+date: 2025-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sentry-ruby
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.22.1
+        version: 5.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.22.1
+        version: 5.23.0
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -64,21 +63,21 @@ files:
 - lib/sentry/sidekiq-scheduler/scheduler.rb
 - lib/sentry/sidekiq/configuration.rb
 - lib/sentry/sidekiq/context_filter.rb
+- lib/sentry/sidekiq/cron/helpers.rb
 - lib/sentry/sidekiq/cron/job.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/tree/5.22.1/sentry-sidekiq
+homepage: https://github.com/getsentry/sentry-ruby/tree/5.23.0/sentry-sidekiq
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/getsentry/sentry-ruby/tree/5.22.1/sentry-sidekiq
-  source_code_uri: https://github.com/getsentry/sentry-ruby/tree/5.22.1/sentry-sidekiq
-  changelog_uri: https://github.com/getsentry/sentry-ruby/blob/5.22.1/CHANGELOG.md
+  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
   bug_tracker_uri: https://github.com/getsentry/sentry-ruby/issues
-  documentation_uri: http://www.rubydoc.info/gems/sentry-sidekiq/5.22.1
-post_install_message: 
+  documentation_uri: http://www.rubydoc.info/gems/sentry-sidekiq/5.23.0
 rdoc_options: []
 require_paths:
 - lib
@@ -93,8 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A gem that provides Sidekiq integration for the Sentry error logger
 test_files: []