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

data/gemfiles/rails-4.2.gemfile

@@ -4,3 +4,7 @@ gem 'rails', '~> 4.2.0'
 gem 'mime-types', '~> 2.6'
 
 gemspec :path => '../'
+
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1.0")
+  gem 'nokogiri', '~> 1.6.0'
+end

data/gemfiles/resque.gemfile

@@ -6,3 +6,7 @@ gem 'sinatra'
 gem 'mime-types', '~> 2.6'
 
 gemspec :path => '../'
+
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1.0")
+  gem 'nokogiri', '~> 1.6.0'
+end

data/lib/appsignal.rb

@@ -1,9 +1,11 @@
-require 'json'
-require 'logger'
-require 'securerandom'
+require "json"
+require "logger"
+require "securerandom"
 
 module Appsignal
   class << self
+    extend Gem::Deprecate
+
     attr_accessor :config, :agent, :extension_loaded
     attr_writer :logger, :in_memory_log
 
@@ -12,7 +14,7 @@ module Appsignal
     end
 
     def initialize_extensions
-      Appsignal.logger.debug('Initializing extensions')
+      Appsignal.logger.debug("Initializing extensions")
       extensions.each do |extension|
         Appsignal.logger.debug("Initializing #{extension}")
         extension.initializer
@@ -21,25 +23,26 @@ module Appsignal
 
     def start
       unless extension_loaded?
-        logger.info('Not starting appsignal, extension is not loaded')
+        logger.info("Not starting appsignal, extension is not loaded")
         return
       else
-        logger.debug('Starting appsignal')
+        logger.debug("Starting appsignal")
       end
 
       unless @config
         @config = Config.new(
           Dir.pwd,
-          ENV['APPSIGNAL_APP_ENV'] || ENV['RAILS_ENV'] || ENV['RACK_ENV']
+          ENV["APPSIGNAL_APP_ENV"] || ENV["RAILS_ENV"] || ENV["RACK_ENV"]
         )
       end
 
       if config.valid?
-        if config[:debug]
-          logger.level = Logger::DEBUG
-        else
-          logger.level = Logger::INFO
-        end
+        logger.level =
+          if config[:debug]
+            Logger::DEBUG
+          else
+            Logger::INFO
+          end
         if config.active?
           logger.info("Starting AppSignal #{Appsignal::VERSION} (#{$0}, Ruby #{RUBY_VERSION}, #{RUBY_PLATFORM})")
           config.write_to_environment
@@ -62,7 +65,7 @@ module Appsignal
           logger.info("Not starting, not active for #{config.env}")
         end
       else
-        logger.error('Not starting, no valid config for this environment')
+        logger.error("Not starting, no valid config for this environment")
       end
     end
 
@@ -74,11 +77,11 @@ module Appsignal
       end
     end
 
-    def stop(called_by=nil)
+    def stop(called_by = nil)
       if called_by
         logger.debug("Stopping appsignal (#{called_by})")
       else
-        logger.debug('Stopping appsignal')
+        logger.debug("Stopping appsignal")
       end
       Appsignal::Extension.stop
     end
@@ -86,24 +89,24 @@ module Appsignal
     def forked
       return unless active?
       Appsignal.start_logger
-      logger.debug('Forked process, resubscribing and restarting extension')
+      logger.debug("Forked process, resubscribing and restarting extension")
       Appsignal::Extension.start
     end
 
     def get_server_state(key)
-      Appsignal::Extension::get_server_state(key)
+      Appsignal::Extension.get_server_state(key)
     end
 
     # Wrap a transaction with appsignal monitoring.
-    def monitor_transaction(name, env={})
+    def monitor_transaction(name, env = {})
       unless active?
         return yield
       end
 
-      if name.start_with?('perform_job'.freeze)
+      if name.start_with?("perform_job".freeze)
         namespace = Appsignal::Transaction::BACKGROUND_JOB
         request   = Appsignal::Transaction::GenericRequest.new(env)
-      elsif name.start_with?('process_action'.freeze)
+      elsif name.start_with?("process_action".freeze)
         namespace = Appsignal::Transaction::HTTP_REQUEST
         request   = ::Rack::Request.new(env)
       else
@@ -133,13 +136,13 @@ module Appsignal
     #
     # Useful for cases such as Rake tasks and Resque-like systems where a process is
     # forked and immediately exits after the transaction finishes.
-    def monitor_single_transaction(name, env={}, &block)
+    def monitor_single_transaction(name, env = {}, &block)
       monitor_transaction(name, env, &block)
     ensure
-      stop('monitor_single_transaction')
+      stop("monitor_single_transaction")
     end
 
-    def listen_for_error(&block)
+    def listen_for_error
       yield
     rescue => error
       send_error(error)
@@ -147,8 +150,8 @@ module Appsignal
     end
     alias :listen_for_exception :listen_for_error
 
-    def send_error(error, tags=nil, namespace=Appsignal::Transaction::HTTP_REQUEST)
-      return if !active? || is_ignored_error?(error)
+    def send_error(error, tags = nil, namespace = Appsignal::Transaction::HTTP_REQUEST)
+      return unless active?
       unless error.is_a?(Exception)
         logger.error('Can\'t send error, given value is not an exception')
         return
@@ -166,15 +169,14 @@ module Appsignal
 
     def set_error(exception)
       return if !active? ||
-                Appsignal::Transaction.current.nil? ||
-                exception.nil? ||
-                is_ignored_error?(exception)
+          Appsignal::Transaction.current.nil? ||
+          exception.nil?
       Appsignal::Transaction.current.set_error(exception)
     end
     alias :set_exception :set_error
     alias :add_exception :set_error
 
-    def tag_request(params={})
+    def tag_request(params = {})
       return unless active?
       transaction = Appsignal::Transaction.current
       return false unless transaction
@@ -182,14 +184,14 @@ module Appsignal
     end
     alias :tag_job :tag_request
 
-    def instrument(name, title=nil, body=nil, body_format=Appsignal::EventFormatter::DEFAULT)
+    def instrument(name, title = nil, body = nil, body_format = Appsignal::EventFormatter::DEFAULT)
       Appsignal::Transaction.current.start_event
       return_value = yield
       Appsignal::Transaction.current.finish_event(name, title, body, body_format)
       return_value
     end
 
-    def instrument_sql(name, title=nil, body=nil, &block)
+    def instrument_sql(name, title = nil, body = nil, &block)
       instrument(name, title, body, Appsignal::EventFormatter::SQL_BODY_FORMAT, &block)
     end
 
@@ -211,7 +213,7 @@ module Appsignal
       Appsignal.logger.warn("Process gauge value #{value} for key '#{key}' is too big")
     end
 
-    def increment_counter(key, value=1)
+    def increment_counter(key, value = 1)
       Appsignal::Extension.increment_counter(key.to_s, value)
     rescue RangeError
       Appsignal.logger.warn("Counter value #{value} for key '#{key}' is too big")
@@ -232,8 +234,8 @@ module Appsignal
 
     def log_formatter(prefix = nil)
       pre = "#{prefix}: " if prefix
-      proc do |severity, datetime, progname, msg|
-        "[#{datetime.strftime('%Y-%m-%dT%H:%M:%S')} (process) ##{Process.pid}][#{severity}] #{pre}#{msg}\n"
+      proc do |severity, datetime, _progname, msg|
+        "[#{datetime.strftime("%Y-%m-%dT%H:%M:%S")} (process) ##{Process.pid}][#{severity}] #{pre}#{msg}\n"
       end
     end
 
@@ -256,7 +258,7 @@ module Appsignal
       end
 
       if path_arg
-        logger.info('Setting the path in start_logger has no effect anymore, set it in the config instead')
+        logger.info("Setting the path in start_logger has no effect anymore, set it in the config instead")
       end
     end
 
@@ -272,10 +274,12 @@ module Appsignal
       Appsignal.config[:ignore_errors].include?(error.class.name)
     end
     alias :is_ignored_exception? :is_ignored_error?
+    deprecate :is_ignored_error?, :none, 2017, 3
 
     def is_ignored_action?(action)
       Appsignal.config[:ignore_actions].include?(action)
     end
+    deprecate :is_ignored_action?, :none, 2017, 3
 
     # Convenience method for skipping instrumentations around a block of code.
     #
@@ -305,22 +309,22 @@ module Appsignal
   end
 end
 
-require 'appsignal/utils'
-require 'appsignal/extension'
-require 'appsignal/auth_check'
-require 'appsignal/config'
-require 'appsignal/event_formatter'
-require 'appsignal/hooks'
-require 'appsignal/marker'
-require 'appsignal/minutely'
-require 'appsignal/garbage_collection_profiler'
-require 'appsignal/integrations/railtie' if defined?(::Rails)
-require 'appsignal/integrations/resque'
-require 'appsignal/integrations/resque_active_job'
-require 'appsignal/transaction'
-require 'appsignal/version'
-require 'appsignal/rack/generic_instrumentation'
-require 'appsignal/rack/js_exception_catcher'
-require 'appsignal/js_exception_transaction'
-require 'appsignal/transmitter'
-require 'appsignal/system'
+require "appsignal/utils"
+require "appsignal/extension"
+require "appsignal/auth_check"
+require "appsignal/config"
+require "appsignal/event_formatter"
+require "appsignal/hooks"
+require "appsignal/marker"
+require "appsignal/minutely"
+require "appsignal/garbage_collection_profiler"
+require "appsignal/integrations/railtie" if defined?(::Rails)
+require "appsignal/integrations/resque"
+require "appsignal/integrations/resque_active_job"
+require "appsignal/transaction"
+require "appsignal/version"
+require "appsignal/rack/generic_instrumentation"
+require "appsignal/rack/js_exception_catcher"
+require "appsignal/js_exception_transaction"
+require "appsignal/transmitter"
+require "appsignal/system"

data/lib/appsignal/auth_check.rb

@@ -1,10 +1,10 @@
 module Appsignal
   class AuthCheck
-    ACTION = 'auth'.freeze
+    ACTION = "auth".freeze
 
     attr_reader :config, :logger
 
-    def initialize(config, logger=Appsignal.logger)
+    def initialize(config, logger = Appsignal.logger)
       @config = config
       @logger = logger
     end
@@ -14,23 +14,22 @@ module Appsignal
     end
 
     def perform_with_result
-      begin
-        status = perform
+      status = perform
+      result =
         case status
-        when '200'
-          result = 'AppSignal has confirmed authorization!'
-        when '401'
-          result = 'API key not valid with AppSignal...'
+        when "200"
+          "AppSignal has confirmed authorization!"
+        when "401"
+          "API key not valid with AppSignal..."
         else
-          result = 'Could not confirm authorization: '\
-                   "#{status.nil? ? 'nil' : status}"
+          "Could not confirm authorization: " \
+            "#{status.nil? ? "nil" : status}"
         end
-        [status, result]
-      rescue => e
-        result = 'Something went wrong while trying to '\
-                 "authenticate with AppSignal: #{e}"
-        [nil, result]
-      end
+      [status, result]
+    rescue => e
+      result = "Something went wrong while trying to "\
+               "authenticate with AppSignal: #{e}"
+      [nil, result]
     end
   end
 end

data/lib/appsignal/capistrano.rb

@@ -1,10 +1,10 @@
-require 'appsignal'
-require 'capistrano/version'
+require "appsignal"
+require "capistrano/version"
 
 if defined?(Capistrano::VERSION) && Gem::Version.new(Capistrano::VERSION) >= Gem::Version.new(3)
   # Capistrano 3+
-  load File.expand_path('../integrations/capistrano/appsignal.cap', __FILE__)
+  load File.expand_path("../integrations/capistrano/appsignal.cap", __FILE__)
 else
   # Capistrano 2
-  require 'appsignal/integrations/capistrano/capistrano_2_tasks'
+  require "appsignal/integrations/capistrano/capistrano_2_tasks"
 end

data/lib/appsignal/cli.rb

@@ -1,12 +1,12 @@
-require 'optparse'
-require 'logger'
-require 'yaml'
-require 'appsignal'
-require 'appsignal/cli/helpers'
-require 'appsignal/cli/demo'
-require 'appsignal/cli/diagnose'
-require 'appsignal/cli/install'
-require 'appsignal/cli/notify_of_deploy'
+require "optparse"
+require "logger"
+require "yaml"
+require "appsignal"
+require "appsignal/cli/helpers"
+require "appsignal/cli/demo"
+require "appsignal/cli/diagnose"
+require "appsignal/cli/install"
+require "appsignal/cli/notify_of_deploy"
 
 module Appsignal
   class CLI
@@ -15,7 +15,7 @@ module Appsignal
     class << self
       attr_accessor :options
 
-      def run(argv=ARGV)
+      def run(argv = ARGV)
         @options = {}
         global = global_option_parser
         commands = command_option_parser
@@ -48,56 +48,56 @@ module Appsignal
 
       def global_option_parser
         OptionParser.new do |o|
-          o.banner = 'Usage: appsignal <command> [options]'
+          o.banner = "Usage: appsignal <command> [options]"
 
-          o.on '-v', '--version', "Print version and exit" do |arg|
+          o.on "-v", "--version", "Print version and exit" do |_arg|
             puts "AppSignal #{Appsignal::VERSION}"
             exit(0)
           end
 
-          o.on '-h', '--help', "Show help and exit" do
+          o.on "-h", "--help", "Show help and exit" do
             puts o
             exit(0)
           end
 
-          o.separator ''
-          o.separator "Available commands: #{AVAILABLE_COMMANDS.join(', ')}"
+          o.separator ""
+          o.separator "Available commands: #{AVAILABLE_COMMANDS.join(", ")}"
         end
       end
 
       def command_option_parser
         {
-          'demo' => OptionParser.new do |o|
-            o.banner = 'Usage: appsignal demo [options]'
+          "demo" => OptionParser.new do |o|
+            o.banner = "Usage: appsignal demo [options]"
 
-            o.on '--environment=<app_env>', "The environment to demo" do |arg|
+            o.on "--environment=<app_env>", "The environment to demo" do |arg|
               options[:environment] = arg
             end
           end,
-          'diagnose' => OptionParser.new do |o|
-            o.banner = 'Usage: appsignal diagnose [options]'
+          "diagnose" => OptionParser.new do |o|
+            o.banner = "Usage: appsignal diagnose [options]"
 
-            o.on '--environment=<app_env>', "The environment to diagnose" do |arg|
+            o.on "--environment=<app_env>", "The environment to diagnose" do |arg|
               options[:environment] = arg
             end
           end,
-          'install' => OptionParser.new,
-          'notify_of_deploy' => OptionParser.new do |o|
-            o.banner = 'Usage: appsignal notify_of_deploy [options]'
+          "install" => OptionParser.new,
+          "notify_of_deploy" => OptionParser.new do |o|
+            o.banner = "Usage: appsignal notify_of_deploy [options]"
 
-            o.on '--revision=<revision>', "The revision you're deploying" do |arg|
+            o.on "--revision=<revision>", "The revision you're deploying" do |arg|
               options[:revision] = arg
             end
 
-            o.on '--user=<user>', "The name of the user that's deploying" do |arg|
+            o.on "--user=<user>", "The name of the user that's deploying" do |arg|
               options[:user] = arg
             end
 
-            o.on '--environment=<app_env>', "The environment you're deploying to" do |arg|
+            o.on "--environment=<app_env>", "The environment you're deploying to" do |arg|
               options[:environment] = arg
             end
 
-            o.on '--name=<name>', "The name of the app (optional)" do |arg|
+            o.on "--name=<name>", "The name of the app (optional)" do |arg|
               options[:name] = arg
             end
           end

data/lib/appsignal/cli/diagnose.rb

@@ -42,7 +42,7 @@ module Appsignal
             initial_config[:log_path] = Rails.root.join("log")
           end
 
-          ENV['APPSIGNAL_DIAGNOSE'] = 'true'
+          ENV["APPSIGNAL_DIAGNOSE"] = "true"
           Appsignal.config = Appsignal::Config.new(
             current_path,
             options[:environment],
@@ -79,9 +79,9 @@ module Appsignal
           puts "  Heroku: true" if Appsignal::System.heroku?
           print "  root user: "
           puts Process.uid == 0 ? "yes (not recommended)" : "no"
-          if Appsignal::System.container?
-            puts "  Container id: #{Appsignal::System::Container.id}"
-          end
+
+          return unless Appsignal::System.container?
+          puts "  Container id: #{Appsignal::System::Container.id}"
         end
 
         def config
@@ -96,12 +96,12 @@ module Appsignal
         def environment
           env = Appsignal.config.env
           puts "  Environment: #{env}"
-          if env == ""
-            puts "    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"
-          end
+
+          return unless env == ""
+          puts "    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"
         end
 
         def paths_writable
@@ -154,7 +154,7 @@ module Appsignal
             :current_path => Dir.pwd,
             :root_path => config.root_path,
             :log_dir_path => log_file_path ? File.dirname(log_file_path) : "",
-            :log_file_path => log_file_path,
+            :log_file_path => log_file_path
           }
         end