fluentd 1.16.10 → 1.16.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa40bacc9e6549ff2050843ead6a9852e6b3783a29c0e5f73dfbfad282707567
-  data.tar.gz: b429eb7f1a663524fb99bd89eb48de153ecdd1e85860048a26832be9143db964
+  metadata.gz: 255e643927676bb2d1414a29cb709d70b72e562a09d83a1a2532c6be1e0dfa89
+  data.tar.gz: 34703e891bc6cf823c88b98fa920fe049d54da981c466be21e63a684966d6988
 SHA512:
-  metadata.gz: 0b437ed360b2bc3b65d965a88743b627a6c17efe0d5a328e57787b36c1b86b0749ee004cc84edba90c0a91a57dae98a7484ad5664f54c5fe37a589f36ebc7b02
-  data.tar.gz: 5711d692a6f2f4f5c9a9cfa7bfc8b6eafe4e588da708c5a09b5d9a386cd1d8c47a9ecb4ff5de6a77bcb8954dec5efa086234e14aeb9fee56abcd92ce91feee6c
+  metadata.gz: 3be646bf7c7ce861dcd8e842527d80d49eba0c3fc899f7f972db30e443bd8a749073167f1d8bcb70d24c8ab6a636388c2b0ea19423f58ed0f57687198b7b8dfb
+  data.tar.gz: a7740e6e6b8ec714811ce128725964a4108b456e0f12d5ef8a98ea95a151fba151fda0ac54ca49ed42c213b66d45b20f9879948f7b04ea3f00d2808816221646

data/.github/workflows/test.yml

@@ -26,7 +26,7 @@ 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@v5
@@ -48,7 +48,7 @@ jobs:
     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@v5

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # 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

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/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.16.10'
+  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_out_forward.rb

@@ -1347,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/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_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.10
+  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: