rollbar 3.5.1 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 272903aca80c9b75c3569e73a7f03d26d9178c29d7b0bd0cb8a9f0b1a5ca10b8
-  data.tar.gz: e3a8e2311450fa42a86028b85e8cc772fe3cd5650b893d39fc775c79d629d354
+  metadata.gz: 31f15586920ecb703867f190757c35491671f3391ed2b9c02f281809f71b10f4
+  data.tar.gz: c96de5c4519b77662362395c4a50750fc25803fc10fbde5eecfebda6fefe6688
 SHA512:
-  metadata.gz: fe2e14f701d38d233ee783f2e76a46429b4400140eb23a9659cb410b155aa610a970bebebad5b03d86e1e064563da5edfb2b3d4f9d4e15ce41c0ed388fc859b3
-  data.tar.gz: 3561ee290a64de01b22af538268d7898d9570dee746a4dde8048979d036995facdcc1bd8f8205a20916c2545352170ae24f8c9e1286e73f2757859c6b228ab83
+  metadata.gz: 3dc7101d46b693662e8cd1ecce2408176f13f8a770eb4d2af3ff984041728c6158f18c1b362a3c096b95384c6c6493e014d2c6196048b3cb433710c34b579d77
+  data.tar.gz: 9440cb71e6cad634faa99e4ea2bdce6f2eba5b0169920c61e17d4c5cbc17eae8e9b9da45113d79cdb943ea842613fa4f3259f8150977bf2373d35586b91fc8ad

data/.rubocop.yml

@@ -65,9 +65,9 @@ Style/FrozenStringLiteralComment:
   Enabled: false
 
 Style/HashSyntax:
-  EnforcedStyle: hash_rockets
+  EnforcedStyle: no_mixed_keys
   SupportedStyles:
-    - hash_rockets
+    - no_mixed_keys
 
 Style/Lambda:
   Enabled: false
@@ -156,8 +156,6 @@ Performance/InefficientHashSearch:
 
 Performance/OpenStruct:
   Enabled: true
-  Exclude:
-    - spec/**/*
 
 Performance/RangeInclude:
   Enabled: true

data/Gemfile

@@ -27,6 +27,10 @@ else
   gem 'rspec-rails', '~> 6.0.3'
 end
 
+if GEMFILE_RAILS_VERSION < '7.1'
+  gem 'concurrent-ruby', '1.3.4'
+end
+
 if GEMFILE_RAILS_VERSION < '6.0'
   gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
 else

data/gemfiles/rails50.gemfile

@@ -34,13 +34,15 @@ gem 'sucker_punch', '~> 2.0'
 
 gem 'rack', '2.1.2' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3')
 
-# We need last sinatra that uses rack 2.1.x
+gem 'concurrent-ruby', '1.3.4'
 gem 'database_cleaner', '~> 1.8.4'
 gem 'delayed_job', :require => false
 gem 'generator_spec'
 gem 'redis', '<= 3.3.5'
 gem 'resque'
 gem 'secure_headers', '~> 6.3.2', :require => false
+
+# We need last sinatra that uses rack 2.1.x
 gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag => 'v2.0.8'
 
 unless is_jruby

data/gemfiles/rails51.gemfile

@@ -37,6 +37,7 @@ gem 'rack', '2.1.2' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3')
 # We need last sinatra that uses rack 2.1.x
 gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag => 'v2.0.8'
 
+gem 'concurrent-ruby', '1.3.4'
 gem 'database_cleaner', '~> 1.8.4'
 gem 'delayed_job', :require => false
 gem 'generator_spec'

data/gemfiles/rails52.gemfile

@@ -31,6 +31,7 @@ gem 'sucker_punch', '~> 2.0'
 # We need last sinatra that uses rack 2.x and ruby 2.5.x
 gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag =>'v2.1.0'
 
+gem 'concurrent-ruby', '1.3.4'
 gem 'database_cleaner'
 gem 'delayed_job', :require => false
 gem 'generator_spec'

data/gemfiles/rails60.gemfile

@@ -27,6 +27,7 @@ gem 'sucker_punch', '~> 2.0'
 # We need last sinatra that uses rack 2.x and ruby 2.5.x
 gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag =>'v2.1.0'
 
+gem 'concurrent-ruby', '1.3.4'
 gem 'database_cleaner'
 gem 'delayed_job', '4.1.9', :require => false
 gem 'generator_spec'

data/gemfiles/rails61.gemfile

@@ -27,6 +27,7 @@ gem 'sucker_punch', '~> 2.0'
 # We need last sinatra that uses rack 2.x and ruby 2.5.x
 gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag =>'v2.1.0'
 
+gem 'concurrent-ruby', '1.3.4'
 gem 'database_cleaner'
 gem 'delayed_job', '4.1.9', :require => false
 gem 'generator_spec'

data/gemfiles/rails70.gemfile

@@ -27,6 +27,7 @@ gem 'sucker_punch', '~> 2.0'
 # We need last sinatra that uses rack 2.x and ruby 2.5.x
 gem 'sinatra', :git => 'https://github.com/sinatra/sinatra', :tag =>'v2.1.0'
 
+gem 'concurrent-ruby', '1.3.4'
 gem 'database_cleaner'
 gem 'delayed_job', '4.1.10', :require => false
 gem 'generator_spec'

data/lib/rollbar/configuration.rb

@@ -76,6 +76,7 @@ module Rollbar
                   :web_base,
                   :write_to_file
     attr_reader :before_process,
+                :enable_rails_error_subscriber,
                 :logger_level,
                 :project_gem_paths,
                 :send_extra_frame_data,
@@ -104,6 +105,7 @@ module Rollbar
       @disable_core_monkey_patch = false
       @disable_rack_monkey_patch = false
       @enable_error_context = true
+      @enable_rails_error_subscriber = false
       @dj_threshold = 0
       @dj_use_scoped_block = false
       @async_skip_report_handler = nil
@@ -337,6 +339,20 @@ module Rollbar
       @send_extra_frame_data = value
     end
 
+    def enable_rails_error_subscriber=(enable)
+      return if !defined?(::Rails) || ::Rails.gem_version < ::Gem::Version.new('7.1.0')
+
+      if @enable_rails_error_subscriber && !enable
+        ::Rails.error.unsubscribe(Rollbar::ErrorSubscriber)
+      end
+
+      if !@enable_rails_error_subscriber && enable
+        ::Rails.error.subscribe(Rollbar::ErrorSubscriber.new)
+      end
+
+      @enable_rails_error_subscriber = enable
+    end
+
     # allow params to be read like a hash
     def [](option)
       send(option)

data/lib/rollbar/exception_reporter.rb

@@ -27,7 +27,8 @@ module Rollbar
     end
 
     def capture_uncaught?
-      Rollbar.configuration.capture_uncaught != false
+      Rollbar.configuration.capture_uncaught != false &&
+        !Rollbar.configuration.enable_rails_error_subscriber
     end
 
     def log_exception_message(exception)

data/lib/rollbar/logger.rb

@@ -17,12 +17,10 @@ module Rollbar
   class Logger < ::Logger
     class Error < RuntimeError; end
 
-    class DatetimeFormatNotSupported < Error; end
-
-    class FormatterNotSupported < Error; end
-
     def initialize
-      @level = ERROR
+      super(nil)
+
+      self.level = ERROR
     end
 
     def add(severity, message = nil, progname = nil)
@@ -39,22 +37,6 @@ module Rollbar
       error(message)
     end
 
-    def formatter=(_)
-      raise(FormatterNotSupported)
-    end
-
-    def formatter
-      raise(FormatterNotSupported)
-    end
-
-    def datetime_format=(_)
-      raise(DatetimeFormatNotSupported)
-    end
-
-    def datetime_format
-      raise(DatetimeFormatNotSupported)
-    end
-
     # Returns a Rollbar::Notifier instance with the current global scope and
     # with a logger writing to /dev/null so we don't have a infinite loop
     # when Rollbar.configuration.logger is Rails.logger.

data/lib/rollbar/notifier.rb

@@ -9,7 +9,6 @@ require 'rollbar/delay/thread'
 require 'rollbar/logger_proxy'
 require 'rollbar/item'
 require 'rollbar/notifier/trace_with_bindings'
-require 'ostruct'
 
 module Rollbar
   # The notifier class. It has the core functionality

data/lib/rollbar/plugins/active_job.rb

@@ -1,45 +1,45 @@
-Rollbar.plugins.define('active_job') do
-  dependency { !configuration.disable_monkey_patch }
-  dependency { !configuration.disable_action_mailer_monkey_patch }
+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
+        }
 
-  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
 
-            # 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)
 
-              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)
+        # 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)
 
-            raise exception
-          end
+          Rollbar.error(exception, job_data)
         end
+
+        raise exception
       end
     end
+  end
+end
 
+Rollbar.plugins.define('active_job') do
+  dependency { !configuration.disable_monkey_patch }
+  dependency { !configuration.disable_action_mailer_monkey_patch }
+
+  execute do
     if defined?(ActiveSupport) && ActiveSupport.respond_to?(:on_load)
       ActiveSupport.on_load(:action_mailer) do
         if defined?(ActionMailer::MailDeliveryJob) # Rails >= 6.0

data/lib/rollbar/plugins/rails/error_subscriber.rb

@@ -0,0 +1,12 @@
+module Rollbar
+  class ErrorSubscriber
+    def report(error, handled:, severity:, context:, source: nil)
+      # The default `nil` for capture_uncaught means `true`. so check for false.
+      return unless handled || Rollbar.configuration.capture_uncaught != false
+
+      extra = context.is_a?(Hash) ? context.deep_dup : {}
+      extra[:custom_data_method_context] = source
+      Rollbar.log(severity, error, extra)
+    end
+  end
+end

data/lib/rollbar/plugins/rails.rb

@@ -79,3 +79,11 @@ Rollbar.plugins.define('rails-rollbar.js') do
     Rollbar::Js::Frameworks::Rails.new.load(self)
   end
 end
+
+Rollbar.plugins.define('rails-error-subscriber') do
+  dependency { defined?(Rails::VERSION) && Rails::VERSION::MAJOR >= 7 }
+
+  execute! do
+    require 'rollbar/plugins/rails/error_subscriber'
+  end
+end

data/lib/rollbar/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.6.1
 platform: ruby
 authors:
 - Rollbar, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-12 00:00:00.000000000 Z
+date: 2025-02-07 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
@@ -101,6 +101,7 @@ files:
 - lib/rollbar/plugins/rack.rb
 - lib/rollbar/plugins/rails.rb
 - lib/rollbar/plugins/rails/controller_methods.rb
+- lib/rollbar/plugins/rails/error_subscriber.rb
 - lib/rollbar/plugins/rails/railtie30.rb
 - lib/rollbar/plugins/rails/railtie32.rb
 - lib/rollbar/plugins/rails/railtie_mixin.rb