appsignal 3.3.7-java → 3.3.9-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf316d2ff99ac803b94b624dc081c41a6c8d84d5ee659e3029870d7ed4d212ba
-  data.tar.gz: 77177fc406fe073de5917b1829bc88f820ebfe941af8e1183be083d99d1735d6
+  metadata.gz: '0856b3ea91ba164241bcb2d0017fd9c5fe6e32c719d1fe05c7684079e20146d2'
+  data.tar.gz: 5cccb7e02b50707e3093025679cd48168379ed2300d855e851eb71d62095f4ff
 SHA512:
-  metadata.gz: 66082238307235ccfeabf9a3b60c8f2b5702a4cb715cbd6dc260d786fde00032add30e6a44993a862f7bba8ef5a2698aa5d581adfc9c54ce9448816692b09add
-  data.tar.gz: 79e3ead1f689f0f9dd1a2b207b5051ec92fffbbd270349aa407d56a0c69669e48f3a1fc681f59ee93d445d92224129e207981a1e84d019f44b7df8b425c8c673
+  metadata.gz: f271aa02a2ba9d57708bbb2f09021646e6ec48822a2f926a108f0b2e58ec2909bc6e8de64a82c00188620297a9f68eb1f5864aaff9a6931272deff871badabc7
+  data.tar.gz: bb15b922ac0460bd0d58d7c5dcf50e95665be21bfc35af5d1a2d8ca400f78c2857fcc0d78f806568927607f55edffc5891c7b536c0554e48abbf90b41a7cc5fd

data/.semaphore/semaphore.yml

@@ -846,7 +846,7 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 2.6.9 for webmachine
+    - name: Ruby 2.6.9 for webmachine1
       env_vars:
       - *2
       - *3
@@ -855,9 +855,27 @@ blocks:
       - name: RUBY_VERSION
         value: 2.6.9
       - name: GEMSET
-        value: webmachine
+        value: webmachine1
       - name: BUNDLE_GEMFILE
-        value: gemfiles/webmachine.gemfile
+        value: gemfiles/webmachine1.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
+    - name: Ruby 2.6.9 for webmachine2
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 2.6.9
+      - name: GEMSET
+        value: webmachine2
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/webmachine2.gemfile
       - name: _RUBYGEMS_VERSION
         value: latest
       - name: _BUNDLER_VERSION
@@ -1239,7 +1257,25 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 2.7.7 for webmachine
+    - name: Ruby 2.7.7 for webmachine1
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 2.7.7
+      - name: GEMSET
+        value: webmachine1
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/webmachine1.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
+    - name: Ruby 2.7.7 for webmachine2
       env_vars:
       - *2
       - *3
@@ -1248,9 +1284,9 @@ blocks:
       - name: RUBY_VERSION
         value: 2.7.7
       - name: GEMSET
-        value: webmachine
+        value: webmachine2
       - name: BUNDLE_GEMFILE
-        value: gemfiles/webmachine.gemfile
+        value: gemfiles/webmachine2.gemfile
       - name: _RUBYGEMS_VERSION
         value: latest
       - name: _BUNDLER_VERSION
@@ -1596,7 +1632,7 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.0.5 for webmachine
+    - name: Ruby 3.0.5 for webmachine1
       env_vars:
       - *2
       - *3
@@ -1605,9 +1641,27 @@ blocks:
       - name: RUBY_VERSION
         value: 3.0.5
       - name: GEMSET
-        value: webmachine
+        value: webmachine1
       - name: BUNDLE_GEMFILE
-        value: gemfiles/webmachine.gemfile
+        value: gemfiles/webmachine1.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
+    - name: Ruby 3.0.5 for webmachine2
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 3.0.5
+      - name: GEMSET
+        value: webmachine2
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/webmachine2.gemfile
       - name: _RUBYGEMS_VERSION
         value: latest
       - name: _BUNDLER_VERSION
@@ -1935,7 +1989,7 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.1.3 for webmachine
+    - name: Ruby 3.1.3 for webmachine1
       env_vars:
       - *2
       - *3
@@ -1944,9 +1998,27 @@ blocks:
       - name: RUBY_VERSION
         value: 3.1.3
       - name: GEMSET
-        value: webmachine
+        value: webmachine1
       - name: BUNDLE_GEMFILE
-        value: gemfiles/webmachine.gemfile
+        value: gemfiles/webmachine1.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
+    - name: Ruby 3.1.3 for webmachine2
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 3.1.3
+      - name: GEMSET
+        value: webmachine2
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/webmachine2.gemfile
       - name: _RUBYGEMS_VERSION
         value: latest
       - name: _BUNDLER_VERSION
@@ -2274,7 +2346,25 @@ blocks:
         value: latest
       commands:
       - "./support/bundler_wrapper exec rake test"
-    - name: Ruby 3.2.1 for webmachine
+    - name: Ruby 3.2.1 for webmachine1
+      env_vars:
+      - *2
+      - *3
+      - *4
+      - *5
+      - name: RUBY_VERSION
+        value: 3.2.1
+      - name: GEMSET
+        value: webmachine1
+      - name: BUNDLE_GEMFILE
+        value: gemfiles/webmachine1.gemfile
+      - name: _RUBYGEMS_VERSION
+        value: latest
+      - name: _BUNDLER_VERSION
+        value: latest
+      commands:
+      - "./support/bundler_wrapper exec rake test"
+    - name: Ruby 3.2.1 for webmachine2
       env_vars:
       - *2
       - *3
@@ -2283,9 +2373,9 @@ blocks:
       - name: RUBY_VERSION
         value: 3.2.1
       - name: GEMSET
-        value: webmachine
+        value: webmachine2
       - name: BUNDLE_GEMFILE
-        value: gemfiles/webmachine.gemfile
+        value: gemfiles/webmachine2.gemfile
       - name: _RUBYGEMS_VERSION
         value: latest
       - name: _BUNDLER_VERSION

data/CHANGELOG.md

@@ -1,10 +1,28 @@
 # AppSignal for Ruby gem Changelog
 
+## 3.3.9
+
+### Fixed
+
+- [a6db61b9](https://github.com/appsignal/appsignal-ruby/commit/a6db61b9a14a5a3b4ba89c99d35229bcdee98f94) patch - Fixed an error when using our Logging feature with Ruby's default logger formatter.
+
+## 3.3.8
+
+### Added
+
+- [2fc6ba85](https://github.com/appsignal/appsignal-ruby/commit/2fc6ba85be1e0cabc2bb8fb26469ad47d1c60243) patch - Support "warning" value for `log_level` config option. This option was documented, but wasn't accepted and fell back on the "info" log level if used. Now it works to configure it to the "warn"/"warning" log level.
+- [c04f7783](https://github.com/appsignal/appsignal-ruby/commit/c04f778332048aeaad9f75c131247caa29e504fa) patch - Add global VM lock metrics. If the `gvltools` library is installed, AppSignal for Ruby will report metrics on the global VM lock and the number of waiting threads in your application.
+
 ## 3.3.7
 
+### Added
+
+- [a815b298](https://github.com/appsignal/appsignal-ruby/commit/a815b29826a84f430384e7e735f79c8c312f1abf) patch - Support cgroups v2. Used by newer Docker engines to report host metrics. Upgrade if you receive no host metrics for Docker containers.
+
 ### Changed
 
 - [8e67159e](https://github.com/appsignal/appsignal-ruby/commit/8e67159e2a57d3b697a07fadd8eb0e0234db9124) patch - Configure AppSignal with the RACK_ENV or RAILS_ENV environment variable in diagnose CLI, if present. Makes it easier to run the diagnose CLI in production, without having to always specify the environment with the `--environment` CLI option.
+- [a815b298](https://github.com/appsignal/appsignal-ruby/commit/a815b29826a84f430384e7e735f79c8c312f1abf) patch - Allow transaction events to have a duration up to 48 hours before being discarded.
 
 ### Fixed
 

data/build_matrix.yml

@@ -339,4 +339,5 @@ matrix:
           - "2.6.9"
           - "2.7.7"
     - gem: "sinatra"
-    - gem: "webmachine"
+    - gem: "webmachine1"
+    - gem: "webmachine2"

data/gemfiles/{webmachine.gemfile → webmachine1.gemfile}

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'webmachine'
+gem 'webmachine', '~> 1.6'
 gem 'webrick'
 
 gemspec :path => '../'

data/gemfiles/webmachine2.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "webmachine", "~> 2.0"
+gem "webrick"
+
+gemspec :path => "../"

data/lib/appsignal/config.rb

@@ -19,6 +19,8 @@ module Appsignal
       :enable_minutely_probes         => true,
       :enable_statsd                  => true,
       :enable_nginx_metrics           => false,
+      :enable_gvl_global_timer        => true,
+      :enable_gvl_waiting_threads     => true,
       :endpoint                       => "https://push.appsignal.com",
       :files_world_accessible         => true,
       :filter_parameters              => [],
@@ -53,6 +55,7 @@ module Appsignal
     LOG_LEVEL_MAP = {
       "error" => ::Logger::ERROR,
       "warn" => ::Logger::WARN,
+      "warning" => ::Logger::WARN,
       "info" => ::Logger::INFO,
       "debug" => ::Logger::DEBUG,
       "trace" => ::Logger::DEBUG
@@ -69,6 +72,8 @@ module Appsignal
       "APPSIGNAL_ENABLE_MINUTELY_PROBES"         => :enable_minutely_probes,
       "APPSIGNAL_ENABLE_STATSD"                  => :enable_statsd,
       "APPSIGNAL_ENABLE_NGINX_METRICS"           => :enable_nginx_metrics,
+      "APPSIGNAL_ENABLE_GVL_GLOBAL_TIMER"        => :enable_gvl_global_timer,
+      "APPSIGNAL_ENABLE_GVL_WAITING_THREADS"     => :enable_gvl_waiting_threads,
       "APPSIGNAL_FILES_WORLD_ACCESSIBLE"         => :files_world_accessible,
       "APPSIGNAL_FILTER_PARAMETERS"              => :filter_parameters,
       "APPSIGNAL_FILTER_SESSION_DATA"            => :filter_session_data,
@@ -123,6 +128,8 @@ module Appsignal
       APPSIGNAL_ENABLE_MINUTELY_PROBES
       APPSIGNAL_ENABLE_STATSD
       APPSIGNAL_ENABLE_NGINX_METRICS
+      APPSIGNAL_ENABLE_GVL_GLOBAL_TIMER
+      APPSIGNAL_ENABLE_GVL_WAITING_THREADS
       APPSIGNAL_FILES_WORLD_ACCESSIBLE
       APPSIGNAL_INSTRUMENT_HTTP_RB
       APPSIGNAL_INSTRUMENT_NET_HTTP

data/lib/appsignal/hooks/gvl.rb

@@ -0,0 +1,22 @@
+module Appsignal
+  class Hooks
+    # @api private
+    class GvlHook < Appsignal::Hooks::Hook
+      register :gvl
+
+      def dependencies_present?
+        return false if Appsignal::System.jruby?
+        require "gvltools"
+        Appsignal.config && Appsignal::Probes::GvlProbe.dependencies_present?
+      rescue LoadError
+        false
+      end
+
+      def install
+        Appsignal::Minutely.probes.register :gvl, Appsignal::Probes::GvlProbe
+        ::GVLTools::GlobalTimer.enable if Appsignal.config[:enable_gvl_global_timer]
+        ::GVLTools::WaitingThreads.enable if Appsignal.config[:enable_gvl_waiting_threads]
+      end
+    end
+  end
+end

data/lib/appsignal/hooks.rb

@@ -94,6 +94,7 @@ require "appsignal/hooks/active_job"
 require "appsignal/hooks/active_support_notifications"
 require "appsignal/hooks/celluloid"
 require "appsignal/hooks/delayed_job"
+require "appsignal/hooks/gvl"
 require "appsignal/hooks/http"
 require "appsignal/hooks/mri"
 require "appsignal/hooks/net_http"

data/lib/appsignal/logger.rb

@@ -9,6 +9,13 @@ module Appsignal
     PLAINTEXT = 0
     LOGFMT = 1
     JSON = 2
+    SEVERITY_MAP = {
+      DEBUG => 2,
+      INFO => 3,
+      WARN => 5,
+      ERROR => 6,
+      FATAL => 7
+    }.freeze
 
     # Create a new logger instance
     #
@@ -25,7 +32,7 @@ module Appsignal
     # We support the various methods in the Ruby
     # logger class by supplying this method.
     # @api private
-    def add(severity, message = nil, group = nil) # rubocop:disable Metrics/CyclomaticComplexity
+    def add(severity, message = nil, group = nil)
       severity ||= UNKNOWN
       return true if severity < level
       group = @group if group.nil?
@@ -38,24 +45,11 @@ module Appsignal
         end
       end
       return if message.nil?
-      message = formatter.call(severity, 0, group, message) if formatter
-      severity_number = case severity
-                        when DEBUG
-                          2
-                        when INFO
-                          3
-                        when WARN
-                          5
-                        when ERROR
-                          6
-                        when FATAL
-                          7
-                        else
-                          0
-                        end
+      message = formatter.call(severity, Time.now, group, message) if formatter
+
       Appsignal::Extension.log(
         group,
-        severity_number,
+        SEVERITY_MAP.fetch(severity, 0),
         @format,
         message,
         Appsignal::Utils::Data.generate({})
@@ -71,7 +65,7 @@ module Appsignal
       return if DEBUG < level
       message = yield if message.nil? && block_given?
       return if message.nil?
-      message = formatter.call(DEBUG, 0, @group, message) if formatter
+      message = formatter.call(DEBUG, Time.now, @group, message) if formatter
       Appsignal::Extension.log(
         @group,
         2,
@@ -89,7 +83,7 @@ module Appsignal
       return if INFO < level
       message = yield if message.nil? && block_given?
       return if message.nil?
-      message = formatter.call(INFO, 0, @group, message) if formatter
+      message = formatter.call(INFO, Time.now, @group, message) if formatter
       Appsignal::Extension.log(
         @group,
         3,
@@ -107,7 +101,7 @@ module Appsignal
       return if WARN < level
       message = yield if message.nil? && block_given?
       return if message.nil?
-      message = formatter.call(WARN, 0, @group, message) if formatter
+      message = formatter.call(WARN, Time.now, @group, message) if formatter
       Appsignal::Extension.log(
         @group,
         5,
@@ -125,7 +119,7 @@ module Appsignal
       return if ERROR < level
       message = yield if message.nil? && block_given?
       return if message.nil?
-      message = formatter.call(ERROR, 0, @group, message) if formatter
+      message = formatter.call(ERROR, Time.now, @group, message) if formatter
       Appsignal::Extension.log(
         @group,
         6,
@@ -143,7 +137,7 @@ module Appsignal
       return if FATAL < level
       message = yield if message.nil? && block_given?
       return if message.nil?
-      message = formatter.call(FATAL, 0, @group, message) if formatter
+      message = formatter.call(FATAL, Time.now, @group, message) if formatter
       Appsignal::Extension.log(
         @group,
         7,

data/lib/appsignal/probes/gvl.rb

@@ -0,0 +1,47 @@
+module Appsignal
+  module Probes
+    class GvlProbe
+      include Helpers
+
+      # @api private
+      def self.dependencies_present?
+        defined?(::GVLTools) && gvltools_0_2_or_newer? && ruby_3_2_or_newer? && !Appsignal::System.jruby?
+      end
+
+      # @api private
+      def self.gvltools_0_2_or_newer?
+        Gem::Version.new(::GVLTools::VERSION) >= Gem::Version.new("0.2.0")
+      end
+
+      # @api private
+      def self.ruby_3_2_or_newer?
+        Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.2.0")
+      end
+
+      def initialize(appsignal: Appsignal, gvl_tools: ::GVLTools)
+        Appsignal.logger.debug("Initializing GVL probe")
+        @appsignal = appsignal
+        @gvl_tools = gvl_tools
+      end
+
+      def call
+        probe_global_timer if @gvl_tools::GlobalTimer.enabled?
+        probe_waiting_threads if @gvl_tools::WaitingThreads.enabled?
+      end
+
+      private
+
+      def probe_global_timer
+        monotonic_time_ns = @gvl_tools::GlobalTimer.monotonic_time
+        gauge_delta :gvl_global_timer, monotonic_time_ns do |time_delta_ns|
+          time_delta_ms = time_delta_ns / 1_000_000
+          set_gauge_with_hostname("gvl_global_timer", time_delta_ms)
+        end
+      end
+
+      def probe_waiting_threads
+        set_gauge_with_hostname("gvl_waiting_threads", @gvl_tools::WaitingThreads.count)
+      end
+    end
+  end
+end

data/lib/appsignal/probes/helpers.rb

@@ -37,6 +37,27 @@ module Appsignal
 
         yield value - previous_value
       end
+
+      def hostname
+        return @hostname if defined?(@hostname)
+
+        config = @appsignal.config
+        @hostname =
+          if config[:hostname]
+            config[:hostname]
+          else
+            # Auto detect hostname as fallback. May be inaccurate.
+            Socket.gethostname
+          end
+        Appsignal.logger.debug "Probe helper: Using hostname config " \
+          "option '#{@hostname.inspect}' as hostname"
+
+        @hostname
+      end
+
+      def set_gauge_with_hostname(metric, value, tags = {})
+        @appsignal.set_gauge(metric, value, { :hostname => hostname }.merge(tags))
+      end
     end
   end
 end

data/lib/appsignal/probes/mri.rb

@@ -20,7 +20,7 @@ module Appsignal
 
         constant_cache_invalidations = stat[:constant_cache_invalidations]
         if constant_cache_invalidations
-          set_gauge(
+          set_gauge_with_hostname(
             "ruby_vm",
             constant_cache_invalidations,
             :metric => :constant_cache_invalidations
@@ -29,7 +29,7 @@ module Appsignal
 
         constant_cache_misses = stat[:constant_cache_misses]
         if constant_cache_misses
-          set_gauge(
+          set_gauge_with_hostname(
             "ruby_vm",
             constant_cache_misses,
             :metric => :constant_cache_misses
@@ -38,23 +38,23 @@ module Appsignal
 
         class_serial = stat[:class_serial]
         if class_serial
-          set_gauge("ruby_vm", class_serial, :metric => :class_serial)
+          set_gauge_with_hostname("ruby_vm", class_serial, :metric => :class_serial)
         end
 
         global_constant_state =
           stat[:constant_cache] ? stat[:constant_cache].values.sum : stat[:global_constant_state]
         if global_constant_state
-          set_gauge(
+          set_gauge_with_hostname(
             "ruby_vm",
             global_constant_state,
             :metric => :global_constant_state
           )
         end
 
-        set_gauge("thread_count", Thread.list.size)
+        set_gauge_with_hostname("thread_count", Thread.list.size)
         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
+            set_gauge_with_hostname("gc_time", gc_time) if gc_time > 0
           end
         end
 
@@ -63,44 +63,21 @@ module Appsignal
           :allocated_objects,
           gc_stats[:total_allocated_objects] || gc_stats[:total_allocated_object]
         ) do |allocated_objects|
-          set_gauge("allocated_objects", allocated_objects)
+          set_gauge_with_hostname("allocated_objects", allocated_objects)
         end
 
         gauge_delta(:gc_count, GC.count) do |gc_count|
-          set_gauge("gc_count", gc_count, :metric => :gc_count)
+          set_gauge_with_hostname("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)
+          set_gauge_with_hostname("gc_count", minor_gc_count, :metric => :minor_gc_count)
         end
         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)
+          set_gauge_with_hostname("gc_count", major_gc_count, :metric => :major_gc_count)
         end
 
-        set_gauge("heap_slots", gc_stats[:heap_live_slots] || gc_stats[:heap_live_slot], :metric => :heap_live)
-        set_gauge("heap_slots", gc_stats[:heap_free_slots] || gc_stats[:heap_free_slot], :metric => :heap_free)
-      end
-
-      private
-
-      def set_gauge(metric, value, tags = {})
-        @appsignal.set_gauge(metric, value, { :hostname => hostname }.merge(tags))
-      end
-
-      def hostname
-        return @hostname if defined?(@hostname)
-
-        config = @appsignal.config
-        @hostname =
-          if config[:hostname]
-            config[:hostname]
-          else
-            # Auto detect hostname as fallback. May be inaccurate.
-            Socket.gethostname
-          end
-        Appsignal.logger.debug "MRI probe: Using hostname config " \
-          "option '#{@hostname.inspect}' as hostname"
-
-        @hostname
+        set_gauge_with_hostname("heap_slots", gc_stats[:heap_live_slots] || gc_stats[:heap_live_slot], :metric => :heap_live)
+        set_gauge_with_hostname("heap_slots", gc_stats[:heap_free_slots] || gc_stats[:heap_free_slot], :metric => :heap_free)
       end
     end
   end

data/lib/appsignal/probes.rb

@@ -4,5 +4,6 @@ module Appsignal
 end
 
 require "appsignal/probes/helpers"
+require "appsignal/probes/gvl"
 require "appsignal/probes/mri"
 require "appsignal/probes/sidekiq"

data/lib/appsignal/version.rb

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

data/spec/lib/appsignal/config_spec.rb

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

data/spec/lib/appsignal/hooks/gvl_spec.rb

@@ -0,0 +1,140 @@
+describe Appsignal::Hooks::GvlHook do
+  if DependencyHelper.running_jruby?
+    context "running JRuby" do
+      it "does not attempt to require GVLTools" do
+        expect_any_instance_of(described_class).not_to receive(:require).with("gvltools")
+        expect(described_class.new.dependencies_present?).to be_falsy
+      end
+    end
+  else
+    before(:context) do
+      Appsignal.config = project_fixture_config
+    end
+
+    def expect_gvltools_require
+      expect_any_instance_of(described_class).to receive(:require).with("gvltools").and_return(true)
+    end
+
+    context "without GVLTools" do
+      describe "#dependencies_present?" do
+        context "if requiring gvltools fails" do
+          it "is false" do
+            expect(described_class.new.dependencies_present?).to be_falsy
+          end
+        end
+
+        it "is false" do
+          expect_gvltools_require
+          expect(described_class.new.dependencies_present?).to be_falsy
+        end
+      end
+    end
+
+    context "with old versions of GVLTools" do
+      before(:context) do
+        module GVLTools
+          VERSION = "0.1.0".freeze
+        end
+      end
+
+      after(:context) { Object.send(:remove_const, :GVLTools) }
+
+      before(:each) { expect_gvltools_require }
+
+      describe "#dependencies_present?" do
+        it "is false" do
+          expect(described_class.new.dependencies_present?).to be_falsy
+        end
+      end
+    end
+
+    context "with new versions of GVLTools" do
+      before(:context) do
+        module GVLTools
+          VERSION = "0.2.0".freeze
+
+          module GlobalTimer
+            def self.enable
+            end
+          end
+
+          module WaitingThreads
+            def self.enable
+            end
+          end
+        end
+      end
+
+      after(:context) { Object.send(:remove_const, :GVLTools) }
+
+      describe "#dependencies_present?" do
+        before(:each) { expect_gvltools_require }
+
+        if DependencyHelper.ruby_3_2_or_newer?
+          it "is true" do
+            expect(described_class.new.dependencies_present?).to be_truthy
+          end
+        else
+          it "is false" do
+            expect(described_class.new.dependencies_present?).to be_falsy
+          end
+        end
+      end
+
+      if DependencyHelper.ruby_3_2_or_newer?
+        describe "Appsignal::Hooks.load_hooks" do
+          before(:each) { expect_gvltools_require }
+
+          # After installing a hook once, it is marked as already installed,
+          # and subsequent calls to `load_hooks` silently do nothing.
+          # Because of this, only one of the tests for the installation uses
+          # `load_hooks`, while the rest call the `install` method directly.
+
+          it "is added to minutely probes" do
+            Appsignal::Hooks.load_hooks
+
+            expect(Appsignal::Minutely.probes[:gvl]).to be Appsignal::Probes::GvlProbe
+          end
+        end
+      end
+
+      describe "#install" do
+        context "with enable_gvl_global_timer" do
+          it "enables the GVL global timer" do
+            Appsignal.config[:enable_gvl_global_timer] = true
+            expect(::GVLTools::GlobalTimer).to receive(:enable)
+
+            described_class.new.install
+          end
+        end
+
+        context "without enable_gvl_global_timer" do
+          it "does not enable the GVL global timer" do
+            Appsignal.config[:enable_gvl_global_timer] = false
+            expect(::GVLTools::GlobalTimer).not_to receive(:enable)
+
+            described_class.new.install
+          end
+        end
+
+        context "with enable_gvl_waiting_threads" do
+          it "enables the GVL waiting threads" do
+            Appsignal.config[:enable_gvl_global_timer] = true
+            expect(::GVLTools::WaitingThreads).to receive(:enable)
+
+            described_class.new.install
+          end
+        end
+
+        context "without enable_gvl_waiting_threads" do
+          it "does not enable the GVL waiting threads" do
+            Appsignal.config[:enable_gvl_waiting_threads] = false
+            expect(::GVLTools::WaitingThreads).not_to receive(:enable)
+
+            described_class.new.install
+          end
+        end
+      end
+    end
+  end
+end

data/spec/lib/appsignal/logger_spec.rb

@@ -115,14 +115,29 @@ describe Appsignal::Logger do
 
       context "with a formatter set" do
         before do
-          logger.formatter = proc do |_level, _timestamp, _appname, message|
-            "formatted: '#{message}'"
+          Timecop.freeze(Time.local(2023))
+          logger.formatter = logger.formatter = proc do |_level, timestamp, _appname, message|
+            # This line replicates the behaviour of the Ruby default Logger::Formatter
+            # which expects a timestamp object as a second argument
+            # https://github.com/ruby/ruby/blob/master/lib/logger/formatter.rb#L15-L17
+            time = timestamp.strftime("%Y-%m-%dT%H:%M:%S.%6N")
+            "formatted: #{time} '#{message}'"
           end
         end
 
+        after do
+          Timecop.return
+        end
+
         it "should log with a level, message and group" do
           expect(Appsignal::Extension).to receive(:log)
-            .with("group", method[1], 0, "formatted: 'Log message'", instance_of(Appsignal::Extension::Data))
+            .with(
+              "group",
+              method[1],
+              0,
+              "formatted: 2023-01-01T00:00:00.000000 'Log message'",
+              instance_of(Appsignal::Extension::Data)
+            )
           logger.send(method[0], "Log message")
         end
       end

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

@@ -0,0 +1,39 @@
+describe Appsignal::Probes::GvlProbe do
+  let(:appsignal_mock) { AppsignalMock.new(:hostname => hostname) }
+  let(:probe) { described_class.new(:appsignal => appsignal_mock, :gvl_tools => FakeGVLTools) }
+
+  let(:hostname) { "some-host" }
+
+  after(:each) { FakeGVLTools.reset }
+
+  context "with global timer enabled" do
+    before(:each) { FakeGVLTools::GlobalTimer.enabled = true }
+
+    it "gauges the global timer delta" do
+      FakeGVLTools::GlobalTimer.monotonic_time = 100_000_000
+      probe.call
+
+      expect(appsignal_mock.gauges).to be_empty
+
+      FakeGVLTools::GlobalTimer.monotonic_time = 300_000_000
+      probe.call
+
+      expect(appsignal_mock.gauges).to eq [
+        ["gvl_global_timer", 200, { :hostname => hostname }]
+      ]
+    end
+  end
+
+  context "with waiting threads enabled" do
+    before(:each) { FakeGVLTools::WaitingThreads.enabled = true }
+
+    it "gauges the waiting threads count" do
+      FakeGVLTools::WaitingThreads.count = 3
+      probe.call
+
+      expect(appsignal_mock.gauges).to eq [
+        ["gvl_waiting_threads", 3, { :hostname => hostname }]
+      ]
+    end
+  end
+end

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

@@ -1,22 +1,3 @@
-class AppsignalMock
-  attr_reader :gauges
-
-  def initialize(hostname: nil)
-    @hostname = hostname
-    @gauges = []
-  end
-
-  def config
-    ConfigHelpers.project_fixture_config.tap do |conf|
-      conf[:hostname] = @hostname if @hostname
-    end
-  end
-
-  def set_gauge(*args) # rubocop:disable Naming/AccessorMethodName
-    @gauges << args
-  end
-end
-
 describe Appsignal::Probes::MriProbe do
   let(:appsignal_mock) { AppsignalMock.new(:hostname => hostname) }
   let(:gc_profiler_mock) { instance_double("Appsignal::GarbageCollectionProfiler") }

data/spec/support/mocks/appsignal_mock.rb

@@ -0,0 +1,18 @@
+class AppsignalMock
+  attr_reader :gauges
+
+  def initialize(hostname: nil)
+    @hostname = hostname
+    @gauges = []
+  end
+
+  def config
+    ConfigHelpers.project_fixture_config.tap do |conf|
+      conf[:hostname] = @hostname if @hostname
+    end
+  end
+
+  def set_gauge(*args) # rubocop:disable Naming/AccessorMethodName
+    @gauges << args
+  end
+end

data/spec/support/mocks/fake_gvl_tools.rb

@@ -0,0 +1,36 @@
+module FakeGVLTools
+  def self.reset
+    self::GlobalTimer.enabled = false
+    self::GlobalTimer.monotonic_time = 0
+    self::WaitingThreads.enabled = false
+    self::WaitingThreads.count = 0
+  end
+
+  module GlobalTimer
+    @enabled = false
+    @monotonic_time = 0
+
+    class << self
+      attr_writer :enabled
+      attr_accessor :monotonic_time
+
+      def enabled?
+        @enabled
+      end
+    end
+  end
+
+  module WaitingThreads
+    @enabled = false
+    @count = 0
+
+    class << self
+      attr_writer :enabled
+      attr_accessor :count
+
+      def enabled?
+        @enabled
+      end
+    end
+  end
+end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 3.3.7
+  version: 3.3.9
 platform: java
 authors:
 - Robert Beekman
 - Thijs Cadier
 - Tom de Bruijn
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 2023-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -196,7 +196,8 @@ files:
 - gemfiles/sequel-435.gemfile
 - gemfiles/sequel.gemfile
 - gemfiles/sinatra.gemfile
-- gemfiles/webmachine.gemfile
+- gemfiles/webmachine1.gemfile
+- gemfiles/webmachine2.gemfile
 - lib/appsignal.rb
 - lib/appsignal/auth_check.rb
 - lib/appsignal/capistrano.rb
@@ -232,6 +233,7 @@ files:
 - lib/appsignal/hooks/data_mapper.rb
 - lib/appsignal/hooks/delayed_job.rb
 - lib/appsignal/hooks/excon.rb
+- lib/appsignal/hooks/gvl.rb
 - lib/appsignal/hooks/http.rb
 - lib/appsignal/hooks/mongo_ruby_driver.rb
 - lib/appsignal/hooks/mri.rb
@@ -274,6 +276,7 @@ files:
 - lib/appsignal/marker.rb
 - lib/appsignal/minutely.rb
 - lib/appsignal/probes.rb
+- lib/appsignal/probes/gvl.rb
 - lib/appsignal/probes/helpers.rb
 - lib/appsignal/probes/mri.rb
 - lib/appsignal/probes/sidekiq.rb
@@ -337,6 +340,7 @@ files:
 - spec/lib/appsignal/hooks/data_mapper_spec.rb
 - spec/lib/appsignal/hooks/delayed_job_spec.rb
 - spec/lib/appsignal/hooks/excon_spec.rb
+- spec/lib/appsignal/hooks/gvl_spec.rb
 - spec/lib/appsignal/hooks/http_spec.rb
 - spec/lib/appsignal/hooks/mongo_ruby_driver_spec.rb
 - spec/lib/appsignal/hooks/mri_spec.rb
@@ -368,6 +372,7 @@ files:
 - spec/lib/appsignal/logger_spec.rb
 - spec/lib/appsignal/marker_spec.rb
 - spec/lib/appsignal/minutely_spec.rb
+- spec/lib/appsignal/probes/gvl_spec.rb
 - spec/lib/appsignal/probes/mri_spec.rb
 - spec/lib/appsignal/probes/sidekiq_spec.rb
 - spec/lib/appsignal/rack/generic_instrumentation_spec.rb
@@ -416,7 +421,9 @@ files:
 - spec/support/matchers/be_completed.rb
 - spec/support/matchers/contains_log.rb
 - spec/support/matchers/have_colorized_text.rb
+- spec/support/mocks/appsignal_mock.rb
 - spec/support/mocks/fake_gc_profiler.rb
+- spec/support/mocks/fake_gvl_tools.rb
 - spec/support/mocks/mock_probe.rb
 - spec/support/rails/my_app.rb
 - spec/support/shared_examples/instrument.rb
@@ -436,7 +443,7 @@ metadata:
   documentation_uri: https://docs.appsignal.com/ruby/
   homepage_uri: https://docs.appsignal.com/ruby/
   source_code_uri: https://github.com/appsignal/appsignal-ruby
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -452,8 +459,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
 test_files:
@@ -494,6 +501,7 @@ test_files:
 - spec/lib/appsignal/hooks/data_mapper_spec.rb
 - spec/lib/appsignal/hooks/delayed_job_spec.rb
 - spec/lib/appsignal/hooks/excon_spec.rb
+- spec/lib/appsignal/hooks/gvl_spec.rb
 - spec/lib/appsignal/hooks/http_spec.rb
 - spec/lib/appsignal/hooks/mongo_ruby_driver_spec.rb
 - spec/lib/appsignal/hooks/mri_spec.rb
@@ -525,6 +533,7 @@ test_files:
 - spec/lib/appsignal/logger_spec.rb
 - spec/lib/appsignal/marker_spec.rb
 - spec/lib/appsignal/minutely_spec.rb
+- spec/lib/appsignal/probes/gvl_spec.rb
 - spec/lib/appsignal/probes/mri_spec.rb
 - spec/lib/appsignal/probes/sidekiq_spec.rb
 - spec/lib/appsignal/rack/generic_instrumentation_spec.rb
@@ -573,7 +582,9 @@ test_files:
 - spec/support/matchers/be_completed.rb
 - spec/support/matchers/contains_log.rb
 - spec/support/matchers/have_colorized_text.rb
+- spec/support/mocks/appsignal_mock.rb
 - spec/support/mocks/fake_gc_profiler.rb
+- spec/support/mocks/fake_gvl_tools.rb
 - spec/support/mocks/mock_probe.rb
 - spec/support/rails/my_app.rb
 - spec/support/shared_examples/instrument.rb