rollbar 3.2.0 → 3.3.0

data/lib/rollbar/plugins/goalie.rb

@@ -11,29 +11,40 @@ Rollbar.plugins.define('goalie') do
           begin
             controller = env['action_controller.instance']
             request_data = begin
-                             controller.rollbar_request_data
-                           rescue StandardError
-                             nil
-                           end
+              controller.rollbar_request_data
+            rescue StandardError
+              nil
+            end
             person_data = begin
-                            controller.rollbar_person_data
-                          rescue StandardError
-                            nil
-                          end
-            exception_data = Rollbar.scope(:request => request_data, :person => person_data).error(exception, :use_exception_level_filters => true)
+              controller.rollbar_person_data
+            rescue StandardError
+              nil
+            end
+            exception_data = Rollbar.scope(
+              :request => request_data,
+              :person => person_data
+            ).error(exception, :use_exception_level_filters => true)
           rescue StandardError => e
-            Rollbar.log_warning "[Rollbar] Exception while reporting exception to Rollbar: #{e}"
+            message = "[Rollbar] Exception while reporting exception to Rollbar: #{e}"
+            Rollbar.log_warning(message)
           end
 
           # if an exception was reported, save uuid in the env
           # so it can be displayed to the user on the error page
-          if exception_data.is_a?(Hash)
+          case exception_data
+          when Hash
             env['rollbar.exception_uuid'] = exception_data[:uuid]
-            Rollbar.log_info "[Rollbar] Exception uuid saved in env: #{exception_data[:uuid]}"
-          elsif exception_data == 'disabled'
-            Rollbar.log_info '[Rollbar] Exception not reported because Rollbar is disabled'
-          elsif exception_data == 'ignored'
-            Rollbar.log_info '[Rollbar] Exception not reported because it was ignored'
+            Rollbar.log_info(
+              "[Rollbar] Exception uuid saved in env: #{exception_data[:uuid]}"
+            )
+          when 'disabled'
+            Rollbar.log_info(
+              '[Rollbar] Exception not reported because Rollbar is disabled'
+            )
+          when 'ignored'
+            Rollbar.log_info(
+              '[Rollbar] Exception not reported because it was ignored'
+            )
           end
 
           # now continue as normal

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

@@ -7,30 +7,34 @@ module Rollbar
       include RequestDataExtractor
 
       def rollbar_person_data
-        (user = send(Rollbar.configuration.person_method)) unless Rollbar::Util.method_in_stack_twice(:rollbar_person_data, __FILE__)
+        user = nil
+        unless Rollbar::Util.method_in_stack_twice(:rollbar_person_data, __FILE__)
+          user = send(Rollbar.configuration.person_method)
+        end
+
         # include id, username, email if non-empty
         if user
           {
             :id => (begin
-                      user.send(Rollbar.configuration.person_id_method)
-                    rescue StandardError
-                      nil
-                    end),
+              user.send(Rollbar.configuration.person_id_method)
+            rescue StandardError
+              nil
+            end),
             :username => (begin
-                            user.send(Rollbar.configuration.person_username_method)
-                          rescue StandardError
-                            nil
-                          end),
+              user.send(Rollbar.configuration.person_username_method)
+            rescue StandardError
+              nil
+            end),
             :email => (begin
-                         user.send(Rollbar.configuration.person_email_method)
-                       rescue StandardError
-                         nil
-                       end)
+              user.send(Rollbar.configuration.person_email_method)
+            rescue StandardError
+              nil
+            end)
           }
         else
           {}
         end
-      rescue NoMethodError, NameError
+      rescue NameError
         {}
       end
 

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

@@ -11,7 +11,8 @@ module Rollbar
 
       app.config.middleware.insert_after ActionDispatch::ShowExceptions,
                                          Rollbar::Middleware::Rails::RollbarMiddleware
-      ActionDispatch::ShowExceptions.send(:include, Rollbar::Middleware::Rails::ShowExceptions)
+      ActionDispatch::ShowExceptions.send(:include,
+                                          Rollbar::Middleware::Rails::ShowExceptions)
     end
   end
 end

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

@@ -11,7 +11,8 @@ module Rollbar
 
       app.config.middleware.insert_after ActionDispatch::DebugExceptions,
                                          Rollbar::Middleware::Rails::RollbarMiddleware
-      ActionDispatch::DebugExceptions.send(:include, Rollbar::Middleware::Rails::ShowExceptions)
+      ActionDispatch::DebugExceptions.send(:include,
+                                           Rollbar::Middleware::Rails::ShowExceptions)
     end
   end
 end

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

@@ -16,9 +16,9 @@ module Rollbar
             config.framework = "Rails: #{::Rails::VERSION::STRING}"
             config.filepath ||= begin
               if ::Rails.application.class.respond_to?(:module_parent_name)
-                ::Rails.application.class.module_parent_name + '.rollbar'
+                "#{::Rails.application.class.module_parent_name}.rollbar"
               else
-                ::Rails.application.class.parent_name + '.rollbar'
+                "#{::Rails.application.class.parent_name}.rollbar"
               end
             end
           end

data/lib/rollbar/plugins/rails.rb

@@ -39,7 +39,8 @@ Rollbar.plugins.define('rails-rollbar.js') do
             end
 
             def after_secure_headers(&block)
-              Rollbar::Railtie.initializer('rollbar.js.frameworks.rails', :after => 'secure_headers.middleware', &block)
+              Rollbar::Railtie.initializer('rollbar.js.frameworks.rails',
+                                           :after => 'secure_headers.middleware', &block)
             end
 
             def plugin_execute_proc_body(plugin)
@@ -52,7 +53,8 @@ Rollbar.plugins.define('rails-rollbar.js') do
                       :options => Rollbar.configuration.js_options,
                       :enabled => Rollbar.configuration.js_enabled
                     }
-                    ::Rails.configuration.middleware.use(::Rollbar::Middleware::Js, config)
+                    ::Rails.configuration.middleware.use(::Rollbar::Middleware::Js,
+                                                         config)
                   end
                 end
               end
@@ -62,6 +64,7 @@ Rollbar.plugins.define('rails-rollbar.js') do
               begin
                 require 'secure_headers'
               rescue LoadError
+                # Skip loading
               end
 
               defined?(::SecureHeaders::Middleware)

data/lib/rollbar/plugins/rake.rb

@@ -40,7 +40,8 @@ Rollbar.plugins.define('rake') do
       end
 
       def self.skip_patch
-        warn('[Rollbar] Rollbar is disabled for Rake tasks since your Rake version is under 0.9.x. Please upgrade to 0.9.x or higher.')
+        warn('[Rollbar] Rollbar is disabled for Rake tasks since your Rake ' \
+          'version is under 0.9.x. Please upgrade to 0.9.x or higher.')
       end
 
       def self.patch?

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

@@ -5,12 +5,12 @@ module Rollbar
     PARAM_BLACKLIST = %w[backtrace error_backtrace error_message error_class].freeze
 
     class ResetScope
-      def call(_worker, msg, _queue)
+      def call(_worker, msg, _queue, &block)
         Rollbar.reset_notifier! # clears scope
 
         return yield unless Rollbar.configuration.sidekiq_use_scoped_block
 
-        Rollbar.scoped(Rollbar::Sidekiq.job_scope(msg)) { yield }
+        Rollbar.scoped(Rollbar::Sidekiq.job_scope(msg), &block)
       end
     end
 
@@ -57,13 +57,13 @@ module Rollbar
     end
 
     # see https://github.com/mperham/sidekiq/wiki/Middleware#server-middleware
-    def call(_worker, msg, _queue)
+    def call(_worker, msg, _queue, &block)
       Rollbar.reset_notifier! # clears scope
 
       return yield unless Rollbar.configuration.sidekiq_use_scoped_block
 
-      Rollbar.scoped(Rollbar::Sidekiq.job_scope(msg)) { yield }
-    rescue Exception => e
+      Rollbar.scoped(Rollbar::Sidekiq.job_scope(msg), &block)
+    rescue Exception => e # rubocop:disable Lint/RescueException
       Rollbar::Sidekiq.handle_exception(msg, e)
       raise
     end

data/lib/rollbar/plugins/thread.rb

@@ -9,6 +9,6 @@ Rollbar.plugins.define('thread') do
   end
 
   execute do
-    Thread.send(:prepend, Rollbar::ThreadPlugin) # rubocop:disable Lint/SendWithMixinArgument
+    Thread.send(:prepend, Rollbar::ThreadPlugin)
   end
 end

data/lib/rollbar/plugins/validations.rb

@@ -17,7 +17,9 @@ Rollbar.plugins.define('active_model') do
       module ActiveRecordExtension
         def report_validation_errors_to_rollbar
           errors.full_messages.each do |error|
-            Rollbar.log_info "[Rollbar] Reporting form validation error: #{error} for #{self}"
+            Rollbar.log_info(
+              "[Rollbar] Reporting form validation error: #{error} for #{self}"
+            )
             Rollbar.warning("Form Validation Error: #{error} for #{self}")
           end
         end

data/lib/rollbar/rake_tasks.rb

@@ -1,4 +1,3 @@
-
 namespace :rollbar do
   desc 'Verify your gem installation by sending a test message to Rollbar'
   task :test => [:environment] do

data/lib/rollbar/request_data_extractor.rb

@@ -19,10 +19,10 @@ module Rollbar
       else
         controller = env['action_controller.instance']
         person_data = begin
-                        controller.rollbar_person_data
-                      rescue StandardError
-                        {}
-                      end
+          controller.rollbar_person_data
+        rescue StandardError
+          {}
+        end
       end
 
       person_data
@@ -34,7 +34,8 @@ module Rollbar
 
       get_params = scrub_params(rollbar_get_params(rack_req), sensitive_params)
       post_params = scrub_params(rollbar_post_params(rack_req), sensitive_params)
-      raw_body_params = scrub_params(mergeable_raw_body_params(rack_req), sensitive_params)
+      raw_body_params = scrub_params(mergeable_raw_body_params(rack_req),
+                                     sensitive_params)
       cookies = scrub_params(rollbar_request_cookies(rack_req), sensitive_params)
       session = scrub_params(rollbar_request_session(env), sensitive_params)
       route_params = scrub_params(rollbar_route_params(env), sensitive_params)
@@ -54,7 +55,10 @@ module Rollbar
         :method => rollbar_request_method(env)
       }
 
-      data[:request_id] = env['action_dispatch.request_id'] if env['action_dispatch.request_id']
+      if env['action_dispatch.request_id']
+        data[:request_id] =
+          env['action_dispatch.request_id']
+      end
 
       data
     end
@@ -87,9 +91,10 @@ module Rollbar
     def mergeable_raw_body_params(rack_req)
       raw_body_params = rollbar_raw_body_params(rack_req)
 
-      if raw_body_params.is_a?(Hash)
+      case raw_body_params
+      when Hash
         raw_body_params
-      elsif raw_body_params.is_a?(Array)
+      when Array
         { 'body.multi' => raw_body_params }
       else
         { 'body.value' => raw_body_params }
@@ -109,13 +114,17 @@ module Rollbar
           { name => Rollbar::Scrubbers.scrub_value(env[header]) }
         elsif name == 'X-Forwarded-For' && !Rollbar.configuration.collect_user_ip
           {}
-        elsif name == 'X-Forwarded-For' && Rollbar.configuration.collect_user_ip && Rollbar.configuration.anonymize_user_ip
+        elsif name == 'X-Forwarded-For' &&
+              Rollbar.configuration.collect_user_ip &&
+              Rollbar.configuration.anonymize_user_ip
           ips = env[header].sub(' ', '').split(',')
           ips = ips.map { |ip| Rollbar::Util::IPAnonymizer.anonymize_ip(ip) }
           { name => ips.join(', ') }
         elsif name == 'X-Real-Ip' && !Rollbar.configuration.collect_user_ip
           {}
-        elsif name == 'X-Real-Ip' && Rollbar.configuration.collect_user_ip && Rollbar.configuration.anonymize_user_ip
+        elsif name == 'X-Real-Ip' &&
+              Rollbar.configuration.collect_user_ip &&
+              Rollbar.configuration.anonymize_user_ip
           { name => Rollbar::Util::IPAnonymizer.anonymize_ip(env[header]) }
         else
           { name => env[header] }
@@ -131,16 +140,15 @@ module Rollbar
       host = host.split(',').first.strip unless host.empty?
 
       path = env['ORIGINAL_FULLPATH'] || env['REQUEST_URI']
-      path ||= "#{env['SCRIPT_NAME']}#{env['PATH_INFO']}#{"?#{env['QUERY_STRING']}" unless env['QUERY_STRING'].to_s.empty?}"
-      unless path.nil? || path.empty?
-        path = '/' + path.to_s if path.to_s.slice(0, 1) != '/'
-      end
+      query = env['QUERY_STRING'].to_s.empty? ? nil : "?#{env['QUERY_STRING']}"
+      path ||= "#{env['SCRIPT_NAME']}#{env['PATH_INFO']}#{query}"
+      path = "/#{path}" if !(path.nil? || path.empty?) && (path.to_s.slice(0, 1) != '/')
 
       port = env['HTTP_X_FORWARDED_PORT']
       if port && !(!scheme.nil? && scheme.casecmp('http').zero? && port.to_i == 80) && \
          !(!scheme.nil? && scheme.casecmp('https').zero? && port.to_i == 443) && \
          !(host.include? ':')
-        host = host + ':' + port
+        host = "#{host}:#{port}"
       end
 
       [scheme, '://', host, path].join
@@ -149,7 +157,11 @@ module Rollbar
     def rollbar_user_ip(env)
       return nil unless Rollbar.configuration.collect_user_ip
 
-      user_ip_string = (env['action_dispatch.remote_ip'] || env['HTTP_X_REAL_IP'] || x_forwarded_for_client(env['HTTP_X_FORWARDED_FOR']) || env['REMOTE_ADDR']).to_s
+      user_ip_string = (user_ip_at_configured_key(env) ||
+                        env['action_dispatch.remote_ip'] ||
+                        env['HTTP_X_REAL_IP'] ||
+                        x_forwarded_for_client(env['HTTP_X_FORWARDED_FOR']) ||
+                        env['REMOTE_ADDR']).to_s
 
       user_ip_string = Rollbar::Util::IPAnonymizer.anonymize_ip(user_ip_string)
 
@@ -158,6 +170,12 @@ module Rollbar
       nil
     end
 
+    def user_ip_at_configured_key(env)
+      return nil unless Rollbar.configuration.user_ip_rack_env_key
+
+      env[Rollbar.configuration.user_ip_rack_env_key]
+    end
+
     def x_forwarded_for_client(header_value)
       return nil unless header_value
 
@@ -248,7 +266,10 @@ module Rollbar
     end
 
     def sensitive_headers_list
-      return [] unless Rollbar.configuration.scrub_headers && Rollbar.configuration.scrub_headers.is_a?(Array)
+      unless Rollbar.configuration.scrub_headers &&
+             Rollbar.configuration.scrub_headers.is_a?(Array)
+        return []
+      end
 
       # Normalize into the expected matching format
       Rollbar.configuration.scrub_headers.map do |header|

data/lib/rollbar/rollbar_test.rb

@@ -27,7 +27,9 @@ module RollbarTest # :nodoc:
   end
 
   def self.error_message
-    'Test failed! You may have a configuration issue, or you could be using a gem that\'s blocking the test. Contact support@rollbar.com if you need help troubleshooting.'
+    'Test failed! You may have a configuration issue, or you could be using a ' \
+    'gem that\'s blocking the test. Contact support@rollbar.com if you need ' \
+    'help troubleshooting.'
   end
 
   def self.success_message

data/lib/rollbar/scrubbers/params.rb

@@ -10,7 +10,8 @@ module Rollbar
     # configuration array even if :scrub_all is true.
     class Params
       SKIPPED_CLASSES = [::Tempfile].freeze
-      ATTACHMENT_CLASSES = %w[ActionDispatch::Http::UploadedFile Rack::Multipart::UploadedFile].freeze
+      ATTACHMENT_CLASSES = %w[ActionDispatch::Http::UploadedFile
+                              Rack::Multipart::UploadedFile].freeze
       SCRUB_ALL = :scrub_all
 
       def self.call(*args)
@@ -21,7 +22,7 @@ module Rollbar
         params = options[:params]
         return {} unless params
 
-        @scrubbed_object_ids = {}
+        @scrubbed_objects = {}.compare_by_identity
 
         config = options[:config]
         extra_fields = options[:extra_fields]
@@ -52,16 +53,20 @@ module Rollbar
       end
 
       def build_whitelist_regex(whitelist)
-        fields = whitelist.find_all { |f| f.is_a?(String) || f.is_a?(Symbol) || f.is_a?(Regexp) }
+        fields = whitelist.find_all do |f|
+          f.is_a?(String) || f.is_a?(Symbol) || f.is_a?(Regexp)
+        end
         return unless fields.any?
 
-        Regexp.new(fields.map { |val| val.is_a?(Regexp) ? val : /\A#{Regexp.escape(val.to_s)}\z/ }.join('|'))
+        Regexp.new(fields.map do |val|
+                     val.is_a?(Regexp) ? val : /\A#{Regexp.escape(val.to_s)}\z/
+                   end.join('|'))
       end
 
       def scrub(params, options)
-        return params if @scrubbed_object_ids[params.object_id]
+        return params if @scrubbed_objects[params]
 
-        @scrubbed_object_ids[params.object_id] = true
+        @scrubbed_objects[params] = true
 
         fields_regex = options[:fields_regex]
         scrub_all = options[:scrub_all]
@@ -71,7 +76,8 @@ module Rollbar
 
         params.to_hash.inject({}) do |result, (key, value)|
           encoded_key = Rollbar::Encoding.encode(key).to_s
-          result[key] = if (fields_regex === encoded_key) && !(whitelist_regex === encoded_key)
+          result[key] = if (fields_regex === encoded_key) &&
+                           !(whitelist_regex === encoded_key)
                           scrub_value(value)
                         elsif value.is_a?(Hash)
                           scrub(value, options)

data/lib/rollbar/scrubbers/url.rb

@@ -23,7 +23,9 @@ module Rollbar
                options[:scrub_fields].include?(SCRUB_ALL),
                build_whitelist_regex(options[:whitelist] || []))
       rescue StandardError => e
-        Rollbar.logger.error("[Rollbar] There was an error scrubbing the url: #{e}, options: #{options.inspect}")
+        message = '[Rollbar] There was an error scrubbing the url: ' \
+          "#{e}, options: #{options.inspect}"
+        Rollbar.logger.error(message)
         url
       end
 
@@ -32,10 +34,11 @@ module Rollbar
       def ascii_encode(url)
         # In some cases non-ascii characters won't be properly encoded, so we do it here.
         #
-        # The standard encoders (the CGI and URI methods) are not reliable when the query string
-        # is already embedded in the full URL, but the inconsistencies are limited to issues
-        # with characters in the ascii range. (For example, the '#' if it appears in an unexpected place.)
-        # For escaping non-ascii, they are all OK, so we'll take care to skip the ascii chars.
+        # The standard encoders (the CGI and URI methods) are not reliable when
+        # the query string is already embedded in the full URL, but the inconsistencies
+        # are limited to issues with characters in the ascii range. (For example,
+        # the '#' if it appears in an unexpected place.) For escaping non-ascii,
+        # they are all OK, so we'll take care to skip the ascii chars.
 
         return url if url.ascii_only?
 
@@ -50,12 +53,15 @@ module Rollbar
         Regexp.new(fields.map { |val| /\A#{Regexp.escape(val.to_s)}\z/ }.join('|'))
       end
 
-      def filter(url, regex, scrub_user, scrub_password, randomize_scrub_length, scrub_all, whitelist)
+      def filter(url, regex, scrub_user, scrub_password, randomize_scrub_length,
+                 scrub_all, whitelist)
         uri = URI.parse(url)
 
         uri.user = filter_user(uri.user, scrub_user, randomize_scrub_length)
-        uri.password = filter_password(uri.password, scrub_password, randomize_scrub_length)
-        uri.query = filter_query(uri.query, regex, randomize_scrub_length, scrub_all, whitelist)
+        uri.password = filter_password(uri.password, scrub_password,
+                                       randomize_scrub_length)
+        uri.query = filter_query(uri.query, regex, randomize_scrub_length, scrub_all,
+                                 whitelist)
 
         uri.to_s
       end
@@ -73,7 +79,12 @@ module Rollbar
       end
 
       def filter_password(password, scrub_password, randomize_scrub_length)
-        scrub_password && password ? filtered_value(password, randomize_scrub_length) : password
+        if scrub_password && password
+          filtered_value(password,
+                         randomize_scrub_length)
+        else
+          password
+        end
       end
 
       def filter_query(query, regex, randomize_scrub_length, scrub_all, whitelist)
@@ -81,7 +92,8 @@ module Rollbar
 
         params = decode_www_form(query)
 
-        encode_www_form(filter_query_params(params, regex, randomize_scrub_length, scrub_all, whitelist))
+        encode_www_form(filter_query_params(params, regex, randomize_scrub_length,
+                                            scrub_all, whitelist))
       end
 
       def decode_www_form(query)
@@ -95,14 +107,22 @@ module Rollbar
       def restore_square_brackets(query)
         # We want this to rebuild array params like foo[]=1&foo[]=2
         #
-        # URI.encode_www_form follows the spec at https://url.spec.whatwg.org/#concept-urlencoded-serializer
+        # URI.encode_www_form follows the spec at
+        # https://url.spec.whatwg.org/#concept-urlencoded-serializer
         # and percent encodes square brackets. Here we change them back.
         query.gsub('%5B', '[').gsub('%5D', ']')
       end
 
-      def filter_query_params(params, regex, randomize_scrub_length, scrub_all, whitelist)
+      def filter_query_params(params, regex, randomize_scrub_length, scrub_all,
+                              whitelist)
         params.map do |key, value|
-          [key, filter_key?(key, regex, scrub_all, whitelist) ? filtered_value(value, randomize_scrub_length) : value]
+          [key,
+           if filter_key?(key, regex, scrub_all,
+                          whitelist)
+             filtered_value(value, randomize_scrub_length)
+           else
+             value
+           end]
         end
       end
 
@@ -115,10 +135,10 @@ module Rollbar
           random_filtered_value
         else
           '*' * (begin
-                   value.length
-                 rescue StandardError
-                   8
-                 end)
+            value.length
+          rescue StandardError
+            8
+          end)
         end
       end
 

data/lib/rollbar/scrubbers.rb

@@ -2,7 +2,7 @@ module Rollbar
   module Scrubbers
     module_function
 
-    def scrub_value(value)
+    def scrub_value(_value)
       if Rollbar.configuration.randomize_scrub_length
         random_filtered_value
       else

data/lib/rollbar/truncation/remove_any_key_strategy.rb

@@ -91,7 +91,10 @@ module Rollbar
       def extract_title(body)
         return body['message']['body'] if body['message'] && body['message']['body']
         return extract_title_from_trace(body['trace']) if body['trace']
-        return extract_title_from_trace(body['trace_chain'][0]) if body['trace_chain'] && body['trace_chain'][0]
+
+        return unless body['trace_chain'] && body['trace_chain'][0]
+
+        extract_title_from_trace(body['trace_chain'][0])
       end
 
       def extract_title_from_trace(trace)

data/lib/rollbar/truncation/remove_extra_strategy.rb

@@ -24,7 +24,9 @@ module Rollbar
       end
 
       def delete_trace_chain_extra(body)
-        body['trace_chain'][0].delete('extra') if body['trace_chain'] && body['trace_chain'][0]['extra']
+        return unless body['trace_chain'] && body['trace_chain'][0]['extra']
+
+        body['trace_chain'][0].delete('extra')
       end
 
       def delete_trace_extra(body)

data/lib/rollbar/util/hash.rb

@@ -2,9 +2,10 @@ module Rollbar
   module Util
     module Hash # :nodoc:
       def self.deep_stringify_keys(hash, seen = {})
-        return if seen[hash.object_id]
+        seen.compare_by_identity
+        return if seen[hash]
 
-        seen[hash.object_id] = true
+        seen[hash] = true
         replace_seen_children(hash, seen)
 
         hash.reduce({}) do |h, (key, value)|
@@ -19,10 +20,10 @@ module Rollbar
         when ::Hash
           send(meth, thing, seen)
         when Array
-          if seen[thing.object_id]
+          if seen[thing]
             thing
           else
-            seen[thing.object_id] = true
+            seen[thing] = true
             replace_seen_children(thing, seen)
             thing.map { |v| map_value(v, meth, seen) }
           end
@@ -34,12 +35,18 @@ module Rollbar
       def self.replace_seen_children(thing, seen)
         case thing
         when ::Hash
-          thing.keys.each do |key|
-            thing[key] = "removed circular reference: #{thing[key]}" if seen[thing[key].object_id]
+          thing.keys.each do |key| # rubocop:disable Style/HashEachMethods
+            if seen[thing[key]]
+              thing[key] =
+                "removed circular reference: #{thing[key]}"
+            end
           end
         when Array
           thing.each_with_index do |_, i|
-            thing[i] = "removed circular reference: #{thing[i]}" if seen[thing[i].object_id]
+            if seen[thing[i]]
+              thing[i] =
+                "removed circular reference: #{thing[i]}"
+            end
           end
         end
       end

data/lib/rollbar/util/ip_anonymizer.rb

@@ -24,7 +24,7 @@ module Rollbar
       def self.anonymize_ipv6(ip)
         ip_parts = ip.to_s.split ':'
 
-        ip_string = ip_parts[0..2].join(':') + ':0000:0000:0000:0000:0000'
+        ip_string = "#{ip_parts[0..2].join(':')}:0000:0000:0000:0000:0000"
 
         IPAddr.new(ip_string).to_s
       end