Skip to content

Commit 9000511

Browse files
authored
config: update fluentd to v1.19 (#868)
Ref. https://github.com/fluent/fluentd/releases/tag/v1.19.0 --------- Signed-off-by: Shizuo Fujita <[email protected]>
1 parent 8a93aa1 commit 9000511

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

fluent-package/Gemfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ gem "msgpack", "1.8.0"
2424
gem "oj", "3.16.11"
2525
gem "tzinfo", "2.0.6"
2626
gem "tzinfo-data", "1.2025.2"
27-
gem "async", "2.26.0"
27+
28+
# Fluentd v1.19.0 requires io-event 1.10.x or before.
29+
# The dependency condition cannot be met with async >= 2.25
30+
gem "async", "2.24.0"
2831
gem "async-http", "0.89.0"
2932
gem "webrick", "1.9.1"
3033

fluent-package/Gemfile.lock

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ GIT
99

1010
GIT
1111
remote: https://github.com/fluent/fluentd
12-
revision: bee06706104aad4ee243f2e959c6d18005762b35
13-
ref: bee06706104aad4ee243f2e959c6d18005762b35
12+
revision: ed15edc4b7c86c1fcea3fbf326b7c42325e6fc71
13+
ref: ed15edc4b7c86c1fcea3fbf326b7c42325e6fc71
1414
specs:
15-
fluentd (1.18.0)
15+
fluentd (1.19.0)
1616
async-http (~> 0.86)
1717
base64 (~> 0.2)
1818
bundler
@@ -22,6 +22,8 @@ GIT
2222
drb (~> 2.2)
2323
fiddle (~> 1.1)
2424
http_parser.rb (>= 0.5.1, < 0.9.0)
25+
io-event (< 1.11.0)
26+
io-stream (< 0.8.0)
2527
logger (~> 1.6)
2628
msgpack (>= 1.3.1, < 2.0.0)
2729
serverengine (>= 2.3.2, < 3.0.0)
@@ -42,10 +44,10 @@ GEM
4244
specs:
4345
addressable (2.8.7)
4446
public_suffix (>= 2.0.2, < 7.0)
45-
async (2.26.0)
47+
async (2.24.0)
4648
console (~> 1.29)
4749
fiber-annotation
48-
io-event (~> 1.12)
50+
io-event (~> 1.9)
4951
metrics (~> 0.12)
5052
traces (~> 0.15)
5153
async-http (0.89.0)
@@ -225,8 +227,8 @@ GEM
225227
httpclient (2.9.0)
226228
mutex_m
227229
io-endpoint (0.15.2)
228-
io-event (1.12.0)
229-
io-stream (0.10.0)
230+
io-event (1.10.2)
231+
io-stream (0.7.0)
230232
jmespath (1.6.2)
231233
json (2.13.0)
232234
linux-utmpx (0.3.0)
@@ -338,7 +340,7 @@ PLATFORMS
338340
x86_64-linux
339341

340342
DEPENDENCIES
341-
async (= 2.26.0)
343+
async (= 2.24.0)
342344
async-http (= 0.89.0)
343345
aws-partitions (= 1.1134.0)
344346
aws-sdk-core (= 3.227.0)

fluent-package/config.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
PACKAGE_DIR = "fluent"
88
COMPAT_PACKAGE_DIR = COMPAT_SERVICE_NAME
99

10-
FLUENTD_REVISION = 'cefbc62e21570c4761a78297d481adff51e36692' # HEAD #5031
10+
FLUENTD_REVISION = 'ed15edc4b7c86c1fcea3fbf326b7c42325e6fc71' # v1.19.0
1111
FLUENTD_LOCAL_GEM_REPO = "file://" + File.expand_path(File.join(__dir__, "local_gem_repo"))
1212

1313
# https://github.com/jemalloc/jemalloc/releases

0 commit comments

Comments
 (0)