Adjust trace length status testing seam

Author: mdh1418

src/Tools/dotnet-trace/CommandLine/Commands/CollectCommand.cs

@@ -28,7 +28,8 @@ public CollectCommandHandler()
             Console = new DefaultConsole(false);
             StartTraceSessionAsync = async (client, config, ct) => new CollectSession(await client.StartEventPipeSessionAsync(config, ct).ConfigureAwait(false));
             ResumeRuntimeAsync = (client, ct) => client.ResumeRuntimeAsync(ct);
-            CollectSessionEventStream = name => new FileStream(name, FileMode.Create, FileAccess.Write);
+            CollectSessionEventStream = (name) => new FileStream(name, FileMode.Create, FileAccess.Write);
+            GetFileLength = (path) => new FileInfo(path).Length;
         }
 
         private void ConsoleWriteLine(string str)
@@ -409,34 +410,21 @@ internal async Task<int> Collect(CancellationToken ct, CommandLineConfiguration
                             if (printStatusOverTime)
                             {
                                 rewriter = new LineRewriter(Console) { LineToClear = Console.CursorTop - 1 };
-                                try {
-                                    Console.CursorVisible = false;
-                                }
-                                catch {}
+                                Console.CursorVisible = false;
                                 if (!rewriter.IsRewriteConsoleLineSupported)
                                 {
                                     ConsoleWriteLine("Recording trace in progress. Press <Enter> or <Ctrl+C> to exit...");
                                 }
                             }
 
-                            FileInfo fileInfo = null;
-                            if (FileSizeForStatus == 0)
-                            {
-                                fileInfo = new(output.FullName);
-                            }
+                            FileInfo fileInfo = new(output.FullName);
                             Action printStatus = () => {
                                 if (printStatusOverTime && rewriter.IsRewriteConsoleLineSupported)
                                 {
                                     rewriter?.RewriteConsoleLine();
-                                    if (fileInfo != null)
-                                    {
-                                        fileInfo.Refresh();
-                                        ConsoleWriteLine($"[{stopwatch.Elapsed:dd\\:hh\\:mm\\:ss}]\tRecording trace {GetSize(fileInfo.Length)}");
-                                    }
-                                    else
-                                    {
-                                        ConsoleWriteLine($"[{stopwatch.Elapsed:dd\\:hh\\:mm\\:ss}]\tRecording trace {GetSize(FileSizeForStatus)}");
-                                    }
+                                    fileInfo.Refresh();
+                                    long length = GetFileLength(output.FullName);
+                                    ConsoleWriteLine($"[{stopwatch.Elapsed:dd\\:hh\\:mm\\:ss}]\tRecording trace {GetSize(length)}");
                                     ConsoleWriteLine("Press <Enter> or <Ctrl+C> to exit...");
                                 }
 
@@ -530,11 +518,7 @@ internal async Task<int> Collect(CancellationToken ct, CommandLineConfiguration
                 {
                     if (!Console.IsOutputRedirected)
                     {
-                        try
-                        {
-                            Console.CursorVisible = true;
-                        }
-                        catch { }
+                        Console.CursorVisible = true;
                     }
                 }
 
@@ -766,7 +750,7 @@ private sealed class CollectSession : ICollectSession
         internal Func<DiagnosticsClient, CancellationToken, Task> ResumeRuntimeAsync { get; set; }
         internal Func<string, Stream> CollectSessionEventStream { get; set; }
         internal IConsole Console { get; set; }
-        internal long FileSizeForStatus { get; set; }
+        internal Func<string, long> GetFileLength { get; set; }
 #endregion
     }
 }

src/tests/Common/MockConsole.cs

@@ -29,7 +29,7 @@ public MockConsole(int width, int height)
 
         public int WindowWidth { get; init; }
 
-        public bool CursorVisible { get => throw new NotSupportedException(); set => throw new NotImplementedException(); }
+        public bool CursorVisible { get; set; }
 
         public int CursorLeft { get; private set; }
 

src/tests/dotnet-trace/CollectCommandFunctionalTests.cs

@@ -65,7 +65,7 @@ private static async Task<string[]> RunAsync(CollectArgs config, MockConsole con
             handler.ResumeRuntimeAsync = (client, ct) => Task.CompletedTask;
             handler.CollectSessionEventStream = (name) => new SlowSinkStream(config.EventStream);
             handler.Console = console;
-            handler.FileSizeForStatus = Encoding.UTF8.GetByteCount(ExpectedPayload);
+            handler.GetFileLength = (path) => Encoding.UTF8.GetByteCount(ExpectedPayload);
 
             int exit = await handler.Collect(
                 config.ct,