fluentd 1.19.3 → 1.20.0

data/lib/fluent/plugin/parser_tsv.rb

@@ -32,8 +32,13 @@ module Fluent
       end
 
       def parse(text)
+        r = {}
+        i = 0
         values = text.split(@delimiter, @key_num)
-        r = Hash[@keys.zip(values)]
+        while i < @key_num
+          r[@keys[i]] = values[i]
+          i += 1
+        end
         time, record = convert_values(parse_time(r), r)
         yield time, record
       end

data/lib/fluent/plugin/sd_file.rb

@@ -16,6 +16,7 @@
 
 require 'cool.io'
 
+require 'fluent/env'
 require 'fluent/plugin_helper'
 require 'fluent/plugin/service_discovery'
 
@@ -75,7 +76,7 @@ module Fluent
             -> (v) { YAML.safe_load(v).map }
           when :json
             require 'json'
-            -> (v) { JSON.parse(v) }
+            -> (v) { JSON.parse(v, **Fluent::DEFAULT_JSON_PARSE_OPTIONS) }
           end
       end
 

data/lib/fluent/plugin/storage_local.rb

@@ -90,7 +90,7 @@ module Fluent
                 log.warn "detect empty plugin storage file during startup. Ignored: #{@path}"
                 return
               end
-              data = JSON.parse(data)
+              data = JSON.parse(data, **Fluent::DEFAULT_JSON_PARSE_OPTIONS)
               raise Fluent::ConfigError, "Invalid contents (not object) in plugin storage file: '#{@path}'" unless data.is_a?(Hash)
             rescue => e
               log.error "failed to read data from plugin storage file", path: @path, error: e
@@ -114,7 +114,7 @@ module Fluent
         return unless File.exist?(@path)
         begin
           json_string = File.open(@path, 'r:utf-8:utf-8'){ |io| io.read }
-          json = JSON.parse(json_string)
+          json = JSON.parse(json_string, **Fluent::DEFAULT_JSON_PARSE_OPTIONS)
           unless json.is_a?(Hash)
             log.error "broken content for plugin storage (Hash required: ignored)", type: json.class
             log.debug "broken content", content: json_string

data/lib/fluent/plugin_helper/http_server/server.rb

@@ -31,15 +31,28 @@ module Fluent
         # @param default_app [Object] This method must have #call.
         # @param tls_context [OpenSSL::SSL::SSLContext]
         def initialize(addr:, port:, logger:, default_app: nil, tls_context: nil)
-          @addr = addr
+          # Normalize the address: strip brackets if present
+          # Brackets are only for URI formatting, not for socket binding
+          @addr = if addr.start_with?('[') && addr.end_with?(']')
+                    addr[1..-2]  # Remove surrounding brackets
+                  else
+                    addr
+                  end
           @port = port
           @logger = logger
 
           # TODO: support http2
           scheme = tls_context ? 'https' : 'http'
-          @uri = URI("#{scheme}://#{@addr}:#{@port}").to_s
+          # Handle IPv6 addresses properly in URI construction per RFC 3986
+          # Add brackets to IPv6 addresses for URI compliance (ip-literal per RFC 3986)
+          ip_literal = if @addr.include?(":")
+                         "[#{@addr}]"  # IPv6 address - add brackets
+                       else
+                         @addr         # IPv4 or hostname - use directly
+                       end
+          @uri = URI("#{scheme}://#{ip_literal}:#{@port}").to_s
           @router = Router.new(default_app)
-          @server_task = nil
+          @server_task_queue = ::Thread::Queue.new
           Console.logger = Fluent::Log::ConsoleAdapter.wrap(@logger)
 
           opts = if tls_context
@@ -60,17 +73,20 @@ module Fluent
 
           Async do |task|
             Console.logger = Fluent::Log::ConsoleAdapter.wrap(@logger)
-            @server_task = task.async do
-              Console.logger = Fluent::Log::ConsoleAdapter.wrap(@logger)
-              @server.run
-            end
-            if notify
-              notify.push(:ready)
-            end
+            begin
+              @server.endpoint.accept(&@server.method(:accept))
+              if notify
+                notify.push(:ready)
+              end
 
-            @server_task_queue = ::Thread::Queue.new
-            @server_task_queue.pop
-            @server_task&.stop
+              @server_task_queue.pop
+            rescue => e
+              @logger.error("Failed to run HTTP server listening #{@uri}: #{e.class}: #{e.message}")
+              raise unless notify
+              notify.push(e)
+            ensure
+              task.children&.each(&:stop)
+            end
           end
 
           @logger.debug('Finished HTTP server')

data/lib/fluent/plugin_helper/http_server.rb

@@ -121,7 +121,8 @@ module Fluent
       def _block_until_http_server_start
         que = Queue.new
         yield(que)
-        que.pop
+        result = que.pop
+        raise result if result.is_a?(Exception)
       end
     end
   end

data/lib/fluent/root_agent.rb

@@ -415,7 +415,7 @@ module Fluent
       input.configure(conf)
       input.event_emitter_apply_source_only if @source_only_mode.enabled?
       if @enable_input_metrics
-        @event_router.add_metric_callbacks(input.plugin_id, Proc.new {|es| input.metric_callback(es) })
+        input.event_emitter_router(conf['@label']).add_metric_callbacks(input.plugin_id, Proc.new {|es| input.metric_callback(es) })
       end
       @inputs << input
 

data/lib/fluent/supervisor.rb

@@ -100,7 +100,14 @@ module Fluent
     end
 
     def cleanup_lock_dir
-      FileUtils.rm(Dir.glob(File.join(@fluentd_lock_dir, "fluentd-*.lock")))
+      begin
+        Dir.each_child(@fluentd_lock_dir) do |name|
+          FileUtils.rm_f(File.join(@fluentd_lock_dir, name)) if File.fnmatch?("fluentd-*.lock", name)
+        end
+      rescue Errno::ENOENT
+        # Directory is already missing. Fall through and let rmdir below
+        # fail in the same way as the current implementation.
+      end
       FileUtils.rmdir(@fluentd_lock_dir)
     end
 
@@ -366,6 +373,7 @@ module Fluent
           encoding: config[:conf_encoding],
           additional_config: config[:inline_config],
           use_v1_config: config[:use_v1_config],
+          type: config[:config_file_type],
         )
 
         Fluent::VariableStore.try_to_reset do
@@ -604,6 +612,8 @@ module Fluent
         fluentd_conf: params['fluentd_conf'],
         conf_encoding: params['conf_encoding'],
         inline_config: params['inline_config'],
+        use_v1_config: params['use_v1_config'],
+        config_file_type: params['config_file_type']&.to_sym,
         main_cmd: params['main_cmd'],
         signame: params['signame'],
         disable_shared_socket: params['disable_shared_socket'],
@@ -780,6 +790,7 @@ module Fluent
         MessagePackFactory.init(enable_time_support: @system_config.enable_msgpack_time_support)
         Fluent::Engine.init(@system_config, start_in_parallel: ENV.key?("FLUENT_RUNNING_IN_PARALLEL_WITH_OLD"))
         Fluent::Engine.run_configure(@conf)
+        enable_ruby_jit if @system_config.enable_jit
         Fluent::Engine.run
         self.class.cleanup_socketmanager_path if @standalone_worker
         exit 0
@@ -808,6 +819,12 @@ module Fluent
       )
       @system_config = build_system_config(@conf)
 
+      # `<system> umask` sets the process umask, just like the `--umask` command
+      # line option. The command line option takes precedence when both are given.
+      if @system_config.umask && !@cl_opt.key?(:chumask)
+        @chumask = @system_config.umask
+      end
+
       $log.info :supervisor, 'parsing config file is succeeded', path: @config_path
 
       build_additional_configurations(parsed_files) do |additional_conf|
@@ -964,6 +981,7 @@ module Fluent
         'fluentd_conf_path' => @config_path,
         'fluentd_conf' => @conf.to_s,
         'use_v1_config' => @use_v1_config,
+        'config_file_type' => @config_file_type,
         'conf_encoding' => @conf_encoding,
         'signame' => @signame,
 
@@ -1208,6 +1226,19 @@ module Fluent
       exit!(unrecoverable_error ? 2 : 1)
     end
 
+    def enable_ruby_jit
+      unless defined?(RubyVM::YJIT) && RubyVM::YJIT.respond_to?(:enable)
+        $log.info "Ruby JIT is not available on this Ruby"
+        return
+      end
+
+      if RubyVM::YJIT.enable
+        $log.info "enabled Ruby JIT"
+      else
+        $log.warn "failed to enable Ruby JIT"
+      end
+    end
+
     def build_system_config(conf)
       system_config = SystemConfig.create(conf, @cl_opt[:strict_config_value])
       # Prefer the options explicitly specified in the command line
@@ -1275,11 +1306,6 @@ module Fluent
         fluentd_spawn_cmd << '-Eascii-8bit:ascii-8bit'
       end
 
-      if @system_config.enable_jit
-        $log.info "enable Ruby JIT for workers (--jit)"
-        fluentd_spawn_cmd << '--jit'
-      end
-
       # Adding `-h` so that it can avoid ruby's command blocking
       # e.g. `ruby -Eascii-8bit:ascii-8bit` will block. but `ruby -Eascii-8bit:ascii-8bit -h` won't.
       _, e, s = Open3.capture3(*fluentd_spawn_cmd, "-h")

data/lib/fluent/system_config.rb

@@ -30,7 +30,7 @@ module Fluent
       :file_permission, :dir_permission, :counter_server, :counter_client,
       :strict_config_value, :enable_msgpack_time_support, :disable_shared_socket,
       :metrics, :enable_input_metrics, :enable_size_metrics, :enable_jit, :source_only_buffer,
-      :config_include_dir
+      :config_include_dir, :umask
     ]
 
     config_param :workers,   :integer, default: 1
@@ -53,7 +53,7 @@ module Fluent
     config_param :disable_shared_socket, :bool, default: nil
     config_param :enable_input_metrics, :bool, default: true
     config_param :enable_size_metrics, :bool, default: nil
-    config_param :enable_jit, :bool, default: false
+    config_param :enable_jit, :bool, default: true
     config_param :file_permission, default: nil do |v|
       v.to_i(8)
     end
@@ -61,6 +61,9 @@ module Fluent
       v.to_i(8)
     end
     config_param :config_include_dir, default: Fluent::DEFAULT_CONFIG_INCLUDE_DIR
+    # Kept as a string (like the `--umask` command line option) so that it flows
+    # through the existing chumask handling, which applies `to_i(8)` later.
+    config_param :umask, :string, default: nil
     config_section :log, required: false, init: true, multi: false do
       config_param :path, :string, default: nil
       config_param :format, :enum, list: [:text, :json], default: :text

data/lib/fluent/time.rb

@@ -112,9 +112,8 @@ module Fluent
     end
 
     def self.now
-      # This method is called many time. so call Process.clock_gettime directly instead of Fluent::Clock.real_now
-      now = Process.clock_gettime(Process::CLOCK_REALTIME, :nanosecond)
-      Fluent::EventTime.new(now / 1_000_000_000, now % 1_000_000_000)
+      time = Time.now
+      Fluent::EventTime.new(time.to_i, time.nsec)
     end
 
     def self.parse(*args)
@@ -362,6 +361,8 @@ module Fluent
 
   class TimeFormatter
     def initialize(format = nil, localtime = true, timezone = nil)
+      # An empty cache slot is marked by a nil string, not by its key: 0 is a
+      # valid timestamp, so a key can never say whether the slot is filled.
       @tc1 = 0
       @tc1_str = nil
       @tc2 = 0
@@ -389,9 +390,9 @@ module Fluent
     end
 
     def format_without_subsec(time)
-      if @tc1 == time
+      if @tc1_str && @tc1 == time
         return @tc1_str
-      elsif @tc2 == time
+      elsif @tc2_str && @tc2 == time
         return @tc2_str
       else
         str = format_nocache(time)
@@ -407,9 +408,9 @@ module Fluent
     end
 
     def format_with_subsec(time)
-      if Fluent::EventTime.eq?(@tc1, time)
+      if @tc1_str && Fluent::EventTime.eq?(@tc1, time)
         return @tc1_str
-      elsif Fluent::EventTime.eq?(@tc2, time)
+      elsif @tc2_str && Fluent::EventTime.eq?(@tc2, time)
         return @tc2_str
       else
         str = format_nocache(time)

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.19.3'
+  VERSION = '1.20.0'
 
 end

data/templates/new_gem/.gitignore

@@ -0,0 +1,8 @@
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.19.3
+  version: 1.20.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,20 +43,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: cool.io
   requirement: !ruby/object:Gem::Requirement
@@ -256,6 +241,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.86'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.21'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.21'
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: base64
   requirement: !ruby/object:Gem::Requirement
@@ -534,6 +547,7 @@ extra_rdoc_files: []
 files:
 - ".rubocop.yml"
 - ADOPTERS.md
+- AGENTS.md
 - AUTHORS
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -719,8 +733,15 @@ files:
 - lib/fluent/plugin/in_sample.rb
 - lib/fluent/plugin/in_syslog.rb
 - lib/fluent/plugin/in_tail.rb
+- lib/fluent/plugin/in_tail/compatibility.rb
+- lib/fluent/plugin/in_tail/dir_watcher.rb
 - lib/fluent/plugin/in_tail/group_watch.rb
+- lib/fluent/plugin/in_tail/io_handler.rb
+- lib/fluent/plugin/in_tail/line_feeder.rb
 - lib/fluent/plugin/in_tail/position_file.rb
+- lib/fluent/plugin/in_tail/stat_watcher.rb
+- lib/fluent/plugin/in_tail/tail_watcher.rb
+- lib/fluent/plugin/in_tail/worker_pool.rb
 - lib/fluent/plugin/in_tcp.rb
 - lib/fluent/plugin/in_udp.rb
 - lib/fluent/plugin/in_unix.rb
@@ -841,6 +862,7 @@ files:
 - lib/fluent/version.rb
 - lib/fluent/win32api.rb
 - lib/fluent/winsvc.rb
+- templates/new_gem/.gitignore
 - templates/new_gem/Gemfile
 - templates/new_gem/README.md.erb
 - templates/new_gem/Rakefile
@@ -870,7 +892,6 @@ metadata:
   source_code_uri: https://github.com/fluent/fluentd
   changelog_uri: https://github.com/fluent/fluentd/blob/master/CHANGELOG.md
   bug_tracker_uri: https://github.com/fluent/fluentd/issues
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -878,15 +899,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Fluentd event collector
 test_files: []