Clear button on ConsoleLogs page

dotnet · Feb 5, 2025 · 9ddc708 · 9ddc708
1 parent a49a22b
commit 9ddc708
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 24 deletions.
diff --git a/src/Aspire.Dashboard/Components/Pages/ConsoleLogs.razor b/src/Aspire.Dashboard/Components/Pages/ConsoleLogs.razor
@@ -27,6 +27,8 @@
                             @bind-SelectedResource:after="HandleSelectedOptionChangedAsync"
                             LabelClass="toolbar-left" />
 
+            <ClearSignalsButton SelectedResource="PageViewModel.SelectedOption" HandleClearSignal="ClearConsoleLogs" />
+
             @foreach (var command in _highlightedCommands)
             {
                 <FluentButton Appearance="Appearance.Lightweight"

diff --git a/src/Aspire.Dashboard/Components/Pages/ConsoleLogs.razor.cs b/src/Aspire.Dashboard/Components/Pages/ConsoleLogs.razor.cs
@@ -12,6 +12,7 @@
 using Aspire.Dashboard.Model;
 using Aspire.Dashboard.Model.Otlp;
 using Aspire.Dashboard.Otlp.Model;
+using Aspire.Dashboard.Otlp.Storage;
 using Aspire.Dashboard.Resources;
 using Aspire.Dashboard.Utils;
 using Aspire.Hosting.ConsoleLogs;
@@ -95,6 +96,9 @@ private sealed class ConsoleLogsSubscription
     private bool _showTimestamp;
     public ConsoleLogsViewModel PageViewModel { get; set; } = null!;
 
+    private readonly Dictionary<ApplicationKey, DateTime> _ignoreLogsBeforeTimeByApplicationKey = new Dictionary<ApplicationKey, DateTime>();
+    private DateTime _ignoreAllLogsBefore { get; set; } = DateTime.MinValue;
+
     public string BasePath => DashboardUrls.ConsoleLogBasePath;
     public string SessionStorageKey => BrowserStorageKeys.ConsoleLogsPageState;
 
@@ -217,35 +221,35 @@ protected override async Task OnParametersSetAsync()
             Logger.LogDebug("New resource {ResourceName} selected.", selectedResourceName);
 
             ConsoleLogsSubscription? newConsoleLogsSubscription = null;
-            if (selectedResourceName is not null)
-            {
-                newConsoleLogsSubscription = new ConsoleLogsSubscription { Name = selectedResourceName };
-                Logger.LogDebug("Creating new subscription {SubscriptionId}.", newConsoleLogsSubscription.SubscriptionId);
+        if (selectedResourceName is not null)
+        {
+            newConsoleLogsSubscription = new ConsoleLogsSubscription { Name = selectedResourceName };
+            Logger.LogDebug("Creating new subscription {SubscriptionId}.", newConsoleLogsSubscription.SubscriptionId);
 
-                if (Logger.IsEnabled(LogLevel.Debug))
+            if (Logger.IsEnabled(LogLevel.Debug))
+            {
+                newConsoleLogsSubscription.CancellationToken.Register(state =>
                 {
-                    newConsoleLogsSubscription.CancellationToken.Register(state =>
-                    {
-                        var s = (ConsoleLogsSubscription)state!;
-                        Logger.LogDebug("Canceling subscription {SubscriptionId} to {ResourceName}.", s.SubscriptionId, s.Name);
-                    }, newConsoleLogsSubscription);
-                }
+                    var s = (ConsoleLogsSubscription)state!;
+                    Logger.LogDebug("Canceling subscription {SubscriptionId} to {ResourceName}.", s.SubscriptionId, s.Name);
+                }, newConsoleLogsSubscription);
             }
+        }
 
-            if (_consoleLogsSubscription is { } currentSubscription)
-            {
-                currentSubscription.Cancel();
-                _consoleLogsSubscription = newConsoleLogsSubscription;
+        if (_consoleLogsSubscription is { } currentSubscription)
+        {
+            currentSubscription.Cancel();
+            _consoleLogsSubscription = newConsoleLogsSubscription;
 
-                await TaskHelpers.WaitIgnoreCancelAsync(currentSubscription.SubscriptionTask);
-            }
-            else
-            {
-                _consoleLogsSubscription = newConsoleLogsSubscription;
-            }
+            await TaskHelpers.WaitIgnoreCancelAsync(currentSubscription.SubscriptionTask);
+        }
+        else
+        {
+            _consoleLogsSubscription = newConsoleLogsSubscription;
+        }
 
-            Logger.LogDebug("Creating new log entries collection.");
-            _logEntries = new(Options.Value.Frontend.MaxConsoleLogCount);
+        Logger.LogDebug("Creating new log entries collection.");
+        _logEntries = new(Options.Value.Frontend.MaxConsoleLogCount);
 
             if (newConsoleLogsSubscription is not null)
             {
@@ -417,6 +421,17 @@ private void LoadLogs(ConsoleLogsSubscription newConsoleLogsSubscription)
 
             try
             {
+                var ignoreLogsBefore = _ignoreAllLogsBefore; // 'Global' ignore before timestamp, defaults to DateTime.Min
+                if (PageViewModel.SelectedOption.Id is not null &&
+                    _ignoreLogsBeforeTimeByApplicationKey.TryGetValue(
+                        PageViewModel.SelectedOption.Id.GetApplicationKey(),
+                        out var _ignoreBeforeForApp) &&
+                    _ignoreBeforeForApp > ignoreLogsBefore)
+                {
+                    // If we have an entry for the specific app that is a higher value than the 'global' ignore, we use that.
+                    ignoreLogsBefore = _ignoreBeforeForApp;
+                }
+
                 var logParser = new LogParser();
                 await foreach (var batch in subscription.ConfigureAwait(true))
                 {
@@ -434,7 +449,11 @@ private void LoadLogs(ConsoleLogsSubscription newConsoleLogsSubscription)
                         }
 
                         var logEntry = logParser.CreateLogEntry(content, isErrorOutput);
-                        _logEntries.InsertSorted(logEntry);
+                        if (logEntry.Timestamp is null || logEntry.Timestamp > ignoreLogsBefore)
+                        {
+                            // Only add entries that are not ignored, or if they are null as we cannot know when they happened.
+                            _logEntries.InsertSorted(logEntry);
+                        }
                     }
 
                     await InvokeAsync(StateHasChanged);
@@ -531,6 +550,21 @@ private async Task DownloadLogsAsync()
         await JS.InvokeVoidAsync("downloadStreamAsFile", fileName, streamReference);
     }
 
+    private async Task ClearConsoleLogs(ApplicationKey? key)
+    {
+        if (key is null)
+        {
+            _ignoreAllLogsBefore = DateTime.UtcNow;
+        }
+        else
+        {
+            _ignoreLogsBeforeTimeByApplicationKey[key.Value] = DateTime.UtcNow;
+        }
+
+        _logEntries.Clear();
+        await InvokeAsync(StateHasChanged);
+    }
+
     public async ValueTask DisposeAsync()
     {
         _resourceSubscriptionCts.Cancel();