honeybadger 5.14.2 → 5.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a266a536f678ad185e842fb49965060a83a9212bc9e0d83b82676eda7ee339e
-  data.tar.gz: efe4451de8be26102391b0e15269a175b446250bb81d0076807f0137497e959a
+  metadata.gz: 53470c49dca6dd18cc027497e441431f1b6871d47ddeb17ee00656dfefe49d18
+  data.tar.gz: e100a3d9279cd5986b16de62c25cf5d2b40f5bafad03bf0dc6560af1ebf966b3
 SHA512:
-  metadata.gz: d72c1b0452f68bfae263c9ceaca636b8201e20f4a902ea8498dfc174251ca3a8e3f72e3043aae0cf2e43a972ac35a94c051f1ee113b2b0ff344a021f4caeded9
-  data.tar.gz: f2b3511ec5b6cb683a593424831e05475320fc398063ab948a81fb946dfff45656c9df7da3ac0a02f9af050747d58dbf9b94aa661855fbc688814a85660e8faa
+  metadata.gz: adef30d0aa32a2933cec0513cbb64e0b0a024d2e8b486b8c3f8da662996337f60537f0d228a28ef2b4a36449cb8ac986588ee1d7b7e737716fa44767e23c9961
+  data.tar.gz: dbc9fd40eb13d435365cad321d604aaa0403ccc88184ae11087f11c3fdfb834da02a96a7c3281fc340956f9dcde38bcfeec097fe2d62be960291e6a545e371b2

data/CHANGELOG.md

@@ -1,6 +1,21 @@
 # Change Log
 
 
+## [5.15.1](https://github.com/honeybadger-io/honeybadger-ruby/compare/v5.15.0...v5.15.1) (2024-07-23)
+
+
+### Bug Fixes
+
+* safe navigate adapter_name for payload connection ([#593](https://github.com/honeybadger-io/honeybadger-ruby/issues/593)) ([368fb16](https://github.com/honeybadger-io/honeybadger-ruby/commit/368fb160d811252f83d0e262110a8c198557c7df))
+* sidekiq leader check only for version > 6.5 ([#594](https://github.com/honeybadger-io/honeybadger-ruby/issues/594)) ([3bc005b](https://github.com/honeybadger-io/honeybadger-ruby/commit/3bc005b12d689da84ebe9b485eb53c508623d984))
+
+## [5.15.0](https://github.com/honeybadger-io/honeybadger-ruby/compare/v5.14.2...v5.15.0) (2024-07-18)
+
+
+### Features
+
+* define default events to ignore, allow for override ([#570](https://github.com/honeybadger-io/honeybadger-ruby/issues/570)) ([a6f2177](https://github.com/honeybadger-io/honeybadger-ruby/commit/a6f2177eb69b75eafef235768187ccf6b3a538f0))
+
 ## [5.14.2](https://github.com/honeybadger-io/honeybadger-ruby/compare/v5.14.1...v5.14.2) (2024-07-17)
 
 

data/lib/honeybadger/agent.rb

@@ -404,7 +404,18 @@ module Honeybadger
         with_error_handling { hook.call(event) }
       end
 
-      return if config.ignored_events.any? { |check| event.event_type&.match?(check) }
+      return if config.ignored_events.any? do |check|
+        with_error_handling do
+          check.all? do |keys, value|
+            if keys == [:event_type]
+              event.event_type&.match?(value)
+            elsif event.dig(*keys)
+              event.dig(*keys).to_s.match?(value)
+            end
+          end
+        end
+      end
+
       return if event.halted?
 
       events_worker.push(event.as_json)

data/lib/honeybadger/config/defaults.rb

@@ -31,6 +31,12 @@ module Honeybadger
                       'Sinatra::NotFound',
                       'Sidekiq::JobRetry::Skip'].map(&:freeze).freeze
 
+    IGNORE_EVENTS_DEFAULT = [
+      { event_type: 'sql.active_record', query: /^(begin|commit)( transaction)?$/i },
+      { event_type: 'sql.active_record', query: /(solid_queue|good_job)/i },
+      { event_type: 'process_action.action_controller', controller: 'Rails::HealthController' }
+    ].freeze
+
     DEVELOPMENT_ENVIRONMENTS = ['development', 'test', 'cucumber'].map(&:freeze).freeze
 
     DEFAULT_PATHS = ['honeybadger.yml', 'config/honeybadger.yml', "#{ENV['HOME']}/honeybadger.yml"].map(&:freeze).freeze
@@ -112,8 +118,13 @@ module Honeybadger
         type: Boolean
       },
       :'events.ignore' => {
-        description: 'A list of events to ignore. Use a string to specify exact matches, or regex for more flexibility.',
-        default: [],
+        description: 'A list of additional events to ignore. Use a hash to query nested payloads, match using a string or regex. Non-hash will match on the event_type.',
+        default: IGNORE_EVENTS_DEFAULT,
+        type: Array
+      },
+      :'events.ignore_only' => {
+        description: 'A list of events to ignore (overrides the default ignored events).',
+        default: nil,
         type: Array
       },
       plugins: {

data/lib/honeybadger/config.rb

@@ -192,10 +192,22 @@ module Honeybadger
       DEFAULTS[:'exceptions.ignore'] | Array(ignore)
     end
 
+    def raw_ignored_events
+      ignore_only = get(:'events.ignore_only')
+      return ignore_only if ignore_only
+      return DEFAULTS[:'events.ignore'] unless ignore = get(:'events.ignore')
+
+      DEFAULTS[:'events.ignore'] | Array(ignore)
+    end
+
     def ignored_events
-      self[:'events.ignore'].map do |check|
-        check.is_a?(String) ? /^#{check}$/ : check
-      end
+      @ignored_events ||= raw_ignored_events.map do |check|
+        if check.is_a?(String) || check.is_a?(Regexp)
+          { [:event_type] => check }
+        elsif check.is_a?(Hash)
+          flat_hash(check).transform_keys! { |key_array| key_array.map(&:to_sym) }
+        end
+      end.compact
     end
 
     def ca_bundle_path
@@ -455,5 +467,14 @@ module Honeybadger
         end
       end
     end
+
+    # Converts a nested hash into a single layer where keys become arrays:
+    # ex: > flat_hash({ :nested => { :hash => "value" }})
+    #     > { [:nested, :hash] => "value" }
+    def flat_hash(h,f=[],g={})
+      return g.update({ f=>h }) unless h.is_a? Hash
+      h.each { |k,r| flat_hash(r,f+[k],g) }
+      g
+    end
   end
 end

data/lib/honeybadger/event.rb

@@ -13,7 +13,7 @@ module Honeybadger
     # The payload data of the event
     attr_reader :payload
 
-    def_delegators :payload, :[], :[]=
+    def_delegators :payload, :dig, :[], :[]=
 
     # @api private
     def initialize(event_type_or_payload, payload={})

data/lib/honeybadger/notification_subscriber.rb

@@ -59,14 +59,13 @@ module Honeybadger
   class ActiveRecordSubscriber < NotificationSubscriber
     def format_payload(payload)
       {
-        query: Util::SQL.obfuscate(payload[:sql], payload[:connection].adapter_name),
+        query: Util::SQL.obfuscate(payload[:sql], payload[:connection]&.adapter_name),
         async: payload[:async]
       }
     end
 
     def process?(event, payload)
       return false if payload[:name] == "SCHEMA"
-      return false if payload[:sql]&.match?(/^(begin|commit)( transaction)?$/i)
       true
     end
   end

data/lib/honeybadger/plugins/sidekiq.rb

@@ -127,25 +127,31 @@ module Honeybadger
           if config.load_plugin_insights?(:sidekiq)
             require "sidekiq"
             require "sidekiq/api"
-            require "sidekiq/component"
 
-            class SidekiqClusterCollectionChecker
-              include ::Sidekiq::Component
-              def initialize(config)
-                @config = config
-              end
+            if Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('6.5')
+              require "sidekiq/component"
+
+              class SidekiqClusterCollectionChecker
+                include ::Sidekiq::Component
+                def initialize(config)
+                  @config = config
+                end
 
-              def collect?
-                return true unless defined?(::Sidekiq::Enterprise)
-                leader?
+                def collect?
+                  return true unless defined?(::Sidekiq::Enterprise)
+                  leader?
+                end
               end
             end
 
             ::Sidekiq.configure_server do |config|
               config.server_middleware { |chain| chain.add(ServerMiddlewareInstrumentation) }
               config.client_middleware { |chain| chain.add(ClientMiddlewareInstrumentation) }
-              config.on(:startup) do
-                leader_checker = SidekiqClusterCollectionChecker.new(config)
+
+              if defined?(SidekiqClusterCollectionChecker)
+                config.on(:startup) do
+                  leader_checker = SidekiqClusterCollectionChecker.new(config)
+                end
               end
             end
 

data/lib/honeybadger/plugins/solid_queue.rb

@@ -2,7 +2,7 @@ module Honeybadger
   module Plugins
     module SolidQueue
       Plugin.register :solid_queue do
-        requirement { defined?(::SolidQueue) }
+        requirement { config.load_plugin_insights?(:solid_queue) && defined?(::SolidQueue) }
 
         collect do
           if config.cluster_collection?(:solid_queue)

data/lib/honeybadger/version.rb

@@ -1,4 +1,4 @@
 module Honeybadger
   # The current String Honeybadger version.
-  VERSION = '5.14.2'.freeze
+  VERSION = '5.15.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: honeybadger
 version: !ruby/object:Gem::Version
-  version: 5.14.2
+  version: 5.15.1
 platform: ruby
 authors:
 - Honeybadger Industries LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-17 00:00:00.000000000 Z
+date: 2024-07-23 00:00:00.000000000 Z
 dependencies: []
 description: Make managing application errors a more pleasant experience.
 email: