fluentd 1.16.8 → 1.17.0

data/test/plugin_helper/test_server.rb

@@ -15,7 +15,7 @@ class ServerPluginHelperTest < Test::Unit::TestCase
   TMP_DIR = File.expand_path(File.dirname(__FILE__) + "/../tmp/plugin_helper_server")
 
   setup do
-    @port = unused_port(protocol: :tcp)
+    @port = unused_port
     if Fluent.windows?
       @socket_manager_server = ServerEngine::SocketManager::Server.open
       @socket_manager_path = @socket_manager_server.path
@@ -233,12 +233,11 @@ class ServerPluginHelperTest < Test::Unit::TestCase
       # 'server_create_connection tcp' => [:server_create_connection, :unix],
     )
     test 'raise error if udp options specified for tcp/tls/unix' do |(m, proto)|
-      port = unused_port(protocol: proto)
       assert_raise ArgumentError do
-        @d.__send__(m, :myserver, port, proto: proto, max_bytes: 128){|x| x }
+        @d.__send__(m, :myserver, @port, proto: proto, max_bytes: 128){|x| x }
       end
       assert_raise ArgumentError do
-        @d.__send__(m, :myserver, port, proto: proto, flags: 1){|x| x }
+        @d.__send__(m, :myserver, @port, proto: proto, flags: 1){|x| x }
       end
     end
 
@@ -246,9 +245,8 @@ class ServerPluginHelperTest < Test::Unit::TestCase
       'server_create udp' => [:server_create, :udp],
     )
     test 'raise error if tcp/tls options specified for udp' do |(m, proto)|
-      port = unused_port(protocol: proto)
       assert_raise(ArgumentError.new("BUG: linger_timeout is available for tcp/tls")) do
-        @d.__send__(m, :myserver, port, proto: proto, linger_timeout: 1, max_bytes: 128){|x| x }
+        @d.__send__(m, :myserver, @port, proto: proto, linger_timeout: 1, max_bytes: 128){|x| x }
       end
     end
 
@@ -256,9 +254,8 @@ class ServerPluginHelperTest < Test::Unit::TestCase
       'server_create udp' => [:server_create, :udp],
     )
     test 'raise error if tcp/tls/unix backlog options specified for udp' do |(m, proto)|
-      port = unused_port(protocol: proto)
       assert_raise(ArgumentError.new("BUG: backlog is available for tcp/tls")) do
-        @d.__send__(m, :myserver, port, proto: proto, backlog: 500){|x| x }
+        @d.__send__(m, :myserver, @port, proto: proto, backlog: 500){|x| x }
       end
     end
 
@@ -266,9 +263,8 @@ class ServerPluginHelperTest < Test::Unit::TestCase
       'server_create udp' => [:server_create, :udp],
     )
     test 'raise error if tcp/tls send_keepalive_packet option is specified for udp' do |(m, proto)|
-      port = unused_port(protocol: proto)
       assert_raise(ArgumentError.new("BUG: send_keepalive_packet is available for tcp/tls")) do
-        @d.__send__(m, :myserver, port, proto: proto, send_keepalive_packet: true){|x| x }
+        @d.__send__(m, :myserver, @port, proto: proto, send_keepalive_packet: true){|x| x }
       end
     end
 
@@ -280,9 +276,8 @@ class ServerPluginHelperTest < Test::Unit::TestCase
       # 'server_create_connection unix' => [:server_create_connection, :unix, {}],
     )
     test 'raise error if tls options specified for tcp/udp/unix' do |(m, proto, kwargs)|
-      port = unused_port(protocol: proto)
       assert_raise(ArgumentError.new("BUG: tls_options is available only for tls")) do
-        @d.__send__(m, :myserver, port, proto: proto, tls_options: {}, **kwargs){|x| x }
+        @d.__send__(m, :myserver, @port, proto: proto, tls_options: {}, **kwargs){|x| x }
       end
     end
 
@@ -294,8 +289,7 @@ class ServerPluginHelperTest < Test::Unit::TestCase
       'server_create_connection tls' => [:server_create_connection, :tls, {tls_options: {insecure: true}}],
     )
     test 'can bind specified IPv4 address' do |(m, proto, kwargs)|
-      port = unused_port(protocol: proto)
-      @d.__send__(m, :myserver, port, proto: proto, bind: "127.0.0.1", **kwargs){|x| x }
+      @d.__send__(m, :myserver, @port, proto: proto, bind: "127.0.0.1", **kwargs){|x| x }
       assert_equal "127.0.0.1", @d._servers.first.bind
       assert_equal "127.0.0.1", @d._servers.first.server.instance_eval{ instance_variable_defined?(:@listen_socket) ? @listen_socket : @_io }.addr[3]
     end
@@ -309,8 +303,7 @@ class ServerPluginHelperTest < Test::Unit::TestCase
     )
     test 'can bind specified IPv6 address' do |(m, proto, kwargs)| # if available
       omit "IPv6 unavailable here" unless ipv6_enabled?
-      port = unused_port(protocol: proto)
-      @d.__send__(m, :myserver, port, proto: proto, bind: "::1", **kwargs){|x| x }
+      @d.__send__(m, :myserver, @port, proto: proto, bind: "::1", **kwargs){|x| x }
       assert_equal "::1", @d._servers.first.bind
       assert_equal "::1", @d._servers.first.server.instance_eval{ instance_variable_defined?(:@listen_socket) ? @listen_socket : @_io }.addr[3]
     end
@@ -327,11 +320,10 @@ class ServerPluginHelperTest < Test::Unit::TestCase
     test 'can create 2 or more servers which share same bind address and port if shared option is true' do |(m, proto, kwargs)|
       begin
         d2 = Dummy.new; d2.start; d2.after_start
-        port = unused_port(protocol: proto)
 
         assert_nothing_raised do
-          @d.__send__(m, :myserver, port, proto: proto, **kwargs){|x| x }
-          d2.__send__(m, :myserver, port, proto: proto, **kwargs){|x| x }
+          @d.__send__(m, :myserver, @port, proto: proto, **kwargs){|x| x }
+          d2.__send__(m, :myserver, @port, proto: proto, **kwargs){|x| x }
         end
       ensure
         d2.stop; d2.before_shutdown; d2.shutdown; d2.after_shutdown; d2.close; d2.terminate
@@ -352,13 +344,12 @@ class ServerPluginHelperTest < Test::Unit::TestCase
     test 'cannot create 2 or more servers using same bind address and port if shared option is false' do |(m, proto, kwargs)|
       begin
         d2 = Dummy.new; d2.start; d2.after_start
-        port = unused_port(protocol: proto)
 
         assert_nothing_raised do
-          @d.__send__(m, :myserver, port, proto: proto, shared: false, **kwargs){|x| x }
+          @d.__send__(m, :myserver, @port, proto: proto, shared: false, **kwargs){|x| x }
         end
         assert_raise(Errno::EADDRINUSE, Errno::EACCES) do
-          d2.__send__(m, :myserver, port, proto: proto, **kwargs){|x| x }
+          d2.__send__(m, :myserver, @port, proto: proto, **kwargs){|x| x }
         end
       ensure
         d2.stop; d2.before_shutdown; d2.shutdown; d2.after_shutdown; d2.close; d2.terminate
@@ -374,18 +365,16 @@ class ServerPluginHelperTest < Test::Unit::TestCase
       # 'unix' => [:unix, {}],
     )
     test 'raise error if block argument is not specified or too many' do |(proto, kwargs)|
-      port = unused_port(protocol: proto)
       assert_raise(ArgumentError.new("BUG: block must have 1 or 2 arguments")) do
-        @d.server_create(:myserver, port, proto: proto, **kwargs){ 1 }
+        @d.server_create(:myserver, @port, proto: proto, **kwargs){ 1 }
       end
       assert_raise(ArgumentError.new("BUG: block must have 1 or 2 arguments")) do
-        @d.server_create(:myserver, port, proto: proto, **kwargs){|sock, conn, what_is_this| 1 }
+        @d.server_create(:myserver, @port, proto: proto, **kwargs){|sock, conn, what_is_this| 1 }
       end
     end
 
     test 'creates udp server if specified in proto' do
-      port = unused_port(protocol: :udp)
-      @d.server_create(:myserver, port, proto: :udp, max_bytes: 512){|x| x }
+      @d.server_create(:myserver, @port, proto: :udp, max_bytes: 512){|x| x }
 
       created_server_info = @d._servers.first
       assert_equal :udp, created_server_info.proto
@@ -598,8 +587,7 @@ class ServerPluginHelperTest < Test::Unit::TestCase
   sub_test_case '#server_create_udp' do
     test 'can accept all keyword arguments valid for udp server' do
       assert_nothing_raised do
-        port = unused_port(protocol: :udp)
-        @d.server_create_udp(:s, port, bind: '127.0.0.1', shared: false, resolve_name: true, max_bytes: 100, flags: 1) do |data, conn|
+        @d.server_create_udp(:s, @port, bind: '127.0.0.1', shared: false, resolve_name: true, max_bytes: 100, flags: 1) do |data, conn|
           # ...
         end
       end
@@ -607,15 +595,14 @@ class ServerPluginHelperTest < Test::Unit::TestCase
 
     test 'creates a udp server just to read data' do
       received = ""
-      port = unused_port(protocol: :udp)
-      @d.server_create_udp(:s, port, max_bytes: 128) do |data|
+      @d.server_create_udp(:s, @port, max_bytes: 128) do |data|
         received << data
       end
       bind_port = unused_port(protocol: :udp, bind: "127.0.0.1")
       3.times do
         sock = UDPSocket.new(Socket::AF_INET)
         sock.bind("127.0.0.1", bind_port)
-        sock.connect("127.0.0.1", port)
+        sock.connect("127.0.0.1", @port)
         sock.puts "yay"
         sock.puts "foo"
         sock.close
@@ -627,17 +614,16 @@ class ServerPluginHelperTest < Test::Unit::TestCase
     test 'creates a udp server to read and write data' do
       received = ""
       responses = []
-      port = unused_port(protocol: :udp)
-      @d.server_create_udp(:s, port, max_bytes: 128) do |data, sock|
+      @d.server_create_udp(:s, @port, max_bytes: 128) do |data, sock|
         received << data
         sock.write "ack\n"
       end
-      bind_port = unused_port(protocol: :udp)
+      bind_port = unused_port
       3.times do
         begin
           sock = UDPSocket.new(Socket::AF_INET)
           sock.bind("127.0.0.1", bind_port)
-          sock.connect("127.0.0.1", port)
+          sock.connect("127.0.0.1", @port)
           th = Thread.new do
             while true
               begin
@@ -668,12 +654,11 @@ class ServerPluginHelperTest < Test::Unit::TestCase
 
       received = ""
       responses = []
-      port = unused_port(protocol: :udp, bind: "::1")
-      @d.server_create_udp(:s, port, bind: "::1", max_bytes: 128) do |data, sock|
+      @d.server_create_udp(:s, @port, bind: "::1", max_bytes: 128) do |data, sock|
         received << data
         sock.write "ack\n"
       end
-      bind_port = unused_port(protocol: :udp, bind: "::1")
+      bind_port = unused_port
       3.times do
         begin
           sock = UDPSocket.new(Socket::AF_INET6)
@@ -682,7 +667,7 @@ class ServerPluginHelperTest < Test::Unit::TestCase
             responses << sock.recv(16)
             true
           end
-          sock.connect("::1", port)
+          sock.connect("::1", @port)
           sock.write "yay\nfoo\n"
           th.join(5)
         ensure
@@ -697,14 +682,13 @@ class ServerPluginHelperTest < Test::Unit::TestCase
     test 'does not resolve name of client address in default' do
       received = ""
       sources = []
-      port = unused_port(protocol: :udp)
-      @d.server_create_udp(:s, port, max_bytes: 128) do |data, sock|
+      @d.server_create_udp(:s, @port, max_bytes: 128) do |data, sock|
         received << data
         sources << sock.remote_host
       end
       3.times do
         sock = UDPSocket.new(Socket::AF_INET)
-        sock.connect("127.0.0.1", port)
+        sock.connect("127.0.0.1", @port)
         sock.puts "yay"
         sock.close
       end
@@ -718,14 +702,13 @@ class ServerPluginHelperTest < Test::Unit::TestCase
 
       received = ""
       sources = []
-      port = unused_port(protocol: :udp)
-      @d.server_create_udp(:s, port, resolve_name: true, max_bytes: 128) do |data, sock|
+      @d.server_create_udp(:s, @port, resolve_name: true, max_bytes: 128) do |data, sock|
         received << data
         sources << sock.remote_host
       end
       3.times do
         sock = UDPSocket.new(Socket::AF_INET)
-        sock.connect("127.0.0.1", port)
+        sock.connect("127.0.0.1", @port)
         sock.puts "yay"
         sock.close
       end
@@ -737,8 +720,7 @@ class ServerPluginHelperTest < Test::Unit::TestCase
     test 'raises error if plugin registers data callback for connection object from #server_create' do
       received = ""
       errors = []
-      port = unused_port(protocol: :udp)
-      @d.server_create_udp(:s, port, max_bytes: 128) do |data, sock|
+      @d.server_create_udp(:s, @port, max_bytes: 128) do |data, sock|
         received << data
         begin
           sock.data{|d| received << d.upcase }
@@ -747,7 +729,7 @@ class ServerPluginHelperTest < Test::Unit::TestCase
         end
       end
       sock = UDPSocket.new(Socket::AF_INET)
-      sock.connect("127.0.0.1", port)
+      sock.connect("127.0.0.1", @port)
       sock.write "foo\n"
       sock.close
 
@@ -760,8 +742,7 @@ class ServerPluginHelperTest < Test::Unit::TestCase
     test 'raise error if plugin registers write_complete callback for udp' do
       received = ""
       errors = []
-      port = unused_port(protocol: :udp)
-      @d.server_create_udp(:s, port, max_bytes: 128) do |data, sock|
+      @d.server_create_udp(:s, @port, max_bytes: 128) do |data, sock|
         received << data
         begin
           sock.on(:write_complete){|conn| "" }
@@ -770,7 +751,7 @@ class ServerPluginHelperTest < Test::Unit::TestCase
         end
       end
       sock = UDPSocket.new(Socket::AF_INET)
-      sock.connect("127.0.0.1", port)
+      sock.connect("127.0.0.1", @port)
       sock.write "foo\n"
       sock.close
 
@@ -783,8 +764,7 @@ class ServerPluginHelperTest < Test::Unit::TestCase
     test 'raises error if plugin registers close callback for udp' do
       received = ""
       errors = []
-      port = unused_port(protocol: :udp)
-      @d.server_create_udp(:s, port, max_bytes: 128) do |data, sock|
+      @d.server_create_udp(:s, @port, max_bytes: 128) do |data, sock|
         received << data
         begin
           sock.on(:close){|d| "" }
@@ -793,7 +773,7 @@ class ServerPluginHelperTest < Test::Unit::TestCase
         end
       end
       sock = UDPSocket.new(Socket::AF_INET)
-      sock.connect("127.0.0.1", port)
+      sock.connect("127.0.0.1", @port)
       sock.write "foo\n"
       sock.close
 
@@ -806,12 +786,11 @@ class ServerPluginHelperTest < Test::Unit::TestCase
     test 'can bind IPv4 / IPv6 together' do
       omit "IPv6 unavailable here" unless ipv6_enabled?
 
-      port = unused_port(protocol: :udp)
       assert_nothing_raised do
-        @d.server_create_udp(:s_ipv4_udp, port, bind: '0.0.0.0', shared: false, max_bytes: 128) do |data, sock|
+        @d.server_create_udp(:s_ipv4_udp, @port, bind: '0.0.0.0', shared: false, max_bytes: 128) do |data, sock|
           # ...
         end
-        @d.server_create_udp(:s_ipv6_udp, port, bind: '::', shared: false, max_bytes: 128) do |data, sock|
+        @d.server_create_udp(:s_ipv6_udp, @port, bind: '::', shared: false, max_bytes: 128) do |data, sock|
           # ...
         end
       end
@@ -824,12 +803,11 @@ class ServerPluginHelperTest < Test::Unit::TestCase
         max_bytes, records, expected = data.values
 
         actual_records = []
-        port = unused_port(protocol: :udp)
-        @d.server_create_udp(:myserver, port, max_bytes: max_bytes) do |data, sock|
+        @d.server_create_udp(:myserver, @port, max_bytes: max_bytes) do |data, sock|
           actual_records << data
         end
 
-        open_client(:udp, "127.0.0.1", port) do |sock|
+        open_client(:udp, "127.0.0.1", @port) do |sock|
           records.each do |record|
             sock.send(record, 0)
           end
@@ -845,12 +823,11 @@ class ServerPluginHelperTest < Test::Unit::TestCase
         max_bytes, records, expected = data.values
 
         actual_records = []
-        port = unused_port(protocol: :udp)
-        @d.server_create_udp(:myserver, port, max_bytes: max_bytes) do |data|
+        @d.server_create_udp(:myserver, @port, max_bytes: max_bytes) do |data|
           actual_records << data
         end
 
-        open_client(:udp, "127.0.0.1", port) do |sock|
+        open_client(:udp, "127.0.0.1", @port) do |sock|
           records.each do |record|
             sock.send(record, 0)
           end

data/test/plugin_helper/test_socket.rb

@@ -11,7 +11,7 @@ class SocketHelperTest < Test::Unit::TestCase
   CERT_CHAINS_DIR = File.expand_path(File.dirname(__FILE__) + '/data/cert/cert_chains')
 
   def setup
-    @port = unused_port(protocol: :tcp)
+    @port = unused_port
   end
 
   def teardown

data/test/test_config.rb

@@ -167,7 +167,6 @@ class ConfigTest < Test::Unit::TestCase
             tag: tag.dummy
         - source:
             $type: tcp
-            $log_level: info
             tag: tag.tcp
             parse:
               $arg:
@@ -177,7 +176,6 @@ class ConfigTest < Test::Unit::TestCase
         - match:
             $tag: tag.*
             $type: stdout
-            $log_level: debug
             buffer:
               $type: memory
               flush_interval: 1s
@@ -210,12 +208,10 @@ class ConfigTest < Test::Unit::TestCase
           'tag.dummy',
           'tcp',
           'tag.tcp',
-          'info',
           'none',
           'why.parse.section.doesnot.have.arg,huh',
           'stdout',
           'tag.*',
-          'debug',
           'null',
           '**',
           '@FLUENT_LOG',
@@ -228,12 +224,10 @@ class ConfigTest < Test::Unit::TestCase
           dummy_source_conf['tag'],
           tcp_source_conf['@type'],
           tcp_source_conf['tag'],
-          tcp_source_conf['@log_level'],
           parse_tcp_conf['@type'],
           parse_tcp_conf.arg,
           match_conf['@type'],
           match_conf.arg,
-          match_conf['@log_level'],
           fluent_log_conf['@type'],
           fluent_log_conf.arg,
           label_conf.arg,

data/test/test_event_router.rb

@@ -175,7 +175,7 @@ class EventRouterTest < ::Test::Unit::TestCase
       test "don't call default collector when tag matched" do
         event_router.add_rule('test', output)
         assert_rr do
-          mock(default_collector).emit_events('test', is_a(OneEventStream)).never
+          dont_allow(default_collector).emit_events('test', is_a(OneEventStream))
           event_router.emit('test', Engine.now, 'k' => 'v')
         end
         # check emit handler doesn't catch rr error
@@ -201,7 +201,7 @@ class EventRouterTest < ::Test::Unit::TestCase
         event_router.add_rule('test', filter)
 
         assert_rr do
-          mock(filter).filter_stream('test', is_a(OneEventStream)).never
+          dont_allow(filter).filter_stream('test', is_a(OneEventStream)) { events }
           event_router.emit('foo', Engine.now, 'k' => 'v')
         end
       end

data/test/test_supervisor.rb

@@ -214,9 +214,6 @@ class SupervisorTest < ::Test::Unit::TestCase
   def test_cont_in_main_process_signal_handlers
     omit "Windows cannot handle signals" if Fluent.windows?
 
-    # https://github.com/fluent/fluentd/issues/4063
-    GC.start
-
     sv = Fluent::Supervisor.new({})
     sv.send(:install_main_process_signal_handlers)
 
@@ -232,9 +229,6 @@ class SupervisorTest < ::Test::Unit::TestCase
   def test_term_cont_in_main_process_signal_handlers
     omit "Windows cannot handle signals" if Fluent.windows?
 
-    # https://github.com/fluent/fluentd/issues/4063
-    GC.start
-
     create_debug_dummy_logger
 
     sv = Fluent::Supervisor.new({})
@@ -302,9 +296,6 @@ class SupervisorTest < ::Test::Unit::TestCase
   def test_cont_in_supervisor_signal_handler
     omit "Windows cannot handle signals" if Fluent.windows?
 
-    # https://github.com/fluent/fluentd/issues/4063
-    GC.start
-
     server = DummyServer.new
     server.install_supervisor_signal_handlers
 
@@ -320,9 +311,6 @@ class SupervisorTest < ::Test::Unit::TestCase
   def test_term_cont_in_supervisor_signal_handler
     omit "Windows cannot handle signals" if Fluent.windows?
 
-    # https://github.com/fluent/fluentd/issues/4063
-    GC.start
-
     server = DummyServer.new
     server.install_supervisor_signal_handlers
 
@@ -402,31 +390,34 @@ class SupervisorTest < ::Test::Unit::TestCase
   def test_supervisor_event_dump_windows
     omit "Only for Windows, alternative to UNIX signals" unless Fluent.windows?
 
-    # https://github.com/fluent/fluentd/issues/4063
-    GC.start
-
-    ENV['SIGDUMP_PATH'] = TMP_DIR + "/sigdump.log"
-
     server = DummyServer.new
     def server.config
       {:signame => "TestFluentdEvent"}
     end
     server.install_windows_event_handler
 
-    begin
-      sleep 0.1 # Wait for starting windows event thread
-      event = Win32::Event.open("TestFluentdEvent_CONT")
-      event.set
-      event.close
-      sleep 1.0 # Wait for dumping
-    ensure
-      server.stop_windows_event_thread
+    assert_rr do
+      # Have to use mock because `Sigdump.dump` seems to be somehow incompatible with RR.
+      # The `mock(server).restart(true) { nil }` line in `test_rpc_server_windows` cause the next error.
+      # Failure: test_supervisor_event_dump_windows(SupervisorTest):
+      #   class()
+      #   Called 0 times.
+      #   Expected 1 times.
+      # .../Ruby26-x64/lib/ruby/gems/2.6.0/gems/sigdump-0.2.4/lib/sigdump.rb:74:in `block in dump_object_count'
+      #     73: ObjectSpace.each_object {|o|
+      #     74:   c = o.class <-- HERE!
+      mock(Sigdump).dump(anything)
+
+      begin
+        sleep 0.1 # Wait for starting windows event thread
+        event = Win32::Event.open("TestFluentdEvent_CONT")
+        event.set
+        event.close
+        sleep 1.0 # Wait for dumping
+      ensure
+        server.stop_windows_event_thread
+      end
     end
-
-    result_filepaths = Dir.glob("#{TMP_DIR}/*")
-    assert {result_filepaths.length > 0}
-  ensure
-    ENV.delete('SIGDUMP_PATH')
   end
 
   data(:ipv4 => ["0.0.0.0", "127.0.0.1", false],

data/test/test_tls.rb

@@ -9,7 +9,7 @@ class UniqueIdTest < Test::Unit::TestCase
   TEST_TLS1_2_CASES = {
     'New TLS v1.2' => :'TLS1_2',
     'Old TLS v1.2' => :'TLSv1_2'
-  }
+  } 
   TEST_TLS_CASES = TEST_TLS1_1_CASES.merge(TEST_TLS1_2_CASES)
 
   sub_test_case 'constants' do