appsignal 4.8.6-java → 4.9.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 483ce7fcc2f48049cf17dea30a242c5792084ff637535293a058247a03c12d2a
-  data.tar.gz: '07290f125fa787fb511c9d5db76625cbb2a791d3b69b6f11916bf7f6c9ce907f'
+  metadata.gz: e9b7f5c960d357b0fa8a1213b9d30871271f932e7b850fef010ea2667269dcf0
+  data.tar.gz: b4810279e337a0d0dfd0283de2051c85619f4bd5338ac1105027370bed2c0977
 SHA512:
-  metadata.gz: 25fdd04fbe1d251e22f2ba4dd45d83e82935826a7dc141340a86b9f877135424a7963c2d8ce4895b941e0d53f12ad1546b973b816f5e77514267b557538a53ab
-  data.tar.gz: 1d44c692006eede99c48325d0f9a4b1476d0adfcf3c39ad5af3fe6f88f3145bf196562d44ab1b4254e91fd70c691c764d43dd37fde41a323969abf3222a74842
+  metadata.gz: 4f9111ea68c1fe1828523a2e2dbc0d41de2f2d9423cd4f5cd60b68020ab1ad03d058c93f42c9f3db7e432c50c3f91c0e3f449dba41e8b03ce1b21b03ef8cec9d
+  data.tar.gz: d45f3e280eba6286eafd5b8ca4eebe9336443d717810abdd3b2f30737a0062df87476c5bf295a54197f23f51e3555c09d81f88c2a356f5a4e010f6f48c8d94a1

data/CHANGELOG.md

@@ -1,5 +1,54 @@
 # AppSignal for Ruby gem Changelog
 
+## 4.9.0
+
+_Published on 2026-07-16._
+
+### Added
+
+- Improve Faraday support. AppSignal now instruments Faraday requests automatically, without double-instrumenting the underlying HTTP client. Turn it off with the `instrument_faraday` option. (minor [c3354af3](https://github.com/appsignal/appsignal-ruby/commit/c3354af3f2497a984aa0110c9460d92ae3b5676f), [24aa25da](https://github.com/appsignal/appsignal-ruby/commit/24aa25da63a6b7abf74f3c29ce0d27ccbda38422))
+- Add config options to turn individual integrations off. Set
+  `instrument_sidekiq`, `instrument_shoryuken`, `instrument_que`,
+  `instrument_resque`, `instrument_delayed_job`, `instrument_active_job`,
+  `instrument_excon` or `instrument_mongo` to `false` to disable that
+  integration entirely. This turns off both the instrumentation of the jobs or
+  requests and the enqueue instrumentation for that integration. They all
+  default to `true`. Each can also be set through its environment variable, such
+  as `APPSIGNAL_INSTRUMENT_SIDEKIQ`.
+
+  (minor [d899994e](https://github.com/appsignal/appsignal-ruby/commit/d899994e23e32d6afac6ab457b905399a8ea68e3))
+- Instrument background job enqueues. Enqueuing a job now records an enqueue
+  event on the active transaction, so enqueues made from within a web request or
+  another job show up in the event timeline. This is recorded for Sidekiq
+  (`enqueue.sidekiq`), Que (`enqueue.que`, plus `bulk_enqueue.que` for bulk
+  enqueues on Que 2), Resque (`enqueue.resque`), Shoryuken (`enqueue.shoryuken`)
+  and Delayed Job (`enqueue.delayed_job`). Each event is titled after the job
+  being enqueued.
+
+  For Active Job, the `enqueue.active_job` event is now recorded by AppSignal's
+  own instrumentation rather than by Rails' native `enqueue.active_job`
+  notification. The native notification is suppressed so the enqueue is recorded
+  once, and the event is now titled after the job being enqueued.
+
+  These enqueue events can be turned off with the
+  `enable_job_enqueue_instrumentation` config option. Set it to `false` to stop
+  recording enqueue events across all integrations, without affecting the
+  instrumentation of the jobs themselves. It defaults to `true` and can also be
+  set through the `APPSIGNAL_ENABLE_JOB_ENQUEUE_INSTRUMENTATION` environment
+  variable.
+
+  (minor [caa8fbc7](https://github.com/appsignal/appsignal-ruby/commit/caa8fbc766f67e945836e6f78bc61ce98d8e0288))
+- Report the `grape` gem version in the environment metadata. For more information, see [our environment metadata docs](https://docs.appsignal.com/application/environment-metadata). (patch [6e91223c](https://github.com/appsignal/appsignal-ruby/commit/6e91223c777a3da8dc2b5c68c3b446fb61db8b5b))
+
+### Fixed
+
+- Instrument HTTP.rb chained requests on http 6. Requests made through a chained
+  client -- `HTTP.follow.get(...)`, `HTTP.headers(...).get(...)`, and so on -- go
+  through `HTTP::Session` rather than `HTTP::Client`, and were not being recorded.
+  They now produce a `request.http_rb` event like any other request.
+
+  (patch [9de9522a](https://github.com/appsignal/appsignal-ruby/commit/9de9522af442cb8b51be5b59702558002fbb5169))
+
 ## 4.8.6
 
 _Published on 2026-06-23._

data/appsignal.gemspec

@@ -21,7 +21,7 @@ IGNORED_PATHS = [
   ".rubocop_todo.yml"
 ].freeze
 
-Gem::Specification.new do |gem| # rubocop:disable Metrics/BlockLength
+Gem::Specification.new do |gem|
   gem.authors = [
     "Robert Beekman",
     "Thijs Cadier",
@@ -63,7 +63,7 @@ Gem::Specification.new do |gem| # rubocop:disable Metrics/BlockLength
   gem.add_development_dependency "pry"
   gem.add_development_dependency "rake", ">= 12"
   gem.add_development_dependency "rspec", "~> 3.8"
-  gem.add_development_dependency "rubocop", "1.64.1"
+  gem.add_development_dependency "rubocop", "~> 1.87.0"
   gem.add_development_dependency("sord") unless RUBY_PLATFORM == "java"
   gem.add_development_dependency "timecop"
   gem.add_development_dependency "webmock"

data/build_matrix.yml

@@ -141,6 +141,7 @@ matrix:
           - "3.4.1"
           - "3.3.4"
           - "jruby-9.4.7.0"
+    - gem: "delayed_job"
     - gem: "dry-monitor"
       only:
         ruby:
@@ -150,6 +151,16 @@ matrix:
           - "3.2.5"
           - "3.1.6"
           - "3.0.7"
+    - gem: "faraday-1"
+    - gem: "faraday-2"
+      only:
+        ruby:
+          - "4.0.0"
+          - "3.4.1"
+          - "3.3.4"
+          - "3.2.5"
+          - "3.1.6"
+          - "3.0.7"
     - gem: "grape"
     - gem: "hanami-2.0"
       only:
@@ -182,6 +193,7 @@ matrix:
           - "3.4.1"
           - "3.3.4"
           - "3.2.5"
+    - gem: "mongo"
     - gem: "ownership"
     - gem: "padrino"
       exclude:
@@ -278,6 +290,19 @@ matrix:
           - "3.1.6"
           - "3.0.7"
     - gem: "sequel"
+    - gem: "shoryuken-6"
+      only:
+        ruby:
+          - "3.1.6"
+          - "3.0.7"
+          - "2.7.8"
+    - gem: "shoryuken-7"
+      only:
+        ruby:
+          - "4.0.0"
+          - "3.4.1"
+          - "3.3.4"
+          - "3.2.5"
     - gem: "sinatra"
     - gem: "webmachine2"
     - gem: "redis-4"

data/ext/base.rb

@@ -100,15 +100,11 @@ def installation_succeeded?
 end
 
 def check_architecture
-  if APPSIGNAL_AGENT_CONFIG["triples"].key?(TARGET_TRIPLE)
-    true
-  else
-    abort_installation(
+  APPSIGNAL_AGENT_CONFIG["triples"].key?(TARGET_TRIPLE) || abort_installation(
       "AppSignal currently does not support your system architecture (#{TARGET_TRIPLE})." \
         "Please let us know at support@appsignal.com, we aim to support everything " \
         "our customers run."
     )
-  end
 end
 
 def download_archive(type)
@@ -140,9 +136,9 @@ def download_archive(type)
           :proxy => proxy }
       ]
       if URI.respond_to?(:open) # rubocop:disable Style/GuardClause
-        return URI.open(*args)
+        return URI.open(*args) # rubocop:disable Security/Open
       else
-        return open(*args)
+        return open(*args) # rubocop:disable Security/Open
       end
     rescue => error
       backtrace = error.backtrace.join("\n")

data/ext/extconf.rb

@@ -77,7 +77,7 @@ def link_libraries
   end
 end
 
-def have_required_function(library, func) # rubocop:disable Naming/PredicateName
+def have_required_function(library, func) # rubocop:disable Naming/PredicatePrefix
   if have_func(func)
     report["build"]["dependencies"][library] = "linked"
     return

data/lib/appsignal/check_in/event.rb

@@ -4,6 +4,9 @@ module Appsignal
   module CheckIn
     # @!visibility private
     class Event
+      CRON_KINDS = %w[start finish].freeze
+      private_constant :CRON_KINDS
+
       class << self
         def new(check_in_type:, identifier:, digest: nil, kind: nil)
           {
@@ -67,7 +70,7 @@ module Appsignal
           end
         end
 
-        def deduplicate_cron!(events) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity
+        def deduplicate_cron!(events)
           # Remove redundant cron check-in events from the given list of events.
           # This is done by removing redundant *pairs* of events -- that is,
           # for each identifier, only send one complete pair of start and
@@ -111,9 +114,7 @@ module Appsignal
             # Do not remove events that are not cron check-in events or that
             # have an unknown kind.
             return false unless
-              event[:check_in_type] == "cron" && (
-                event[:kind] == "start" ||
-                event[:kind] == "finish")
+              event[:check_in_type] == "cron" && CRON_KINDS.include?(event[:kind])
 
             # Remove any event that is part of a complete digest pair, except
             # for the one digest that should be kept.

data/lib/appsignal/cli/diagnose.rb

@@ -350,7 +350,7 @@ module Appsignal
           path = File.expand_path("../../../ext/install.report", __dir__)
           raw_report = File.read(path)
           JSON.parse(raw_report)
-        rescue StandardError, JSON::ParserError => e # rubocop:disable Lint/ShadowedException
+        rescue StandardError => e
           {
             "parsing_error" => {
               "error" => "#{e.class}: #{e}",

data/lib/appsignal/cli/helpers.rb

@@ -5,8 +5,6 @@ require "appsignal/utils/rails_helper"
 module Appsignal
   class CLI
     module Helpers
-      private
-
       COLOR_CODES = {
         :red => 31,
         :green => 32,
@@ -16,6 +14,8 @@ module Appsignal
         :default => 0
       }.freeze
 
+      private
+
       def coloring=(value)
         @coloring = value
       end

data/lib/appsignal/cli/install.rb

@@ -12,7 +12,7 @@ module Appsignal
       EXCLUDED_ENVIRONMENTS = ["test"].freeze
 
       class << self
-        def run(push_api_key, options) # rubocop:disable Metrics/AbcSize
+        def run(push_api_key, options)
           self.coloring = options.delete(:color) { true }
           $stdout.sync = true
 
@@ -228,7 +228,7 @@ module Appsignal
           done_notice
         end
 
-        def configure(config, environments, name_overwritten) # rubocop:disable Metrics/AbcSize
+        def configure(config, environments, name_overwritten)
           install_for_capistrano
 
           ENV["APPSIGNAL_APP_ENV"] = "development"
@@ -241,7 +241,7 @@ module Appsignal
           puts "  See our docs for information on the different configuration methods: "
           puts "  https://docs.appsignal.com/ruby/configuration.html"
           puts
-          loop do # rubocop:disable Metrics/BlockLength
+          loop do
             print "  Choose (1-3): "
             case ask_for_input
             when "1"

data/lib/appsignal/config.rb

@@ -96,6 +96,7 @@ module Appsignal
       :enable_at_exit_hook => "on_error",
       :enable_at_exit_reporter => true,
       :enable_host_metrics => true,
+      :enable_job_enqueue_instrumentation => true,
       :enable_minutely_probes => true,
       :enable_statsd => true,
       :enable_nginx_metrics => false,
@@ -113,12 +114,21 @@ module Appsignal
       :ignore_errors => [],
       :ignore_logs => [],
       :ignore_namespaces => [],
+      :instrument_active_job => true,
       :instrument_code_ownership => true,
+      :instrument_delayed_job => true,
+      :instrument_excon => true,
+      :instrument_faraday => true,
       :instrument_http_rb => true,
+      :instrument_mongo => true,
       :instrument_net_http => true,
       :instrument_ownership => true,
+      :instrument_que => true,
       :instrument_redis => true,
+      :instrument_resque => true,
       :instrument_sequel => true,
+      :instrument_shoryuken => true,
+      :instrument_sidekiq => true,
       :log => "file",
       :logging_endpoint => "https://appsignal-endpoint.net",
       :ownership_set_namespace => false,
@@ -180,6 +190,8 @@ module Appsignal
       :enable_allocation_tracking => "APPSIGNAL_ENABLE_ALLOCATION_TRACKING",
       :enable_at_exit_reporter => "APPSIGNAL_ENABLE_AT_EXIT_REPORTER",
       :enable_host_metrics => "APPSIGNAL_ENABLE_HOST_METRICS",
+      :enable_job_enqueue_instrumentation =>
+        "APPSIGNAL_ENABLE_JOB_ENQUEUE_INSTRUMENTATION",
       :enable_minutely_probes => "APPSIGNAL_ENABLE_MINUTELY_PROBES",
       :enable_statsd => "APPSIGNAL_ENABLE_STATSD",
       :enable_nginx_metrics => "APPSIGNAL_ENABLE_NGINX_METRICS",
@@ -191,12 +203,21 @@ module Appsignal
       :enable_rake_performance_instrumentation =>
         "APPSIGNAL_ENABLE_RAKE_PERFORMANCE_INSTRUMENTATION",
       :files_world_accessible => "APPSIGNAL_FILES_WORLD_ACCESSIBLE",
+      :instrument_active_job => "APPSIGNAL_INSTRUMENT_ACTIVE_JOB",
       :instrument_code_ownership => "APPSIGNAL_INSTRUMENT_CODE_OWNERSHIP",
+      :instrument_delayed_job => "APPSIGNAL_INSTRUMENT_DELAYED_JOB",
+      :instrument_excon => "APPSIGNAL_INSTRUMENT_EXCON",
+      :instrument_faraday => "APPSIGNAL_INSTRUMENT_FARADAY",
       :instrument_http_rb => "APPSIGNAL_INSTRUMENT_HTTP_RB",
+      :instrument_mongo => "APPSIGNAL_INSTRUMENT_MONGO",
       :instrument_net_http => "APPSIGNAL_INSTRUMENT_NET_HTTP",
       :instrument_ownership => "APPSIGNAL_INSTRUMENT_OWNERSHIP",
+      :instrument_que => "APPSIGNAL_INSTRUMENT_QUE",
       :instrument_redis => "APPSIGNAL_INSTRUMENT_REDIS",
+      :instrument_resque => "APPSIGNAL_INSTRUMENT_RESQUE",
       :instrument_sequel => "APPSIGNAL_INSTRUMENT_SEQUEL",
+      :instrument_shoryuken => "APPSIGNAL_INSTRUMENT_SHORYUKEN",
+      :instrument_sidekiq => "APPSIGNAL_INSTRUMENT_SIDEKIQ",
       :ownership_set_namespace => "APPSIGNAL_OWNERSHIP_SET_NAMESPACE",
       :running_in_container => "APPSIGNAL_RUNNING_IN_CONTAINER",
       :send_environment_metadata => "APPSIGNAL_SEND_ENVIRONMENT_METADATA",
@@ -432,7 +453,7 @@ module Appsignal
     end
 
     # @!visibility private
-    def write_to_environment # rubocop:disable Metrics/AbcSize
+    def write_to_environment
       ENV["_APPSIGNAL_ACTIVE"]                       = active?.to_s
       ENV["_APPSIGNAL_AGENT_PATH"]                   = File.expand_path("../../ext", __dir__).to_s
       ENV["_APPSIGNAL_APP_NAME"]                     = config_hash[:name]
@@ -591,7 +612,9 @@ module Appsignal
       return unless yml_config_file?
 
       read_options = YAML::VERSION >= "4.0.0" ? { :aliases => true } : {}
+      # rubocop:disable Security/YAMLLoad
       configurations = YAML.load(ERB.new(File.read(yml_config_file)).result, **read_options)
+      # rubocop:enable Security/YAMLLoad
       config_for_this_env = configurations[env]
       if config_for_this_env
         config_for_this_env.transform_keys(&:to_sym)
@@ -824,6 +847,8 @@ module Appsignal
       #   @return [Boolean] Configure whether the at_exit reporter is enabled
       # @!attribute [rw] enable_host_metrics
       #   @return [Boolean] Configure whether host metrics collection is enabled
+      # @!attribute [rw] enable_job_enqueue_instrumentation
+      #   @return [Boolean] Configure whether to record an event when a background job is enqueued
       # @!attribute [rw] enable_minutely_probes
       #   @return [Boolean] Configure whether minutely probes are enabled
       # @!attribute [rw] enable_statsd
@@ -842,16 +867,34 @@ module Appsignal
       #   @return [Boolean] Configure whether Rake performance instrumentation is enabled
       # @!attribute [rw] files_world_accessible
       #   @return [Boolean] Configure whether files created by AppSignal should be world accessible
+      # @!attribute [rw] instrument_active_job
+      #   @return [Boolean] Configure whether to instrument Active Job
+      # @!attribute [rw] instrument_delayed_job
+      #   @return [Boolean] Configure whether to instrument Delayed Job
+      # @!attribute [rw] instrument_excon
+      #   @return [Boolean] Configure whether to instrument requests made with the Excon gem
+      # @!attribute [rw] instrument_faraday
+      #   @return [Boolean] Configure whether to instrument requests made with the Faraday gem
       # @!attribute [rw] instrument_http_rb
       #   @return [Boolean] Configure whether to instrument requests made with the http.rb gem
+      # @!attribute [rw] instrument_mongo
+      #   @return [Boolean] Configure whether to instrument MongoDB queries
       # @!attribute [rw] instrument_net_http
       #   @return [Boolean] Configure whether to instrument requests made with Net::HTTP
       # @!attribute [rw] instrument_ownership
       #   @return [Boolean] Configure whether to instrument the Ownership gem
+      # @!attribute [rw] instrument_que
+      #   @return [Boolean] Configure whether to instrument Que
       # @!attribute [rw] instrument_redis
       #   @return [Boolean] Configure whether to instrument Redis queries
+      # @!attribute [rw] instrument_resque
+      #   @return [Boolean] Configure whether to instrument Resque
       # @!attribute [rw] instrument_sequel
       #   @return [Boolean] Configure whether to instrument Sequel queries
+      # @!attribute [rw] instrument_shoryuken
+      #   @return [Boolean] Configure whether to instrument Shoryuken
+      # @!attribute [rw] instrument_sidekiq
+      #   @return [Boolean] Configure whether to instrument Sidekiq
       # @!attribute [rw] ownership_set_namespace
       #   @return [Boolean] Configure whether the Ownership gem instrumentation should set namespace
       # @!attribute [rw] running_in_container

data/lib/appsignal/environment.rb

@@ -87,6 +87,7 @@ module Appsignal
       elasticsearch
       excon
       faraday
+      grape
       gvltools
       hanami
       hiredis

data/lib/appsignal/extension/jruby.rb

@@ -398,14 +398,14 @@ module Appsignal
           )
         end
 
-        def set_action(action_name) # rubocop:disable Naming/AccessorMethodName
+        def set_action(action_name)
           Extension.appsignal_set_transaction_action(
             pointer,
             make_appsignal_string(action_name)
           )
         end
 
-        def set_namespace(namespace) # rubocop:disable Naming/AccessorMethodName
+        def set_namespace(namespace)
           Extension.appsignal_set_transaction_namespace(
             pointer,
             make_appsignal_string(namespace)
@@ -420,7 +420,7 @@ module Appsignal
           )
         end
 
-        def set_queue_start(time) # rubocop:disable Naming/AccessorMethodName
+        def set_queue_start(time)
           Extension.appsignal_set_transaction_queue_start(pointer, time)
         end
 
@@ -496,7 +496,7 @@ module Appsignal
           )
         end
 
-        def set_name(name) # rubocop:disable Naming/AccessorMethodName
+        def set_name(name)
           Extension.appsignal_set_span_name(
             pointer,
             make_appsignal_string(name)
@@ -547,6 +547,7 @@ module Appsignal
 
       class Data
         include StringHelpers
+
         attr_reader :pointer
 
         def initialize(pointer)
@@ -588,7 +589,7 @@ module Appsignal
           )
         end
 
-        def set_nil(key) # rubocop:disable Naming/AccessorMethodName
+        def set_nil(key)
           Extension.appsignal_data_map_set_null(
             pointer,
             make_appsignal_string(key)

data/lib/appsignal/extension.rb

@@ -84,7 +84,7 @@ module Appsignal
     #
     # This class inherits from the {Data} class so that it passes type checks.
     class MockData < Data
-      def initialize(*_args)
+      def initialize(*_args) # rubocop:disable Lint/MissingSuper
         # JRuby extension requirement, as it sends a pointer to the Data object
         # when creating it
       end

data/lib/appsignal/helpers/instrumentation.rb

@@ -138,7 +138,7 @@ module Appsignal
 
         begin
           yield if block_given?
-        rescue Exception => error # rubocop:disable Lint/RescueException
+        rescue Exception => error
           transaction.set_error(error)
           raise error
         ensure
@@ -242,7 +242,7 @@ module Appsignal
 
         transaction.complete
       end
-      alias :send_exception :send_error
+      alias send_exception send_error
 
       # Set an error on the current transaction.
       #
@@ -305,8 +305,8 @@ module Appsignal
         transaction.set_error(exception)
         yield transaction if block_given?
       end
-      alias :set_exception :set_error
-      alias :add_exception :set_error
+      alias set_exception set_error
+      alias add_exception set_error
 
       # Report an error to AppSignal.
       #
@@ -377,7 +377,7 @@ module Appsignal
 
         transaction.complete unless has_parent_transaction
       end
-      alias :report_exception :report_error
+      alias report_exception report_error
 
       # Set a custom action name for the current transaction.
       #
@@ -497,7 +497,7 @@ module Appsignal
         transaction = Appsignal::Transaction.current
         transaction.add_custom_data(data)
       end
-      alias :set_custom_data :add_custom_data
+      alias set_custom_data add_custom_data
 
       # Add tags to the current transaction.
       #
@@ -542,9 +542,9 @@ module Appsignal
         transaction = Appsignal::Transaction.current
         transaction.add_tags(tags)
       end
-      alias :tag_request :add_tags
-      alias :tag_job :add_tags
-      alias :set_tags :add_tags
+      alias tag_request add_tags
+      alias tag_job add_tags
+      alias set_tags add_tags
 
       # Add parameters to the current transaction.
       #
@@ -600,7 +600,7 @@ module Appsignal
         transaction = Appsignal::Transaction.current
         transaction.add_params(params, &block)
       end
-      alias :set_params :add_params
+      alias set_params add_params
 
       # Mark the parameters sample data to be set as an empty value.
       #
@@ -666,7 +666,7 @@ module Appsignal
         transaction = Appsignal::Transaction.current
         transaction.add_session_data(session_data, &block)
       end
-      alias :set_session_data :add_session_data
+      alias set_session_data add_session_data
 
       # Add request headers to the current transaction.
       #
@@ -708,7 +708,7 @@ module Appsignal
         transaction = Appsignal::Transaction.current
         transaction.add_headers(headers, &block)
       end
-      alias :set_headers :add_headers
+      alias set_headers add_headers
 
       # Add breadcrumbs to the transaction.
       #

data/lib/appsignal/hooks/action_cable.rb

@@ -43,7 +43,7 @@ module Appsignal
             Appsignal.instrument "subscribed.action_cable" do
               inner.call
             end
-          rescue Exception => exception # rubocop:disable Lint/RescueException
+          rescue Exception => exception
             transaction.set_error(exception)
             raise exception
           ensure
@@ -79,7 +79,7 @@ module Appsignal
             Appsignal.instrument "unsubscribed.action_cable" do
               inner.call
             end
-          rescue Exception => exception # rubocop:disable Lint/RescueException
+          rescue Exception => exception
             transaction.set_error(exception)
             raise exception
           ensure

data/lib/appsignal/hooks/active_job.rb

@@ -22,13 +22,16 @@ module Appsignal
       end
 
       def dependencies_present?
-        self.class.dependencies_present?
+        self.class.dependencies_present? && Appsignal.config &&
+          Appsignal.config[:instrument_active_job]
       end
 
       def install
         ActiveSupport.on_load(:active_job) do
           ::ActiveJob::Base
             .extend ::Appsignal::Hooks::ActiveJobHook::ActiveJobClassInstrumentation
+          ::ActiveJob::Base
+            .prepend ::Appsignal::Hooks::ActiveJobHook::ActiveJobEnqueueInstrumentation
 
           next unless Appsignal::Hooks::ActiveJobHook.version_7_1_or_higher?
 
@@ -41,8 +44,44 @@ module Appsignal
         end
       end
 
+      # Records an `enqueue.active_job` event when a job is enqueued, so the
+      # enqueue shows up on the active transaction's timeline (e.g. when
+      # enqueuing from within a web request or another job).
+      #
+      # Wrapping `enqueue` ourselves -- rather than relying on Rails' native
+      # `enqueue.active_job` notification, which the AppSignal notifications
+      # path now suppresses -- gives us a single event we own. Like all
+      # AppSignal events, this only records when there's an active transaction;
+      # an enqueue with no transaction is a transparent pass-through.
+      #
+      # @!visibility private
+      module ActiveJobEnqueueInstrumentation
+        def enqueue(*, **)
+          # Skip recording the event when enqueue events are suppressed. That is
+          # the case when enqueue instrumentation is disabled, and it keeps this
+          # integration consistent with the standalone adapters (Sidekiq, ...),
+          # which already gate their own enqueue event on this check.
+          if Appsignal::Transaction.current? &&
+              Appsignal::Transaction.current.job_enqueue_events_suppressed?
+            return super
+          end
+
+          Appsignal.instrument("enqueue.active_job", "enqueue #{self.class.name} job") do
+            # Active Job enqueues through an adapter (Sidekiq, Resque, ...) that
+            # has its own enqueue instrumentation. Suppress it so the enqueue is
+            # recorded once, as this event, rather than as nested Active Job +
+            # adapter events.
+            if Appsignal::Transaction.current?
+              Appsignal::Transaction.current.suppress_job_enqueue_events { super }
+            else
+              super
+            end
+          end
+        end
+      end
+
       module ActiveJobClassInstrumentation
-        def execute(job) # rubocop:disable Metrics/CyclomaticComplexity
+        def execute(job)
           enqueued_at = job["enqueued_at"]
           queue_start = Time.parse(enqueued_at) if enqueued_at
           queue_time =
@@ -75,7 +114,7 @@ module Appsignal
             transaction.set_action(ActiveJobHelpers.action_name(job))
 
             super
-          rescue Exception => exception # rubocop:disable Lint/RescueException
+          rescue Exception => exception
             job_status = :failed
             transaction_set_error(transaction, exception)
             raise exception

data/lib/appsignal/hooks/delayed_job.rb

@@ -7,7 +7,8 @@ module Appsignal
       register :delayed_job
 
       def dependencies_present?
-        defined?(::Delayed::Plugin)
+        defined?(::Delayed::Plugin) && Appsignal.config &&
+          Appsignal.config[:instrument_delayed_job]
       end
 
       def install

data/lib/appsignal/hooks/excon.rb

@@ -7,7 +7,7 @@ module Appsignal
       register :excon
 
       def dependencies_present?
-        Appsignal.config && defined?(::Excon)
+        Appsignal.config && defined?(::Excon) && Appsignal.config[:instrument_excon]
       end
 
       def install