fluentd 0.14.13-x86-mingw32 → 0.14.17-x86-mingw32

data/test/plugin/test_filter_parser.rb

@@ -662,4 +662,39 @@ class ParserFilterTest < Test::Unit::TestCase
       end
     end
   end
+
+  class EmitInvalidRecordToErrorTest < self
+    def test_pattern_is_mismached_with_emit_invalid_record_to_error
+      d = create_driver(CONFIG_UNMATCHED_PATTERN_LOG + "emit_invalid_record_to_error false")
+      flexmock(d.instance.router).should_receive(:emit_error_event).never
+      assert_nothing_raised {
+        d.run do
+          d.feed(@tag, Fluent::EventTime.now.to_i, {'message' => INVALID_MESSAGE})
+        end
+      }
+      assert_equal 0, d.filtered.length
+    end
+
+    def test_parser_error_with_emit_invalid_record_to_error
+      d = create_driver(CONFIG_INVALID_TIME_VALUE + "emit_invalid_record_to_error false")
+      flexmock(d.instance.router).should_receive(:emit_error_event).never
+      assert_nothing_raised {
+        d.run do
+          d.feed(@tag, Fluent::EventTime.now.to_i, {'data' => '{"time":[], "f1":"v1"}'})
+        end
+      }
+      assert_equal 0, d.filtered.length
+    end
+
+    def test_key_not_exist_with_emit_invalid_record_to_error
+      d = create_driver(CONFIG_NOT_IGNORE + "emit_invalid_record_to_error false")
+      flexmock(d.instance.router).should_receive(:emit_error_event).never
+      assert_nothing_raised {
+        d.run do
+          d.feed(@tag, Fluent::EventTime.now.to_i, {'foo' => 'bar'})
+        end
+      }
+      assert_equal 0, d.filtered.length
+    end
+  end
 end

data/test/plugin/test_in_http.rb

@@ -215,14 +215,14 @@ class HttpInputTest < Test::Unit::TestCase
   def test_multi_json_with_add_remote_addr_given_x_forwarded_for
     d = create_driver(CONFIG + "add_remote_addr true")
 
+    tag = "tag1"
     time = event_time("2011-01-02 13:14:15 UTC")
     time_i = time.to_i
     records = [{"a"=>1},{"a"=>2}]
     events = [
-      ["tag1", time, {"REMOTE_ADDR"=>"129.78.138.66", "a"=>1}],
-      ["tag1", time, {"REMOTE_ADDR"=>"129.78.138.66", "a"=>2}],
+      [tag, time, {"REMOTE_ADDR"=>"129.78.138.66", "a"=>1}],
+      [tag, time, {"REMOTE_ADDR"=>"129.78.138.66", "a"=>2}],
     ]
-    tag = "tag1"
     res_codes = []
 
     d.run(expect_records: 2, timeout: 5) do
@@ -235,6 +235,37 @@ class HttpInputTest < Test::Unit::TestCase
     assert_equal_event_time time, d.events[1][1]
   end
 
+  def test_add_remote_addr_given_multi_x_forwarded_for
+    d = create_driver(CONFIG + "add_remote_addr true")
+
+    tag = "tag1"
+    time = event_time("2011-01-02 13:14:15 UTC")
+    time_i = time.to_i
+    record = {"a" => 1}
+    event = ["tag1", time, {"REMOTE_ADDR" => "129.78.138.66", "a" => 1}]
+    res_code = nil
+
+    d.run(expect_records: 1, timeout: 5) do
+      res = post("/#{tag}", {"json" => record.to_json, "time" => time_i.to_s}) { |http, req|
+        # net/http can't send multiple headers so overwrite it.
+        def req.each_capitalized
+          block_given? or return enum_for(__method__) { @header.size }
+          @header.each do |k, vs|
+            vs.each { |v|
+              yield capitalize(k), v
+            }
+          end
+        end
+        req.add_field("X-Forwarded-For", "129.78.138.66, 127.0.0.1")
+        req.add_field("X-Forwarded-For", "8.8.8.8")
+      }
+      res_code = res.code
+    end
+    assert_equal "200", res_code
+    assert_equal event, d.events.first
+    assert_equal_event_time time, d.events.first[1]
+  end
+
   def test_multi_json_with_add_http_headers
     d = create_driver(CONFIG + "add_http_headers true")
     time = event_time("2011-01-02 13:14:15 UTC")
@@ -313,6 +344,28 @@ class HttpInputTest < Test::Unit::TestCase
     assert_equal_event_time time, d.events[1][1]
   end
 
+  def test_application_msgpack
+    d = create_driver
+    time = event_time("2011-01-02 13:14:15 UTC")
+    time_i = time.to_i
+    events = [
+      ["tag1", time, {"a"=>1}],
+      ["tag2", time, {"a"=>2}],
+    ]
+    res_codes = []
+
+    d.run(expect_records: 2) do
+      events.each do |tag, t, record|
+        res = post("/#{tag}?time=#{time_i.to_s}", record.to_msgpack, {"Content-Type"=>"application/msgpack"})
+        res_codes << res.code
+      end
+    end
+    assert_equal ["200", "200"], res_codes
+    assert_equal events, d.events
+    assert_equal_event_time time, d.events[0][1]
+    assert_equal_event_time time, d.events[1][1]
+  end
+  
   def test_msgpack
     d = create_driver
     time = event_time("2011-01-02 13:14:15 UTC")
@@ -543,9 +596,10 @@ class HttpInputTest < Test::Unit::TestCase
     assert_equal $test_in_http_connection_object_ids[0], $test_in_http_connection_object_ids[1]
   end
 
-  def post(path, params, header = {})
+  def post(path, params, header = {}, &block)
     http = Net::HTTP.new("127.0.0.1", PORT)
     req = Net::HTTP::Post.new(path, header)
+    block.call(http, req) if block
     if params.is_a?(String)
       unless header.has_key?('Content-Type')
         header['Content-Type'] = 'application/octet-stream'

data/test/plugin/test_in_monitor_agent.rb

@@ -204,10 +204,9 @@ EOC
     unless header.has_key?('Content-Type')
       header['Content-Type'] = 'application/octet-stream'
     end
-    res = Net::HTTP.start(url.host, url.port) {|http|
+    Net::HTTP.start(url.host, url.port) {|http|
       http.request(req)
     }
-    res.body
   end
 
   sub_test_case "servlets" do
@@ -268,7 +267,7 @@ plugin_id:test_in\tplugin_category:input\ttype:test_in\toutput_plugin:false\tret
       expected_test_filter_response = "\
 plugin_id:test_filter\tplugin_category:filter\ttype:test_filter\toutput_plugin:false\tretry_count:"
 
-      response = get("http://127.0.0.1:#{@port}/api/plugins")
+      response = get("http://127.0.0.1:#{@port}/api/plugins").body
       test_in = response.split("\n")[0]
       test_filter = response.split("\n")[3]
       assert_equal(expected_test_in_response, test_in)
@@ -306,7 +305,7 @@ plugin_id:test_filter\tplugin_category:filter\ttype:test_filter\toutput_plugin:f
       }
       expected_null_response.merge!("config" => {"@id" => "null", "@type" => "null"}) if with_config
       expected_null_response.merge!("retry" => {}) if with_retry
-      response = JSON.parse(get("http://127.0.0.1:#{@port}/api/plugins.json"))
+      response = JSON.parse(get("http://127.0.0.1:#{@port}/api/plugins.json").body)
       test_in_response = response["plugins"][0]
       null_response = response["plugins"][5]
       assert_equal(expected_test_in_response, test_in_response)
@@ -343,7 +342,7 @@ plugin_id:test_filter\tplugin_category:filter\ttype:test_filter\toutput_plugin:f
       }
       expected_null_response.merge!("config" => {"@id" => "null", "@type" => "null"}) if with_config
       expected_null_response.merge!("retry" => {}) if with_retry
-      response = JSON.parse(get("http://127.0.0.1:#{@port}/api/plugins.json#{query_param}"))
+      response = JSON.parse(get("http://127.0.0.1:#{@port}/api/plugins.json#{query_param}").body)
       test_in_response = response["plugins"][0]
       null_response = response["plugins"][5]
       assert_equal(expected_test_in_response, test_in_response)
@@ -376,7 +375,7 @@ plugin_id:test_filter\tplugin_category:filter\ttype:test_filter\toutput_plugin:f
         "type"            => "null",
         "instance_variables" => {"id" => "null", "num_errors" => 0}
       }
-      response = JSON.parse(get("http://127.0.0.1:#{@port}/api/plugins.json?with_config=no&with_retry=no&with_ivars=id,num_errors"))
+      response = JSON.parse(get("http://127.0.0.1:#{@port}/api/plugins.json?with_config=no&with_retry=no&with_ivars=id,num_errors").body)
       test_in_response = response["plugins"][0]
       null_response = response["plugins"][5]
       assert_equal(expected_test_in_response, test_in_response)
@@ -394,7 +393,7 @@ plugin_id:test_filter\tplugin_category:filter\ttype:test_filter\toutput_plugin:f
       expected_response_regex = /pid:\d+\tppid:\d+\tconfig_path:\/etc\/fluent\/fluent.conf\tpid_file:\tplugin_dirs:\[\"\/etc\/fluent\/plugin\"\]\tlog_path:/
 
       assert_match(expected_response_regex,
-                   get("http://127.0.0.1:#{@port}/api/config"))
+                   get("http://127.0.0.1:#{@port}/api/config").body)
     end
 
     test "/api/config.json" do
@@ -405,7 +404,7 @@ plugin_id:test_filter\tplugin_category:filter\ttype:test_filter\toutput_plugin:f
   tag monitor
 ")
       d.instance.start
-      res = JSON.parse(get("http://127.0.0.1:#{@port}/api/config.json"))
+      res = JSON.parse(get("http://127.0.0.1:#{@port}/api/config.json").body)
       assert_equal("/etc/fluent/fluent.conf", res["config_path"])
       assert_nil(res["pid_file"])
       assert_equal(["/etc/fluent/plugin"], res["plugin_dirs"])
@@ -474,7 +473,7 @@ plugin_id:test_filter\tplugin_category:filter\ttype:test_filter\toutput_plugin:f
         output.submit_flush_once
         sleep 0.1 until output.buffer.queued?
       end
-      response = JSON.parse(get("http://127.0.0.1:#{@port}/api/plugins.json"))
+      response = JSON.parse(get("http://127.0.0.1:#{@port}/api/plugins.json").body)
       test_out_fail_write_response = response["plugins"][1]
       # remove dynamic keys
       response_retry_count = test_out_fail_write_response.delete("retry_count")
@@ -486,4 +485,86 @@ plugin_id:test_filter\tplugin_category:filter\ttype:test_filter\toutput_plugin:f
       assert{ response_retry_count == response_retry["steps"] + 1 }
     end
   end
+
+  sub_test_case "check the port number of http server" do
+    test "on single worker environment" do
+      port = unused_port
+      d = create_driver("
+  @type monitor_agent
+  bind '127.0.0.1'
+  port #{port}
+")
+      d.instance.start
+      assert_equal("200", get("http://127.0.0.1:#{port}/api/plugins").code)
+    end
+
+    test "worker_id = 2 on multi worker environment" do
+      port = unused_port
+      Fluent::SystemConfig.overwrite_system_config('workers' => 4) do
+        d = Fluent::Test::Driver::Input.new(Fluent::Plugin::MonitorAgentInput)
+        d.instance.instance_eval{ @_fluentd_worker_id = 2 }
+        d.configure("
+  @type monitor_agent
+  bind '127.0.0.1'
+  port #{port - 2}
+")
+        d.instance.start
+      end
+      assert_equal("200", get("http://127.0.0.1:#{port}/api/plugins").code)
+    end
+  end
+
+  sub_test_case "check NoMethodError does not happen" do
+    class FluentTestBufferVariableOutput < ::Fluent::Plugin::Output
+      ::Fluent::Plugin.register_output('test_out_buffer_variable', self)
+      def configure(conf)
+        super
+        @buffer = []
+      end
+
+      def write(chunk)
+      end
+    end
+    class FluentTestBufferVariableFilter < ::Fluent::Plugin::Filter
+      ::Fluent::Plugin.register_filter("test_filter_buffer_variable", self)
+      def initialize
+        super
+        @buffer = {}
+      end
+      def filter(tag, time, record)
+        record
+      end
+    end
+
+    setup do
+      conf = <<-EOC
+<match **>
+  @type test_out_buffer_variable
+  @id test_out_buffer_variable
+</match>
+<filter **>
+  @type test_filter_buffer_variable
+  @id test_filter_buffer_variable
+</filter>
+EOC
+      @ra = Fluent::RootAgent.new(log: $log)
+      stub(Fluent::Engine).root_agent { @ra }
+      @ra = configure_ra(@ra, conf)
+    end
+
+    test "plugins have a variable named buffer does not throws NoMethodError" do
+      port = unused_port
+      d = create_driver("
+  @type monitor_agent
+  bind '127.0.0.1'
+  port #{port}
+  include_config no
+")
+      d.instance.start
+
+      assert_equal("200", get("http://127.0.0.1:#{port}/api/plugins.json").code)
+      assert{ d.logs.none?{|log| log.include?("NoMethodError") } }
+      assert_equal(false, d.instance.instance_variable_get(:@first_warn))
+    end
+  end
 end

data/test/plugin/test_in_tail.rb

@@ -72,6 +72,7 @@ class TailInputTest < Test::Unit::TestCase
       assert_equal 2, d.instance.rotate_wait
       assert_equal "#{TMP_DIR}/tail.pos", d.instance.pos_file
       assert_equal 1000, d.instance.read_lines_limit
+      assert_equal false, d.instance.ignore_repeated_permission_error
     end
 
     data("empty" => config_element,
@@ -1198,4 +1199,19 @@ class TailInputTest < Test::Unit::TestCase
       assert_equal expected_files, plugin.expand_paths.sort
     end
   end
+
+  def test_skip_refresh_on_startup
+    FileUtils.touch("#{TMP_DIR}/tail.txt")
+    config = config_element('', '', {
+                              'format' => 'none',
+                              'refresh_interval' => 1,
+                              'skip_refresh_on_startup' => true
+                            })
+    d = create_driver(config)
+    d.run(shutdown: false) {}
+    assert_equal 0, d.instance.instance_variable_get(:@tails).keys.size
+    # detect a file at first execution of in_tail_refresh_watchers timer
+    waiting(5) { sleep 0.1 until d.instance.instance_variable_get(:@tails).keys.size == 1 }
+    d.instance_shutdown
+  end
 end

data/test/plugin/test_in_udp.rb

@@ -54,7 +54,7 @@ class UdpInputTest < Test::Unit::TestCase
     d = create_driver(conf)
     assert_equal PORT, d.instance.port
     assert_equal bind, d.instance.bind
-    assert_equal 4096, d.instance.body_size_limit
+    assert_equal 4096, d.instance.message_length_limit
   end
 
   data(
@@ -86,6 +86,16 @@ class UdpInputTest < Test::Unit::TestCase
     end
   end
 
+  data(
+    'message_length_limit' => 'message_length_limit 2048',
+    'body_size_limit' => 'body_size_limit 2048'
+  )
+  test 'message_length_limit/body_size_limit compatibility' do |param|
+
+    d = create_driver(CONFIG + param)
+    assert_equal 2048, d.instance.message_length_limit
+  end
+
   data(
     'none' => {
       'format' => 'none',

data/test/plugin/test_out_file.rb

@@ -20,6 +20,9 @@ class FileOutputTest < Test::Unit::TestCase
     path #{TMP_DIR}/out_file_test
     compress gz
     utc
+    <buffer>
+      timekey_use_utc true
+    </buffer>
   ]
 
   def create_driver(conf = CONFIG, opts = {})
@@ -405,6 +408,9 @@ class FileOutputTest < Test::Unit::TestCase
       path #{TMP_DIR_WITH_SYSTEM}/out_file_test
       compress gz
       utc
+      <buffer>
+        timekey_use_utc true
+      </buffer>
       <system>
         file_permission #{OVERRIDE_FILE_PERMISSION}
         dir_permission #{OVERRIDE_DIR_PERMISSION}
@@ -527,6 +533,9 @@ class FileOutputTest < Test::Unit::TestCase
         compress gz
         utc
         append true
+        <buffer>
+          timekey_use_utc true
+        </buffer>
       ]
       d.run(default_tag: 'test'){
         d.feed(time, {"a"=>1})

data/test/plugin/test_out_forward.rb

@@ -430,6 +430,51 @@ EOL
     assert_empty d.instance.exceptions
   end
 
+  data('ack true' => true,
+       'ack false' => false)
+  test 'TLS transport and ack parameter combination' do |ack|
+    omit "TLS and 'ack false' always fails on AppVeyor. Need to debug" if Fluent.windows? && !ack
+
+    input_conf = TARGET_CONFIG + %[
+                   <transport tls>
+                     insecure true
+                   </transport>
+                 ]
+    target_input_driver = create_target_input_driver(conf: input_conf)
+
+    output_conf = %[
+      send_timeout 5
+      require_ack_response #{ack}
+      transport tls
+      tls_insecure_mode true
+      <server>
+        host #{TARGET_HOST}
+        port #{TARGET_PORT}
+      </server>
+      <buffer>
+        #flush_mode immediate
+        flush_interval 0s
+        flush_at_shutdown false # suppress errors in d.instance_shutdown
+      </buffer>
+    ]
+    @d = d = create_driver(output_conf)
+
+    time = event_time("2011-01-02 13:14:15 UTC")
+    records = [{"a" => 1}, {"a" => 2}]
+    target_input_driver.run(expect_records: 2, timeout: 3) do
+      d.run(default_tag: 'test', wait_flush_completion: false, shutdown: false) do
+        records.each do |record|
+          d.feed(time, record)
+        end
+      end
+    end
+
+    events = target_input_driver.events
+    assert{ events != [] }
+    assert_equal(['test', time, records[0]], events[0])
+    assert_equal(['test', time, records[1]], events[1])
+  end
+
   test 'a destination node not supporting responses by just ignoring' do
     target_input_driver = create_target_input_driver(response_stub: ->(_option) { nil }, disconnect: false)
 

data/test/plugin/test_output.rb

@@ -315,7 +315,7 @@ class OutputTest < Test::Unit::TestCase
         validators = @i.placeholder_validators(:path, "/my/path/file.%Y-%m-%d.log")
         assert_equal 1, validators.size
         assert_equal 1, validators.select(&:time?).size
-        assert_raise Fluent::ConfigError.new("Parameter 'path' has timestamp placeholders, but chunk key 'time' is not configured") do
+        assert_raise Fluent::ConfigError.new("Parameter 'path: /my/path/file.%Y-%m-%d.log' has timestamp placeholders, but chunk key 'time' is not configured") do
           validators.first.validate!
         end
       end
@@ -325,7 +325,7 @@ class OutputTest < Test::Unit::TestCase
         validators = @i.placeholder_validators(:path, "/my/path/to/file.log")
         assert_equal 1, validators.size
         assert_equal 1, validators.select(&:time?).size
-        assert_raise Fluent::ConfigError.new("Parameter 'path' doesn't have timestamp placeholders for timekey 30") do
+        assert_raise Fluent::ConfigError.new("Parameter 'path: /my/path/to/file.log' doesn't have timestamp placeholders for timekey 30") do
           validators.first.validate!
         end
       end
@@ -335,7 +335,7 @@ class OutputTest < Test::Unit::TestCase
         validators = @i.placeholder_validators(:path, "/my/path/${tag}/file.log")
         assert_equal 1, validators.size
         assert_equal 1, validators.select(&:tag?).size
-        assert_raise Fluent::ConfigError.new("Parameter 'path' has tag placeholders, but chunk key 'tag' is not configured") do
+        assert_raise Fluent::ConfigError.new("Parameter 'path: /my/path/${tag}/file.log' has tag placeholders, but chunk key 'tag' is not configured") do
           validators.first.validate!
         end
       end
@@ -345,7 +345,7 @@ class OutputTest < Test::Unit::TestCase
         validators = @i.placeholder_validators(:path, "/my/path/file.log")
         assert_equal 1, validators.size
         assert_equal 1, validators.select(&:tag?).size
-        assert_raise Fluent::ConfigError.new("Parameter 'path' doesn't have tag placeholder") do
+        assert_raise Fluent::ConfigError.new("Parameter 'path: /my/path/file.log' doesn't have tag placeholder") do
           validators.first.validate!
         end
       end
@@ -355,7 +355,7 @@ class OutputTest < Test::Unit::TestCase
         validators = @i.placeholder_validators(:path, "/my/path/${username}/file.${group}.log")
         assert_equal 1, validators.size
         assert_equal 1, validators.select(&:keys?).size
-        assert_raise Fluent::ConfigError.new("Parameter 'path' has placeholders, but chunk keys doesn't have keys group,username") do
+        assert_raise Fluent::ConfigError.new("Parameter 'path: /my/path/${username}/file.${group}.log' has placeholders, but chunk keys doesn't have keys group,username") do
           validators.first.validate!
         end
       end
@@ -365,7 +365,7 @@ class OutputTest < Test::Unit::TestCase
         validators = @i.placeholder_validators(:path, "/my/path/file.log")
         assert_equal 1, validators.size
         assert_equal 1, validators.select(&:keys?).size
-        assert_raise Fluent::ConfigError.new("Parameter 'path' doesn't have enough placeholders for keys group,username") do
+        assert_raise Fluent::ConfigError.new("Parameter 'path: /my/path/file.log' doesn't have enough placeholders for keys group,username") do
           validators.first.validate!
         end
       end
@@ -374,14 +374,14 @@ class OutputTest < Test::Unit::TestCase
     sub_test_case '#placeholder_validate!' do
       test 'raises configuration error for a templace when timestamp placeholders exist but time key is missing' do
         @i.configure(config_element('ROOT', '', {}, [config_element('buffer', '')]))
-        assert_raise Fluent::ConfigError.new("Parameter 'path' has timestamp placeholders, but chunk key 'time' is not configured") do
+        assert_raise Fluent::ConfigError.new("Parameter 'path: /path/without/timestamp/file.%Y%m%d-%H%M.log' has timestamp placeholders, but chunk key 'time' is not configured") do
           @i.placeholder_validate!(:path, "/path/without/timestamp/file.%Y%m%d-%H%M.log")
         end
       end
 
       test 'raises configuration error for a template without timestamp placeholders when timekey is configured' do
         @i.configure(config_element('ROOT', '', {}, [config_element('buffer', 'time', {"timekey" => 180})]))
-        assert_raise Fluent::ConfigError.new("Parameter 'path' doesn't have timestamp placeholders for timekey 180") do
+        assert_raise Fluent::ConfigError.new("Parameter 'path: /my/path/file.log' doesn't have timestamp placeholders for timekey 180") do
           @i.placeholder_validate!(:path, "/my/path/file.log")
         end
         assert_nothing_raised do
@@ -391,7 +391,7 @@ class OutputTest < Test::Unit::TestCase
 
       test 'raises configuration error for a template with timestamp placeholders when plugin is configured more fine timekey' do
         @i.configure(config_element('ROOT', '', {}, [config_element('buffer', 'time', {"timekey" => 180})]))
-        assert_raise Fluent::ConfigError.new("Parameter 'path' doesn't have timestamp placeholder for hour('%H') for timekey 180") do
+        assert_raise Fluent::ConfigError.new("Parameter 'path: /my/path/file.%Y%m%d_%H.log' doesn't have timestamp placeholder for hour('%H') for timekey 180") do
           @i.placeholder_validate!(:path, "/my/path/file.%Y%m%d_%H.log")
         end
         assert_nothing_raised do
@@ -401,14 +401,14 @@ class OutputTest < Test::Unit::TestCase
 
       test 'raises configuration error for a template when tag placeholders exist but tag key is missing' do
         @i.configure(config_element('ROOT', '', {}, [config_element('buffer', '')]))
-        assert_raise Fluent::ConfigError.new("Parameter 'path' has tag placeholders, but chunk key 'tag' is not configured") do
+        assert_raise Fluent::ConfigError.new("Parameter 'path: /my/path/${tag}/file.${tag[2]}.log' has tag placeholders, but chunk key 'tag' is not configured") do
           @i.placeholder_validate!(:path, "/my/path/${tag}/file.${tag[2]}.log")
         end
       end
 
       test 'raises configuration error for a template without tag placeholders when tagkey is configured' do
         @i.configure(config_element('ROOT', '', {}, [config_element('buffer', 'tag')]))
-        assert_raise Fluent::ConfigError.new("Parameter 'path' doesn't have tag placeholder") do
+        assert_raise Fluent::ConfigError.new("Parameter 'path: /my/path/file.log' doesn't have tag placeholder") do
           @i.placeholder_validate!(:path, "/my/path/file.log")
         end
         assert_nothing_raised do
@@ -418,14 +418,14 @@ class OutputTest < Test::Unit::TestCase
 
       test 'raises configuration error for a template when variable key placeholders exist but chunk keys are missing' do
         @i.configure(config_element('ROOT', '', {}, [config_element('buffer', '')]))
-        assert_raise Fluent::ConfigError.new("Parameter 'path' has placeholders, but chunk keys doesn't have keys service,username") do
+        assert_raise Fluent::ConfigError.new("Parameter 'path: /my/path/${service}/file.${username}.log' has placeholders, but chunk keys doesn't have keys service,username") do
           @i.placeholder_validate!(:path, "/my/path/${service}/file.${username}.log")
         end
       end
 
       test 'raises configuration error for a template without variable key placeholders when chunk keys are configured' do
         @i.configure(config_element('ROOT', '', {}, [config_element('buffer', 'username,service')]))
-        assert_raise Fluent::ConfigError.new("Parameter 'path' doesn't have enough placeholders for keys service,username") do
+        assert_raise Fluent::ConfigError.new("Parameter 'path: /my/path/file.log' doesn't have enough placeholders for keys service,username") do
           @i.placeholder_validate!(:path, "/my/path/file.log")
         end
         assert_nothing_raised do
@@ -435,10 +435,10 @@ class OutputTest < Test::Unit::TestCase
 
       test 'raise configuration error for a template and configuration with keys mismatch' do
         @i.configure(config_element('ROOT', '', {}, [config_element('buffer', 'username,service')]))
-        assert_raise Fluent::ConfigError.new("Parameter 'path' doesn't have enough placeholders for keys service") do
+        assert_raise Fluent::ConfigError.new("Parameter 'path: /my/path/file.${username}.log' doesn't have enough placeholders for keys service") do
           @i.placeholder_validate!(:path, "/my/path/file.${username}.log")
         end
-        assert_raise Fluent::ConfigError.new("Parameter 'path' doesn't have enough placeholders for keys username") do
+        assert_raise Fluent::ConfigError.new("Parameter 'path: /my/path/${service}/file.log' doesn't have enough placeholders for keys username") do
           @i.placeholder_validate!(:path, "/my/path/${service}/file.log")
         end
         assert_nothing_raised do