appsignal 3.6.5 → 3.7.1

data/ext/agent.rb

@@ -6,7 +6,7 @@
 # Modifications to this file will be overwritten with the next agent release.
 
 APPSIGNAL_AGENT_CONFIG = {
-  "version" => "0.34.2",
+  "version" => "0.35.5",
   "mirrors" => [
     "https://appsignal-agent-releases.global.ssl.fastly.net",
     "https://d135dj0rjqvssy.cloudfront.net"
@@ -14,131 +14,131 @@ APPSIGNAL_AGENT_CONFIG = {
   "triples" => {
     "x86_64-darwin" => {
       "static" => {
-        "checksum" => "5bf07d396b22fd414eac70c545c710ab60114b1a2fa28aa92f8a5379483fe8fc",
+        "checksum" => "3985b53b2a2814d44737182890e6fbe31b4b88361025140477a598e0e41fd948",
         "filename" => "appsignal-x86_64-darwin-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "d58133f8fd7e47906392e8b587e2ad29e8a31404ac7a6dc78650699b9ef84bd1",
+        "checksum" => "d135e2daf5c041a4ce7a7ab720cfd977fbae8375a007995e33a96558d3635792",
         "filename" => "appsignal-x86_64-darwin-all-dynamic.tar.gz"
       }
     },
     "universal-darwin" => {
       "static" => {
-        "checksum" => "5bf07d396b22fd414eac70c545c710ab60114b1a2fa28aa92f8a5379483fe8fc",
+        "checksum" => "3985b53b2a2814d44737182890e6fbe31b4b88361025140477a598e0e41fd948",
         "filename" => "appsignal-x86_64-darwin-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "d58133f8fd7e47906392e8b587e2ad29e8a31404ac7a6dc78650699b9ef84bd1",
+        "checksum" => "d135e2daf5c041a4ce7a7ab720cfd977fbae8375a007995e33a96558d3635792",
         "filename" => "appsignal-x86_64-darwin-all-dynamic.tar.gz"
       }
     },
     "aarch64-darwin" => {
       "static" => {
-        "checksum" => "6099dfa72394de9e19e8524c19e5292cacd2359a5ceac634c878c113b6f5e875",
+        "checksum" => "79d22436bfe32dab4661f2a4149c6ab34c71e810c5d808ee3e60cd9f8a1395e4",
         "filename" => "appsignal-aarch64-darwin-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "be6bef642febaae556086b7a26e8676c3f1496277150e6a9330ce1afe6a4a7c2",
+        "checksum" => "2c49c8f24a9dd8f9d55c28015b3e1096180807e7b13d4a9cd8ed30f58bc6612f",
         "filename" => "appsignal-aarch64-darwin-all-dynamic.tar.gz"
       }
     },
     "arm64-darwin" => {
       "static" => {
-        "checksum" => "6099dfa72394de9e19e8524c19e5292cacd2359a5ceac634c878c113b6f5e875",
+        "checksum" => "79d22436bfe32dab4661f2a4149c6ab34c71e810c5d808ee3e60cd9f8a1395e4",
         "filename" => "appsignal-aarch64-darwin-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "be6bef642febaae556086b7a26e8676c3f1496277150e6a9330ce1afe6a4a7c2",
+        "checksum" => "2c49c8f24a9dd8f9d55c28015b3e1096180807e7b13d4a9cd8ed30f58bc6612f",
         "filename" => "appsignal-aarch64-darwin-all-dynamic.tar.gz"
       }
     },
     "arm-darwin" => {
       "static" => {
-        "checksum" => "6099dfa72394de9e19e8524c19e5292cacd2359a5ceac634c878c113b6f5e875",
+        "checksum" => "79d22436bfe32dab4661f2a4149c6ab34c71e810c5d808ee3e60cd9f8a1395e4",
         "filename" => "appsignal-aarch64-darwin-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "be6bef642febaae556086b7a26e8676c3f1496277150e6a9330ce1afe6a4a7c2",
+        "checksum" => "2c49c8f24a9dd8f9d55c28015b3e1096180807e7b13d4a9cd8ed30f58bc6612f",
         "filename" => "appsignal-aarch64-darwin-all-dynamic.tar.gz"
       }
     },
     "aarch64-linux" => {
       "static" => {
-        "checksum" => "34061220065890545627b8988062950a20ab873f297c1e3ba1c1709038c23c96",
+        "checksum" => "4a54587bb61f59d0b60032b2e0c1d14d2e726e20af049353c2ff279d07dd3028",
         "filename" => "appsignal-aarch64-linux-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "6d6da3fb88012143081d07a1adefb60cbc9868acb9ad5a260df68b12aec0ab4d",
+        "checksum" => "aa2d011c538ce547c87110e7c8e49a24597d60ea2d1418032fc3db06267efba2",
         "filename" => "appsignal-aarch64-linux-all-dynamic.tar.gz"
       }
     },
     "i686-linux" => {
       "static" => {
-        "checksum" => "f8285d87fa72717889e89059a64bba7e98c45ecc720e533c2b4fc92c60a30a04",
+        "checksum" => "01e2237029c3af23cc6f348fb63f65a92b8caf8f4731b78d014bb4001559aad5",
         "filename" => "appsignal-i686-linux-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "5f59ea1875a86124cdd215a75fb964c2dcef8c0689b3ae116a693a451c7cdb0c",
+        "checksum" => "c1043ac92b000a406d9afb77b6ec1d3ab6cfffd63c218a720c11daa3edb7fd1f",
         "filename" => "appsignal-i686-linux-all-dynamic.tar.gz"
       }
     },
     "x86-linux" => {
       "static" => {
-        "checksum" => "f8285d87fa72717889e89059a64bba7e98c45ecc720e533c2b4fc92c60a30a04",
+        "checksum" => "01e2237029c3af23cc6f348fb63f65a92b8caf8f4731b78d014bb4001559aad5",
         "filename" => "appsignal-i686-linux-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "5f59ea1875a86124cdd215a75fb964c2dcef8c0689b3ae116a693a451c7cdb0c",
+        "checksum" => "c1043ac92b000a406d9afb77b6ec1d3ab6cfffd63c218a720c11daa3edb7fd1f",
         "filename" => "appsignal-i686-linux-all-dynamic.tar.gz"
       }
     },
     "x86_64-linux" => {
       "static" => {
-        "checksum" => "fd6718fee5638986b77ebd777649f013b52f69f4b1886c41c85626c6f901bcb9",
+        "checksum" => "beae1db2c122eb579f1ccb450177b0c64d65569d774efc7a1ee72c42d3382d39",
         "filename" => "appsignal-x86_64-linux-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "13f09cc708cb75a6fcc43cc52166992f0fd56d40927cd8b25fd32e7a53de11d3",
+        "checksum" => "67650f59d2ea9c99cde7dfe44da65a506522a3cdccabe697931d89ebaea96d18",
         "filename" => "appsignal-x86_64-linux-all-dynamic.tar.gz"
       }
     },
     "x86_64-linux-musl" => {
       "static" => {
-        "checksum" => "561626ac2bf31c6a5af9d21994fe7ca55cc89619b0db0d1f575d311259e99bae",
+        "checksum" => "521c4486d10cdafa1f72103cc439d6f0e4f549f1522c4473bf43dc487ec42436",
         "filename" => "appsignal-x86_64-linux-musl-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "905f9ec4138ed9c66e460ceb03e521b8aa1ade15a8fdf20c7a3b5352d1595c02",
+        "checksum" => "0a94fcee8eb1f8fd06fce3eacffbcf9f2a52f5cde040796e19a589176525db4b",
         "filename" => "appsignal-x86_64-linux-musl-all-dynamic.tar.gz"
       }
     },
     "aarch64-linux-musl" => {
       "static" => {
-        "checksum" => "03d8464040796f2d242ce66f12297f238d686794a0c2fe4090e0cde1b7bee272",
+        "checksum" => "c29aab31f4ca59efb1483f48c0cb3c27d799347b81655a28f24c146b55aa7db6",
         "filename" => "appsignal-aarch64-linux-musl-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "805b27b9ced058f79627700ac0e04cb458e888c6df753104b778cf5c18793f98",
+        "checksum" => "4b77ea0c1f50ada6e5f6ed693002e56db1e34e0e9d5fdb4ac80fc52fd51099b8",
         "filename" => "appsignal-aarch64-linux-musl-all-dynamic.tar.gz"
       }
     },
     "x86_64-freebsd" => {
       "static" => {
-        "checksum" => "422cbc821ac99087ca132aa1ac4290cdf08d6f5b8c24fed18e7d321b1ea8e460",
+        "checksum" => "a3598e9df1b6b5970aabbbccbe4e77c2372d2320cd87bfa20f32fca53b8505e4",
         "filename" => "appsignal-x86_64-freebsd-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "9167daf766e3d1c4a7cdcd49e21f6c22e553d24760ecb78652c5601ae8df513c",
+        "checksum" => "4cbfd5e16776c8ea4308ee7f3a096c5cc137f2506f8a05d9c8504e3483fcd8ac",
         "filename" => "appsignal-x86_64-freebsd-all-dynamic.tar.gz"
       }
     },
     "amd64-freebsd" => {
       "static" => {
-        "checksum" => "422cbc821ac99087ca132aa1ac4290cdf08d6f5b8c24fed18e7d321b1ea8e460",
+        "checksum" => "a3598e9df1b6b5970aabbbccbe4e77c2372d2320cd87bfa20f32fca53b8505e4",
         "filename" => "appsignal-x86_64-freebsd-all-static.tar.gz"
       },
       "dynamic" => {
-        "checksum" => "9167daf766e3d1c4a7cdcd49e21f6c22e553d24760ecb78652c5601ae8df513c",
+        "checksum" => "4cbfd5e16776c8ea4308ee7f3a096c5cc137f2506f8a05d9c8504e3483fcd8ac",
         "filename" => "appsignal-x86_64-freebsd-all-dynamic.tar.gz"
       }
     }

data/ext/base.rb

@@ -190,6 +190,9 @@ def store_download_version_on_report
 end
 
 def http_proxy
+  proxy = try_http_proxy_value(ENV.fetch("APPSIGNAL_HTTP_PROXY", nil))
+  return [proxy, nil] if proxy
+
   proxy, error =
     begin
       [try_http_proxy_value(Gem.configuration[:http_proxy]), nil]

data/lib/appsignal/config.rb

@@ -8,7 +8,7 @@ require "tmpdir"
 
 module Appsignal
   class Config
-    include Appsignal::Utils::DeprecationMessage
+    include Appsignal::Utils::StdoutAndLoggerMessage
 
     DEFAULT_CONFIG = {
       :activejob_report_errors => "all",
@@ -30,6 +30,7 @@ module Appsignal
       :filter_session_data => [],
       :ignore_actions => [],
       :ignore_errors => [],
+      :ignore_logs => [],
       :ignore_namespaces => [],
       :instrument_http_rb => true,
       :instrument_net_http => true,
@@ -90,6 +91,7 @@ module Appsignal
       "APPSIGNAL_HTTP_PROXY" => :http_proxy,
       "APPSIGNAL_IGNORE_ACTIONS" => :ignore_actions,
       "APPSIGNAL_IGNORE_ERRORS" => :ignore_errors,
+      "APPSIGNAL_IGNORE_LOGS" => :ignore_logs,
       "APPSIGNAL_IGNORE_NAMESPACES" => :ignore_namespaces,
       "APPSIGNAL_INSTRUMENT_HTTP_RB" => :instrument_http_rb,
       "APPSIGNAL_INSTRUMENT_NET_HTTP" => :instrument_net_http,
@@ -165,6 +167,7 @@ module Appsignal
       APPSIGNAL_FILTER_SESSION_DATA
       APPSIGNAL_IGNORE_ACTIONS
       APPSIGNAL_IGNORE_ERRORS
+      APPSIGNAL_IGNORE_LOGS
       APPSIGNAL_IGNORE_NAMESPACES
       APPSIGNAL_REQUEST_HEADERS
     ].freeze
@@ -317,20 +320,29 @@ module Appsignal
     end
 
     def log_file_path
+      return @log_file_path if defined? @log_file_path
+
       path = config_hash[:log_path] || (root_path && File.join(root_path, "log"))
-      return File.join(File.realpath(path), "appsignal.log") if path && File.writable?(path)
+      if path && File.writable?(path)
+        @log_file_path = File.join(File.realpath(path), "appsignal.log")
+        return @log_file_path
+      end
 
       system_tmp_dir = self.class.system_tmp_dir
       if File.writable? system_tmp_dir
         $stdout.puts "appsignal: Unable to log to '#{path}'. Logging to " \
-          "'#{system_tmp_dir}' instead. Please check the " \
-          "permissions for the application's (log) directory."
-        File.join(system_tmp_dir, "appsignal.log")
+          "'#{system_tmp_dir}' instead. " \
+          "Please check the permissions for the application's (log) " \
+          "directory."
+        @log_file_path = File.join(system_tmp_dir, "appsignal.log")
       else
         $stdout.puts "appsignal: Unable to log to '#{path}' or the " \
           "'#{system_tmp_dir}' fallback. Please check the permissions " \
           "for the application's (log) directory."
+        @log_file_path = nil
       end
+
+      @log_file_path
     end
 
     def valid?
@@ -363,6 +375,7 @@ module Appsignal
       ENV["_APPSIGNAL_HTTP_PROXY"]                   = config_hash[:http_proxy]
       ENV["_APPSIGNAL_IGNORE_ACTIONS"]               = config_hash[:ignore_actions].join(",")
       ENV["_APPSIGNAL_IGNORE_ERRORS"]                = config_hash[:ignore_errors].join(",")
+      ENV["_APPSIGNAL_IGNORE_LOGS"]                  = config_hash[:ignore_logs].join(",")
       ENV["_APPSIGNAL_IGNORE_NAMESPACES"]            = config_hash[:ignore_namespaces].join(",")
       ENV["_APPSIGNAL_LANGUAGE_INTEGRATION_VERSION"] = "ruby-#{Appsignal::VERSION}"
       ENV["_APPSIGNAL_LOG"]                          = config_hash[:log]
@@ -472,7 +485,7 @@ module Appsignal
     def maintain_backwards_compatibility
       return unless config_hash.key?(:working_dir_path)
 
-      deprecation_message \
+      stdout_and_logger_warning \
         "The `working_dir_path` option is deprecated, please use " \
           "`working_directory_path` instead and specify the " \
           "full path to the working directory",
@@ -538,7 +551,7 @@ module Appsignal
           config[:send_session_data] = true # Set default value
         end
       else
-        deprecation_message "The `skip_session_data` config option is " \
+        stdout_and_logger_warning "The `skip_session_data` config option is " \
           "deprecated. Please use `send_session_data` instead.",
           logger
         # Not configured by user

data/lib/appsignal/event_formatter.rb

@@ -14,8 +14,6 @@ module Appsignal
   # @api private
   class EventFormatter
     class << self
-      include Appsignal::Utils::DeprecationMessage
-
       def formatters
         @formatters ||= {}
       end

data/lib/appsignal/heartbeat.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+module Appsignal
+  class Heartbeat
+    class << self
+      def transmitter
+        @transmitter ||= Appsignal::Transmitter.new(
+          "#{Appsignal.config[:logging_endpoint]}/heartbeats/json"
+        )
+      end
+    end
+
+    attr_reader :name, :id
+
+    def initialize(name:)
+      @name = name
+      @id = SecureRandom.hex(8)
+    end
+
+    def start
+      transmit_event("start")
+    end
+
+    def finish
+      transmit_event("finish")
+    end
+
+    private
+
+    def event(kind)
+      {
+        :name => name,
+        :id => @id,
+        :kind => kind,
+        :timestamp => Time.now.utc.to_i
+      }
+    end
+
+    def transmit_event(kind)
+      unless Appsignal.active?
+        Appsignal.internal_logger.debug("AppSignal not active, not transmitting heartbeat event")
+        return
+      end
+
+      response = self.class.transmitter.transmit(event(kind))
+
+      if response.code.to_i >= 200 && response.code.to_i < 300
+        Appsignal.internal_logger.trace("Transmitted heartbeat `#{name}` (#{id}) #{kind} event")
+      else
+        Appsignal.internal_logger.error(
+          "Failed to transmit heartbeat event: status code was #{response.code}"
+        )
+      end
+    rescue => e
+      Appsignal.internal_logger.error("Failed to transmit heartbeat event: #{e}")
+    end
+  end
+
+  def self.heartbeat(name)
+    heartbeat = Appsignal::Heartbeat.new(:name => name)
+    output = nil
+
+    if block_given?
+      heartbeat.start
+      output = yield
+    end
+
+    heartbeat.finish
+    output
+  end
+end

data/lib/appsignal/helpers/instrumentation.rb

@@ -3,7 +3,7 @@
 module Appsignal
   module Helpers
     module Instrumentation # rubocop:disable Metrics/ModuleLength
-      include Appsignal::Utils::DeprecationMessage
+      include Appsignal::Utils::StdoutAndLoggerMessage
 
       # Creates an AppSignal transaction for the given block.
       #
@@ -207,7 +207,7 @@ module Appsignal
       )
         if tags
           call_location = caller(1..1).first
-          deprecation_message \
+          stdout_and_logger_warning \
             "The tags argument for `Appsignal.send_error` is deprecated. " \
               "Please use the block method to set tags instead.\n\n" \
               "  Appsignal.send_error(error) do |transaction|\n" \
@@ -217,7 +217,7 @@ module Appsignal
         end
         if namespace
           call_location = caller(1..1).first
-          deprecation_message \
+          stdout_and_logger_warning \
             "The namespace argument for `Appsignal.send_error` is deprecated. " \
               "Please use the block method to set the namespace instead.\n\n" \
               "  Appsignal.send_error(error) do |transaction|\n" \
@@ -300,7 +300,7 @@ module Appsignal
       def set_error(exception, tags = nil, namespace = nil)
         if tags
           call_location = caller(1..1).first
-          deprecation_message \
+          stdout_and_logger_warning \
             "The tags argument for `Appsignal.set_error` is deprecated. " \
               "Please use the block method to set tags instead.\n\n" \
               "  Appsignal.set_error(error) do |transaction|\n" \
@@ -310,7 +310,7 @@ module Appsignal
         end
         if namespace
           call_location = caller(1..1).first
-          deprecation_message \
+          stdout_and_logger_warning \
             "The namespace argument for `Appsignal.set_error` is deprecated. " \
               "Please use the block method to set the namespace instead.\n\n" \
               "  Appsignal.set_error(error) do |transaction|\n" \

data/lib/appsignal/helpers/metrics.rb

@@ -15,7 +15,7 @@ module Appsignal
       end
 
       def set_host_gauge(_key, _value)
-        Appsignal::Utils::DeprecationMessage.message \
+        Appsignal::Utils::StdoutAndLoggerMessage.warning \
           "The `set_host_gauge` method has been deprecated. " \
             "Calling this method has no effect. " \
             "Please remove method call in the following file to remove " \
@@ -23,7 +23,7 @@ module Appsignal
       end
 
       def set_process_gauge(_key, _value)
-        Appsignal::Utils::DeprecationMessage.message \
+        Appsignal::Utils::StdoutAndLoggerMessage.warning \
           "The `set_process_gauge` method has been deprecated. " \
             "Calling this method has no effect. " \
             "Please remove method call in the following file to remove " \

data/lib/appsignal/hooks/gvl.rb

@@ -16,7 +16,7 @@ module Appsignal
       end
 
       def install
-        Appsignal::Minutely.probes.register :gvl, Appsignal::Probes::GvlProbe
+        Appsignal::Probes.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

data/lib/appsignal/hooks/mri.rb

@@ -11,7 +11,7 @@ module Appsignal
       end
 
       def install
-        Appsignal::Minutely.probes.register :mri, Appsignal::Probes::MriProbe
+        Appsignal::Probes.probes.register :mri, Appsignal::Probes::MriProbe
       end
     end
   end

data/lib/appsignal/hooks/sidekiq.rb

@@ -11,7 +11,7 @@ module Appsignal
 
       def install
         require "appsignal/integrations/sidekiq"
-        Appsignal::Minutely.probes.register :sidekiq, Appsignal::Probes::SidekiqProbe
+        Appsignal::Probes.probes.register :sidekiq, Appsignal::Probes::SidekiqProbe
 
         ::Sidekiq.configure_server do |config|
           config.error_handlers <<

data/lib/appsignal/hooks.rb

@@ -76,7 +76,7 @@ module Appsignal
       when :SidekiqPlugin
         require "appsignal/integrations/sidekiq"
         callers = caller
-        Appsignal::Utils::DeprecationMessage.message \
+        Appsignal::Utils::StdoutAndLoggerMessage.warning \
           "The constant Appsignal::Hooks::SidekiqPlugin has been deprecated. " \
             "Please update the constant name to Appsignal::Integrations::SidekiqMiddleware " \
             "in the following file to remove this message.\n#{callers.first}"

data/lib/appsignal/integrations/railtie.rb

@@ -14,7 +14,7 @@ module Appsignal
       end
 
       console do
-        Appsignal::Minutely.stop
+        Appsignal::Probes.stop
       end
 
       def self.initialize_appsignal(app)