appsignal 3.3.6-java → 3.3.8-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23fd604ba8693728cde46042cdd5a8948ed02a0d1fd585485a64b9b63679f834
-  data.tar.gz: 26ccebf3fd9845f812f1521b819c926aacb8465cd3faeeb0a3802877f7c19e58
+  metadata.gz: 35ea1bb6c0b8149bf0ec44f55a8ab59655ea4149e40656122d39ede681bf4776
+  data.tar.gz: 6b8e85945c4517cedff96f03d304e945f70dbc5f0ee53afb153fe0ed35a8bcdd
 SHA512:
-  metadata.gz: 8f9cfbf7b54ebc968f558a0f144cfbb3d255f2038465c19a9ce1d60b675be5b9bb06b58c514c77584d063695380fc7bca135e1841104756267956721df0a3265
-  data.tar.gz: '0487d44ad3d8907615cb877f5aaf3a13e73c1753c05cbac87a7a41eb0f5dfeaa383d533e7e057e8534d5c2035c005b8094eb566ed729e6a7a87ce9877e95c57c'
+  metadata.gz: aca3054a5bc035c77d1d7c935988f0fc989482d74242d55f9f3879fbeba1ee037faa9644060c17bf09f36fab61f4aa25955e58d18f4846448ac436499216e9f1
+  data.tar.gz: 0b50957a4ba08682831a8f21c7b589f0a2658ed388b17fb6b9980802a8c83f181b8464976cc8a64ab16648a2d776dfe8c723f2cda227dc6c7d954eacd75ab09d

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # AppSignal for Ruby gem Changelog
 
+## 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
+
+- [a815b298](https://github.com/appsignal/appsignal-ruby/commit/a815b29826a84f430384e7e735f79c8c312f1abf) patch - Remove trailing comments in SQL queries, ensuring queries are grouped consistently.
+- [a815b298](https://github.com/appsignal/appsignal-ruby/commit/a815b29826a84f430384e7e735f79c8c312f1abf) patch - Fix an issue where events longer than forty-eight minutes would be shown as having a zero-second duration.
+
 ## 3.3.6
 
 ### Changed

data/ext/agent.rb

@@ -4,7 +4,7 @@
 # Modifications to this file will be overwritten with the next agent release.
 
 APPSIGNAL_AGENT_CONFIG = {
-  "version" => "8d042e2",
+  "version" => "dee4fcb",
   "mirrors" => [
     "https://appsignal-agent-releases.global.ssl.fastly.net",
     "https://d135dj0rjqvssy.cloudfront.net"
@@ -12,131 +12,131 @@ APPSIGNAL_AGENT_CONFIG = {
   "triples" => {
     "x86_64-darwin" => {
       "static" => {
-        "checksum" => "e0142859f35e31b52dcc57418636c05bcb21940ad499bbe255f90a1cf7359bf7",
+        "checksum" => "d45bfc2eb38138c317b501c3156459b8dbbb15a59910f1e2ec3d2d02e461a147",
         "filename" => "appsignal-x86_64-darwin-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "43b01ab821eddb9fda03cedf59ab4bd8ebfca4c0cf011daa0233802fff69fc0b",
+        "checksum" => "a126901650046ae1c40affd386ab5dfcda5cb89f9bd05cf0a3087faff1d2d77d",
         "filename" => "appsignal-x86_64-darwin-all-dynamic.tar.gz"
       }
     },
     "universal-darwin" => {
       "static" => {
-        "checksum" => "e0142859f35e31b52dcc57418636c05bcb21940ad499bbe255f90a1cf7359bf7",
+        "checksum" => "d45bfc2eb38138c317b501c3156459b8dbbb15a59910f1e2ec3d2d02e461a147",
         "filename" => "appsignal-x86_64-darwin-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "43b01ab821eddb9fda03cedf59ab4bd8ebfca4c0cf011daa0233802fff69fc0b",
+        "checksum" => "a126901650046ae1c40affd386ab5dfcda5cb89f9bd05cf0a3087faff1d2d77d",
         "filename" => "appsignal-x86_64-darwin-all-dynamic.tar.gz"
       }
     },
     "aarch64-darwin" => {
       "static" => {
-        "checksum" => "5a1ab02452497b29222d580f3e9d3649eb547b8c90338858462d4f221dd18ff9",
+        "checksum" => "1cd875e74ba18c2bc81533437a9eebdf08f624e0201427c13326c2be00f22907",
         "filename" => "appsignal-aarch64-darwin-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "ea6ee98125ae521f3a79c47d942cf9b689a43e48fd172eab62d3dc80a7fea033",
+        "checksum" => "d2243146bf4e5839a4cf4430870b7b87d6553e1da4dc631c9fb396bba094cea4",
         "filename" => "appsignal-aarch64-darwin-all-dynamic.tar.gz"
       }
     },
     "arm64-darwin" => {
       "static" => {
-        "checksum" => "5a1ab02452497b29222d580f3e9d3649eb547b8c90338858462d4f221dd18ff9",
+        "checksum" => "1cd875e74ba18c2bc81533437a9eebdf08f624e0201427c13326c2be00f22907",
         "filename" => "appsignal-aarch64-darwin-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "ea6ee98125ae521f3a79c47d942cf9b689a43e48fd172eab62d3dc80a7fea033",
+        "checksum" => "d2243146bf4e5839a4cf4430870b7b87d6553e1da4dc631c9fb396bba094cea4",
         "filename" => "appsignal-aarch64-darwin-all-dynamic.tar.gz"
       }
     },
     "arm-darwin" => {
       "static" => {
-        "checksum" => "5a1ab02452497b29222d580f3e9d3649eb547b8c90338858462d4f221dd18ff9",
+        "checksum" => "1cd875e74ba18c2bc81533437a9eebdf08f624e0201427c13326c2be00f22907",
         "filename" => "appsignal-aarch64-darwin-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "ea6ee98125ae521f3a79c47d942cf9b689a43e48fd172eab62d3dc80a7fea033",
+        "checksum" => "d2243146bf4e5839a4cf4430870b7b87d6553e1da4dc631c9fb396bba094cea4",
         "filename" => "appsignal-aarch64-darwin-all-dynamic.tar.gz"
       }
     },
     "aarch64-linux" => {
       "static" => {
-        "checksum" => "0e85a0a13b9457c4ee1f316e92e8d95de9125bbaff90ceb826bcefaaffa413d9",
+        "checksum" => "72fbfaa1c6ed72defea9eca59679372f53ddeab845a9b2f75d9d165e4983d69e",
         "filename" => "appsignal-aarch64-linux-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "77103ab5c9907334998c48464fd742ab21fcbead58195cb6afcfc4797514f34c",
+        "checksum" => "bf31b4836c84ceaa87a52aa85f296d40e32cfd784a8aa5b19ec5ca3a4aa5c8eb",
         "filename" => "appsignal-aarch64-linux-all-dynamic.tar.gz"
       }
     },
     "i686-linux" => {
       "static" => {
-        "checksum" => "0e8a0490ca960bb8e57183156ed4999afbd70cf13c640fe96f9b0e25556075f1",
+        "checksum" => "c504a7233512c9285274a7ba0142ab91cf4637c6f5f57c58c6890137ba0f82de",
         "filename" => "appsignal-i686-linux-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "f19947288f3638f15eeaf8f6ee9aecae6f1f777e4e68820c88bf4fb6941856b9",
+        "checksum" => "19091f50e98afed547b73bc220770bdafce737e152ab9345dabe03e284219cc1",
         "filename" => "appsignal-i686-linux-all-dynamic.tar.gz"
       }
     },
     "x86-linux" => {
       "static" => {
-        "checksum" => "0e8a0490ca960bb8e57183156ed4999afbd70cf13c640fe96f9b0e25556075f1",
+        "checksum" => "c504a7233512c9285274a7ba0142ab91cf4637c6f5f57c58c6890137ba0f82de",
         "filename" => "appsignal-i686-linux-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "f19947288f3638f15eeaf8f6ee9aecae6f1f777e4e68820c88bf4fb6941856b9",
+        "checksum" => "19091f50e98afed547b73bc220770bdafce737e152ab9345dabe03e284219cc1",
         "filename" => "appsignal-i686-linux-all-dynamic.tar.gz"
       }
     },
     "x86_64-linux" => {
       "static" => {
-        "checksum" => "4eec193edeae76e0793789846112ac9127870c90a8ae6e47aa2a8490163733aa",
+        "checksum" => "f9e68dbbee7d38b255c5b9bc0cb75226764f79cd51421e4e00a9e7454b0c6ccb",
         "filename" => "appsignal-x86_64-linux-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "dcbc99ba30038f03f91232e5a25d76f27fae1a85a1b692e4935c62720e60b4ae",
+        "checksum" => "58e3192c87903a2abce6540b893c9d25a69f43e37fd2367df45c2c22c26068ba",
         "filename" => "appsignal-x86_64-linux-all-dynamic.tar.gz"
       }
     },
     "x86_64-linux-musl" => {
       "static" => {
-        "checksum" => "d91d1ed6e775cc00319fca0a4144dff064d31fb6a8a28dbb5027add44e4dab02",
+        "checksum" => "8fa1d110d2544502509cc66ba8ec6685010d8c6d8373f4f14ebe721d4be157e0",
         "filename" => "appsignal-x86_64-linux-musl-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "87a704506c488a9f6fd582b2191085af9dc3c1ffb10eaa8586691474fc42f595",
+        "checksum" => "fc46dd29864165968d96bb78fde1c8970903488d80d97056e630636c736cf86f",
         "filename" => "appsignal-x86_64-linux-musl-all-dynamic.tar.gz"
       }
     },
     "aarch64-linux-musl" => {
       "static" => {
-        "checksum" => "0ff6702bd976871f610f39ff6c2dd73c4535b12c15c81c0d0afab7650e75922d",
+        "checksum" => "a43895183baf017879332885a904208773befc14b9bd628efae6d1513052b782",
         "filename" => "appsignal-aarch64-linux-musl-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "516656660666791a5158765fdc8181f12c2c08763f257740c6e04d97cdcdb6c2",
+        "checksum" => "7e96b29348be655066cf162ae5c15248bba7d7177663e35e60a6c5ad243937d0",
         "filename" => "appsignal-aarch64-linux-musl-all-dynamic.tar.gz"
       }
     },
     "x86_64-freebsd" => {
       "static" => {
-        "checksum" => "d973edc7f13cdad2993c415f17a680a4de3288ce57fc5ae0c69ef3a1ccbb2856",
+        "checksum" => "1b992f770bdbced09f7b5f18d7aa721710218d4a76a131adc7affe44d68684f0",
         "filename" => "appsignal-x86_64-freebsd-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "6720b701bb41257c4fcdb189c7196241c5e43a0a0f20f1614a1a8978e117f5c9",
+        "checksum" => "300b718986c10ff65f237e1d74086e9cc0f7079d7b531e3b6f9a64752f1aa6ee",
         "filename" => "appsignal-x86_64-freebsd-all-dynamic.tar.gz"
       }
     },
     "amd64-freebsd" => {
       "static" => {
-        "checksum" => "d973edc7f13cdad2993c415f17a680a4de3288ce57fc5ae0c69ef3a1ccbb2856",
+        "checksum" => "1b992f770bdbced09f7b5f18d7aa721710218d4a76a131adc7affe44d68684f0",
         "filename" => "appsignal-x86_64-freebsd-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "6720b701bb41257c4fcdb189c7196241c5e43a0a0f20f1614a1a8978e117f5c9",
+        "checksum" => "300b718986c10ff65f237e1d74086e9cc0f7079d7b531e3b6f9a64752f1aa6ee",
         "filename" => "appsignal-x86_64-freebsd-all-dynamic.tar.gz"
       }
     }

data/lib/appsignal/cli/demo.rb

@@ -35,9 +35,9 @@ module Appsignal
     # @since 2.0.0
     # @see Appsignal::Demo
     # @see Appsignal::CLI::Install
-    # @see http://docs.appsignal.com/ruby/command-line/demo.html
+    # @see https://docs.appsignal.com/ruby/command-line/demo.html
     #   AppSignal demo documentation
-    # @see http://docs.appsignal.com/support/debugging.html
+    # @see https://docs.appsignal.com/support/debugging.html
     #   Debugging AppSignal guide
     # @api private
     class Demo

data/lib/appsignal/cli/diagnose.rb

@@ -196,7 +196,7 @@ module Appsignal
 
           Appsignal.config = Appsignal::Config.new(
             current_path,
-            options[:environment],
+            options.fetch(:environment, ENV.fetch("RACK_ENV", ENV.fetch("RAILS_ENV", nil))),
             initial_config
           )
           Appsignal.config.write_to_environment

data/lib/appsignal/cli/install.rb

@@ -126,7 +126,7 @@ module Appsignal
           puts "  require 'appsignal/integrations/sinatra'"
           puts
           puts "  You can find more information in the documentation:"
-          puts "  http://docs.appsignal.com/ruby/integrations/sinatra.html"
+          puts "  https://docs.appsignal.com/ruby/integrations/sinatra.html"
           press_any_key
           done_notice
         end
@@ -144,7 +144,7 @@ module Appsignal
           puts "  require 'appsignal/integrations/padrino"
           puts
           puts "  You can find more information in the documentation:"
-          puts "  http://docs.appsignal.com/ruby/integrations/padrino.html"
+          puts "  https://docs.appsignal.com/ruby/integrations/padrino.html"
           press_any_key
           done_notice
         end
@@ -159,7 +159,7 @@ module Appsignal
 
           puts "Manual Grape configuration needed"
           puts "  See the installation instructions at:"
-          puts "  http://docs.appsignal.com/ruby/integrations/grape.html"
+          puts "  https://docs.appsignal.com/ruby/integrations/grape.html"
           press_any_key
           done_notice
         end
@@ -177,7 +177,7 @@ module Appsignal
           puts "  require 'appsignal/integrations/hanami'"
           puts
           puts "  You can find more information in the documentation:"
-          puts "  http://docs.appsignal.com/ruby/integrations/hanami.html"
+          puts "  https://docs.appsignal.com/ruby/integrations/hanami.html"
           press_any_key
           done_notice
         end
@@ -234,7 +234,7 @@ module Appsignal
               end
               puts
               puts "  See the documentation for more configuration options:"
-              puts "  http://docs.appsignal.com/gem-settings/configuration.html"
+              puts "  https://docs.appsignal.com/gem-settings/configuration.html"
               press_any_key
               break
             end

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/helpers/instrumentation.rb

@@ -197,9 +197,9 @@ module Appsignal
       #   used to send the error.
       # @return [void]
       #
-      # @see http://docs.appsignal.com/ruby/instrumentation/exception-handling.html
+      # @see https://docs.appsignal.com/ruby/instrumentation/exception-handling.html
       #   Exception handling guide
-      # @see http://docs.appsignal.com/ruby/instrumentation/tagging.html
+      # @see https://docs.appsignal.com/ruby/instrumentation/tagging.html
       #   Tagging guide
       # @since 0.6.0
       def send_error(
@@ -296,7 +296,7 @@ module Appsignal
       # @return [void]
       #
       # @see Transaction#set_error
-      # @see http://docs.appsignal.com/ruby/instrumentation/exception-handling.html
+      # @see https://docs.appsignal.com/ruby/instrumentation/exception-handling.html
       #   Exception handling guide
       # @since 0.6.6
       def set_error(exception, tags = nil, namespace = nil)
@@ -435,7 +435,7 @@ module Appsignal
       # @return [void]
       #
       # @see Transaction.set_tags
-      # @see http://docs.appsignal.com/ruby/instrumentation/tagging.html
+      # @see https://docs.appsignal.com/ruby/instrumentation/tagging.html
       #   Tagging guide
       def tag_request(tags = {})
         return unless active?
@@ -468,7 +468,7 @@ module Appsignal
       # @return [void]
       #
       # @see Transaction#add_breadcrumb
-      # @see http://docs.appsignal.com/ruby/instrumentation/breadcrumbs.html
+      # @see https://docs.appsignal.com/ruby/instrumentation/breadcrumbs.html
       #   Breadcrumb reference
       # @since 2.12.0
       def add_breadcrumb(category, action, message = "", metadata = {}, time = Time.now.utc)
@@ -513,9 +513,9 @@ module Appsignal
       #
       # @see Appsignal::Transaction#instrument
       # @see .instrument_sql
-      # @see http://docs.appsignal.com/ruby/instrumentation/instrumentation.html
+      # @see https://docs.appsignal.com/ruby/instrumentation/instrumentation.html
       #   AppSignal custom instrumentation guide
-      # @see http://docs.appsignal.com/api/event-names.html
+      # @see https://docs.appsignal.com/api/event-names.html
       #   AppSignal event naming guide
       # @since 1.3.0
       def instrument(
@@ -557,9 +557,9 @@ module Appsignal
       # @return [Object] Returns the block's return value.
       #
       # @see .instrument
-      # @see http://docs.appsignal.com/ruby/instrumentation/instrumentation.html
+      # @see https://docs.appsignal.com/ruby/instrumentation/instrumentation.html
       #   AppSignal custom instrumentation guide
-      # @see http://docs.appsignal.com/api/event-names.html
+      # @see https://docs.appsignal.com/api/event-names.html
       #   AppSignal event naming guide
       # @since 2.0.0
       def instrument_sql(name, title = nil, body = nil, &block)

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/marker.rb

@@ -18,7 +18,7 @@ module Appsignal
   #     Set config does not override data set in {#marker_data}.
   #
   # @see Appsignal::CLI::NotifyOfDeploy
-  # @see http://docs.appsignal.com/appsignal/terminology.html#markers
+  # @see https://docs.appsignal.com/appsignal/terminology.html#markers
   #   Terminology: Deploy marker
   # @api private
   class Marker

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/transaction.rb

@@ -159,7 +159,7 @@ module Appsignal
     # @return [void]
     #
     # @see Appsignal.tag_request
-    # @see http://docs.appsignal.com/ruby/instrumentation/tagging.html
+    # @see https://docs.appsignal.com/ruby/instrumentation/tagging.html
     #   Tagging guide
     def set_tags(given_tags = {})
       @tags.merge!(given_tags)
@@ -177,7 +177,7 @@ module Appsignal
     # @return [void]
     #
     # @see Appsignal.add_breadcrumb
-    # @see http://docs.appsignal.com/ruby/instrumentation/breadcrumbs.html
+    # @see https://docs.appsignal.com/ruby/instrumentation/breadcrumbs.html
     #   Breadcrumb reference
     def add_breadcrumb(category, action, message = "", metadata = {}, time = Time.now.utc)
       @breadcrumbs.push(

data/lib/appsignal/version.rb

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

data/lib/appsignal.rb

@@ -74,8 +74,8 @@ module Appsignal
     # This is not required for the automatic integrations AppSignal offers, but
     # this is required for all non-automatic integrations and pure Ruby
     # applications. For more information, see our [integrations
-    # list](http://docs.appsignal.com/ruby/integrations/) and our [Integrating
-    # AppSignal](http://docs.appsignal.com/ruby/instrumentation/integrating-appsignal.html)
+    # list](https://docs.appsignal.com/ruby/integrations/) and our [Integrating
+    # AppSignal](https://docs.appsignal.com/ruby/instrumentation/integrating-appsignal.html)
     # guide.
     #
     # To start the logger see {.start_logger}.

data/resources/appsignal.yml.erb

@@ -26,7 +26,7 @@ default: &defaults
   #   - SystemExit
   #   - SystemStackError
 
-  # See http://docs.appsignal.com/ruby/configuration/options.html for
+  # See https://docs.appsignal.com/ruby/configuration/options.html for
   # all configuration options.
 
 # Configuration per environment, leave out an environment or set active

data/spec/lib/appsignal/cli/diagnose_spec.rb

@@ -802,6 +802,39 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
             end
           end
 
+          context "when the source is the RACK_ENV env variable", :send_report => :no_cli_option do
+            let(:config) { project_fixture_config("rack_env") }
+            let(:options) { {} }
+            before do
+              ENV["RACK_ENV"] = "rack_env"
+              run
+            end
+            after { ENV.delete("RACK_ENV") }
+
+            it "outputs the RACK_ENV variable value" do
+              expect(output).to include(
+                %(environment: "rack_env" (Loaded from: initial)\n)
+              )
+            end
+          end
+
+          context "when the source is the RAILS_ENV env variable", :send_report => :no_cli_option do
+            let(:config) { project_fixture_config("rails_env") }
+            let(:options) { {} }
+            before do
+              ENV.delete("RACK_ENV")
+              ENV["RAILS_ENV"] = "rails_env"
+              run
+            end
+            after { ENV.delete("RAILS_ENV") }
+
+            it "outputs the RAILS_ENV variable value" do
+              expect(output).to include(
+                %(environment: "rails_env" (Loaded from: initial)\n)
+              )
+            end
+          end
+
           context "when the source is multiple sources" do
             let(:options) { { :environment => "development" } }
             before do

data/spec/lib/appsignal/cli/install_spec.rb

@@ -469,7 +469,7 @@ describe Appsignal::CLI::Install do
             "Installing for Sinatra",
             "Sinatra requires some manual configuration.",
             "require 'appsignal/integrations/sinatra'",
-            "http://docs.appsignal.com/ruby/integrations/sinatra.html"
+            "https://docs.appsignal.com/ruby/integrations/sinatra.html"
           ]
         end
         let(:app_name) { "Test app" }
@@ -536,7 +536,7 @@ describe Appsignal::CLI::Install do
           [
             "Installing for Padrino",
             "Padrino requires some manual configuration.",
-            "http://docs.appsignal.com/ruby/integrations/padrino.html"
+            "https://docs.appsignal.com/ruby/integrations/padrino.html"
           ]
         end
         let(:app_name) { "Test app" }
@@ -603,7 +603,7 @@ describe Appsignal::CLI::Install do
           [
             "Installing for Grape",
             "Manual Grape configuration needed",
-            "http://docs.appsignal.com/ruby/integrations/grape.html"
+            "https://docs.appsignal.com/ruby/integrations/grape.html"
           ]
         end
         let(:app_name) { "Test app" }
@@ -670,7 +670,7 @@ describe Appsignal::CLI::Install do
           [
             "Installing for Hanami",
             "Hanami requires some manual configuration.",
-            "http://docs.appsignal.com/ruby/integrations/hanami.html"
+            "https://docs.appsignal.com/ruby/integrations/hanami.html"
           ]
         end
         let(:app_name) { "Test app" }

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/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/fixtures/projects/valid/config/appsignal.yml

@@ -52,3 +52,9 @@ old_config_mixed_with_new_config:
     "REQUEST_METHOD", "REQUEST_URI", "SERVER_NAME", "SERVER_PORT",
     "SERVER_PROTOCOL", "HTTP_USER_AGENT"
   ]
+
+rack_env:
+  <<: *defaults
+
+rails_env:
+  <<: *defaults

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.6
+  version: 3.3.8
 platform: java
 authors:
 - Robert Beekman
 - Thijs Cadier
 - Tom de Bruijn
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-22 00:00:00.000000000 Z
+date: 2023-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -232,6 +232,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 +275,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 +339,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 +371,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 +420,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 +442,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
@@ -453,7 +459,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com
 test_files:
@@ -494,6 +500,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 +532,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 +581,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