rollbar 3.4.2 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fccee4d8f496c152bca4e1bd0cd3c71831dedda32230fbd5815091d498bf60c
-  data.tar.gz: 7a46b0396b809d8837a0891821f3b0dfd348daad1b6d39a2691afd519901e380
+  metadata.gz: 272903aca80c9b75c3569e73a7f03d26d9178c29d7b0bd0cb8a9f0b1a5ca10b8
+  data.tar.gz: e3a8e2311450fa42a86028b85e8cc772fe3cd5650b893d39fc775c79d629d354
 SHA512:
-  metadata.gz: dac247751b7b78289210aa82bc4508fe31483e758d47f345b9db01811553a745b6a508bbd93a11e10a5349dd8441c7b118d884b421ccb5985b99edd5f2814805
-  data.tar.gz: aa7197048fa8a4eae1080fa6ac794cb8ab301862893488636012113f119b59023c38bf395d1f2d45abacfee3d7ff81e96f7be2896614a8f4835340f60594a456
+  metadata.gz: fe2e14f701d38d233ee783f2e76a46429b4400140eb23a9659cb410b155aa610a970bebebad5b03d86e1e064563da5edfb2b3d4f9d4e15ce41c0ed388fc859b3
+  data.tar.gz: 3561ee290a64de01b22af538268d7898d9570dee746a4dde8048979d036995facdcc1bd8f8205a20916c2545352170ae24f8c9e1286e73f2757859c6b228ab83

data/lib/rollbar/configuration.rb

@@ -18,10 +18,12 @@ module Rollbar
                   :custom_data_method,
                   :default_logger,
                   :delayed_job_enabled,
+                  :disable_action_mailer_monkey_patch,
                   :disable_core_monkey_patch,
                   :disable_monkey_patch,
                   :disable_rack_monkey_patch,
                   :dj_threshold,
+                  :dj_use_scoped_block,
                   :enable_error_context,
                   :enabled,
                   :endpoint,
@@ -98,10 +100,12 @@ module Rollbar
       @logger_level = :info
       @delayed_job_enabled = true
       @disable_monkey_patch = false
+      @disable_action_mailer_monkey_patch = false
       @disable_core_monkey_patch = false
       @disable_rack_monkey_patch = false
       @enable_error_context = true
       @dj_threshold = 0
+      @dj_use_scoped_block = false
       @async_skip_report_handler = nil
       @enabled = nil # set to true when configure is called
       @endpoint = DEFAULT_ENDPOINT

data/lib/rollbar/json.rb

@@ -5,8 +5,6 @@ module Rollbar
   module JSON # :nodoc:
     module_function
 
-    attr_writer :options_module
-
     def dump(object)
       Rollbar.plugins.get('basic_socket').load_scoped!(true) do
         ::JSON.generate(object)

data/lib/rollbar/middleware/rails/show_exceptions.rb

@@ -7,7 +7,7 @@ module Rollbar
         def render_exception_with_rollbar(env, exception, wrapper = nil)
           key = 'action_dispatch.show_detailed_exceptions'
 
-          if exception.is_a?(ActionController::RoutingError) && env[key]
+          if exception.is_a?(ActionController::RoutingError) && env.params[key.to_s]
             scope = extract_scope_from(env)
 
             Rollbar.scoped(scope) do

data/lib/rollbar/plugins/active_job.rb

@@ -1,35 +1,54 @@
-module Rollbar
-  # Report any uncaught errors in a job to Rollbar and reraise
-  module ActiveJob
-    def self.included(base)
-      base.send :rescue_from, Exception do |exception|
-        args = if self.class.respond_to?(:log_arguments?) && !self.class.log_arguments?
-                 arguments.map(&Rollbar::Scrubbers.method(:scrub_value))
-               else
-                 arguments
-               end
+Rollbar.plugins.define('active_job') do
+  dependency { !configuration.disable_monkey_patch }
+  dependency { !configuration.disable_action_mailer_monkey_patch }
 
-        Rollbar.error(exception,
-                      :job => self.class.name,
-                      :job_id => job_id,
-                      :use_exception_level_filters => true,
-                      :arguments => args)
-        raise exception
+  execute do
+    module Rollbar
+      # Report any uncaught errors in a job to Rollbar and reraise
+      module ActiveJob
+        def self.included(base)
+          base.send :rescue_from, Exception do |exception|
+            job_data = {
+              :job => self.class.name,
+              :use_exception_level_filters => true
+            }
+
+            # When included in ActionMailer, the handler is called twice.
+            # This detects the execution that has the expected state.
+            if defined?(ActionMailer::Base) && self.class.ancestors.include?(ActionMailer::Base)
+              job_data[:action] = action_name
+              job_data[:params] = @params
+
+              Rollbar.error(exception, job_data)
+
+            # This detects other supported integrations.
+            elsif defined?(arguments)
+              job_data[:arguments] = \
+                if self.class.respond_to?(:log_arguments?) && !self.class.log_arguments?
+                  arguments.map(&Rollbar::Scrubbers.method(:scrub_value))
+                else
+                  arguments
+                end
+              job_data[:job_id] = job_id if defined?(job_id)
+
+              Rollbar.error(exception, job_data)
+            end
+
+            raise exception
+          end
+        end
       end
     end
-  end
-end
 
-if defined?(ActiveSupport) && ActiveSupport.respond_to?(:on_load)
-  ActiveSupport.on_load(:action_mailer) do
-    # Automatically add to ActionMailer::DeliveryJob
-    if defined?(ActionMailer::DeliveryJob)
-      ActionMailer::DeliveryJob.send(:include,
-                                     Rollbar::ActiveJob)
-    end
-    # Rails >= 6.0
-    if defined?(ActionMailer::MailDeliveryJob)
-      ActionMailer::MailDeliveryJob.send(:include, Rollbar::ActiveJob)
+    if defined?(ActiveSupport) && ActiveSupport.respond_to?(:on_load)
+      ActiveSupport.on_load(:action_mailer) do
+        if defined?(ActionMailer::MailDeliveryJob) # Rails >= 6.0
+          ActionMailer::Base.send(:include, Rollbar::ActiveJob)
+        elsif defined?(ActionMailer::DeliveryJob) # Rails < 6.0
+          ActionMailer::DeliveryJob.send(:include,
+                                         Rollbar::ActiveJob)
+        end
+      end
     end
   end
 end

data/lib/rollbar/plugins/delayed_job/plugin.rb

@@ -48,7 +48,12 @@ module Rollbar
     def self.invoke_job_callback
       proc do |job, *args, &block|
         begin
-          block.call(job, *args)
+          if Rollbar.configuration.dj_use_scoped_block
+            data = Rollbar::Delayed.build_job_data(job)
+            Rollbar.scoped(:request => data) { block.call(job, *args) }
+          else
+            block.call(job, *args)
+          end
         rescue StandardError => e
           report(e, job)
 

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = '3.4.2'.freeze
+  VERSION = '3.5.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.5.1
 platform: ruby
 authors:
 - Rollbar, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-06 00:00:00.000000000 Z
+date: 2024-01-12 00:00:00.000000000 Z
 dependencies: []
 description: Track and debug errors in your Ruby applications with ease using Rollbar.
   With this gem, you can easily monitor and report on exceptions and other errors