fluentd 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5644a4291fc48ff7ee5d4ef95a8ec9cefd2bdf2c
-  data.tar.gz: d6d3f809d8417c2386cb886bd6b0690366ee2c19
+  metadata.gz: 4e5a7a4c71fe45e0a65fd941bea4093e8a6c5414
+  data.tar.gz: 6e4000e2928c6bfda990ea5566e4e32618e031f7
 SHA512:
-  metadata.gz: f6b0e70fc412893ed6855087aa976b01e5dad1d99c5529e840fdb4cdf1c70919466426932fb83e7e5756a88a85306a2fcbb7fab2da0eadd0f07e73d44820da85
-  data.tar.gz: da606d762f1e2b57acc31b5dcbdd508ae16c8034100eb4a20c3232b88a8ff19e0ff831dd935f3314a14a72497eb280ae1a713f62733e1ee5d3d85e941d083185
+  metadata.gz: 94194178c70c31f9ae8f20f4c85230f1479f53dfbd25e5e8a13e724a5cf8ca7b38a7658a97153838ff486d554d0f44369bf2f622838af324c585594a3748d76d
+  data.tar.gz: 836807eb180ed4144f8333cb67c11d640b432882497e63d24d760a7a050f4513e137b6ac97bc6503d781e5690e80e26dee25792e6081b99f857f40787256e029

data/.travis.yml

@@ -11,12 +11,14 @@ matrix:
       os: linux
     - rvm: 2.2.10
       os: linux
-    - rvm: 2.3.8
+    - rvm: 2.3.7
       os: linux
     - rvm: 2.4.5
       os: linux
     - rvm: 2.5.3
       os: linux
+    - rvm: 2.6.0
+      os: linux
     - rvm: ruby-head
       os: linux
     - rvm: 2.1.10
@@ -50,7 +52,7 @@ branches:
     - v0.14
 
 before_install:
-  - gem update --system
+  - gem update --system=2.7.8
 
 sudo: false
 dist: trusty # for TLSv1.2 support

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # v1.3
 
+## Release v1.3.3 - 2018/01/06
+
+### Enhancements
+
+* parser_syslog: Use String#squeeze for performance improvement
+  https://github.com/fluent/fluentd/pull/2239
+* parser_syslog: Support RFC5424 timestamp without subseconds
+  https://github.com/fluent/fluentd/pull/2240
+
+### Bug fixes
+
+* server: Ignore ECONNRESET in TLS accept to avoid fluentd restart
+  https://github.com/fluent/fluentd/pull/2243
+* log: Fix plugin logger ignores fluentd log event setting
+  https://github.com/fluent/fluentd/pull/2252
+
 ## Release v1.3.2 - 2018/12/10
 
 ### Enhancements

data/fluentd.gemspec

@@ -47,5 +47,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency("timecop", ["~> 0.3"])
   gem.add_development_dependency("test-unit", ["~> 3.2"])
   gem.add_development_dependency("test-unit-rr", ["~> 1.0"])
-  gem.add_development_dependency("oj", ["~> 2.14"])
+  gem.add_development_dependency("oj", [">= 2.14", "< 4"])
 end

data/lib/fluent/log.rb

@@ -554,7 +554,7 @@ module Fluent
 
     extend Forwardable
     def_delegators '@logger', :get_worker_id, :enable_color?, :enable_debug, :enable_event,
-      :disable_events, :log_event_enabled, :log_event_enamed=, :time_format, :time_format=,
+      :disable_events, :log_event_enabled, :log_event_enabled=, :time_format, :time_format=,
       :time_formatter, :time_formatter=, :event, :caller_line, :puts, :write, :<<, :flush,
       :reset, :out, :out=, :optional_header, :optional_header=, :optional_attrs, :optional_attrs=
   end

data/lib/fluent/plugin/base.rb

@@ -81,6 +81,12 @@ module Fluent
       end
 
       def start
+        # By initialization order, plugin logger is created before set log_event_enabled.
+        # It causes '@id' specified plugin, it uses plugin logger instead of global logger, ignores `<label @FLUENT_LOG>` setting.
+        # This is adhoc approach but impact is minimal.
+        if @log.is_a?(Fluent::PluginLogger) && $log.respond_to?(:log_event_enabled) # log_event_enabled check for tests
+          @log.log_event_enabled = $log.log_event_enabled
+        end
         @_state.start = true
         self
       end

data/lib/fluent/plugin/buf_file.rb

@@ -137,7 +137,7 @@ module Fluent
                              # so it should not added into @metadata_list for now
           mode = Fluent::Plugin::Buffer::FileChunk.assume_chunk_state(path)
           if mode == :unknown
-            log.debug "uknown state chunk found", path: path
+            log.debug "unknown state chunk found", path: path
             next
           end
 

data/lib/fluent/plugin/parser_syslog.rb

@@ -48,6 +48,8 @@ module Fluent
         super
 
         @time_parser_rfc3164 = @time_parser_rfc5424 = nil
+        @time_parser_rfc5424_without_subseconds = nil
+        @support_rfc5424_without_subseconds = false
         @regexp = case @message_format
                   when :rfc3164
                     class << self
@@ -59,6 +61,7 @@ module Fluent
                       alias_method :parse, :parse_plain
                     end
                     @time_format = @rfc5424_time_format unless conf.has_key?('time_format')
+                    @support_rfc5424_without_subseconds = true
                     @with_priority ? REGEXP_RFC5424_WITH_PRI : REGEXP_RFC5424
                   when :auto
                     class << self
@@ -69,6 +72,7 @@ module Fluent
                     nil
                   end
         @time_parser = time_parser_create
+        @time_parser_rfc5424_without_subseconds = time_parser_create(format: "%Y-%m-%dT%H:%M:%S%z")
       end
 
       def patterns
@@ -83,6 +87,7 @@ module Fluent
         if REGEXP_DETECT_RFC5424.match(text)
           @regexp = @with_priority ? REGEXP_RFC5424_WITH_PRI : REGEXP_RFC5424
           @time_parser = @time_parser_rfc5424
+          @support_rfc5424_without_subseconds = true
         else
           @regexp = @with_priority ? REGEXP_WITH_PRI : REGEXP
           @time_parser = @time_parser_rfc3164
@@ -106,7 +111,19 @@ module Fluent
             when "pri"
               record['pri'] = value.to_i
             when "time"
-              time = @mutex.synchronize { @time_parser.parse(value.gsub(/ +/, ' ')) }
+              time = @mutex.synchronize do
+                time_str = value.squeeze(' ')
+                begin
+                  @time_parser.parse(time_str)
+                rescue Fluent::TimeParser::TimeParseError => e
+                  if @support_rfc5424_without_subseconds
+                    log.trace(e)
+                    @time_parser_rfc5424_without_subseconds.parse(time_str)
+                  else
+                    raise
+                  end
+                end
+              end
               record[name] = value if @keep_time_key
             else
               record[name] = value

data/lib/fluent/plugin_helper/server.rb

@@ -722,7 +722,7 @@ module Fluent
 
                 return true
               end
-            rescue OpenSSL::SSL::SSLError => e
+            rescue Errno::ECONNRESET, OpenSSL::SSL::SSLError => e
               @log.trace "unexpected error before accepting TLS connection", error: e
               close rescue nil
             end

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.3.2'
+  VERSION = '1.3.3'
 
 end

data/test/command/test_fluentd.rb

@@ -442,7 +442,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, expecting keyword_end (SyntaxError)"
+        "in_buggy.rb:5: syntax error, unexpected end-of-input, expecting"
       )
     end
   end

data/test/plugin/test_parser_syslog.rb

@@ -232,6 +232,44 @@ class SyslogParserTest < ::Test::Unit::TestCase
         assert_nil record["message"]
       end
     end
+
+    def test_parse_with_rfc5424_message_without_subseconds
+      @parser.configure(
+                        'message_format' => 'rfc5424',
+                        'with_priority' => true,
+                        )
+      text = '<16>1 2017-02-06T13:14:15Z 192.168.0.1 fluentd - - - Hi, from Fluentd!'
+      @parser.instance.parse(text) do |time, record|
+        assert_equal(event_time("2017-02-06T13:14:15Z", format: '%Y-%m-%dT%H:%M:%S%z'), time)
+        assert_equal "-", record["pid"]
+        assert_equal "-", record["msgid"]
+        assert_equal "-", record["extradata"]
+        assert_equal "Hi, from Fluentd!", record["message"]
+      end
+    end
+
+    def test_parse_with_rfc5424_message_both_timestamp
+      @parser.configure(
+                        'message_format' => 'rfc5424',
+                        'with_priority' => true,
+                        )
+      text = '<16>1 2017-02-06T13:14:15Z 192.168.0.1 fluentd - - - Hi, from Fluentd!'
+      @parser.instance.parse(text) do |time, record|
+        assert_equal(event_time("2017-02-06T13:14:15Z", format: '%Y-%m-%dT%H:%M:%S%z'), time)
+        assert_equal "-", record["pid"]
+        assert_equal "-", record["msgid"]
+        assert_equal "-", record["extradata"]
+        assert_equal "Hi, from Fluentd!", record["message"]
+      end
+      text = '<16>1 2017-02-06T13:14:15.003Z 192.168.0.1 fluentd - - - Hi, from Fluentd with subseconds!'
+      @parser.instance.parse(text) do |time, record|
+        assert_equal(event_time("2017-02-06T13:14:15.003Z", format: '%Y-%m-%dT%H:%M:%S.%L%z'), time)
+        assert_equal "-", record["pid"]
+        assert_equal "-", record["msgid"]
+        assert_equal "-", record["extradata"]
+        assert_equal "Hi, from Fluentd with subseconds!", record["message"]
+      end
+    end
   end
 
   class TestAutoRegexp < self
@@ -387,6 +425,17 @@ class SyslogParserTest < ::Test::Unit::TestCase
       end
       assert_equal(Fluent::Plugin::SyslogParser::REGEXP_RFC5424_WITH_PRI,
                    @parser.instance.patterns['format'])
+
+      text = '<16>1 2017-02-06T13:14:15Z 192.168.0.1 fluentd - - - Hi, from Fluentd without subseconds!'
+      @parser.instance.parse(text) do |time, record|
+        assert_equal(event_time("2017-02-06T13:14:15Z", format: '%Y-%m-%dT%H:%M:%S%z'), time)
+        assert_equal "-", record["pid"]
+        assert_equal "-", record["msgid"]
+        assert_equal "-", record["extradata"]
+        assert_equal "Hi, from Fluentd without subseconds!", record["message"]
+      end
+      assert_equal(Fluent::Plugin::SyslogParser::REGEXP_RFC5424_WITH_PRI,
+                   @parser.instance.patterns['format'])
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-11 00:00:00.000000000 Z
+date: 2019-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -296,16 +296,22 @@ dependencies:
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.14'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.14'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 description: Fluentd is an open source data collector designed to scale and simplify
   log management. It can collect, process and ship many kinds of data in near real-time.
 email: