appsignal 2.1.0.alpha.3 → 2.1.0.beta.1

data/lib/appsignal/cli/helpers.rb

@@ -43,7 +43,7 @@ module Appsignal
         loop do
           print prompt
           value = ask_for_input
-          return value if value.length > 0
+          return value unless value.empty?
         end
       end
 

data/lib/appsignal/cli/install.rb

@@ -1,14 +1,14 @@
-require 'erb'
-require 'ostruct'
-require 'io/console'
-require 'appsignal/demo'
+require "erb"
+require "ostruct"
+require "io/console"
+require "appsignal/demo"
 
 module Appsignal
   class CLI
     class Install
       extend CLI::Helpers
 
-      EXCLUDED_ENVIRONMENTS = ['test'].freeze
+      EXCLUDED_ENVIRONMENTS = ["test"].freeze
 
       class << self
         def run(push_api_key)
@@ -21,23 +21,23 @@ module Appsignal
           puts colorize "#######################################", :green
           puts
           unless push_api_key
-            puts colorize 'Problem encountered:', :red
-            puts '  No push API key entered.'
-            puts '  - Sign up for AppSignal and follow the instructions'
+            puts colorize "Problem encountered:", :red
+            puts "  No push API key entered."
+            puts "  - Sign up for AppSignal and follow the instructions"
             puts "  - Already signed up? Click 'New app' on the account overview page"
             puts
-            puts colorize 'Exiting installer...', :red
+            puts colorize "Exiting installer...", :red
             return
           end
           config = new_config
           config[:push_api_key] = push_api_key
 
-          print 'Validating API key'
+          print "Validating API key"
           periods
           puts
           begin
             auth_check = Appsignal::AuthCheck.new(config)
-            unless auth_check.perform == '200'
+            unless auth_check.perform == "200"
               puts "\n  API key '#{config[:push_api_key]}' is not valid, please get a new one on https://appsignal.com"
               return
             end
@@ -47,7 +47,7 @@ module Appsignal
             puts "  Please try again"
             return
           end
-          puts colorize '  API key valid!', :green
+          puts colorize "  API key valid!", :green
           puts
 
           if installed_frameworks.include?(:rails)
@@ -64,9 +64,9 @@ module Appsignal
         end
 
         def install_for_rails(config)
-          require File.expand_path(File.join(Dir.pwd, 'config/application.rb'))
+          require File.expand_path(File.join(Dir.pwd, "config/application.rb"))
 
-          puts 'Installing for Ruby on Rails'
+          puts "Installing for Ruby on Rails"
 
           config[:name] = Rails.application.class.parent_name
 
@@ -82,10 +82,10 @@ module Appsignal
         end
 
         def install_for_sinatra(config)
-          puts 'Installing for Sinatra'
-          config[:name] = required_input('  Enter application name: ')
+          puts "Installing for Sinatra"
+          config[:name] = required_input("  Enter application name: ")
           puts
-          configure(config, ['development', 'production', 'staging'], true)
+          configure(config, ["development", "production", "staging"], true)
 
           puts "Finish Sinatra configuration"
           puts "  Sinatra requires some manual configuration."
@@ -100,10 +100,10 @@ module Appsignal
         end
 
         def install_for_padrino(config)
-          puts 'Installing for Padrino'
-          config[:name] = required_input('  Enter application name: ')
+          puts "Installing for Padrino"
+          config[:name] = required_input("  Enter application name: ")
           puts
-          configure(config, ['development', 'production', 'staging'], true)
+          configure(config, ["development", "production", "staging"], true)
 
           puts "Finish Padrino installation"
           puts "  Padrino requires some manual configuration."
@@ -118,12 +118,12 @@ module Appsignal
         end
 
         def install_for_grape(config)
-          puts 'Installing for Grape'
+          puts "Installing for Grape"
 
-          config[:name] = required_input('  Enter application name: ')
+          config[:name] = required_input("  Enter application name: ")
           puts
 
-          configure(config, ['development', 'production', 'staging'], true)
+          configure(config, ["development", "production", "staging"], true)
 
           puts "Manual Grape configuration needed"
           puts "  See the installation instructions at:"
@@ -133,13 +133,13 @@ module Appsignal
         end
 
         def install_for_capistrano
-          capfile = File.join(Dir.pwd, 'Capfile')
+          capfile = File.join(Dir.pwd, "Capfile")
           return unless File.exist?(capfile)
           return if File.read(capfile) =~ %r{require ['|"]appsignal/capistrano}
 
-          puts 'Installing for Capistrano'
-          print '  Adding AppSignal integration to Capfile'
-          File.open(capfile, 'a') do |f|
+          puts "Installing for Capistrano"
+          print "  Adding AppSignal integration to Capfile"
+          File.open(capfile, "a") do |f|
             f.write "\nrequire 'appsignal/capistrano'\n"
           end
           periods
@@ -158,7 +158,7 @@ module Appsignal
           loop do
             print "  Choose (1/2): "
             case ask_for_input
-            when '1'
+            when "1"
               puts
               print "Writing config file"
               periods
@@ -171,7 +171,7 @@ module Appsignal
               )
               puts
               break
-            when '2'
+            when "2"
               ENV["APPSIGNAL_ACTIVE"] = "true"
               ENV["APPSIGNAL_PUSH_API_KEY"] = config[:push_api_key]
               ENV["APPSIGNAL_APP_NAME"] = config[:name]
@@ -199,7 +199,7 @@ module Appsignal
           sleep 0.3
           puts
           if Gem.win_platform?
-            puts 'The AppSignal agent currently does not work on Windows, please push these changes to your test/staging/production environment'
+            puts "The AppSignal agent currently does not work on Windows, please push these changes to your test/staging/production environment"
           else
             puts "  Sending example data to AppSignal..."
             if Appsignal::Demo.transmit
@@ -217,22 +217,22 @@ module Appsignal
         def installed_frameworks
           [].tap do |out|
             begin
-              require 'rails'
+              require "rails"
               out << :rails
             rescue LoadError
             end
             begin
-              require 'sinatra'
+              require "sinatra"
               out << :sinatra
             rescue LoadError
             end
             begin
-              require 'padrino'
+              require "padrino"
               out << :padrino
             rescue LoadError
             end
             begin
-              require 'grape'
+              require "grape"
               out << :grape
             rescue LoadError
             end
@@ -241,7 +241,7 @@ module Appsignal
 
         def rails_environments
           Dir.glob(
-            File.join(Dir.pwd, 'config/environments/*.rb')
+            File.join(Dir.pwd, "config/environments/*.rb")
           ).map { |o| File.basename(o, ".rb") }.sort - EXCLUDED_ENVIRONMENTS
         end
 
@@ -249,13 +249,13 @@ module Appsignal
           template = ERB.new(
             File.read(File.join(File.dirname(__FILE__), "../../../resources/appsignal.yml.erb")),
             nil,
-            '-'
+            "-"
           )
 
           config = template.result(OpenStruct.new(data).instance_eval { binding })
 
-          FileUtils.mkdir_p(File.join(Dir.pwd, 'config'))
-          File.write(File.join(Dir.pwd, 'config/appsignal.yml'), config)
+          FileUtils.mkdir_p(File.join(Dir.pwd, "config"))
+          File.write(File.join(Dir.pwd, "config/appsignal.yml"), config)
         end
 
         def new_config

data/lib/appsignal/cli/notify_of_deploy.rb

@@ -30,7 +30,7 @@ module Appsignal
           end
           return unless missing.any?
 
-          puts "Error: Missing options: #{missing.join(', ')}"
+          puts "Error: Missing options: #{missing.join(", ")}"
           exit 1
         end
 

data/lib/appsignal/config.rb

@@ -1,67 +1,67 @@
-require 'erb'
-require 'yaml'
-require 'uri'
-require 'socket'
+require "erb"
+require "yaml"
+require "uri"
+require "socket"
 
 module Appsignal
   class Config
-    SYSTEM_TMP_DIR = File.realpath('/tmp')
+    SYSTEM_TMP_DIR = File.realpath("/tmp")
     DEFAULT_CONFIG = {
       :debug                          => false,
-      :log                            => 'file',
+      :log                            => "file",
       :ignore_errors                  => [],
       :ignore_actions                 => [],
       :filter_parameters              => [],
       :send_params                    => true,
-      :endpoint                       => 'https://push.appsignal.com',
+      :endpoint                       => "https://push.appsignal.com",
       :instrument_net_http            => true,
       :instrument_redis               => true,
       :instrument_sequel              => true,
       :skip_session_data              => false,
       :enable_frontend_error_catching => false,
-      :frontend_error_catching_path   => '/appsignal_error_catcher',
+      :frontend_error_catching_path   => "/appsignal_error_catcher",
       :enable_allocation_tracking     => true,
       :enable_gc_instrumentation      => false,
       :running_in_container           => false,
       :enable_host_metrics            => true,
       :enable_minutely_probes         => false,
       :hostname                       => ::Socket.gethostname,
-      :ca_file_path                   => File.expand_path(File.join('../../../resources/cacert.pem'), __FILE__)
+      :ca_file_path                   => File.expand_path(File.join("../../../resources/cacert.pem"), __FILE__)
     }.freeze
 
     ENV_TO_KEY_MAPPING = {
-      'APPSIGNAL_ACTIVE'                         => :active,
-      'APPSIGNAL_PUSH_API_KEY'                   => :push_api_key,
-      'APPSIGNAL_APP_NAME'                       => :name,
-      'APPSIGNAL_PUSH_API_ENDPOINT'              => :endpoint,
-      'APPSIGNAL_FRONTEND_ERROR_CATCHING_PATH'   => :frontend_error_catching_path,
-      'APPSIGNAL_DEBUG'                          => :debug,
-      'APPSIGNAL_LOG'                            => :log,
-      'APPSIGNAL_LOG_PATH'                       => :log_path,
-      'APPSIGNAL_INSTRUMENT_NET_HTTP'            => :instrument_net_http,
-      'APPSIGNAL_INSTRUMENT_REDIS'               => :instrument_redis,
-      'APPSIGNAL_INSTRUMENT_SEQUEL'              => :instrument_sequel,
-      'APPSIGNAL_SKIP_SESSION_DATA'              => :skip_session_data,
-      'APPSIGNAL_ENABLE_FRONTEND_ERROR_CATCHING' => :enable_frontend_error_catching,
-      'APPSIGNAL_IGNORE_ERRORS'                  => :ignore_errors,
-      'APPSIGNAL_IGNORE_ACTIONS'                 => :ignore_actions,
-      'APPSIGNAL_FILTER_PARAMETERS'              => :filter_parameters,
-      'APPSIGNAL_SEND_PARAMS'                    => :send_params,
-      'APPSIGNAL_HTTP_PROXY'                     => :http_proxy,
-      'APPSIGNAL_ENABLE_ALLOCATION_TRACKING'     => :enable_allocation_tracking,
-      'APPSIGNAL_ENABLE_GC_INSTRUMENTATION'      => :enable_gc_instrumentation,
-      'APPSIGNAL_RUNNING_IN_CONTAINER'           => :running_in_container,
-      'APPSIGNAL_WORKING_DIR_PATH'               => :working_dir_path,
-      'APPSIGNAL_ENABLE_HOST_METRICS'            => :enable_host_metrics,
-      'APPSIGNAL_ENABLE_MINUTELY_PROBES'         => :enable_minutely_probes,
-      'APPSIGNAL_HOSTNAME'                       => :hostname,
-      'APPSIGNAL_CA_FILE_PATH'                   => :ca_file_path
+      "APPSIGNAL_ACTIVE"                         => :active,
+      "APPSIGNAL_PUSH_API_KEY"                   => :push_api_key,
+      "APPSIGNAL_APP_NAME"                       => :name,
+      "APPSIGNAL_PUSH_API_ENDPOINT"              => :endpoint,
+      "APPSIGNAL_FRONTEND_ERROR_CATCHING_PATH"   => :frontend_error_catching_path,
+      "APPSIGNAL_DEBUG"                          => :debug,
+      "APPSIGNAL_LOG"                            => :log,
+      "APPSIGNAL_LOG_PATH"                       => :log_path,
+      "APPSIGNAL_INSTRUMENT_NET_HTTP"            => :instrument_net_http,
+      "APPSIGNAL_INSTRUMENT_REDIS"               => :instrument_redis,
+      "APPSIGNAL_INSTRUMENT_SEQUEL"              => :instrument_sequel,
+      "APPSIGNAL_SKIP_SESSION_DATA"              => :skip_session_data,
+      "APPSIGNAL_ENABLE_FRONTEND_ERROR_CATCHING" => :enable_frontend_error_catching,
+      "APPSIGNAL_IGNORE_ERRORS"                  => :ignore_errors,
+      "APPSIGNAL_IGNORE_ACTIONS"                 => :ignore_actions,
+      "APPSIGNAL_FILTER_PARAMETERS"              => :filter_parameters,
+      "APPSIGNAL_SEND_PARAMS"                    => :send_params,
+      "APPSIGNAL_HTTP_PROXY"                     => :http_proxy,
+      "APPSIGNAL_ENABLE_ALLOCATION_TRACKING"     => :enable_allocation_tracking,
+      "APPSIGNAL_ENABLE_GC_INSTRUMENTATION"      => :enable_gc_instrumentation,
+      "APPSIGNAL_RUNNING_IN_CONTAINER"           => :running_in_container,
+      "APPSIGNAL_WORKING_DIR_PATH"               => :working_dir_path,
+      "APPSIGNAL_ENABLE_HOST_METRICS"            => :enable_host_metrics,
+      "APPSIGNAL_ENABLE_MINUTELY_PROBES"         => :enable_minutely_probes,
+      "APPSIGNAL_HOSTNAME"                       => :hostname,
+      "APPSIGNAL_CA_FILE_PATH"                   => :ca_file_path
     }.freeze
 
     attr_reader :root_path, :env, :initial_config, :config_hash
     attr_accessor :logger
 
-    def initialize(root_path, env, initial_config={}, logger=Appsignal.logger)
+    def initialize(root_path, env, initial_config = {}, logger = Appsignal.logger)
       @root_path      = root_path
       @env            = ENV.fetch("APPSIGNAL_APP_ENV".freeze, env.to_s)
       @initial_config = initial_config
@@ -90,16 +90,16 @@ module Appsignal
     end
 
     def log_file_path
-      path = config_hash[:log_path] || root_path && File.join(root_path, 'log')
+      path = config_hash[:log_path] || root_path && File.join(root_path, "log")
       if path && File.writable?(path)
-        return File.join(File.realpath(path), 'appsignal.log')
+        return File.join(File.realpath(path), "appsignal.log")
       end
 
       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')
+        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 "\
@@ -116,43 +116,44 @@ module Appsignal
     end
 
     def write_to_environment
-      ENV['APPSIGNAL_ACTIVE']                       = active?.to_s
-      ENV['APPSIGNAL_APP_PATH']                     = root_path.to_s
-      ENV['APPSIGNAL_AGENT_PATH']                   = File.expand_path('../../../ext', __FILE__).to_s
-      ENV['APPSIGNAL_ENVIRONMENT']                  = env
-      ENV['APPSIGNAL_AGENT_VERSION']                = Appsignal::Extension.agent_version
-      ENV['APPSIGNAL_LANGUAGE_INTEGRATION_VERSION'] = "ruby-#{Appsignal::VERSION}"
-      ENV['APPSIGNAL_DEBUG_LOGGING']                = config_hash[:debug].to_s
-      ENV['APPSIGNAL_LOG_FILE_PATH']                = log_file_path.to_s if log_file_path
-      ENV['APPSIGNAL_PUSH_API_ENDPOINT']            = config_hash[:endpoint]
-      ENV['APPSIGNAL_PUSH_API_KEY']                 = config_hash[:push_api_key]
-      ENV['APPSIGNAL_APP_NAME']                     = config_hash[:name]
-      ENV['APPSIGNAL_HTTP_PROXY']                   = config_hash[:http_proxy]
-      ENV['APPSIGNAL_IGNORE_ACTIONS']               = config_hash[:ignore_actions].join(',')
-      ENV['APPSIGNAL_FILTER_PARAMETERS']            = config_hash[:filter_parameters].join(',')
-      ENV['APPSIGNAL_SEND_PARAMS']                  = config_hash[:send_params].to_s
-      ENV['APPSIGNAL_RUNNING_IN_CONTAINER']         = config_hash[:running_in_container].to_s
-      ENV['APPSIGNAL_WORKING_DIR_PATH']             = config_hash[:working_dir_path] if config_hash[:working_dir_path]
-      ENV['APPSIGNAL_ENABLE_HOST_METRICS']          = config_hash[:enable_host_metrics].to_s
-      ENV['APPSIGNAL_ENABLE_MINUTELY_PROBES']       = config_hash[:enable_minutely_probes].to_s
-      ENV['APPSIGNAL_HOSTNAME']                     = config_hash[:hostname].to_s
-      ENV['APPSIGNAL_PROCESS_NAME']                 = $0
-      ENV['APPSIGNAL_CA_FILE_PATH']                 = config_hash[:ca_file_path].to_s
+      ENV["APPSIGNAL_ACTIVE"]                       = active?.to_s
+      ENV["APPSIGNAL_APP_PATH"]                     = root_path.to_s
+      ENV["APPSIGNAL_AGENT_PATH"]                   = File.expand_path("../../../ext", __FILE__).to_s
+      ENV["APPSIGNAL_ENVIRONMENT"]                  = env
+      ENV["APPSIGNAL_AGENT_VERSION"]                = Appsignal::Extension.agent_version
+      ENV["APPSIGNAL_LANGUAGE_INTEGRATION_VERSION"] = "ruby-#{Appsignal::VERSION}"
+      ENV["APPSIGNAL_DEBUG_LOGGING"]                = config_hash[:debug].to_s
+      ENV["APPSIGNAL_LOG_FILE_PATH"]                = log_file_path.to_s if log_file_path
+      ENV["APPSIGNAL_PUSH_API_ENDPOINT"]            = config_hash[:endpoint]
+      ENV["APPSIGNAL_PUSH_API_KEY"]                 = config_hash[:push_api_key]
+      ENV["APPSIGNAL_APP_NAME"]                     = config_hash[:name]
+      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_FILTER_PARAMETERS"]            = config_hash[:filter_parameters].join(",")
+      ENV["APPSIGNAL_SEND_PARAMS"]                  = config_hash[:send_params].to_s
+      ENV["APPSIGNAL_RUNNING_IN_CONTAINER"]         = config_hash[:running_in_container].to_s
+      ENV["APPSIGNAL_WORKING_DIR_PATH"]             = config_hash[:working_dir_path] if config_hash[:working_dir_path]
+      ENV["APPSIGNAL_ENABLE_HOST_METRICS"]          = config_hash[:enable_host_metrics].to_s
+      ENV["APPSIGNAL_ENABLE_MINUTELY_PROBES"]       = config_hash[:enable_minutely_probes].to_s
+      ENV["APPSIGNAL_HOSTNAME"]                     = config_hash[:hostname].to_s
+      ENV["APPSIGNAL_PROCESS_NAME"]                 = $0
+      ENV["APPSIGNAL_CA_FILE_PATH"]                 = config_hash[:ca_file_path].to_s
     end
 
     protected
 
     def config_file
       @config_file ||=
-        root_path.nil? ? nil : File.join(root_path, 'config', 'appsignal.yml')
+        root_path.nil? ? nil : File.join(root_path, "config", "appsignal.yml")
     end
 
     def detect_from_system
       config_hash[:running_in_container] = true if Appsignal::System.container?
-      config_hash[:log] = 'stdout' if Appsignal::System.heroku?
+      config_hash[:log] = "stdout" if Appsignal::System.heroku?
 
       # Make active by default if APPSIGNAL_PUSH_API_KEY is present
-      config_hash[:active] = true if ENV['APPSIGNAL_PUSH_API_KEY']
+      config_hash[:active] = true if ENV["APPSIGNAL_PUSH_API_KEY"]
     end
 
     def load_from_disk
@@ -200,7 +201,7 @@ module Appsignal
          APPSIGNAL_RUNNING_IN_CONTAINER APPSIGNAL_ENABLE_HOST_METRICS
          APPSIGNAL_SEND_PARAMS APPSIGNAL_ENABLE_MINUTELY_PROBES).each do |var|
         if env_var = ENV[var]
-          config[ENV_TO_KEY_MAPPING[var]] = env_var == 'true'
+          config[ENV_TO_KEY_MAPPING[var]] = env_var == "true"
         end
       end
 
@@ -208,7 +209,7 @@ module Appsignal
       %w(APPSIGNAL_IGNORE_ERRORS APPSIGNAL_IGNORE_ACTIONS
          APPSIGNAL_FILTER_PARAMETERS).each do |var|
         if env_var = ENV[var]
-          config[ENV_TO_KEY_MAPPING[var]] = env_var.split(',')
+          config[ENV_TO_KEY_MAPPING[var]] = env_var.split(",")
         end
       end
 
@@ -228,11 +229,12 @@ module Appsignal
       # Strip path from endpoint so we're backwards compatible with
       # earlier versions of the gem.
       endpoint_uri = URI(config_hash[:endpoint])
-      if endpoint_uri.port == 443
-        config_hash[:endpoint] = "#{endpoint_uri.scheme}://#{endpoint_uri.host}"
-      else
-        config_hash[:endpoint] = "#{endpoint_uri.scheme}://#{endpoint_uri.host}:#{endpoint_uri.port}"
-      end
+      config_hash[:endpoint] =
+        if endpoint_uri.port == 443
+          "#{endpoint_uri.scheme}://#{endpoint_uri.host}"
+        else
+          "#{endpoint_uri.scheme}://#{endpoint_uri.host}:#{endpoint_uri.port}"
+        end
 
       if config_hash[:push_api_key]
         @valid = true