[Feat] new server adapter

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
           path: deps
           key: v1-${{ matrix.os }}-${{ matrix.otp }}-${{ matrix.elixir }}-mix-${{ hashFiles(format('{0}{1}', github.workspace, '/mix.lock')) }}
       - name: Install Dependencies
-        run: mix deps.get 1>/dev/null
+        run: mix setup 1>/dev/null
       - name: Check format
         run: mix format --check-formatted
   tests:

benchmark/bin/test.exs

@@ -3,10 +3,10 @@ server =
     async_server_threads: 1,
     port: 10000,
     channel_args: [
-      Grpc.Testing.ChannelArg.new(
+      %Grpc.Testing.ChannelArg{
         name: "grpc.optimization_target",
         value: {:str_value, "latency"}
-      )
+      }
     ]
   )
 

benchmark/config/config.exs

@@ -1,5 +1,6 @@
 import Config
 
-config :logger, level: :info
+# Reduce logging overhead by default for better performance
+config :logger, level: :error
 
-import_config "#{Mix.env()}.exs"
+import_config "#{config_env()}.exs"

benchmark/lib/benchmark/server_manager.ex

@@ -1,13 +1,25 @@
 defmodule Benchmark.ServerManager do
-  def start_server(%Grpc.Testing.ServerConfig{} = config) do
+  def start_server(%Grpc.Testing.ServerConfig{} = config, opts \\ []) do
     # get security
     payload_type = Benchmark.Manager.payload_type(config.payload_config)
-    start_server(payload_type, config)
+    start_server(payload_type, config, opts)
   end
 
-  def start_server(:protobuf, config) do
+  def start_server(:protobuf, config, opts) do
     cores = Benchmark.Manager.set_cores(config.core_limit)
-    {:ok, pid, port} = GRPC.Server.start(Grpc.Testing.BenchmarkService.Server, config.port)
+
+    # Extract adapter option, default to Cowboy
+    adapter = Keyword.get(opts, :adapter, GRPC.Server.Adapters.Cowboy)
+    adapter_name = adapter |> Module.split() |> List.last()
+
+    IO.puts("Starting server with #{adapter_name} adapter on port #{config.port}...")
+
+    {:ok, pid, port} =
+      GRPC.Server.start(
+        Grpc.Testing.BenchmarkService.Server,
+        config.port,
+        adapter: adapter
+      )
 
     %Benchmark.Server{
       cores: cores,
@@ -18,5 +30,10 @@ defmodule Benchmark.ServerManager do
     }
   end
 
-  def start_server(_, _), do: raise(GRPC.RPCError, status: :unimplemented)
+  def start_server(_, _, _), do: raise(GRPC.RPCError, status: :unimplemented)
+
+  def stop_server(%Benchmark.Server{} = _server, opts \\ []) do
+    adapter = Keyword.get(opts, :adapter, GRPC.Server.Adapters.Cowboy)
+    GRPC.Server.stop(Grpc.Testing.BenchmarkService.Server, adapter: adapter)
+  end
 end

benchmark/lib/grpc/worker_server.ex

@@ -21,19 +21,19 @@ defmodule Grpc.Testing.WorkerService.Server do
             {server, stats} = Benchmark.Server.get_stats(server)
 
             status =
-              Grpc.Testing.ServerStatus.new(
+              %Grpc.Testing.ServerStatus{
                 stats: stats,
                 port: server.port,
                 cores: server.cores
-              )
+              }
 
             {server, status}
 
           {:mark, mark} ->
             {server, stats} = Benchmark.Server.get_stats(server, mark)
 
             status =
-              Grpc.Testing.ServerStatus.new(cores: server.cores, port: server.port, stats: stats)
+              %Grpc.Testing.ServerStatus{cores: server.cores, port: server.port, stats: stats}
 
             {server, status}
         end
@@ -53,11 +53,11 @@ defmodule Grpc.Testing.WorkerService.Server do
         case args.argtype do
           {:setup, client_config} ->
             manager = ClientManager.start_client(client_config)
-            {Grpc.Testing.ClientStatus.new(), manager}
+            {%Grpc.Testing.ClientStatus{}, manager}
 
           {:mark, mark} ->
             stats = ClientManager.get_stats(manager, mark.reset)
-            {Grpc.Testing.ClientStatus.new(stats: stats), manager}
+            {%Grpc.Testing.ClientStatus{stats: stats}, manager}
         end
 
       Logger.debug("Client send reply #{inspect(status)}")
@@ -70,6 +70,6 @@ defmodule Grpc.Testing.WorkerService.Server do
     Logger.debug("Received quit_work")
     Logger.debug(inspect(stream.local[:main_pid]))
     send(stream.local[:main_pid], {:quit, self()})
-    Grpc.Testing.Void.new()
+    %Grpc.Testing.Void{}
   end
 end

benchmark/lib/mix/tasks/benchmark.test.ex

@@ -1,19 +1,22 @@
 defmodule Mix.Tasks.Benchmark.Test do
   @moduledoc """
   Runs a simple gRPC benchmark test.
-  
+
   This task starts a benchmark server and client, runs performance tests,
   and reports statistics.
-  
+
   ## Usage
-  
+
       mix benchmark.test
-
+      mix benchmark.test --adapter=thousand_island
+      mix benchmark.test --adapter=cowboy
+
   ## Options
-  
+
     * `--port` - Server port (default: 10000)
     * `--requests` - Number of requests to send (default: 1000)
-
+    * `--adapter` - Server adapter: cowboy or thousand_island (default: cowboy)
+
   """
   use Mix.Task
 
@@ -27,13 +30,27 @@ defmodule Mix.Tasks.Benchmark.Test do
 
     {parsed, _remaining, _invalid} =
       OptionParser.parse(args,
-        strict: [port: :integer, requests: :integer]
+        strict: [port: :integer, requests: :integer, adapter: :string]
       )
 
     port = Keyword.get(parsed, :port, 10000)
     num_requests = Keyword.get(parsed, :requests, 1000)
+    adapter_name = Keyword.get(parsed, :adapter, "cowboy")
+
+    adapter =
+      case String.downcase(adapter_name) do
+        "thousand_island" ->
+          GRPC.Server.Adapters.ThousandIsland
+
+        "cowboy" ->
+          GRPC.Server.Adapters.Cowboy
 
-    Logger.info("Starting benchmark test on port #{port}")
+        _ ->
+          Logger.error("Unknown adapter: #{adapter_name}. Using Cowboy.")
+          GRPC.Server.Adapters.Cowboy
+      end
+
+    Logger.info("Starting benchmark test on port #{port} with #{adapter_name} adapter")
 
     # Configure and start server
     server = %Grpc.Testing.ServerConfig{
@@ -48,7 +65,7 @@ defmodule Mix.Tasks.Benchmark.Test do
     }
 
     Logger.info("Starting server...")
-    server = Benchmark.ServerManager.start_server(server)
+    server = Benchmark.ServerManager.start_server(server, adapter: adapter)
     Logger.info("Server started: #{inspect(server)}")
 
     # Configure client
@@ -98,7 +115,7 @@ defmodule Mix.Tasks.Benchmark.Test do
     # Connect and warm up
     Logger.info("Connecting to server...")
     {:ok, ch} = GRPC.Stub.connect("localhost:#{port}")
-    
+
     Logger.info("Warming up...")
     Grpc.Testing.BenchmarkService.Stub.unary_call(ch, req)
 
@@ -132,6 +149,10 @@ defmodule Mix.Tasks.Benchmark.Test do
     IO.inspect(stats, label: "Stats", pretty: true)
     Logger.info("=" |> String.duplicate(60))
 
+    # Clean shutdown
+    Logger.info("Stopping server...")
+    Benchmark.ServerManager.stop_server(server, adapter: adapter)
+    Logger.info("Server stopped")
     :ok
   end
 end

benchmark/lib/mix/tasks/benchmark.worker.ex

@@ -1,15 +1,15 @@
 defmodule Mix.Tasks.Benchmark.Worker do
   @moduledoc """
   Starts a gRPC worker server for benchmarking.
-  
+
   ## Usage
-  
+
       mix benchmark.worker --port=10000
-  
+
   ## Options
-  
+
     * `--port` - Port to listen on (required)
-  
+
   """
   use Mix.Task
 

benchmark/mix.lock

@@ -11,4 +11,5 @@
   "protobuf": {:hex, :protobuf, "0.15.0", "c9fc1e9fc1682b05c601df536d5ff21877b55e2023e0466a3855cc1273b74dcb", [:mix], [{:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "5d7bb325319db1d668838d2691c31c7b793c34111aec87d5ee467a39dac6e051"},
   "ranch": {:hex, :ranch, "2.2.0", "25528f82bc8d7c6152c57666ca99ec716510fe0925cb188172f41ce93117b1b0", [:make, :rebar3], [], "hexpm", "fa0b99a1780c80218a4197a59ea8d3bdae32fbff7e88527d7d8a4787eff4f8e7"},
   "telemetry": {:hex, :telemetry, "1.3.0", "fedebbae410d715cf8e7062c96a1ef32ec22e764197f70cda73d82778d61e7a2", [:rebar3], [], "hexpm", "7015fc8919dbe63764f4b4b87a95b7c0996bd539e0d499be6ec9d7f3875b79e6"},
+  "thousand_island": {:hex, :thousand_island, "1.4.2", "735fa783005d1703359bbd2d3a5a3a398075ba4456e5afe3c5b7cf4666303d36", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "1c7637f16558fc1c35746d5ee0e83b18b8e59e18d28affd1f2fa1645f8bc7473"},
 }

benchmark/test/benchmark_test.exs

@@ -1,5 +1,4 @@
 defmodule BenchmarkgTest do
   use ExUnit.Case
   doctest Benchmark
-
 end

grpc_client/mix.lock

@@ -21,4 +21,5 @@
   "protobuf": {:hex, :protobuf, "0.15.0", "c9fc1e9fc1682b05c601df536d5ff21877b55e2023e0466a3855cc1273b74dcb", [:mix], [{:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "5d7bb325319db1d668838d2691c31c7b793c34111aec87d5ee467a39dac6e051"},
   "ranch": {:hex, :ranch, "2.2.0", "25528f82bc8d7c6152c57666ca99ec716510fe0925cb188172f41ce93117b1b0", [:make, :rebar3], [], "hexpm", "fa0b99a1780c80218a4197a59ea8d3bdae32fbff7e88527d7d8a4787eff4f8e7"},
   "telemetry": {:hex, :telemetry, "1.3.0", "fedebbae410d715cf8e7062c96a1ef32ec22e764197f70cda73d82778d61e7a2", [:rebar3], [], "hexpm", "7015fc8919dbe63764f4b4b87a95b7c0996bd539e0d499be6ec9d7f3875b79e6"},
+  "thousand_island": {:hex, :thousand_island, "1.4.2", "735fa783005d1703359bbd2d3a5a3a398075ba4456e5afe3c5b7cf4666303d36", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "1c7637f16558fc1c35746d5ee0e83b18b8e59e18d28affd1f2fa1645f8bc7473"},
 }