Merge pull request #255 from instana/hm/action-mailer-active-support

hmadison · web-flow · commit 91f286059526 · 2021-07-08T05:52:48.000-04:00
Ensure ActionMailer is instrumented after ActiveSupport finishes loading
diff --git a/lib/instana/activators/action_mailer.rb b/lib/instana/activators/action_mailer.rb
@@ -5,7 +5,7 @@ module Instana
   module Activators
     class ActionMailer < Activator
       def can_instrument?
-        defined?(::ActionMailer::Base)
+        defined?(::ActionMailer::Base) && defined?(ActiveSupport::Executor)
       end
 
       def instrument
