sentry-rails 4.8.0 → 4.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 518e3c6fc5c3c6531b4dd7bf57ea473735c345b5622430a24f68a1c934fe3eb1
-  data.tar.gz: adc5f1bd6de3c7e205e76800124bdaa656074803ee5d6c0e5e37398908a7a2de
+  metadata.gz: d3fac86beaf3aa169dfed1a73e0836e066bd8ec0a4c0c79dd91391d8dac20e29
+  data.tar.gz: 264f9fa5c867f13c8d1a69263e5956f1aa5e6123af5937db597cb4e43b6396dd
 SHA512:
-  metadata.gz: bec815782a5a5b7654b1c0f0b65c34d0a817deb9fd154d11ff8885ad5d6e7e8dc2e2f83d00169b2e0ebd20cabb06be7773b2ccca6c6e810b687203a235271e68
-  data.tar.gz: 4490b7c0bde163af393a5c4d60bd0d8744192d65a6a3ec449fa7217093446290d9324eedaf7756133c467ec4f5dc79f326b8653ac4b8f639ce558d06ca76f8b2
+  metadata.gz: 0a0890d576cdbe46e5a80834820014fc4bd5c201075f7ffad9156ec9d523783e799daa789ac5bfb9702980957fbcf6abd4277269dbb12ebe6a501bdf11273818
+  data.tar.gz: 56be8d335560de6e7e696ce0c62b0a5e86f672d4366a4c4da97fa79c8e7731c9b5778b79a8150e52799beedc7b688a1c3a436ea590ee3baa914f0355dd3828e7

data/app/jobs/sentry/send_event_job.rb

@@ -16,8 +16,8 @@ if defined?(ActiveJob)
         discard_on ActiveJob::DeserializationError
       else
         # mimic what discard_on does for Rails 5.0
-        rescue_from ActiveJob::DeserializationError do
-          logger.error "Discarded #{self.class} due to a #{exception}. The original exception was #{error.cause.inspect}."
+        rescue_from ActiveJob::DeserializationError do |exception|
+          logger.error "Discarded #{self.class} due to a #{exception}. The original exception was #{exception.cause.inspect}."
         end
       end
 

data/lib/sentry/rails/active_job.rb

@@ -1,28 +1,22 @@
 module Sentry
   module Rails
     module ActiveJobExtensions
-      def self.included(base)
-        base.class_eval do
-          around_perform do |job, block|
-            if Sentry.initialized?
-              if already_supported_by_specific_integration?(job)
-                block.call
-              else
-                Sentry.with_scope do |scope|
-                  capture_and_reraise_with_sentry(job, scope, block)
-                end
-              end
-            else
-              block.call
+      def perform_now
+        if !Sentry.initialized? || already_supported_by_sentry_integration?
+          super
+        else
+          Sentry.with_scope do |scope|
+            capture_and_reraise_with_sentry(scope) do
+              super
             end
           end
         end
       end
 
-      def capture_and_reraise_with_sentry(job, scope, block)
-        scope.set_transaction_name(job.class.name)
+      def capture_and_reraise_with_sentry(scope, &block)
+        scope.set_transaction_name(self.class.name)
         transaction =
-          if job.is_a?(::Sentry::SendEventJob)
+          if is_a?(::Sentry::SendEventJob)
             nil
           else
             Sentry.start_transaction(name: scope.transaction_name, op: "active_job")
@@ -30,50 +24,46 @@ module Sentry
 
         scope.set_span(transaction) if transaction
 
-        block.call
+        return_value = block.call
 
-        finish_transaction(transaction, 200)
+        finish_sentry_transaction(transaction, 200)
+
+        return_value
       rescue Exception => e # rubocop:disable Lint/RescueException
-        rescue_handler_result = rescue_with_handler(e)
-        finish_transaction(transaction, 500)
-        return rescue_handler_result if rescue_handler_result
+        finish_sentry_transaction(transaction, 500)
 
         Sentry::Rails.capture_exception(
           e,
-          extra: sentry_context(job),
+          extra: sentry_context,
           tags: {
-            job_id: job.job_id,
-            provider_job_id: job.provider_job_id
+            job_id: job_id,
+            provider_job_id:provider_job_id
           }
         )
         raise e
       end
 
-      def finish_transaction(transaction, status)
+      def finish_sentry_transaction(transaction, status)
         return unless transaction
 
         transaction.set_http_status(status)
         transaction.finish
       end
 
-      def already_supported_by_specific_integration?(job)
-        Sentry.configuration.rails.skippable_job_adapters.include?(job.class.queue_adapter.class.to_s)
+      def already_supported_by_sentry_integration?
+        Sentry.configuration.rails.skippable_job_adapters.include?(self.class.queue_adapter.class.to_s)
       end
 
-      def sentry_context(job)
+      def sentry_context
         {
-          active_job: job.class.name,
-          arguments: job.arguments,
-          scheduled_at: job.scheduled_at,
-          job_id: job.job_id,
-          provider_job_id: job.provider_job_id,
-          locale: job.locale
+          active_job: self.class.name,
+          arguments: arguments,
+          scheduled_at: scheduled_at,
+          job_id: job_id,
+          provider_job_id: provider_job_id,
+          locale: locale
         }
       end
     end
   end
 end
-
-class ActiveJob::Base
-  include Sentry::Rails::ActiveJobExtensions
-end

data/lib/sentry/rails/background_worker.rb

@@ -1,11 +1,9 @@
 module Sentry
   class BackgroundWorker
-    def perform(&block)
-      @executor.post do
-        # make sure the background worker returns AR connection if it accidentally acquire one during serialization
-        ActiveRecord::Base.connection_pool.with_connection do
-          block.call
-        end
+    def _perform(&block)
+      # make sure the background worker returns AR connection if it accidentally acquire one during serialization
+      ActiveRecord::Base.connection_pool.with_connection do
+        block.call
       end
     end
   end

data/lib/sentry/rails/version.rb

@@ -1,5 +1,5 @@
 module Sentry
   module Rails
-    VERSION = "4.8.0"
+    VERSION = "4.8.3"
   end
 end

data/sentry-rails.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "railties", ">= 5.0"
-  spec.add_dependency "sentry-ruby-core", "~> 4.8.0"
+  spec.add_dependency "sentry-ruby-core", "~> 4.8.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-rails
 version: !ruby/object:Gem::Version
-  version: 4.8.0
+  version: 4.8.3
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-11 00:00:00.000000000 Z
+date: 2022-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.8.0
+        version: 4.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.8.0
+        version: 4.8.3
 description: A gem that provides Rails integration for the Sentry error logger
 email: accounts@sentry.io
 executables: []