appsignal 3.9.3-java → 3.11.0-java

data/lib/appsignal/utils/data.rb

@@ -2,7 +2,6 @@
 
 module Appsignal
   module Utils
-    # @api private
     class Data
       class << self
         def generate(body)

data/lib/appsignal/utils/hash_sanitizer.rb

@@ -2,7 +2,6 @@
 
 module Appsignal
   module Utils
-    # @api private
     class HashSanitizer
       FILTERED = "[FILTERED]"
       RECURSIVE = "[RECURSIVE VALUE]"

data/lib/appsignal/utils/integration_logger.rb

@@ -2,20 +2,7 @@
 
 module Appsignal
   module Utils
-    # Subclass of logger with method to only log a warning once
-    # prevents the local log from filling up with repeated messages.
     class IntegrationLogger < ::Logger
-      def seen_keys
-        @seen_keys ||= Set.new
-      end
-
-      def warn_once_then_debug(key, message)
-        if seen_keys.add?(key).nil?
-          debug message
-        else
-          warn message
-        end
-      end
     end
   end
 end

data/lib/appsignal/utils/integration_memory_logger.rb

@@ -4,7 +4,6 @@ require "logger"
 
 module Appsignal
   module Utils
-    # @api private
     class IntegrationMemoryLogger
       LEVELS = {
         Logger::DEBUG => :DEBUG,
@@ -35,18 +34,6 @@ module Appsignal
         add(:WARN, message)
       end
 
-      def seen_keys
-        @seen_keys ||= Set.new
-      end
-
-      def warn_once_then_debug(key, message)
-        if seen_keys.add?(key).nil?
-          debug message
-        else
-          warn message
-        end
-      end
-
       def error(message)
         add(:ERROR, message)
       end

data/lib/appsignal/utils/json.rb

@@ -2,7 +2,6 @@
 
 module Appsignal
   module Utils
-    # @api private
     class JSON
       class << self
         def generate(body)

data/lib/appsignal/utils/query_params_sanitizer.rb

@@ -2,7 +2,6 @@
 
 module Appsignal
   module Utils
-    # @api private
     class QueryParamsSanitizer
       REPLACEMENT_KEY = "?"
 

data/lib/appsignal/utils/stdout_and_logger_message.rb

@@ -2,7 +2,6 @@
 
 module Appsignal
   module Utils
-    # @api private
     module StdoutAndLoggerMessage
       def self.warning(message, logger = Appsignal.internal_logger)
         Kernel.warn "appsignal WARNING: #{message}"

data/lib/appsignal/utils.rb

@@ -1,5 +1,11 @@
 # frozen_string_literal: true
 
+module Appsignal
+  # @api private
+  module Utils
+  end
+end
+
 require "appsignal/utils/integration_memory_logger"
 require "appsignal/utils/stdout_and_logger_message"
 require "appsignal/utils/data"

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appsignal
-  VERSION = "3.9.3"
+  VERSION = "3.11.0"
 end

data/lib/appsignal.rb

@@ -47,7 +47,7 @@ module Appsignal
     # @see Extension
     # @see extension_loaded?
     attr_accessor :extension_loaded
-    # @!attribute [rw] logger
+    # @!attribute [rw] internal_logger
     #   Accessor for the internal AppSignal logger.
     #
     #   Not to be confused with our logging feature.
@@ -59,10 +59,8 @@ module Appsignal
     #   {.start}) the contents of the "in memory logger" is written to the new
     #   logger.
     #
-    #   @note some classes may have options to set custom loggers. Their
-    #     defaults are pointed to this attribute.
     #   @api private
-    #   @return [Logger]
+    #   @return [Utils::IntegrationLogger or Utils::IntegrationMemoryLogger]
     #   @see start
     attr_writer :internal_logger
 
@@ -165,10 +163,12 @@ module Appsignal
       Appsignal::Extension.start
     end
 
+    # @api private
     def get_server_state(key)
       Appsignal::Extension.get_server_state(key)
     end
 
+    # @api private
     def in_memory_logger
       @in_memory_logger ||=
         Appsignal::Utils::IntegrationMemoryLogger.new.tap do |l|
@@ -176,6 +176,7 @@ module Appsignal
         end
     end
 
+    # @api private
     def internal_logger
       @internal_logger ||= in_memory_logger
     end
@@ -195,7 +196,7 @@ module Appsignal
     def start_logger
       callers = caller
       Appsignal::Utils::StdoutAndLoggerMessage.warning \
-        "Callng 'Appsignal.start_logger' is deprecated. " \
+        "Calling 'Appsignal.start_logger' is deprecated. " \
           "The logger will be started when calling 'Appsignal.start'. " \
           "Remove the 'Appsignal.start_logger' call in the following file to " \
           "remove this message.\n#{callers.first}"
@@ -324,8 +325,10 @@ require "appsignal/hooks"
 require "appsignal/probes"
 require "appsignal/marker"
 require "appsignal/garbage_collection"
+require "appsignal/rack"
+require "appsignal/rack/body_wrapper"
 require "appsignal/rack/abstract_middleware"
-require "appsignal/rack/generic_instrumentation"
+require "appsignal/rack/instrumentation_middleware"
 require "appsignal/rack/event_handler"
 require "appsignal/integrations/railtie" if defined?(::Rails)
 require "appsignal/transaction"

data/spec/lib/appsignal/capistrano2_spec.rb

@@ -17,7 +17,7 @@ if DependencyHelper.capistrano2_present?
         c.dry_run = false
       end
     end
-    before { Appsignal::Capistrano.tasks(capistrano_config) }
+    before { Appsignal::Integrations::Capistrano.tasks(capistrano_config) }
 
     def run
       capture_stdout(out_stream) do

data/spec/lib/appsignal/config_spec.rb

@@ -1,19 +1,4 @@
 describe Appsignal::Config do
-  describe "config keys" do
-    it "all config keys have an environment variable version registered" do
-      config = Appsignal::Config
-      mapped_env_keys = config::ENV_TO_KEY_MAPPING.keys.sort
-      configured_env_keys = (
-        config::ENV_STRING_KEYS +
-        config::ENV_BOOLEAN_KEYS +
-        config::ENV_ARRAY_KEYS +
-        config::ENV_FLOAT_KEYS
-      ).sort
-
-      expect(mapped_env_keys).to eql(configured_env_keys)
-    end
-  end
-
   describe "#initialize" do
     describe "environment" do
       context "when environment is nil" do
@@ -165,6 +150,7 @@ describe Appsignal::Config do
         :enable_statsd                  => true,
         :enable_nginx_metrics           => false,
         :enable_rails_error_reporter    => true,
+        :enable_rake_performance_instrumentation => false,
         :endpoint                       => "https://push.appsignal.com",
         :files_world_accessible         => true,
         :filter_metadata                => [],
@@ -415,49 +401,159 @@ describe Appsignal::Config do
     let(:working_directory_path) { File.join(tmp_dir, "test_working_directory_path") }
     let(:env_config) do
       {
-        :running_in_container => true,
-        :push_api_key => "aaa-bbb-ccc",
         :active => true,
+        :activejob_report_errors => "all",
         :bind_address => "0.0.0.0",
+        :ca_file_path => "/some/path",
         :cpu_count => 1.5,
-        :name => "App name",
         :debug => true,
         :dns_servers => ["8.8.8.8", "8.8.4.4"],
-        :ignore_actions => %w[action1 action2],
-        :ignore_errors => %w[ExampleStandardError AnotherError],
+        :enable_allocation_tracking => false,
+        :enable_gvl_global_timer => false,
+        :enable_gvl_waiting_threads => false,
+        :enable_host_metrics => false,
+        :enable_minutely_probes => false,
+        :enable_nginx_metrics => false,
+        :enable_rails_error_reporter => false,
+        :enable_rake_performance_instrumentation => false,
+        :enable_statsd => false,
+        :endpoint => "https://test.appsignal.com",
+        :files_world_accessible => false,
+        :filter_metadata => ["key1", "key2"],
+        :filter_parameters => ["param1", "param2"],
+        :filter_session_data => ["session1", "session2"],
+        :host_role => "my host role",
+        :hostname => "my hostname",
+        :http_proxy => "some proxy",
+        :ignore_actions => ["action1", "action2"],
+        :ignore_errors => ["ExampleStandardError", "AnotherError"],
         :ignore_logs => ["^start$", "^Completed 2.* in .*ms (.*)"],
-        :ignore_namespaces => %w[admin private_namespace],
+        :ignore_namespaces => ["admin", "private_namespace"],
+        :instrument_http_rb => false,
         :instrument_net_http => false,
         :instrument_redis => false,
         :instrument_sequel => false,
-        :files_world_accessible => false,
-        :request_headers => %w[accept accept-charset],
+        :log => "file",
+        :log_level => "debug",
+        :log_path => "/tmp/something",
+        :logging_endpoint => "https://appsignal-endpoint.net/test",
+        :name => "App name",
+        :push_api_key => "aaa-bbb-ccc",
+        :request_headers => ["accept", "accept-charset"],
         :revision => "v2.5.1",
+        :running_in_container => true,
         :send_environment_metadata => false,
+        :send_params => false,
+        :send_session_data => false,
+        :sidekiq_report_errors => "all",
+        :skip_session_data => false,
+        :statsd_port => "7890",
+        :transaction_debug_mode => false,
+        :working_dir_path => "/some/path",
         :working_directory_path => working_directory_path
       }
     end
+    let(:env_vars) do
+      {
+        # Strings
+        "APPSIGNAL_ACTIVEJOB_REPORT_ERRORS" => "all",
+        "APPSIGNAL_APP_NAME" => "App name",
+        "APPSIGNAL_BIND_ADDRESS" => "0.0.0.0",
+        "APPSIGNAL_CA_FILE_PATH" => "/some/path",
+        "APPSIGNAL_HOSTNAME" => "my hostname",
+        "APPSIGNAL_HOST_ROLE" => "my host role",
+        "APPSIGNAL_HTTP_PROXY" => "some proxy",
+        "APPSIGNAL_LOG" => "file",
+        "APPSIGNAL_LOGGING_ENDPOINT" => "https://appsignal-endpoint.net/test",
+        "APPSIGNAL_LOG_LEVEL" => "debug",
+        "APPSIGNAL_LOG_PATH" => "/tmp/something",
+        "APPSIGNAL_PUSH_API_ENDPOINT" => "https://test.appsignal.com",
+        "APPSIGNAL_PUSH_API_KEY" => "aaa-bbb-ccc",
+        "APPSIGNAL_SIDEKIQ_REPORT_ERRORS" => "all",
+        "APPSIGNAL_STATSD_PORT" => "7890",
+        "APPSIGNAL_WORKING_DIRECTORY_PATH" => working_directory_path,
+        "APPSIGNAL_WORKING_DIR_PATH" => "/some/path",
+        "APP_REVISION" => "v2.5.1",
+
+        # Booleans
+        "APPSIGNAL_ACTIVE" => "true",
+        "APPSIGNAL_DEBUG" => "true",
+        "APPSIGNAL_ENABLE_ALLOCATION_TRACKING" => "false",
+        "APPSIGNAL_ENABLE_GVL_GLOBAL_TIMER" => "false",
+        "APPSIGNAL_ENABLE_GVL_WAITING_THREADS" => "false",
+        "APPSIGNAL_ENABLE_HOST_METRICS" => "false",
+        "APPSIGNAL_ENABLE_MINUTELY_PROBES" => "false",
+        "APPSIGNAL_ENABLE_NGINX_METRICS" => "false",
+        "APPSIGNAL_ENABLE_RAILS_ERROR_REPORTER" => "false",
+        "APPSIGNAL_ENABLE_RAKE_PERFORMANCE_INSTRUMENTATION" => "false",
+        "APPSIGNAL_ENABLE_STATSD" => "false",
+        "APPSIGNAL_FILES_WORLD_ACCESSIBLE" => "false",
+        "APPSIGNAL_INSTRUMENT_HTTP_RB" => "false",
+        "APPSIGNAL_INSTRUMENT_NET_HTTP" => "false",
+        "APPSIGNAL_INSTRUMENT_REDIS" => "false",
+        "APPSIGNAL_INSTRUMENT_SEQUEL" => "false",
+        "APPSIGNAL_RUNNING_IN_CONTAINER" => "true",
+        "APPSIGNAL_SEND_ENVIRONMENT_METADATA" => "false",
+        "APPSIGNAL_SEND_PARAMS" => "false",
+        "APPSIGNAL_SEND_SESSION_DATA" => "false",
+        "APPSIGNAL_SKIP_SESSION_DATA" => "false",
+        "APPSIGNAL_TRANSACTION_DEBUG_MODE" => "false",
+
+        # Arrays
+        "APPSIGNAL_DNS_SERVERS" => "8.8.8.8,8.8.4.4",
+        "APPSIGNAL_FILTER_METADATA" => "key1,key2",
+        "APPSIGNAL_FILTER_PARAMETERS" => "param1,param2",
+        "APPSIGNAL_FILTER_SESSION_DATA" => "session1,session2",
+        "APPSIGNAL_IGNORE_ACTIONS" => "action1,action2",
+        "APPSIGNAL_IGNORE_ERRORS" => "ExampleStandardError,AnotherError",
+        "APPSIGNAL_IGNORE_LOGS" => "^start$,^Completed 2.* in .*ms (.*)",
+        "APPSIGNAL_IGNORE_NAMESPACES" => "admin,private_namespace",
+        "APPSIGNAL_REQUEST_HEADERS" => "accept,accept-charset",
+
+        # Floats
+        "APPSIGNAL_CPU_COUNT" => "1.5"
+      }
+    end
     before do
-      ENV["APPSIGNAL_RUNNING_IN_CONTAINER"]    = "true"
-      ENV["APPSIGNAL_PUSH_API_KEY"]            = "aaa-bbb-ccc"
-      ENV["APPSIGNAL_ACTIVE"]                  = "true"
-      ENV["APPSIGNAL_APP_NAME"]                = "App name"
-      ENV["APPSIGNAL_BIND_ADDRESS"]            = "0.0.0.0"
-      ENV["APPSIGNAL_CPU_COUNT"]               = "1.5"
-      ENV["APPSIGNAL_DEBUG"]                   = "true"
-      ENV["APPSIGNAL_DNS_SERVERS"]             = "8.8.8.8,8.8.4.4"
-      ENV["APPSIGNAL_IGNORE_ACTIONS"]          = "action1,action2"
-      ENV["APPSIGNAL_IGNORE_ERRORS"]           = "ExampleStandardError,AnotherError"
-      ENV["APPSIGNAL_IGNORE_LOGS"]             = "^start$,^Completed 2.* in .*ms (.*)"
-      ENV["APPSIGNAL_IGNORE_NAMESPACES"]       = "admin,private_namespace"
-      ENV["APPSIGNAL_INSTRUMENT_NET_HTTP"]     = "false"
-      ENV["APPSIGNAL_INSTRUMENT_REDIS"]        = "false"
-      ENV["APPSIGNAL_INSTRUMENT_SEQUEL"]       = "false"
-      ENV["APPSIGNAL_FILES_WORLD_ACCESSIBLE"]  = "false"
-      ENV["APPSIGNAL_REQUEST_HEADERS"]         = "accept,accept-charset"
-      ENV["APPSIGNAL_SEND_ENVIRONMENT_METADATA"] = "false"
-      ENV["APPSIGNAL_WORKING_DIRECTORY_PATH"] = working_directory_path
-      ENV["APP_REVISION"] = "v2.5.1"
+      env_vars.each do |key, value|
+        ENV[key] = value
+      end
+    end
+
+    it "reads all string env keys" do
+      config
+
+      Appsignal::Config::ENV_STRING_KEYS.each do |env_key, option|
+        ENV.fetch(env_key) { raise "Config env var '#{env_key}' is not set for this test" }
+        expect(config[option]).to eq(ENV.fetch(env_key, nil))
+      end
+    end
+
+    it "reads all boolean env keys" do
+      config
+
+      Appsignal::Config::ENV_BOOLEAN_KEYS.each do |env_key, option|
+        ENV.fetch(env_key) { raise "Config env var '#{env_key}' is not set for this test" }
+        expect(config[option]).to eq(ENV.fetch(env_key, nil) == "true")
+      end
+    end
+
+    it "reads all array env keys" do
+      config
+
+      Appsignal::Config::ENV_ARRAY_KEYS.each do |env_key, option|
+        ENV.fetch(env_key) { raise "Config env var '#{env_key}' is not set for this test" }
+        expect(config[option]).to eq(ENV.fetch(env_key, nil).split(","))
+      end
+    end
+
+    it "reads all float env keys" do
+      config
+
+      Appsignal::Config::ENV_FLOAT_KEYS.each do |env_key, option|
+        ENV.fetch(env_key) { raise "Config env var '#{env_key}' is not set for this test" }
+        expect(config[option]).to eq(ENV.fetch(env_key, nil).to_f)
+      end
     end
 
     it "overrides config with environment values" do