sentry-resque 5.1.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34025217fa0ebd7f1ff06b033917df01b3a4dfc953015033f04c73ff204bc063
-  data.tar.gz: 2d30113030ff36c739460693c90c1f891ca33a7751509d25c4fb688f7f42ec60
+  metadata.gz: 47ed5386880ace81cea24fd9d6a2e3a71169c8b7edf520335666107101bafaf9
+  data.tar.gz: 288dbf76154789de5192033c4679061add2387af8413fb2c56667b4e66a73d7c
 SHA512:
-  metadata.gz: 6212927151bbfe622f4dff28f8c39252983200b14894084bb2c70e4dfbf648f8fe15270c00b10b6d5bd6bb6c8996dbf71b1c0ede41f170018239c3130d657030
-  data.tar.gz: 35700d18f0762997f6ec9e04a8aed96a2e231b8366e25b937f89bd169b8c2a66f5f62a63f6c6330ce74ead93d27d7d7159d13cb48b48e8f080adb3135078a5f9
+  metadata.gz: 8ca1d97342063ef49772edd169ee0c4bcacdba8b3352ec0759baf2e5a27ffee25b3d4b3b584bdde0b145fb4b72908499688ab74f4d91090881686ba5649bdb80
+  data.tar.gz: 20904c4043323ff3104302a28d9c865e7c150738dfe3e79924b71a22d004752d712adfe419cb4d004d78b76d8fbcbbc43b858ba0fe9d75641e1059911080fd5f

data/lib/sentry/resque/version.rb

@@ -1,5 +1,5 @@
 module Sentry
   module Resque
-    VERSION = "5.1.0"
+    VERSION = "5.1.1"
   end
 end

data/lib/sentry/resque.rb

@@ -5,63 +5,75 @@ require "resque"
 module Sentry
   module Resque
     def perform
-      return super unless Sentry.initialized?
+      if Sentry.initialized?
+        SentryReporter.record(queue, worker, payload) do
+          super
+        end
+      else
+        super
+      end
+    end
 
-      Sentry.with_scope do |scope|
-        begin
-          contexts = generate_contexts
-          scope.set_contexts(**contexts)
-          scope.set_tags("resque.queue" => queue)
+    class SentryReporter
+      class << self
+        def record(queue, worker, payload, &block)
+          Sentry.with_scope do |scope|
+            begin
+              contexts = generate_contexts(queue, worker, payload)
+              scope.set_contexts(**contexts)
+              scope.set_tags("resque.queue" => queue)
 
-          scope.set_transaction_name(contexts.dig(:"Active-Job", :job_class) || contexts.dig(:"Resque", :job_class))
-          transaction = Sentry.start_transaction(name: scope.transaction_name, op: "resque")
-          scope.set_span(transaction) if transaction
+              scope.set_transaction_name(contexts.dig(:"Active-Job", :job_class) || contexts.dig(:"Resque", :job_class))
+              transaction = Sentry.start_transaction(name: scope.transaction_name, op: "resque")
+              scope.set_span(transaction) if transaction
 
-          super
+              yield
 
-          finish_transaction(transaction, 200)
-        rescue Exception => exception
-          ::Sentry::Resque.capture_exception(exception, hint: { background: false })
-          finish_transaction(transaction, 500)
-          raise
+              finish_transaction(transaction, 200)
+            rescue Exception => exception
+              ::Sentry::Resque.capture_exception(exception, hint: { background: false })
+              finish_transaction(transaction, 500)
+              raise
+            end
+          end
         end
-      end
-    end
 
-    def generate_contexts
-      context = {}
+        def generate_contexts(queue, worker, payload)
+          context = {}
 
-      if payload["class"] == "ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper"
-        active_job_payload = payload["args"].first
+          if payload["class"] == "ActiveJob::QueueAdapters::ResqueAdapter::JobWrapper"
+            active_job_payload = payload["args"].first
 
-        context[:"Active-Job"] = {
-          job_class: active_job_payload["job_class"],
-          job_id: active_job_payload["job_id"],
-          arguments: active_job_payload["arguments"],
-          executions: active_job_payload["executions"],
-          exception_executions: active_job_payload["exception_executions"],
-          locale: active_job_payload["locale"],
-          enqueued_at: active_job_payload["enqueued_at"],
-          queue: queue,
-          worker: worker.to_s
-        }
-      else
-        context[:"Resque"] = {
-          job_class: payload["class"],
-          arguments: payload["args"],
-          queue: queue,
-          worker: worker.to_s
-        }
-      end
+            context[:"Active-Job"] = {
+              job_class: active_job_payload["job_class"],
+              job_id: active_job_payload["job_id"],
+              arguments: active_job_payload["arguments"],
+              executions: active_job_payload["executions"],
+              exception_executions: active_job_payload["exception_executions"],
+              locale: active_job_payload["locale"],
+              enqueued_at: active_job_payload["enqueued_at"],
+              queue: queue,
+              worker: worker.to_s
+            }
+          else
+            context[:"Resque"] = {
+              job_class: payload["class"],
+              arguments: payload["args"],
+              queue: queue,
+              worker: worker.to_s
+            }
+          end
 
-      context
-    end
+          context
+        end
 
-    def finish_transaction(transaction, status)
-      return unless transaction
+        def finish_transaction(transaction, status)
+          return unless transaction
 
-      transaction.set_http_status(status)
-      transaction.finish
+          transaction.set_http_status(status)
+          transaction.finish
+        end
+      end
     end
   end
 end

data/sentry-resque.gemspec

@@ -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", "~> 5.1.0"
+  spec.add_dependency "sentry-ruby-core", "~> 5.1.1"
   spec.add_dependency "resque", ">= 1.24"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-resque
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.1.1
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2022-02-24 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: 5.1.0
+        version: 5.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.1.1
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement