honeybadger 6.9.1 → 6.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 938bd913b16cb752020a666aa009ecf5fced36cf55fa1d9ffc2078857af14690
-  data.tar.gz: 5829e029bdad75d2ce531f41b228c333246fa904fa4af1030bae9c5c29be9ad0
+  metadata.gz: fe7e1dc021b03b75e886083cda940bd73ac4613427229e0b9a08c4e65badf548
+  data.tar.gz: ea2e996262898454537f1e65e394d4d1cd93226420dab1d0d66ad8b408cac200
 SHA512:
-  metadata.gz: 2e7434371e4456bfd1b0f8f51f540006852d3f6a776ae98b5e9b795ef6463849767a45df0eb1b9c0d5b96e8dcd99ed5e5b93a0cd77ce9226bc0a571311fee00c
-  data.tar.gz: 4bbbf5016c7732302bf20f99ec52190be16e5ab14ef6cc54203afe7b96280c61d0d465439d49ed29e57907ed8ebd999ea39ffd13931a44afc1384e6d8c7b1c98
+  metadata.gz: 8ae65e4be79d6ed5761b54139488681f1d5a591f8a5f1b44185e17d4322120f2a280055704a1a56e5e0836bb12f2dcf2c91372f9e0c0c9b06a488e69089fd7ce
+  data.tar.gz: 8ac9bb344ab71c34de08a8eefb3bb7dc2393d7c29d6f59f6cbe289d6c428a699cc679d599088d2d6c87f8e1a6de9069cc079f156b272385299e25b2e81361002

data/CHANGELOG.md

@@ -1,6 +1,20 @@
 # Change Log
 
 
+## [6.9.3](https://github.com/honeybadger-io/honeybadger-ruby/compare/v6.9.2...v6.9.3) (2026-09-29)
+
+
+### Bug Fixes
+
+* propagate the Rails request ID to notices and Insights events ([#848](https://github.com/honeybadger-io/honeybadger-ruby/issues/848)) ([23edb08](https://github.com/honeybadger-io/honeybadger-ruby/commit/23edb08f4fda3b3f66fb697c5ec5502f39aeb127))
+
+## [6.9.2](https://github.com/honeybadger-io/honeybadger-ruby/compare/v6.9.1...v6.9.2) (2026-09-15)
+
+
+### Bug Fixes
+
+* truncate very large SQL queries instead of obfuscating them ([#841](https://github.com/honeybadger-io/honeybadger-ruby/issues/841)) ([c80e046](https://github.com/honeybadger-io/honeybadger-ruby/commit/c80e0468ee167496ba7f5798aca2974463cf1af2))
+
 ## [6.9.1](https://github.com/honeybadger-io/honeybadger-ruby/compare/v6.9.0...v6.9.1) (2026-07-16)
 
 

data/lib/honeybadger/agent.rb

@@ -579,13 +579,18 @@ module Honeybadger
     # @api private
     def with_rack_env(rack_env, &block)
       context_manager.set_rack_env(rack_env)
-      context_manager.set_request_id(rack_env["action_dispatch.request_id"] || SecureRandom.uuid)
+      context_manager.set_request_id(SecureRandom.uuid)
       yield
     ensure
       context_manager.set_rack_env(nil)
       context_manager.set_request_id(nil)
     end
 
+    # @api private
+    def set_request_id(request_id)
+      context_manager.set_request_id(request_id)
+    end
+
     # @api private
     attr_reader :worker, :events_worker, :metrics_worker
 

data/lib/honeybadger/breadcrumbs/active_support.rb

@@ -20,14 +20,15 @@ module Honeybadger
               if data[:sql]
                 connection = data.delete(:connection)
                 adapter = connection&.adapter_name&.downcase || active_record_connection_db_config[:adapter]
-                data[:sql] = Util::SQL.obfuscate(data[:sql], adapter)
+                data[:sql] = Util::SQL.obfuscate(data[:sql], adapter, max_length: Honeybadger.config[:"sql.max_length"])
               end
               data
             end,
             exclude_when: lambda do |data|
-              # Ignore schema, begin, and commit transaction queries
+              # Ignore schema, begin, and commit transaction queries. Those
+              # statements are tiny, so skip the scan for large queries.
               data[:name] == "SCHEMA" ||
-                (data[:sql] && (Util::SQL.force_utf_8(data[:sql].dup) =~ /^(begin|commit)( immediate)?( transaction)?$/i))
+                (data[:sql] && data[:sql].bytesize <= 64 && (Util::SQL.force_utf_8(data[:sql].dup) =~ /^(begin|commit)( immediate)?( transaction)?$/i))
             end
           },
 

data/lib/honeybadger/config/defaults.rb

@@ -34,7 +34,7 @@ module Honeybadger
 
     IGNORE_EVENTS_DEFAULT = [
       {event_type: "sql.active_record", query: /^(begin|commit)( immediate)?( transaction)?$/i},
-      {event_type: "sql.active_record", query: /(solid_queue|good_job|solid_cable_messages)/i},
+      {event_type: "sql.active_record", query: /(solid_queue|solid_cache|good_job|solid_cable_messages)/i},
       {event_type: "sql.active_record", name: /^GoodJob/},
       {event_type: "process_action.action_controller", controller: "Rails::HealthController"},
       {event_type: "cache_read.active_support"},
@@ -153,6 +153,11 @@ module Honeybadger
         default: 100,
         type: Integer
       },
+      "sql.max_length": {
+        description: "SQL queries larger than this many bytes are truncated instead of obfuscated (in Insights events and breadcrumbs). Scanning very large queries is slow and can exceed Regexp.timeout.",
+        default: 1_000_000,
+        type: Integer
+      },
       plugins: {
         description: "An optional list of plugins to load. Default is to load all plugins.",
         default: nil,

data/lib/honeybadger/init/rails.rb

@@ -2,6 +2,7 @@ require "rails"
 require "yaml"
 
 require "honeybadger/ruby"
+require "honeybadger/rack/request_id"
 
 module Honeybadger
   module Init
@@ -14,8 +15,14 @@ module Honeybadger
         initializer "honeybadger.install_middleware" do |app|
           honeybadger_config = Honeybadger::Agent.instance.config
 
-          if honeybadger_config[:"exceptions.enabled"]
+          # ErrorNotifier also sets up the request context that Insights events
+          # read. Agent#notify does nothing when exceptions are disabled.
+          if honeybadger_config[:"exceptions.enabled"] || honeybadger_config[:"insights.enabled"]
             app.config.middleware.insert(0, Honeybadger::Rack::ErrorNotifier)
+            app.config.middleware.insert_after(::ActionDispatch::RequestId, Honeybadger::Rack::RequestId)
+          end
+
+          if honeybadger_config[:"exceptions.enabled"]
             app.config.middleware.insert_before(Honeybadger::Rack::ErrorNotifier, Honeybadger::Rack::UserInformer) if honeybadger_config[:"user_informer.enabled"]
             app.config.middleware.insert_before(Honeybadger::Rack::ErrorNotifier, Honeybadger::Rack::UserFeedback) if honeybadger_config[:"feedback.enabled"]
           end

data/lib/honeybadger/notification_subscriber.rb

@@ -20,6 +20,9 @@ module Honeybadger
 
       record(name, payload)
       record_metrics(name, payload)
+    rescue => e
+      # Instrumentation must never break the instrumented code.
+      Honeybadger.config.logger.error("Error in Honeybadger instrumentation for #{name}: #{e.class}: #{e.message}")
     end
 
     def record(name, payload)
@@ -116,7 +119,7 @@ module Honeybadger
   class ActiveRecordSubscriber < RailsSubscriber
     def format_payload(_name, payload)
       {
-        query: Util::SQL.obfuscate(payload[:sql], payload[:connection]&.adapter_name),
+        query: Util::SQL.obfuscate(payload[:sql], payload[:connection]&.adapter_name, max_length: Honeybadger.config[:"sql.max_length"]),
         cached: payload[:cached],
         async: payload[:async]
       }

data/lib/honeybadger/plugins/breadcrumbs.rb

@@ -100,6 +100,9 @@ module Honeybadger
           category: notification_config[:category] || :custom,
           metadata: data
         )
+      rescue => e
+        # Instrumentation must never break the instrumented code.
+        Honeybadger.config.logger.error("Error in Honeybadger breadcrumb for #{name}: #{e.class}: #{e.message}")
       end
 
       # @api private

data/lib/honeybadger/rack/request_id.rb

@@ -0,0 +1,27 @@
+require "honeybadger/ruby"
+
+module Honeybadger
+  module Rack
+    # @api private
+    #
+    # Copies the request ID assigned by ActionDispatch::RequestId into the
+    # Honeybadger context. Must sit after ActionDispatch::RequestId in the
+    # middleware stack.
+    #
+    # No ensure/cleanup here: ErrorNotifier owns the request lifecycle and
+    # clears state after the stack unwinds. Clearing here would nil the ID
+    # before ErrorNotifier builds the notice on exception.
+    class RequestId
+      def initialize(app, agent = nil)
+        @app = app
+        @agent = agent if agent.is_a?(Agent)
+      end
+
+      def call(env)
+        request_id = env["action_dispatch.request_id"]
+        (@agent || Honeybadger::Agent.instance).set_request_id(request_id) if request_id
+        @app.call(env)
+      end
+    end
+  end
+end

data/lib/honeybadger/util/sql.rb

@@ -4,20 +4,48 @@ module Honeybadger
       ESCAPE_QUOTES = /(\\"|\\')/
       SQUOTE_DATA = /'(?:[^']|'')*'/
       DQUOTE_DATA = /"(?:[^"]|"")*"/
-      NUMBER_DATA = /\b\d+\b/
+      # Underscore separators are allowed in numeric literals by PostgreSQL
+      # 16+ and SQLite 3.46+, and \b does not match next to one.
+      NUMBER_DATA = /\b\d+(?:_\d+)*\b/
+      HEX_DATA = /\b0[xbo][0-9a-f]+(?:_[0-9a-f]+)*\b/i
       DOUBLE_QUOTERS = /(postgres|sqlite|postgis)/i
+      TRUNCATED_HEAD_LENGTH = 200
+      # Leading run of characters that can't start a string literal or a
+      # comment in any supported adapter: stops at ', $, /, -, #, \ and so
+      # on. Double quotes and backticks are kept because they quote
+      # identifiers; adapters that use double quotes for strings are cut
+      # at the first double quote in .truncate.
+      TRUNCATED_HEAD_SAFE = /\A[\w\s.,()=*"`]*/
 
-      def self.obfuscate(sql, adapter)
-        force_utf_8(sql.to_s.dup).tap do |s|
+      # Obfuscates literal values in a SQL query. When +max_length+ is given
+      # and the query is larger than that many bytes, the query is truncated
+      # instead (see .truncate): scanning multi-megabyte queries (e.g. an
+      # INSERT of a serialized cache value) is slow, and can exceed the
+      # Regexp.timeout that Rails 8.1+ sets by default.
+      def self.obfuscate(sql, adapter, max_length: nil)
+        sql = sql.to_s
+        return truncate(sql, adapter, max_length) if max_length && sql.bytesize > max_length
+
+        force_utf_8(sql.dup).tap do |s|
           s.gsub!(/\s+/, " ")
           s.gsub!(ESCAPE_QUOTES, "".freeze)
           s.gsub!(SQUOTE_DATA, "'?'".freeze)
           s.gsub!(DQUOTE_DATA, '"?"'.freeze) unless adapter.to_s.match?(DOUBLE_QUOTERS)
+          s.gsub!(HEX_DATA, "?".freeze)
           s.gsub!(NUMBER_DATA, "?".freeze)
           s.strip!
         end
       end
 
+      # Keeps only the head of the statement (up to the first quoted value or
+      # comment) so that no literal data leaks, and notes the original size.
+      def self.truncate(sql, adapter, max_length)
+        head = force_utf_8(sql.byteslice(0, TRUNCATED_HEAD_LENGTH)).scrub("")[TRUNCATED_HEAD_SAFE]
+        head = head[0, head.index('"')] if head.include?('"') && !adapter.to_s.match?(DOUBLE_QUOTERS)
+
+        "#{obfuscate(head, adapter)} ... [truncated #{sql.bytesize} bytes]"
+      end
+
       def self.force_utf_8(string)
         string.encode(
           Encoding.find("UTF-8"),

data/lib/honeybadger/version.rb

@@ -1,4 +1,4 @@
 module Honeybadger
   # The current String Honeybadger version.
-  VERSION = "6.9.1".freeze
+  VERSION = "6.9.3".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeybadger
 version: !ruby/object:Gem::Version
-  version: 6.9.1
+  version: 6.9.3
 platform: ruby
 authors:
   - Honeybadger Industries LLC
@@ -131,6 +131,7 @@ files:
   - lib/honeybadger/plugins/thor.rb
   - lib/honeybadger/plugins/warden.rb
   - lib/honeybadger/rack/error_notifier.rb
+  - lib/honeybadger/rack/request_id.rb
   - lib/honeybadger/rack/user_feedback.rb
   - lib/honeybadger/rack/user_informer.rb
   - lib/honeybadger/registry.rb
@@ -217,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       - !ruby/object:Gem::Version
         version: "0"
 requirements: []
-rubygems_version: 4.1.0.dev
+rubygems_version: 4.1.0.beta1
 specification_version: 4
 summary: "Full-stack error tracking, performance monitoring, logging, and more."
 test_files: []