sentry-resque 5.0.2 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3276450719b246b7eddb8d5b2378c4d6d2f82374a2e026f5264ed7152aa5f74
-  data.tar.gz: 703626264624b1cd39b9cf6d614820c1ccbee204ebd3b7b290eaad7cc624a6df
+  metadata.gz: 915b11697f4ec7624e315220d15434d530dcce89b823a3504fae07311d419b1b
+  data.tar.gz: 36249ae2e06f3cbcf71db429905d2f362f42acffc09a5fa8cfd39ec74499ec5b
 SHA512:
-  metadata.gz: 86579c723534a6022c1b06c6d4c72ccb48382ef59a7dfd515d8170822d9de44446f3dcfc8a8cae7ba9613b41d17c5f560730e48e5b018c9bab03b7896882ce53
-  data.tar.gz: f7b61c04b1510db6233b70d11c07f51a6ec0ef37fd05633948bb0ee22bae76b218123996e15d3063fa122fc2516aef2b8c517ba86329a1150384039c1417d49a
+  metadata.gz: '08a305de6e4367e1027fe47a7a4eb6b94a32ac9807c86304a48e3ceaff998b175e02d1f7b0a4b538ef445150bc10d5a7b8cadc389a1ae9727953c74ead8b223b'
+  data.tar.gz: 24cd6907f3be8d948fff4ca51d6e5ade9c0ca7e108747e7fd9f6188dda011e3e3b5d6d4685c104a1b43e93fc1947f2ac8d035be817338b496710ec5793deccf9

data/lib/sentry/resque/version.rb

@@ -1,5 +1,5 @@
 module Sentry
   module Resque
-    VERSION = "5.0.2"
+    VERSION = "5.2.0"
   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.0.2"
+  spec.add_dependency "sentry-ruby-core", "~> 5.2.0"
   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.0.2
+  version: 5.2.0
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-31 00:00:00.000000000 Z
+date: 2022-03-08 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.0.2
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement