From 0ec963a859ff48ef64228b9e6908f0f84e41d5b5 Mon Sep 17 00:00:00 2001
From: TAGOMORI Satoshi <tagomoris@gmail.com>
Date: Thu, 18 Aug 2016 17:57:35 +0900
Subject: [PATCH] fix to require compat modules missed in previous

---
 lib/fluent/compat/handle_tag_and_time_mixin.rb |  2 ++
 lib/fluent/compat/output.rb                    |  4 +++-
 test/test_output.rb                            | 14 ++++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/lib/fluent/compat/handle_tag_and_time_mixin.rb b/lib/fluent/compat/handle_tag_and_time_mixin.rb
index 517ddca6a9..069e0b9df8 100644
--- a/lib/fluent/compat/handle_tag_and_time_mixin.rb
+++ b/lib/fluent/compat/handle_tag_and_time_mixin.rb
@@ -14,6 +14,8 @@
 #    limitations under the License.
 #
 
+require 'fluent/time' # TimeFormatter
+
 module Fluent
   module Compat
     module HandleTagAndTimeMixin
diff --git a/lib/fluent/compat/output.rb b/lib/fluent/compat/output.rb
index d169a6818c..1dd369183b 100644
--- a/lib/fluent/compat/output.rb
+++ b/lib/fluent/compat/output.rb
@@ -19,8 +19,10 @@
 require 'fluent/plugin/bare_output'
 require 'fluent/compat/call_super_mixin'
 require 'fluent/compat/formatter_utils'
+require 'fluent/compat/handle_tag_and_time_mixin'
 require 'fluent/compat/parser_utils'
 require 'fluent/compat/propagate_default'
+require 'fluent/compat/record_filter_mixin'
 require 'fluent/compat/output_chain'
 require 'fluent/timezone'
 require 'fluent/mixin'
@@ -265,7 +267,7 @@ def configure(conf)
           conf.elements << Fluent::Config::Element.new('buffer', '', buf_params, [])
         end
 
-        @includes_record_filter = self.class.ancestors.include?(Fluent::RecordFilterMixin) # TODO rename Compat::RecordFilterMixin
+        @includes_record_filter = self.class.ancestors.include?(Fluent::Compat::RecordFilterMixin)
 
         methods_of_plugin = self.class.instance_methods(false)
         @overrides_emit = methods_of_plugin.include?(:emit)
diff --git a/test/test_output.rb b/test/test_output.rb
index 3bb9160bfd..057e6655b4 100644
--- a/test/test_output.rb
+++ b/test/test_output.rb
@@ -65,6 +65,20 @@ def test_configure
       # assert_equal Float, d.instance.retry_wait.class
     end
 
+    class FormatterInjectTestOutput < Fluent::Output
+      def initialize
+        super
+        @formatter = nil
+      end
+    end
+    def test_start
+      i = FormatterInjectTestOutput.new
+      i.configure(config_element('ROOT', '', {}, [config_element('inject', '', {'hostname_key' => "host"})]))
+      assert_nothing_raised do
+        i.start
+      end
+    end
+
     def create_mock_driver(conf=CONFIG)
       Fluent::Test::BufferedOutputTestDriver.new(Fluent::BufferedOutput) do
         attr_accessor :submit_flush_threads