appsignal 3.1.1-java → 3.1.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be534a2bce153240d9a00c15ee4f177cec58a0a40df738ddd66e7afba50a1d0c
-  data.tar.gz: 0d9c3820cfe794ccabbcc1cda65fafec925cda36690b4caa179170e07a38a25c
+  metadata.gz: 11a83cde5a5fd83b9e14f1429d5a9f695d080ffc2ac729a02f83f3b891b812c3
+  data.tar.gz: 53743646f5cf821ab45559817cf65c2bf9ed483184725fca2413b3606fad6e1e
 SHA512:
-  metadata.gz: 4dd0efe8930f19068dbf54ab0709f3bed422ac67bd2974b348f5d6eddcb054da09df59fb992a41802ddb0e7ed0de986a6b67f484779409d7b227c32451f3b6f0
-  data.tar.gz: 0167fd0f1bfa054e46f20ab12680529913da7b5b702fc119cbdb43e78e2e8cf3f459e7b4236413f394e51a0ed935e597806b8836b20d702ede7d0f26780f2590
+  metadata.gz: 3e56000d21fc9cb56edc28ef15ad22d8ab493d081e8e88d8e112c592b7a8bf93c3ac2d0a24b2ea97b7cc85f26fe2fdbdf751894c4fb156f3189bc962504f93d5
+  data.tar.gz: b03a309a6c8649397e6f5d9b62a65324e4b4e39a3a1eee77b6cb60280758838212e2de7ca3eb28c8f10b3b59cb5b02ca7d88347cc9f3995be0308bf5249cae70

data/CHANGELOG.md

@@ -1,5 +1,45 @@
 # AppSignal for Ruby gem Changelog
 
+## 3.1.4
+
+### Added
+
+- [ffe49cfe](https://github.com/appsignal/appsignal-ruby/commit/ffe49cfe94f5269e59d6f168a73114f7a3914f79) patch - Support temporarily disabling GC profiling without reporting inaccurate `gc_time` metric durations. The MRI probe's `gc_time` will not report any value when the `GC::Profiler.enabled?` returns `false`.
+
+### Changed
+
+- [af7e666c](https://github.com/appsignal/appsignal-ruby/commit/af7e666cf173ec1f42e9cf3fce2ab6c8e658440c) patch - Listen if the Ruby Garbage Collection profiler is enabled and collect how long the GC is running for the Ruby VM magic dashboard. An app will need to call `GC::Profiler.enable` to enable the GC profiler. Do not enable this in production environments, or at least not for long, because this can negatively impact performance of apps.
+
+### Fixed
+
+- [b3a163be](https://github.com/appsignal/appsignal-ruby/commit/b3a163be154796e1f358c5061eaee99845c960ee) patch - Fix the MRI probe using the Garbage Collection profiler instead of the NilProfiler when garbage collection instrumentation is not enabled for MRI probe. This caused unnecessary overhead.
+
+## 3.1.3
+
+### Added
+
+- [811a1082](https://github.com/appsignal/appsignal-ruby/commit/811a10825043ed584f23d870e3a420ee409eb151) patch - Add the `Transaction.current?` helper to determine if any Transaction is currently active or not. AppSignal `NilTransaction`s are not considered active transactions.
+
+### Changed
+
+- [dc50d889](https://github.com/appsignal/appsignal-ruby/commit/dc50d8892699bf17b2399865ead8b27ce45b60ed) patch - Rename the (so far privately reported) `gc_total_time` metric to `gc_time`. It no longer reports the total time of Garbage Collection measured, but only the time between two (minutely) measurements.
+
+### Fixed
+
+- [7cfed987](https://github.com/appsignal/appsignal-ruby/commit/7cfed98761cf81d475261c553486b24843460cf3) patch - Fix error on unknown HTTP request method. When a request is made with an unknown request method, triggering and `ActionController::UnknownHttpMethod`, it will no longer break the AppSignal instrumentation but omit the request method in the sample data.
+
+## 3.1.2
+
+### Changed
+
+- [1b95bb4c](https://github.com/appsignal/appsignal-ruby/commit/1b95bb4c8df08128cfa2db0d918ffcb909e5ee4c) patch - Report Garbage Collection total time metric as the delta between measurements. This reports a more user friendly metric that doesn't always goes up until the app restarts or gets a new deploy. This metric is reported 0 by default without `GC::Profiler.enable` having been called.
+- [61a78fb0](https://github.com/appsignal/appsignal-ruby/commit/61a78fb028b04ae6f0a4ca1fc469d744f23c5029) patch - Bump agent to 06391fb
+  
+  - Accept "warning" value for the `log_level` config option.
+  - Add aarch64 Linux musl build.
+  - Improve debug logging from the extension.
+  - Fix high CPU issue for appsignal-agent when nothing could be read from the socket.
+
 ## 3.1.1
 
 ### Changed

data/appsignal.gemspec

@@ -39,12 +39,16 @@ Gem::Specification.new do |gem| # rubocop:disable Metrics/BlockLength
   gem.add_development_dependency "rake", ">= 12"
   gem.add_development_dependency "rspec", "~> 3.8"
   gem.add_development_dependency "timecop"
-  gem.add_development_dependency "webmock"
   gem.add_development_dependency "yard", ">= 0.9.20"
   gem.add_development_dependency "pry"
 
   # Dependencies that need to be locked to a specific version in developement
   ruby_version = Gem::Version.new(RUBY_VERSION)
+  if ruby_version < Gem::Version.new("2.3.0")
+    gem.add_development_dependency "webmock", "3.14.0"
+  else
+    gem.add_development_dependency "webmock"
+  end
   if ruby_version > Gem::Version.new("2.5.0")
     # RuboCop dependency parallel depends on Ruby > 2.4
     gem.add_development_dependency "rubocop", "0.50.0"

data/ext/agent.yml

@@ -3,92 +3,99 @@
 # appsignal-agent repository.
 # Modifications to this file will be overwritten with the next agent release.
 ---
-version: d573c9b
+version: '06391fb'
 mirrors:
 - https://appsignal-agent-releases.global.ssl.fastly.net
 - https://d135dj0rjqvssy.cloudfront.net
 triples:
   x86_64-darwin:
     static:
-      checksum: a9a86594e50f22e7f7fd93a050e334048248a6dc971015e66c26150c4a689345
+      checksum: 9bf41c183d94c80e980f57ea2e29d08bae97e8097b5284a2b91a5484bf866f8c
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 04a69d0b608aa0e834c96c75a3bb226e7ca252fd2c74e439fdd43bf297d6bde2
+      checksum: 4d3789e65cf00e446600e883d95d097323ebb3835703c67c8d09f434f09ab496
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   universal-darwin:
     static:
-      checksum: a9a86594e50f22e7f7fd93a050e334048248a6dc971015e66c26150c4a689345
+      checksum: 9bf41c183d94c80e980f57ea2e29d08bae97e8097b5284a2b91a5484bf866f8c
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 04a69d0b608aa0e834c96c75a3bb226e7ca252fd2c74e439fdd43bf297d6bde2
+      checksum: 4d3789e65cf00e446600e883d95d097323ebb3835703c67c8d09f434f09ab496
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   aarch64-darwin:
     static:
-      checksum: 92f7f71b685985b310a9f3693a96a5db6b9133b0af807d000b90248e097063c7
+      checksum: 74edd7b97995f3314c10e3d84fc832c1b842c236c331ed4f2f77146ad004d179
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: ffb54af4c35dd281a4735b57d8e537b8b08e87e08841e5d344caff325948a9e8
+      checksum: 7165bb164a9cd7a2a5f97897d954390412f7034c667e5826b3307ffbd848bff9
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   arm64-darwin:
     static:
-      checksum: 92f7f71b685985b310a9f3693a96a5db6b9133b0af807d000b90248e097063c7
+      checksum: 74edd7b97995f3314c10e3d84fc832c1b842c236c331ed4f2f77146ad004d179
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: ffb54af4c35dd281a4735b57d8e537b8b08e87e08841e5d344caff325948a9e8
+      checksum: 7165bb164a9cd7a2a5f97897d954390412f7034c667e5826b3307ffbd848bff9
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   arm-darwin:
     static:
-      checksum: 92f7f71b685985b310a9f3693a96a5db6b9133b0af807d000b90248e097063c7
+      checksum: 74edd7b97995f3314c10e3d84fc832c1b842c236c331ed4f2f77146ad004d179
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: ffb54af4c35dd281a4735b57d8e537b8b08e87e08841e5d344caff325948a9e8
+      checksum: 7165bb164a9cd7a2a5f97897d954390412f7034c667e5826b3307ffbd848bff9
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   aarch64-linux:
     static:
-      checksum: 79f1e7f9c34ab36c06d5c3d676173ee7c1219af2f51dc77865897598dc01349a
+      checksum: 0f2430e637eb77ce2093f021777087e87cb1e7be7c86a53771172696791c4879
       filename: appsignal-aarch64-linux-all-static.tar.gz
     dynamic:
-      checksum: cfd8e98238e2c7cdb10c0e136c47ab8e2dacab0a14d8ccf0e4c6c14946e325f1
+      checksum: 0e4f9305aeaaa2d7847e83be04227b865723a0591574108d78040b5921a677a7
       filename: appsignal-aarch64-linux-all-dynamic.tar.gz
   i686-linux:
     static:
-      checksum: 835c6f823a2c6e9f8fa12704bf0953e3610dc9836355b57d2d6981e6ae412fb4
+      checksum: 449ba623aaa1853c2d211bf1e2d3a14e5ae09225a62457cbdbcc0983a5713a52
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: febc5d80a7b0fd9644e2d68d068d28c66359bbef9473f01e9f71fb07fd73bcb8
+      checksum: dae994292d602eaf0910bd2ce53f0163e19767a4cbb8e5d0db99c0010d6df486
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86-linux:
     static:
-      checksum: 835c6f823a2c6e9f8fa12704bf0953e3610dc9836355b57d2d6981e6ae412fb4
+      checksum: 449ba623aaa1853c2d211bf1e2d3a14e5ae09225a62457cbdbcc0983a5713a52
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: febc5d80a7b0fd9644e2d68d068d28c66359bbef9473f01e9f71fb07fd73bcb8
+      checksum: dae994292d602eaf0910bd2ce53f0163e19767a4cbb8e5d0db99c0010d6df486
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86_64-linux:
     static:
-      checksum: 6eb6f0df2f8c62a29769bf7f21cefaec92a24ee0ab363acc5bd4f9c2d1241c53
+      checksum: 394796c0ddeb4881c9f2e6ce82f840e66bcb69e027324f6c04f6671067445fbb
       filename: appsignal-x86_64-linux-all-static.tar.gz
     dynamic:
-      checksum: ce710ff2edea2fc7b3b6bafd10af849e95f513abf5d775b9a8361ffed45b70c3
+      checksum: 9ca4762c464482b0a5a89898a839388597dd57a17a21527a67f3e3db0e540a03
       filename: appsignal-x86_64-linux-all-dynamic.tar.gz
   x86_64-linux-musl:
     static:
-      checksum: b16d46074527da5700e10e5a8b176aeb46b7bbb19431653029eda04437bef918
+      checksum: 673271c8c5fd55053d8a719bcd307f787db4ca4633baf8cf961c442bf1805614
       filename: appsignal-x86_64-linux-musl-all-static.tar.gz
     dynamic:
-      checksum: 261b79ab790e6a12a748d4649a4389e96d5cf7d1f981c3b56ed331f164d1627b
+      checksum: 609d59376d6633652015e838eb649229fe2523d443a5471232b869f48eb99640
       filename: appsignal-x86_64-linux-musl-all-dynamic.tar.gz
+  aarch64-linux-musl:
+    static:
+      checksum: e90ca19bf61596be022ba04897e8902b3401add58f351a40a3d3a7af241d0bbb
+      filename: appsignal-aarch64-linux-musl-all-static.tar.gz
+    dynamic:
+      checksum: afb66c65fb82b672887bc6b6e82d82f09d9855a5497a7abb06b438dadea97aca
+      filename: appsignal-aarch64-linux-musl-all-dynamic.tar.gz
   x86_64-freebsd:
     static:
-      checksum: e7bfc1dc355ce1237aaee6fdf967c78ecca533db41b09c2b10716e7f8593dbe0
+      checksum: cb45da91c51123859e5ef5cea850460c28d6e77dfa08b90375178d9017162ba8
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 97af9419cf00e22ea544a2365785a6b5df2a990f17e7735b3bbec1a690b68f0b
+      checksum: 6a03e02c2526e05edaa7fa932b2e764318c63ec93d517c6c00f6b7541bfe71f3
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz
   amd64-freebsd:
     static:
-      checksum: e7bfc1dc355ce1237aaee6fdf967c78ecca533db41b09c2b10716e7f8593dbe0
+      checksum: cb45da91c51123859e5ef5cea850460c28d6e77dfa08b90375178d9017162ba8
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 97af9419cf00e22ea544a2365785a6b5df2a990f17e7735b3bbec1a690b68f0b
+      checksum: 6a03e02c2526e05edaa7fa932b2e764318c63ec93d517c6c00f6b7541bfe71f3
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz

data/lib/appsignal/config.rb

@@ -15,7 +15,6 @@ module Appsignal
       :debug                          => false,
       :dns_servers                    => [],
       :enable_allocation_tracking     => true,
-      :enable_gc_instrumentation      => false,
       :enable_host_metrics            => true,
       :enable_minutely_probes         => true,
       :enable_statsd                  => true,
@@ -63,7 +62,6 @@ module Appsignal
       "APPSIGNAL_DEBUG"                          => :debug,
       "APPSIGNAL_DNS_SERVERS"                    => :dns_servers,
       "APPSIGNAL_ENABLE_ALLOCATION_TRACKING"     => :enable_allocation_tracking,
-      "APPSIGNAL_ENABLE_GC_INSTRUMENTATION"      => :enable_gc_instrumentation,
       "APPSIGNAL_ENABLE_HOST_METRICS"            => :enable_host_metrics,
       "APPSIGNAL_ENABLE_MINUTELY_PROBES"         => :enable_minutely_probes,
       "APPSIGNAL_ENABLE_STATSD"                  => :enable_statsd,
@@ -114,7 +112,6 @@ module Appsignal
       APPSIGNAL_ACTIVE
       APPSIGNAL_DEBUG
       APPSIGNAL_ENABLE_ALLOCATION_TRACKING
-      APPSIGNAL_ENABLE_GC_INSTRUMENTATION
       APPSIGNAL_ENABLE_HOST_METRICS
       APPSIGNAL_ENABLE_MINUTELY_PROBES
       APPSIGNAL_ENABLE_STATSD

data/lib/appsignal/garbage_collection.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+module Appsignal
+  # @api private
+  module GarbageCollection
+    # Return the GC profiler wrapper.
+    #
+    # Returns {Profiler} if the Ruby Garbage Collection profiler is enabled.
+    # This is checked by calling `GC::Profiler.enabled?`.
+    #
+    # GC profiling is disabled by default due to the overhead it causes. Do not
+    # enable this in production for long periods of time.
+    def self.profiler
+      # Cached instances so it doesn't create a new object every time this
+      # method is called. Especially necessary for the {Profiler} because a new
+      # instance will have a new internal time counter.
+      @real_profiler ||= Profiler.new
+      @nil_profiler ||= NilProfiler.new
+
+      enabled? ? @real_profiler : @nil_profiler
+    end
+
+    # Check if Garbage Collection is enabled at the moment.
+    #
+    # @return [Boolean]
+    def self.enabled?
+      GC::Profiler.enabled?
+    end
+
+    # Unset the currently cached profilers.
+    #
+    # @return [void]
+    def self.clear_profiler!
+      @real_profiler = nil
+      @nil_profiler = nil
+    end
+
+    # A wrapper around Ruby's `GC::Profiler` that tracks garbage collection
+    # time, while clearing `GC::Profiler`'s total_time to make sure it doesn't
+    # leak memory by keeping garbage collection run samples in memory.
+    class Profiler
+      def self.lock
+        @lock ||= Mutex.new
+      end
+
+      def initialize
+        @total_time = 0
+      end
+
+      # Whenever {#total_time} is called, the current `GC::Profiler#total_time`
+      # gets added to `@total_time`, after which `GC::Profiler.clear` is called
+      # to prevent it from leaking memory. A class-level lock is used to make
+      # sure garbage collection time is never counted more than once.
+      #
+      # Whenever `@total_time` gets above two billion milliseconds (about 23
+      # days), it's reset to make sure the result fits in a signed 32-bit
+      # integer.
+      #
+      # @return [Integer]
+      def total_time
+        lock.synchronize do
+          @total_time += (internal_profiler.total_time * 1000).round
+          internal_profiler.clear
+        end
+
+        @total_time = 0 if @total_time > 2_000_000_000
+
+        @total_time
+      end
+
+      private
+
+      def internal_profiler
+        GC::Profiler
+      end
+
+      def lock
+        self.class.lock
+      end
+    end
+
+    # A dummy profiler that always returns 0 as the total time. Used when GC
+    # profiler is disabled.
+    class NilProfiler
+      def total_time
+        0
+      end
+    end
+  end
+end

data/lib/appsignal/helpers/instrumentation.rb

@@ -325,7 +325,8 @@ module Appsignal
             "value is not an exception: #{exception.inspect}"
           return
         end
-        return if !active? || Appsignal::Transaction.current.nil?
+        return if !active? || !Appsignal::Transaction.current?
+
         transaction = Appsignal::Transaction.current
         transaction.set_error(exception)
         transaction.set_tags(tags) if tags
@@ -359,7 +360,7 @@ module Appsignal
       # @since 2.2.0
       def set_action(action)
         return if !active? ||
-            Appsignal::Transaction.current.nil? ||
+            !Appsignal::Transaction.current? ||
             action.nil?
         Appsignal::Transaction.current.set_action(action)
       end
@@ -398,7 +399,7 @@ module Appsignal
       # @since 2.2.0
       def set_namespace(namespace)
         return if !active? ||
-            Appsignal::Transaction.current.nil? ||
+            !Appsignal::Transaction.current? ||
             namespace.nil?
         Appsignal::Transaction.current.set_namespace(namespace)
       end
@@ -438,8 +439,9 @@ module Appsignal
       #   Tagging guide
       def tag_request(tags = {})
         return unless active?
+        return unless Appsignal::Transaction.current?
+
         transaction = Appsignal::Transaction.current
-        return false unless transaction
         transaction.set_tags(tags)
       end
       alias :tag_job :tag_request
@@ -471,8 +473,9 @@ module Appsignal
       # @since 2.12.0
       def add_breadcrumb(category, action, message = "", metadata = {}, time = Time.now.utc)
         return unless active?
+        return unless Appsignal::Transaction.current?
+
         transaction = Appsignal::Transaction.current
-        return false unless transaction
         transaction.add_breadcrumb(category, action, message, metadata, time)
       end
 

data/lib/appsignal/hooks/active_job.rb

@@ -20,9 +20,11 @@ module Appsignal
       module ActiveJobClassInstrumentation
         def execute(job)
           job_status = nil
-          current_transaction = Appsignal::Transaction.current
+          has_wrapper_transaction = Appsignal::Transaction.current?
           transaction =
-            if current_transaction.nil_transaction?
+            if has_wrapper_transaction
+              Appsignal::Transaction.current
+            else
               # No standalone integration started before ActiveJob integration.
               # We don't have a separate integration for this QueueAdapter like
               # we do for Sidekiq.
@@ -33,8 +35,6 @@ module Appsignal
                 Appsignal::Transaction::BACKGROUND_JOB,
                 Appsignal::Transaction::GenericRequest.new({})
               )
-            else
-              current_transaction
             end
 
           super
@@ -64,7 +64,7 @@ module Appsignal
               transaction.set_queue_start((Time.parse(enqueued_at).to_f * 1_000).to_i)
             end
 
-            if current_transaction.nil_transaction?
+            unless has_wrapper_transaction
               # Only complete transaction if ActiveJob is not wrapped in
               # another supported integration, such as Sidekiq.
               Appsignal::Transaction.complete_current!

data/lib/appsignal/integrations/mongo_ruby_driver.rb

@@ -6,8 +6,9 @@ module Appsignal
     class MongoMonitorSubscriber
       # Called by Mongo::Monitor when query starts
       def started(event)
+        return unless Appsignal::Transaction.current?
+
         transaction = Appsignal::Transaction.current
-        return if transaction.nil_transaction?
         return if transaction.paused?
 
         # Format the command
@@ -36,8 +37,9 @@ module Appsignal
 
       # Finishes the event in the AppSignal extension
       def finish(result, event)
+        return unless Appsignal::Transaction.current?
+
         transaction = Appsignal::Transaction.current
-        return if transaction.nil_transaction?
         return if transaction.paused?
 
         # Get the query from the transaction store

data/lib/appsignal/integrations/sidekiq.rb

@@ -10,21 +10,24 @@ module Appsignal
     # @api private
     class SidekiqErrorHandler
       def call(exception, sidekiq_context)
-        transaction = Appsignal::Transaction.current
-
-        if transaction.nil_transaction?
-          # Sidekiq error outside of the middleware scope.
-          # Can be a job JSON parse error or some other error happening in
-          # Sidekiq.
-          transaction = Appsignal::Transaction.create(
-            SecureRandom.uuid, # Newly generated job id
-            Appsignal::Transaction::BACKGROUND_JOB,
-            Appsignal::Transaction::GenericRequest.new({})
-          )
-          transaction.set_action_if_nil("SidekiqInternal")
-          transaction.set_metadata("sidekiq_error", sidekiq_context[:context])
-          transaction.params = { :jobstr => sidekiq_context[:jobstr] }
-        end
+        transaction =
+          if Appsignal::Transaction.current?
+            Appsignal::Transaction.current
+          else
+            # Sidekiq error outside of the middleware scope.
+            # Can be a job JSON parse error or some other error happening in
+            # Sidekiq.
+            transaction =
+              Appsignal::Transaction.create(
+                SecureRandom.uuid, # Newly generated job id
+                Appsignal::Transaction::BACKGROUND_JOB,
+                Appsignal::Transaction::GenericRequest.new({})
+              )
+            transaction.set_action_if_nil("SidekiqInternal")
+            transaction.set_metadata("sidekiq_error", sidekiq_context[:context])
+            transaction.params = { :jobstr => sidekiq_context[:jobstr] }
+            transaction
+          end
 
         transaction.set_error(exception)
         Appsignal::Transaction.complete_current!

data/lib/appsignal/probes/helpers.rb

@@ -7,22 +7,35 @@ module Appsignal
         @gauge_delta_cache ||= {}
       end
 
-      # Calculate the delta of two values for a gauge metric
+      # Calculate the delta of two values for a gauge metric.
       #
-      # First call will store the data for the metric in the cache and the
-      # second call will return the delta of the gauge metric. This is used for
-      # absolute counter values which we want to track as gauges.
+      # When this method is called, the given value is stored in a cache
+      # under the given cache key.
+      #
+      # A block must be passed to this method. The first time the method
+      # is called for a given cache key, the block will not be yielded to.
+      # In subsequent calls, the delta between the previously stored value
+      # in the cache for that key and the value given in this invocation
+      # will be yielded to the block.
+      #
+      # This is used for absolute counter values which we want to track as
+      # gauges.
       #
       # @example
-      #   gauge_delta :my_cache_key, 10
-      #   gauge_delta :my_cache_key, 15
-      #   # Returns a value of `5`
+      #   gauge_delta :with_block, 10 do |delta|
+      #     puts "this block will not be yielded to"
+      #   end
+      #   gauge_delta :with_block, 15 do |delta|
+      #     # `delta` has a value of `5`
+      #     puts "this block will be yielded to with delta = #{delta}"
+      #   end
+      #
       def gauge_delta(cache_key, value)
         previous_value = gauge_delta_cache[cache_key]
         gauge_delta_cache[cache_key] = value
         return unless previous_value
 
-        value - previous_value
+        yield value - previous_value
       end
     end
   end

data/lib/appsignal/probes/mri.rb

@@ -8,13 +8,10 @@ module Appsignal
         defined?(::RubyVM) && ::RubyVM.respond_to?(:stat)
       end
 
-      def self.garbage_collection_profiler
-        @garbage_collection_profiler ||= Appsignal::GarbageCollectionProfiler.new
-      end
-
-      def initialize(appsignal = Appsignal)
+      def initialize(appsignal: Appsignal, gc_profiler: Appsignal::GarbageCollection.profiler)
         Appsignal.logger.debug("Initializing VM probe")
         @appsignal = appsignal
+        @gc_profiler = gc_profiler
       end
 
       # @api private
@@ -34,24 +31,27 @@ module Appsignal
         )
 
         set_gauge("thread_count", Thread.list.size)
-        set_gauge("gc_total_time", MriProbe.garbage_collection_profiler.total_time)
+        if Appsignal::GarbageCollection.enabled?
+          gauge_delta(:gc_time, @gc_profiler.total_time) do |gc_time|
+            set_gauge("gc_time", gc_time) if gc_time > 0
+          end
+        end
 
         gc_stats = GC.stat
-        allocated_objects =
-          gauge_delta(
-            :allocated_objects,
-            gc_stats[:total_allocated_objects] || gc_stats[:total_allocated_object]
-          )
-        set_gauge("allocated_objects", allocated_objects) if allocated_objects
+        gauge_delta(
+          :allocated_objects,
+          gc_stats[:total_allocated_objects] || gc_stats[:total_allocated_object]
+        ) do |allocated_objects|
+          set_gauge("allocated_objects", allocated_objects)
+        end
 
-        gc_count = gauge_delta(:gc_count, GC.count)
-        set_gauge("gc_count", gc_count, :metric => :gc_count) if gc_count
-        minor_gc_count = gauge_delta(:minor_gc_count, gc_stats[:minor_gc_count])
-        if minor_gc_count
+        gauge_delta(:gc_count, GC.count) do |gc_count|
+          set_gauge("gc_count", gc_count, :metric => :gc_count)
+        end
+        gauge_delta(:minor_gc_count, gc_stats[:minor_gc_count]) do |minor_gc_count|
           set_gauge("gc_count", minor_gc_count, :metric => :minor_gc_count)
         end
-        major_gc_count = gauge_delta(:major_gc_count, gc_stats[:major_gc_count])
-        if major_gc_count
+        gauge_delta(:major_gc_count, gc_stats[:major_gc_count]) do |major_gc_count|
           set_gauge("gc_count", major_gc_count, :metric => :major_gc_count)
         end
 

data/lib/appsignal/probes/sidekiq.rb

@@ -44,15 +44,16 @@ module Appsignal
 
         gauge "worker_count", stats.workers_size
         gauge "process_count", stats.processes_size
-        jobs_processed = gauge_delta :jobs_processed, stats.processed
-        if jobs_processed
+        gauge_delta :jobs_processed, stats.processed do |jobs_processed|
           gauge "job_count", jobs_processed, :status => :processed
         end
-        jobs_failed = gauge_delta :jobs_failed, stats.failed
-        gauge "job_count", jobs_failed, :status => :failed if jobs_failed
+        gauge_delta :jobs_failed, stats.failed do |jobs_failed|
+          gauge "job_count", jobs_failed, :status => :failed
+        end
         gauge "job_count", stats.retry_size, :status => :retry_queue
-        jobs_dead = gauge_delta :jobs_dead, stats.dead_size
-        gauge "job_count", jobs_dead, :status => :died if jobs_dead
+        gauge_delta :jobs_dead, stats.dead_size do |jobs_dead|
+          gauge "job_count", jobs_dead, :status => :died
+        end
         gauge "job_count", stats.scheduled_size, :status => :scheduled
         gauge "job_count", stats.enqueued, :status => :enqueued
       end

data/lib/appsignal/rack/rails_instrumentation.rb

@@ -40,7 +40,11 @@ module Appsignal
           end
           transaction.set_http_or_background_queue_start
           transaction.set_metadata("path", request.path)
-          transaction.set_metadata("method", request.request_method)
+          begin
+            transaction.set_metadata("method", request.request_method)
+          rescue => error
+            Appsignal.logger.error("Unable to report HTTP request method: '#{error}'")
+          end
           Appsignal::Transaction.complete_current!
         end
       end