From ba5b206bb1520ef411fb83ddd59981e35b85800a Mon Sep 17 00:00:00 2001
From: Shizuo Fujita <fujita@clear-code.com>
Date: Thu, 16 Jan 2025 12:10:24 +0900
Subject: [PATCH] server: remove codes for async v1.x (#4771)

**Which issue(s) this PR fixes**:
Fixes #

**What this PR does / why we need it**:
Async v2.0 just supports Ruby 3.1 or above.
When we had been supporting Ruby 2.7 and 3.0, we need async v1.x and
v2.x both.
Related to https://github.com/fluent/fluentd/pull/4619

Next fluentd version will drop support of Ruby 3.1 or below.
So, now we can remove the codes for async v1.x
Ref. https://github.com/fluent/fluentd/pull/4745

**Docs Changes**:

**Release Note**:

Signed-off-by: Shizuo Fujita <fujita@clear-code.com>
---
 fluentd.gemspec                                |  2 +-
 lib/fluent/plugin_helper/http_server/server.rb | 18 ++++--------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/fluentd.gemspec b/fluentd.gemspec
index c7afb175ec..c7c03911ad 100644
--- a/fluentd.gemspec
+++ b/fluentd.gemspec
@@ -65,7 +65,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency("test-unit", ["~> 3.3"])
   gem.add_development_dependency("test-unit-rr", ["~> 1.0"])
   gem.add_development_dependency("oj", [">= 2.14", "< 4"])
-  gem.add_development_dependency("async-http", ">= 0.50.0")
+  gem.add_development_dependency("async-http", "~> 0.86")
   gem.add_development_dependency("aws-sigv4", ["~> 1.8"])
   gem.add_development_dependency("aws-sdk-core", ["~> 3.191"])
   gem.add_development_dependency("rexml", ["~> 3.2"])
diff --git a/lib/fluent/plugin_helper/http_server/server.rb b/lib/fluent/plugin_helper/http_server/server.rb
index 50df177e83..9c099292d8 100644
--- a/lib/fluent/plugin_helper/http_server/server.rb
+++ b/lib/fluent/plugin_helper/http_server/server.rb
@@ -68,11 +68,9 @@ def start(notify = nil)
               notify.push(:ready)
             end
 
-            if async_v2?
-              @server_task_queue = ::Thread::Queue.new
-              @server_task_queue.pop
-              @server_task&.stop
-            end
+            @server_task_queue = ::Thread::Queue.new
+            @server_task_queue.pop
+            @server_task&.stop
           end
 
           @logger.debug('Finished HTTP server')
@@ -80,11 +78,7 @@ def start(notify = nil)
 
         def stop
           @logger.debug('closing HTTP server')
-          if async_v2?
-            @server_task_queue&.push(:stop)
-          else
-            @server_task&.stop
-          end
+          @server_task_queue.push(:stop)
         end
 
         HttpServer::Methods::ALL.map { |e| e.downcase.to_sym }.each do |name|
@@ -100,10 +94,6 @@ def stop
             @router.mount(name, path, app || block)
           end
         end
-
-        private def async_v2?
-          Gem::Version.new(Async::VERSION) >= Gem::Version.new('2.0')
-        end
       end
     end
   end