appsignal 3.1.3-java → 3.1.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bb9d094ed8de471e90dea7cd631a31ffea0777c09dbe4bfac516cc1820cbdcf
-  data.tar.gz: 790ec312c3349ee2b6889d8fca238e6cea7daa537c71cf81b7438152c2a2a2cb
+  metadata.gz: 20749c0f3826167272d727c37dd1e881502a9654f8b499d4f3fcdf40dd386178
+  data.tar.gz: 90ddbe20ee5243338aefdfbefbb1989bbe1df5cc57a56a4f277bcfa789086b41
 SHA512:
-  metadata.gz: a3ecfceba446f9a876c903b796a2b91c4ba44ab53856e9a6518d4681f86144547bdffd6d367a309ae05c5e15ebc30a52ca4b666dcec1c651b321d90c0eb8014f
-  data.tar.gz: c5705bfeca7ec423ee1888572f84ef70fd15abdb5501cd0c9e73c2d5855b498d7e03ac8c50ab1aa88137d3335376cd2d0b767503c0ec17d9b2c7b209cd04e80f
+  metadata.gz: c9f2133fe6f929ebbbee6b9c8f47f85bd3c895b518daf6a69b5ad8a2e9a29ebcd72ca1c25a7aef8512a8493f8941ab711fda9b0f16fff30cac73c40701376a47
+  data.tar.gz: bfe585b6c6ce5f8cc5e470c9a164e6690fc1834e40bb4bd27491f719cbdaf6ebd4b92d1f1ba2bc3001e157f5c35786f12143b29d9908e9ce73d9ca9712c7c5ef

data/CHANGELOG.md

@@ -1,5 +1,33 @@
 # AppSignal for Ruby gem Changelog
 
+## 3.1.5
+
+### Changed
+
+- [4035c3c2](https://github.com/appsignal/appsignal-ruby/commit/4035c3c2d5c0b002119054014daddd193bd820f0) patch - Bump agent to version 813a59b
+  
+  - Fix http proxy config option parsing for port 80.
+  - Fix the return value for appsignal_import_opentelemetry_span extension
+    function in `appsignal.h`.
+
+### Fixed
+
+- [feb60fb8](https://github.com/appsignal/appsignal-ruby/commit/feb60fb877a2b264e587fe3d5d546e40d86c9c38) patch - Fix NoMethodError for AppSignal Puma plugin for Puma 6. Puma 5 is also still supported.
+
+## 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

data/ext/agent.yml

@@ -3,99 +3,99 @@
 # appsignal-agent repository.
 # Modifications to this file will be overwritten with the next agent release.
 ---
-version: '06391fb'
+version: 813a59b
 mirrors:
 - https://appsignal-agent-releases.global.ssl.fastly.net
 - https://d135dj0rjqvssy.cloudfront.net
 triples:
   x86_64-darwin:
     static:
-      checksum: 9bf41c183d94c80e980f57ea2e29d08bae97e8097b5284a2b91a5484bf866f8c
+      checksum: c8919a19a28950f726221829ea4d2b3312f1595a5e28ea134f8c41ed0814d7cd
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 4d3789e65cf00e446600e883d95d097323ebb3835703c67c8d09f434f09ab496
+      checksum: 1c10139bc4df56048a71766b64eba76462ee38d3cc814dc230e0fdb3c7e4fba3
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   universal-darwin:
     static:
-      checksum: 9bf41c183d94c80e980f57ea2e29d08bae97e8097b5284a2b91a5484bf866f8c
+      checksum: c8919a19a28950f726221829ea4d2b3312f1595a5e28ea134f8c41ed0814d7cd
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 4d3789e65cf00e446600e883d95d097323ebb3835703c67c8d09f434f09ab496
+      checksum: 1c10139bc4df56048a71766b64eba76462ee38d3cc814dc230e0fdb3c7e4fba3
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   aarch64-darwin:
     static:
-      checksum: 74edd7b97995f3314c10e3d84fc832c1b842c236c331ed4f2f77146ad004d179
+      checksum: 40a38896132f418362af9fb2e9796eb4479e13cc0691b61f0f0b81b77e66ded6
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 7165bb164a9cd7a2a5f97897d954390412f7034c667e5826b3307ffbd848bff9
+      checksum: 40ec0c7db246cfc9b8eeebc882b07ba625948f376a53d8e24add7148d0f8c067
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   arm64-darwin:
     static:
-      checksum: 74edd7b97995f3314c10e3d84fc832c1b842c236c331ed4f2f77146ad004d179
+      checksum: 40a38896132f418362af9fb2e9796eb4479e13cc0691b61f0f0b81b77e66ded6
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 7165bb164a9cd7a2a5f97897d954390412f7034c667e5826b3307ffbd848bff9
+      checksum: 40ec0c7db246cfc9b8eeebc882b07ba625948f376a53d8e24add7148d0f8c067
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   arm-darwin:
     static:
-      checksum: 74edd7b97995f3314c10e3d84fc832c1b842c236c331ed4f2f77146ad004d179
+      checksum: 40a38896132f418362af9fb2e9796eb4479e13cc0691b61f0f0b81b77e66ded6
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 7165bb164a9cd7a2a5f97897d954390412f7034c667e5826b3307ffbd848bff9
+      checksum: 40ec0c7db246cfc9b8eeebc882b07ba625948f376a53d8e24add7148d0f8c067
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   aarch64-linux:
     static:
-      checksum: 0f2430e637eb77ce2093f021777087e87cb1e7be7c86a53771172696791c4879
+      checksum: c73b6e9de849a40290a0d90eaad43ea41a9a0293ba4b8bf99f69965c45c85514
       filename: appsignal-aarch64-linux-all-static.tar.gz
     dynamic:
-      checksum: 0e4f9305aeaaa2d7847e83be04227b865723a0591574108d78040b5921a677a7
+      checksum: 90226eefe2e2f66833ca3e31c69ce70763ed57916bd0b5c1809bd99d61ff3429
       filename: appsignal-aarch64-linux-all-dynamic.tar.gz
   i686-linux:
     static:
-      checksum: 449ba623aaa1853c2d211bf1e2d3a14e5ae09225a62457cbdbcc0983a5713a52
+      checksum: 6741b9a068dc405b3d6d07953fab7fc876c21b4add1cbb2b4c4c4dfdeca5d387
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: dae994292d602eaf0910bd2ce53f0163e19767a4cbb8e5d0db99c0010d6df486
+      checksum: 1af902b37af378a06251365fb637f86298380d3627c54f2945a85c1b7f075fda
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86-linux:
     static:
-      checksum: 449ba623aaa1853c2d211bf1e2d3a14e5ae09225a62457cbdbcc0983a5713a52
+      checksum: 6741b9a068dc405b3d6d07953fab7fc876c21b4add1cbb2b4c4c4dfdeca5d387
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: dae994292d602eaf0910bd2ce53f0163e19767a4cbb8e5d0db99c0010d6df486
+      checksum: 1af902b37af378a06251365fb637f86298380d3627c54f2945a85c1b7f075fda
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86_64-linux:
     static:
-      checksum: 394796c0ddeb4881c9f2e6ce82f840e66bcb69e027324f6c04f6671067445fbb
+      checksum: 8355b017093db606014023cc617d84d6375d503d7ffa54f62c7b3dc56fb64ead
       filename: appsignal-x86_64-linux-all-static.tar.gz
     dynamic:
-      checksum: 9ca4762c464482b0a5a89898a839388597dd57a17a21527a67f3e3db0e540a03
+      checksum: 7c239a7ffe18cb173120bd67fb96563f4a81f0744bbbb47082f077a38ccbe5f1
       filename: appsignal-x86_64-linux-all-dynamic.tar.gz
   x86_64-linux-musl:
     static:
-      checksum: 673271c8c5fd55053d8a719bcd307f787db4ca4633baf8cf961c442bf1805614
+      checksum: e9d98ed23b872dbf1e67a081473918cf88c4af775b1caadbfd93deda2635d9f8
       filename: appsignal-x86_64-linux-musl-all-static.tar.gz
     dynamic:
-      checksum: 609d59376d6633652015e838eb649229fe2523d443a5471232b869f48eb99640
+      checksum: 5538172a95dfca1a4cf8e111ba61eab5e9c16314fa902259711cb9e8e0d2f85e
       filename: appsignal-x86_64-linux-musl-all-dynamic.tar.gz
   aarch64-linux-musl:
     static:
-      checksum: e90ca19bf61596be022ba04897e8902b3401add58f351a40a3d3a7af241d0bbb
+      checksum: 0fb3eacfb8c8bc01c4acc8916327626720de376bcdd95104be71bb11a4ff9215
       filename: appsignal-aarch64-linux-musl-all-static.tar.gz
     dynamic:
-      checksum: afb66c65fb82b672887bc6b6e82d82f09d9855a5497a7abb06b438dadea97aca
+      checksum: b87bcedaa2aa886acf3a93ce6e32762a843f3bee1ca7a8f9e0d17ca32f7a7d39
       filename: appsignal-aarch64-linux-musl-all-dynamic.tar.gz
   x86_64-freebsd:
     static:
-      checksum: cb45da91c51123859e5ef5cea850460c28d6e77dfa08b90375178d9017162ba8
+      checksum: b7d3c244b7068213840f5970df2e318d98f7909eb3b2b4ab42441d064ffb19ee
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 6a03e02c2526e05edaa7fa932b2e764318c63ec93d517c6c00f6b7541bfe71f3
+      checksum: 0a739134f11d50318d14f247df1f8cc0f8aec1fbcb70a8bc48d5e1f22dc4aaba
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz
   amd64-freebsd:
     static:
-      checksum: cb45da91c51123859e5ef5cea850460c28d6e77dfa08b90375178d9017162ba8
+      checksum: b7d3c244b7068213840f5970df2e318d98f7909eb3b2b4ab42441d064ffb19ee
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: 6a03e02c2526e05edaa7fa932b2e764318c63ec93d517c6c00f6b7541bfe71f3
+      checksum: 0a739134f11d50318d14f247df1f8cc0f8aec1fbcb70a8bc48d5e1f22dc4aaba
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz

data/gemfiles/padrino.gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'padrino', "~> 0.15"
-gem 'rack'
+gem 'rack', "~> 2"
+gem 'sinatra', "~> 2"
 
 gemspec :path => '../'

data/gemfiles/que.gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'que'
+gem 'que', "~> 1.0"
 
 gemspec :path => '../'

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/probes/mri.rb

@@ -8,7 +8,7 @@ module Appsignal
         defined?(::RubyVM) && ::RubyVM.respond_to?(:stat)
       end
 
-      def initialize(appsignal: Appsignal, gc_profiler: Appsignal::GarbageCollectionProfiler.new)
+      def initialize(appsignal: Appsignal, gc_profiler: Appsignal::GarbageCollection.profiler)
         Appsignal.logger.debug("Initializing VM probe")
         @appsignal = appsignal
         @gc_profiler = gc_profiler
@@ -31,8 +31,10 @@ module Appsignal
         )
 
         set_gauge("thread_count", Thread.list.size)
-        gauge_delta(:gc_time, @gc_profiler.total_time) do |gc_time|
-          set_gauge("gc_time", gc_time) if gc_time > 0
+        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

data/lib/appsignal/transaction.rb

@@ -66,11 +66,6 @@ module Appsignal
       def clear_current_transaction!
         Thread.current[:appsignal_transaction] = nil
       end
-
-      def garbage_collection_profiler
-        @garbage_collection_profiler ||=
-          Appsignal.config[:enable_gc_instrumentation] ? Appsignal::GarbageCollectionProfiler.new : NilGarbageCollectionProfiler.new
-      end
     end
 
     attr_reader :ext, :transaction_id, :action, :namespace, :request, :paused, :tags, :options, :discarded, :breadcrumbs
@@ -103,7 +98,7 @@ module Appsignal
       @ext = Appsignal::Extension.start_transaction(
         @transaction_id,
         @namespace,
-        self.class.garbage_collection_profiler.total_time
+        0
       ) || Appsignal::Extension::MockTransaction.new
     end
 
@@ -117,9 +112,7 @@ module Appsignal
           "because it was manually discarded."
         return
       end
-      if @ext.finish(self.class.garbage_collection_profiler.total_time)
-        sample_data
-      end
+      sample_data if @ext.finish(0)
       @ext.complete
     end
 
@@ -355,7 +348,7 @@ module Appsignal
 
     def start_event
       return if paused?
-      @ext.start_event(self.class.garbage_collection_profiler.total_time)
+      @ext.start_event(0)
     end
 
     def finish_event(name, title, body, body_format = Appsignal::EventFormatter::DEFAULT)
@@ -365,7 +358,7 @@ module Appsignal
         title || BLANK,
         body || BLANK,
         body_format || Appsignal::EventFormatter::DEFAULT,
-        self.class.garbage_collection_profiler.total_time
+        0
       )
     end
 
@@ -377,7 +370,7 @@ module Appsignal
         body || BLANK,
         body_format || Appsignal::EventFormatter::DEFAULT,
         duration,
-        self.class.garbage_collection_profiler.total_time
+        0
       )
     end
 

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appsignal
-  VERSION = "3.1.3".freeze
+  VERSION = "3.1.5".freeze
 end

data/lib/appsignal.rb

@@ -115,11 +115,6 @@ module Appsignal
             Appsignal::Environment.report_enabled("allocation_tracking")
           end
 
-          if config[:enable_gc_instrumentation]
-            GC::Profiler.enable
-            Appsignal::Environment.report_enabled("gc_instrumentation")
-          end
-
           Appsignal::Minutely.start if config[:enable_minutely_probes]
 
           collect_environment_metadata
@@ -298,7 +293,7 @@ require "appsignal/hooks"
 require "appsignal/probes"
 require "appsignal/marker"
 require "appsignal/minutely"
-require "appsignal/garbage_collection_profiler"
+require "appsignal/garbage_collection"
 require "appsignal/integrations/railtie" if defined?(::Rails)
 require "appsignal/transaction"
 require "appsignal/version"

data/lib/puma/plugin/appsignal.rb

@@ -11,9 +11,9 @@ require "json"
 Puma::Plugin.create do # rubocop:disable Metrics/BlockLength
   def start(launcher)
     @launcher = launcher
-    @launcher.events.debug "AppSignal: Puma plugin start."
+    log_debug "AppSignal: Puma plugin start."
     in_background do
-      @launcher.events.debug "AppSignal: Start Puma stats collection loop."
+      log_debug "AppSignal: Start Puma stats collection loop."
       plugin = AppsignalPumaPlugin.new
 
       loop do
@@ -24,12 +24,12 @@ Puma::Plugin.create do # rubocop:disable Metrics/BlockLength
           # metrics.
           sleep sleep_time
 
-          @launcher.events.debug "AppSignal: Collecting Puma stats."
+          log_debug "AppSignal: Collecting Puma stats."
           stats = fetch_puma_stats
           if stats
             plugin.call(stats)
           else
-            @launcher.events.log "AppSignal: No Puma stats to report."
+            log_debug "AppSignal: No Puma stats to report."
           end
         rescue StandardError => error
           log_error "Error while processing metrics.", error
@@ -44,8 +44,20 @@ Puma::Plugin.create do # rubocop:disable Metrics/BlockLength
     60 # seconds
   end
 
+  def logger
+    if @launcher.respond_to? :log_writer
+      @launcher.log_writer
+    else
+      @launcher.events
+    end
+  end
+
+  def log_debug(message)
+    logger.debug message
+  end
+
   def log_error(message, error)
-    @launcher.events.log "AppSignal: #{message}\n" \
+    logger.error "AppSignal: #{message}\n" \
       "#{error.class}: #{error.message}\n#{error.backtrace.join("\n")}"
   end
 

data/spec/lib/appsignal/config_spec.rb

@@ -156,7 +156,6 @@ describe Appsignal::Config do
         :debug                          => false,
         :dns_servers                    => [],
         :enable_allocation_tracking     => true,
-        :enable_gc_instrumentation      => false,
         :enable_host_metrics            => true,
         :enable_minutely_probes         => true,
         :enable_statsd                  => true,

data/spec/lib/appsignal/{garbage_collection_profiler_spec.rb → garbage_collection_spec.rb}

@@ -1,11 +1,33 @@
-describe Appsignal::GarbageCollectionProfiler do
+describe Appsignal::GarbageCollection do
+  describe ".profiler" do
+    before do
+      # Unset the internal memoized variable to avoid state leaking
+      described_class.clear_profiler!
+    end
+
+    context "when GC instrumentation is disabled" do
+      it "returns the NilProfiler" do
+        expect(described_class.profiler).to be_a(Appsignal::GarbageCollection::NilProfiler)
+      end
+    end
+
+    context "when GC profiling is enabled" do
+      before { GC::Profiler.enable }
+      after { GC::Profiler.disable }
+
+      it "returns the Profiler" do
+        expect(described_class.profiler).to be_a(Appsignal::GarbageCollection::Profiler)
+      end
+    end
+  end
+end
+
+describe Appsignal::GarbageCollection::Profiler do
   let(:internal_profiler) { FakeGCProfiler.new }
   let(:profiler) { described_class.new }
 
   before do
-    allow_any_instance_of(described_class)
-      .to receive(:internal_profiler)
-      .and_return(internal_profiler)
+    stub_const("GC::Profiler", internal_profiler)
   end
 
   context "on initialization" do
@@ -54,7 +76,7 @@ describe Appsignal::GarbageCollectionProfiler do
 
       2.times do
         threads << Thread.new do
-          profiler = Appsignal::GarbageCollectionProfiler.new
+          profiler = Appsignal::GarbageCollection::Profiler.new
           results << profiler.total_time
         end
       end
@@ -65,7 +87,7 @@ describe Appsignal::GarbageCollectionProfiler do
   end
 end
 
-describe Appsignal::NilGarbageCollectionProfiler do
+describe Appsignal::GarbageCollection::NilProfiler do
   let(:profiler) { described_class.new }
 
   describe "#total_time" do

data/spec/lib/appsignal/probes/mri_spec.rb

@@ -39,6 +39,7 @@ describe Appsignal::Probes::MriProbe do
       let(:hostname) { nil }
       before do
         allow(gc_profiler_mock).to receive(:total_time)
+        allow(GC::Profiler).to receive(:enabled?).and_return(true)
       end
 
       it "should track vm metrics" do
@@ -70,6 +71,40 @@ describe Appsignal::Probes::MriProbe do
         end
       end
 
+      context "when GC profiling is disabled" do
+        it "does not report a gc_time metric" do
+          allow(GC::Profiler).to receive(:enabled?).and_return(false)
+          expect(gc_profiler_mock).to_not receive(:total_time)
+          probe.call # Normal call, create a cache
+          probe.call # Report delta value based on cached value
+          metrics = appsignal_mock.gauges.map { |(key)| key }
+          expect(metrics).to_not include("gc_time")
+        end
+
+        it "does not report a gc_time metric while temporarily disabled" do
+          # While enabled
+          allow(GC::Profiler).to receive(:enabled?).and_return(true)
+          expect(gc_profiler_mock).to receive(:total_time).and_return(10, 15)
+          probe.call # Normal call, create a cache
+          probe.call # Report delta value based on cached value
+          expect_gauges([["gc_time", 5]])
+
+          # While disabled
+          allow(GC::Profiler).to receive(:enabled?).and_return(false)
+          probe.call # Call twice to make sure any caches resets wouldn't mess up the assertion
+          probe.call
+          # Does not include any newly reported metrics
+          expect_gauges([["gc_time", 5]])
+
+          # When enabled after being disabled for a while, it only reports the
+          # newly reported time since it was renabled
+          allow(GC::Profiler).to receive(:enabled?).and_return(true)
+          expect(gc_profiler_mock).to receive(:total_time).and_return(25)
+          probe.call
+          expect_gauges([["gc_time", 5], ["gc_time", 10]])
+        end
+      end
+
       it "tracks GC run count" do
         expect(GC).to receive(:count).and_return(10, 15)
         expect(GC).to receive(:stat).and_return(

data/spec/lib/appsignal/transaction_spec.rb

@@ -683,43 +683,36 @@ describe Appsignal::Transaction do
     end
 
     describe "#sample_data" do
-      it "should sample data" do
-        expect(transaction.ext).to receive(:set_sample_data).with(
-          "environment",
-          Appsignal::Utils::Data.generate(
-            "CONTENT_LENGTH" => "0",
-            "REQUEST_METHOD" => "GET",
-            "SERVER_NAME" => "example.org",
-            "SERVER_PORT" => "80",
-            "PATH_INFO" => "/blog"
-          )
-        ).once
-        expect(transaction.ext).to receive(:set_sample_data).with(
-          "session_data",
-          Appsignal::Utils::Data.generate({})
-        ).once
-        expect(transaction.ext).to receive(:set_sample_data).with(
-          "params",
-          Appsignal::Utils::Data.generate(
-            "controller" => "blog_posts",
-            "action" => "show",
-            "id" => "1"
-          )
-        ).once
-        expect(transaction.ext).to receive(:set_sample_data).with(
-          "metadata",
-          Appsignal::Utils::Data.generate("key" => "value")
-        ).once
-        expect(transaction.ext).to receive(:set_sample_data).with(
-          "tags",
-          Appsignal::Utils::Data.generate({})
-        ).once
-        expect(transaction.ext).to receive(:set_sample_data).with(
-          "breadcrumbs",
-          Appsignal::Utils::Data.generate([])
-        ).once
+      let(:env) { { "rack.session" => { "session" => "value" } } }
 
+      it "sets sample data" do
+        transaction.set_tags "tag" => "value"
+        transaction.add_breadcrumb "category", "action", "message", "key" => "value"
         transaction.sample_data
+
+        sample_data = transaction.to_h["sample_data"]
+        expect(sample_data["environment"]).to include(
+          "CONTENT_LENGTH" => "0",
+          "REQUEST_METHOD" => "GET",
+          "SERVER_NAME" => "example.org",
+          "SERVER_PORT" => "80",
+          "PATH_INFO" => "/blog"
+        )
+        expect(sample_data["session_data"]).to eq("session" => "value")
+        expect(sample_data["params"]).to eq(
+          "controller" => "blog_posts",
+          "action" => "show",
+          "id" => "1"
+        )
+        expect(sample_data["metadata"]).to eq("key" => "value")
+        expect(sample_data["tags"]).to eq("tag" => "value")
+        expect(sample_data["breadcrumbs"]).to contain_exactly(
+          "action" => "action",
+          "category" => "category",
+          "message" => "message",
+          "metadata" => { "key" => "value" },
+          "time" => kind_of(Integer)
+        )
       end
     end
 
@@ -792,23 +785,6 @@ describe Appsignal::Transaction do
       end
     end
 
-    describe "#garbage_collection_profiler" do
-      before { Appsignal::Transaction.instance_variable_set(:@garbage_collection_profiler, nil) }
-
-      it "returns the NilGarbageCollectionProfiler" do
-        expect(Appsignal::Transaction.garbage_collection_profiler).to be_a(Appsignal::NilGarbageCollectionProfiler)
-      end
-
-      context "when gc profiling is enabled" do
-        before { Appsignal.config.config_hash[:enable_gc_instrumentation] = true }
-        after { Appsignal.config.config_hash[:enable_gc_instrumentation] = false }
-
-        it "returns the GarbageCollectionProfiler" do
-          expect(Appsignal::Transaction.garbage_collection_profiler).to be_a(Appsignal::GarbageCollectionProfiler)
-        end
-      end
-    end
-
     describe "#start_event" do
       it "starts the event in the extension" do
         expect(transaction.ext).to receive(:start_event).with(0).and_call_original
@@ -827,11 +803,7 @@ describe Appsignal::Transaction do
     end
 
     describe "#finish_event" do
-      let(:fake_gc_time) { 123 }
-      before do
-        expect(described_class.garbage_collection_profiler)
-          .to receive(:total_time).at_least(:once).and_return(fake_gc_time)
-      end
+      let(:fake_gc_time) { 0 }
 
       it "should finish the event in the extension" do
         expect(transaction.ext).to receive(:finish_event).with(
@@ -878,11 +850,7 @@ describe Appsignal::Transaction do
     end
 
     describe "#record_event" do
-      let(:fake_gc_time) { 123 }
-      before do
-        expect(described_class.garbage_collection_profiler)
-          .to receive(:total_time).at_least(:once).and_return(fake_gc_time)
-      end
+      let(:fake_gc_time) { 0 }
 
       it "should record the event in the extension" do
         expect(transaction.ext).to receive(:record_event).with(

data/spec/lib/appsignal_spec.rb

@@ -54,20 +54,12 @@ describe Appsignal do
         Appsignal.start
       end
 
-      context "when allocation tracking and gc instrumentation have been enabled" do
+      context "when allocation tracking has been enabled" do
         before do
-          allow(GC::Profiler).to receive(:enable)
           Appsignal.config.config_hash[:enable_allocation_tracking] = true
-          Appsignal.config.config_hash[:enable_gc_instrumentation] = true
           capture_environment_metadata_report_calls
         end
 
-        it "should enable Ruby's GC::Profiler" do
-          expect(GC::Profiler).to receive(:enable)
-          Appsignal.start
-          expect_environment_metadata("ruby_gc_instrumentation_enabled", "true")
-        end
-
         unless DependencyHelper.running_jruby?
           it "installs the allocation event hook" do
             expect(Appsignal::Extension).to receive(:install_allocation_event_hook)
@@ -78,29 +70,17 @@ describe Appsignal do
         end
       end
 
-      context "when allocation tracking and gc instrumentation have been disabled" do
+      context "when allocation tracking has been disabled" do
         before do
           Appsignal.config.config_hash[:enable_allocation_tracking] = false
-          Appsignal.config.config_hash[:enable_gc_instrumentation] = false
           capture_environment_metadata_report_calls
         end
 
-        it "should not enable Ruby's GC::Profiler" do
-          expect(GC::Profiler).not_to receive(:enable)
-          Appsignal.start
-        end
-
         it "should not install the allocation event hook" do
-          expect(Appsignal::Minutely).not_to receive(:install_allocation_event_hook)
+          expect(Appsignal::Extension).not_to receive(:install_allocation_event_hook)
           Appsignal.start
           expect_not_environment_metadata("ruby_allocation_tracking_enabled")
         end
-
-        it "should not add the gc probe to minutely" do
-          expect(Appsignal::Minutely).not_to receive(:register_garbage_collection_probe)
-          Appsignal.start
-          expect_not_environment_metadata("ruby_gc_instrumentation_enabled")
-        end
       end
 
       context "when minutely metrics has been enabled" do

data/spec/lib/puma/appsignal_spec.rb

@@ -2,14 +2,14 @@ RSpec.describe "Puma plugin" do
   include WaitForHelper
 
   class MockPumaLauncher
-    def events
-      return @events if defined?(@events)
+    def log_writer
+      return @log_writer if defined?(@log_writer)
 
-      @events = MockPumaEvents.new
+      @log_writer = MockPumaLogWriter.new
     end
   end
 
-  class MockPumaEvents
+  class MockPumaLogWriter
     attr_reader :logs
 
     def initialize
@@ -153,7 +153,7 @@ RSpec.describe "Puma plugin" do
   end
 
   def logs
-    launcher.events.logs
+    launcher.log_writer.logs
   end
 
   def messages
@@ -281,7 +281,7 @@ RSpec.describe "Puma plugin" do
     it "does not fetch metrics" do
       run_plugin(appsignal_plugin) do
         expect(logs).to_not include([:error, kind_of(String)])
-        expect(logs).to include([:log, "AppSignal: No Puma stats to report."])
+        expect(logs).to include([:debug, "AppSignal: No Puma stats to report."])
         expect(messages).to be_empty
       end
     end
@@ -296,4 +296,43 @@ RSpec.describe "Puma plugin" do
       end
     end
   end
+
+  context "with Puma < 6 Events class" do
+    class MockPumaEvents
+      attr_reader :logs
+
+      def initialize
+        @logs = []
+      end
+
+      def log(message)
+        @logs << [:log, message]
+      end
+
+      def debug(message)
+        @logs << [:debug, message]
+      end
+
+      def error(message)
+        @logs << [:error, message]
+      end
+    end
+
+    let(:launcher) do
+      Class.new do
+        def events
+          return @events if defined?(@events)
+
+          @events = MockPumaEvents.new
+        end
+      end.new
+    end
+    let(:stats_data) { { :max_threads => 5 } }
+
+    it "logs messages to the events class" do
+      run_plugin(appsignal_plugin) do
+        expect(launcher.events.logs).to_not be_empty
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.5
 platform: java
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-04 00:00:00.000000000 Z
+date: 2022-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -218,7 +218,7 @@ files:
 - lib/appsignal/event_formatter/sequel/sql_formatter.rb
 - lib/appsignal/extension.rb
 - lib/appsignal/extension/jruby.rb
-- lib/appsignal/garbage_collection_profiler.rb
+- lib/appsignal/garbage_collection.rb
 - lib/appsignal/helpers/instrumentation.rb
 - lib/appsignal/helpers/metrics.rb
 - lib/appsignal/hooks.rb
@@ -319,7 +319,7 @@ files:
 - spec/lib/appsignal/extension/jruby_spec.rb
 - spec/lib/appsignal/extension_install_failure_spec.rb
 - spec/lib/appsignal/extension_spec.rb
-- spec/lib/appsignal/garbage_collection_profiler_spec.rb
+- spec/lib/appsignal/garbage_collection_spec.rb
 - spec/lib/appsignal/hooks/action_cable_spec.rb
 - spec/lib/appsignal/hooks/action_mailer_spec.rb
 - spec/lib/appsignal/hooks/active_support_notifications/finish_with_state_shared_examples.rb
@@ -441,7 +441,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.12
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
@@ -471,7 +471,7 @@ test_files:
 - spec/lib/appsignal/extension/jruby_spec.rb
 - spec/lib/appsignal/extension_install_failure_spec.rb
 - spec/lib/appsignal/extension_spec.rb
-- spec/lib/appsignal/garbage_collection_profiler_spec.rb
+- spec/lib/appsignal/garbage_collection_spec.rb
 - spec/lib/appsignal/hooks/action_cable_spec.rb
 - spec/lib/appsignal/hooks/action_mailer_spec.rb
 - spec/lib/appsignal/hooks/active_support_notifications/finish_with_state_shared_examples.rb

data/lib/appsignal/garbage_collection_profiler.rb

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-module Appsignal
-  # {Appsignal::GarbageCollectionProfiler} wraps Ruby's `GC::Profiler` to be
-  # able to track garbage collection time for multiple transactions, while
-  # constantly clearing `GC::Profiler`'s total_time to make sure it doesn't
-  # leak memory by keeping garbage collection run samples in memory.
-  #
-  # @api private
-  class GarbageCollectionProfiler
-    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
-
-  # {Appsignal::NilGarbageCollectionProfiler} is a dummy profiler
-  # that always returns 0 as the total time.
-  # Used when we don't want any profile information
-  #
-  # @api private
-  class NilGarbageCollectionProfiler
-    def total_time
-      0
-    end
-  end
-end