Drop trace size status validation

Author: mdh1418

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

@@ -28,7 +28,7 @@ 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);
         }
 
         private void ConsoleWriteLine(string str)
@@ -409,34 +409,20 @@ 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();
+                                    ConsoleWriteLine($"[{stopwatch.Elapsed:dd\\:hh\\:mm\\:ss}]\tRecording trace {GetSize(fileInfo.Length)}");
                                     ConsoleWriteLine("Press <Enter> or <Ctrl+C> to exit...");
                                 }
 
@@ -530,11 +516,7 @@ internal async Task<int> Collect(CancellationToken ct, CommandLineConfiguration
                 {
                     if (!Console.IsOutputRedirected)
                     {
-                        try
-                        {
-                            Console.CursorVisible = true;
-                        }
-                        catch { }
+                        Console.CursorVisible = true;
                     }
                 }
 
@@ -766,7 +748,6 @@ 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; }
 #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

@@ -50,7 +50,7 @@ public sealed record CollectArgs(
         [MemberData(nameof(BasicCases))]
         public async Task CollectCommandProviderConfigurationConsolidation(CollectArgs args, string[] expectedSubset)
         {
-            MockConsole console = new(200, 30) { IsOutputRedirected = false };
+            MockConsole console = new(200, 30);
             string[] rawLines = await RunAsync(args, console).ConfigureAwait(true);
             console.AssertSanitizedLinesEqual(CollectSanitizer, expectedSubset);
 
@@ -63,9 +63,8 @@ private static async Task<string[]> RunAsync(CollectArgs config, MockConsole con
             var handler = new CollectCommandHandler();
             handler.StartTraceSessionAsync = (client, cfg, ct) => Task.FromResult<CollectCommandHandler.ICollectSession>(new TestCollectSession());
             handler.ResumeRuntimeAsync = (client, ct) => Task.CompletedTask;
-            handler.CollectSessionEventStream = (name) => new SlowSinkStream(config.EventStream);
+            handler.CollectSessionEventStream = (name) => config.EventStream;
             handler.Console = console;
-            handler.FileSizeForStatus = Encoding.UTF8.GetByteCount(ExpectedPayload);
 
             int exit = await handler.Collect(
                 config.ct,
@@ -96,32 +95,6 @@ private static async Task<string[]> RunAsync(CollectArgs config, MockConsole con
             return console.Lines;
         }
 
-        // As the test payload is small, we need to delay writes to the output stream to ensure
-        // that the status update logic in CollectCommandHandler has a chance to run.
-        private sealed class SlowSinkStream : Stream
-        {
-            private readonly Stream _inner;
-
-            public SlowSinkStream(Stream inner) { _inner = inner; }
-
-            public override bool CanRead => false;
-            public override bool CanSeek => false;
-            public override bool CanWrite => true;
-            public override long Length => throw new NotSupportedException();
-            public override long Position { get => throw new NotSupportedException(); set => throw new NotSupportedException(); }
-
-            public override void Flush() { }
-            public override int Read(byte[] buffer, int offset, int count) => throw new NotSupportedException();
-            public override long Seek(long offset, SeekOrigin origin) => throw new NotSupportedException();
-            public override void SetLength(long value) => throw new NotSupportedException();
-            public override void Write(byte[] buffer, int offset, int count) => _inner.Write(buffer, offset, count);
-            public override async Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken)
-            {
-                await Task.Delay(200, cancellationToken).ConfigureAwait(false);
-                await _inner.WriteAsync(buffer, offset, count, cancellationToken).ConfigureAwait(false);
-            }
-        }
-
         private static string[] CollectSanitizer(string[] lines)
         {
             List<string> result = new();
@@ -131,10 +104,6 @@ private static string[] CollectSanitizer(string[] lines)
                 {
                     result.Add("Process        : <PROCESS>");
                 }
-                else if (line.StartsWith('[') && line.Contains("Recording trace"))
-                {
-                    result.Add("[dd:hh:mm:ss]\t" + line.Substring(14));
-                }
                 else
                 {
                     result.Add(line);
@@ -250,8 +219,7 @@ public static IEnumerable<object[]> BasicCases()
         private static readonly string[] CommonTail = [
             "Process        : <PROCESS>",
             outputFile,
-            "[dd:hh:mm:ss]\tRecording trace 38.00    (B)",
-            "Press <Enter> or <Ctrl+C> to exit...",
+            "",
             "\nTrace completed."
         ];