fluentd 1.7.4 → 1.8.0.rc1

data/lib/fluent/plugin_id.rb

@@ -23,6 +23,7 @@ module Fluent
     def initialize
       super
       @_plugin_root_dir = nil
+      @id = nil
     end
 
     def configure(conf)
@@ -76,5 +77,11 @@ module Fluent
       @_plugin_root_dir = dir.freeze
       dir
     end
+
+    def stop
+      @@configured_ids.delete(@id)
+
+      super
+    end
   end
 end

data/lib/fluent/supervisor.rb

@@ -25,6 +25,7 @@ require 'fluent/log'
 require 'fluent/plugin'
 require 'fluent/rpc'
 require 'fluent/system_config'
+require 'fluent/msgpack_factory'
 require 'serverengine'
 
 if Fluent.windows?
@@ -41,7 +42,6 @@ end
 module Fluent
   module ServerModule
     def before_run
-      @start_time = Time.now
       @rpc_server = nil
       @counter = nil
 
@@ -457,7 +457,6 @@ module Fluent
       @plugin_dirs = opt[:plugin_dirs]
       @chgroup = opt[:chgroup]
       @chuser = opt[:chuser]
-      @rpc_server = nil
       @process_name = nil
 
       @workers = opt[:workers]
@@ -554,6 +553,7 @@ module Fluent
       main_process do
         create_socket_manager if @standalone_worker
         change_privilege if @standalone_worker
+        MessagePackFactory.init
         init_engine
         run_configure
         run_engine
@@ -585,6 +585,7 @@ module Fluent
       begin
         Fluent::Engine.dry_run_mode = true
         change_privilege
+        MessagePackFactory.init
         init_engine
         run_configure
       rescue Fluent::ConfigError => e
@@ -772,15 +773,15 @@ module Fluent
     end
 
     def read_config
-      @config_fname = File.basename(@config_path)
-      @config_basedir = File.dirname(@config_path)
-      @config_data = File.open(@config_path, "r:#{@conf_encoding}:utf-8") {|f| f.read }
+      config_fname = File.basename(@config_path)
+      config_basedir = File.dirname(@config_path)
+      config_data = File.open(@config_path, "r:#{@conf_encoding}:utf-8") {|f| f.read }
       if @inline_config == '-'
-        @config_data << "\n" << STDIN.read
+        config_data << "\n" << STDIN.read
       elsif @inline_config
-        @config_data << "\n" << @inline_config.gsub("\\n","\n")
+        config_data << "\n" << @inline_config.gsub("\\n","\n")
       end
-      @conf = Fluent::Config.parse(@config_data, @config_fname, @config_basedir, @use_v1_config)
+      @conf = Fluent::Config.parse(config_data, config_fname, config_basedir, @use_v1_config)
     end
 
     def set_system_config

data/lib/fluent/system_config.rb

@@ -152,8 +152,6 @@ module Fluent
           case param
           when :log_level
             @log.level = @log_level = param_value
-          when :emit_error_log_interval
-            @suppress_interval = param_value
           else
             instance_variable_set("@#{param}", param_value)
           end

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.7.4'
+  VERSION = '1.8.0.rc1'
 
 end

data/test/config/test_system_config.rb

@@ -74,7 +74,6 @@ module Fluent::Config
       'root_dir' => ['root_dir', File.join(TMP_DIR, 'root')],
       'log_level' => ['log_level', 'error'],
       'suppress_repeated_stacktrace' => ['suppress_repeated_stacktrace', true],
-      'emit_error_log_interval' => ['emit_error_log_interval', 60],
       'log_event_verbose' => ['log_event_verbose', true],
       'suppress_config_dump' => ['suppress_config_dump', true],
       'without_source' => ['without_source', true],

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_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_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_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
 

data/test/plugin/test_out_forward.rb

@@ -39,7 +39,7 @@ class ForwardOutputTest < Test::Unit::TestCase
 
   def create_driver(conf=CONFIG)
     Fluent::Test::Driver::Output.new(Fluent::Plugin::ForwardOutput) {
-      attr_reader :sent_chunk_ids, :ack_handler
+      attr_reader :sent_chunk_ids, :ack_handler, :discovery_manager
 
       def initialize
         super
@@ -260,6 +260,30 @@ EOL
     end
   end
 
+  test 'server is an abbreviation of static type of service_discovery' do
+    @d = d = create_driver(%[
+<server>
+  host 127.0.0.1
+  port 1234
+</server>
+
+<service_discovery>
+  @type static
+
+  <service>
+    host 127.0.0.1
+    port 1235
+  </service>
+</service_discovery>
+    ])
+
+    assert_equal 2, d.instance.discovery_manager.services.size
+    assert_equal '127.0.0.1', d.instance.discovery_manager.services[0].host
+    assert_equal 1234, d.instance.discovery_manager.services[0].port
+    assert_equal '127.0.0.1', d.instance.discovery_manager.services[1].host
+    assert_equal 1235, d.instance.discovery_manager.services[1].port
+  end
+
   test 'compress_default_value' do
     @d = d = create_driver
     assert_equal :text, d.instance.compress
@@ -945,6 +969,26 @@ EOL
     end
   end
 
+  test 'when out_forward has @id' do
+    # cancel https://github.com/fluent/fluentd/blob/077508ac817b7637307434d0c978d7cdc3d1c534/lib/fluent/plugin_id.rb#L43-L53
+    # it always return true in test
+    mock.proxy(Fluent::Plugin).new_sd(:static, anything) { |v|
+      stub(v).plugin_id_for_test? { false }
+    }.once
+
+    output = Fluent::Test::Driver::Output.new(Fluent::Plugin::ForwardOutput) {
+      def plugin_id_for_test?
+        false
+      end
+    }
+
+    assert_nothing_raised do
+      output.configure(CONFIG + %[
+        @id unique_out_forward
+      ])
+    end
+  end
+
   sub_test_case 'verify_connection_at_startup' do
     test 'nodes are not available' do
       @d = d = create_driver(CONFIG + %[

data/test/plugin/test_out_stream.rb

@@ -31,10 +31,10 @@ module StreamOutputTest
     d.emit({"a"=>2}, time)
 
     expect = ["test",
-        Fluent::Engine.msgpack_factory.packer.write([time,{"a"=>1}]).to_s +
-        Fluent::Engine.msgpack_factory.packer.write([time,{"a"=>2}]).to_s
+        Fluent::MessagePackFactory.msgpack_packer.write([time,{"a"=>1}]).to_s +
+        Fluent::MessagePackFactory.msgpack_packer.write([time,{"a"=>2}]).to_s
       ]
-    expect = Fluent::Engine.msgpack_factory.packer.write(expect).to_s
+    expect = Fluent::MessagePackFactory.msgpack_packer.write(expect).to_s
 
     result = d.run
     assert_equal(expect, result)

data/test/plugin/test_sd_file.rb

@@ -0,0 +1,211 @@
+require_relative '../helper'
+require 'fluent/plugin/sd_file'
+require 'fileutils'
+require 'json'
+
+class FileServiceDiscoveryTest < ::Test::Unit::TestCase
+  setup do
+    @dir = File.expand_path('data/sd_file', __dir__)
+    FileUtils.mkdir_p(File.join(@dir, 'tmp'))
+  end
+
+  teardown do
+    FileUtils.rm_r(File.join(@dir, 'tmp'))
+  end
+
+  sub_test_case 'configure' do
+    test 'load yml' do
+      sdf = Fluent::Plugin::FileServiceDiscovery.new
+      sdf.configure(config_element('service_discovery', '', { 'path' => File.join(@dir, 'config.yml') }))
+      assert_equal Fluent::Plugin::ServiceDiscovery::Service.new(:file, '127.0.0.1', 24224, 'test1', 1, false, 'user1', 'pass1', 'key1'), sdf.services[0]
+      assert_equal Fluent::Plugin::ServiceDiscovery::Service.new(:file, '127.0.0.1', 24225, nil, 1), sdf.services[1]
+    end
+
+    test 'load yaml' do
+      sdf = Fluent::Plugin::FileServiceDiscovery.new
+      sdf.configure(config_element('service_discovery', '', { 'path' => File.join(@dir, 'config.yaml') }))
+      assert_equal Fluent::Plugin::ServiceDiscovery::Service.new(:file, '127.0.0.1', 24224, 'test1', 1, false, 'user1', 'pass1', 'key1'), sdf.services[0]
+      assert_equal Fluent::Plugin::ServiceDiscovery::Service.new(:file, '127.0.0.1', 24225, nil, 1), sdf.services[1]
+    end
+
+    test 'load json' do
+      sdf = Fluent::Plugin::FileServiceDiscovery.new
+      sdf.configure(config_element('service_discovery', '', { 'path' => File.join(@dir, 'config.json') }))
+      assert_equal Fluent::Plugin::ServiceDiscovery::Service.new(:file, '127.0.0.1', 24224, 'test1', 1, false, 'user1', 'pass1', 'key1'), sdf.services[0]
+      assert_equal Fluent::Plugin::ServiceDiscovery::Service.new(:file, '127.0.0.1', 24225, nil, 1), sdf.services[1]
+    end
+
+    test 'regard as yaml if ext is not givened' do
+      sdf = Fluent::Plugin::FileServiceDiscovery.new
+      sdf.configure(config_element('service_discovery', '', { 'path' => File.join(@dir, 'config') }))
+      assert_equal Fluent::Plugin::ServiceDiscovery::Service.new(:file, '127.0.0.1', 24224, 'test1', 1, false, 'user1', 'pass1', 'key1'), sdf.services[0]
+      assert_equal Fluent::Plugin::ServiceDiscovery::Service.new(:file, '127.0.0.1', 24225, nil, 1), sdf.services[1]
+    end
+
+    test 'raise an error if config has error' do
+      sdf = Fluent::Plugin::FileServiceDiscovery.new
+      e = assert_raise Fluent::ConfigError do
+        sdf.configure(config_element('service_discovery', '', { 'path' => File.join(@dir, 'invalid_config.yaml') }))
+      end
+      assert_match(/path=/, e.message)
+    end
+
+    test 'raise an error if config file does not exist' do
+      sdf = Fluent::Plugin::FileServiceDiscovery.new
+      e = assert_raise Fluent::ConfigError do
+        sdf.configure(config_element('service_discovery', '', { 'path' => File.join(@dir, 'invalid_not_found.json') }))
+      end
+      assert_match(/not found/, e.message)
+    end
+  end
+
+  sub_test_case '#start' do
+    module TestStatEventHelperWrapper
+      # easy to control statsevent
+      def event_loop_attach(watcher)
+        unless watcher.is_a?(Fluent::Plugin::FileServiceDiscovery::StatWatcher)
+          super
+          return
+        end
+
+        @test_stat_event_helper_wrapper_watchers ||= []
+        @test_stat_event_helper_wrapper_watchers << watcher
+
+        @test_stat_event_helper_wrapper_context = Fiber.new do
+          loop do
+            @test_stat_event_helper_wrapper_watchers.each do |w|
+              w.on_change('old', 'new')
+            end
+
+            if Fiber.yield == :finish
+              break
+            end
+          end
+        end
+        resume
+      end
+
+      def resume
+        @test_stat_event_helper_wrapper_context.resume(:resume)
+      end
+
+      def shutdown
+        super
+
+        if @test_stat_event_helper_wrapper_context
+          @test_stat_event_helper_wrapper_context.resume(:finish)
+        end
+      end
+    end
+
+    def create_tmp_config(path, body)
+      File.write(File.join(@dir, 'tmp', path), body)
+    end
+
+    setup do
+      sdf = Fluent::Plugin::FileServiceDiscovery.new
+      @sd_file = sdf
+    end
+
+    teardown do
+      if @sd_file
+        @sd_file.stop unless @sd_file.stopped?
+        @sd_file.before_shutdown unless @sd_file.before_shutdown?
+        @sd_file.shutdown unless @sd_file.shutdown?
+        @sd_file.after_shutdown unless @sd_file.after_shutdown?
+        @sd_file.close unless @sd_file.closed?
+        @sd_file.terminate unless @sd_file.terminated?
+      end
+    end
+
+    test 'Skip if file is not updated' do
+      @sd_file.extend(TestStatEventHelperWrapper)
+
+      create_tmp_config('config.json', JSON.generate([{ port: 1233, host: '127.0.0.1' }]))
+      @sd_file.configure(config_element('service_discovery', '', { 'path' => File.join(@dir, 'config.yml') }))
+      queue = []
+      mock.proxy(@sd_file).refresh_file(queue).twice
+
+      @sd_file.start(queue)
+      assert_empty queue
+
+      @sd_file.resume
+      assert_empty queue
+    end
+
+    test 'Skip if file is invalid contents' do
+      @sd_file.extend(TestStatEventHelperWrapper)
+
+      create_tmp_config('config.json', JSON.generate([{ port: 1233, host: '127.0.0.1' }]))
+      @sd_file.configure(config_element('service_discovery', '', { 'path' => File.join(@dir, 'config.yml') }))
+
+      queue = []
+      @sd_file.start(queue)
+
+      mock.proxy(@sd_file).refresh_file(queue).once
+      create_tmp_config('test.json', 'invalid contents')
+      @sd_file.resume
+
+      assert_empty queue
+    end
+
+    test 'if service is updated, service_in and service_out event happen' do
+      @sd_file.extend(TestStatEventHelperWrapper)
+
+      create_tmp_config('test.json', JSON.generate([{ port: 1233, host: '127.0.0.1' }]))
+      @sd_file.configure(config_element('service_discovery', '', { 'path' => File.join(@dir, 'tmp/test.json') }))
+
+      queue = []
+      @sd_file.start(queue)
+      create_tmp_config('test.json', JSON.generate([{ port: 1234, host: '127.0.0.1' }]))
+      @sd_file.resume
+
+      assert_equal 2, queue.size
+      join = queue.shift
+      drain = queue.shift
+      assert_equal Fluent::Plugin::ServiceDiscovery::SERVICE_IN, join.type
+      assert_equal 1234, join.service.port
+      assert_equal '127.0.0.1', join.service.host
+
+      assert_equal Fluent::Plugin::ServiceDiscovery::SERVICE_OUT, drain.type
+      assert_equal 1233, drain.service.port
+      assert_equal '127.0.0.1', drain.service.host
+    end
+
+    test 'if service is deleted, service_out event happens' do
+      @sd_file.extend(TestStatEventHelperWrapper)
+
+      create_tmp_config('test.json', JSON.generate([{ port: 1233, host: '127.0.0.1' }, { port: 1234, host: '127.0.0.2' }]))
+      @sd_file.configure(config_element('service_discovery', '', { 'path' => File.join(@dir, 'tmp/test.json') }))
+
+      queue = []
+      @sd_file.start(queue)
+      create_tmp_config('test.json', JSON.generate([{ port: 1233, host: '127.0.0.1' }]))
+      @sd_file.resume
+
+      assert_equal 1, queue.size
+      drain = queue.shift
+      assert_equal Fluent::Plugin::ServiceDiscovery::SERVICE_OUT, drain.type
+      assert_equal 1234, drain.service.port
+      assert_equal '127.0.0.2', drain.service.host
+    end
+
+    test 'if new service is added, service_in event happens' do
+      @sd_file.extend(TestStatEventHelperWrapper)
+
+      create_tmp_config('test.json', JSON.generate([{ port: 1233, host: '127.0.0.1' }]))
+      @sd_file.configure(config_element('service_discovery', '', { 'path' => File.join(@dir, 'tmp/test.json') }))
+
+      queue = []
+      @sd_file.start(queue)
+      create_tmp_config('test.json', JSON.generate([{ port: 1233, host: '127.0.0.1' }, { port: 1234, host: '127.0.0.2' }]))
+      @sd_file.resume
+
+      assert_equal 1, queue.size
+      join = queue.shift
+      assert_equal Fluent::Plugin::ServiceDiscovery::SERVICE_IN, join.type
+      assert_equal 1234, join.service.port
+      assert_equal '127.0.0.2', join.service.host
+    end
+  end
+end