honeybadger 5.29.1 → 6.0.0

data/lib/honeybadger/util/sanitizer.rb

@@ -1,6 +1,6 @@
-require 'set'
+require "set"
 
-require 'honeybadger/conversions'
+require "honeybadger/conversions"
 
 module Honeybadger
   module Util
@@ -8,17 +8,17 @@ module Honeybadger
     # are based on Rails' HTTP parameter filter.
     class Sanitizer
       COOKIE_PAIRS = /[;,]\s?/
-      COOKIE_SEP = '='.freeze
-      COOKIE_PAIR_SEP = '; '.freeze
+      COOKIE_SEP = "=".freeze
+      COOKIE_PAIR_SEP = "; ".freeze
 
-      ENCODE_OPTS = { invalid: :replace, undef: :replace, replace: '?'.freeze }.freeze
+      ENCODE_OPTS = {invalid: :replace, undef: :replace, replace: "?".freeze}.freeze
 
-      BASIC_OBJECT = '#<BasicObject>'.freeze
-      DEPTH = '[DEPTH]'.freeze
-      FILTERED = '[FILTERED]'.freeze
-      RAISED = '[RAISED]'.freeze
-      RECURSION = '[RECURSION]'.freeze
-      TRUNCATED = '[TRUNCATED]'.freeze
+      BASIC_OBJECT = "#<BasicObject>".freeze
+      DEPTH = "[DEPTH]".freeze
+      FILTERED = "[FILTERED]".freeze
+      RAISED = "[RAISED]".freeze
+      RECURSION = "[RECURSION]".freeze
+      TRUNCATED = "[TRUNCATED]".freeze
 
       IMMUTABLE = [NilClass, FalseClass, TrueClass, Symbol, Numeric, Method].freeze
 
@@ -51,15 +51,15 @@ module Honeybadger
         @deep_regexps, @regexps = @regexps.partition { |r| r.to_s.include?('\\.'.freeze) }
         deep_strings, @strings = strings.partition { |s| s.include?('\\.'.freeze) }
 
-        @regexps << Regexp.new(strings.join('|'.freeze), true) unless strings.empty?
-        @deep_regexps << Regexp.new(deep_strings.join('|'.freeze), true) unless deep_strings.empty?
+        @regexps << Regexp.new(strings.join("|".freeze), true) unless strings.empty?
+        @deep_regexps << Regexp.new(deep_strings.join("|".freeze), true) unless deep_strings.empty?
       end
 
       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
@@ -74,12 +74,12 @@ module Honeybadger
 
           hash.each_pair do |key, value|
             parents.push(key) if deep_regexps
-            key = key.kind_of?(Symbol) ? key : sanitize(key, depth+1, stack, parents)
+            key = key.is_a?(Symbol) ? key : sanitize(key, depth + 1, stack, parents)
 
             if filter_key?(key, parents)
               new_hash[key] = FILTERED
             else
-              value = sanitize(value, depth+1, stack, parents)
+              value = sanitize(value, depth + 1, stack, parents)
 
               if blocks.any? && !recursive?(value)
                 key = key.dup if can_dup?(key)
@@ -98,13 +98,13 @@ module Honeybadger
           return DEPTH if depth >= max_depth
 
           data.to_a.map do |value|
-            sanitize(value, depth+1, stack, parents)
+            sanitize(value, depth + 1, stack, parents)
           end
         when Numeric, TrueClass, FalseClass, NilClass
           data
         when String
           sanitize_string(data)
-        when -> (d) { d.respond_to?(:to_honeybadger) }
+        when ->(d) { d.respond_to?(:to_honeybadger) }
           return DEPTH if depth >= max_depth
 
           begin
@@ -113,7 +113,7 @@ module Honeybadger
             return RAISED
           end
 
-          sanitize(data, depth+1, stack, parents)
+          sanitize(data, depth + 1, stack, parents)
         else # all other objects
           klass = data.class
 
@@ -156,7 +156,7 @@ module Honeybadger
         filtered_url
       end
 
-    private
+      private
 
       attr_reader :max_depth, :regexps, :deep_regexps, :blocks
 
@@ -180,7 +180,7 @@ module Honeybadger
       def valid_encoding?(string)
         string.valid_encoding? && (
           VALID_ENCODINGS.include?(string.encoding) ||
-          VALID_ENCODINGS.include?(Encoding.compatible?(''.freeze, string))
+          VALID_ENCODINGS.include?(Encoding.compatible?("".freeze, string))
         )
       end
 
@@ -202,7 +202,7 @@ module Honeybadger
       end
 
       def can_dup?(obj)
-        !IMMUTABLE.any? {|k| obj.kind_of?(k) }
+        !IMMUTABLE.any? { |k| obj.is_a?(k) }
       end
 
       def inspected?(string)

data/lib/honeybadger/util/stats.rb

@@ -6,14 +6,17 @@ module Honeybadger
 
       class << self
         def all
-          { :mem => memory, :load => load }
+          {mem: memory, load: load}
         end
 
         # From https://github.com/bloopletech/webstats/blob/master/server/data_providers/mem_info.rb
         def memory
           out = {}
           if HAS_MEM && (meminfo = run_meminfo)
-            out[:total], out[:free], out[:buffers], out[:cached] = meminfo[0..4].map { |l| l =~ /^.*?\: +(.*?) kB$/; ($1.to_i / 1024.0).to_f }
+            out[:total], out[:free], out[:buffers], out[:cached] = meminfo[0..4].map { |l|
+              l =~ /^.*?: +(.*?) kB$/
+              ($1.to_i / 1024.0).to_f
+            }
             out[:free_total] = out[:free] + out[:buffers] + out[:cached]
           end
           out
@@ -23,7 +26,7 @@ module Honeybadger
         def load
           out = {}
           if HAS_LOAD && (loadavg = run_loadavg)
-            out[:one], out[:five], out[:fifteen] = loadavg.split(' ', 4).map(&:to_f)
+            out[:one], out[:five], out[:fifteen] = loadavg.split(" ", 4).map(&:to_f)
           end
           out
         end

data/lib/honeybadger/version.rb

@@ -1,4 +1,4 @@
 module Honeybadger
   # The current String Honeybadger version.
-  VERSION = '5.29.1'.freeze
+  VERSION = "6.0.0".freeze
 end

data/lib/honeybadger/worker.rb

@@ -1,7 +1,7 @@
-require 'forwardable'
-require 'net/http'
+require "forwardable"
+require "net/http"
 
-require 'honeybadger/logging'
+require "honeybadger/logging"
 
 module Honeybadger
   # A concurrent queue to notify the backend.
@@ -38,7 +38,7 @@ module Honeybadger
       return false unless start
 
       if queue.size >= config.max_queue_size
-        warn { sprintf('Unable to report error; reached max queue size of %s. id=%s', queue.size, msg.id) }
+        warn { sprintf("Unable to report error; reached max queue size of %s. id=%s", queue.size, msg.id) }
         return false
       end
 
@@ -50,7 +50,7 @@ module Honeybadger
     end
 
     def shutdown(force = false)
-      d { 'shutting down worker' }
+      d { "shutting down worker" }
 
       mutex.synchronize do
         @shutdown = true
@@ -60,11 +60,11 @@ module Honeybadger
       return true unless thread&.alive?
 
       if throttled?
-        warn { sprintf('Unable to report %s error(s) to Honeybadger (currently throttled)', queue.size) } unless queue.empty?
+        warn { sprintf("Unable to report %s error(s) to Honeybadger (currently throttled)", queue.size) } unless queue.empty?
         return true
       end
 
-      info { sprintf('Waiting to report %s error(s) to Honeybadger', queue.size) } unless queue.empty?
+      info { sprintf("Waiting to report %s error(s) to Honeybadger", queue.size) } unless queue.empty?
 
       queue.push(SHUTDOWN)
       !!thread.join
@@ -76,7 +76,7 @@ module Honeybadger
     # 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
@@ -125,7 +125,7 @@ module Honeybadger
     end
 
     def kill!
-      d { 'killing worker thread' }
+      d { "killing worker thread" }
 
       if thread
         Thread.kill(thread)
@@ -147,7 +147,7 @@ module Honeybadger
 
     def run
       begin
-        d { 'worker started' }
+        d { "worker started" }
         loop do
           case msg = queue.pop
           when SHUTDOWN then break
@@ -156,9 +156,9 @@ module Honeybadger
           end
         end
       ensure
-        d { 'stopping worker' }
+        d { "stopping worker" }
       end
-    rescue Exception => e
+    rescue => e
       error {
         msg = "Error in worker thread (shutting down) class=%s message=%s\n\t%s"
         sprintf(msg, e.class, e.message.dump, Array(e.backtrace).join("\n\t"))
@@ -171,13 +171,13 @@ module Honeybadger
       send_now(msg)
 
       if shutdown? && throttled?
-        warn { sprintf('Unable to report %s error(s) to Honeybadger (currently throttled)', queue.size) } if queue.size > 1
+        warn { sprintf("Unable to report %s error(s) to Honeybadger (currently throttled)", queue.size) } if queue.size > 1
         kill!
         return
       end
 
       sleep(throttle_interval)
-    rescue StandardError => e
+    rescue => e
       error {
         msg = "Error in worker thread class=%s message=%s\n\t%s"
         sprintf(msg, e.class, e.message.dump, Array(e.backtrace).join("\n\t"))
@@ -185,12 +185,12 @@ module Honeybadger
     end
 
     def notify_backend(payload)
-      d { sprintf('worker notifying backend id=%s', payload.id) }
+      d { sprintf("worker notifying backend id=%s", payload.id) }
       backend.notify(:notices, payload)
     end
 
     def calc_throttle_interval
-      ((BASE_THROTTLE ** throttle) - 1).round(3)
+      ((BASE_THROTTLE**throttle) - 1).round(3)
     end
 
     def inc_throttle
@@ -211,33 +211,33 @@ module Honeybadger
     end
 
     def handle_response(msg, response)
-      d { sprintf('worker response id=%s code=%s message=%s', msg.id, response.code, response.message.to_s.dump) }
+      d { sprintf("worker response id=%s code=%s message=%s", msg.id, response.code, response.message.to_s.dump) }
 
       case response.code
       when 429, 503
         throttle = inc_throttle
-        warn { sprintf('Error report failed: project is sending too many errors. id=%s code=%s throttle=%s interval=%s', msg.id, response.code, throttle, throttle_interval) }
+        warn { sprintf("Error report failed: project is sending too many errors. id=%s code=%s throttle=%s interval=%s", msg.id, response.code, throttle, throttle_interval) }
       when 402
-        warn { sprintf('Error report failed: payment is required. id=%s code=%s', msg.id, response.code) }
+        warn { sprintf("Error report failed: payment is required. id=%s code=%s", msg.id, response.code) }
         suspend(3600)
       when 403
-        warn { sprintf('Error report failed: API key is invalid. id=%s code=%s', msg.id, response.code) }
+        warn { sprintf("Error report failed: API key is invalid. id=%s code=%s", msg.id, response.code) }
         suspend(3600)
       when 413
-        warn { sprintf('Error report failed: Payload is too large. id=%s code=%s', msg.id, response.code) }
+        warn { sprintf("Error report failed: Payload is too large. id=%s code=%s", msg.id, response.code) }
       when 201
-        host = config.get(:'connection.ui_host')
-        if throttle = dec_throttle
-          info { sprintf('Success ⚡ https://%s/notice/%s id=%s code=%s throttle=%s interval=%s', host, msg.id, msg.id, response.code, throttle, throttle_interval) }
+        host = config.get(:"connection.ui_host")
+        if (throttle = dec_throttle)
+          info { sprintf("Success ⚡ https://%s/notice/%s id=%s code=%s throttle=%s interval=%s", host, msg.id, msg.id, response.code, throttle, throttle_interval) }
         else
-          info { sprintf('Success ⚡ https://%s/notice/%s id=%s code=%s', host, msg.id, msg.id, response.code) }
+          info { sprintf("Success ⚡ https://%s/notice/%s id=%s code=%s", host, msg.id, msg.id, response.code) }
         end
       when :stubbed
-        info { sprintf('Success ⚡ Development mode is enabled; this error will be reported if it occurs after you deploy your app. id=%s', msg.id) }
+        info { sprintf("Success ⚡ Development mode is enabled; this error will be reported if it occurs after you deploy your app. id=%s", msg.id) }
       when :error
-        warn { sprintf('Error report failed: an unknown error occurred. code=%s error=%s', response.code, response.message.to_s.dump) }
+        warn { sprintf("Error report failed: an unknown error occurred. code=%s error=%s", response.code, response.message.to_s.dump) }
       else
-        warn { sprintf('Error report failed: unknown response from server. code=%s', response.code) }
+        warn { sprintf("Error report failed: unknown response from server. code=%s", response.code) }
       end
     end
 
@@ -248,8 +248,10 @@ module Honeybadger
     end
 
     def signal_marker(marker)
-      mutex.synchronize do
+      if mutex.owned?
         marker.signal
+      else
+        mutex.synchronize { marker.signal }
       end
     end
   end

data/lib/honeybadger.rb

@@ -1,13 +1,13 @@
 if defined?(::Rails::Railtie)
-  require 'honeybadger/init/rails'
+  require "honeybadger/init/rails"
 elsif defined?(Sinatra::Base)
-  require 'honeybadger/init/sinatra'
+  require "honeybadger/init/sinatra"
 elsif defined?(::Hanami)
-  require 'honeybadger/init/hanami'
+  require "honeybadger/init/hanami"
 else
-  require 'honeybadger/init/ruby'
+  require "honeybadger/init/ruby"
 end
 
 if defined?(Rake.application)
-  require 'honeybadger/init/rake'
+  require "honeybadger/init/rake"
 end

data/lib/puma/plugin/honeybadger.rb

@@ -1,10 +1,10 @@
-require 'honeybadger/instrumentation_helper'
+require "honeybadger/instrumentation_helper"
 
 module Honeybadger
   class PumaPlugin
     include Honeybadger::InstrumentationHelper
 
-    STATS_KEYS = %i(pool_capacity max_threads requests_count backlog running).freeze
+    STATS_KEYS = %i[pool_capacity max_threads requests_count backlog running].freeze
 
     ::Puma::Plugin.create do
       def start(launcher)
@@ -19,14 +19,18 @@ module Honeybadger
     end
 
     def record
-      metric_source 'puma'
+      metric_source "puma"
 
-      stats = ::Puma.stats rescue {}
+      stats = begin
+        ::Puma.stats
+      rescue
+        {}
+      end
       stats = stats.is_a?(Hash) ? stats : JSON.parse(stats, symbolize_names: true)
 
       if stats[:worker_status].is_a?(Array)
         stats[:worker_status].each do |worker_data|
-          context = { worker: worker_data[:index] }
+          context = {worker: worker_data[:index]}
           record_puma_stats(worker_data[:last_status], context)
         end
       else
@@ -34,14 +38,14 @@ module Honeybadger
       end
     end
 
-    def record_puma_stats(stats, context={})
+    def record_puma_stats(stats, context = {})
       if Honeybadger.config.load_plugin_insights_events?(:puma)
-        Honeybadger.event('stats.puma', context.merge(stats))
+        Honeybadger.event("stats.puma", context.merge(stats))
       end
 
       if Honeybadger.config.load_plugin_insights_metrics?(:puma)
         STATS_KEYS.each do |stat|
-          gauge stat, context, ->{ stats[stat] } if stats[stat]
+          gauge stat, context, -> { stats[stat] } if stats[stat]
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeybadger
 version: !ruby/object:Gem::Version
-  version: 5.29.1
+  version: 6.0.0
 platform: ruby
 authors:
 - Honeybadger Industries LLC
@@ -201,14 +201,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.0.dev
+rubygems_version: 3.8.0.dev
 specification_version: 4
 summary: Full-stack error tracking, performance monitoring, logging, and more.
 test_files: []