appsignal 2.9.18.beta.1 → 2.10.6.beta.1

data/gemfiles/capistrano2.gemfile

@@ -3,10 +3,5 @@ source 'https://rubygems.org'
 gem 'capistrano', '< 3.0'
 gem 'net-ssh', '2.9.2'
 gem 'rack', '~> 1.6'
-if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
-  gem 'public_suffix', "~> 2.0.0"
-else
-  gem 'public_suffix'
-end
 
 gemspec :path => '../'

data/gemfiles/capistrano3.gemfile

@@ -4,10 +4,5 @@ gem 'capistrano', '~> 3.0'
 gem 'i18n', '~> 1.2.0'
 gem 'net-ssh', '2.9.2'
 gem 'rack', '~> 1.6'
-if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
-  gem 'public_suffix', "~> 2.0.0"
-else
-  gem 'public_suffix'
-end
 
 gemspec :path => '../'

data/gemfiles/grape.gemfile

@@ -3,10 +3,5 @@ source 'https://rubygems.org'
 gem 'grape', '0.14.0'
 gem 'rack', '~> 1.6'
 gem 'activesupport', '~> 4.2'
-if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
-  gem 'public_suffix', "~> 2.0.0"
-else
-  gem 'public_suffix'
-end
 
 gemspec :path => '../'

data/gemfiles/no_dependencies.gemfile

@@ -1,10 +1,5 @@
 source 'https://rubygems.org'
 
 gem 'rack', '~> 1.6'
-if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
-  gem 'public_suffix', "~> 2.0.0"
-else
-  gem 'public_suffix'
-end
 
 gemspec :path => '../'

data/gemfiles/padrino.gemfile

@@ -2,11 +2,5 @@ source 'https://rubygems.org'
 
 gem 'padrino', '~> 0.13.0'
 gem 'rack', '~> 1.6'
-gem 'activesupport', '~> 4.2'
-if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
-  gem 'public_suffix', "~> 2.0.0"
-else
-  gem 'public_suffix'
-end
 
 gemspec :path => '../'

data/gemfiles/que.gemfile

@@ -1,10 +1,5 @@
 source 'https://rubygems.org'
 
 gem 'que'
-if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
-  gem 'public_suffix', "~> 2.0.0"
-else
-  gem 'public_suffix'
-end
 
 gemspec :path => '../'

data/gemfiles/que_beta.gemfile

@@ -1,10 +1,5 @@
 source 'https://rubygems.org'
 
 gem 'que', '1.0.0.beta3'
-if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
-  gem 'public_suffix', "~> 2.0.0"
-else
-  gem 'public_suffix'
-end
 
 gemspec :path => '../'

data/gemfiles/rails-3.2.gemfile

@@ -2,10 +2,5 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 3.2.14'
 gem 'test-unit'
-if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
-  gem 'public_suffix', "~> 2.0.0"
-else
-  gem 'public_suffix'
-end
 
 gemspec :path => '../'

data/gemfiles/rails-4.0.gemfile

@@ -2,10 +2,5 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 4.0.0'
 gem 'mime-types', '~> 2.6'
-if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
-  gem 'public_suffix', "~> 2.0.0"
-else
-  gem 'public_suffix'
-end
 
 gemspec :path => '../'

data/gemfiles/rails-4.1.gemfile

@@ -2,10 +2,5 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 4.1.0'
 gem 'mime-types', '~> 2.6'
-if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
-  gem 'public_suffix', "~> 2.0.0"
-else
-  gem 'public_suffix'
-end
 
 gemspec :path => '../'

data/gemfiles/rails-4.2.gemfile

@@ -8,8 +8,3 @@ gemspec :path => '../'
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1.0")
   gem 'nokogiri', '~> 1.6.0'
 end
-if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
-  gem 'public_suffix', "~> 2.0.0"
-else
-  gem 'public_suffix'
-end

data/gemfiles/resque.gemfile

@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'resque'
-gem 'rails', '~> 4.2.0'
 gem 'sinatra'
 gem 'mime-types', '~> 2.6'
 
@@ -10,8 +9,3 @@ gemspec :path => '../'
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1.0")
   gem 'nokogiri', '~> 1.6.0'
 end
-if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
-  gem 'public_suffix', "~> 2.0.0"
-else
-  gem 'public_suffix'
-end

data/lib/appsignal.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 require "json"
-require "logger"
 require "securerandom"
 
+require "appsignal/logger"
 require "appsignal/helpers/instrumentation"
 require "appsignal/helpers/metrics"
+require "appsignal/utils/deprecation_message"
 
 # AppSignal for Ruby gem's main module.
 #
@@ -15,9 +16,9 @@ require "appsignal/helpers/metrics"
 # {Appsignal::Helpers::Metrics}) for ease of use.
 module Appsignal
   class << self
-    extend Gem::Deprecate
     include Helpers::Instrumentation
     include Helpers::Metrics
+    include Utils::DeprecationMessage
 
     # Accessor for the AppSignal configuration.
     # Return the current AppSignal configuration.
@@ -195,7 +196,7 @@ module Appsignal
     end
 
     def logger
-      @logger ||= Logger.new(in_memory_log).tap do |l|
+      @logger ||= Appsignal::Logger.new(in_memory_log).tap do |l|
         l.level = Logger::INFO
         l.formatter = log_formatter("appsignal")
       end
@@ -280,26 +281,28 @@ module Appsignal
 
     # @deprecated No replacement
     def is_ignored_error?(error) # rubocop:disable Naming/PredicateName
+      deprecation_message "Appsignal.is_ignored_error? is deprecated " \
+        "with no replacement and will be removed in version 3.0."
       Appsignal.config[:ignore_errors].include?(error.class.name)
     end
     alias :is_ignored_exception? :is_ignored_error?
-    deprecate :is_ignored_error?, :none, 2017, 3
 
     # @deprecated No replacement
     def is_ignored_action?(action) # rubocop:disable Naming/PredicateName
+      deprecation_message "Appsignal.is_ignored_action? is deprecated " \
+        "with no replacement and will be removed in version 3.0."
       Appsignal.config[:ignore_actions].include?(action)
     end
-    deprecate :is_ignored_action?, :none, 2017, 3
 
     private
 
     def start_stdout_logger
-      @logger = Logger.new($stdout)
+      @logger = Appsignal::Logger.new($stdout)
       logger.formatter = log_formatter("appsignal")
     end
 
     def start_file_logger(path)
-      @logger = Logger.new(path)
+      @logger = Appsignal::Logger.new(path)
       logger.formatter = log_formatter
     rescue SystemCallError => error
       start_stdout_logger

data/lib/appsignal/cli.rb

@@ -32,7 +32,7 @@ module Appsignal
             when :diagnose
               Appsignal::CLI::Diagnose.run(options)
             when :install
-              Appsignal::CLI::Install.run(argv.shift)
+              Appsignal::CLI::Install.run(argv.shift, options)
             when :notify_of_deploy
               Appsignal::CLI::NotifyOfDeploy.run(options)
             end
@@ -85,8 +85,15 @@ module Appsignal
             o.on "--[no-]send-report", "Confirm sending the report to AppSignal automatically" do |arg|
               options[:send_report] = arg
             end
+            o.on "--[no-]color", "Colorize the output of the diagnose command" do |arg|
+              options[:color] = arg
+            end
+          end,
+          "install" => OptionParser.new do |o|
+            o.on "--[no-]color", "Colorize the output of the diagnose command" do |arg|
+              options[:color] = arg
+            end
           end,
-          "install" => OptionParser.new,
           "notify_of_deploy" => OptionParser.new do |o|
             o.banner = "Usage: appsignal notify_of_deploy [options]"
 

data/lib/appsignal/cli/diagnose.rb

@@ -77,6 +77,7 @@ module Appsignal
         # @return [void]
         # @api private
         def run(options = {})
+          self.coloring = options.delete(:color) { true }
           $stdout.sync = true
           header
           print_empty_line
@@ -200,7 +201,7 @@ module Appsignal
         def run_agent_diagnose_mode
           puts "Agent diagnostics"
           unless Appsignal.extension_loaded?
-            puts "  Extension is not loaded. No agent report created."
+            puts colorize("  Extension is not loaded. No agent report created.", :red)
             return
           end
 
@@ -336,7 +337,7 @@ module Appsignal
           path = File.expand_path("../../../../ext/install.report", __FILE__)
           raw_report = File.read(path)
           Utils.parse_yaml(raw_report)
-        rescue => e
+        rescue StandardError, Psych::SyntaxError => e # rubocop:disable Lint/ShadowedException
           {
             "parsing_error" => {
               "error" => "#{e.class}: #{e}",
@@ -461,10 +462,11 @@ module Appsignal
           print "  Environment: #{format_config_option(env)}"
 
           if env == ""
-            puts "\n    Warning: No environment set, no config loaded!"
-            puts "    Please make sure appsignal diagnose is run within your "
-            puts "    project directory with an environment."
-            puts "      appsignal diagnose --environment=production"
+            message = "    Warning: No environment set, no config loaded!\n" \
+              "    Please make sure appsignal diagnose is run within your\n" \
+              "    project directory with an environment.\n" \
+              "      appsignal diagnose --environment=production"
+            puts "\n#{colorize(message, :red)}"
           else
             puts sources_label
           end
@@ -531,20 +533,19 @@ module Appsignal
 
         def check_api_key
           puts "Validation"
-          data_section :validation do
-            auth_check = ::Appsignal::AuthCheck.new(Appsignal.config)
-            status, error = auth_check.perform_with_result
-            result =
-              case status
-              when "200"
-                "valid"
-              when "401"
-                "invalid"
-              else
-                "Failed with status #{status}\n#{error.inspect}"
-              end
-            puts_and_save :push_api_key, "Validating Push API key", result
-          end
+          auth_check = ::Appsignal::AuthCheck.new(Appsignal.config)
+          status, error = auth_check.perform_with_result
+          result, color =
+            case status
+            when "200"
+              ["valid", :green]
+            when "401"
+              ["invalid", :red]
+            else
+              ["Failed with status #{status}\n#{error.inspect}", :red]
+            end
+          data[:validation][:push_api_key] = result
+          puts_value "Validating Push API key", colorize(result, color)
         end
 
         def print_paths_section(report)

data/lib/appsignal/cli/helpers.rb

@@ -7,24 +7,36 @@ module Appsignal
     module Helpers
       private
 
+      COLOR_CODES = {
+        :red => 31,
+        :green => 32,
+        :yellow => 33,
+        :blue => 34,
+        :pink => 35,
+        :default => 0
+      }.freeze
+
       def ruby_2_6_or_up?
         Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.6.0")
       end
 
+      def coloring=(value)
+        @coloring = value
+      end
+
+      def coloring?
+        return true unless defined?(@coloring)
+        @coloring
+      end
+
       def colorize(text, color)
+        return text unless coloring?
         return text if Gem.win_platform?
 
-        color_code =
-          case color
-          when :red then 31
-          when :green then 32
-          when :yellow then 33
-          when :blue then 34
-          when :pink then 35
-          else 0
-          end
+        reset_color_code = COLOR_CODES.fetch(:default)
+        color_code = COLOR_CODES.fetch(color, reset_color_code)
 
-        "\e[#{color_code}m#{text}\e[0m"
+        "\e[#{color_code}m#{text}\e[#{reset_color_code}m"
       end
 
       def periods

data/lib/appsignal/cli/install.rb

@@ -13,7 +13,8 @@ module Appsignal
       EXCLUDED_ENVIRONMENTS = ["test"].freeze
 
       class << self
-        def run(push_api_key)
+        def run(push_api_key, options) # rubocop:disable Metrics/AbcSize
+          self.coloring = options.delete(:color) { true }
           $stdout.sync = true
 
           puts

data/lib/appsignal/cli/notify_of_deploy.rb

@@ -94,7 +94,7 @@ module Appsignal
             "see our documentation for more information on the recommended " \
             "method: " \
             "https://docs.appsignal.com/application/markers/deploy-markers.html"
-          deprecation_message message, Appsignal.logger
+          deprecation_message message
         end
 
         private

data/lib/appsignal/config.rb

@@ -39,7 +39,8 @@ module Appsignal
       :enable_minutely_probes         => true,
       :ca_file_path                   => File.expand_path(File.join("../../../resources/cacert.pem"), __FILE__),
       :dns_servers                    => [],
-      :files_world_accessible         => true
+      :files_world_accessible         => true,
+      :transaction_debug_mode         => false
     }.freeze
 
     ENV_TO_KEY_MAPPING = {
@@ -75,6 +76,7 @@ module Appsignal
       "APPSIGNAL_DNS_SERVERS"                    => :dns_servers,
       "APPSIGNAL_FILES_WORLD_ACCESSIBLE"         => :files_world_accessible,
       "APPSIGNAL_REQUEST_HEADERS"                => :request_headers,
+      "APPSIGNAL_TRANSACTION_DEBUG_MODE"         => :transaction_debug_mode,
       "APP_REVISION"                             => :revision
     }.freeze
 
@@ -219,6 +221,7 @@ module Appsignal
       ENV["_APPSIGNAL_CA_FILE_PATH"]                 = config_hash[:ca_file_path].to_s
       ENV["_APPSIGNAL_DNS_SERVERS"]                  = config_hash[:dns_servers].join(",")
       ENV["_APPSIGNAL_FILES_WORLD_ACCESSIBLE"]       = config_hash[:files_world_accessible].to_s
+      ENV["_APPSIGNAL_TRANSACTION_DEBUG_MODE"]       = config_hash[:transaction_debug_mode].to_s
       ENV["_APP_REVISION"]                           = config_hash[:revision].to_s
     end
 
@@ -234,11 +237,12 @@ module Appsignal
           "#{endpoint_uri.scheme}://#{endpoint_uri.host}:#{endpoint_uri.port}"
         end
 
-      if config_hash[:push_api_key]
-        @valid = true
-      else
+      push_api_key = config_hash[:push_api_key] || ""
+      if push_api_key.strip.empty?
         @valid = false
-        @logger.error "Push api key not set after loading config"
+        @logger.error "Push API key not set after loading config"
+      else
+        @valid = true
       end
     end
 
@@ -253,8 +257,10 @@ module Appsignal
       {}.tap do |hash|
         hash[:log] = "stdout" if Appsignal::System.heroku?
 
-        # Make active by default if APPSIGNAL_PUSH_API_KEY is present
-        hash[:active] = true if ENV["APPSIGNAL_PUSH_API_KEY"]
+        # Make AppSignal active by default if APPSIGNAL_PUSH_API_KEY
+        # environment variable is present and not empty.
+        env_push_api_key = ENV["APPSIGNAL_PUSH_API_KEY"] || ""
+        hash[:active] = true unless env_push_api_key.strip.empty?
       end
     end
 
@@ -271,9 +277,17 @@ module Appsignal
 
         maintain_backwards_compatibility(config_for_this_env)
       else
-        @logger.error "Not loading from config file: config for '#{env}' not found"
+        logger.error "Not loading from config file: config for '#{env}' not found"
         nil
       end
+    rescue => e
+      message = "An error occured while loading the AppSignal config file." \
+        " Skipping file config.\n" \
+        "File: #{config_file.inspect}\n" \
+        "#{e.class.name}: #{e}"
+      $stderr.puts "appsignal: #{message}"
+      logger.error "#{message}\n#{e.backtrace.join("\n")}"
+      nil
     end
 
     # Maintain backwards compatibility with config files generated by earlier
@@ -324,7 +338,7 @@ module Appsignal
          APPSIGNAL_ENABLE_ALLOCATION_TRACKING APPSIGNAL_ENABLE_GC_INSTRUMENTATION
          APPSIGNAL_RUNNING_IN_CONTAINER APPSIGNAL_ENABLE_HOST_METRICS
          APPSIGNAL_SEND_PARAMS APPSIGNAL_ENABLE_MINUTELY_PROBES
-         APPSIGNAL_FILES_WORLD_ACCESSIBLE].each do |var|
+         APPSIGNAL_FILES_WORLD_ACCESSIBLE APPSIGNAL_TRANSACTION_DEBUG_MODE].each do |var|
         env_var = ENV[var]
         next unless env_var
         config[ENV_TO_KEY_MAPPING[var]] = env_var.casecmp("true").zero?