fluent-plugin-concat 2.6.0 → 2.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/dependabot.yml +6 -0
- data/.github/workflows/add-to-project.yml +9 -2
- data/.github/workflows/linux.yml +17 -12
- data/.github/workflows/windows.yml +17 -6
- data/NEWS.md +9 -4
- data/fluent-plugin-concat.gemspec +1 -1
- data/lib/fluent/plugin/filter_concat.rb +6 -2
- metadata +3 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 57c16827309de887d99790f740319040ac08b1ab8e137d8c99caa7f8c71b68f0
|
|
4
|
+
data.tar.gz: 99ac67b840a21e911128cff0123426f11911f1c4baf7324eaab4f1f615dbf160
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8fc317393e1dfbdb7cecc39e0fb045ee82ea93f4f21e3a0f377c460b0df6b0d89f0ef1cd4ff11aeb20a99f7ae3134a4ddd7c96e7166fceca46c4f4ad36f4b168
|
|
7
|
+
data.tar.gz: 20661b96b7799c0484c98a7b9ece9376b4b004d7b3e054c7eb3b3de0c9c760ba6354d72b8f3e8025284f4dad85afe2a08ec3dc69f11df8f6359493a6a15ba496
|
|
@@ -10,8 +10,15 @@ jobs:
|
|
|
10
10
|
name: Add issue to project
|
|
11
11
|
runs-on: ubuntu-latest
|
|
12
12
|
steps:
|
|
13
|
-
-
|
|
13
|
+
- name: Generate token
|
|
14
|
+
id: generate_token
|
|
15
|
+
uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
|
|
16
|
+
with:
|
|
17
|
+
app-id: ${{ secrets.PROJECT_APP_ID }}
|
|
18
|
+
private-key: ${{ secrets.PROJECT_APP_PRIVATE_KEY }}
|
|
19
|
+
owner: fluent
|
|
20
|
+
- uses: actions/add-to-project@244f685bbc3b7adfa8466e08b698b5577571133e # v1.0.2
|
|
14
21
|
with:
|
|
15
22
|
project-url: https://github.com/orgs/fluent/projects/4
|
|
16
|
-
github-token: ${{
|
|
23
|
+
github-token: ${{ steps.generate_token.outputs.token }}
|
|
17
24
|
labeled: waiting-for-triage
|
data/.github/workflows/linux.yml
CHANGED
|
@@ -1,26 +1,32 @@
|
|
|
1
1
|
name: Testing on Ubuntu
|
|
2
2
|
on:
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
push:
|
|
4
|
+
branches: [master]
|
|
5
|
+
pull_request:
|
|
6
|
+
branches: [master]
|
|
7
|
+
schedule:
|
|
8
|
+
- cron: '0 0 1 * *'
|
|
5
9
|
jobs:
|
|
10
|
+
ruby-versions:
|
|
11
|
+
uses: ruby/actions/.github/workflows/ruby_versions.yml@master
|
|
12
|
+
with:
|
|
13
|
+
engine: cruby
|
|
14
|
+
min_version: 2.7
|
|
6
15
|
build:
|
|
16
|
+
needs: ruby-versions
|
|
7
17
|
runs-on: ${{ matrix.os }}
|
|
8
18
|
strategy:
|
|
9
19
|
fail-fast: false
|
|
10
20
|
matrix:
|
|
11
|
-
ruby:
|
|
12
|
-
|
|
13
|
-
-
|
|
14
|
-
- 3.1
|
|
15
|
-
- 3.2
|
|
16
|
-
- 3.3
|
|
17
|
-
- 3.4
|
|
21
|
+
ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
|
|
22
|
+
exclude:
|
|
23
|
+
- ruby: head
|
|
18
24
|
os:
|
|
19
25
|
- ubuntu-latest
|
|
20
26
|
name: Ruby ${{ matrix.ruby }} unit testing on ${{ matrix.os }}
|
|
21
27
|
steps:
|
|
22
|
-
- uses: actions/checkout@
|
|
23
|
-
- uses: ruby/setup-ruby@v1
|
|
28
|
+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
|
|
29
|
+
- uses: ruby/setup-ruby@6ca151fd1bfcfd6fe0c4eb6837eb0584d0134a0c # v1.290.0
|
|
24
30
|
with:
|
|
25
31
|
ruby-version: ${{ matrix.ruby }}
|
|
26
32
|
rubygems: latest
|
|
@@ -28,6 +34,5 @@ jobs:
|
|
|
28
34
|
env:
|
|
29
35
|
CI: true
|
|
30
36
|
run: |
|
|
31
|
-
gem install bundler rake
|
|
32
37
|
bundle install --jobs 4 --retry 3
|
|
33
38
|
bundle exec rake test
|
|
@@ -1,20 +1,32 @@
|
|
|
1
1
|
name: Testing on Windows
|
|
2
2
|
on:
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
push:
|
|
4
|
+
branches: [master]
|
|
5
|
+
pull_request:
|
|
6
|
+
branches: [master]
|
|
7
|
+
schedule:
|
|
8
|
+
- cron: '0 0 1 * *'
|
|
5
9
|
jobs:
|
|
10
|
+
ruby-versions:
|
|
11
|
+
uses: ruby/actions/.github/workflows/ruby_versions.yml@master
|
|
12
|
+
with:
|
|
13
|
+
engine: cruby
|
|
14
|
+
min_version: 2.7
|
|
6
15
|
build:
|
|
16
|
+
needs: ruby-versions
|
|
7
17
|
runs-on: ${{ matrix.os }}
|
|
8
18
|
strategy:
|
|
9
19
|
fail-fast: false
|
|
10
20
|
matrix:
|
|
11
|
-
ruby:
|
|
21
|
+
ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
|
|
22
|
+
exclude:
|
|
23
|
+
- ruby: head
|
|
12
24
|
os:
|
|
13
25
|
- windows-latest
|
|
14
26
|
name: Ruby ${{ matrix.ruby }} unit testing on ${{ matrix.os }}
|
|
15
27
|
steps:
|
|
16
|
-
- uses: actions/checkout@
|
|
17
|
-
- uses: ruby/setup-ruby@v1
|
|
28
|
+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
|
|
29
|
+
- uses: ruby/setup-ruby@6ca151fd1bfcfd6fe0c4eb6837eb0584d0134a0c # v1.290.0
|
|
18
30
|
with:
|
|
19
31
|
ruby-version: ${{ matrix.ruby }}
|
|
20
32
|
rubygems: latest
|
|
@@ -22,6 +34,5 @@ jobs:
|
|
|
22
34
|
env:
|
|
23
35
|
CI: true
|
|
24
36
|
run: |
|
|
25
|
-
gem install bundler rake
|
|
26
37
|
bundle install --jobs 4 --retry 3
|
|
27
38
|
bundle exec rake test
|
data/NEWS.md
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
# ChangeLog
|
|
2
2
|
|
|
3
|
-
##
|
|
3
|
+
## v2.6.1
|
|
4
4
|
|
|
5
|
-
###
|
|
5
|
+
### Fixes
|
|
6
6
|
|
|
7
|
-
*
|
|
7
|
+
* Fix NoMethodError when calculating bytesize of non-string record values. See #136
|
|
8
8
|
|
|
9
9
|
## v2.6.0
|
|
10
10
|
|
|
@@ -12,6 +12,12 @@
|
|
|
12
12
|
|
|
13
13
|
* Support `buffer_limit_size`, `buffer_overflow_method` to change behavior when buffer overflow. See #68
|
|
14
14
|
|
|
15
|
+
## v2.5.0
|
|
16
|
+
|
|
17
|
+
### Improvements
|
|
18
|
+
|
|
19
|
+
* adds `partial_metadata_format` to support Docker 20.10 journald log driver improvements [moby/moby#41407](https://github.com/moby/moby/pull/41407)
|
|
20
|
+
|
|
15
21
|
## v2.3.0
|
|
16
22
|
|
|
17
23
|
### Improvements
|
|
@@ -63,4 +69,3 @@
|
|
|
63
69
|
### Incompatibilities
|
|
64
70
|
|
|
65
71
|
* Flush buffer when match both `multiline_start_regexp` and `multiline_end_regexp`
|
|
66
|
-
|
|
@@ -300,7 +300,7 @@ module Fluent::Plugin
|
|
|
300
300
|
end
|
|
301
301
|
if force_flush && @buffer_overflow_method == :new
|
|
302
302
|
@buffer[stream_identity] << [tag, time, record]
|
|
303
|
-
@buffer_size[stream_identity] =
|
|
303
|
+
@buffer_size[stream_identity] = record_bytesize(record)
|
|
304
304
|
if @partial_value != record[@partial_key]
|
|
305
305
|
new_time, new_record = flush_buffer(stream_identity)
|
|
306
306
|
time = new_time if @use_first_timestamp
|
|
@@ -403,7 +403,7 @@ module Fluent::Plugin
|
|
|
403
403
|
end
|
|
404
404
|
|
|
405
405
|
def overflow?(stream_identity, record)
|
|
406
|
-
size =
|
|
406
|
+
size = record_bytesize(record)
|
|
407
407
|
if @buffer_size[stream_identity] + size > @buffer_limit_size
|
|
408
408
|
@buffer_size[stream_identity] = 0
|
|
409
409
|
true
|
|
@@ -475,6 +475,10 @@ module Fluent::Plugin
|
|
|
475
475
|
router.emit_error_event(tag, time, record, TimeoutError.new(message))
|
|
476
476
|
end
|
|
477
477
|
end
|
|
478
|
+
|
|
479
|
+
def record_bytesize(record)
|
|
480
|
+
record.keys.sum(&:bytesize) + record.values.sum { |v| v.to_s.bytesize }
|
|
481
|
+
end
|
|
478
482
|
end
|
|
479
483
|
end
|
|
480
484
|
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: fluent-plugin-concat
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.6.
|
|
4
|
+
version: 2.6.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Kenji Okimoto
|
|
@@ -123,6 +123,7 @@ files:
|
|
|
123
123
|
- ".github/ISSUE_TEMPLATE/bug_report.yml"
|
|
124
124
|
- ".github/ISSUE_TEMPLATE/config.yml"
|
|
125
125
|
- ".github/ISSUE_TEMPLATE/feature_request.yml"
|
|
126
|
+
- ".github/dependabot.yml"
|
|
126
127
|
- ".github/workflows/add-to-project.yml"
|
|
127
128
|
- ".github/workflows/linux.yml"
|
|
128
129
|
- ".github/workflows/windows.yml"
|
|
@@ -154,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
154
155
|
- !ruby/object:Gem::Version
|
|
155
156
|
version: '0'
|
|
156
157
|
requirements: []
|
|
157
|
-
rubygems_version: 3.6.
|
|
158
|
+
rubygems_version: 3.6.9
|
|
158
159
|
specification_version: 4
|
|
159
160
|
summary: Fluentd Filter plugin to concat multiple event messages
|
|
160
161
|
test_files: []
|