fluentd 1.7.4-x64-mingw32 → 1.8.0-x64-mingw32

data/test/counter/test_client.rb

@@ -128,7 +128,8 @@ class CounterClientTest < ::Test::Unit::TestCase
     test 'raise an error when @scope is nil' do
       @client.instance_variable_set(:@scope, nil)
       assert_raise 'Call `establish` method to get a `scope` before calling this method' do
-        @client.init(name: 'key1', reset_interval: 10).get
+        params = { name: 'key1', reset_interval: 10 }
+        @client.init(params).get
       end
     end
 
@@ -151,7 +152,8 @@ class CounterClientTest < ::Test::Unit::TestCase
       ]
     )
     test 'return an error object' do |(param, expected_error)|
-      @client.init(:name => 'key1', :reset_interval => 10).get
+      params = { name: 'key1', reset_interval: 10 }
+      @client.init(params).get
       response = @client.init(param).get
       errors = response.errors.first
 
@@ -164,7 +166,8 @@ class CounterClientTest < ::Test::Unit::TestCase
     end
 
     test 'return an existing value when passed key already exists and ignore option is true' do
-      res1 = @client.init(name: 'key1', reset_interval: 10).get
+      params = { name: 'key1', reset_interval: 10 }
+      res1 = @client.init(params).get
       res2 = nil
       assert_nothing_raised do
         res2 = @client.init({ name: 'key1', reset_interval: 10 }, options: { ignore: true }).get
@@ -312,7 +315,8 @@ class CounterClientTest < ::Test::Unit::TestCase
     test 'raise an error when @scope is nil' do
       @client.instance_variable_set(:@scope, nil)
       assert_raise 'Call `establish` method to get a `scope` before calling this method' do
-        @client.inc(name: 'name', value: 1).get
+        params = { name: 'name', value: 1 }
+        @client.inc(params).get
       end
     end
 

data/test/plugin/data/sd_file/config

@@ -0,0 +1,11 @@
+- 'host': 127.0.0.1
+  'port': 24224
+  'weight': 1
+  'name': test1
+  'standby': false
+  'username': user1
+  'password': pass1
+  'shared_key': key1
+- 'host': 127.0.0.1
+  'port': 24225
+  'weight': 1

data/test/plugin/data/sd_file/config.json

@@ -0,0 +1,17 @@
+[
+    {
+        "host": "127.0.0.1",
+        "port": 24224,
+        "weight": 1,
+        "name": "test1",
+        "standby": false,
+        "username": "user1",
+        "password": "pass1",
+        "shared_key": "key1"
+    },
+    {
+        "host": "127.0.0.1",
+        "port": 24225,
+        "weight": 1
+    }
+]

data/test/plugin/data/sd_file/config.yaml

@@ -0,0 +1,11 @@
+- 'host': 127.0.0.1
+  'port': 24224
+  'weight': 1
+  'name': test1
+  'standby': false
+  'username': user1
+  'password': pass1
+  'shared_key': key1
+- 'host': 127.0.0.1
+  'port': 24225
+  'weight': 1

data/test/plugin/data/sd_file/config.yml

@@ -0,0 +1,11 @@
+- 'host': 127.0.0.1
+  'port': 24224
+  'weight': 1
+  'name': test1
+  'standby': false
+  'username': user1
+  'password': pass1
+  'shared_key': key1
+- 'host': 127.0.0.1
+  'port': 24225
+  'weight': 1

data/test/plugin/data/sd_file/invalid_config.yml

@@ -0,0 +1,7 @@
+- 'host': 127.0.0.1
+  'weight': 1
+  'name': test1
+  'standby': false
+  'username': user1
+  'password': pass1
+  'shared_key': key1

data/test/plugin/out_forward/test_handshake_protocol.rb

@@ -16,7 +16,7 @@ class HandshakeProtocolTest < Test::Unit::TestCase
       handshake.invoke(sock, ri, ['HELO', {}])
 
       assert_equal(ri.state, :pingpong)
-      Fluent::Engine.msgpack_factory.unpacker.feed_each(sock.string) do |ping|
+      Fluent::MessagePackFactory.msgpack_unpacker.feed_each(sock.string) do |ping|
         assert_equal(ping.size, 6)
         assert_equal(ping[0], 'PING')
         assert_equal(ping[1], hostname)
@@ -38,7 +38,7 @@ class HandshakeProtocolTest < Test::Unit::TestCase
       handshake.invoke(sock, ri, ['HELO', { 'auth' => 'auth' }])
 
       assert_equal(ri.state, :pingpong)
-      Fluent::Engine.msgpack_factory.unpacker.feed_each(sock.string) do |ping|
+      Fluent::MessagePackFactory.msgpack_unpacker.feed_each(sock.string) do |ping|
         assert_equal(ping.size, 6)
         assert_equal(ping[0], 'PING')
         assert_equal(ping[1], hostname)

data/test/plugin/out_forward/test_load_balancer.rb

@@ -5,7 +5,7 @@ require 'fluent/plugin/out_forward/load_balancer'
 
 class LoadBalancerTest < Test::Unit::TestCase
   sub_test_case 'select_healthy_node' do
-    test 'select healty node' do
+    test 'select healthy node' do
       lb = Fluent::Plugin::ForwardOutput::LoadBalancer.new($log)
       n1 = flexmock('node', :'standby?' => false, :'available?' => false, weight: 1)
       n2 = flexmock('node', :'standby?' => false, :'available?' => true, weight: 1)

data/test/plugin/out_forward/test_socket_cache.rb

@@ -23,7 +23,7 @@ class SocketCacheTest < Test::Unit::TestCase
 
     test 'when given key exists but used by other' do
       c = Fluent::Plugin::ForwardOutput::SocketCache.new(10, $log)
-      assert_equal(@sock, c.checkout_or('key') { @sock })
+      assert_equal('sock', c.checkout_or('key') { 'sock' })
 
       new_sock = 'new sock'
       sock = mock!.open { new_sock }.subject
@@ -32,7 +32,7 @@ class SocketCacheTest < Test::Unit::TestCase
 
     test "when given key's value was expired" do
       c = Fluent::Plugin::ForwardOutput::SocketCache.new(0, $log)
-      assert_equal(@sock, c.checkout_or('key') { @sock })
+      assert_equal('sock', c.checkout_or('key') { 'sock' })
 
       new_sock = 'new sock'
       sock = mock!.open { new_sock }.subject

data/test/plugin/test_buf_file.rb

@@ -327,6 +327,46 @@ class FileBufferTest < Test::Unit::TestCase
       plugin.stop; plugin.before_shutdown; plugin.shutdown; plugin.after_shutdown; plugin.close; plugin.terminate
       FileUtils.rm_r bufdir
     end
+
+    test '#generate_chunk generates blank file chunk with specified permission with system_config' do
+      omit "NTFS doesn't support UNIX like permissions" if Fluent.windows?
+
+      begin
+        plugin = Fluent::Plugin::FileBuffer.new
+        plugin.owner = @d
+        rand_num = rand(0..100)
+        bufpath = File.join(File.expand_path("../../tmp/buffer_file_#{rand_num}", __FILE__), 'testbuf.*.log')
+        bufdir = File.dirname(bufpath)
+
+        FileUtils.rm_r bufdir if File.exist?(bufdir)
+        assert !File.exist?(bufdir)
+
+        plugin.configure(config_element('buffer', '', { 'path' => bufpath }))
+
+        assert !File.exist?(bufdir)
+        plugin.start
+
+        m = metadata()
+        c = nil
+        Fluent::SystemConfig.overwrite_system_config("file_permission" => "700") do
+           c = plugin.generate_chunk(m)
+        end
+
+        assert c.is_a? Fluent::Plugin::Buffer::FileChunk
+        assert_equal m, c.metadata
+        assert c.empty?
+        assert_equal :unstaged, c.state
+        assert_equal 0700, c.permission
+        assert_equal bufpath.gsub('.*.', ".b#{Fluent::UniqueId.hex(c.unique_id)}."), c.path
+        assert{ File.stat(c.path).mode.to_s(8).end_with?('700') }
+
+        c.purge
+
+        plugin.stop; plugin.before_shutdown; plugin.shutdown; plugin.after_shutdown; plugin.close; plugin.terminate
+      ensure
+        FileUtils.rm_r bufdir
+      end
+    end
   end
 
   sub_test_case 'configured with system root directory and plugin @id' do

data/test/plugin/test_buf_file_single.rb

@@ -293,6 +293,38 @@ class FileSingleBufferTest < Test::Unit::TestCase
 
       c.purge
     end
+
+    test '#generate_chunk generates blank file chunk with specified permission with system_config' do
+      omit "NTFS doesn't support UNIX like permissions" if Fluent.windows?
+
+      @d = create_driver(%[
+        <buffer tag>
+          @type file_single
+          path #{PATH}
+        </buffer>
+      ])
+      @p = @d.instance.buffer
+
+      FileUtils.rm_r @bufdir if File.exist?(@bufdir)
+      assert !File.exist?(@bufdir)
+
+      @p.start
+
+      m = metadata()
+      c = nil
+      Fluent::SystemConfig.overwrite_system_config("file_permission" => "700") do
+        c = @p.generate_chunk(m)
+      end
+      assert c.is_a? Fluent::Plugin::Buffer::FileSingleChunk
+      assert_equal m, c.metadata
+      assert c.empty?
+      assert_equal :unstaged, c.state
+      assert_equal 0700, c.permission
+      assert_equal File.join(@bufdir, "fsb.testing.b#{Fluent::UniqueId.hex(c.unique_id)}.buf"), c.path
+      assert{ File.stat(c.path).mode.to_s(8).end_with?('700') }
+
+      c.purge
+    end
   end
 
   sub_test_case 'configured with system root directory and plugin @id' do

data/test/plugin/test_buffer_file_chunk.rb

@@ -416,17 +416,6 @@ class BufferFileChunkTest < Test::Unit::TestCase
       assert_equal d4.to_json + "\n", lines[3]
     end
 
-    test 'can refer system config for file permission' do
-      omit "NTFS doesn't support UNIX like permissions" if Fluent.windows?
-
-      chunk_path = File.join(@chunkdir, 'testperm.*.log')
-      Fluent::SystemConfig.overwrite_system_config("file_permission" => "600") do
-        c = Fluent::Plugin::Buffer::FileChunk.new(gen_metadata, chunk_path, :create)
-        assert{ File.stat(c.path).mode.to_s(8).end_with?('600') }
-        assert{ File.stat(c.path + '.meta').mode.to_s(8).end_with?('600') }
-      end
-    end
-
     test '#write_metadata tries to store metadata on file' do
       d1 = {"f1" => 'v1', "f2" => 'v2', "f3" => 'v3'}
       d2 = {"f1" => 'vv1', "f2" => 'vv2', "f3" => 'vv3'}

data/test/plugin/test_buffer_file_single_chunk.rb

@@ -353,16 +353,6 @@ class BufferFileSingleChunkTest < Test::Unit::TestCase
       assert_equal d3.to_json + "\n", lines[2]
       assert_equal d4.to_json + "\n", lines[3]
     end
-
-    test 'can refer system config for file permission' do
-      omit "NTFS doesn't support UNIX like permissions" if Fluent.windows?
-
-      chunk_path = File.join(@chunkdir, 'fsb.*.buf')
-      Fluent::SystemConfig.overwrite_system_config("file_permission" => "600") do
-        c = Fluent::Plugin::Buffer::FileSingleChunk.new(gen_metadata, chunk_path, :create, nil)
-        assert{ File.stat(c.path).mode.to_s(8).end_with?('600') }
-      end
-    end
   end
 
   sub_test_case 'chunk with file for staged chunk' do

data/test/plugin/test_formatter_csv.rb

@@ -54,6 +54,15 @@ class CsvFormatterTest < ::Test::Unit::TestCase
     assert_equal("\"awesome\",\"awesome2\"\n", formatted)
   end
 
+  def test_format_with_nested_fields
+    d = create_driver("fields" => "message,$.nest.key")
+    formatted = d.instance.format(tag, @time, {
+                                    'message' => 'awesome',
+                                    'nest' => {'key' => 'awesome2'}
+                                  })
+    assert_equal("\"awesome\",\"awesome2\"\n", formatted)
+  end
+
   def test_format_without_newline
     d = create_driver("fields" => "message,message2", "add_newline" => false)
     formatted = d.instance.format(tag, @time, {

data/test/plugin/test_in_forward.rb

@@ -538,7 +538,7 @@ class ForwardInputTest < Test::Unit::TestCase
       chunk = ["tag1", entries, { 'compressed' => 'gzip' }].to_msgpack
 
       d.run do
-        Fluent::Engine.msgpack_factory.unpacker.feed_each(chunk) do |obj|
+        Fluent::MessagePackFactory.msgpack_unpacker.feed_each(chunk) do |obj|
           option = d.instance.send(:on_message, obj, chunk.size, DUMMY_SOCK)
           assert_equal 'gzip', option['compressed']
         end
@@ -568,7 +568,7 @@ class ForwardInputTest < Test::Unit::TestCase
       mock(Fluent::CompressedMessagePackEventStream).new(entries, nil, 0)
 
       d.run do
-        Fluent::Engine.msgpack_factory.unpacker.feed_each(chunk) do |obj|
+        Fluent::MessagePackFactory.msgpack_unpacker.feed_each(chunk) do |obj|
           option = d.instance.send(:on_message, obj, chunk.size, DUMMY_SOCK)
           assert_equal 'gzip', option['compressed']
         end
@@ -592,7 +592,7 @@ class ForwardInputTest < Test::Unit::TestCase
       assert chunk.size < (32 * 1024 * 1024)
 
       d.run(shutdown: false) do
-        Fluent::Engine.msgpack_factory.unpacker.feed_each(chunk) do |obj|
+        Fluent::MessagePackFactory.msgpack_unpacker.feed_each(chunk) do |obj|
           d.instance.send(:on_message, obj, chunk.size, DUMMY_SOCK)
         end
       end
@@ -624,7 +624,7 @@ class ForwardInputTest < Test::Unit::TestCase
       chunk = [ "test.tag", (0...16).map{|i| [time + i, {"data" => str}] } ].to_msgpack
 
       d.run(shutdown: false) do
-        Fluent::Engine.msgpack_factory.unpacker.feed_each(chunk) do |obj|
+        Fluent::MessagePackFactory.msgpack_unpacker.feed_each(chunk) do |obj|
           d.instance.send(:on_message, obj, chunk.size, DUMMY_SOCK)
         end
       end
@@ -654,7 +654,7 @@ class ForwardInputTest < Test::Unit::TestCase
 
       # d.run => send_data
       d.run(shutdown: false) do
-        Fluent::Engine.msgpack_factory.unpacker.feed_each(chunk) do |obj|
+        Fluent::MessagePackFactory.msgpack_unpacker.feed_each(chunk) do |obj|
           d.instance.send(:on_message, obj, chunk.size, DUMMY_SOCK)
         end
       end
@@ -1004,11 +1004,11 @@ class ForwardInputTest < Test::Unit::TestCase
   end
 
   def packer(*args)
-    Fluent::Engine.msgpack_factory.packer(*args)
+    Fluent::MessagePackFactory.msgpack_packer(*args)
   end
 
   def unpacker
-    Fluent::Engine.msgpack_factory.unpacker
+    Fluent::MessagePackFactory.msgpack_unpacker
   end
 
   # res
@@ -1158,9 +1158,9 @@ class ForwardInputTest < Test::Unit::TestCase
       execute_test_with_source_hostname_key(*keys) { |events|
         entries = ''
         events.each { |tag, time, record|
-          Fluent::Engine.msgpack_factory.packer(entries).write([time, record]).flush
+          Fluent::MessagePackFactory.msgpack_packer(entries).write([time, record]).flush
         }
-        send_data Fluent::Engine.msgpack_factory.packer.write(["tag1", entries]).to_s
+        send_data Fluent::MessagePackFactory.msgpack_packer.write(["tag1", entries]).to_s
       }
     end
   end

data/test/plugin/test_in_monitor_agent.rb

@@ -12,6 +12,8 @@ require_relative '../test_plugin_classes'
 class MonitorAgentInputTest < Test::Unit::TestCase
   include FuzzyAssert
 
+  CONFIG_DIR = File.expand_path('../tmp/in_monitor_agent', __dir__)
+
   def setup
     Fluent::Test.setup
   end
@@ -160,9 +162,20 @@ EOC
     test "fluentd opts" do
       d = create_driver
       opts = Fluent::Supervisor.default_options
-      Fluent::Supervisor.new(opts)
+
+      filepath = nil
+      begin
+        FileUtils.mkdir_p(CONFIG_DIR)
+        filepath = File.expand_path('fluentd.conf', CONFIG_DIR)
+        FileUtils.touch(filepath)
+        s = Fluent::Supervisor.new(opts.merge(config_path: filepath))
+        s.configure
+      ensure
+        FileUtils.rm_r(CONFIG_DIR) rescue _
+      end
+
       expected_opts = {
-        "config_path" => "/etc/fluent/fluent.conf",
+        "config_path" => filepath,
         "pid_file"    => nil,
         "plugin_dirs" => ["/etc/fluent/plugin"],
         "log_path"    => nil,
@@ -279,11 +292,25 @@ EOC
   </match>
 </label>
 EOC
-      @ra = Fluent::RootAgent.new(log: $log)
-      stub(Fluent::Engine).root_agent { @ra }
-      @ra = configure_ra(@ra, conf)
-      # store Supervisor instance to avoid collected by GC
-      @supervisor = Fluent::Supervisor.new(Fluent::Supervisor.default_options)
+
+
+      begin
+        @ra = Fluent::RootAgent.new(log: $log)
+        stub(Fluent::Engine).root_agent { @ra }
+        @ra = configure_ra(@ra, conf)
+        # store Supervisor instance to avoid collected by GC
+
+        FileUtils.mkdir_p(CONFIG_DIR)
+        @filepath = File.expand_path('fluentd.conf', CONFIG_DIR)
+        File.open(@filepath, 'w') do |v|
+          v.puts(conf)
+        end
+
+        @supervisor = Fluent::Supervisor.new(Fluent::Supervisor.default_options.merge(config_path: @filepath))
+        @supervisor.configure
+      ensure
+        FileUtils.rm_r(CONFIG_DIR) rescue _
+      end
     end
 
     test "/api/plugins" do
@@ -469,8 +496,7 @@ plugin_id:test_filter\tplugin_category:filter\ttype:test_filter\toutput_plugin:f
   tag monitor
 ")
       d.instance.start
-      expected_response_regex = /pid:\d+\tppid:\d+\tconfig_path:\/etc\/fluent\/fluent.conf\tpid_file:\tplugin_dirs:\/etc\/fluent\/plugin\tlog_path:/
-
+      expected_response_regex = %r{pid:\d+\tppid:\d+\tversion:#{Fluent::VERSION}\tconfig_path:#{@filepath}\tpid_file:\tplugin_dirs:/etc/fluent/plugin\tlog_path:}
       assert_match(expected_response_regex,
                    get("http://127.0.0.1:#{@port}/api/config").body)
     end
@@ -484,10 +510,11 @@ plugin_id:test_filter\tplugin_category:filter\ttype:test_filter\toutput_plugin:f
 ")
       d.instance.start
       res = JSON.parse(get("http://127.0.0.1:#{@port}/api/config.json").body)
-      assert_equal("/etc/fluent/fluent.conf", res["config_path"])
+      assert_equal(@filepath, res["config_path"])
       assert_nil(res["pid_file"])
       assert_equal(["/etc/fluent/plugin"], res["plugin_dirs"])
       assert_nil(res["log_path"])
+      assert_equal(Fluent::VERSION, res["version"])
     end
 
     test "/api/config.json?debug=1" do

data/test/plugin/test_in_unix.rb

@@ -18,7 +18,7 @@ module StreamInputTest
 
     d.run do
       d.expected_emits.each {|tag,_time,record|
-        send_data Fluent::Engine.msgpack_factory.packer.write([tag, 0, record]).to_s
+        send_data Fluent::MessagePackFactory.msgpack_packer.write([tag, 0, record]).to_s
       }
     end
   end
@@ -33,7 +33,7 @@ module StreamInputTest
 
     d.run do
       d.expected_emits.each {|tag,_time,record|
-        send_data Fluent::Engine.msgpack_factory.packer.write([tag, _time, record]).to_s
+        send_data Fluent::MessagePackFactory.msgpack_packer.write([tag, _time, record]).to_s
       }
     end
   end
@@ -51,7 +51,7 @@ module StreamInputTest
       d.expected_emits.each {|tag,_time,record|
         entries << [_time, record]
       }
-      send_data Fluent::Engine.msgpack_factory.packer.write(["tag1", entries]).to_s
+      send_data Fluent::MessagePackFactory.msgpack_packer.write(["tag1", entries]).to_s
     end
   end
 
@@ -66,9 +66,9 @@ module StreamInputTest
     d.run do
       entries = ''
       d.expected_emits.each {|tag,_time,record|
-        Fluent::Engine.msgpack_factory.packer(entries).write([_time, record]).flush
+        Fluent::MessagePackFactory.msgpack_packer(entries).write([_time, record]).flush
       }
-      send_data Fluent::Engine.msgpack_factory.packer.write(["tag1", entries]).to_s
+      send_data Fluent::MessagePackFactory.msgpack_packer.write(["tag1", entries]).to_s
     end
   end