appsignal 4.5.17 → 4.7.0

data/lib/appsignal/hooks/redis.rb

@@ -2,7 +2,7 @@
 
 module Appsignal
   class Hooks
-    # @api private
+    # @!visibility private
     class RedisHook < Appsignal::Hooks::Hook
       register :redis
 

data/lib/appsignal/hooks/redis_client.rb

@@ -2,7 +2,7 @@
 
 module Appsignal
   class Hooks
-    # @api private
+    # @!visibility private
     class RedisClientHook < Appsignal::Hooks::Hook
       register :redis_client
 

data/lib/appsignal/hooks/resque.rb

@@ -2,7 +2,7 @@
 
 module Appsignal
   class Hooks
-    # @api private
+    # @!visibility private
     class ResqueHook < Appsignal::Hooks::Hook
       register :resque
 

data/lib/appsignal/hooks/sequel.rb

@@ -2,7 +2,7 @@
 
 module Appsignal
   class Hooks
-    # @api private
+    # @!visibility private
     module SequelLogExtension
       # Add query instrumentation
       def log_yield(sql, args = nil)
@@ -19,6 +19,7 @@ module Appsignal
 
     module SequelLogConnectionExtension
       # Add query instrumentation
+      # @!visibility private
       def log_connection_yield(sql, conn, args = nil)
         Appsignal.instrument(
           "sql.sequel",

data/lib/appsignal/hooks/shoryuken.rb

@@ -2,7 +2,7 @@
 
 module Appsignal
   class Hooks
-    # @api private
+    # @!visibility private
     class ShoryukenHook < Appsignal::Hooks::Hook
       register :shoryuken
 

data/lib/appsignal/hooks/sidekiq.rb

@@ -2,6 +2,7 @@
 
 module Appsignal
   class Hooks
+    # @!visibility private
     class SidekiqHook < Appsignal::Hooks::Hook
       register :sidekiq
 

data/lib/appsignal/hooks/unicorn.rb

@@ -2,7 +2,7 @@
 
 module Appsignal
   class Hooks
-    # @api private
+    # @!visibility private
     class UnicornHook < Appsignal::Hooks::Hook
       register :unicorn
 

data/lib/appsignal/hooks/webmachine.rb

@@ -2,7 +2,7 @@
 
 module Appsignal
   class Hooks
-    # @api private
+    # @!visibility private
     class WebmachineHook < Appsignal::Hooks::Hook
       register :webmachine
 

data/lib/appsignal/hooks.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Appsignal
-  # @api private
+  # @!visibility private
   class Hooks
     class << self
       def register(name, hook)
@@ -38,8 +38,10 @@ module Appsignal
           @installed = true
         rescue => ex
           logger = Appsignal.internal_logger
-          logger.error("Error while installing #{name} hook: #{ex}")
-          logger.debug ex.backtrace.join("\n")
+          logger.error(
+            "Error while installing #{name} hook: #{ex.class}: #{ex.message}\n" \
+              "#{ex.backtrace.join("\n")}"
+          )
         end
       end
 

data/lib/appsignal/integrations/action_cable.rb

@@ -2,7 +2,7 @@
 
 module Appsignal
   module Integrations
-    # @api private
+    # @!visibility private
     module ActionCableIntegration
       def perform_action(*args, &block)
         # The request is only the original websocket request

data/lib/appsignal/integrations/active_support_notifications.rb

@@ -2,7 +2,7 @@
 
 module Appsignal
   module Integrations
-    # @api private
+    # @!visibility private
     module ActiveSupportNotificationsIntegration
       BANG = "!"
 

data/lib/appsignal/integrations/capistrano/capistrano_2_tasks.rb

@@ -2,7 +2,7 @@
 
 module Appsignal
   module Integrations
-    # @api private
+    # @!visibility private
     class Capistrano
       def self.tasks(config)
         config.load do

data/lib/appsignal/integrations/data_mapper.rb

@@ -2,7 +2,7 @@
 
 module Appsignal
   class Hooks
-    # @api private
+    # @!visibility private
     module DataMapperLogListener
       SQL_CLASSES = [
         "DataObjects::SqlServer::Connection",

data/lib/appsignal/integrations/delayed_job_plugin.rb

@@ -2,7 +2,7 @@
 
 module Appsignal
   module Integrations
-    # @api private
+    # @!visibility private
     class DelayedJobPlugin < ::Delayed::Plugin
       extend Appsignal::Hooks::Helpers
 

data/lib/appsignal/integrations/dry_monitor.rb

@@ -2,7 +2,7 @@
 
 module Appsignal
   module Integrations
-    # @api private
+    # @!visibility private
     module DryMonitorIntegration
       def instrument(event_id, payload = {}, &block)
         Appsignal::Transaction.current.start_event

data/lib/appsignal/integrations/excon.rb

@@ -2,7 +2,7 @@
 
 module Appsignal
   module Integrations
-    # @api private
+    # @!visibility private
     module ExconIntegration
       def self.instrument(name, data, &block)
         namespace, *event = name.split(".")

data/lib/appsignal/integrations/http.rb

@@ -2,7 +2,7 @@
 
 module Appsignal
   module Integrations
-    # @api private
+    # @!visibility private
     module HttpIntegration
       def request(verb, uri, opts = {})
         uri_module = defined?(HTTP::URI) ? HTTP::URI : URI

data/lib/appsignal/integrations/mongo_ruby_driver.rb

@@ -2,7 +2,7 @@
 
 module Appsignal
   class Hooks
-    # @api private
+    # @!visibility private
     class MongoMonitorSubscriber
       # Called by Mongo::Monitor when query starts
       def started(event)

data/lib/appsignal/integrations/net_http.rb

@@ -2,7 +2,7 @@
 
 module Appsignal
   module Integrations
-    # @api private
+    # @!visibility private
     module NetHttpIntegration
       def request(request, body = nil, &block)
         Appsignal.instrument(

data/lib/appsignal/integrations/object.rb

@@ -2,7 +2,17 @@
 
 Appsignal::Environment.report_enabled("object_instrumentation") if defined?(Appsignal)
 
+# Extensions to Object for AppSignal method instrumentation.
+#
+# @see https://docs.appsignal.com/ruby/instrumentation/method-instrumentation.html
+#   Method instrumentation documentation.
 class Object
+  # Instruments a class method with AppSignal monitoring.
+  #
+  # @param method_name [Symbol] The name of the class method to instrument.
+  # @param options [Hash<Symbol, String>] Options for instrumentation.
+  # @option options [String] :name Custom event name for the instrumentation.
+  # @return [Symbol]
   # @see https://docs.appsignal.com/ruby/instrumentation/method-instrumentation.html
   #   Method instrumentation documentation.
   def self.appsignal_instrument_class_method(method_name, options = {})
@@ -22,6 +32,12 @@ class Object
     end
   end
 
+  # Instruments an instance method with AppSignal monitoring.
+  #
+  # @param method_name [Symbol] The name of the instance method to instrument.
+  # @param options [Hash<Symbol, String>] Options for instrumentation.
+  # @option options [String] :name Custom event name for the instrumentation.
+  # @return [Symbol]
   # @see https://docs.appsignal.com/ruby/instrumentation/method-instrumentation.html
   #   Method instrumentation documentation.
   def self.appsignal_instrument_method(method_name, options = {})
@@ -37,14 +53,14 @@ class Object
     ruby2_keywords method_name if respond_to?(:ruby2_keywords, true)
   end
 
-  # @api private
+  # @!visibility private
   def self.appsignal_reverse_class_name
     return "AnonymousClass" unless name
 
     name.split("::").reverse.join(".")
   end
 
-  # @api private
+  # @!visibility private
   def appsignal_reverse_class_name
     self.class.appsignal_reverse_class_name
   end

data/lib/appsignal/integrations/ownership.rb

@@ -2,7 +2,7 @@
 
 module Appsignal
   module Integrations
-    # @api private
+    # @!visibility private
     module OwnershipIntegration
       # Implement the `around_change` logic by monkey-patching the reader,
       # instead of by using the `around_change=` writer. This allows customers

data/lib/appsignal/integrations/puma.rb

@@ -2,7 +2,7 @@
 
 module Appsignal
   module Integrations
-    # @api private
+    # @!visibility private
     module PumaServer
       def lowlevel_error(error, env, response_status = 500)
         response =

data/lib/appsignal/integrations/que.rb

@@ -2,7 +2,7 @@
 
 module Appsignal
   module Integrations
-    # @api private
+    # @!visibility private
     module QuePlugin
       def _run(*args)
         transaction =

data/lib/appsignal/integrations/railtie.rb

@@ -7,7 +7,7 @@ require "appsignal/rack/rails_instrumentation"
 
 module Appsignal
   module Integrations
-    # @api private
+    # @!visibility private
     class Railtie < ::Rails::Railtie
       config.appsignal = ActiveSupport::OrderedOptions.new
       config.appsignal.start_at = :on_load
@@ -28,11 +28,19 @@ module Appsignal
 
       def self.on_load(app)
         load_default_config
-        Appsignal::Integrations::Railtie.add_instrumentation_middleware(app)
 
-        return unless app.config.appsignal.start_at == :on_load
+        Appsignal::Integrations::Railtie.start if app.config.appsignal.start_at == :on_load
 
-        Appsignal::Integrations::Railtie.start
+        # If AppSignal is supposed to start after initialization, we need to add the
+        # instrumentation middleware now, even if AppSignal may not actually start
+        # later, because the middleware stack will be frozen after initialization.
+        #
+        # Otherwise, only add the instrumentation middleware if AppSignal did actually
+        # start before this point, preventing the middleware from being added when
+        # AppSignal is not active.
+        return unless app.config.appsignal.start_at == :after_initialize || Appsignal.started?
+
+        add_instrumentation_middleware(app)
       end
 
       def self.after_initialize(app)
@@ -52,14 +60,15 @@ module Appsignal
 
       def self.start
         Appsignal.start
-        initialize_error_reporter if Appsignal.started?
+        return unless Appsignal.started?
+
+        initialize_error_reporter
       end
 
       def self.add_instrumentation_middleware(app)
         app.middleware.insert(
           0,
-          ::Rack::Events,
-          [Appsignal::Rack::EventHandler.new]
+          ::Appsignal::Rack::EventMiddleware
         )
         app.middleware.insert_after(
           ActionDispatch::DebugExceptions,
@@ -77,7 +86,7 @@ module Appsignal
 
     # Report errors reported by the Rails error reporter using {Appsignal.report_error}.
     #
-    # @api private
+    # @!visibility private
     class RailsErrorReporterSubscriber
       class << self
         def report(error, handled:, severity:, context: {}, source: nil) # rubocop:disable Lint/UnusedMethodArgument

data/lib/appsignal/integrations/rake.rb

@@ -2,7 +2,7 @@
 
 module Appsignal
   module Integrations
-    # @api private
+    # @!visibility private
     module RakeIntegration
       IGNORED_ERRORS = [
         # Normal exits from the application we do not need to report
@@ -49,7 +49,7 @@ module Appsignal
       end
     end
 
-    # @api private
+    # @!visibility private
     module RakeIntegrationHelper
       # Register an `at_exit` hook when a task is executed. This will stop
       # AppSignal when _all_ tasks are executed and Rake exits.

data/lib/appsignal/integrations/redis.rb

@@ -2,7 +2,7 @@
 
 module Appsignal
   module Integrations
-    # @api private
+    # @!visibility private
     module RedisIntegration
       def write(command)
         sanitized_command =

data/lib/appsignal/integrations/redis_client.rb

@@ -2,7 +2,7 @@
 
 module Appsignal
   module Integrations
-    # @api private
+    # @!visibility private
     module RedisClientIntegration
       def write(command)
         sanitized_command =

data/lib/appsignal/integrations/resque.rb

@@ -2,7 +2,7 @@
 
 module Appsignal
   module Integrations
-    # @api private
+    # @!visibility private
     module ResqueIntegration
       def perform
         transaction = Appsignal::Transaction.create(Appsignal::Transaction::BACKGROUND_JOB)
@@ -25,7 +25,7 @@ module Appsignal
       end
     end
 
-    # @api private
+    # @!visibility private
     class ResqueHelpers
       def self.arguments(payload)
         case payload["class"]

data/lib/appsignal/integrations/shoryuken.rb

@@ -2,7 +2,7 @@
 
 module Appsignal
   module Integrations
-    # @api private
+    # @!visibility private
     class ShoryukenMiddleware
       def call(worker_instance, queue, sqs_msg, body, &block)
         transaction = Appsignal::Transaction.create(Appsignal::Transaction::BACKGROUND_JOB)

data/lib/appsignal/integrations/sidekiq.rb

@@ -11,7 +11,7 @@ module Appsignal
     # about completing the transaction.
     #
     # Introduced in Sidekiq 5.1.
-    # @api private
+    # @!visibility private
     class SidekiqDeathHandler
       def call(_job_context, exception)
         return unless Appsignal.config[:sidekiq_report_errors] == "discard"
@@ -24,7 +24,7 @@ module Appsignal
     # Error handler for Sidekiq to report errors from jobs and internal Sidekiq
     # errors.
     #
-    # @api private
+    # @!visibility private
     class SidekiqErrorHandler
       # Sidekiq 7.1.5 introduced the third sidekiq_config argument. It is not
       # given on older Sidekiq versions.
@@ -49,7 +49,7 @@ module Appsignal
       end
     end
 
-    # @api private
+    # @!visibility private
     class SidekiqMiddleware
       include Appsignal::Hooks::Helpers
 
@@ -66,8 +66,9 @@ module Appsignal
 
       def call(_worker, item, _queue, &block)
         job_status = nil
+        action_name = formatted_action_name(item)
         transaction = Appsignal::Transaction.create(Appsignal::Transaction::BACKGROUND_JOB)
-        transaction.set_action_if_nil(formatted_action_name(item))
+        transaction.set_action_if_nil(action_name)
 
         formatted_metadata(item).each do |key, value|
           transaction.set_metadata key, value
@@ -93,14 +94,24 @@ module Appsignal
           Appsignal::Transaction.complete_current! unless exception
 
           queue = item["queue"] || "unknown"
+
           if job_status
             increment_counter "queue_job_count", 1,
               :queue => queue,
               :status => job_status
+            increment_counter "worker_job_count", 1,
+              :worker => action_name,
+              :queue => queue,
+              :status => job_status
           end
           increment_counter "queue_job_count", 1,
             :queue => queue,
             :status => :processed
+          increment_counter "worker_job_count", 1,
+            :worker => action_name,
+            :queue => queue,
+            :status => :processed
+
         end
       end
 

data/lib/appsignal/integrations/unicorn.rb

@@ -2,7 +2,7 @@
 
 module Appsignal
   module Integrations
-    # @api private
+    # @!visibility private
     module UnicornIntegration
       # Make sure that appsignal is started and the last transaction
       # in a worker gets flushed.

data/lib/appsignal/integrations/webmachine.rb

@@ -2,7 +2,7 @@
 
 module Appsignal
   module Integrations
-    # @api private
+    # @!visibility private
     module WebmachineIntegration
       def run
         has_parent_transaction = Appsignal::Transaction.current?

data/lib/appsignal/internal_errors.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
 module Appsignal
-  # @api private
   class InternalError < StandardError; end
 
-  # @api private
   class NotStartedError < InternalError
+    # @!visibility private
     MESSAGE = <<~MESSAGE
       The AppSignal Ruby gem was not started!
 
       This error was raised by calling `Appsignal.check_if_started!`
     MESSAGE
 
+    # @return [String]
     def message
       MESSAGE
     end

data/lib/appsignal/loaders/hanami.rb

@@ -21,10 +21,7 @@ module Appsignal
         require "appsignal/rack/hanami_middleware"
 
         hanami_app_config = ::Hanami.app.config
-        hanami_app_config.middleware.use(
-          ::Rack::Events,
-          [Appsignal::Rack::EventHandler.new]
-        )
+        hanami_app_config.middleware.use(Appsignal::Rack::EventMiddleware)
         hanami_app_config.middleware.use(Appsignal::Rack::HanamiMiddleware)
 
         return unless Gem::Version.new(Hanami::VERSION) < Gem::Version.new("2.2.0")

data/lib/appsignal/loaders/padrino.rb

@@ -18,7 +18,7 @@ module Appsignal
         Padrino::Application.prepend(Appsignal::Loaders::PadrinoLoader::PadrinoIntegration)
 
         Padrino.before_load do
-          Padrino.use ::Rack::Events, [Appsignal::Rack::EventHandler.new]
+          Padrino.use Appsignal::Rack::EventMiddleware
           Padrino.use Appsignal::Rack::SinatraBaseInstrumentation,
             :instrument_event_name => "process_action.padrino"
         end

data/lib/appsignal/loaders/sinatra.rb

@@ -16,7 +16,7 @@ module Appsignal
       def on_start
         require "appsignal/rack/sinatra_instrumentation"
 
-        ::Sinatra::Base.use(::Rack::Events, [Appsignal::Rack::EventHandler.new])
+        ::Sinatra::Base.use(Appsignal::Rack::EventMiddleware)
         ::Sinatra::Base.use(Appsignal::Rack::SinatraBaseInstrumentation)
       end
     end

data/lib/appsignal/loaders.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Appsignal
-  # @api private
+  # @!visibility private
   module Loaders
     class << self
       def loaders