fluentd 1.19.4 → 1.20.0

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.4'
+  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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.19.4
+  version: 1.20.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -43,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
@@ -255,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
@@ -533,6 +547,7 @@ extra_rdoc_files: []
 files:
 - ".rubocop.yml"
 - ADOPTERS.md
+- AGENTS.md
 - AUTHORS
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -718,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
@@ -840,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
@@ -876,7 +899,7 @@ 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:
   - - ">="