Use gRPC to communicate data from app host to dashboard

samples/eShopLite/AppHost/AppHost.csproj

@@ -6,6 +6,7 @@
     <UserSecretsId>1bf0740a-0dfc-45aa-9002-def9b2b17da0</UserSecretsId>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsAspireHost>true</IsAspireHost>
+    <AssemblyName>eShopLite.AppHost</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>

spelling.dic

@@ -1,4 +1,7 @@
 ansi
+apigateway
+apiserver
+blazor
 brightblack
 brightblue
 brightcyan
@@ -8,16 +11,22 @@ brightred
 brightwhite
 brightyellow
 dbug
+dcpctrl
 dylib
 equatable
 grpc
+kubeconfig
 Kubelet
 kubernetes
 libc
+noreferrer
+noopener
 oninput
 otlp
 protoc
 redis
 runtimeconfig
 trce
+upsert
 uris
+urls

src/Aspire.Dashboard/Aspire.Dashboard.csproj

@@ -173,6 +173,7 @@
     <Protobuf Include="..\Aspire.Hosting\Dashboard\proto\resource_service.proto" GrpcServices="Client" Access="Internal">
       <Link>Protos\resource_service.proto</Link>
     </Protobuf>
+    <Compile Include="..\Aspire.Hosting\Extensions\ChannelExtensions.cs" Link="Extensions\ChannelExtensions.cs" />
   </ItemGroup>
 
 </Project>

src/Aspire.Dashboard/Components/Layout/MainLayout.razor

@@ -9,7 +9,7 @@
     <FluentHeader>
         <div class="header-title">
             <FluentAnchor IconStart="@(new AspireIcons.Size32.Logo())" Appearance="Appearance.Stealth" Href="/" Class="logo">
-                @string.Format(Loc[nameof(Layout.MainLayoutDashboardName)], ResourceService.ApplicationName)
+                @DashboardClient.FormatApplicationName(Loc[nameof(Layout.MainLayoutDashboardName)], () => InvokeAsync(StateHasChanged))
             </FluentAnchor>
         </div>
         <div class="header-right">

src/Aspire.Dashboard/Components/Layout/MainLayout.razor.cs

@@ -25,7 +25,7 @@ public partial class MainLayout : IDisposable
     public required IStringLocalizer<Resources.Layout> Loc { get; set; }
 
     [Inject]
-    public required IResourceService ResourceService { get; set; }
+    public required IDashboardClient DashboardClient { get; set; }
 
     [Inject]
     public required IDialogService DialogService { get; set; }

src/Aspire.Dashboard/Components/Pages/ConsoleLogs.razor

@@ -1,8 +1,9 @@
 @page "/ConsoleLogs/{resourceName?}"
 @namespace Aspire.Dashboard.Components.Pages
+@using Aspire.Dashboard.Model
 @inject IStringLocalizer<Dashboard.Resources.ConsoleLogs> Loc
 
-<PageTitle>@string.Format(Loc[nameof(Dashboard.Resources.ConsoleLogs.ConsoleLogsPageTitle)], ResourceService.ApplicationName)</PageTitle>
+<PageTitle>@DashboardClient.FormatApplicationName(Loc[nameof(Dashboard.Resources.ConsoleLogs.ConsoleLogsPageTitle)], () => InvokeAsync(StateHasChanged))</PageTitle>
 
 <div class="resource-logs-layout">
     <h1 class="page-header">@Loc[nameof(Dashboard.Resources.ConsoleLogs.ConsoleLogsHeader)]</h1>

src/Aspire.Dashboard/Components/Pages/ConsoleLogs.razor.cs

@@ -14,7 +14,7 @@ namespace Aspire.Dashboard.Components.Pages;
 public sealed partial class ConsoleLogs : ComponentBase, IAsyncDisposable
 {
     [Inject]
-    public required IResourceService ResourceService { get; init; }
+    public required IDashboardClient DashboardClient { get; init; }
     [Inject]
     public required IJSRuntime JS { get; init; }
     [Inject]
@@ -50,7 +50,7 @@ protected override void OnInitialized()
 
         void TrackResources()
         {
-            var (snapshot, subscription) = ResourceService.SubscribeResources();
+            var (snapshot, subscription) = DashboardClient.SubscribeResources();
 
             foreach (var resource in snapshot)
             {
@@ -150,13 +150,13 @@ private async ValueTask LoadLogsAsync()
         {
             var cancellationToken = await _logSubscriptionCancellationSeries.NextAsync();
 
-            var subscription = ResourceService.SubscribeConsoleLogs(_selectedResource.Name, cancellationToken);
+            var subscription = DashboardClient.SubscribeConsoleLogs(_selectedResource.Name, cancellationToken);
 
             if (subscription is not null)
             {
                 var task = _logViewer.SetLogSourceAsync(
                     subscription,
-                    convertTimestampsFromUtc: _selectedResource is ContainerViewModel);
+                    convertTimestampsFromUtc: _selectedResource.IsContainer());
 
                 _initialisedSuccessfully = true;
                 _status = Loc[nameof(Dashboard.Resources.ConsoleLogs.ConsoleLogsWatchingLogs)];
@@ -171,7 +171,7 @@ private async ValueTask LoadLogsAsync()
             else
             {
                 _initialisedSuccessfully = false;
-                _status = Loc[_selectedResource is ContainerViewModel
+                _status = Loc[_selectedResource.IsContainer()
                     ? nameof(Dashboard.Resources.ConsoleLogs.ConsoleLogsFailedToInitialize)
                     : nameof(Dashboard.Resources.ConsoleLogs.ConsoleLogsLogsNotYetAvailable)];
             }
@@ -185,9 +185,9 @@ private async Task HandleSelectedOptionChangedAsync()
         NavigationManager.NavigateTo($"/ConsoleLogs/{_selectedOption?.Value}");
     }
 
-    private async Task OnResourceChanged(ResourceChangeType changeType, ResourceViewModel resource)
+    private async Task OnResourceChanged(ResourceViewModelChangeType changeType, ResourceViewModel resource)
     {
-        if (changeType == ResourceChangeType.Upsert)
+        if (changeType == ResourceViewModelChangeType.Upsert)
         {
             _resourceByName[resource.Name] = resource;
 
@@ -206,7 +206,7 @@ private async Task OnResourceChanged(ResourceChangeType changeType, ResourceView
                 }
             }
         }
-        else if (changeType == ResourceChangeType.Delete)
+        else if (changeType == ResourceViewModelChangeType.Delete)
         {
             var removed = _resourceByName.TryRemove(resource.Name, out _);
             Debug.Assert(removed, "Cannot remove unknown resource.");

src/Aspire.Dashboard/Components/Pages/Metrics.razor

@@ -3,12 +3,13 @@
 @page "/Metrics/{applicationInstanceId}/Meter/{meterName}"
 @page "/Metrics/{applicationInstanceId}/Meter/{meterName}/Instrument/{instrumentName}"
 
+@using Aspire.Dashboard.Model
 @using Aspire.Dashboard.Model.Otlp
 @using Aspire.Dashboard.Resources
 @inject IStringLocalizer<Dashboard.Resources.Metrics> Loc
 @inject IStringLocalizer<ControlsStrings> ControlsStringsLoc
 
-<PageTitle>@string.Format(Loc[nameof(Dashboard.Resources.Metrics.MetricsPageTitle)], ResourceService.ApplicationName)</PageTitle>
+<PageTitle>@DashboardClient.FormatApplicationName(Loc[nameof(Dashboard.Resources.Metrics.MetricsPageTitle)], () => InvokeAsync(StateHasChanged))</PageTitle>
 
 <div class="metrics-layout">
     <h1 class="page-header">@Loc[nameof(Dashboard.Resources.Metrics.MetricsHeader)]</h1>

src/Aspire.Dashboard/Components/Pages/Metrics.razor.cs

@@ -44,7 +44,7 @@ public partial class Metrics : IDisposable
     public required NavigationManager NavigationManager { get; set; }
 
     [Inject]
-    public required IResourceService ResourceService { get; set; }
+    public required IDashboardClient DashboardClient { get; set; }
 
     [Inject]
     public required ProtectedSessionStorage ProtectedSessionStore { get; set; }

src/Aspire.Dashboard/Components/Pages/Resources.razor

@@ -1,10 +1,11 @@
 @page "/"
 @using Aspire.Dashboard.Components.ResourcesGridColumns
+@using Aspire.Dashboard.Model
 @using Aspire.Dashboard.Resources
 @inject IStringLocalizer<Dashboard.Resources.Resources> Loc
 @inject IStringLocalizer<ControlsStrings> ControlsStringsLoc
 
-<PageTitle>@string.Format(Loc[nameof(Dashboard.Resources.Resources.ResourcesPageTitle)], ResourceService.ApplicationName)</PageTitle>
+<PageTitle>@DashboardClient.FormatApplicationName(Loc[nameof(Dashboard.Resources.Resources.ResourcesPageTitle)], () => InvokeAsync(StateHasChanged))</PageTitle>
 
 <div class="content-layout-with-toolbar">
     <FluentToolbar Orientation="Orientation.Horizontal">

src/Aspire.Dashboard/Components/Pages/Resources.razor.cs

@@ -19,7 +19,7 @@ public partial class Resources : ComponentBase, IDisposable
     private Dictionary<OtlpApplication, int>? _applicationUnviewedErrorCounts;
 
     [Inject]
-    public required IResourceService ResourceService { get; init; }
+    public required IDashboardClient DashboardClient { get; init; }
     [Inject]
     public required TelemetryRepository TelemetryRepository { get; init; }
     [Inject]
@@ -31,7 +31,7 @@ public partial class Resources : ComponentBase, IDisposable
     private readonly CancellationTokenSource _watchTaskCancellationTokenSource = new();
     private readonly ConcurrentDictionary<string, ResourceViewModel> _resourceByName = new(StringComparers.ResourceName);
     // TODO populate resource types from server data
-    private readonly ImmutableArray<string> _allResourceTypes = ["Project", "Executable", "Container"];
+    private readonly ImmutableArray<string> _allResourceTypes = [KnownResourceTypes.Project, KnownResourceTypes.Executable, KnownResourceTypes.Container];
     private readonly HashSet<string> _visibleResourceTypes;
     private string _filter = "";
     private bool _isTypeFilterVisible;
@@ -87,7 +87,7 @@ protected override void OnInitialized()
     {
         _applicationUnviewedErrorCounts = TelemetryRepository.GetApplicationUnviewedErrorLogsCount();
 
-        var (snapshot, subscription) = ResourceService.SubscribeResources();
+        var (snapshot, subscription) = DashboardClient.SubscribeResources();
 
         foreach (var resource in snapshot)
         {
@@ -99,7 +99,17 @@ protected override void OnInitialized()
         {
             await foreach (var (changeType, resource) in subscription.WithCancellation(_watchTaskCancellationTokenSource.Token))
             {
-                await OnResourceListChanged(changeType, resource);
+                if (changeType == ResourceViewModelChangeType.Upsert)
+                {
+                    _resourceByName[resource.Name] = resource;
+                }
+                else if (changeType == ResourceViewModelChangeType.Delete)
+                {
+                    var removed = _resourceByName.TryRemove(resource.Name, out _);
+                    Debug.Assert(removed, "Cannot remove unknown resource.");
+                }
+
+                await InvokeAsync(StateHasChanged);
             }
         });
 
@@ -110,27 +120,6 @@ protected override void OnInitialized()
         });
     }
 
-    private int GetUnviewedErrorCount(ResourceViewModel resource)
-    {
-        if (_applicationUnviewedErrorCounts is null)
-        {
-            return 0;
-        }
-
-        var application = TelemetryRepository.GetApplication(resource.Uid);
-        if (application is null)
-        {
-            return 0;
-        }
-
-        if (!_applicationUnviewedErrorCounts.TryGetValue(application, out var count))
-        {
-            return 0;
-        }
-
-        return count;
-    }
-
     private void ShowEnvironmentVariables(ResourceViewModel resource)
     {
         if (SelectedResource == resource)
@@ -150,23 +139,6 @@ private void ClearSelectedResource()
         SelectedResource = null;
     }
 
-    private async Task OnResourceListChanged(ResourceChangeType changeType, ResourceViewModel resource)
-    {
-        switch (changeType)
-        {
-            case ResourceChangeType.Upsert:
-                _resourceByName[resource.Name] = resource;
-                break;
-
-            case ResourceChangeType.Delete:
-                var removed = _resourceByName.TryRemove(resource.Name, out _);
-                Debug.Assert(removed, "Cannot remove unknown resource.");
-                break;
-        }
-
-        await InvokeAsync(StateHasChanged);
-    }
-
     private string GetResourceName(ResourceViewModel resource) => ResourceViewModel.GetResourceName(resource, _resourceByName.Values);
 
     private bool HasMultipleReplicas(ResourceViewModel resource)
@@ -203,11 +175,6 @@ public void Dispose()
         GC.SuppressFinalize(this);
     }
 
-    private void ViewErrorStructuredLogs(ResourceViewModel resource)
-    {
-        NavigationManager.NavigateTo($"/StructuredLogs/{resource.Uid}?level=error");
-    }
-
     private string? GetRowClass(ResourceViewModel resource)
         => resource == SelectedResource ? "selected-row" : null;
 }

src/Aspire.Dashboard/Components/Pages/StructuredLogs.razor

@@ -6,13 +6,13 @@
 @using System.Web
 @using Aspire.Dashboard.Resources
 @inject NavigationManager NavigationManager
-@inject IResourceService resourceService
+@inject IDashboardClient DashboardClient
 @inject IJSRuntime JS
 @implements IDisposable
 @inject IStringLocalizer<Dashboard.Resources.StructuredLogs> Loc
 @inject IStringLocalizer<ControlsStrings> ControlsStringsLoc
 
-<PageTitle>@string.Format(Loc[nameof(Dashboard.Resources.StructuredLogs.StructuredLogsPageTitle)], resourceService.ApplicationName)</PageTitle>
+<PageTitle>@DashboardClient.FormatApplicationName(Loc[nameof(Dashboard.Resources.StructuredLogs.StructuredLogsPageTitle)], () => InvokeAsync(StateHasChanged))</PageTitle>
 
 <div class="logs-layout">
     <h1 class="page-header">@Loc[nameof(Dashboard.Resources.StructuredLogs.StructuredLogsHeader)]</h1>

src/Aspire.Dashboard/Components/Pages/TraceDetail.razor

@@ -8,9 +8,9 @@
 @using Aspire.Dashboard.Resources
 @inject IStringLocalizer<Dashboard.Resources.TraceDetail> Loc
 @inject IStringLocalizer<ControlsStrings> ControlStringsLoc
-@inject IResourceService DashboardService
+@inject IDashboardClient DashboardClient
 
-<PageTitle>@string.Format(Loc[nameof(Dashboard.Resources.TraceDetail.TraceDetailPageTitle)], DashboardService.ApplicationName)</PageTitle>
+<PageTitle>@DashboardClient.FormatApplicationName(Loc[nameof(Dashboard.Resources.TraceDetail.TraceDetailPageTitle)], () => InvokeAsync(StateHasChanged))</PageTitle>
 
 @if (_trace != null)
 {

src/Aspire.Dashboard/Components/Pages/Traces.razor

@@ -5,16 +5,15 @@
 @using Aspire.Dashboard.Otlp.Model
 @using Aspire.Dashboard.Resources
 @inject NavigationManager NavigationManager
-@inject IResourceService ResourceService
+@inject IDashboardClient DashboardClient
 @inject IJSRuntime JS
 @inject IStringLocalizer<Dashboard.Resources.Traces> Loc
 @inject IStringLocalizer<ControlsStrings> ControlsStringsLoc
 @inject IStringLocalizer<TraceDetail> TraceDetailLoc
 @inject IStringLocalizer<Dashboard.Resources.StructuredLogs> StructuredLogsLoc
 @implements IDisposable
 
-<PageTitle>@string.Format(Loc[nameof(Dashboard.Resources.Traces.TracesPageTitle)], ResourceService.ApplicationName)</PageTitle>
-
+<PageTitle>@DashboardClient.FormatApplicationName(Loc[nameof(Dashboard.Resources.Traces.TracesPageTitle)], () => InvokeAsync(StateHasChanged))</PageTitle>
 
 <div class="traces-layout">
     <h1 class="page-header">@Loc[nameof(Dashboard.Resources.Traces.TracesHeader)]</h1>

src/Aspire.Dashboard/Components/ResourcesGridColumns/ResourceNameDisplay.razor

@@ -4,21 +4,21 @@
 
 <FluentStack Orientation="Orientation.Horizontal" VerticalAlignment="VerticalAlignment.Center">
     <span><FluentHighlighter HighlightedText="@FilterText" Text="@FormatName(Resource)" /></span>
-    @if (Resource is ContainerViewModel containerViewModel)
+    @if (Resource.TryGetContainerId(out var containerId))
     {
         <div class="subtext">
-            <GridValue Value="@containerViewModel.ContainerId"
+            <GridValue Value="@containerId"
                        MaxDisplayLength="8"
                        EnableHighlighting="false"
                        PreCopyToolTip="@Loc[nameof(Columns.ResourceNameDisplayCopyContainerIdText)]"
-                       ToolTip="@string.Format(Loc[nameof(Columns.ResourceNameDisplayContainerIdText)], containerViewModel.ContainerId)"/>
+                       ToolTip="@string.Format(Loc[nameof(Columns.ResourceNameDisplayContainerIdText)], containerId)"/>
         </div>
     }
-    else if (Resource is ExecutableViewModel executableViewModel)
+    else if (Resource.TryGetProcessId(out int processId))
     {
         // NOTE projects are also executables, so this will handle both
-        var title = string.Format(Loc[nameof(Columns.ResourceNameDisplayProcessIdText)], executableViewModel.ProcessId);
-        <span class="subtext" title="@title" aria-label="@title">@executableViewModel.ProcessId</span>
+        var title = string.Format(Loc[nameof(Columns.ResourceNameDisplayProcessIdText)], processId);
+        <span class="subtext" title="@title" aria-label="@title">@processId</span>
     }
 </FluentStack>