sidekiq_metered_exceptions 0.2.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5559035e512931e92f57dc4f549b8745dcfc2fe4
-  data.tar.gz: deb9de3d744473dadb9ff1faf2657400ea041cdd
+  metadata.gz: bc937fac34504b327d11e95bacd4b86a5d5c72f4
+  data.tar.gz: 7815de00fff56b82ad0fac3eb1b34894e1204405
 SHA512:
-  metadata.gz: 3c2a22180c1be3f17c813a15c083e6ae017f3ea087715da959e978964ff704244c1b1275c80f2b2aa3c0830450f2d033530623f91efb2134b97b5b191973fb65
-  data.tar.gz: bbfb6c1aed680e9ca810ffafdda4ef8afdbaf52cd988478bab9a9dea2d0a18237717e0026c71513a4e435aad62f1d998f939e5fd919e101c013b507ac16804bd
+  metadata.gz: 459dd9ded4400d9458de49240438b58d82be2ea271955db6a20950364257774fed630c7b2732f567d4f0a7a89e753130b2f49ffcf6173f80d457a96bd27f6ee5
+  data.tar.gz: ec516b73d69aa95e727428f27615bbdc888975955b175145f7017cf403dda9233a43c102a16a2e2be9610c0d86758dec9bd602e5d9b812ff2988fb7e48bbb439

data/Gemfile.lock

@@ -1,8 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.5.0)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.4.0)
     builder (3.2.3)
     celluloid (0.14.1)
       timers (>= 1.0.0)
@@ -12,47 +11,46 @@ GEM
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     git (1.3.0)
-    github_api (0.11.3)
-      addressable (~> 2.3)
-      descendants_tracker (~> 0.0.1)
+    github_api (0.16.0)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 1.2)
-      multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.0)
-      oauth2
-    hashie (3.4.6)
-    highline (1.7.8)
-    jeweler (2.3.2)
+      hashie (>= 3.4)
+      mime-types (>= 1.16, < 3.0)
+      oauth2 (~> 1.0)
+    hashie (3.5.7)
+    highline (1.7.10)
+    jeweler (2.3.9)
       builder
-      bundler (>= 1.0)
+      bundler
       git (>= 1.2.5)
-      github_api (~> 0.11.0)
+      github_api (~> 0.16.0)
       highline (>= 1.6.15)
       nokogiri (>= 1.5.10)
-      psych (~> 2.2)
+      psych
       rake
       rdoc
       semver2
     json (2.0.3)
     jwt (1.5.6)
-    mini_portile2 (2.1.0)
+    mime-types (2.99.3)
+    mini_portile2 (2.3.0)
     minitest (5.0.4)
-    multi_json (1.12.1)
+    multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    nokogiri (1.6.8.1)
-      mini_portile2 (~> 2.1.0)
-    oauth2 (1.3.0)
-      faraday (>= 0.8, < 0.11)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
+    oauth2 (1.4.0)
+      faraday (>= 0.8, < 0.13)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    psych (2.2.2)
-    public_suffix (2.0.5)
-    rack (2.0.1)
-    rake (12.0.0)
-    rdoc (5.0.0)
+    psych (3.0.2)
+    rack (2.0.4)
+    rake (12.3.1)
+    rdoc (6.0.3)
     redis (3.0.4)
     redis-namespace (1.3.0)
       redis (~> 3.0.0)
@@ -65,7 +63,7 @@ GEM
       json
       redis (>= 3.0)
       redis-namespace
-    thread_safe (0.3.5)
+    thread_safe (0.3.6)
     timers (1.1.0)
 
 PLATFORMS
@@ -80,4 +78,4 @@ DEPENDENCIES
   sidekiq
 
 BUNDLED WITH
-   1.13.7
+   1.16.1

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.3

data/lib/metered_raven_error_handler.rb

@@ -2,12 +2,27 @@ require 'sidekiq'
 require 'raven/integrations/sidekiq'
 
 module SidekiqMeteredExceptions
-  class MeteredRavenErrorHandler < ::Raven::Sidekiq
-    def call(ex, context)
-      retry_count = (context['retry_count'] || (context['job'] && context['job']['retry_count']))
+  class MeteredRavenErrorHandler < ::Raven::SidekiqErrorHandler
+    def call(ex, original_context)
+      ::Rails.logger.debug("MeteredRavenErrorHandler -- Error on Sidekiq job. Exception: #{ex.inspect} - Context: #{original_context.inspect}")
 
-      if retry_count.nil? || retry_count > 1
-        super(ex, context)
+      # symbolize keys so we don't have to worry about strings vs. symbols
+      context = original_context.deep_symbolize_keys
+
+      # If the job context has a `retry_count` key, it tells us how many times the job has been REtried so far.
+      # If it lacks this key, it has never been retried; this is the first attempt.
+      retry_count = (context[:retry_count] || (context[:job] && context[:job][:retry_count])).try(:to_i) || 0
+
+      # Is this a retryable job?
+      is_retryable = context[:retry] || (context[:job] && context[:job][:retry])
+
+      # We notify if this job has been retried at least once.
+      # Someday we plan to make this number configurable.
+      # If this isn't a retryable job, we notify even if this is the first attempt, because there will not be more attempts.
+      if retry_count > 0 || !is_retryable
+        ::Rails.logger.debug("MeteredRavenErrorHandler -- Current retry count: #{retry_count}. Notifying upstream...")
+
+        super(ex, original_context)
       end
     end
   end

data/sidekiq_metered_exceptions.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: sidekiq_metered_exceptions 0.2.1 ruby lib
+# stub: sidekiq_metered_exceptions 0.3.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "sidekiq_metered_exceptions".freeze
-  s.version = "0.2.1"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Nathan Woodhull".freeze]
-  s.date = "2017-01-19"
+  s.date = "2018-06-12"
   s.description = "Some exceptions are transient, so notifying an admin is not useful.".freeze
   s.email = "woodhull@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/woodhull/sidekiq_metered_exceptions".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.6.8".freeze
+  s.rubygems_version = "2.6.12".freeze
   s.summary = "Only propagate sidekiq exceptions that have already been retried once.".freeze
 
   if s.respond_to? :specification_version then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_metered_exceptions
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Nathan Woodhull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2018-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Only propagate sidekiq exceptions that have already been retried once.