Merge pull request #382 from liammclennan/increase-timeout-for-bench

Add `--timeout` option to bench command

Author: liammclennan

src/SeqCli/Cli/Commands/Bench/BenchCommand.cs

@@ -69,13 +69,14 @@ class BenchCommand : Command
     int _runs = 10;
     readonly ConnectionFeature _connection;
     readonly DateRangeFeature _range;
+    readonly TimeoutFeature _timeout;
     string _cases = "";
     string _reportingServerUrl = "";
     string _reportingServerApiKey = "";
     string _description = "";
     bool _withIngestion = false;
     bool _withQueries = false;
-    
+
     public BenchCommand(SeqConnectionFactory connectionFactory)
     {
         _connectionFactory = connectionFactory;
@@ -88,6 +89,7 @@ public BenchCommand(SeqConnectionFactory connectionFactory)
 
         _connection = Enable<ConnectionFeature>();
         _range = Enable<DateRangeFeature>();
+        _timeout = Enable<TimeoutFeature>();
 
         Options.Add(
             "reporting-server=", 
@@ -123,6 +125,7 @@ protected override async Task<int> Run()
         {
             var (_, apiKey) = _connectionFactory.GetConnectionDetails(_connection);
             var connection = _connectionFactory.Connect(_connection);
+            var timeout = _timeout.ApplyTimeout(connection.Client.HttpClient);
             var seqVersion = (await connection.Client.GetRootAsync()).Version;
             await using var reportingLogger = BuildReportingLogger();
 
@@ -194,7 +197,7 @@ protected override async Task<int> Run()
 
                 if (_withQueries)
                 {
-                    var collectedTimings = await QueryBenchmark(reportingLogger, runId, connection, seqVersion);
+                    var collectedTimings = await QueryBenchmark(reportingLogger, runId, connection, seqVersion, timeout);
                     collectedTimings.LogSummary(_description);
                     cancellationTokenSource.Cancel();
                 }
@@ -231,7 +234,8 @@ async Task IngestionBenchmark(Logger reportingLogger, string runId, SeqConnectio
         }
     }
 
-    async Task<QueryBenchRunResults> QueryBenchmark(Logger reportingLogger, string runId, SeqConnection connection, string seqVersion)
+    async Task<QueryBenchRunResults> QueryBenchmark(Logger reportingLogger, string runId, SeqConnection connection,
+        string seqVersion, TimeSpan? timeout)
     {
         var cases = ReadCases(_cases);
         QueryBenchRunResults queryBenchRunResults = new(reportingLogger);
@@ -254,7 +258,7 @@ async Task<QueryBenchRunResults> QueryBenchmark(Logger reportingLogger, string r
                     _range.End,
                     c.SignalExpression != null ? SignalExpressionPart.Signal(c.SignalExpression) : null,
                     null,
-                    TimeSpan.FromMinutes(4)
+                    timeout
                 );
 
                 timings.PushElapsed(response.Statistics.ElapsedMilliseconds);