fluentd 1.19.1 → 1.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7d0597141166c9db2f30b7ea1761610ec6dc2e3c5b8443f3ff980530c4afd33
-  data.tar.gz: eb02d36ab94976985da49b0abe845dfe17056806f02e99cb8fa38a88addb79be
+  metadata.gz: 4873da89c533afd45a6f02a86aa8f92f7502bd08204724290dd34187c7183cd5
+  data.tar.gz: 1f092049f456daae36077e374670a7a32d044da48b01ecea5410bc116f76c61b
 SHA512:
-  metadata.gz: cd04fb1ed5a9407cae8d150fdb5875cac15d5e906356ba76232e82cb4c28053199f9b09fa403fad5733623b758ec713defb205d8bcc6058e067a71f01c0ec30c
-  data.tar.gz: eba375ae694bf113a9a70bce6c77575ed42e6d8f14d5c463890ae570c14dfe48576eb7eecd90fb401480ebfd910ecd45fdfed1130f909b8c541440bdf7a3c407
+  metadata.gz: 820db817466aaade115300f5839e62d278a7fbbd19479b939206f4a0b212905046c1717c37cf2e19d90640dc07b570455e9b6f10fa5d21b04b96da4ec04f15b2
+  data.tar.gz: 581e8ac6c84ae65e8b33758de56a65ca684547f64c2864fcdb630c68e2b58bda6232e98c60dc48b99efe8c2cf584f31aef62a14fd1a72785d1b6d88f41635fea

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # v1.19
 
+## Release v1.19.2 - 2026/02/13
+
+### Bug Fix
+
+* out_forward: add timeout to establish_connection to prevent infinite loop https://github.com/fluent/fluentd/pull/5138
+* gem: use latest net-http to solve IPv6 addr error https://github.com/fluent/fluentd/pull/5192
+* in_tail: fix error when files without read permission are included in glob patterns https://github.com/fluent/fluentd/pull/5222
+* command/fluentd: load win32/registry when edit registry for Ruby 4.0 https://github.com/fluent/fluentd/pull/5221
+* plugin_helper/http_server: Ensure request body is closed to prevent socket leaks in POST requests https://github.com/fluent/fluentd/pull/5234
+* config: fix duplicate config file loading in config_include_dir https://github.com/fluent/fluentd/pull/5235
+* gem: add ostruct gem as dependency for Ruby 4.0 https://github.com/fluent/fluentd/pull/5251
+
+### Misc
+
+* config: warn when backed-up config file will be included https://github.com/fluent/fluentd/pull/5252
+* filter_record_transformer: use cgi/escape to avoid Ruby 4.0 deprecation https://github.com/fluent/fluentd/pull/5256
+* CI fixes
+  * https://github.com/fluent/fluentd/pull/5257
+  * https://github.com/fluent/fluentd/pull/5229
+  * https://github.com/fluent/fluentd/pull/5225
+  * https://github.com/fluent/fluentd/pull/5186
+  * https://github.com/fluent/fluentd/pull/5184
+  * https://github.com/fluent/fluentd/pull/5176
+
 ## Release v1.19.1 - 2025/11/06
 
 ### Bug Fix

data/lib/fluent/command/fluentd.rb

@@ -344,6 +344,7 @@ if winsvcinstmode = opts[:regwinsvc]
 end
 
 if fluentdopt = opts[:fluentdopt]
+  require "win32/registry"
   Win32::Registry::HKEY_LOCAL_MACHINE.open("SYSTEM\\CurrentControlSet\\Services\\#{opts[:winsvc_name]}", Win32::Registry::KEY_ALL_ACCESS) do |reg|
     reg['fluentdopt', Win32::Registry::REG_SZ] = fluentdopt
   end

data/lib/fluent/config/v1_parser.rb

@@ -27,17 +27,18 @@ module Fluent
     class V1Parser < LiteralParser
       ELEMENT_NAME = /[a-zA-Z0-9_]+/
 
-      def self.parse(data, fname, basepath = Dir.pwd, eval_context = nil)
+      def self.parse(data, fname, basepath = Dir.pwd, eval_context = nil, on_file_parsed: nil)
         ss = StringScanner.new(data)
-        ps = V1Parser.new(ss, basepath, fname, eval_context)
+        ps = V1Parser.new(ss, basepath, fname, eval_context, on_file_parsed: on_file_parsed)
         ps.parse!
       end
 
-      def initialize(strscan, include_basepath, fname, eval_context)
+      def initialize(strscan, include_basepath, fname, eval_context, on_file_parsed: nil)
         super(strscan, eval_context)
         @include_basepath = include_basepath
         @fname = fname
         @logger = defined?($log) ? $log : nil
+        @on_file_parsed = on_file_parsed
       end
 
       def parse!
@@ -138,6 +139,8 @@ module Fluent
           end
         end
 
+        @on_file_parsed&.call(File.expand_path(File.join(@include_basepath, @fname))) if root_element
+
         return attrs, elems
       end
 
@@ -163,10 +166,15 @@ module Fluent
           Dir.glob(pattern).sort.each { |entry|
             basepath = File.dirname(entry)
             fname = File.basename(entry)
+            suspicious_backup_extensions = %w(bak old backup orig prev conf tmp temp debug wip)
+            if path.end_with?('*.conf') and
+              suspicious_backup_extensions.any? { |ext| fname.end_with?(".#{ext}.conf", "_#{ext}.conf") }
+              @logger.warn "There is a possibility that '@include #{uri}' includes duplicated backed-up config file such as <#{fname}>" if @logger
+            end
             data = File.read(entry)
             data.force_encoding('UTF-8')
             ss = StringScanner.new(data)
-            V1Parser.new(ss, basepath, fname, @eval_context).parse_element(true, nil, attrs, elems)
+            V1Parser.new(ss, basepath, fname, @eval_context, on_file_parsed: @on_file_parsed).parse_element(true, nil, attrs, elems)
           }
         else
           require 'open-uri'
@@ -175,7 +183,7 @@ module Fluent
           data = u.open { |f| f.read }
           data.force_encoding('UTF-8')
           ss = StringScanner.new(data)
-          V1Parser.new(ss, basepath, fname, @eval_context).parse_element(true, nil, attrs, elems)
+          V1Parser.new(ss, basepath, fname, @eval_context, on_file_parsed: @on_file_parsed).parse_element(true, nil, attrs, elems)
         end
       rescue SystemCallError => e
         cpe = ConfigParseError.new("include error #{uri} - #{e}")

data/lib/fluent/config/yaml_parser/loader.rb

@@ -30,9 +30,10 @@ module Fluent
         FLUENT_STR_TAG = 'tag:fluent/s'.freeze
         SHOVEL = '<<'.freeze
 
-        def initialize(context = Kernel.binding)
+        def initialize(context = Kernel.binding, on_file_parsed: nil)
           @context = context
           @current_path = nil
+          @on_file_parsed = on_file_parsed
         end
 
         # @param [String] path
@@ -55,9 +56,13 @@ module Fluent
             Fluent::Config::YamlParser::FluentValue::StringValue.new(val, @context)
           end
 
-          path.open do |f|
+          config = path.open do |f|
             visitor.accept(Psych.parse(f))
           end
+
+          @on_file_parsed&.call(File.expand_path(path.to_s))
+
+          config
         end
 
         def eval_include(path, parent)

data/lib/fluent/config/yaml_parser.rb

@@ -21,7 +21,7 @@ require 'pathname'
 module Fluent
   module Config
     module YamlParser
-      def self.parse(path)
+      def self.parse(path, on_file_parsed: nil)
         context = Kernel.binding
 
         unless context.respond_to?(:use_nil)
@@ -48,7 +48,7 @@ module Fluent
           end
         end
 
-        s = Fluent::Config::YamlParser::Loader.new(context).load(Pathname.new(path))
+        s = Fluent::Config::YamlParser::Loader.new(context, on_file_parsed: on_file_parsed).load(Pathname.new(path))
         Fluent::Config::YamlParser::Parser.new(s).build.to_element
       end
     end

data/lib/fluent/config.rb

@@ -26,7 +26,7 @@ module Fluent
     # @param additional_config [String] config which is added to last of config body
     # @param use_v1_config [Bool] config is formatted with v1 or not
     # @return [Fluent::Config]
-    def self.build(config_path:, encoding: 'utf-8', additional_config: nil, use_v1_config: true, type: nil)
+    def self.build(config_path:, encoding: 'utf-8', additional_config: nil, use_v1_config: true, type: nil, on_file_parsed: nil)
       if type == :guess
         config_file_ext = File.extname(config_path)
         if config_file_ext == '.yaml' || config_file_ext == '.yml'
@@ -35,7 +35,7 @@ module Fluent
       end
 
       if type == :yaml || type == :yml
-        return Fluent::Config::YamlParser.parse(config_path)
+        return Fluent::Config::YamlParser.parse(config_path, on_file_parsed: on_file_parsed)
       end
 
       config_fname = File.basename(config_path)
@@ -49,10 +49,10 @@ module Fluent
         s
       end
 
-      Fluent::Config.parse(config_data, config_fname, config_basedir, use_v1_config)
+      Fluent::Config.parse(config_data, config_fname, config_basedir, use_v1_config, on_file_parsed: on_file_parsed)
     end
 
-    def self.parse(str, fname, basepath = Dir.pwd, v1_config = nil, syntax: :v1)
+    def self.parse(str, fname, basepath = Dir.pwd, v1_config = nil, syntax: :v1, on_file_parsed: nil)
       parser = if fname =~ /\.rb$/ || syntax == :ruby
                  :ruby
                elsif v1_config.nil?
@@ -68,7 +68,7 @@ module Fluent
       case parser
       when :v1
         require 'fluent/config/v1_parser'
-        V1Parser.parse(str, fname, basepath, Kernel.binding)
+        V1Parser.parse(str, fname, basepath, Kernel.binding, on_file_parsed: on_file_parsed)
       when :v0
         # TODO: show deprecated message in v1
         require 'fluent/config/parser'

data/lib/fluent/plugin/filter_record_transformer.rb

@@ -71,7 +71,7 @@ module Fluent::Plugin
           # require utilities which would be used in ruby placeholders
           require 'pathname'
           require 'uri'
-          require 'cgi'
+          require 'cgi/escape'
           RubyPlaceholderExpander.new(placeholder_expander_params)
         else
           PlaceholderExpander.new(placeholder_expander_params)

data/lib/fluent/plugin/in_tail.rb

@@ -59,6 +59,7 @@ module Fluent::Plugin
       @shutdown_start_time = nil
       @metrics = nil
       @startup = true
+      @capability = Fluent::Capability.new(:current_process)
     end
 
     desc 'The paths to read. Multiple paths can be specified, separated by comma.'
@@ -195,7 +196,6 @@ module Fluent::Plugin
       @dir_perm = system_config.dir_permission || Fluent::DEFAULT_DIR_PERMISSION
       # parser is already created by parser helper
       @parser = parser_create(usage: parser_config['usage'] || @parser_configs.first.usage)
-      @capability = Fluent::Capability.new(:current_process)
       if @read_bytes_limit_per_second > 0
         if !@enable_watch_timer
           raise Fluent::ConfigError, "Need to enable watch timer when using log throttling feature"

data/lib/fluent/plugin/out_forward.rb

@@ -620,7 +620,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/http_server/app.rb

@@ -71,6 +71,8 @@ module Fluent
                 path
               end
             @router.route!(name, canonical_path, req)
+          ensure
+            request.body&.close
           end
         end
       end

data/lib/fluent/supervisor.rb

@@ -18,6 +18,7 @@ require 'fileutils'
 require 'open3'
 require 'pathname'
 require 'find'
+require 'set'
 
 require 'fluent/config'
 require 'fluent/counter'
@@ -796,18 +797,20 @@ module Fluent
         $log.warn('the value "-" for `inline_config` is deprecated. See https://github.com/fluent/fluentd/issues/2711')
         @inline_config = STDIN.read
       end
+      parsed_files = Set.new
       @conf = Fluent::Config.build(
         config_path: @config_path,
         encoding: @conf_encoding,
         additional_config: @inline_config,
         use_v1_config: @use_v1_config,
         type: @config_file_type,
+        on_file_parsed: ->(path) { parsed_files << path },
       )
       @system_config = build_system_config(@conf)
 
       $log.info :supervisor, 'parsing config file is succeeded', path: @config_path
 
-      build_additional_configurations do |additional_conf|
+      build_additional_configurations(parsed_files) do |additional_conf|
         @conf += additional_conf
       end
 
@@ -854,6 +857,7 @@ module Fluent
         additional_config: @inline_config,
         use_v1_config: @use_v1_config,
         type: @config_file_type,
+        on_file_parsed: nil,
       )
       system_config = build_system_config(conf)
 
@@ -1088,15 +1092,17 @@ module Fluent
         $log.debug('worker got SIGUSR2')
 
         begin
+          parsed_files = Set.new
           conf = Fluent::Config.build(
             config_path: @config_path,
             encoding: @conf_encoding,
             additional_config: @inline_config,
             use_v1_config: @use_v1_config,
             type: @config_file_type,
+            on_file_parsed: ->(path) { parsed_files << path },
           )
 
-          build_additional_configurations do |additional_conf|
+          build_additional_configurations(parsed_files) do |additional_conf|
             conf += additional_conf
           end
 
@@ -1206,7 +1212,7 @@ module Fluent
       system_config
     end
 
-    def build_additional_configurations
+    def build_additional_configurations(parsed_files)
       if @system_config.config_include_dir&.empty?
         $log.info :supervisor, 'configuration include directory is disabled'
         return
@@ -1218,11 +1224,17 @@ module Fluent
           next unless supported_suffixes.include?(File.extname(path))
           # NOTE: both types of normal config (.conf) and YAML will be loaded.
           # Thus, it does not care whether @config_path is .conf or .yml.
+          if parsed_files.include?(path)
+            $log.info :supervisor, 'skip auto loading, it was already loaded', path: path
+            next
+          end
+
           $log.info :supervisor, 'loading additional configuration file', path: path
           yield Fluent::Config.build(config_path: path,
                                      encoding: @conf_encoding,
                                      use_v1_config: @use_v1_config,
-                                     type: :guess)
+                                     type: :guess,
+                                     on_file_parsed: nil)
         end
       rescue Errno::ENOENT
         $log.info :supervisor, 'inaccessible include directory was specified', path: @system_config.config_include_dir

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.19.1'
+  VERSION = '1.19.2'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.19.1
+  version: 1.19.2
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -220,9 +220,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -230,9 +227,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - "<"
+- !ruby/object:Gem::Dependency
+  name: net-http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: async-http
   requirement: !ruby/object:Gem::Requirement
@@ -303,6 +311,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -861,7 +883,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: []