fluent-plugin-concat 2.2.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b9554bd1483439c3202f8372c5a0c1699446eb6880e386f938569c509705c86
-  data.tar.gz: 717f110778d3f834a4c026816ddb9932b97968604ede88f1ab939b4293289b6f
+  metadata.gz: 0fa8ad39f08cb1de3cf3137fd5c504e285cc82107b10b3faf9455a8b08c002ca
+  data.tar.gz: d4f0fbfa8974961fcb2e4e7128e8d823c5a607a4087fc063d936c90896e267c9
 SHA512:
-  metadata.gz: 5b84e5ebd5d8d071f3743194e80444dffbcd6737944e88a9d562d682127b7c243610dc10ea5b4c05d6cc9daed63e7cf5ffc439a7e24ea819f2565f642a783849
-  data.tar.gz: d31210d2cfbe92f7d3489b46d5569524722e0124f247548264edb87694b0dd7d114d321db331e87288f2846e7e0b2baa99c11d9d20e2dbbec97bf9710233eeba
+  metadata.gz: 173c3b6dcb69212174c1bca085e44b26da8137c0c4cd935e622b54ba019150a720e1eb863a4c3aff7503b8ee752aa992e694e321423c0cc2e3d846ccf2d79215
+  data.tar.gz: 11f274a4e8e4ae32f8e8f91d4eabd7ba72d98c794ff202b5e111b475024b40cc61fae65698eaebf645cc161fa8b3a9c632ff1f6de778fa369afe9fa57459c126

data/.github/workflows/linux.yml

@@ -0,0 +1,30 @@
+name: Testing on Ubuntu
+on:
+  - push
+  - pull_request
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - 2.5
+          - 2.6
+          - 2.7
+          - 3.0
+        os:
+          - ubuntu-latest
+    name: Ruby ${{ matrix.ruby }} unit testing on ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: unit testing
+      env:
+        CI: true
+      run: |
+        gem install bundler rake
+        bundle install --jobs 4 --retry 3
+        bundle exec rake test

data/.github/workflows/windows.yml

@@ -0,0 +1,26 @@
+name: Testing on Windows
+on:
+  - push
+  - pull_request
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.5', '2.6', '2.7', '3.0' ]
+        os:
+          - windows-latest
+    name: Ruby ${{ matrix.ruby }} unit testing on ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: unit testing
+      env:
+        CI: true
+      run: |
+        gem install bundler rake
+        bundle install --jobs 4 --retry 3
+        bundle exec rake test

data/.rubocop.yml

@@ -4,6 +4,11 @@ AllCops:
   Exclude:
     - "vendor/**/*"
 
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+Layout/SpaceInsideBlockBraces:
+  EnforcedStyle: space
+  SpaceBeforeBlockParameters: false
 Lint/UnderscorePrefixedVariableName:
   Enabled: false
 Lint/UnusedMethodArgument:
@@ -19,6 +24,9 @@ Metrics/ParameterLists:
 Metrics/MethodLength:
   Max: 30
 
+Naming/FileName:
+  Enabled: false
+
 Style/AsciiComments:
   Enabled: false
 Style/HashSyntax:
@@ -29,11 +37,11 @@ Style/FrozenStringLiteralComment:
   Enabled: false
 Style/StringLiterals:
   EnforcedStyle: double_quotes
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
   Enabled: false
-Style/TrailingCommaInArguments:
+Style/TrailingCommaInHashLiteral:
   Enabled: false
-Style/FileName:
+Style/TrailingCommaInArguments:
   Enabled: false
 Style/Documentation:
   Enabled: false
@@ -41,13 +49,8 @@ Style/WordArray:
   Enabled: false
 Style/BarePercentLiterals:
   EnforcedStyle: percent_q
-Style/SpaceInsideBlockBraces:
-  EnforcedStyle: space
-  SpaceBeforeBlockParameters: false
 Style/BracesAroundHashParameters:
   Enabled: false
-Style/MultilineMethodCallIndentation:
-  EnforcedStyle: indented
 Style/DoubleNegation:
   Enabled: false
 Style/EmptyCaseCondition:

data/Appraisals

@@ -1,3 +0,0 @@
-appraise "fluentd v0.14" do
-  gem "fluentd", "~> 0.14.0"
-end

data/NEWS.md

@@ -1,5 +1,41 @@
 # ChangeLog
 
+## next
+
+### Improvements
+
+* adds `partial_metadata_format` to support Docker 20.10 journald log driver improvements [moby/moby#41407](https://github.com/moby/moby/pull/41407) 
+
+## v2.3.0
+
+### Improvements
+
+* Support `partial_key`, `partial_value` to concatenate split log lines. See #46, #52
+
+## v2.2.3
+
+### Fixes
+
+* Fix a bug that `@timeout_map` will be updated while traversing it. See #49
+
+## v.2.2.2
+
+### Fixes
+
+* #48
+
+## v2.2.1
+
+### Fixes
+
+* #45
+
+## v2.2.0
+
+### Fixes
+
+* #43
+
 ## v2.0.0
 
 * Use Fluentd v0.14 API and drop Fluentd v0.12 or earlier support

data/README.md

@@ -29,47 +29,56 @@ Or install it yourself as:
 
 ## Configuration
 
-**key** (required)
+### Example
 
-The key for part of multiline log.
-
-**separator**
-
-The separator of lines.
-Default value is `"\n"`.
-
-**n\_lines**
-
-The number of lines.
-This is exclusive with `multiline_start_regex`.
-
-**multiline\_start\_regexp**
-
-The regexp to match beginning of multiline.
-This is exclusive with `n_lines.`
-
-**multiline\_end\_regexp**
-
-The regexp to match ending of multiline.
-This is exclusive with `n_lines.`
-
-**continuous\_line\_regexp**
-
-The regexp to match continuous lines.
-This is exclusive with `n_lines.`
-
-**stream\_identity\_key**
-
-The key to determine which stream an event belongs to.
-
-**flush\_interval**
-
-The number of seconds after which the last received event log will be flushed.
-If specified 0, wait for next line forever.
-
-**use\_first\_timestamp**
+```
+<filter docker.log>
+  @type concat
+  key loga
+  #separator "\n"
+  n_lines 10
+  #multiline_start_regexp /^Start/
+  #multiline_end_regexp /^End/
+  #continuous_line_regexp nil
+  #stream_identity_key nil
+  #flush_interval 60
+  #timeout_label nil
+  #use_first_timestamp false
+  #partial_key nil
+  #partial_value nil
+  #keep_partial_key false
+  #use_partial_metadata false
+  #keep_partial_metadata false
+  #partial\_metadata\_format docker-fluentd
+  #use\_partial\_cri\_logtag false
+  #partial\_cri\_logtag\_key nil
+  #partial\_cri\_stream\_key stream
+</filter>
+```
 
-Use timestamp of first record when buffer is flushed.
+### Parameter
+
+|parameter|description|default|
+|---|---|---|
+|key|The key for part of multiline log||
+|separator|The separator of lines|`"\n"`|
+|n\_lines|The number of lines. This is exclusive with `multiline_start_regex`|nil|
+|multiline\_start\_regexp|The regexp to match beginning of multiline. This is exclusive with `n_lines`|nil|
+|multiline\_end\_regexp|The regexp to match ending of multiline.This is exclusive with `n_lines`|nil|
+|continuous\_line\_regexp|The regexp to match continuous lines.This is exclusive with `n_lines`|nil|
+|stream\_identity\_key|The key to determine which stream an event belongs to|nil|
+|flush\_interval|The number of seconds after which the last received event log will be flushed.If specified 0, wait for next line foreverr|60|
+|timeout\_label|The label name to handle events caused by timeout|nil|
+|use\_first\_timestamp|Use timestamp of first record when buffer is flushed|`false`|
+|partial\_key|The field name that is the reference to concatenate records|nil|
+|partial\_value|The value stored in the field specified by partial_key that represent partial log|nil|
+|keep\_partial\_key|If true, keep partial_key in concatenated records|`false`|
+|use\_partial\_metadata|Use partial metadata to concatenate multiple records|`false`|
+|keep\_partial\_metadata|If true, keep partial metadata|`false`|
+|partial\_metadata\_format|Input format of the partial metadata (fluentd or journald docker log driver) ( `docker-fluentd`, `docker-journald`, `docker-journald-lowercase`)<br>Configure based on the input plugin, that is used. <br>The docker fluentd and journald log drivers are behaving differently, so the plugin needs to know, what to look for.<br>Use `docker-journald-lowercase`, if you have `fields_lowercase true` in the `journald` source config |`docker-fluentd`|
+|use\_partial\_cri\_logtag|bool (optional)|Use cri log tag to concatenate multiple records||
+|partial\_cri\_logtag\_key|string (optional)|The key name that is referred to concatenate records on cri log||
+|partial\_cri\_stream\_key|string (optional)|The key name that is referred to detect stream name on cri log|`stream`|
 
 ## Usage
 
@@ -137,6 +146,90 @@ Handle single line JSON from Docker containers.
 </filter>
 ```
 
+Handle Docker logs splitted in several parts (using `partial_message`), and do not add new line between parts.
+
+```aconf
+<filter>
+  @type concat
+  key log
+  partial_key partial_message
+  partial_value true
+  separator ""
+</filter>
+```
+
+(Docker v19.03+) Handle Docker logs splitted in several parts (using `use_partial_metadata`), and do not add new line between parts.
+
+```aconf
+<filter>
+  @type concat
+  key log
+  use_partial_metadata true
+  separator ""
+</filter>
+```
+
+(Docker v20.10+) Handle Docker logs splitted in several parts (using `use_partial_metadata`), and do not add new line between parts.
+
+Docker v20.10 improved partial message handling by adding better metadata in the journald log driver, this works now similarily to the fluentd log driver, but requires one additional setting
+
+```aconf
+<filter>
+  @type concat
+  key log
+  use_partial_metadata true
+  partial_metadata_format docker-journald
+  separator ""
+</filter>
+```
+
+Handle Docker logs splitted in several parts (using newline detection), and do not add new line between parts (prior to Docker 18.06).
+
+```aconf
+<filter **>
+  @type concat
+  key log
+  multiline_end_regexp /\\n$/
+  separator ""
+</filter>
+```
+
+Handle containerd/cri in Kubernetes.
+
+```aconf
+<source>
+  @type tail
+  path /var/log/containers/*.log
+  <parse>
+    @type regexp
+    expression /^(?<time>[^ ]+) (?<stream>stdout|stderr) (?<logtag>[^ ]*) (?<message>.*)$/
+    time_format %Y-%m-%dT%H:%M:%S.%L%z
+  </parse>
+  tag k8s
+  @label @CONCAT
+</source>
+
+<label @CONCAT>
+  <filter k8s>
+    @type concat
+    key message
+    use_partial_cri_logtag true
+    partial_cri_logtag_key logtag
+    partial_cri_stream_key stream
+  </filter>
+  <match k8s>
+    @type relabel
+    @label @OUTPUT
+  </match>
+</label>
+
+<label @OUTPUT>
+  <match>
+    @type stdout
+  </match>
+</label>
+```
+
 ## Contributing
 
 1. Fork it

data/fluent-plugin-concat.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-concat"
-  spec.version       = "2.2.1"
+  spec.version       = "2.5.0"
   spec.authors       = ["Kenji Okimoto"]
   spec.email         = ["okimoto@clear-code.com"]
 
@@ -17,9 +17,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "fluentd", ">= 0.14.0", "< 2"
-  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "test-unit", ">= 3.1.0"
   spec.add_development_dependency "test-unit-rr"
   spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "webrick"
 end

data/lib/fluent/plugin/filter_concat.rb

@@ -26,6 +26,24 @@ module Fluent::Plugin
     config_param :timeout_label, :string, default: nil
     desc "Use timestamp of first record when buffer is flushed"
     config_param :use_first_timestamp, :bool, default: false
+    desc "The field name that is the reference to concatenate records"
+    config_param :partial_key, :string, default: nil
+    desc "The value stored in the field specified by partial_key that represent partial log"
+    config_param :partial_value, :string, default: nil
+    desc "If true, keep partial_key in concatenated records"
+    config_param :keep_partial_key, :bool, default: false
+    desc "Use partial metadata to concatenate multiple records"
+    config_param :use_partial_metadata, :bool, default: false
+    desc "Input format of the partial metadata (fluentd or journald docker log driver)"
+    config_param :partial_metadata_format, :enum, list: [:"docker-fluentd", :"docker-journald", :"docker-journald-lowercase"], default: :"docker-fluentd"
+    desc "If true, keep partial metadata"
+    config_param :keep_partial_metadata, :bool, default: false
+    desc "Use cri log tag to concatenate multiple records"
+    config_param :use_partial_cri_logtag, :bool, default: false
+    desc "The key name that is referred to concatenate records on cri log"
+    config_param :partial_cri_logtag_key, :string, default: nil
+    desc "The key name that is referred to detect stream name on cri log"
+    config_param :partial_cri_stream_key, :string, default: "stream"
 
     class TimeoutError < StandardError
     end
@@ -34,23 +52,91 @@ module Fluent::Plugin
       super
 
       @buffer = Hash.new {|h, k| h[k] = [] }
-      @timeout_map = Hash.new {|h, k| h[k] = Fluent::Engine.now }
+      @timeout_map_mutex = Thread::Mutex.new
+      @timeout_map_mutex.synchronize do
+        @timeout_map = Hash.new {|h, k| h[k] = Fluent::Engine.now }
+      end
+    end
+
+    def required_params
+      params = [@n_lines.nil?, @multiline_start_regexp.nil?, @multiline_end_regexp.nil?, @partial_key.nil?, !@use_partial_metadata, !@use_partial_cri_logtag]
+      names = ["n_lines", "multiline_start_regexp", "multiline_end_regexp", "partial_key", "use_partial_metadata", "use_partial_cri_logtag"]
+      return params, names
     end
 
     def configure(conf)
       super
 
-      if @n_lines && (@multiline_start_regexp || @multiline_end_regexp || @continuous_line_regexp)
-        raise Fluent::ConfigError, "n_lines and multiline_start_regexp/multiline_end_regexp/continuous_line_regexp are exclusive"
+      params, names = required_params
+      if params.all?
+        raise Fluent::ConfigError, "Either #{[names[0..-2].join(", "), names[-1]].join(" or ")} is required"
+      end
+      if @n_lines && (@multiline_start_regexp || @multiline_end_regexp)
+        raise Fluent::ConfigError, "n_lines and multiline_start_regexp/multiline_end_regexp are exclusive"
+      end
+      if @partial_key && @n_lines
+        raise Fluent::ConfigError, "partial_key and n_lines are exclusive"
+      end
+      if @partial_key && (@multiline_start_regexp || @multiline_end_regexp)
+        raise Fluent::ConfigError, "partial_key and multiline_start_regexp/multiline_end_regexp are exclusive"
+      end
+      if @partial_key && @partial_value.nil?
+        raise Fluent::ConfigError, "partial_value is required when partial_key is specified"
+      end
+      if @use_partial_metadata && @n_lines
+        raise Fluent::ConfigError, "use_partial_metadata and n_lines are exclusive"
       end
-      if @n_lines.nil? && @multiline_start_regexp.nil? && @multiline_end_regexp.nil?
-        raise Fluent::ConfigError, "Either n_lines or multiline_start_regexp or multiline_end_regexp is required"
+      if @use_partial_metadata && (@multiline_start_regexp || @multiline_end_regexp)
+        raise Fluent::ConfigError, "use_partial_metadata and multiline_start_regexp/multiline_end_regexp are exclusive"
+      end
+      if @use_partial_metadata && @partial_key
+        raise Fluent::ConfigError, "use_partial_metadata and partial_key are exclusive"
+      end
+      if @use_partial_cri_logtag && @n_lines
+        raise Fluent::ConfigError, "use_partial_cri_logtag and n_lines are exclusive"
+      end
+      if @use_partial_cri_logtag && (@multiline_start_regexp || @multiline_end_regexp)
+        raise Fluent::ConfigError, "use_partial_cri_logtag and multiline_start_regexp/multiline_end_regexp are exclusive"
+      end
+      if @use_partial_cri_logtag && @partial_key
+        raise Fluent::ConfigError, "use_partial_cri_logtag and partial_key are exclusive"
       end
 
       @mode = nil
       case
       when @n_lines
         @mode = :line
+      when @partial_key
+        @mode = :partial
+      when @use_partial_metadata
+        @mode = :partial_metadata
+        case @partial_metadata_format
+        when :"docker-fluentd"
+          @partial_message_field     = "partial_message".freeze
+          @partial_id_field          = "partial_id".freeze
+          @partial_ordinal_field     = "partial_ordinal".freeze
+          @partial_last_field        = "partial_last".freeze
+          @partial_message_indicator = @partial_message_field
+        when :"docker-journald"
+          @partial_message_field     = "CONTAINER_PARTIAL_MESSAGE".freeze
+          @partial_id_field          = "CONTAINER_PARTIAL_ID".freeze
+          @partial_ordinal_field     = "CONTAINER_PARTIAL_ORDINAL".freeze
+          @partial_last_field        = "CONTAINER_PARTIAL_LAST".freeze
+          # the journald log driver does not add CONTAINER_PARTIAL_MESSAGE to the last message
+          # so we help ourself by using another indicator
+          @partial_message_indicator = @partial_id_field
+        when :"docker-journald-lowercase"
+          @partial_message_field     = "container_partial_message".freeze
+          @partial_id_field          = "container_partial_id".freeze
+          @partial_ordinal_field     = "container_partial_ordinal".freeze
+          @partial_last_field        = "container_partial_last".freeze
+          @partial_message_indicator = @partial_id_field
+        end
+      when @use_partial_cri_logtag
+        @mode = :partial_cri
+        @partial_logtag_delimiter = ":".freeze
+        @partial_logtag_continue = "P".freeze
+        @partial_logtag_full = "F".freeze
       when @multiline_start_regexp || @multiline_end_regexp
         @mode = :regexp
         if @multiline_start_regexp
@@ -78,22 +164,49 @@ module Fluent::Plugin
     end
 
     def filter_stream(tag, es)
+      if /\Afluent\.(?:trace|debug|info|warn|error|fatal)\z/ =~ tag
+        return es
+      end
+
       new_es = Fluent::MultiEventStream.new
       es.each do |time, record|
-        if /\Afluent\.(?:trace|debug|info|warn|error|fatal)\z/ =~ tag
-          new_es.add(time, record)
-          next
-        end
         unless record.key?(@key)
           new_es.add(time, record)
           next
         end
+        if @mode == :partial
+          unless record.key?(@partial_key)
+            new_es.add(time, record)
+            next
+          end
+        end
+        if @mode == :partial_metadata
+          unless record.key?(@partial_message_indicator)
+            new_es.add(time, record)
+            next
+          end
+        end
         begin
           flushed_es = process(tag, time, record)
           unless flushed_es.empty?
             flushed_es.each do |_time, new_record|
               time = _time if @use_first_timestamp
-              new_es.add(time, record.merge(new_record))
+              merged_record = record.merge(new_record)
+              case @mode
+              when :partial
+                merged_record.delete(@partial_key) unless @keep_partial_key
+              when :partial_metadata
+                unless @keep_partial_metadata
+                  merged_record.delete(@partial_message_field)
+                  merged_record.delete(@partial_id_field)
+                  merged_record.delete(@partial_ordinal_field)
+                  merged_record.delete(@partial_last_field)
+                end
+              when :partial_cri
+                merged_record.delete(@partial_cri_logtag_key) unless @keep_partial_key
+                merged_record.delete(@partial_cri_stream_key)
+              end
+              new_es.add(time, merged_record)
             end
           end
         rescue => e
@@ -109,18 +222,36 @@ module Fluent::Plugin
       return if @flush_interval <= 0
       return if @finished
       flush_timeout_buffer
+    rescue => e
+      log.error "failed to flush timeout buffer", error: e
     end
 
     def process(tag, time, record)
-      if @stream_identity_key
-        stream_identity = "#{tag}:#{record[@stream_identity_key]}"
+      if @mode == :partial_metadata
+        if @stream_identity_key
+          stream_identity = %Q(#{tag}:#{record[@stream_identity_key]}#{record[@partial_id_field]})
+        else
+          stream_identity = %Q(#{tag}:#{record[@partial_id_field]})
+        end
       else
-        stream_identity = "#{tag}:default"
+        if @stream_identity_key
+          stream_identity = "#{tag}:#{record[@stream_identity_key]}"
+        else
+          stream_identity = "#{tag}:default"
+        end
+      end
+      @timeout_map_mutex.synchronize do
+        @timeout_map[stream_identity] = Fluent::Engine.now
       end
-      @timeout_map[stream_identity] = Fluent::Engine.now
       case @mode
       when :line
         process_line(stream_identity, tag, time, record)
+      when :partial
+        process_partial(stream_identity, tag, time, record)
+      when :partial_metadata
+        process_partial_metadata(stream_identity, tag, time, record)
+      when :partial_cri
+        process_partial_cri(stream_identity, tag, time, record)
       when :regexp
         process_regexp(stream_identity, tag, time, record)
       end
@@ -137,6 +268,42 @@ module Fluent::Plugin
       new_es
     end
 
+    def process_partial(stream_identity, tag, time, record)
+      new_es = Fluent::MultiEventStream.new
+      @buffer[stream_identity] << [tag, time, record]
+      unless @partial_value == record[@partial_key]
+        new_time, new_record = flush_buffer(stream_identity)
+        time = new_time if @use_first_timestamp
+        new_record.delete(@partial_key)
+        new_es.add(time, new_record)
+      end
+      new_es
+    end
+
+    def process_partial_cri(stream_identity, tag, time, record)
+      new_es = Fluent::MultiEventStream.new
+      @buffer[stream_identity] << [tag, time, record]
+      if record[@partial_cri_logtag_key].split(@partial_logtag_delimiter)[0] == @partial_logtag_full
+        new_time, new_record = flush_buffer(stream_identity)
+        time = new_time if @use_first_timestamp
+        new_record.delete(@partial_cri_logtag_key)
+        new_es.add(time, new_record)
+      end
+      new_es
+    end
+
+    def process_partial_metadata(stream_identity, tag, time, record)
+      new_es = Fluent::MultiEventStream.new
+      @buffer[stream_identity] << [tag, time, record]
+      if record[@partial_last_field] == "true"
+        new_time, new_record = flush_buffer(stream_identity)
+        time = new_time if @use_first_timestamp
+        new_record.delete(@partial_key)
+        new_es.add(time, new_record)
+      end
+      new_es
+    end
+
     def process_regexp(stream_identity, tag, time, record)
       new_es = Fluent::MultiEventStream.new
       case
@@ -189,23 +356,29 @@ module Fluent::Plugin
     end
 
     def firstline?(text)
-      @multiline_start_regexp && !!@multiline_start_regexp.match(text)
+      @multiline_start_regexp && @multiline_start_regexp.match?(text)
     end
 
     def lastline?(text)
-      @multiline_end_regexp && !!@multiline_end_regexp.match(text)
+      @multiline_end_regexp && @multiline_end_regexp.match?(text)
     end
 
     def continuous_line?(text)
       if @continuous_line_regexp
-        !!@continuous_line_regexp.match(text)
+        @continuous_line_regexp.match?(text)
       else
         true
       end
     end
 
     def flush_buffer(stream_identity, new_element = nil)
-      lines = @buffer[stream_identity].map {|_tag, _time, record| record[@key] }
+      lines = if @mode == :partial_metadata
+                @buffer[stream_identity]
+                  .sort_by {|_tag, _time, record| record[@partial_ordinal_field].to_i }
+                  .map {|_tag, _time, record| record[@key] }
+              else
+                @buffer[stream_identity].map {|_tag, _time, record| record[@key] }
+              end
       _tag, time, first_record = @buffer[stream_identity].first
       new_record = {
         @key => lines.join(@separator)
@@ -218,18 +391,20 @@ module Fluent::Plugin
     def flush_timeout_buffer
       now = Fluent::Engine.now
       timeout_stream_identities = []
-      @timeout_map.each do |stream_identity, previous_timestamp|
-        next if @flush_interval > (now - previous_timestamp)
-        next if @buffer[stream_identity].empty?
-        time, flushed_record = flush_buffer(stream_identity)
-        timeout_stream_identities << stream_identity
-        tag = stream_identity.split(":").first
-        message = "Timeout flush: #{stream_identity}"
-        handle_timeout_error(tag, @use_first_timestamp ? time : now, flushed_record, message)
-        log.info(message)
-      end
-      @timeout_map.reject! do |stream_identity, _|
-        timeout_stream_identities.include?(stream_identity)
+      @timeout_map_mutex.synchronize do
+        @timeout_map.each do |stream_identity, previous_timestamp|
+          next if @flush_interval > (now - previous_timestamp)
+          next if @buffer[stream_identity].empty?
+          time, flushed_record = flush_buffer(stream_identity)
+          timeout_stream_identities << stream_identity
+          tag = stream_identity.split(":").first
+          message = "Timeout flush: #{stream_identity}"
+          handle_timeout_error(tag, @use_first_timestamp ? time : now, flushed_record, message)
+          log.info(message)
+        end
+        @timeout_map.reject! do |stream_identity, _|
+          timeout_stream_identities.include?(stream_identity)
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-concat
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.5.0
 platform: ruby
 authors:
 - Kenji Okimoto
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2021-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -34,16 +34,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +100,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Fluentd Filter plugin to concat multiple event messages
 email:
 - okimoto@clear-code.com
@@ -108,9 +122,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/ISSUE_TEMPLATE.md"
+- ".github/workflows/linux.yml"
+- ".github/workflows/windows.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Appraisals
 - Gemfile
 - LICENSE.txt
@@ -118,13 +133,12 @@ files:
 - README.md
 - Rakefile
 - fluent-plugin-concat.gemspec
-- gemfiles/fluentd_v0.14.gemfile
 - lib/fluent/plugin/filter_concat.rb
 homepage: https://github.com/fluent-plugins-nursery/fluent-plugin-concat
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -139,9 +153,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Fluentd Filter plugin to concat multiple event messages
 test_files: []

data/.travis.yml

@@ -1,21 +0,0 @@
-sudo: false
-language: ruby
-
-notifications:
-  webhooks:
-    urls:
-      secure: NhOBulc3nFAnJrCr9G0/3IGd1pOb/Zk0Wyk9Jqrf7PHnI4mZOIgttGnewZx1sG96NWrs0Braue5vXwFBTrJ60J6EW3+Q33XzhaZR+Q95jEb+5vcdIP69TYs0TgOIiOouo69Y4rIE1ANYuF/1cBfCKxGulpOIKUCW5LYPkyUEwQy+7VccULctCYCha2OYHQau5SUITCQQqZMfYCvZ+9FRubhR+OiiAnwduuzixKm5b2sa2K4lCKy2vsz3JZtjvQ6/7WM5JsipErtuUY2fDlrWSr/9SehRu8LCD119FjV/HcaAffFMokX+8vJm6RLGcyx/0mAejEqaBofqf9vi1KQJKsKuEe8N9IUpoLrl36RYVfDDRNDqm0pSkrz/KaNxSSe5sDNsCFY+uEFhtiPMHJiSlyEA+BVqnUeoM9pSWp3pcTsIHAjq5VGfQ6u9IooUODCASBlOsLuPu+FYEWG3dC3oiOLEIqQ+WywJg2P7I4dJNhyivti5j61czipTGj28ReFiydp5macKabkvAFBvOW8q07QBO4cvjixhr8hiUgMEVdo5y5dqNhLvS182by3OpmtaSQfpuI8QXytiN9629lWzB7qu0Q7Pji/5wSqEuCdaEHjF5uCVYLFE2LaGJdlTLBg9n0vFfFpJXnP1q0nehq2qRs30pNcgkcCKfEIPJgFgCac=
-    on_success: change
-    on_failure: always
-    on_start: never
-
-rvm:
-  - 2.1
-  - 2.2
-  - 2.3
-  - 2.4.3
-  - 2.5.0
-
-gemfile:
-  - Gemfile
-  - gemfiles/fluentd_v0.14.gemfile

data/gemfiles/fluentd_v0.14.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "fluentd", "~> 0.14.0"
-
-gemspec :path => "../"