sentry-sidekiq 5.22.0 → 5.22.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83fbb1f91441c9adf737eaf26f68e5161de49eaf18cbcfb3f64ca104f1de4076
-  data.tar.gz: eb15ed9917c8677b982bfa5a81a080b80da54084051a5975ff0b678175ee0a38
+  metadata.gz: b36dbbd090d1178b71b8ce282e0bb053b067ea7e05e0d7c215a3d29fa3872817
+  data.tar.gz: 2fee63cd4fdfea8e290d089e7143b48a4324153e77fb87c9bfe22226fed27a80
 SHA512:
-  metadata.gz: 54831f113983325cc42c0e6bdf1765a01b1bf7769cade041270ab3c0475bb14ef95ee71b6461cf95f4c1139f0cfeea82cab0c846b3a4dad6e814bfa4fec423bc
-  data.tar.gz: 4bf2ad8e03051cf927c5f11c404bfe0a93e2cc17fc91f10b0233da2d14dc36cef4f20cf1386b871dcce982a857c8c617441495ab4a20f8bca5a1c9f6f45ef96c
+  metadata.gz: dc2966e26f5431bd2b6fd1a47015da73bc8f1e75cca2d19b6722498bb5cdf2c6c270e4c8d308555b6ededca6cf9a8e1e670d111aa457e1fb24719669973dadcb
+  data.tar.gz: 6254ece04b3c5215ca119a5f7272d7d0d101b0ccbb3700f91c00b4fd957f14b8a06fd6fd1617d437c81509931b39bfd9bda7576c153a262873dcd0e07544c148

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/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/sentry_context_middleware.rb

@@ -6,12 +6,12 @@ module Sentry
   module Sidekiq
     module Helpers
       def set_span_data(span, id:, queue:, latency: nil, retry_count: nil)
-        if span
-          span.set_data("messaging.message.id", id)
-          span.set_data("messaging.destination.name", queue)
-          span.set_data("messaging.message.receive.latency", latency) if latency
-          span.set_data("messaging.message.retry.count", retry_count) if retry_count
-        end
+        return unless span
+
+        span.set_data(Span::DataConventions::MESSAGING_MESSAGE_ID, id)
+        span.set_data(Span::DataConventions::MESSAGING_DESTINATION_NAME, queue)
+        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
     end
 
@@ -40,7 +40,14 @@ module Sentry
         if transaction
           scope.set_span(transaction)
 
-          set_span_data(transaction, id: job["jid"], queue: queue, latency: ((Time.now.to_f - job["enqueued_at"]) * 1000).to_i, retry_count: job["retry_count"] || 0)
+          latency = ((Time.now.to_f - job["enqueued_at"]) * 1000).to_i if job["enqueued_at"]
+          set_span_data(
+            transaction,
+            id: job["jid"],
+            queue: queue,
+            latency: latency,
+            retry_count: job["retry_count"] || 0
+          )
         end
 
         begin

data/lib/sentry/sidekiq/version.rb

@@ -2,6 +2,6 @@
 
 module Sentry
   module Sidekiq
-    VERSION = "5.22.0"
+    VERSION = "5.22.2"
   end
 end

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

@@ -38,16 +38,14 @@ 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
+            # Split schedule into cron and timezone parts (if timezone exists)
+            cron_parts = schedule.strip.split(" ")
 
-            # 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)
+            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(schedule)
             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.22.0"
+  spec.add_dependency "sentry-ruby", "~> 5.22.2"
   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.0
+  version: 5.22.2
 platform: ruby
 authors:
 - Sentry Team
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-12-04 00:00:00.000000000 Z
+date: 2025-01-24 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.0
+        version: 5.22.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.22.0
+        version: 5.22.2
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -69,16 +68,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.22.0/sentry-sidekiq
+homepage: https://github.com/getsentry/sentry-ruby/tree/5.22.2/sentry-sidekiq
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/getsentry/sentry-ruby/tree/5.22.0/sentry-sidekiq
-  source_code_uri: https://github.com/getsentry/sentry-ruby/tree/5.22.0/sentry-sidekiq
-  changelog_uri: https://github.com/getsentry/sentry-ruby/blob/5.22.0/CHANGELOG.md
+  homepage_uri: https://github.com/getsentry/sentry-ruby/tree/5.22.2/sentry-sidekiq
+  source_code_uri: https://github.com/getsentry/sentry-ruby/tree/5.22.2/sentry-sidekiq
+  changelog_uri: https://github.com/getsentry/sentry-ruby/blob/5.22.2/CHANGELOG.md
   bug_tracker_uri: https://github.com/getsentry/sentry-ruby/issues
-  documentation_uri: http://www.rubydoc.info/gems/sentry-sidekiq/5.22.0
-post_install_message: 
+  documentation_uri: http://www.rubydoc.info/gems/sentry-sidekiq/5.22.2
 rdoc_options: []
 require_paths:
 - lib
@@ -93,8 +91,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: []