fluentd 1.16.9 → 1.16.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93691593c92aeca335e74f4c4bf3b1595655c97fc194b46c4ece5387201d9f05
-  data.tar.gz: 83202ec05f5d4a7139edcabfc0be8134394216710402183bda98ab0b6e3f88d0
+  metadata.gz: aa40bacc9e6549ff2050843ead6a9852e6b3783a29c0e5f73dfbfad282707567
+  data.tar.gz: b429eb7f1a663524fb99bd89eb48de153ecdd1e85860048a26832be9143db964
 SHA512:
-  metadata.gz: 912df889d8a361269285bb48d7b05ef910de2196d87ddf49f93bb026a2b65c2e158ce252cf13ba5280a14817012704021fabdb71b6e68d05b4ec19bde9727a8c
-  data.tar.gz: e44d5fd2b8a7561dc7c81d2ad48cd4490457340065ec3d852aaf84444e68f7b323355bc39438814ecb6e3f0a1120c7caac4fa9738bcf3791286e43fdba37bfe8
+  metadata.gz: 0b437ed360b2bc3b65d965a88743b627a6c17efe0d5a328e57787b36c1b86b0749ee004cc84edba90c0a91a57dae98a7484ad5664f54c5fe37a589f36ebc7b02
+  data.tar.gz: 5711d692a6f2f4f5c9a9cfa7bfc8b6eafe4e588da708c5a09b5d9a386cd1d8c47a9ecb4ff5de6a77bcb8954dec5efa086234e14aeb9fee56abcd92ce91feee6c

data/.github/workflows/test.yml

@@ -29,7 +29,7 @@ jobs:
         ruby-version: ['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,7 +41,7 @@ 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
@@ -51,9 +51,9 @@ jobs:
         ruby-version: ['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,21 @@
 # v1.16
 
+## 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/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.10'
 
 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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.16.9
+  version: 1.16.10
 platform: ruby
 authors:
 - Sadayuki Furuhashi