sentry-rails 4.7.3 → 4.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cec5336b01a20ec1922a32d103bd4dcf1587e8bf53288bd58520ba76aaa181a3
-  data.tar.gz: e38495a0f02aa5d1293167cb8894671948d0eaf1d4c1eac987e7bb74a28f3b0d
+  metadata.gz: d3fac86beaf3aa169dfed1a73e0836e066bd8ec0a4c0c79dd91391d8dac20e29
+  data.tar.gz: 264f9fa5c867f13c8d1a69263e5956f1aa5e6123af5937db597cb4e43b6396dd
 SHA512:
-  metadata.gz: a2a44a181625827c72a1393c96c3f783a9b0eb8317d626baa44ebd1a91f099e0fc135fba8270f45dab649b3bf8e87a65b0f79aa865fb400e52c0e1ecba961f62
-  data.tar.gz: f6e5fd836f4b7e9cdaabd776b0f2b2918fcc422f0e170b75dce77b32f36f230e1046d02cd437aa59fb1017239a829032cb78daf0f1af20668786897555467ecc
+  metadata.gz: 0a0890d576cdbe46e5a80834820014fc4bd5c201075f7ffad9156ec9d523783e799daa789ac5bfb9702980957fbcf6abd4277269dbb12ebe6a501bdf11273818
+  data.tar.gz: 56be8d335560de6e7e696ce0c62b0a5e86f672d4366a4c4da97fa79c8e7731c9b5778b79a8150e52799beedc7b688a1c3a436ea590ee3baa914f0355dd3828e7

data/Gemfile

@@ -24,12 +24,14 @@ gem "sidekiq"
 gem "rspec", "~> 3.0"
 gem "rspec-retry"
 gem "rspec-rails", "~> 4.0"
-gem "codecov", "0.2.12"
+gem 'simplecov'
+gem "simplecov-cobertura", "~> 1.4"
+gem "rexml"
 
 gem "rake", "~> 12.0"
 
 gem "object_tracer"
-gem "debug", github: "ruby/debug" if RUBY_VERSION.to_f >= 2.6
+gem "debug", github: "ruby/debug", platform: :ruby if RUBY_VERSION.to_f >= 2.6
 gem "pry"
 
 gem "benchmark-ips"

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/configuration.rb

@@ -1,6 +1,7 @@
 require "sentry/rails/tracing/action_controller_subscriber"
 require "sentry/rails/tracing/action_view_subscriber"
 require "sentry/rails/tracing/active_record_subscriber"
+require "sentry/rails/tracing/active_storage_subscriber"
 
 module Sentry
   class Configuration
@@ -59,7 +60,8 @@ module Sentry
         @tracing_subscribers = Set.new([
           Sentry::Rails::Tracing::ActionControllerSubscriber,
           Sentry::Rails::Tracing::ActionViewSubscriber,
-          Sentry::Rails::Tracing::ActiveRecordSubscriber
+          Sentry::Rails::Tracing::ActiveRecordSubscriber,
+          Sentry::Rails::Tracing::ActiveStorageSubscriber
         ])
       end
     end

data/lib/sentry/rails/railtie.rb

@@ -7,7 +7,7 @@ module Sentry
     # middlewares can't be injected after initialize
     initializer "sentry.use_rack_middleware" do |app|
       # placed after all the file-sending middlewares so we can avoid unnecessary transactions
-      app.config.middleware.insert_after ActionDispatch::Executor, Sentry::Rails::CaptureExceptions
+      app.config.middleware.insert_after ActionDispatch::ShowExceptions, Sentry::Rails::CaptureExceptions
       # need to place as close to DebugExceptions as possible to intercept most of the exceptions, including those raised by middlewares
       app.config.middleware.insert_after ActionDispatch::DebugExceptions, Sentry::Rails::RescuedExceptionInterceptor
     end

data/lib/sentry/rails/rescued_exception_interceptor.rb

@@ -11,22 +11,6 @@ module Sentry
         begin
           @app.call(env)
         rescue => e
-          request = ActionDispatch::Request.new(env)
-
-          # Rails' ShowExceptions#render_exception will mutate env for the exceptions app
-          # so we need to hold a copy of env to report the accurate data (like request's url)
-          if request.show_exceptions?
-            scope = Sentry.get_current_scope
-            copied_env = scope.rack_env.dup
-            copied_env["sentry.original_transaction"] = scope.transaction_name
-            scope.set_rack_env(copied_env)
-
-            if report_rescued_exceptions?
-              Sentry::Rails.capture_exception(e)
-              env["sentry.already_captured"] = true
-            end
-          end
-
           env["sentry.rescued_exception"] = e if report_rescued_exceptions?
           raise e
         end

data/lib/sentry/rails/tracing/abstract_subscriber.rb

@@ -9,22 +9,30 @@ module Sentry
           end
 
           def unsubscribe!
-            ActiveSupport::Notifications.unsubscribe(self::EVENT_NAME)
+            self::EVENT_NAMES.each do |name|
+              ActiveSupport::Notifications.unsubscribe(name)
+            end
           end
 
-          def subscribe_to_event(event_name)
-            if ::Rails.version.to_i == 5
-              ActiveSupport::Notifications.subscribe(event_name) do |*args|
-                next unless Tracing.get_current_transaction
+          if ::Rails.version.to_i == 5
+            def subscribe_to_event(event_names)
+              event_names.each do |event_name|
+                ActiveSupport::Notifications.subscribe(event_name) do |*args|
+                  next unless Tracing.get_current_transaction
 
-                event = ActiveSupport::Notifications::Event.new(*args)
-                yield(event_name, event.duration, event.payload)
+                  event = ActiveSupport::Notifications::Event.new(*args)
+                  yield(event_name, event.duration, event.payload)
+                end
               end
-            else
-              ActiveSupport::Notifications.subscribe(event_name) do |event|
-                next unless Tracing.get_current_transaction
-
-                yield(event_name, event.duration, event.payload)
+            end
+          else
+            def subscribe_to_event(event_names)
+              event_names.each do |event_name|
+                ActiveSupport::Notifications.subscribe(event_name) do |event|
+                  next unless Tracing.get_current_transaction
+
+                  yield(event_name, event.duration, event.payload)
+                end
               end
             end
           end

data/lib/sentry/rails/tracing/action_controller_subscriber.rb

@@ -7,10 +7,10 @@ module Sentry
       class ActionControllerSubscriber < AbstractSubscriber
         extend InstrumentPayloadCleanupHelper
 
-        EVENT_NAME = "process_action.action_controller".freeze
+        EVENT_NAMES = ["process_action.action_controller"].freeze
 
         def self.subscribe!
-          subscribe_to_event(EVENT_NAME) do |event_name, duration, payload|
+          subscribe_to_event(EVENT_NAMES) do |event_name, duration, payload|
             controller = payload[:controller]
             action = payload[:action]
 

data/lib/sentry/rails/tracing/action_view_subscriber.rb

@@ -4,10 +4,10 @@ module Sentry
   module Rails
     module Tracing
       class ActionViewSubscriber < AbstractSubscriber
-        EVENT_NAME = "render_template.action_view".freeze
+        EVENT_NAMES = ["render_template.action_view"].freeze
 
         def self.subscribe!
-          subscribe_to_event(EVENT_NAME) do |event_name, duration, payload|
+          subscribe_to_event(EVENT_NAMES) do |event_name, duration, payload|
             record_on_current_span(op: event_name, start_timestamp: payload[START_TIMESTAMP_NAME], description: payload[:identifier], duration: duration)
           end
         end

data/lib/sentry/rails/tracing/active_record_subscriber.rb

@@ -4,11 +4,11 @@ module Sentry
   module Rails
     module Tracing
       class ActiveRecordSubscriber < AbstractSubscriber
-        EVENT_NAME = "sql.active_record".freeze
+        EVENT_NAMES = ["sql.active_record"].freeze
         EXCLUDED_EVENTS = ["SCHEMA", "TRANSACTION"].freeze
 
         def self.subscribe!
-          subscribe_to_event(EVENT_NAME) do |event_name, duration, payload|
+          subscribe_to_event(EVENT_NAMES) do |event_name, duration, payload|
             next if EXCLUDED_EVENTS.include? payload[:name]
 
             record_on_current_span(op: event_name, start_timestamp: payload[START_TIMESTAMP_NAME], description: payload[:sql], duration: duration) do |span|

data/lib/sentry/rails/tracing/active_storage_subscriber.rb

@@ -0,0 +1,34 @@
+require "sentry/rails/tracing/abstract_subscriber"
+
+module Sentry
+  module Rails
+    module Tracing
+      class ActiveStorageSubscriber < AbstractSubscriber
+        EVENT_NAMES = %w(
+          service_upload.active_storage
+          service_download.active_storage
+          service_streaming_download.active_storage
+          service_download_chunk.active_storage
+          service_delete.active_storage
+          service_delete_prefixed.active_storage
+          service_exist.active_storage
+          service_url.active_storage
+          service_mirror.active_storage
+          service_update_metadata.active_storage
+          preview.active_storage
+          analyze.active_storage
+        ).freeze
+
+        def self.subscribe!
+          subscribe_to_event(EVENT_NAMES) do |event_name, duration, payload|
+            record_on_current_span(op: event_name, start_timestamp: payload[START_TIMESTAMP_NAME], description: payload[:service], duration: duration) do |span|
+              payload.each do |key, value|
+                span.set_data(key, value) unless key == START_TIMESTAMP_NAME
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sentry/rails/tracing.rb

@@ -21,7 +21,8 @@ module Sentry
 
         subscribers.each do |subscriber|
           subscriber.subscribe!
-          subscribed_tracing_events << subscriber::EVENT_NAME
+          @subscribed_tracing_events ||= []
+          @subscribed_tracing_events += subscriber::EVENT_NAMES
         end
 
         @subscribed = true

data/lib/sentry/rails/version.rb

@@ -1,5 +1,5 @@
 module Sentry
   module Rails
-    VERSION = "4.7.3"
+    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.7.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.7.3
+  version: 4.8.3
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-22 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.7.0
+        version: 4.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 4.8.3
 description: A gem that provides Rails integration for the Sentry error logger
 email: accounts@sentry.io
 executables: []
@@ -79,6 +79,7 @@ files:
 - lib/sentry/rails/tracing/action_controller_subscriber.rb
 - lib/sentry/rails/tracing/action_view_subscriber.rb
 - lib/sentry/rails/tracing/active_record_subscriber.rb
+- lib/sentry/rails/tracing/active_storage_subscriber.rb
 - lib/sentry/rails/version.rb
 - sentry-rails.gemspec
 homepage: https://github.com/getsentry/sentry-ruby