sentry-sidekiq 4.6.5 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 666a6688ac42b70a0134030d26e15b8391adf574d024a6abbab9a949f26e2fd3
-  data.tar.gz: '09eea35fbd0433bd0d9d2afae1a46327d1f14227aa6c72204ffa76b5267b8dc7'
+  metadata.gz: 4b3171c41f5f846d3f8c4f1ccb50636dead582c00abe5600cb552ba56e4c2b2e
+  data.tar.gz: 781f0ae3e22206cfd162ded78ac0199013890de73fadba2ccc360a023c5d9321
 SHA512:
-  metadata.gz: 917768117376b8289170f04ce12df6df04f8acac8b86263ce2078a1b9c8799b75f9a85b745860537763eef6f8b36f111e3aa03620cebb03c3cf2493a0e423ac9
-  data.tar.gz: 62bba56cd1a0e337f072f8446656c59d22d45ca4d69449a3069a52a7306255bbd678dd7393e09dd1fc348d05d8237b1a33929a0559733b0c8801885c5ce81605
+  metadata.gz: 1b857c91e200172af2d28d69df3b8069a0e70f1146f20828483595ea423621ccc4e12b06d050727c32aaab07a90c2638a38a46f88301320385e2ae1d30c040c1
+  data.tar.gz: 8a028b2c535d7b8a0e3740be347aeb443bfd05fa7b2db0594858c3d97019837b4612b7ad364c4098f89fe78599ca73daa60389fd9f7eb2011b26129db5e5b891

data/Gemfile

@@ -7,8 +7,11 @@ gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
 gem "codecov", "0.2.12"
 
-gem "sidekiq"
+sidekiq_version = ENV["SIDEKIQ_VERSION"]
+sidekiq_version = "6.0" if sidekiq_version.nil?
+
 gem "rails"
+gem "sidekiq", "~> #{sidekiq_version}"
 
 gem "sentry-ruby", path: "../sentry-ruby"
 gem "sentry-rails", path: "../sentry-rails"
@@ -16,3 +19,4 @@ gem "sentry-rails", path: "../sentry-rails"
 gem "object_tracer"
 gem "debug", github: "ruby/debug" if RUBY_VERSION.to_f >= 2.6
 gem "pry"
+

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020 st0012
+Copyright (c) 2020 getsentry
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/sentry/sidekiq/configuration.rb

@@ -0,0 +1,21 @@
+module Sentry
+  class Configuration
+    attr_reader :sidekiq
+
+    add_post_initialization_callback do
+      @sidekiq = Sentry::Sidekiq::Configuration.new
+    end
+  end
+
+  module Sidekiq
+    class Configuration
+      # Set this option to true if you want Sentry to only capture the last job
+      # retry if it fails.
+      attr_accessor :report_after_job_retries
+
+      def initialize
+        @report_after_job_retries = false
+      end
+    end
+  end
+end

data/lib/sentry/sidekiq/error_handler.rb

@@ -11,6 +11,15 @@ module Sentry
         scope = Sentry.get_current_scope
         scope.set_transaction_name(context_filter.transaction_name) unless scope.transaction_name
 
+        retry_option = context.dig(:job, "retry")
+
+        if Sentry.configuration.sidekiq.report_after_job_retries && retry_option.is_a?(Integer)
+          retry_count = context.dig(:job, "retry_count")
+          if retry_count.nil? || retry_count < retry_option - 1
+            return
+          end
+        end
+
         Sentry::Sidekiq.capture_exception(
           ex,
           contexts: { sidekiq: context_filter.filtered },

data/lib/sentry/sidekiq/version.rb

@@ -1,5 +1,5 @@
 module Sentry
   module Sidekiq
-    VERSION = "4.6.5"
+    VERSION = "4.7.0"
   end
 end

data/lib/sentry-sidekiq.rb

@@ -2,6 +2,7 @@ require "sidekiq"
 require "sentry-ruby"
 require "sentry/integrable"
 require "sentry/sidekiq/version"
+require "sentry/sidekiq/configuration"
 require "sentry/sidekiq/error_handler"
 require "sentry/sidekiq/sentry_context_middleware"
 
@@ -14,7 +15,7 @@ module Sentry
     if defined?(::Rails::Railtie)
       class Railtie < ::Rails::Railtie
         config.after_initialize do
-          next unless Sentry.initialized?
+          next unless Sentry.initialized? && defined?(::Sentry::Rails)
 
           Sentry.configuration.rails.skippable_job_adapters << "ActiveJob::QueueAdapters::SidekiqAdapter"
         end

data/sentry-sidekiq.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.authors = ["Sentry Team"]
   spec.description = spec.summary = "A gem that provides Sidekiq integration for the Sentry error logger"
   spec.email = "accounts@sentry.io"
-  spec.license = 'Apache-2.0'
+  spec.license = 'MIT'
   spec.homepage = "https://github.com/getsentry/sentry-ruby"
 
   spec.platform = Gem::Platform::RUBY
@@ -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", "~> 4.6.0"
+  spec.add_dependency "sentry-ruby-core", "~> 4.7.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: 4.6.5
+  version: 4.7.0
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-12 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sentry-ruby-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.7.0
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -62,6 +62,7 @@ files:
 - example/config/sidekiq.yml
 - example/error_worker.rb
 - lib/sentry-sidekiq.rb
+- lib/sentry/sidekiq/configuration.rb
 - lib/sentry/sidekiq/context_filter.rb
 - lib/sentry/sidekiq/error_handler.rb
 - lib/sentry/sidekiq/sentry_context_middleware.rb
@@ -69,7 +70,7 @@ files:
 - sentry-sidekiq.gemspec
 homepage: https://github.com/getsentry/sentry-ruby
 licenses:
-- Apache-2.0
+- MIT
 metadata:
   homepage_uri: https://github.com/getsentry/sentry-ruby
   source_code_uri: https://github.com/getsentry/sentry-ruby