honeybadger 5.19.2 → 5.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20909b3d33ea742bea8ebf66e119cd76e1db5bd57d1fe0a83ea15a997ff5c23c
-  data.tar.gz: acc73eea6c152b3a4f0bda2667ab29975ca8b95cb91109d26c85795b5a9ea6a7
+  metadata.gz: 49d9b04a56a6e16762784db9423b067fc80efe777f9ca3de3af933489aa97a4d
+  data.tar.gz: 071ef334c1a1ae28539dd67acf6f3c096fc890b7ee42a8e835653a21d4909b55
 SHA512:
-  metadata.gz: c5ac6182c0b8ef252f81ddb54ef89dc2c6cd65313601acfd404fcf60832efcc67115964395573642149c4bac08940ce4258014be032df559125ce779d487d622
-  data.tar.gz: 5494eba2f9590c809cf3263b5c373ac9f0bcd97dfb34ac1e602979e7412632758f4f1b4ce359e382b31d1ee3921357ae7390f88a9fdb9b81dbfeaff01de56708
+  metadata.gz: 5436c222a36b4697c51475e06d5275086a7339c53be1843ce6db6d3b218250edc0254745a2dc05de24965b5e9db66114c07e55b0daa870319255b2689b12b087
+  data.tar.gz: ca87e31006c7804b84ced1a675c3c60f79b7e55180480fd599b3a5823d00a1106f5cd251016556fd62a7093ac1e5d8b9ba980209a84d0d5309535ba7c3cb9f84

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Change Log
 
 
+## [5.20.0](https://github.com/honeybadger-io/honeybadger-ruby/compare/v5.19.2...v5.20.0) (2024-11-08)
+
+
+### Features
+
+* add aggregated metrics for rails and more ([#630](https://github.com/honeybadger-io/honeybadger-ruby/issues/630)) ([12db5a4](https://github.com/honeybadger-io/honeybadger-ruby/commit/12db5a4d44a9597c0999d32a150283799d856d66))
+
 ## [5.19.2](https://github.com/honeybadger-io/honeybadger-ruby/compare/v5.19.1...v5.19.2) (2024-11-05)
 
 

data/lib/honeybadger/config/defaults.rb

@@ -32,6 +32,7 @@ module Honeybadger
                       'Sidekiq::JobRetry::Skip'].map(&:freeze).freeze
 
     IGNORE_EVENTS_DEFAULT = [
+      { event_type: 'metric.hb', metric_name: 'duration.sql.active_record', query: /^(begin|commit)( transaction)?$/i },
       { event_type: 'sql.active_record', query: /^(begin|commit)( transaction)?$/i },
       { event_type: 'sql.active_record', query: /(solid_queue|good_job)/i },
       { event_type: 'sql.active_record', name: /^GoodJob/ },
@@ -363,6 +364,36 @@ module Honeybadger
         default: 60,
         type: Integer
       },
+      :'sidekiq.insights.enabled' => {
+        description: 'Enable automatic data collection for Sidekiq.',
+        default: true,
+        type: Boolean
+      },
+      :'sidekiq.insights.events' => {
+        description: 'Enable automatic event capturing for Sidekiq.',
+        default: true,
+        type: Boolean
+      },
+      :'sidekiq.insights.metrics' => {
+        description: 'Enable automatic metric data collection for Sidekiq.',
+        default: false,
+        type: Boolean
+      },
+      :'rails.insights.enabled' => {
+        description: 'Enable automatic data collection for Ruby on Rails.',
+        default: true,
+        type: Boolean
+      },
+      :'rails.insights.events' => {
+        description: 'Enable automatic event capturing for Ruby on Rails.',
+        default: true,
+        type: Boolean
+      },
+      :'rails.insights.metrics' => {
+        description: 'Enable automatic metric data collection for Ruby on Rails.',
+        default: false,
+        type: Boolean
+      },
       :'karafka.insights.enabled' => {
         description: 'Enable automatic data collection for Karafka.',
         default: true,
@@ -375,7 +406,7 @@ module Honeybadger
       },
       :'karafka.insights.metrics' => {
         description: 'Enable automatic metric data collection for Karafka.',
-        default: true,
+        default: false,
         type: Boolean
       },
       :'net_http.insights.enabled' => {
@@ -383,6 +414,16 @@ module Honeybadger
         default: true,
         type: Boolean
       },
+      :'net_http.insights.events' => {
+        description: 'Enable automatic event capturing for Net::HTTP requests.',
+        default: true,
+        type: Boolean
+      },
+      :'net_http.insights.metrics' => {
+        description: 'Enable automatic metric data collection for Net::HTTP requests.',
+        default: false,
+        type: Boolean
+      },
       :'net_http.insights.full_url' => {
         description: 'Record the full request url during instrumentation.',
         default: false,

data/lib/honeybadger/gauge.rb

@@ -19,6 +19,7 @@ module Honeybadger
     def payloads
       [
         {
+          total: @total,
           min: @min,
           max: @max,
           avg: @avg,

data/lib/honeybadger/histogram.rb

@@ -34,6 +34,7 @@ module Honeybadger
 
     def payloads
       [{
+        total: @total,
         min: @min,
         max: @max,
         avg: @avg,

data/lib/honeybadger/instrumentation.rb

@@ -134,7 +134,7 @@ module Honeybadger
       elsif block_given?
         value = yield
       else
-        value = attributes.delete(:value)
+        value = attributes.delete(:duration) || attributes.delete(:value)
       end
 
       Honeybadger::Gauge.register(registry, name, attributes).tap do |gauge|

data/lib/honeybadger/notification_subscriber.rb

@@ -3,6 +3,8 @@ require 'honeybadger/util/sql'
 
 module Honeybadger
   class NotificationSubscriber
+    include Honeybadger::InstrumentationHelper
+
     def start(name, id, payload)
       @start_time = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
     end
@@ -21,7 +23,29 @@ module Honeybadger
     end
 
     def record(name, payload)
-      Honeybadger.event(name, payload)
+      if Honeybadger.config.load_plugin_insights_events?(:rails)
+        Honeybadger.event(name, payload)
+      end
+
+      if Honeybadger.config.load_plugin_insights_metrics?(:rails)
+        metric_source 'rails'
+        record_metrics(name, payload)
+      end
+    end
+
+    def record_metrics(name, payload)
+      case name
+      when 'sql.active_record'
+        gauge('duration.sql.active_record', value: payload[:duration], **payload.slice(:query))
+      when 'process_action.action_controller'
+        gauge('duration.process_action.action_controller', value: payload[:duration], **payload.slice(:method, :controller, :action, :format, :status))
+        gauge('db_runtime.process_action.action_controller', value: payload[:db_runtime], **payload.slice(:method, :controller, :action, :format, :status))
+        gauge('view_runtime.process_action.action_controller', value: payload[:view_runtime], **payload.slice(:method, :controller, :action, :format, :status))
+      when 'perform.active_job'
+        gauge('duration.perform.active_job', value: payload[:duration], **payload.slice(:job_class, :queue_name))
+      when /^cache_.*.active_support$/
+        gauge("duration.#{name}", value: payload[:duration], **payload.slice(:store, :key))
+      end
     end
 
     def process?(event, payload)
@@ -109,22 +133,6 @@ module Honeybadger
     end
   end
 
-  class ActiveJobMetricsSubscriber < NotificationSubscriber
-    include Honeybadger::InstrumentationHelper
-
-    def format_payload(payload)
-      {
-        job_class: payload[:job].class.to_s,
-        queue_name: payload[:job].queue_name
-      }
-    end
-
-    def record(name, payload)
-      metric_source 'active_job'
-      histogram name, { bins: [30, 60, 120, 300, 1800, 3600, 21_600] }.merge(payload)
-    end
-  end
-
   class ActionMailerSubscriber < NotificationSubscriber
   end
 

data/lib/honeybadger/plugins/active_job.rb

@@ -55,7 +55,6 @@ module Honeybadger
 
           if config.load_plugin_insights?(:active_job)
             ::ActiveSupport::Notifications.subscribe(/(enqueue_at|enqueue|enqueue_retry|enqueue_all|perform|retry_stopped|discard)\.active_job/, Honeybadger::ActiveJobSubscriber.new)
-            ::ActiveSupport::Notifications.subscribe('perform.active_job', Honeybadger::ActiveJobMetricsSubscriber.new)
           end
         end
       end

data/lib/honeybadger/plugins/net_http.rb

@@ -7,6 +7,12 @@ module Honeybadger
   module Plugins
     module Net
       module HTTP
+        @@hb_config = ::Honeybadger.config
+
+        def self.set_hb_config(config)
+          @@hb_config = config
+        end
+
         def request(request_data, body = nil, &block)
           return super unless started?
           return super if hb?
@@ -18,19 +24,26 @@ module Honeybadger
               status: response_data.code.to_i
             }.merge(parsed_uri_data(request_data))
 
-            Honeybadger.event('request.net_http', context)
+            if @@hb_config.load_plugin_insights_events?(:net_http)
+              Honeybadger.event('request.net_http', context)
+            end
+
+            if @@hb_config.load_plugin_insights_metrics?(:net_http)
+              context.delete(:url)
+              Honeybadger.gauge('duration.request', context.merge(metric_source: 'net_http'))
+            end
           end[1] # return the response data only
         end
 
         def hb?
-          address.to_s[/#{Honeybadger.config[:'connection.host'].to_s}/]
+          address.to_s[/#{@@hb_config[:'connection.host'].to_s}/]
         end
 
         def parsed_uri_data(request_data)
           uri = request_data.uri || build_uri(request_data)
           {}.tap do |uri_data|
             uri_data[:host] = uri.host
-            uri_data[:url] = uri.to_s if Honeybadger.config[:'net_http.insights.full_url']
+            uri_data[:url] = uri.to_s if @@hb_config[:'net_http.insights.full_url']
           end
         end
 
@@ -43,6 +56,7 @@ module Honeybadger
           requirement { config.load_plugin_insights?(:net_http) }
 
           execution do
+            Honeybadger::Plugins::Net::HTTP.set_hb_config(config)
             ::Net::HTTP.send(:prepend, Honeybadger::Plugins::Net::HTTP)
           end
         end

data/lib/honeybadger/plugins/sidekiq.rb

@@ -38,10 +38,14 @@ module Honeybadger
             raise
           ensure
             context.merge!(duration: duration, status: status)
-            Honeybadger.event('perform.sidekiq', context)
+            if Honeybadger.config.load_plugin_insights_events?(:sidekiq)
+              Honeybadger.event('perform.sidekiq', context)
+            end
 
-            metric_source 'sidekiq'
-            histogram 'perform', { bins: [30, 60, 120, 300, 1800, 3600, 21_600] }.merge(context.slice(:worker, :queue, :duration))
+            if Honeybadger.config.load_plugin_insights_metrics?(:sidekiq)
+              metric_source 'sidekiq'
+              gauge 'perform', context.slice(:worker, :queue, :duration)
+            end
           end
         end
       end
@@ -55,7 +59,9 @@ module Honeybadger
             queue: queue
           }
 
-          Honeybadger.event('enqueue.sidekiq', context)
+          if Honeybadger.config.load_plugin_insights_events?(:sidekiq)
+            Honeybadger.event('enqueue.sidekiq', context)
+          end
 
           yield
         end

data/lib/honeybadger/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: honeybadger
 version: !ruby/object:Gem::Version
-  version: 5.19.2
+  version: 5.20.0
 platform: ruby
 authors:
 - Honeybadger Industries LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-05 00:00:00.000000000 Z
+date: 2024-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.5.22
 signing_key: 
 specification_version: 4
 summary: Error reports you can be happy about.