rollbar 3.4.1 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c64f479a34f9a4292e7c11843f53f3375024d8062847c728885399ce5be8da9
-  data.tar.gz: 2d8eb22823cf8e098eca8dab38d3acdb49c49df6043dcbee7908d62384727a88
+  metadata.gz: 9833b30479b7f91305cdf3a4269e3f550d8a925aa50f13ccd374f9d6e3456dc6
+  data.tar.gz: fcc7e9410c968844460052171bf0cbf62006d86f2ab0a71d81fd2a8af60d5599
 SHA512:
-  metadata.gz: 105d2bcaf2bc879723b23f3536c9bb6f3b6a6e147472510f0995a5c52f85c58cdebe904f75ef5cfb1636c21cdc9777cf9ae1faf08777ed8c4fb3842309c913b9
-  data.tar.gz: 3c9b51d3d2a0335421441032db51351b373c14c3c1e2a79d25f3fe1030f441453bd55612719a0b387357f083ebc1bcbcc5ad161491c798667fcf104947971d9b
+  metadata.gz: 8b1da82b43abeaef4e2b78937842ddca414279b6816e61ddd1861a32955c5a4436e625a8931da4151b3d77c645451f8aef18fd88c0e976928cf1939080e9c2a2
+  data.tar.gz: d034b0a6f4e8eea5fef9e714ffa7492087f6c61dc442710eecd479b16cfda5d3522bf863abdec17aa2b7f3beb7a7981741bf0376d427d1b63861dce343b5ceea

data/.github/workflows/ci.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         ruby-version: [2.5.3, 2.6.0, 2.6.6, 2.7.2]
@@ -29,28 +29,6 @@ jobs:
             ruby-version: 3.0.3
           - gemfile: gemfiles/rails61.gemfile
             ruby-version: 3.0.3
-          - gemfile: gemfiles/rails42.gemfile
-            ruby-version: 2.4.5
-          - gemfile: gemfiles/rails42.gemfile
-            ruby-version: 2.3.8
-          - gemfile: gemfiles/rails42.gemfile
-            ruby-version: 2.2.10
-          - gemfile: gemfiles/rails41.gemfile
-            ruby-version: 2.3.0
-          - gemfile: gemfiles/rails41.gemfile
-            ruby-version: 2.2.10
-          - gemfile: gemfiles/rails41.gemfile
-            ruby-version: 2.1.9
-          - gemfile: gemfiles/rails40.gemfile
-            ruby-version: 2.3.0
-          - gemfile: gemfiles/rails40.gemfile
-            ruby-version: 2.2.10
-          - gemfile: gemfiles/rails40.gemfile
-            ruby-version: 2.1.9
-          - gemfile: gemfiles/rails32.gemfile
-            ruby-version: 2.2.10
-          - gemfile: gemfiles/rails32.gemfile
-            ruby-version: 2.1.9
 
     steps:
       - uses: actions/checkout@v2

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,44 @@
-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|
+            args = if self.class.respond_to?(:log_arguments?) && !self.class.log_arguments?
+                     arguments.map(&Rollbar::Scrubbers.method(:scrub_value))
+                   else
+                     arguments
+                   end
+
+            job_data = {
+              :job => self.class.name,
+              :use_exception_level_filters => true,
+              :arguments => args
+            }
+
+            # job_id isn't present when this is a mailer class.
+            job_data[:job_id] = job_id if defined?(job_id)
+
+            Rollbar.error(exception, job_data)
+            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/plugins/sidekiq.rb

@@ -12,7 +12,7 @@ Rollbar.plugins.define('sidekiq >= 3') do
         chain.add Rollbar::Sidekiq::ResetScope
       end
 
-      config.error_handlers << proc do |e, context|
+      config.error_handlers << proc do |e, context, _sidekiq_config = nil|
         Rollbar::Sidekiq.handle_exception(context, e)
       end
     end

data/lib/rollbar/version.rb

@@ -1,3 +1,3 @@
 module Rollbar
-  VERSION = '3.4.1'.freeze
+  VERSION = '3.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollbar
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.5.0
 platform: ruby
 authors:
 - Rollbar, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-12 00:00:00.000000000 Z
+date: 2024-01-04 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
@@ -41,12 +41,6 @@ files:
 - data/rollbar.snippet.js
 - docs/configuration.md
 - docs/plugins.md
-- gemfiles/rails30.gemfile
-- gemfiles/rails31.gemfile
-- gemfiles/rails32.gemfile
-- gemfiles/rails40.gemfile
-- gemfiles/rails41.gemfile
-- gemfiles/rails42.gemfile
 - gemfiles/rails50.gemfile
 - gemfiles/rails51.gemfile
 - gemfiles/rails52.gemfile
@@ -166,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Reports exceptions to Rollbar

data/gemfiles/rails30.gemfile

@@ -1,50 +0,0 @@
-require 'rubygems/version'
-
-source 'https://rubygems.org'
-
-gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
-gem 'hitimes', '< 1.2.2'
-gem 'jruby-openssl', :platform => :jruby
-gem 'mixlib-shellout', '<= 2.0.0'
-gem 'net-ssh', '<= 3.1.1'
-gem 'public_suffix', '<= 2.0.5'
-gem 'rails', '~> 3.0.20'
-gem 'rake', '< 11'
-gem 'rspec-rails', '>= 2.14.0'
-gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
-
-if RUBY_VERSION < '2.2.2'
-  gem 'sidekiq', '~> 2.13.0'
-else
-  gem 'sidekiq', '>= 2.13.0'
-end
-
-platforms :rbx do
-  gem 'minitest'
-  gem 'racc'
-  gem 'rubinius-developer_tools'
-  gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
-  gem 'rubysl-test-unit'
-end
-
-gem 'capistrano', :require => false
-gem 'rexml', '<= 3.2.4'
-gem 'shoryuken'
-gem 'simplecov', '<= 0.17.1'
-gem 'sucker_punch', '~> 2.0'
-
-gem 'database_cleaner', '~> 1.0.0'
-gem 'delayed_job', :require => false
-gem 'genspec', '>= 0.2.8'
-gem 'girl_friday', '>= 0.11.1'
-gem 'redis', '<= 3.3.5'
-gem 'redis-namespace', '<= 1.5.0'
-gem 'rspec-command'
-gem 'sinatra'
-
-gem 'webmock', :require => false
-
-gem 'aws-sdk-sqs'
-gem 'resque', '< 2.0.0'
-
-gemspec :path => '../'

data/gemfiles/rails31.gemfile

@@ -1,50 +0,0 @@
-require 'rubygems/version'
-
-source 'https://rubygems.org'
-
-gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
-gem 'jruby-openssl', :platform => :jruby
-gem 'mixlib-shellout', '<= 2.0.0'
-gem 'net-ssh', '<= 3.1.1'
-gem 'public_suffix', '<= 2.0.5'
-gem 'rails', '~> 3.1.12'
-gem 'rake', '< 11'
-gem 'rspec-rails', '~> 3.4'
-gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
-
-if RUBY_VERSION < '2.2.2'
-  gem 'sidekiq', '~> 2.13.0'
-else
-  gem 'sidekiq', '>= 2.13.0'
-end
-
-platforms :rbx do
-  gem 'minitest'
-  gem 'racc'
-  gem 'rubinius-developer_tools'
-  gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
-  gem 'rubysl-test-unit'
-end
-
-gem 'capistrano', :require => false
-gem 'rexml', '<= 3.2.4'
-gem 'shoryuken'
-gem 'simplecov', '<= 0.17.1'
-gem 'sucker_punch'
-
-gem 'database_cleaner'
-gem 'delayed_job', :require => false
-gem 'generator_spec'
-gem 'girl_friday'
-gem 'rack-cache', '<= 1.9.0'
-gem 'redis', '<= 3.3.5'
-gem 'redis-namespace', '<= 1.5.0'
-gem 'rspec-command'
-gem 'sinatra'
-
-gem 'webmock', :require => false
-
-gem 'aws-sdk-sqs'
-gem 'resque', '< 2.0.0'
-
-gemspec :path => '../'

data/gemfiles/rails32.gemfile

@@ -1,52 +0,0 @@
-require 'rubygems/version'
-
-source 'https://rubygems.org'
-
-gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
-gem 'jruby-openssl', :platform => :jruby
-gem 'mixlib-shellout', '<= 2.0.0'
-gem 'net-ssh', '<= 3.1.1'
-gem 'public_suffix', '<= 2.0.5'
-gem 'rails', '~> 3.2.22'
-gem 'rake'
-gem 'rspec-rails', '~> 3.4'
-gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
-# Please see https://github.com/rspec/rspec-rails/issues/1273
-gem 'test-unit'
-
-if RUBY_VERSION < '2.2.2'
-  gem 'sidekiq', '~> 2.13.0'
-else
-  gem 'sidekiq', '>= 2.13.0'
-end
-
-platforms :rbx do
-  gem 'minitest'
-  gem 'racc'
-  gem 'rubinius-developer_tools'
-  gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
-  gem 'rubysl-test-unit'
-end
-
-gem 'capistrano', :require => false
-gem 'rexml', '<= 3.2.4'
-gem 'shoryuken'
-gem 'simplecov', '<= 0.17.1'
-gem 'sucker_punch', '~> 2.0'
-
-gem 'delayed_job', :require => false
-gem 'redis', '<= 3.3.5'
-gem 'redis-namespace', '<= 1.5.0'
-gem 'sinatra'
-
-gem 'database_cleaner', '~> 1.0.0'
-gem 'generator_spec'
-gem 'girl_friday', '>= 0.11.1'
-gem 'rspec-command'
-
-gem 'webmock', :require => false
-
-gem 'aws-sdk-sqs'
-gem 'resque', '< 2.0.0'
-
-gemspec :path => '../'

data/gemfiles/rails40.gemfile

@@ -1,52 +0,0 @@
-require 'rubygems/version'
-
-source 'https://rubygems.org'
-
-gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
-gem 'jruby-openssl', :platform => :jruby
-gem 'mixlib-shellout', '<= 2.0.0'
-gem 'net-ssh', '<= 3.1.1'
-gem 'public_suffix', '<= 2.0.5'
-gem 'rails', '~> 4.0.13'
-gem 'rake'
-gem 'rspec-rails', '~> 3.4'
-gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
-# Please see https://github.com/rspec/rspec-rails/issues/1273
-gem 'test-unit'
-
-if RUBY_VERSION < '2.2.2'
-  gem 'sidekiq', '~> 2.13.0'
-else
-  gem 'sidekiq', '>= 2.13.0'
-end
-
-platforms :rbx do
-  gem 'minitest'
-  gem 'racc'
-  gem 'rubinius-developer_tools'
-  gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
-  gem 'rubysl-test-unit'
-end
-
-gem 'capistrano', :require => false
-gem 'json', '~> 2.0'
-gem 'shoryuken'
-gem 'simplecov', '<= 0.17.1'
-gem 'sucker_punch', '~> 2.0'
-
-gem 'delayed_job', :require => false
-gem 'redis', '<= 3.3.5'
-gem 'redis-namespace', '<= 1.5.0'
-gem 'resque'
-gem 'sinatra'
-
-gem 'database_cleaner', '~> 1.0.0'
-gem 'generator_spec'
-gem 'girl_friday', '>= 0.11.1'
-gem 'rspec-command'
-
-gem 'webmock', :require => false
-
-gem 'aws-sdk-sqs'
-
-gemspec :path => '../'

data/gemfiles/rails41.gemfile

@@ -1,48 +0,0 @@
-require 'rubygems/version'
-
-source 'https://rubygems.org'
-
-gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
-gem 'jruby-openssl', :platform => :jruby
-gem 'mixlib-shellout', '<= 2.0.0'
-gem 'net-ssh', '<= 3.1.1'
-gem 'public_suffix', '<= 2.0.5'
-gem 'rails', '~> 4.1.16'
-gem 'rake'
-gem 'rspec-rails', '~> 3.4'
-gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
-
-if RUBY_VERSION < '2.2.2'
-  gem 'sidekiq', '~> 2.13.0'
-else
-  gem 'sidekiq', '>= 2.13.0'
-end
-
-platforms :rbx do
-  gem 'minitest'
-  gem 'racc'
-  gem 'rubinius-developer_tools'
-  gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
-end
-
-gem 'capistrano', :require => false
-gem 'shoryuken'
-gem 'simplecov', '<= 0.17.1'
-gem 'sucker_punch', '~> 2.0'
-
-gem 'delayed_job', :require => false
-gem 'redis', '<= 3.3.5'
-gem 'redis-namespace', '<= 1.5.0'
-gem 'resque'
-gem 'sinatra'
-
-gem 'database_cleaner', '~> 1.0.0'
-gem 'generator_spec'
-gem 'girl_friday', '>= 0.11.1'
-gem 'rspec-command'
-
-gem 'webmock', :require => false
-
-gem 'aws-sdk-sqs'
-
-gemspec :path => '../'

data/gemfiles/rails42.gemfile

@@ -1,50 +0,0 @@
-require 'rubygems/version'
-
-source 'https://rubygems.org'
-
-gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
-gem 'jruby-openssl', :platform => :jruby
-gem 'net-ssh', '<= 3.1.1'
-gem 'public_suffix', '<= 2.0.5'
-gem 'rails', '~> 4.2.11'
-gem 'rake'
-gem 'rspec-rails', '~> 3.4'
-gem 'sqlite3', '< 1.4.0', :platform => [:ruby, :mswin, :mingw]
-
-platforms :rbx do
-  gem 'minitest'
-  gem 'racc'
-  gem 'rubinius-developer_tools'
-  gem 'rubysl', '~> 2.0' unless RUBY_VERSION.start_with?('1')
-end
-
-gem 'json', '1.8.6' if RUBY_VERSION < '2.0.0'
-
-if RUBY_VERSION < '2.2.2'
-  gem 'sidekiq', '~> 2.13.0'
-else
-  gem 'sidekiq', '>= 2.13.0'
-end
-
-gem 'capistrano', :require => false
-gem 'shoryuken'
-
-gem 'database_cleaner', '~> 1.0.0'
-gem 'delayed_job', :require => false
-gem 'generator_spec'
-gem 'girl_friday', '>= 0.11.1'
-gem 'loofah', '~>2.19.1'
-gem 'redis', '<= 3.3.5'
-gem 'resque'
-gem 'rspec-command'
-gem 'sinatra'
-
-gem 'nokogiri', '~> 1.6.0' if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('2.0')
-
-gem 'simplecov', '<= 0.17.1'
-gem 'sucker_punch', '~> 2.0'
-gem 'webmock', :require => false
-
-gem 'aws-sdk-sqs'
-
-gemspec :path => '../'