Only extend ActiveJob when it's defined

st0012 · st0012 · commit 3ae136595f3d · 2021-01-20T12:53:15.000+08:00
It's somewhat common for Rails users to exclude ActiveJob by manually
requiring every other components when they don't need it. So we should
detect if the ActiveJob constant is defined before extending it.
diff --git a/sentry-rails/lib/sentry/rails/railtie.rb b/sentry-rails/lib/sentry/rails/railtie.rb
@@ -4,7 +4,6 @@
 require "sentry/rails/backtrace_cleaner"
 require "sentry/rails/controller_methods"
 require "sentry/rails/controller_transaction"
-require "sentry/rails/active_job"
 require "sentry/rails/overrides/streaming_reporter"
 
 module Sentry
@@ -22,7 +21,7 @@ class Railtie < ::Rails::Railtie
 
       configure_sentry_logger
       extend_controller_methods
-      extend_active_job
+      extend_active_job if defined?(ActiveJob)
       override_streaming_reporter
       setup_backtrace_cleanup_callback
       inject_breadcrumbs_logger
@@ -34,6 +33,7 @@ def configure_sentry_logger
     end
 
     def extend_active_job
+      require "sentry/rails/active_job"
       ActiveJob::Base.send(:prepend, Sentry::Rails::ActiveJobExtensions)
     end
 
diff --git a/sentry-rails/spec/sentry/rails/activejob_spec.rb b/sentry-rails/spec/sentry/rails/activejob_spec.rb
@@ -1,4 +1,5 @@
 require "spec_helper"
+require "active_job/railtie"
 
 class FailedJob < ActiveJob::Base
   self.logger = nil
@@ -38,7 +39,7 @@ def rescue_callback(error); end
 
 RSpec.describe "ActiveJob integration" do
   before(:all) do
-    perform_basic_setup
+    make_basic_app
   end
 
   let(:event) do
diff --git a/sentry-rails/spec/support/test_rails_app/app.rb b/sentry-rails/spec/support/test_rails_app/app.rb
@@ -3,7 +3,6 @@
 require "action_view/railtie"
 require "action_controller/railtie"
 # require "action_mailer/railtie"
-require "active_job/railtie"
 # require "action_cable/engine"
 # require "sprockets/railtie"
 # require "rails/test_unit/railtie"
