From 7fec6dd2f3163b77a38c152d682da58672b4dfa3 Mon Sep 17 00:00:00 2001 From: Shizuo Fujita Date: Wed, 10 Jun 2026 13:32:59 +0900 Subject: [PATCH] Replace yajl-ruby with the json gem for JSON handling Since the yajl-ruby gem depends on a deprecated Ruby C API, it cannot be installed with Ruby 4.1. Signed-off-by: Shizuo Fujita --- lib/fluent/plugin/in_s3.rb | 2 +- test/test_in_s3.rb | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/fluent/plugin/in_s3.rb b/lib/fluent/plugin/in_s3.rb index 49ec268..b0a94bb 100644 --- a/lib/fluent/plugin/in_s3.rb +++ b/lib/fluent/plugin/in_s3.rb @@ -210,7 +210,7 @@ def run begin @poller.poll(options) do |message| begin - body = Yajl.load(message.body) + body = JSON.parse(message.body) log.debug(body) next unless is_valid_queue(body) # skip test queue if @match_regexp diff --git a/test/test_in_s3.rb b/test/test_in_s3.rb index 5aadeb8..ed80e06 100644 --- a/test/test_in_s3.rb +++ b/test/test_in_s3.rb @@ -341,7 +341,7 @@ def test_one_record } ] } - message = Struct::StubMessage.new(1, 1, Yajl.dump(body)) + message = Struct::StubMessage.new(1, 1, JSON.generate(body)) @sqs_poller.get_messages(anything, anything) do |config, stats| config.before_request.call(stats) if config.before_request stats.request_count += 1 @@ -376,7 +376,7 @@ def test_one_record_with_metadata } ] } - message = Struct::StubMessage.new(1, 1, Yajl.dump(body)) + message = Struct::StubMessage.new(1, 1, JSON.generate(body)) @sqs_poller.get_messages(anything, anything) do |config, stats| config.before_request.call(stats) if config.before_request stats.request_count += 1 @@ -411,7 +411,7 @@ def test_one_record_url_encoded } ] } - message = Struct::StubMessage.new(1, 1, Yajl.dump(body)) + message = Struct::StubMessage.new(1, 1, JSON.generate(body)) @sqs_poller.get_messages(anything, anything) do |config, stats| config.before_request.call(stats) if config.before_request stats.request_count += 1 @@ -446,7 +446,7 @@ def test_one_record_url_encoded_with_metadata } ] } - message = Struct::StubMessage.new(1, 1, Yajl.dump(body)) + message = Struct::StubMessage.new(1, 1, JSON.generate(body)) @sqs_poller.get_messages(anything, anything) do |config, stats| config.before_request.call(stats) if config.before_request stats.request_count += 1 @@ -481,7 +481,7 @@ def test_one_record_multi_line } ] } - message = Struct::StubMessage.new(1, 1, Yajl.dump(body)) + message = Struct::StubMessage.new(1, 1, JSON.generate(body)) @sqs_poller.get_messages(anything, anything) do |config, stats| config.before_request.call(stats) if config.before_request stats.request_count += 1 @@ -521,7 +521,7 @@ def test_one_record_multi_line_with_metadata } ] } - message = Struct::StubMessage.new(1, 1, Yajl.dump(body)) + message = Struct::StubMessage.new(1, 1, JSON.generate(body)) @sqs_poller.get_messages(anything, anything) do |config, stats| config.before_request.call(stats) if config.before_request stats.request_count += 1 @@ -569,7 +569,7 @@ def test_gzip_single_stream } ] } - message = Struct::StubMessage.new(1, 1, Yajl.dump(body)) + message = Struct::StubMessage.new(1, 1, JSON.generate(body)) @sqs_poller.get_messages(anything, anything) do |config, stats| config.before_request.call(stats) if config.before_request stats.request_count += 1 @@ -620,7 +620,7 @@ def test_gzip_multiple_steams } ] } - message = Struct::StubMessage.new(1, 1, Yajl.dump(body)) + message = Struct::StubMessage.new(1, 1, JSON.generate(body)) @sqs_poller.get_messages(anything, anything) do |config, stats| config.before_request.call(stats) if config.before_request stats.request_count += 1 @@ -661,7 +661,7 @@ def test_regexp_matching } ] } - message = Struct::StubMessage.new(1, 1, Yajl.dump(body)) + message = Struct::StubMessage.new(1, 1, JSON.generate(body)) @sqs_poller.get_messages(anything, anything) do |config, stats| config.before_request.call(stats) if config.before_request stats.request_count += 1 @@ -690,7 +690,7 @@ def test_regexp_not_matching } ] } - message = Struct::StubMessage.new(1, 1, Yajl.dump(body)) + message = Struct::StubMessage.new(1, 1, JSON.generate(body)) @sqs_poller.get_messages(anything, anything) do |config, stats| config.before_request.call(stats) if config.before_request stats.request_count += 1 @@ -735,7 +735,7 @@ def test_event_bridge_mode } } - message = Struct::StubMessage.new(1, 1, Yajl.dump(body)) + message = Struct::StubMessage.new(1, 1, JSON.generate(body)) @sqs_poller.get_messages(anything, anything) do |config, stats| config.before_request.call(stats) if config.before_request stats.request_count += 1