Add standard 'unsafe' fixes

mperham · mperham · commit 7b22a5e55ef5 · 2025-01-20T10:27:02.000-08:00
diff --git a/lib/honeybadger/backtrace.rb b/lib/honeybadger/backtrace.rb
@@ -104,7 +104,7 @@ def get_source(file, number, radius = 2)
               f.gets
               l += 1
             }
-            return Hash[duration.times.map { (line = f.gets) ? [(l += 1), line] : nil }.compact]
+            return duration.times.map { (line = f.gets) ? [(l += 1), line] : nil }.compact.to_h
           end
         else
           {}
diff --git a/lib/honeybadger/breadcrumbs/active_support.rb b/lib/honeybadger/breadcrumbs/active_support.rb
@@ -19,7 +19,7 @@ def self.default_notifications
             transform: lambda do |data|
               if data[:sql]
                 connection = data.delete(:connection)
-                adapter = (connection && connection.adapter_name.downcase) || active_record_connection_db_config[:adapter]
+                adapter = connection&.adapter_name&.downcase || active_record_connection_db_config[:adapter]
                 data[:sql] = Util::SQL.obfuscate(data[:sql], adapter)
               end
               data
diff --git a/lib/honeybadger/cli/heroku.rb b/lib/honeybadger/cli/heroku.rb
@@ -78,7 +78,7 @@ def detect_heroku_app(prompt_on_default = true)
               apps.values.first
             else
               say "We detected a Heroku app named #{apps.values.first}. Do you want to load the config? (y/yes or n/no)"
-              if STDIN.gets.chomp =~ /(y|yes)/i
+              if $stdin.gets.chomp =~ /(y|yes)/i
                 apps.values.first
               end
             end
@@ -87,7 +87,7 @@ def detect_heroku_app(prompt_on_default = true)
             apps.each_with_index { |a, i| say "\s\s#{i + 1}. #{a[1]}" }
             say "\s\s#{apps.size + 1}. Use default"
             say "Please select an option (1-#{apps.size + 1}):"
-            apps.values[STDIN.gets.chomp.to_i - 1]
+            apps.values[$stdin.gets.chomp.to_i - 1]
           end
         end
       end
@@ -107,7 +107,7 @@ def read_heroku_env(app = nil)
         cmd << "--app #{app}" if app
         output = run(cmd.join("\s"))
         return false unless $?.to_i == 0
-        Hash[output.scan(/(HONEYBADGER_[^:]+):\s*(\S.*)\s*$/)]
+        output.scan(/(HONEYBADGER_[^:]+):\s*(\S.*)\s*$/).to_h
       end
 
       def set_env_from_heroku(app = nil)
diff --git a/lib/honeybadger/cli/test.rb b/lib/honeybadger/cli/test.rb
@@ -12,7 +12,7 @@ class Test
         exception_name = ENV["EXCEPTION"] || "HoneybadgerTestingException"
         Object.const_get(exception_name)
       rescue
-        Object.const_set(exception_name, Class.new(Exception))
+        Object.const_set(exception_name, Class.new(RuntimeError))
       end.new('Testing honeybadger via "honeybadger test". If you can see this, it works.')
 
       class TestBackend
@@ -90,7 +90,7 @@ def test_exception_class
         exception_name = ENV["EXCEPTION"] || "HoneybadgerTestingException"
         Object.const_get(exception_name)
       rescue
-        Object.const_set(exception_name, Class.new(Exception))
+        Object.const_set(exception_name, Class.new(RuntimeError))
       end
 
       def run_standalone_test
diff --git a/lib/honeybadger/config.rb b/lib/honeybadger/config.rb
@@ -10,7 +10,6 @@
 require "honeybadger/config/defaults"
 require "honeybadger/util/http"
 require "honeybadger/util/revision"
-require "honeybadger/logging"
 
 module Honeybadger
   # @api private
diff --git a/lib/honeybadger/config/defaults.rb b/lib/honeybadger/config/defaults.rb
@@ -291,7 +291,7 @@ class Boolean; end
       },
       "exceptions.rescue_rake": {
         description: "Enable reporting exceptions in rake tasks.",
-        default: !STDOUT.tty?,
+        default: !$stdout.tty?,
         type: Boolean
       },
       "exceptions.notify_at_exit": {
@@ -519,6 +519,6 @@ class Boolean; end
       }
     }.freeze
 
-    DEFAULTS = Hash[OPTIONS.map { |k, v| [k, v[:default]] }].freeze
+    DEFAULTS = OPTIONS.map { |k, v| [k, v[:default]] }.to_h.freeze
   end
 end
diff --git a/lib/honeybadger/config/env.rb b/lib/honeybadger/config/env.rb
@@ -4,7 +4,7 @@ module Honeybadger
   class Config
     module Env
       CONFIG_KEY = /\AHONEYBADGER_(.+)\Z/.freeze
-      CONFIG_MAPPING = Hash[DEFAULTS.keys.map { |k| [k.to_s.upcase.gsub(KEY_REPLACEMENT, "_"), k] }].freeze
+      CONFIG_MAPPING = DEFAULTS.keys.map { |k| [k.to_s.upcase.gsub(KEY_REPLACEMENT, "_"), k] }.to_h.freeze
       ARRAY_VALUES = Regexp.new('\s*,\s*').freeze
       IGNORED_TYPES = Set[Hash]
 
diff --git a/lib/honeybadger/config/ruby.rb b/lib/honeybadger/config/ruby.rb
@@ -46,7 +46,7 @@ def mash?(method)
       end
 
       def setter?(method_name)
-        return false unless method_name.to_s =~ /=\z/
+        return false unless method_name.to_s.end_with?("=")
         key = key(method_name)
         KEYS.any? { |k| k == key }
       end
diff --git a/lib/honeybadger/events_worker.rb b/lib/honeybadger/events_worker.rb
@@ -84,7 +84,7 @@ def shutdown(force = false)
     # Blocks until queue is processed up to this point in time.
     def flush
       mutex.synchronize do
-        if thread && thread.alive?
+        if thread&.alive?
           queue.push(FLUSH)
           queue.push(marker)
           marker.wait(mutex)
diff --git a/lib/honeybadger/instrumentation.rb b/lib/honeybadger/instrumentation.rb
@@ -143,12 +143,12 @@ def gauge(name, *args)
 
     # @api private
     def extract_attributes(args)
-      args.select { |a| a.is_a?(Hash) }.first || {}
+      args.find { |a| a.is_a?(Hash) } || {}
     end
 
     # @api private
     def extract_callable(args)
-      args.select { |a| a.respond_to?(:call) }.first
+      args.find { |a| a.respond_to?(:call) }
     end
   end
 end
diff --git a/lib/honeybadger/logging.rb b/lib/honeybadger/logging.rb
@@ -116,15 +116,15 @@ def format_message(msg)
     end
 
     class ConfigLogger < StandardLogger
-      LOCATE_CALLER_LOCATION = Regexp.new("#{Regexp.escape(__FILE__)}").freeze
+      LOCATE_CALLER_LOCATION = Regexp.new(Regexp.escape(__FILE__).to_s).freeze
       CALLER_LOCATION = Regexp.new("#{Regexp.escape(File.expand_path("../../../", __FILE__))}/(.*)").freeze
 
       INFO_SUPPLEMENT = " level=%s pid=%s".freeze
       DEBUG_SUPPLEMENT = " at=%s".freeze
 
       def initialize(config, logger = Logger.new(nil))
         @config = config
-        @tty = STDOUT.tty?
+        @tty = $stdout.tty?
         @tty_level = @config.log_level(:"logging.tty_level")
         super(logger)
       end
@@ -169,7 +169,7 @@ def supplement(msg, severity)
       end
 
       def caller_location
-        if caller && caller.find { |l| l !~ LOCATE_CALLER_LOCATION && l =~ CALLER_LOCATION }
+        if caller&.find { |l| l !~ LOCATE_CALLER_LOCATION && l =~ CALLER_LOCATION }
           Regexp.last_match(1)
         end
       end
diff --git a/lib/honeybadger/metrics_worker.rb b/lib/honeybadger/metrics_worker.rb
@@ -59,7 +59,7 @@ def shutdown(force = false)
     # Blocks until queue is processed up to this point in time.
     def flush
       mutex.synchronize do
-        if thread && thread.alive?
+        if thread&.alive?
           queue.push(marker)
           marker.wait(mutex)
         end
diff --git a/lib/honeybadger/notice.rb b/lib/honeybadger/notice.rb
@@ -310,8 +310,7 @@ def ignore_by_origin?
     end
 
     def ignore_by_callbacks?
-      config.exception_filter &&
-        config.exception_filter.call(self)
+      config.exception_filter&.call(self)
     end
 
     # Gets a property named "attribute" of an exception, either from
@@ -489,7 +488,7 @@ def local_variables_from_exception(exception, config)
           end
         }
 
-      result_hash = Hash[results]
+      result_hash = results.to_h
       request_sanitizer.sanitize(result_hash)
     end
 
@@ -532,11 +531,11 @@ def unwrap_exception(exception)
     # Returns the Exception cause.
     def exception_cause(exception)
       e = exception
-      if e.respond_to?(:cause) && e.cause && e.cause.is_a?(Exception)
+      if e.respond_to?(:cause) && e.cause&.is_a?(Exception)
         e.cause
-      elsif e.respond_to?(:original_exception) && e.original_exception && e.original_exception.is_a?(Exception)
+      elsif e.respond_to?(:original_exception) && e.original_exception&.is_a?(Exception)
         e.original_exception
-      elsif e.respond_to?(:continued_exception) && e.continued_exception && e.continued_exception.is_a?(Exception)
+      elsif e.respond_to?(:continued_exception) && e.continued_exception&.is_a?(Exception)
         e.continued_exception
       end
     end
diff --git a/lib/honeybadger/plugins/breadcrumbs.rb b/lib/honeybadger/plugins/breadcrumbs.rb
@@ -73,7 +73,7 @@ class RailsBreadcrumbs
       # @option notification_config [Proc] :transform A proc that accepts the data payload. The return value will replace the current data hash (optional)
       #
       def self.send_breadcrumb_notification(name, duration, notification_config, data = {})
-        return if notification_config[:exclude_when] && notification_config[:exclude_when].call(data)
+        return if notification_config[:exclude_when]&.call(data)
 
         message =
           case (m = notification_config[:message])
diff --git a/lib/honeybadger/plugins/delayed_job/plugin.rb b/lib/honeybadger/plugins/delayed_job/plugin.rb
@@ -9,7 +9,7 @@ class Plugin < ::Delayed::Plugin
           lifecycle.around(:invoke_job) do |job, &block|
             begin
               begin
-                if job.payload_object.class.name == "ActiveJob::QueueAdapters::DelayedJobAdapter::JobWrapper"
+                if job.payload_object.instance_of?(::ActiveJob::QueueAdapters::DelayedJobAdapter::JobWrapper)
                   # buildin support for Rails 4.2 ActiveJob
                   component = job.payload_object.job_data["job_class"]
                   action = "perform"
diff --git a/lib/honeybadger/plugins/sidekiq.rb b/lib/honeybadger/plugins/sidekiq.rb
@@ -37,7 +37,8 @@ def call(worker, msg, queue, &block)
             status = "failure"
             raise
           ensure
-            context.merge!(duration: duration, status: status)
+            context[:duration] = duration
+            context[:status] = status
             if Honeybadger.config.load_plugin_insights_events?(:sidekiq)
               Honeybadger.event("perform.sidekiq", context)
             end
diff --git a/lib/honeybadger/singleton.rb b/lib/honeybadger/singleton.rb
@@ -68,7 +68,7 @@ def notify(exception_or_opts = nil, opts = {}, **kwargs)
 
   # @api private
   def load_plugins!
-    Dir[File.expand_path("../plugins/*.rb", __FILE__)].each do |plugin|
+    Dir[File.expand_path("../plugins/*.rb", __FILE__)].sort.each do |plugin|
       require plugin
     end
     Plugin.load!(config)
diff --git a/lib/honeybadger/util/http.rb b/lib/honeybadger/util/http.rb
@@ -66,7 +66,7 @@ def http_connection
       def http_headers(headers = nil)
         {}.tap do |hash|
           hash.merge!(HEADERS)
-          hash.merge!({"X-API-Key" => config[:api_key].to_s})
+          hash["X-API-Key"] = config[:api_key].to_s
           hash.merge!(headers) if headers
         end
       end
diff --git a/lib/honeybadger/util/sanitizer.rb b/lib/honeybadger/util/sanitizer.rb
@@ -59,7 +59,7 @@ def sanitize(data, depth = 0, stack = nil, parents = [])
         return BASIC_OBJECT if basic_object?(data)
 
         if recursive?(data)
-          return RECURSION if stack && stack.include?(data.object_id)
+          return RECURSION if stack&.include?(data.object_id)
 
           stack = stack ? stack.dup : Set.new
           stack << data.object_id
diff --git a/lib/honeybadger/worker.rb b/lib/honeybadger/worker.rb
@@ -76,7 +76,7 @@ def shutdown(force = false)
     # Blocks until queue is processed up to this point in time.
     def flush
       mutex.synchronize do
-        if thread && thread.alive?
+        if thread&.alive?
           queue.push(marker)
           marker.wait(mutex)
         end
diff --git a/spec/fixtures/Rakefile b/spec/fixtures/Rakefile
@@ -19,11 +19,11 @@ end
 
 def stub_tty_output(value)
   if value
-    def STDOUT.tty?
+    def $stdout.tty?
       true
     end
   else
-    def STDOUT.tty?
+    def $stdout.tty?
       false
     end
   end
diff --git a/spec/fixtures/ruby_custom.rb b/spec/fixtures/ruby_custom.rb
@@ -4,7 +4,7 @@
   api_key: "asdf",
   backend: "debug",
   debug: true,
-  logger: Logger.new(STDOUT)
+  logger: Logger.new($stdout)
 })
 
 agent.notify(error_class: "CustomHoneybadgerException", error_message: "Test message")
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -19,7 +19,7 @@
   nil
 end
 
-Dir[File.expand_path("../support/**/*.rb", __FILE__)].each { |f| require f }
+Dir[File.expand_path("../support/**/*.rb", __FILE__)].sort.each { |f| require f }
 
 TMP_DIR = Pathname.new(File.expand_path("../../tmp", __FILE__))
 FIXTURES_PATH = Pathname.new(File.expand_path("../fixtures/", __FILE__))
diff --git a/spec/support/backtraced_exception.rb b/spec/support/backtraced_exception.rb
@@ -1,4 +1,4 @@
-class BacktracedException < Exception
+class BacktracedException < RuntimeError
   attr_accessor :backtrace
   def initialize(opts)
     @backtrace = opts[:backtrace]
diff --git a/spec/unit/honeybadger/events_worker_spec.rb b/spec/unit/honeybadger/events_worker_spec.rb
@@ -1,5 +1,4 @@
 require "timecop"
-require "thread"
 
 require "honeybadger/events_worker"
 require "honeybadger/config"
diff --git a/spec/unit/honeybadger/logging_spec.rb b/spec/unit/honeybadger/logging_spec.rb
@@ -63,7 +63,7 @@
     it { should respond_to severity }
   end
 
-  context "when not attached to terminal", unless: STDOUT.tty? do
+  context "when not attached to terminal", unless: $stdout.tty? do
     LOG_SEVERITIES.each do |severity|
       it "delegates ##{severity} to configured logger" do
         # Debug is logged at the info level.
@@ -74,7 +74,7 @@
     end
   end
 
-  context "when attached to terminal", if: STDOUT.tty? do
+  context "when attached to terminal", if: $stdout.tty? do
     [:debug, :info, :warn].each do |severity|
       it "suppresses ##{severity} from configured logger" do
         expect(logger).not_to receive(:add)
diff --git a/spec/unit/honeybadger/metrics_worker_spec.rb b/spec/unit/honeybadger/metrics_worker_spec.rb
@@ -1,5 +1,4 @@
 require "timecop"
-require "thread"
 
 require "honeybadger/metrics_worker"
 require "honeybadger/config"
diff --git a/spec/unit/honeybadger/plugins/local_variables_spec.rb b/spec/unit/honeybadger/plugins/local_variables_spec.rb
@@ -56,7 +56,7 @@
       describe Honeybadger::Plugins::LocalVariables::ExceptionExtension do
         subject do
           # Test in isolation rather than installing the plugin globally.
-          Class.new(Exception) do |klass|
+          Class.new(RuntimeError) do |klass|
             klass.send(:include, Honeybadger::Plugins::LocalVariables::ExceptionExtension)
           end.new
         end
diff --git a/spec/unit/honeybadger/rack/error_notifier_spec.rb b/spec/unit/honeybadger/rack/error_notifier_spec.rb
@@ -1,6 +1,6 @@
 require "honeybadger/rack/error_notifier"
 
-class BacktracedException < Exception
+class BacktracedException < RuntimeError
   attr_accessor :backtrace
   def initialize(opts)
     @backtrace = opts[:backtrace]
diff --git a/spec/unit/honeybadger/worker_spec.rb b/spec/unit/honeybadger/worker_spec.rb
@@ -1,5 +1,4 @@
 require "timecop"
-require "thread"
 
 require "honeybadger/worker"
 require "honeybadger/config"
diff --git a/tools/profile.rb b/tools/profile.rb
@@ -5,7 +5,7 @@
   RubyProf.start and Honeybadger::Agent.at_exit do
     result = RubyProf.stop
     printer = RubyProf::FlatPrinter.new(result)
-    printer.print(STDOUT, {})
+    printer.print($stdout, {})
   end
 
   1000.times do

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ def get_source(file, number, radius = 2)`
`104`	`104`	`f.gets`
`105`	`105`	`l += 1`
`106`	`106`	`}`
`107`		`- return Hash[duration.times.map { (line = f.gets) ? [(l += 1), line] : nil }.compact]`
	`107`	`+ return duration.times.map { (line = f.gets) ? [(l += 1), line] : nil }.compact.to_h`
`108`	`108`	`end`
`109`	`109`	`else`
`110`	`110`	`{}`