fluentd 1.16.9 → 1.16.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93691593c92aeca335e74f4c4bf3b1595655c97fc194b46c4ece5387201d9f05
-  data.tar.gz: 83202ec05f5d4a7139edcabfc0be8134394216710402183bda98ab0b6e3f88d0
+  metadata.gz: 255e643927676bb2d1414a29cb709d70b72e562a09d83a1a2532c6be1e0dfa89
+  data.tar.gz: 34703e891bc6cf823c88b98fa920fe049d54da981c466be21e63a684966d6988
 SHA512:
-  metadata.gz: 912df889d8a361269285bb48d7b05ef910de2196d87ddf49f93bb026a2b65c2e158ce252cf13ba5280a14817012704021fabdb71b6e68d05b4ec19bde9727a8c
-  data.tar.gz: e44d5fd2b8a7561dc7c81d2ad48cd4490457340065ec3d852aaf84444e68f7b323355bc39438814ecb6e3f0a1120c7caac4fa9738bcf3791286e43fdba37bfe8
+  metadata.gz: 3be646bf7c7ce861dcd8e842527d80d49eba0c3fc899f7f972db30e443bd8a749073167f1d8bcb70d24c8ab6a636388c2b0ea19423f58ed0f57687198b7b8dfb
+  data.tar.gz: a7740e6e6b8ec714811ce128725964a4108b456e0f12d5ef8a98ea95a151fba151fda0ac54ca49ed42c213b66d45b20f9879948f7b04ea3f00d2808816221646

data/.github/workflows/test.yml

@@ -26,10 +26,10 @@ jobs:
       fail-fast: false
       matrix:
         os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
-        ruby-version: ['3.3', '3.2', '3.1', '3.0', '2.7']
+        ruby-version: ['3.4', '3.3', '3.2', '3.1', '3.0', '2.7']
     name: Ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -41,19 +41,19 @@ jobs:
       - name: Install dependencies
         run: bundle install
       - name: Run tests
-        run: bundle exec rake test TESTOPTS="-v --no-show-detail-immediately"
+        run: bundle exec rake test TESTOPTS="-v --report-slow-tests --no-show-detail-immediately"
 
   test-windows-service:
     runs-on: windows-latest
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['3.3', '3.2', '3.1', '3.0', '2.7']
+        ruby-version: ['3.4', '3.3', '3.2', '3.1', '3.0', '2.7']
     name: Windows service (Ruby ${{ matrix.ruby-version }})
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@v5
       - name: Set up Ruby
-        uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
       - name: Install dependencies

data/CHANGELOG.md

@@ -1,5 +1,42 @@
 # v1.16
 
+## Release v1.16.11 - 2025/12/12
+
+### Bug Fix
+
+* out_forward: fix issue where could cause output to stop when using `<security>` and TLS setting together under unstable network environments
+  https://github.com/fluent/fluentd/pull/5137
+
+### Misc
+
+* Add missing gem dependency on Ruby 3.4.
+  https://github.com/fluent/fluentd/pull/5172
+
+* CI improvemnts
+  https://github.com/fluent/fluentd/pull/5135
+  https://github.com/fluent/fluentd/pull/5175
+  https://github.com/fluent/fluentd/pull/5182
+  https://github.com/fluent/fluentd/pull/5183
+  https://github.com/fluent/fluentd/pull/5185
+  https://github.com/fluent/fluentd/pull/5187
+  https://github.com/fluent/fluentd/pull/5189
+
+## Release v1.16.10 - 2025/09/12
+
+### Bug Fix
+
+* server plugin helper: ensure to close all connections at shutdown
+  https://github.com/fluent/fluentd/pull/5088
+
+### Misc
+
+* CI improvemnts
+  https://github.com/fluent/fluentd/pull/5083
+  https://github.com/fluent/fluentd/pull/5085
+  https://github.com/fluent/fluentd/pull/5086
+  https://github.com/fluent/fluentd/pull/5091
+  https://github.com/fluent/fluentd/pull/5092
+
 ## Release v1.16.9 - 2025/05/14
 
 ### Bug Fix

data/README.md

@@ -4,7 +4,6 @@ Fluentd: Open-Source Log Collector
 [![Testing on Ubuntu](https://github.com/fluent/fluentd/actions/workflows/linux-test.yaml/badge.svg?branch=master)](https://github.com/fluent/fluentd/actions/workflows/linux-test.yaml)
 [![Testing on Windows](https://github.com/fluent/fluentd/actions/workflows/windows-test.yaml/badge.svg?branch=master)](https://github.com/fluent/fluentd/actions/workflows/windows-test.yaml)
 [![Testing on macOS](https://github.com/fluent/fluentd/actions/workflows/macos-test.yaml/badge.svg?branch=master)](https://github.com/fluent/fluentd/actions/workflows/macos-test.yaml)
-[![Code Climate](https://codeclimate.com/github/fluent/fluentd/badges/gpa.svg)](https://codeclimate.com/github/fluent/fluentd)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/1189/badge)](https://bestpractices.coreinfrastructure.org/projects/1189)
 
 [Fluentd](https://www.fluentd.org/) collects events from various data sources and writes them to files, RDBMS, NoSQL, IaaS, SaaS, Hadoop and so on. Fluentd helps you unify your logging infrastructure (Learn more about the [Unified Logging Layer](https://www.fluentd.org/blog/unified-logging-layer)).

data/SECURITY.md

@@ -2,11 +2,13 @@
 
 ## Supported Versions
 
-| Version   | Supported          |
-| -------   | ------------------ |
+|  Version  |     Supported      |
+|-----------|--------------------|
+| 1.19.x    | :white_check_mark: |
+| 1.18.x    | :x:                |
+| 1.17.x    | :x:                |
 | 1.16.x    | :white_check_mark: |
-| 1.15.x    | :white_check_mark: |
-| <= 1.14.x | :x:                |
+| <= 1.15.x | :x:                |
 
 ## Reporting a Vulnerability
 

data/fluentd.gemspec

@@ -31,6 +31,11 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency("webrick", ["~> 1.4"])
   gem.add_runtime_dependency("console", ["< 1.24"])
 
+  # gems that aren't default gems as of Ruby 3.4
+  gem.add_runtime_dependency("base64", ["~> 0.2"])
+  gem.add_runtime_dependency("csv", ["~> 3.2"])
+  gem.add_runtime_dependency("drb", ["~> 2.2"])
+
   # gems that aren't default gems as of Ruby 3.5
   gem.add_runtime_dependency("logger", ["~> 1.6"])
 

data/lib/fluent/plugin/out_forward.rb

@@ -610,7 +610,17 @@ module Fluent::Plugin
       end
 
       def establish_connection(sock, ri)
+        start_time = Fluent::Clock.now
+        timeout = @sender.hard_timeout
+
         while ri.state != :established
+          # Check for timeout to prevent infinite loop
+          if Fluent::Clock.now - start_time > timeout
+            @log.warn "handshake timeout after #{timeout}s", host: @host, port: @port
+            disable!
+            break
+          end
+
           begin
             # TODO: On Ruby 2.2 or earlier, read_nonblock doesn't work expectedly.
             # We need rewrite around here using new socket/server plugin helper.

data/lib/fluent/plugin_helper/server.rb

@@ -347,7 +347,10 @@ module Fluent
       end
 
       def shutdown
-        @_server_connections.each do |conn|
+        # When it invokes conn.cose, it reduces elements in @_server_connections by close_callback,
+        # and it reduces the number of loops. This prevents the connection closing.
+        # So, it requires invoking #dup to avoid the problem.
+        @_server_connections.dup.each do |conn|
           conn.close rescue nil
         end
 

data/lib/fluent/test.rb

@@ -40,9 +40,12 @@ module Fluent
 
       $log = dummy_logger
 
-      Fluent.__send__(:remove_const, :Engine)
-      engine = Fluent.const_set(:Engine, EngineClass.new).init(SystemConfig.new)
+      old_engine = Fluent.__send__(:remove_const, :Engine)
+      # Ensure that GC can remove the objects of the old engine.
+      # Some objects can still exist after `remove_const`. See https://github.com/fluent/fluentd/issues/5054.
+      old_engine.instance_variable_set(:@root_agent, nil)
 
+      engine = Fluent.const_set(:Engine, EngineClass.new).init(SystemConfig.new)
       engine.define_singleton_method(:now=) {|n|
         @now = n
       }

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.16.9'
+  VERSION = '1.16.11'
 
 end

data/test/command/test_fluentd.rb

@@ -570,7 +570,7 @@ CONF
 
       assert_fluentd_fails_to_start(
         create_cmdline(conf_path, "-p", File.dirname(plugin_path)),
-        "in_buggy.rb:5: syntax error, unexpected end-of-input"
+        /in_buggy.rb:\d+:.+\(SyntaxError\)/
       )
     end
   end

data/test/config/test_dsl.rb

@@ -1,6 +1,7 @@
 require_relative '../helper'
 require 'fluent/config/element'
 require "fluent/config/dsl"
+require 'tempfile'
 
 TMP_DIR = File.dirname(__FILE__) + "/tmp/config_dsl#{ENV['TEST_ENV_NUMBER']}"
 def write_config(path, data)
@@ -358,9 +359,13 @@ module Fluent::Config
       sub_test_case '.parse' do
         test 'can get result of Kernel.open() by ruby.open()' do
           uname_string = `uname -a`
+          tmpfile = Tempfile.create('fluentd-test')
+          tmpfile.write(uname_string)
+          tmpfile.close
+
           root = Fluent::Config::DSL::Parser.parse(<<DSL)
 worker {
-  uname_str = ruby.open('|uname -a'){|out| out.read}
+  uname_str = ruby.open("#{tmpfile.path}"){|out| out.read}
   source {
     uname uname_str
   }
@@ -372,6 +377,8 @@ DSL
           assert_equal('source', source.name)
           assert_equal(1, source.keys.size)
           assert_equal(uname_string, source['uname'])
+        ensure
+          File.delete(tmpfile.path)
         end
 
         test 'accepts ruby keyword with block, which allow to use methods included from ::Kernel' do

data/test/config/test_element.rb

@@ -282,8 +282,8 @@ CONF
       dump = <<-CONF
 name:ROOT, arg:, {\"k1\"=>\"v1\"}, [name:test, arg:ext, {\"k2\"=>\"v2\"}, []]
 CONF
-      assert_not_equal(e.to_s, e.inspect)
-      assert_equal(dump.chomp, e.inspect)
+      assert_not_equal(e.to_s, e.inspect.gsub(' => ', '=>'))
+      assert_equal(dump.chomp, e.inspect.gsub(' => ', '=>'))
     end
   end
 

data/test/plugin/test_filter_stdout.rb

@@ -86,12 +86,12 @@ class StdoutFilterTest < Test::Unit::TestCase
       d = create_driver(CONFIG + config_element("", "", { "output_type" => "hash" }))
       etime = event_time("2016-10-07 21:09:31.012345678 UTC")
       out = capture_log(d) { filter(d, etime, {'test' => 'test'}) }
-      assert_equal "2016-10-07 21:09:31.012345678 +0000 filter.test: {\"test\"=>\"test\"}\n", out
+      assert_equal "2016-10-07 21:09:31.012345678 +0000 filter.test: {\"test\"=>\"test\"}\n", out.gsub(' => ', '=>')
 
       # NOTE: Float::NAN is not jsonable, but hash string can output it.
       d = create_driver(CONFIG + config_element("", "", { "output_type" => "hash" }))
       out = capture_log(d) { filter(d, etime, {'test' => Float::NAN}) }
-      assert_equal "2016-10-07 21:09:31.012345678 +0000 filter.test: {\"test\"=>NaN}\n", out
+      assert_equal "2016-10-07 21:09:31.012345678 +0000 filter.test: {\"test\"=>NaN}\n", out.gsub(' => ', '=>')
     end
 
     # Use include_time_key to output the message's time
@@ -172,7 +172,7 @@ class StdoutFilterTest < Test::Unit::TestCase
         d = create_driver(conf)
         etime = event_time("2016-10-07 21:09:31.012345678 UTC")
         out = capture_log(d) { filter(d, etime, {'test' => 'test'}) }
-        assert_equal "2016-10-07 21:09:31.012345678 +0000 filter.test: {\"test\"=>\"test\"}\n", out
+        assert_equal "2016-10-07 21:09:31.012345678 +0000 filter.test: {\"test\"=>\"test\"}\n", out.gsub(' => ', '=>')
       end
 
       def test_hash_nan
@@ -182,7 +182,7 @@ class StdoutFilterTest < Test::Unit::TestCase
         d = create_driver(conf)
         etime = event_time("2016-10-07 21:09:31.012345678 UTC")
         out = capture_log(d) { filter(d, etime, {'test' => Float::NAN}) }
-        assert_equal "2016-10-07 21:09:31.012345678 +0000 filter.test: {\"test\"=>NaN}\n", out
+        assert_equal "2016-10-07 21:09:31.012345678 +0000 filter.test: {\"test\"=>NaN}\n", out.gsub(' => ', '=>')
       end
 
       # Use include_time_key to output the message's time

data/test/plugin/test_formatter_hash.rb

@@ -26,13 +26,13 @@ class HashFormatterTest < ::Test::Unit::TestCase
     d = create_driver({"newline" => newline_conf})
     formatted = d.instance.format(tag, @time, record)
 
-    assert_equal(%Q!{"message"=>"awesome", "greeting"=>"hello"}#{newline}!, formatted.encode(Encoding::UTF_8))
+    assert_equal(%Q!{"message"=>"awesome", "greeting"=>"hello"}#{newline}!, formatted.gsub(' => ', '=>').encode(Encoding::UTF_8))
   end
 
   def test_format_without_newline
     d = create_driver('add_newline' => false)
     formatted = d.instance.format(tag, @time, record)
 
-    assert_equal(%Q!{"message"=>"awesome", "greeting"=>"hello"}!, formatted.encode(Encoding::UTF_8))
+    assert_equal(%Q!{"message"=>"awesome", "greeting"=>"hello"}!, formatted.gsub(' => ', '=>').encode(Encoding::UTF_8))
   end
 end

data/test/plugin/test_in_object_space.rb

@@ -50,6 +50,10 @@ class ObjectSpaceInputTest < Test::Unit::TestCase
   end
 
   def test_emit
+    # Force release garbaged objects due to avoid unexpected error by mock objects on `on_timer`
+    # https://github.com/fluent/fluentd/pull/5055
+    GC.start
+
     d = create_driver
 
     d.run(expect_emits: 3)

data/test/plugin/test_out_forward.rb

@@ -178,6 +178,42 @@ EOL
     assert{ logs.any?{|log| log.include?(expected_log) && log.include?(expected_detail) } }
   end
 
+  sub_test_case 'configure compress' do
+    data('default', ['', :text])
+    data('gzip', ['compress gzip', :gzip])
+    test 'should be applied' do |(option, expected)|
+      @d = d = create_driver(config + option)
+      node = d.instance.nodes.first
+
+      assert_equal(
+        [expected, expected],
+        [d.instance.compress, node.instance_variable_get(:@compress)]
+      )
+    end
+
+    # TODO add tests that we cannot configure the different compress type between owner and buffer except for :text
+    data('gzip', ['compress gzip', :text, :gzip])
+    test 'can configure buffer compress separately when owner uses :text' do |(buffer_option, expected_owner_compress, expected_buffer_compress)|
+      @d = d = create_driver(config + %[
+         <buffer>
+           type memory
+           #{buffer_option}
+         </buffer>
+       ])
+      node = d.instance.nodes.first
+
+      assert_equal(
+        [expected_owner_compress, expected_owner_compress, expected_buffer_compress],
+        [d.instance.compress, node.instance_variable_get(:@compress), d.instance.buffer.compress],
+      )
+
+      log_message = "buffer is compressed.  If you also want to save the bandwidth of a network, Add `compress` configuration in <match>"
+      assert do
+        d.logs.any? { |log| log.include?(log_message) }
+      end
+    end
+  end
+
   data('CA cert'     => 'tls_ca_cert_path',
        'non CA cert' => 'tls_cert_path')
   test 'configure tls_cert_path/tls_ca_cert_path' do |param|
@@ -326,40 +362,6 @@ EOL
     assert_equal 1234, d.instance.discovery_manager.services[0].port
   end
 
-  test 'compress_default_value' do
-    @d = d = create_driver
-    assert_equal :text, d.instance.compress
-
-    node = d.instance.nodes.first
-    assert_equal :text, node.instance_variable_get(:@compress)
-  end
-
-  test 'set_compress_is_gzip' do
-    @d = d = create_driver(config + %[compress gzip])
-    assert_equal :gzip, d.instance.compress
-    assert_equal :gzip, d.instance.buffer.compress
-
-    node = d.instance.nodes.first
-    assert_equal :gzip, node.instance_variable_get(:@compress)
-  end
-
-  test 'set_compress_is_gzip_in_buffer_section' do
-    mock = flexmock($log)
-    mock.should_receive(:log).with("buffer is compressed.  If you also want to save the bandwidth of a network, Add `compress` configuration in <match>")
-
-    @d = d = create_driver(config + %[
-       <buffer>
-         type memory
-         compress gzip
-       </buffer>
-     ])
-    assert_equal :text, d.instance.compress
-    assert_equal :gzip, d.instance.buffer.compress
-
-    node = d.instance.nodes.first
-    assert_equal :text, node.instance_variable_get(:@compress)
-  end
-
   test 'phi_failure_detector disabled' do
     @d = d = create_driver(config + %[phi_failure_detector false \n phi_threshold 0])
     node = d.instance.nodes.first
@@ -1345,4 +1347,27 @@ EOL
       end
     end
   end
+
+  test 'establish_connection_timeout' do
+    @d = d = create_driver(%[
+      hard_timeout 1
+      <server>
+        host #{TARGET_HOST}
+        port #{@target_port}
+      </server>
+    ])
+
+    node = d.instance.nodes.first
+    mock_sock = flexmock('socket')
+    mock_sock.should_receive(:read_nonblock).with(512).and_return('').at_least.once
+
+    ri = Fluent::Plugin::ForwardOutput::ConnectionManager::RequestInfo.new(:helo)
+
+    assert_true node.available?
+    node.establish_connection(mock_sock, ri)
+    assert_false node.available?
+
+    logs = d.logs
+    assert{ logs.any?{|log| log.include?('handshake timeout after 1.0s') } }
+  end
 end

data/test/plugin/test_out_stdout.rb

@@ -95,11 +95,11 @@ class StdoutOutputTest < Test::Unit::TestCase
           d.feed(time, {'test' => 'test2'})
         end
       end
-      assert_equal "#{Time.at(time).localtime.strftime(TIME_FORMAT)} test: {\"test\"=>\"test2\"}\n", out
+      assert_equal "#{Time.at(time).localtime.strftime(TIME_FORMAT)} test: {\"test\"=>\"test2\"}\n", out.gsub(' => ', '=>')
 
       # NOTE: Float::NAN is not jsonable, but hash string can output it.
       out = capture_log { d.feed('test', time, {'test' => Float::NAN}) }
-      assert_equal "#{Time.at(time).localtime.strftime(TIME_FORMAT)} test: {\"test\"=>NaN}\n", out
+      assert_equal "#{Time.at(time).localtime.strftime(TIME_FORMAT)} test: {\"test\"=>NaN}\n", out.gsub(' => ', '=>')
     end
   end
 
@@ -171,7 +171,7 @@ class StdoutOutputTest < Test::Unit::TestCase
           end
         end
 
-        assert_equal "#{Time.at(time).localtime.strftime(TIME_FORMAT)} test: {\"test\"=>\"test\"}\n", out
+        assert_equal "#{Time.at(time).localtime.strftime(TIME_FORMAT)} test: {\"test\"=>\"test\"}\n", out.gsub(' => ', '=>')
       end
     end
   end

data/test/plugin_helper/test_child_process.rb

@@ -569,7 +569,7 @@ class ChildProcessTest < Test::Unit::TestCase
   unless Fluent.windows?
     test 'can specify subprocess name' do
       io = IO.popen([["cat", "caaaaaaaaaaat"], '-'])
-      process_naming_enabled = (open("|ps opid,cmd"){|_io| _io.readlines }.count{|line| line.include?("caaaaaaaaaaat") } > 0)
+      process_naming_enabled = (IO.popen(["ps", "opid,cmd"]){|_io| _io.readlines }.count{|line| line.include?("caaaaaaaaaaat") } > 0)
       Process.kill(:TERM, io.pid) rescue nil
       io.close rescue nil
 
@@ -586,7 +586,7 @@ class ChildProcessTest < Test::Unit::TestCase
           m.lock
           ran = true
           pids << @d.child_process_id
-          proc_lines += open("|ps opid,cmd"){|_io| _io.readlines }
+          proc_lines += IO.popen(["ps", "opid,cmd"]){|_io| _io.readlines }
           m.unlock
           readio.read
         end
@@ -645,8 +645,8 @@ class ChildProcessTest < Test::Unit::TestCase
   unless Fluent.windows?
     test 'can change working directory' do
       # check my real /tmp directory (for mac)
-      cmd = %[|ruby -e 'Dir.chdir("/tmp"); puts Dir.pwd']
-      mytmpdir = open(cmd){|io| io.read.chomp }
+      cmd = ['ruby', '-e', 'Dir.chdir("/tmp"); puts Dir.pwd']
+      mytmpdir = IO.popen(cmd){|io| io.read.chomp }
 
       m = Mutex.new
       str = nil

data/test/plugin_helper/test_server.rb

@@ -364,6 +364,25 @@ class ServerPluginHelperTest < Test::Unit::TestCase
         d2.stop; d2.before_shutdown; d2.shutdown; d2.after_shutdown; d2.close; d2.terminate
       end
     end
+
+    test 'close all connections by shutdown' do
+      @d.server_create_tcp(:s, @port) do |data, conn|
+      end
+
+      client_sockets = []
+      5.times do
+        client_sockets << TCPSocket.open("127.0.0.1", @port)
+      end
+      waiting(4){ sleep 0.1 until @d.instance_variable_get(:@_server_connections).size == 5 }
+
+      @d.stop
+      @d.before_shutdown
+      @d.shutdown
+
+      assert_true @d.instance_variable_get(:@_server_connections).empty?
+    ensure
+      client_sockets.each(&:close)
+    end
   end
 
   sub_test_case '#server_create' do

data/test/test_configdsl.rb

@@ -1,6 +1,7 @@
 require_relative 'helper'
 require 'fluent/config/dsl'
 require 'fluent/test'
+require 'tempfile'
 
 class ConfigDSLTest < Test::Unit::TestCase
   # TEST_CONFIG1 = %[
@@ -107,8 +108,12 @@ match('aa')
 
   def test_with_ruby_keyword
     uname_string = `uname -a`
+    tmpfile = Tempfile.create('fluentd-test')
+    tmpfile.write(uname_string)
+    tmpfile.close
+
     root1 = Fluent::Config::DSL::Parser.parse(<<DSL)
-uname_str = ruby.open('|uname -a'){|out| out.read}
+uname_str = ruby.open("#{tmpfile.path}"){|out| out.read}
 source {
   uname uname_str
 }
@@ -144,5 +149,7 @@ source {
 }
 DSL
     assert_raise (NoMethodError) { Fluent::Config::DSL::Parser.parse(conf3) }
+  ensure
+    File.delete(tmpfile.path)
   end
 end

data/test/test_plugin_helper.rb

@@ -2,7 +2,7 @@ require_relative 'helper'
 require 'fluent/plugin_helper'
 require 'fluent/plugin/base'
 
-class ConfigTest < Test::Unit::TestCase
+class PluginHelperTest < Test::Unit::TestCase
   module FluentTest; end
 
   sub_test_case 'Fluent::Plugin::Base.helpers method works as shortcut to include helper modules' do

data/test/test_supervisor.rb

@@ -353,6 +353,7 @@ class SupervisorTest < ::Test::Unit::TestCase
       event = Win32::Event.open("TestFluentdEvent")
       event.set
       event.close
+      sleep 1.0 # Wait for dumping
     ensure
       server.stop_windows_event_thread
     end
@@ -379,6 +380,7 @@ class SupervisorTest < ::Test::Unit::TestCase
       event = Win32::Event.open("TestFluentdEvent_USR1")
       event.set
       event.close
+      sleep 1.0 # Wait for dumping
     ensure
       server.stop_windows_event_thread
     end
@@ -405,7 +407,7 @@ class SupervisorTest < ::Test::Unit::TestCase
     # https://github.com/fluent/fluentd/issues/4063
     GC.start
 
-    ENV['SIGDUMP_PATH'] = TMP_DIR + "/sigdump.log"
+    ENV['SIGDUMP_PATH'] = @tmp_dir + "/sigdump.log"
 
     server = DummyServer.new
     def server.config
@@ -423,7 +425,7 @@ class SupervisorTest < ::Test::Unit::TestCase
       server.stop_windows_event_thread
     end
 
-    result_filepaths = Dir.glob("#{TMP_DIR}/*")
+    result_filepaths = Dir.glob("#{@tmp_dir}/*")
     assert {result_filepaths.length > 0}
   ensure
     ENV.delete('SIGDUMP_PATH')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.16.9
+  version: 1.16.11
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -213,6 +213,48 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.24'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: drb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
@@ -983,7 +1025,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.8
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Fluentd event collector
 test_files: