appsignal 2.11.10 → 3.0.0.beta.1

data/gemfiles/capistrano2.gemfile

@@ -2,5 +2,6 @@ source 'https://rubygems.org'
 
 gem 'capistrano', '< 3.0'
 gem 'net-ssh', '2.9.2'
+gem 'rack', '~> 1.6'
 
 gemspec :path => '../'

data/gemfiles/capistrano3.gemfile

@@ -3,5 +3,6 @@ source 'https://rubygems.org'
 gem 'capistrano', '~> 3.0'
 gem 'i18n', '~> 1.2.0'
 gem 'net-ssh', '2.9.2'
+gem 'rack', '~> 1.6'
 
 gemspec :path => '../'

data/gemfiles/grape.gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'grape', '0.14.0'
+gem 'rack', '~> 1.6'
 gem 'activesupport', '~> 4.2'
 
 gemspec :path => '../'

data/gemfiles/no_dependencies.gemfile

@@ -1,9 +1,6 @@
 source 'https://rubygems.org'
 
-ruby_version = Gem::Version.new(RUBY_VERSION)
-if ruby_version < Gem::Version.new("2.3.0")
-  gem 'rack', '~> 1.6'
-end
+gem 'rack', '~> 1.6'
 
 ruby_version = Gem::Version.new(RUBY_VERSION)
 if ruby_version < Gem::Version.new("2.0.0")

data/gemfiles/rails-3.2.gemfile

@@ -3,6 +3,4 @@ source 'https://rubygems.org'
 gem 'rails', '~> 3.2.14'
 gem 'test-unit'
 
-gem "rack-cache", "~> 1.9.0"
-
 gemspec :path => '../'

data/gemfiles/rails-4.2.gemfile

@@ -13,11 +13,5 @@ end
 if ruby_version < Gem::Version.new("2.1.0")
   gem 'nokogiri', '~> 1.6.0'
 end
-if ruby_version < Gem::Version.new("2.5.0")
-  gem 'sprockets', '~> 3.7.2'
-end
-
-gem "minitest", "5.12.0"
-gem "connection_pool", "2.2.3"
 
 gemspec :path => '../'

data/gemfiles/resque-2.gemfile

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

data/gemfiles/sequel-435.gemfile

@@ -6,5 +6,6 @@ if RUBY_PLATFORM == "java"
 else
   gem 'sqlite3'
 end
+gem 'rack', '~> 1.6'
 
 gemspec :path => '../'

data/gemfiles/sequel.gemfile

@@ -6,5 +6,6 @@ if RUBY_PLATFORM == "java"
 else
   gem 'sqlite3'
 end
+gem 'rack', '~> 1.6'
 
 gemspec :path => '../'

data/gemfiles/sinatra.gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'sinatra'
+gem 'rack', '~> 1.6'
 
 gemspec :path => '../'

data/lib/appsignal/auth_check.rb

@@ -20,16 +20,10 @@ module Appsignal
     # https://push.appsignal.com/1/auth
     ACTION = "auth".freeze
 
-    attr_reader :config, :logger
+    attr_reader :config
 
-    def initialize(config, logger = nil)
+    def initialize(config)
       @config = config
-      if logger # rubocop:disable Style/GuardClause
-        Appsignal::Utils::DeprecationMessage.message \
-          "`Appsignal::AuthCheck.new`'s `logger` argument will be removed " \
-          "in the next major version. Please configure the logger " \
-          "using `Appsignal.logger`."
-      end
     end
 
     # Perform push api validation request and return response status code.

data/lib/appsignal/cli.rb

@@ -7,12 +7,11 @@ require "appsignal/cli/helpers"
 require "appsignal/cli/demo"
 require "appsignal/cli/diagnose"
 require "appsignal/cli/install"
-require "appsignal/cli/notify_of_deploy"
 
 module Appsignal
   # @api private
   class CLI
-    AVAILABLE_COMMANDS = %w[demo diagnose install notify_of_deploy].freeze
+    AVAILABLE_COMMANDS = %w[demo diagnose install].freeze
 
     class << self
       attr_accessor :options
@@ -33,8 +32,6 @@ module Appsignal
               Appsignal::CLI::Diagnose.run(options)
             when :install
               Appsignal::CLI::Install.run(argv.shift, options)
-            when :notify_of_deploy
-              Appsignal::CLI::NotifyOfDeploy.run(options)
             end
           else
             puts "Command '#{command}' does not exist, run appsignal -h to "\
@@ -93,25 +90,6 @@ module Appsignal
             o.on "--[no-]color", "Colorize the output of the diagnose command" do |arg|
               options[:color] = arg
             end
-          end,
-          "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|
-              options[:revision] = arg
-            end
-
-            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|
-              options[:environment] = arg
-            end
-
-            o.on "--name=<name>", "The name of the app (optional)" do |arg|
-              options[:name] = arg
-            end
           end
         }
       end

data/lib/appsignal/config.rb

@@ -32,8 +32,6 @@ module Appsignal
       :instrument_redis               => true,
       :instrument_sequel              => true,
       :skip_session_data              => false,
-      :enable_frontend_error_catching => false,
-      :frontend_error_catching_path   => "/appsignal_error_catcher",
       :enable_allocation_tracking     => true,
       :enable_gc_instrumentation      => false,
       :enable_host_metrics            => true,
@@ -49,7 +47,6 @@ module Appsignal
       "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,
@@ -57,7 +54,6 @@ module Appsignal
       "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_ACTIONS"                 => :ignore_actions,
       "APPSIGNAL_IGNORE_ERRORS"                  => :ignore_errors,
       "APPSIGNAL_IGNORE_NAMESPACES"              => :ignore_namespaces,
@@ -86,7 +82,6 @@ module Appsignal
       APPSIGNAL_APP_NAME
       APPSIGNAL_CA_FILE_PATH
       APPSIGNAL_DNS_SERVERS
-      APPSIGNAL_FRONTEND_ERROR_CATCHING_PATH
       APPSIGNAL_HOSTNAME
       APPSIGNAL_HTTP_PROXY
       APPSIGNAL_LOG
@@ -102,7 +97,6 @@ module Appsignal
       APPSIGNAL_ACTIVE
       APPSIGNAL_DEBUG
       APPSIGNAL_ENABLE_ALLOCATION_TRACKING
-      APPSIGNAL_ENABLE_FRONTEND_ERROR_CATCHING
       APPSIGNAL_ENABLE_GC_INSTRUMENTATION
       APPSIGNAL_ENABLE_HOST_METRICS
       APPSIGNAL_ENABLE_MINUTELY_PROBES
@@ -126,12 +120,6 @@ module Appsignal
       APPSIGNAL_REQUEST_HEADERS
     ].freeze
 
-    # Mapping of old and deprecated AppSignal configuration keys
-    DEPRECATED_CONFIG_KEY_MAPPING = {
-      :api_key => :push_api_key,
-      :ignore_exceptions => :ignore_errors
-    }.freeze
-
     # @attribute [r] system_config
     #   Config detected on the system level.
     #   Used in diagnose report.
@@ -376,18 +364,6 @@ module Appsignal
     # Used by {#load_from_disk}. No compatibility for env variables or initial config currently.
     def maintain_backwards_compatibility(configuration)
       configuration.tap do |config|
-        DEPRECATED_CONFIG_KEY_MAPPING.each do |old_key, new_key|
-          old_config_value = config.delete(old_key)
-          next unless old_config_value
-          deprecation_message \
-            "Old configuration key found. Please update the "\
-            "'#{old_key}' to '#{new_key}'.",
-            logger
-
-          next if config[new_key] # Skip if new key is already in use
-          config[new_key] = old_config_value
-        end
-
         if config.include?(:working_dir_path)
           deprecation_message \
             "'working_dir_path' is deprecated, please use " \

data/lib/appsignal/event_formatter.rb

@@ -20,20 +20,11 @@ module Appsignal
         @formatters ||= {}
       end
 
-      def deprecated_formatter_classes
-        @deprecated_formatter_classes ||= {}
-      end
-
       def formatter_classes
         @formatter_classes ||= {}
       end
 
       def register(name, formatter = nil)
-        unless formatter
-          register_deprecated_formatter(name)
-          return
-        end
-
         if registered?(name, formatter)
           logger.warn(
             "Formatter for '#{name}' already registered, not registering "\
@@ -45,12 +36,6 @@ module Appsignal
         initialize_formatter name, formatter
       end
 
-      def initialize_deprecated_formatters
-        deprecated_formatter_classes.each do |name, formatter|
-          register(name, formatter)
-        end
-      end
-
       def unregister(name, formatter = self)
         return unless formatter_classes[name] == formatter
 
@@ -86,16 +71,6 @@ module Appsignal
         logger.error("'#{ex.message}' when initializing #{name} event formatter")
       end
 
-      def register_deprecated_formatter(name)
-        deprecation_message \
-          "Formatter for '#{name}' is using a deprecated registration " \
-          "method. This event formatter will not be loaded. " \
-          "Please update the formatter according to the documentation at: " \
-          "https://docs.appsignal.com/ruby/instrumentation/event-formatters.html"
-
-        EventFormatter.deprecated_formatter_classes[name] = self
-      end
-
       def logger
         Appsignal.logger
       end

data/lib/appsignal/extension.rb

@@ -40,16 +40,6 @@ module Appsignal
       def method_missing(m, *args, &block)
         super if Appsignal.testing?
       end
-
-      unless Appsignal.extension_loaded?
-        def data_map_new
-          Appsignal::Extension::MockData.new
-        end
-
-        def data_array_new
-          Appsignal::Extension::MockData.new
-        end
-      end
     end
 
     if Appsignal::System.jruby?
@@ -72,45 +62,5 @@ module Appsignal
         "#<#{self.class.name}:#{object_id} #{self}>"
       end
     end
-
-    # Mock of the {Data} class. This mock is used when the extension cannot be
-    # loaded. This mock listens to all method calls and does nothing, and
-    # prevents NoMethodErrors from being raised.
-    #
-    # Disabled in testing so we can make sure that we don't miss an extension
-    # function implementation.
-    #
-    # This class inherits from the {Data} class so that it passes type checks.
-    class MockData < Data
-      def initialize(*_args)
-        # JRuby extension requirement, as it sends a pointer to the Data object
-        # when creating it
-      end
-
-      def method_missing(_method, *_args, &_block)
-        super if Appsignal.testing?
-      end
-
-      def to_s
-        "{}"
-      end
-    end
-
-    # Mock of the {Transaction} class. This mock is used when the extension
-    # cannot be loaded. This mock listens to all method calls and does nothing,
-    # and prevents NoMethodErrors from being raised.
-    #
-    # Disabled in testing so we can make sure that we don't miss an extension
-    # function implementation.
-    class MockTransaction
-      def initialize(*_args)
-        # JRuby extension requirement, as it sends a pointer to the Transaction
-        # object when creating it
-      end
-
-      def method_missing(_method, *_args, &_block)
-        super if Appsignal.testing?
-      end
-    end
   end
 end

data/lib/appsignal/hooks/action_cable.rb

@@ -14,53 +14,18 @@ module Appsignal
       end
 
       def install
-        patch_perform_action
+        require "appsignal/integrations/action_cable"
+        ActionCable::Channel::Base.send(:prepend, Appsignal::Integrations::ActionCableIntegration)
+
         install_callbacks
       end
 
       private
 
-      def patch_perform_action
-        ActionCable::Channel::Base.class_eval do
-          alias_method :original_perform_action, :perform_action
-
-          def perform_action(*args, &block)
-            # The request is only the original websocket request
-            env = connection.env
-            request = ActionDispatch::Request.new(env)
-            env[Appsignal::Hooks::ActionCableHook::REQUEST_ID] ||=
-              request.request_id || SecureRandom.uuid
-
-            transaction = Appsignal::Transaction.create(
-              env[Appsignal::Hooks::ActionCableHook::REQUEST_ID],
-              Appsignal::Transaction::ACTION_CABLE,
-              request
-            )
-
-            begin
-              original_perform_action(*args, &block)
-            rescue Exception => exception # rubocop:disable Lint/RescueException
-              transaction.set_error(exception)
-              raise exception
-            ensure
-              transaction.params = args.first
-              transaction.set_action_if_nil("#{self.class}##{args.first["action"]}")
-              transaction.set_metadata("path", request.path)
-              transaction.set_metadata("method", "websocket")
-              Appsignal::Transaction.complete_current!
-            end
-          end
-        end
-      end
-
       def install_callbacks
         ActionCable::Channel::Base.set_callback :subscribe, :around, :prepend => true do |channel, inner|
           # The request is only the original websocket request
-          connection = channel.connection
-          # #env is not available on the Rails ConnectionStub class used in the
-          # Rails app test suite. If we call `#env` it causes an error to occur
-          # in apps' test suites.
-          env = connection.respond_to?(:env) ? connection.env : {}
+          env = channel.connection.env
           request = ActionDispatch::Request.new(env)
           env[Appsignal::Hooks::ActionCableHook::REQUEST_ID] ||=
             request.request_id || SecureRandom.uuid
@@ -88,11 +53,7 @@ module Appsignal
 
         ActionCable::Channel::Base.set_callback :unsubscribe, :around, :prepend => true do |channel, inner|
           # The request is only the original websocket request
-          connection = channel.connection
-          # #env is not available on the Rails ConnectionStub class used in the
-          # Rails app test suite. If we call `#env` it causes an error to occur
-          # in apps' test suites.
-          env = connection.respond_to?(:env) ? connection.env : {}
+          env = channel.connection.env
           request = ActionDispatch::Request.new(env)
           env[Appsignal::Hooks::ActionCableHook::REQUEST_ID] ||=
             request.request_id || SecureRandom.uuid

data/lib/appsignal/hooks/active_support_notifications.rb

@@ -6,8 +6,6 @@ module Appsignal
     class ActiveSupportNotificationsHook < Appsignal::Hooks::Hook
       register :active_support_notifications
 
-      BANG = "!".freeze
-
       def dependencies_present?
         defined?(::ActiveSupport::Notifications::Instrumenter)
       end
@@ -23,100 +21,23 @@ module Appsignal
           end
         end
 
+        require "appsignal/integrations/active_support_notifications"
         instrumenter = ::ActiveSupport::Notifications::Instrumenter
-
+        parent_integration_module = Appsignal::Integrations::ActiveSupportNotificationsIntegration
         if instrumenter.method_defined?(:start) && instrumenter.method_defined?(:finish)
-          install_start_finish
+          install_module(parent_integration_module::StartFinishIntegration)
         else
-          install_instrument
+          install_module(parent_integration_module::InstrumentIntegration)
         end
 
         # rubocop:disable Style/GuardClause
         if instrumenter.method_defined?(:finish_with_state)
-          install_finish_with_state
+          install_module(parent_integration_module::FinishStateIntegration)
         end
       end
 
-      def install_instrument
-        ::ActiveSupport::Notifications::Instrumenter.class_eval do
-          alias instrument_without_appsignal instrument
-
-          def instrument(name, payload = {}, &block)
-            # Events that start with a bang are internal to Rails
-            instrument_this = name[0] != BANG
-
-            Appsignal::Transaction.current.start_event if instrument_this
-
-            instrument_without_appsignal(name, payload, &block)
-          ensure
-            if instrument_this
-              title, body, body_format = Appsignal::EventFormatter.format(name, payload)
-              Appsignal::Transaction.current.finish_event(
-                name.to_s,
-                title,
-                body,
-                body_format
-              )
-            end
-          end
-        end
-      end
-
-      def install_start_finish
-        ::ActiveSupport::Notifications::Instrumenter.class_eval do
-          alias start_without_appsignal start
-
-          def start(name, payload = {})
-            # Events that start with a bang are internal to Rails
-            instrument_this = name[0] != BANG
-
-            Appsignal::Transaction.current.start_event if instrument_this
-
-            start_without_appsignal(name, payload)
-          end
-
-          alias finish_without_appsignal finish
-
-          def finish(name, payload = {})
-            # Events that start with a bang are internal to Rails
-            instrument_this = name[0] != BANG
-
-            if instrument_this
-              title, body, body_format = Appsignal::EventFormatter.format(name, payload)
-              Appsignal::Transaction.current.finish_event(
-                name.to_s,
-                title,
-                body,
-                body_format
-              )
-            end
-
-            finish_without_appsignal(name, payload)
-          end
-        end
-      end
-
-      def install_finish_with_state
-        ::ActiveSupport::Notifications::Instrumenter.class_eval do
-          alias finish_with_state_without_appsignal finish_with_state
-
-          def finish_with_state(listeners_state, name, payload = {})
-            # Events that start with a bang are internal to Rails
-            instrument_this = name[0] != BANG
-
-            if instrument_this
-              title, body, body_format = Appsignal::EventFormatter.format(name, payload)
-              Appsignal::Transaction.current.finish_event(
-                name.to_s,
-                title,
-                body,
-                body_format
-              )
-            end
-
-            finish_with_state_without_appsignal(listeners_state, name, payload)
-          end
-        end
+      def install_module(mod)
+        ::ActiveSupport::Notifications::Instrumenter.send(:prepend, mod)
       end
     end
   end

data/lib/appsignal/hooks/celluloid.rb

@@ -16,16 +16,12 @@ module Appsignal
         # down Celluloid so we're sure our thread does not aggravate this situation.
         # This way we also make sure any outstanding transactions get flushed.
 
-        ::Celluloid.class_eval do
-          class << self
-            alias shutdown_without_appsignal shutdown
-
-            def shutdown
-              Appsignal.stop("celluloid")
-              shutdown_without_appsignal
-            end
+        Celluloid.singleton_class.send(:prepend, Module.new do
+          def shutdown
+            Appsignal.stop("celluloid")
+            super
           end
-        end
+        end)
       end
     end
   end

data/lib/appsignal/hooks/net_http.rb

@@ -13,18 +13,8 @@ module Appsignal
       end
 
       def install
-        Net::HTTP.class_eval do
-          alias request_without_appsignal request
-
-          def request(request, body = nil, &block)
-            Appsignal.instrument(
-              "request.net_http",
-              "#{request.method} #{use_ssl? ? "https" : "http"}://#{request["host"] || address}"
-            ) do
-              request_without_appsignal(request, body, &block)
-            end
-          end
-        end
+        require "appsignal/integrations/net_http"
+        Net::HTTP.send(:prepend, Appsignal::Integrations::NetHttpIntegration)
 
         Appsignal::Environment.report_enabled("net_http")
       end

data/lib/appsignal/hooks/puma.rb

@@ -29,14 +29,12 @@ module Appsignal
 
         return unless defined?(::Puma::Cluster)
         # For clustered mode with multiple workers
-        ::Puma::Cluster.class_eval do
-          alias stop_workers_without_appsignal stop_workers
-
+        ::Puma::Cluster.send(:prepend, Module.new do
           def stop_workers
             Appsignal.stop("puma cluster")
-            stop_workers_without_appsignal
+            super
           end
-        end
+        end)
       end
     end
   end

data/lib/appsignal/hooks/que.rb

@@ -12,7 +12,7 @@ module Appsignal
 
       def install
         require "appsignal/integrations/que"
-        ::Que::Job.send(:include, Appsignal::Integrations::QuePlugin)
+        ::Que::Job.send(:prepend, Appsignal::Integrations::QuePlugin)
 
         ::Que.error_notifier = proc do |error, _job|
           Appsignal::Transaction.current.set_error(error)

data/lib/appsignal/hooks/rake.rb

@@ -11,30 +11,8 @@ module Appsignal
       end
 
       def install
-        ::Rake::Task.class_eval do
-          alias :execute_without_appsignal :execute
-
-          def execute(*args)
-            execute_without_appsignal(*args)
-          rescue Exception => error # rubocop:disable Lint/RescueException
-            # Format given arguments and cast to hash if possible
-            params, _ = args
-            params = params.to_hash if params.respond_to?(:to_hash)
-
-            transaction = Appsignal::Transaction.create(
-              SecureRandom.uuid,
-              Appsignal::Transaction::BACKGROUND_JOB,
-              Appsignal::Transaction::GenericRequest.new(
-                :params => params
-              )
-            )
-            transaction.set_action(name)
-            transaction.set_error(error)
-            transaction.complete
-            Appsignal.stop("rake")
-            raise error
-          end
-        end
+        require "appsignal/integrations/rake"
+        ::Rake::Task.send(:prepend, Appsignal::Integrations::RakeIntegration)
       end
     end
   end

data/lib/appsignal/hooks/redis.rb

@@ -13,19 +13,8 @@ module Appsignal
       end
 
       def install
-        ::Redis::Client.class_eval do
-          alias process_without_appsignal process
-
-          def process(commands, &block)
-            sanitized_commands = commands.map do |command, *args|
-              "#{command}#{" ?" * args.size}"
-            end.join("\n")
-
-            Appsignal.instrument "query.redis", id, sanitized_commands do
-              process_without_appsignal(commands, &block)
-            end
-          end
-        end
+        require "appsignal/integrations/redis"
+        ::Redis::Client.send(:prepend, Appsignal::Integrations::RedisIntegration)
 
         Appsignal::Environment.report_enabled("redis")
       end