Move ActionMailer::Caching's content into ActionMailer::Base instead of including it

Remove useless helper in ActionDispatch::Caching and fix indentation

1 files changed, 15 insertions, 1 deletions

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 9b14a96d48..25be5c3a7f 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -6,6 +6,8 @@ require 'active_support/core_ext/module/anonymous'
 
 require 'action_mailer/log_subscriber'
 
+require 'action_dispatch/caching'
+
 module ActionMailer
   # Action Mailer allows you to send email from your application using a mailer model and views.
   #
@@ -420,7 +422,6 @@ module ActionMailer
   class Base < AbstractController::Base
     include DeliveryMethods
     include Previews
-    include Caching
 
     abstract!
 
@@ -431,6 +432,7 @@ module ActionMailer
     include AbstractController::Translation
     include AbstractController::AssetPaths
     include AbstractController::Callbacks
+    include ActionDispatch::Caching
 
     include ActionView::Layouts
 
@@ -828,6 +830,18 @@ module ActionMailer
       message
     end
 
+    # This and #instrument_name is for caching instrument
+    def instrument_payload(key)
+      {
+        mailer: mailer_name,
+        key: key
+      }
+    end
+
+    def instrument_name
+      "action_mailer"
+    end
+
     protected
 
     # Used by #mail to set the content type of the message.