honeybadger 5.16.0 → 5.26.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6674f1772ae54868a913de6f2acdb4286500ffc165e0d5f171b322da91776f3
-  data.tar.gz: f22eb1fb98c3482bce89bf493dd9de0d2316e6aaf8026a57c9046728e7162c41
+  metadata.gz: a61036295da38a5d17bcc5061ccb9c07b106e3be1e7642d5561f8f876f9d7c7d
+  data.tar.gz: 8790ba8611d838ac98978976862fba259c3aa7bdeb070d7285e54d5659d456aa
 SHA512:
-  metadata.gz: 532f696d90a9d2ffb9343b5cf5a64bf3e2a38485360198d32b6d16a297819dd80dc58bdbca81a8b00da2a7c6e9a6cb1fafe7f77ee6b4f7cec586c0e726fabed2
-  data.tar.gz: 571036d50c716b884a2ea06cad05829ee182d6ee84a82a44b170fb030dc63d00e937afad62983d44eab64de3e2f9f94844c9c4d4aeaca9a1de6ebbec809056bb
+  metadata.gz: 6f8f7051e9326b04cf314ae0201606a8a558c66235066706df3c00f093318a126599eb055ed574accf9acc2048b015604e1778b19e4aacd5f0c8952264f6a207
+  data.tar.gz: 27251a44c22ffa1b1f7b244de298650e119dda596ebc5a9642800ac030f14232fcc938cc79386581b06c085beaa53573c28de876bd4974b8a3a6398912b8403d

data/CHANGELOG.md

@@ -1,6 +1,128 @@
 # Change Log
 
 
+## [5.26.4](https://github.com/honeybadger-io/honeybadger-ruby/compare/v5.26.3...v5.26.4) (2025-02-18)
+
+
+### Bug Fixes
+
+* ignore transactions with the immediate keyword ([#668](https://github.com/honeybadger-io/honeybadger-ruby/issues/668)) ([43e9ccb](https://github.com/honeybadger-io/honeybadger-ruby/commit/43e9ccb8afb86b6be340dba064af14c5cfd4929f))
+
+## [5.26.3](https://github.com/honeybadger-io/honeybadger-ruby/compare/v5.26.2...v5.26.3) (2025-02-10)
+
+
+### Bug Fixes
+
+* remove mail objects from ActionMailer events ([#664](https://github.com/honeybadger-io/honeybadger-ruby/issues/664)) ([07e0520](https://github.com/honeybadger-io/honeybadger-ruby/commit/07e0520ae1cd27beb16a96e075e64eb6463c97a8)), closes [#663](https://github.com/honeybadger-io/honeybadger-ruby/issues/663)
+
+## [5.26.2](https://github.com/honeybadger-io/honeybadger-ruby/compare/v5.26.1...v5.26.2) (2025-01-10)
+
+
+### Bug Fixes
+
+* ensure instrumentation durations are unique during threaded executions ([#658](https://github.com/honeybadger-io/honeybadger-ruby/issues/658)) ([4c3f0a6](https://github.com/honeybadger-io/honeybadger-ruby/commit/4c3f0a6e69e826b6664d4385009e67fb94c5160e))
+
+## [5.26.1](https://github.com/honeybadger-io/honeybadger-ruby/compare/v5.26.0...v5.26.1) (2024-12-17)
+
+
+### Bug Fixes
+
+* support Ruby 3.4 quote syntax in backtraces ([1655a04](https://github.com/honeybadger-io/honeybadger-ruby/commit/1655a041d707be1dcd8dd30314cc2383af084d8f))
+
+## [5.26.0](https://github.com/honeybadger-io/honeybadger-ruby/compare/v5.25.0...v5.26.0) (2024-11-27)
+
+
+### Features
+
+* use after_change for context changes ([#651](https://github.com/honeybadger-io/honeybadger-ruby/issues/651)) ([2cfc766](https://github.com/honeybadger-io/honeybadger-ruby/commit/2cfc766660d0462168aded9c34712904f8a1f774))
+
+## [5.25.0](https://github.com/honeybadger-io/honeybadger-ruby/compare/v5.24.0...v5.25.0) (2024-11-26)
+
+
+### Features
+
+* set context during rails error report ([#649](https://github.com/honeybadger-io/honeybadger-ruby/issues/649)) ([dee37e1](https://github.com/honeybadger-io/honeybadger-ruby/commit/dee37e157b0913e24a5d368e3d2cbe733f87214e))
+
+## [5.24.0](https://github.com/honeybadger-io/honeybadger-ruby/compare/v5.23.0...v5.24.0) (2024-11-21)
+
+
+### Features
+
+* skip middleware, plugins, and exception reporting when exceptions are disabled ([#646](https://github.com/honeybadger-io/honeybadger-ruby/issues/646)) ([6c4d7d5](https://github.com/honeybadger-io/honeybadger-ruby/commit/6c4d7d53f7356717894269b5fc9095621c9e8014))
+
+## [5.23.0](https://github.com/honeybadger-io/honeybadger-ruby/compare/v5.22.0...v5.23.0) (2024-11-19)
+
+
+### Features
+
+* update puma and autotuner plugins ([#644](https://github.com/honeybadger-io/honeybadger-ruby/issues/644)) ([1ed9687](https://github.com/honeybadger-io/honeybadger-ruby/commit/1ed96874c31c0273bc28cb917043f19140fd8204))
+
+## [5.22.0](https://github.com/honeybadger-io/honeybadger-ruby/compare/v5.21.0...v5.22.0) (2024-11-14)
+
+
+### Features
+
+* only allow for insights to be enabled when public ([#642](https://github.com/honeybadger-io/honeybadger-ruby/issues/642)) ([2d3ab26](https://github.com/honeybadger-io/honeybadger-ruby/commit/2d3ab26ca3673b5b01082d55737bf7907c02e799))
+
+## [5.21.0](https://github.com/honeybadger-io/honeybadger-ruby/compare/v5.20.1...v5.21.0) (2024-11-14)
+
+
+### Features
+
+* add event stats for sidekiq and sq ([#638](https://github.com/honeybadger-io/honeybadger-ruby/issues/638)) ([0d15bf5](https://github.com/honeybadger-io/honeybadger-ruby/commit/0d15bf543d4c425a2d9f6000d328dc0e71261647))
+* disable all workers in rails console ([#636](https://github.com/honeybadger-io/honeybadger-ruby/issues/636)) ([d0bcb42](https://github.com/honeybadger-io/honeybadger-ruby/commit/d0bcb4278ad84d02e3706766269582067bc76e29))
+* emit an event for karafka stats ([#637](https://github.com/honeybadger-io/honeybadger-ruby/issues/637)) ([e7e74b5](https://github.com/honeybadger-io/honeybadger-ruby/commit/e7e74b51324f7c718b1adc634cee4233d0c91813))
+
+## [5.20.1](https://github.com/honeybadger-io/honeybadger-ruby/compare/v5.20.0...v5.20.1) (2024-11-13)
+
+
+### Bug Fixes
+
+* cli test for rails 8 ([#639](https://github.com/honeybadger-io/honeybadger-ruby/issues/639)) ([ec74cfd](https://github.com/honeybadger-io/honeybadger-ruby/commit/ec74cfd95519cd49509ff63fb34a7673f5c76323))
+
+## [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)
+
+
+### Bug Fixes
+
+* don't run middleware in Sinatra when not configured ([#629](https://github.com/honeybadger-io/honeybadger-ruby/issues/629)) ([d84c2b1](https://github.com/honeybadger-io/honeybadger-ruby/commit/d84c2b15f61b1a019be6329981d8f5323115d1e9))
+* pin rspec-its gem to 1.3.1 ([#631](https://github.com/honeybadger-io/honeybadger-ruby/issues/631)) ([5f78b8a](https://github.com/honeybadger-io/honeybadger-ruby/commit/5f78b8adfb1b86c233bf9ad3ddb69dc702341e11))
+
+## [5.19.1](https://github.com/honeybadger-io/honeybadger-ruby/compare/v5.19.0...v5.19.1) (2024-11-02)
+
+
+### Bug Fixes
+
+* don't raise errors in instrumentation metrics ([#627](https://github.com/honeybadger-io/honeybadger-ruby/issues/627)) ([1231dae](https://github.com/honeybadger-io/honeybadger-ruby/commit/1231dae0c48a2fab4cdaa14f7308ab3e0b44c287))
+
+## [5.19.0](https://github.com/honeybadger-io/honeybadger-ruby/compare/v5.18.0...v5.19.0) (2024-10-29)
+
+
+### Features
+
+* improved karafka plugin for insights ([#625](https://github.com/honeybadger-io/honeybadger-ruby/issues/625)) ([21880fc](https://github.com/honeybadger-io/honeybadger-ruby/commit/21880fc92493abb044ba3c0d64299ad8b92ad5f3))
+
+## [5.18.0](https://github.com/honeybadger-io/honeybadger-ruby/compare/v5.17.0...v5.18.0) (2024-10-25)
+
+
+### Features
+
+* add a separate configuration for Insights in a console ([#623](https://github.com/honeybadger-io/honeybadger-ruby/issues/623)) ([a89488e](https://github.com/honeybadger-io/honeybadger-ruby/commit/a89488e535ff04ec2e362807f0001471ba5c6fe3))
+
+## [5.17.0](https://github.com/honeybadger-io/honeybadger-ruby/compare/v5.16.0...v5.17.0) (2024-10-22)
+
+
+### Features
+
+* add request_id to notices ([#619](https://github.com/honeybadger-io/honeybadger-ruby/issues/619)) ([fa4d878](https://github.com/honeybadger-io/honeybadger-ruby/commit/fa4d878ad0f0a5c37e49adeab1c53e6ffa463295)), closes [#616](https://github.com/honeybadger-io/honeybadger-ruby/issues/616)
+
 ## [5.16.0](https://github.com/honeybadger-io/honeybadger-ruby/compare/v5.15.6...v5.16.0) (2024-09-19)
 
 

data/lib/honeybadger/agent.rb

@@ -125,6 +125,11 @@ module Honeybadger
     # @return [String] UUID reference to the notice within Honeybadger.
     # @return [false] when ignored.
     def notify(exception_or_opts = nil, opts = {}, **kwargs)
+      if !config[:'exceptions.enabled']
+        debug { 'disabled feature=notices' }
+        return false
+      end
+
       opts = opts.dup
       opts.merge!(kwargs)
 
@@ -149,6 +154,7 @@ module Honeybadger
       opts[:rack_env] ||= context_manager.get_rack_env
       opts[:global_context] ||= context_manager.get_context
       opts[:breadcrumbs] ||= breadcrumbs.dup
+      opts[:request_id] ||= context_manager.get_request_id
 
       notice = Notice.new(config, opts)
 
@@ -376,6 +382,16 @@ module Honeybadger
       true
     end
 
+    # Stops the Honeybadger Insights related services.
+    #
+    # @example
+    #   Honeybadger.stop_insights # => nil
+    def stop_insights(force = false)
+      events_worker&.shutdown(force)
+      metrics_worker&.shutdown(force)
+      true
+    end
+
     # Sends event to events backend
     #
     # @example

data/lib/honeybadger/backend/test.rb

@@ -42,13 +42,17 @@ module Honeybadger
         self.class.check_ins
       end
 
+      def events
+        self.class.events
+      end
+
       def notify(feature, payload)
         notifications[feature] << payload
         super
       end
 
       def event(payload)
-        events << payload
+        events.concat(payload.dup)
         super
       end
 

data/lib/honeybadger/backtrace.rb

@@ -7,7 +7,8 @@ module Honeybadger
     # Handles backtrace parsing line by line.
     class Line
       # Backtrace line regexp (optionally allowing leading X: for windows support).
-      INPUT_FORMAT = %r{^((?:[a-zA-Z]:)?[^:]+):(\d+)(?::in `([^']+)')?$}.freeze
+      # Capture quoted strings either with leading backtick (pre Ruby 3.4) or single quote.
+      INPUT_FORMAT = %r{^((?:[a-zA-Z]:)?[^:]+):(\d+)(?::in (?:`|')([^']+)')?$}.freeze
 
       # The file portion of the line (such as app/models/user.rb).
       attr_reader :file

data/lib/honeybadger/breadcrumbs/active_support.rb

@@ -27,7 +27,7 @@ module Honeybadger
             exclude_when: lambda do |data|
               # Ignore schema, begin, and commit transaction queries
               data[:name] == "SCHEMA" ||
-                (data[:sql] && (Util::SQL.force_utf_8(data[:sql].dup) =~ /^(begin|commit)( transaction)?$/i))
+                (data[:sql] && (Util::SQL.force_utf_8(data[:sql].dup) =~ /^(begin|commit)( immediate)?( transaction)?$/i))
             end
           },
 

data/lib/honeybadger/cli/test.rb

@@ -142,6 +142,7 @@ module Honeybadger
         end
         CONTROLLER
 
+        ::Rails.application.try(:reload_routes_unless_loaded)
         ::Rails.application.routes.tap do |r|
           # RouteSet#disable_clear_and_finalize prevents existing routes from
           # being cleared. We'll set it back to the original value when we're

data/lib/honeybadger/config/defaults.rb

@@ -32,8 +32,10 @@ module Honeybadger
                       'Sidekiq::JobRetry::Skip'].map(&:freeze).freeze
 
     IGNORE_EVENTS_DEFAULT = [
-      { event_type: 'sql.active_record', query: /^(begin|commit)( transaction)?$/i },
+      { event_type: 'metric.hb', metric_name: 'duration.sql.active_record', query: /^(begin|commit)( immediate)?( transaction)?$/i },
+      { event_type: 'sql.active_record', query: /^(begin|commit)( immediate)?( transaction)?$/i },
       { event_type: 'sql.active_record', query: /(solid_queue|good_job)/i },
+      { event_type: 'sql.active_record', name: /^GoodJob/ },
       { event_type: 'process_action.action_controller', controller: 'Rails::HealthController' }
     ].freeze
 
@@ -342,6 +344,21 @@ module Honeybadger
         default: true,
         type: Boolean
       },
+      :'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
+      },
       :'sidekiq.insights.cluster_collection' => {
         description: 'Collect cluster based metrics for Sidekiq.',
         default: true,
@@ -349,9 +366,24 @@ module Honeybadger
       },
       :'sidekiq.insights.collection_interval' => {
         description: 'The frequency in which Sidekiq cluster metrics are sampled.',
-        default: 60,
+        default: 5,
         type: Integer
       },
+      :'solid_queue.insights.enabled' => {
+        description: 'Enable automatic data collection for SolidQueue.',
+        default: true,
+        type: Boolean
+      },
+      :'solid_queue.insights.events' => {
+        description: 'Enable automatic event capturing for SolidQueue.',
+        default: true,
+        type: Boolean
+      },
+      :'solid_queue.insights.metrics' => {
+        description: 'Enable automatic metric data collection for SolidQueue.',
+        default: false,
+        type: Boolean
+      },
       :'solid_queue.insights.cluster_collection' => {
         description: 'Collect cluster based metrics for SolidQueue.',
         default: true,
@@ -359,14 +391,54 @@ module Honeybadger
       },
       :'solid_queue.insights.collection_interval' => {
         description: 'The frequency in which SolidQueue cluster metrics are sampled.',
-        default: 60,
+        default: 5,
         type: Integer
       },
+      :'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,
+        type: Boolean
+      },
+      :'karafka.insights.events' => {
+        description: 'Enable automatic event capturing for Karafka.',
+        default: true,
+        type: Boolean
+      },
+      :'karafka.insights.metrics' => {
+        description: 'Enable automatic metric data collection for Karafka.',
+        default: false,
+        type: Boolean
+      },
       :'net_http.insights.enabled' => {
         description: 'Allow automatic instrumentation of Net::HTTP requests.',
         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,
@@ -410,10 +482,40 @@ module Honeybadger
         default: false,
         type: Boolean
       },
+      :'insights.console.enabled' => {
+        description: "Enable/Disable Honeybadger Insights built-in instrumentation in a Rails console.",
+        default: false,
+        type: Boolean
+      },
       :'insights.registry_flush_interval' => {
         description: "Number of seconds between registry flushes.",
         default: 60,
         type: Integer
+      },
+      :'puma.insights.events' => {
+        description: 'Enable automatic event capturing for Puma stats.',
+        default: true,
+        type: Boolean
+      },
+      :'puma.insights.metrics' => {
+        description: 'Enable automatic metric data aggregation for Puma stats.',
+        default: false,
+        type: Boolean
+      },
+      :'puma.insights.collection_interval' => {
+        description: 'The frequency in which the Honeybadger gem will collect Puma stats.',
+        default: 1,
+        type: Integer
+      },
+      :'autotuner.insights.events' => {
+        description: 'Enable automatic event capturing for Autotuner stats.',
+        default: true,
+        type: Boolean
+      },
+      :'autotuner.insights.metrics' => {
+        description: 'Enable automatic metric data aggregation for Autotuner stats.',
+        default: false,
+        type: Boolean
       }
     }.freeze
 

data/lib/honeybadger/config.rb

@@ -289,7 +289,7 @@ module Honeybadger
     end
 
     def insights_enabled?
-      !!self[:'insights.enabled']
+      public? && !!self[:'insights.enabled']
     end
 
     def cluster_collection?(name)
@@ -309,6 +309,20 @@ module Honeybadger
       !!self[:"#{name}.insights.enabled"]
     end
 
+    def load_plugin_insights_events?(name)
+      return false unless insights_enabled?
+      return false unless load_plugin_insights?(name)
+      return true if self[:"#{name}.insights.events"].nil?
+      !!self[:"#{name}.insights.events"]
+    end
+
+    def load_plugin_insights_metrics?(name)
+      return false unless insights_enabled?
+      return false unless load_plugin_insights?(name)
+      return true if self[:"#{name}.insights.metrics"].nil?
+      !!self[:"#{name}.insights.metrics"]
+    end
+
     def root_regexp
       return @root_regexp if @root_regexp
       return nil if @no_root

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

@@ -9,6 +9,15 @@ module Honeybadger
       return unless value
 
       @samples += 1
+
+      @total ||= 0
+      @total = @total + value
+
+      @min = value if @min.nil? || @min > value
+      @max = value if @max.nil? || @max < value
+      @avg = @total.to_f / @samples
+      @latest = value
+
       @bin_counts ||= Hash.new(0)
       @bin_counts[find_bin(value)] += 1
     end
@@ -25,6 +34,11 @@ module Honeybadger
 
     def payloads
       [{
+        total: @total,
+        min: @min,
+        max: @max,
+        avg: @avg,
+        latest: @latest,
         bins: (bins + [INFINITY]).map { |bin| [bin.to_f, @bin_counts[bin]] }
       }]
     end

data/lib/honeybadger/init/hanami.rb

@@ -8,7 +8,7 @@ Honeybadger.init!({
 
 Honeybadger.load_plugins!
 
-if Hanami::VERSION >= '2.0'
+if Hanami::VERSION >= '2.0' && Honeybadger.config[:'exceptions.enabled']
   Hanami.app.instance_eval do
     config.middleware.use Honeybadger::Rack::UserFeedback
     config.middleware.use Honeybadger::Rack::UserInformer

data/lib/honeybadger/init/rails.rb

@@ -14,9 +14,11 @@ module Honeybadger
         initializer 'honeybadger.install_middleware' do |app|
           honeybadger_config = Honeybadger::Agent.instance.config
 
-          app.config.middleware.insert(0, Honeybadger::Rack::ErrorNotifier)
-          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']
+          if honeybadger_config[:'exceptions.enabled']
+            app.config.middleware.insert(0, Honeybadger::Rack::ErrorNotifier)
+            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
         end
 
         config.before_initialize do
@@ -34,7 +36,10 @@ module Honeybadger
         end
 
         console do
-          Honeybadger::Agent.instance.config[:'insights.enabled'] = false unless Honeybadger::Agent.instance.config.env.has_key?(:'insights.enabled')
+          unless Honeybadger::Agent.instance.config[:'insights.enabled'] = Honeybadger::Agent.instance.config[:'insights.console.enabled']
+            Honeybadger::Agent.instance.config.logger.debug("Rails console detected, shutting down Honeybadger Insights workers.")
+            Honeybadger::Agent.instance.stop_insights
+          end
         end
       end
     end

data/lib/honeybadger/init/sinatra.rb

@@ -31,8 +31,8 @@ module Honeybadger
             if config[:'exceptions.enabled']
               # These two must come before the ErrorNotifier, since an error/response
               # passes through middleware from inner to outer (bottom to top)
-              install_honeybadger_middleware(Honeybadger::Rack::UserFeedback)
-              install_honeybadger_middleware(Honeybadger::Rack::UserInformer)
+              install_honeybadger_middleware(Honeybadger::Rack::UserFeedback) if config[:'feedback.enabled']
+              install_honeybadger_middleware(Honeybadger::Rack::UserInformer) if config[:'user_informer.enabled']
               install_honeybadger_middleware(Honeybadger::Rack::ErrorNotifier)
             end
           end

data/lib/honeybadger/instrumentation.rb

@@ -47,66 +47,102 @@ module Honeybadger
     def time(name, *args)
       attributes = extract_attributes(args)
       callable = extract_callable(args)
-      duration = attributes.delete(:duration)
+      value = nil
 
       if callable
-        duration = monotonic_timer{ callable.call }[0]
+        value = monotonic_timer{ callable.call }[0]
       elsif block_given?
-        duration = monotonic_timer{ yield }[0]
+        value = monotonic_timer{ yield }[0]
+      else
+        value = attributes.delete(:duration) || attributes.delete(:value)
       end
 
-      raise 'No duration found' if duration.nil?
-
       Honeybadger::Timer.register(registry, name, attributes).tap do |timer|
-        timer.record(duration)
+        if value.nil?
+          agent.config.logger.warn("No value found for timer #{name}. Must specify either duration or value. Skipping.")
+        else
+          timer.record(value)
+        end
       end
     end
 
     def histogram(name, *args)
       attributes = extract_attributes(args)
       callable = extract_callable(args)
-      duration = attributes.delete(:duration)
+      value = nil
 
       if callable
-        duration = monotonic_timer{ callable.call }[0]
+        value = monotonic_timer{ callable.call }[0]
       elsif block_given?
-        duration = monotonic_timer{ yield }[0]
+        value = monotonic_timer{ yield }[0]
+      else
+        value = attributes.delete(:duration) || attributes.delete(:value)
       end
 
-      raise 'No duration found' if duration.nil?
-
       Honeybadger::Histogram.register(registry, name, attributes).tap do |histogram|
-        histogram.record(duration)
+        if value.nil?
+          agent.config.logger.warn("No value found for histogram #{name}. Must specify either duration or value. Skipping.")
+        else
+          histogram.record(value)
+        end
       end
     end
 
     def increment_counter(name, *args)
       attributes = extract_attributes(args)
-      by = extract_callable(args)&.call || attributes.delete(:by) || 1
-      by = yield if block_given?
+      callable = extract_callable(args)
+      value = nil
+
+      if callable
+        value = callable.call
+      elsif block_given?
+        value = yield
+      else
+        value = attributes.delete(:by) || attributes.delete(:value) || 1
+      end
 
       Honeybadger::Counter.register(registry, name, attributes).tap do |counter|
-        counter.count(by)
+        counter.count(value)
       end
     end
 
     def decrement_counter(name, *args)
       attributes = extract_attributes(args)
-      by = extract_callable(args)&.call || attributes.delete(:by) || 1
-      by = yield if block_given?
+      callable = extract_callable(args)
+      value = nil
+
+      if callable
+        value = callable.call
+      elsif block_given?
+        value = yield
+      else
+        value = attributes.delete(:by) || attributes.delete(:value) || 1
+      end
 
       Honeybadger::Counter.register(registry, name, attributes).tap do |counter|
-        counter.count(by * -1)
+        counter.count(value * -1)
       end
     end
 
     def gauge(name, *args)
       attributes = extract_attributes(args)
-      value = extract_callable(args)&.call || attributes.delete(:value)
-      value = yield if block_given?
+      callable = extract_callable(args)
+      value = nil
+
+      if callable
+        value = callable.call
+      elsif block_given?
+        value = yield
+      else
+        value = attributes.delete(:duration) || attributes.delete(:value)
+      end
 
       Honeybadger::Gauge.register(registry, name, attributes).tap do |gauge|
-        gauge.record(value)
+        if value.nil?
+          agent.config.logger.warn("No value found for gauge #{name}. Must specify value. Skipping.")
+        else
+          gauge.record(value)
+        end
       end
     end