sentry-delayed_job 4.3.1 → 4.4.0.pre.beta.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9888d4edc96b1c7c6b3c6241fbcc8f56ea67e043bffaac3132db17f06403ec9b
-  data.tar.gz: c26084a79d7c879ee07cd2f5e3a14a3e3fb557b36051d10731cc9349926bed22
+  metadata.gz: 50d21b952977b6c1028402322adeec2ed87a98025a042c08b220b62f5fd18669
+  data.tar.gz: 16c3a1160593d15ad08c214a78cc7d7afbb2030edeedc23af73900b817dbd372
 SHA512:
-  metadata.gz: 2d8145b047c778322f7476500b9227267efabf8ba5972318cdb9b319c7780f22a6c1f432f538e9434f64ea7fbb41b4be610a2ccafaf0989e564bef67d19541e6
-  data.tar.gz: 841500c12895f082dfde45c8d376a19ca817f8c023723b43908137cc41fcfb774e7dff7756555c595c6d1582ed9d1bbe055da6061575bed428d2e86d0f73bd13
+  metadata.gz: 56753ecc4da486738dca54acad67c87471fcd406088a27ffdaa528785b21ab5767107c69d9f2affcb9f12c3d25bbfade91f78be8f509c3e9a38bf16f7dbf2ad2
+  data.tar.gz: 6effc1073db4d525268ccf23cff54886f293623c506fcb670e512e0547329b62727214e20b79e181c986084328cd6d4090286f97d041bcf3eb49726649019d84

data/.craft.yml

@@ -11,9 +11,10 @@ artifactProvider:
   name: github
 targets:
     - name: gem
-    - name: github
-      tagPrefix: sentry-delayed_job-v
     - name: registry
       type: sdk
       config:
           canonical: 'gem:sentry-delayed_job'
+    - name: github
+      tagPrefix: sentry-delayed_job-v
+      changelog: sentry-delayed_job/CHANGELOG

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## 4.4.0-beta.0
+
+### Features
+
+- Allow delayed job's exceptions to be reported to sentry until the last job retry [#1364](https://github.com/getsentry/sentry-ruby/pull/1364)
+
+Add the `report_after_job_retries` configuration option to only report an exception to Sentry if this is the last job's retry after multiple exceptions. 
+
+```ruby
+config.delayed_job.report_after_job_retries = true # default is false
+```
+
+- Use context for delayed_job's job info [#1395](https://github.com/getsentry/sentry-ruby/pull/1395)
+
+**Before:**
+
+<img width="60%" alt="job info in extra" src="https://user-images.githubusercontent.com/5079556/114307133-de856c00-9b10-11eb-8967-cd0e67e80539.png">
+
+**After:**
+
+<img width="60%" alt="job info in context" src="https://user-images.githubusercontent.com/5079556/114307135-e2b18980-9b10-11eb-9fc4-af885bf0f68d.png">
+
 ## 4.3.1
 
 - Return delayed job when the SDK is not initialized [#1373](https://github.com/getsentry/sentry-ruby/pull/1373)

data/lib/sentry-delayed_job.rb

@@ -1,6 +1,7 @@
 require "delayed_job"
 require "sentry-ruby"
 require "sentry/integrable"
+require "sentry/delayed_job/configuration"
 require "sentry/delayed_job/version"
 require "sentry/delayed_job/plugin"
 

data/lib/sentry/delayed_job/configuration.rb

@@ -0,0 +1,21 @@
+module Sentry
+  class Configuration
+    attr_reader :delayed_job
+
+    add_post_initialization_callback do
+      @delayed_job = Sentry::DelayedJob::Configuration.new
+    end
+  end
+
+  module DelayedJob
+    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/delayed_job/plugin.rb

@@ -4,18 +4,22 @@ require "delayed_job"
 module Sentry
   module DelayedJob
     class Plugin < ::Delayed::Plugin
+      # need to symbolize strings as keyword arguments in Ruby 2.4~2.6
+      DELAYED_JOB_CONTEXT_KEY = :"Delayed-Job"
+      ACTIVE_JOB_CONTEXT_KEY = :"Active-Job"
+
       callbacks do |lifecycle|
         lifecycle.around(:invoke_job) do |job, *args, &block|
           next block.call(job, *args) unless Sentry.initialized?
 
           Sentry.with_scope do |scope|
-            scope.set_extras(**generate_extra(job))
+            scope.set_contexts(**generate_contexts(job))
             scope.set_tags("delayed_job.queue" => job.queue, "delayed_job.id" => job.id.to_s)
 
             begin
               block.call(job, *args)
             rescue Exception => e
-              Sentry::DelayedJob.capture_exception(e, hint: { background: false })
+              capture_exception(e, job)
 
               raise
             end
@@ -23,27 +27,43 @@ module Sentry
         end
       end
 
-      def self.generate_extra(job)
-        extra = {
-          "delayed_job.id": job.id.to_s,
-          "delayed_job.priority": job.priority,
-          "delayed_job.attempts": job.attempts,
-          "delayed_job.run_at": job.run_at,
-          "delayed_job.locked_at": job.locked_at,
-          "delayed_job.locked_by": job.locked_by,
-          "delayed_job.queue": job.queue,
-          "delayed_job.created_at": job.created_at,
-          "delayed_job.last_error": job.last_error&.byteslice(0..1000),
-          "delayed_job.handler": job.handler&.byteslice(0..1000)
+      def self.generate_contexts(job)
+        context = {}
+
+        context[DELAYED_JOB_CONTEXT_KEY] = {
+          id: job.id.to_s,
+          priority: job.priority,
+          attempts: job.attempts,
+          run_at: job.run_at,
+          locked_at: job.locked_at,
+          locked_by: job.locked_by,
+          queue: job.queue,
+          created_at: job.created_at,
+          last_error: job.last_error&.byteslice(0..1000),
+          handler: job.handler&.byteslice(0..1000)
         }
 
         if job.payload_object.respond_to?(:job_data)
+          context[ACTIVE_JOB_CONTEXT_KEY] = {}
+
           job.payload_object.job_data.each do |key, value|
-            extra[:"active_job.#{key}"] = value
+            context[ACTIVE_JOB_CONTEXT_KEY][key.to_sym] = value
           end
         end
 
-        extra
+        context
+      end
+
+      def self.capture_exception(exception, job)
+        Sentry::DelayedJob.capture_exception(exception, hint: { background: false }) if report?(job)
+      end
+
+      def self.report?(job)
+        return true unless Sentry.configuration.delayed_job.report_after_job_retries
+
+        # We use the predecessor because the job's attempts haven't been increased to the new
+        # count at this point.
+        job.attempts >= Delayed::Worker.max_attempts.pred
       end
     end
   end

data/lib/sentry/delayed_job/version.rb

@@ -1,5 +1,5 @@
 module Sentry
   module DelayedJob
-    VERSION = "4.3.1"
+    VERSION = "4.4.0-beta.0"
   end
 end

data/sentry-delayed_job.gemspec

@@ -22,5 +22,5 @@ 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.3.0"
+  spec.add_dependency "sentry-ruby-core", "~> 4.4.0.pre.beta"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-delayed_job
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 4.4.0.pre.beta.0
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2021-04-27 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.3.0
+        version: 4.4.0.pre.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 4.4.0.pre.beta
 description: A gem that provides DelayedJob integration for the Sentry error logger
 email: accounts@sentry.io
 executables: []
@@ -47,6 +47,7 @@ files:
 - example/Gemfile
 - example/app.rb
 - lib/sentry-delayed_job.rb
+- lib/sentry/delayed_job/configuration.rb
 - lib/sentry/delayed_job/plugin.rb
 - lib/sentry/delayed_job/version.rb
 - sentry-delayed_job.gemspec
@@ -68,11 +69,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: A gem that provides DelayedJob integration for the Sentry error logger