Improve page titles by adding (resource) or (trace name) where appropriate.

src/Aspire.Dashboard/Components/Controls/ApplicationName.razor

@@ -1,3 +1,3 @@
 @namespace Aspire.Dashboard.Components
 
-@_applicationName
+@_pageTitle

src/Aspire.Dashboard/Components/Controls/ApplicationName.razor.cs

@@ -13,15 +13,18 @@ public sealed partial class ApplicationName : ComponentBase, IDisposable
     private CancellationTokenSource? _disposalCts;
 
     [Parameter]
-    public string? ResourceName { get; init; }
+    public string? AdditionalText { get; set; }
 
     [Parameter]
-    public IStringLocalizer? Loc { get; init; }
+    public string? ResourceName { get; set; }
+
+    [Parameter]
+    public IStringLocalizer? Loc { get; set; }
 
     [Inject]
     public required IDashboardClient DashboardClient { get; init; }
 
-    private string? _applicationName;
+    private string? _pageTitle;
 
     protected override async Task OnInitializedAsync()
     {
@@ -31,15 +34,24 @@ protected override async Task OnInitializedAsync()
             _disposalCts = new CancellationTokenSource();
             await DashboardClient.WhenConnected.WaitAsync(_disposalCts.Token);
         }
+    }
+
+    protected override void OnParametersSet()
+    {
+        string applicationName;
 
         if (ResourceName is not null && Loc is not null)
         {
-            _applicationName = string.Format(CultureInfo.InvariantCulture, Loc[ResourceName], DashboardClient.ApplicationName);
+            applicationName = string.Format(CultureInfo.InvariantCulture, Loc[ResourceName], DashboardClient.ApplicationName);
         }
         else
         {
-            _applicationName = DashboardClient.ApplicationName;
+            applicationName = DashboardClient.ApplicationName;
         }
+
+        _pageTitle = string.IsNullOrEmpty(AdditionalText)
+            ? applicationName
+            : $"{applicationName} ({AdditionalText})";
     }
 
     public void Dispose()

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

@@ -5,7 +5,12 @@
 @using Aspire.Dashboard.Resources
 @namespace Aspire.Dashboard.Components.Pages
 
-<PageTitle><ApplicationName ResourceName="@nameof(Dashboard.Resources.ConsoleLogs.ConsoleLogsPageTitle)" Loc="@Loc" /></PageTitle>
+<PageTitle>
+    <ApplicationName
+        AdditionalText="@PageViewModel.SelectedOption.Id?.ReplicaSetName"
+        ResourceName="@nameof(Dashboard.Resources.ConsoleLogs.ConsoleLogsPageTitle)"
+        Loc="@Loc"/>
+</PageTitle>
 
 <div class="page-content-container">
     <AspirePageContentLayout AddNewlineOnToolbar="true"

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

@@ -10,7 +10,26 @@
 @inject IStringLocalizer<Dashboard.Resources.Metrics> Loc
 @inject IStringLocalizer<ControlsStrings> ControlsStringsLoc
 
-<PageTitle><ApplicationName ResourceName="@nameof(Dashboard.Resources.Metrics.MetricsPageTitle)" Loc="@Loc" /></PageTitle>
+<PageTitle>
+    @{
+        string? additionalText;
+        if (PageViewModel.SelectedApplication.Id is { ReplicaSetName: { } replicaSetName })
+        {
+            additionalText = PageViewModel.SelectedInstrument is { } selectedInstrument
+                ? $"{replicaSetName} - {selectedInstrument.Name}"
+                : replicaSetName;
+        }
+        else
+        {
+            additionalText = null;
+        }
+    }
+
+    <ApplicationName
+        AdditionalText="@additionalText"
+        ResourceName="@nameof(Dashboard.Resources.Metrics.MetricsPageTitle)"
+        Loc="@Loc"/>
+</PageTitle>
 
 <div class="page-content-container">
     <AspirePageContentLayout

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

@@ -13,7 +13,12 @@
 @inject IStringLocalizer<ControlsStrings> ControlsStringsLoc
 @inject IStringLocalizer<StructuredFiltering> FilterLoc
 
-<PageTitle><ApplicationName ResourceName="@nameof(Dashboard.Resources.StructuredLogs.StructuredLogsPageTitle)" Loc="@Loc" /></PageTitle>
+<PageTitle>
+    <ApplicationName
+        AdditionalText="@PageViewModel.SelectedApplication.Id?.ReplicaSetName"
+        ResourceName="@nameof(Dashboard.Resources.StructuredLogs.StructuredLogsPageTitle)"
+        Loc="@Loc"/>
+</PageTitle>
 
 <div class="page-content-container">
     <AspirePageContentLayout @ref="@_contentLayout"

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

@@ -9,7 +9,12 @@
 @inject IStringLocalizer<Dashboard.Resources.TraceDetail> Loc
 @inject IStringLocalizer<ControlsStrings> ControlStringsLoc
 
-<PageTitle><ApplicationName ResourceName="@nameof(Dashboard.Resources.TraceDetail.TraceDetailPageTitle)" Loc="@Loc" /></PageTitle>
+<PageTitle>
+    <ApplicationName
+        AdditionalText="@GetPageTitle()"
+        ResourceName="@nameof(Dashboard.Resources.TraceDetail.TraceDetailPageTitle)"
+        Loc="@Loc"/>
+</PageTitle>
 
 <div class="page-content-container">
     @if (_trace is { } trace)
@@ -19,14 +24,11 @@
             MobileToolbarButtonText="@Loc[nameof(Dashboard.Resources.TraceDetail.TraceDetailMobileToolbarButtonText)]"
             IsSummaryDetailsViewOpen="@(SelectedSpan is not null)">
             <PageTitleSection>
-                @{
-                    var headerSpan = trace.RootOrFirstSpan;
-                }
                 <div class="page-header">
                     <h1>
-                        <span>@GetResourceName(headerSpan.Source): @headerSpan.Name</span>
+                        <span>@GetPageTitle()</span>
                         <span class="trace-id">@OtlpHelpers.ToShortenedId(trace.TraceId)</span>
-                    </h1>                    
+                    </h1>
                 </div>
             </PageTitleSection>
             <ToolbarSection>

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

@@ -95,6 +95,17 @@ private ValueTask<GridItemsProviderResult<SpanWaterfallViewModel>> GetData(GridI
         });
     }
 
+    private string? GetPageTitle()
+    {
+        if (_trace is null)
+        {
+            return null;
+        }
+
+        var headerSpan = _trace.RootOrFirstSpan;
+        return $"{GetResourceName(headerSpan.Source)}: {headerSpan.Name}";
+    }
+
     private static Icon GetSpanIcon(OtlpSpan span)
     {
         switch (span.Kind)

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

@@ -13,7 +13,12 @@
 @inject IStringLocalizer<ControlsStrings> ControlsStringsLoc
 @implements IDisposable
 
-<PageTitle><ApplicationName ResourceName="@nameof(Dashboard.Resources.Traces.TracesPageTitle)" Loc="@Loc" /></PageTitle>
+<PageTitle>
+    <ApplicationName
+        AdditionalText="@PageViewModel.SelectedApplication.Id?.ReplicaSetName"
+        ResourceName="@nameof(Dashboard.Resources.Traces.TracesPageTitle)"
+        Loc="@Loc"/>
+</PageTitle>
 
 <div class="page-content-container">
     <AspirePageContentLayout AddNewlineOnToolbar="true" @ref="@_contentLayout">

tests/Aspire.Dashboard.Components.Tests/Controls/ApplicationNameTests.cs

@@ -5,6 +5,7 @@
 using Bunit;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Xunit;
@@ -32,6 +33,29 @@ public void Render_DashboardClientDisabled_Success()
         cut.MarkupMatches("Aspire");
     }
 
+    [Fact]
+    public void Render_With_Args()
+    {
+        // Arrange
+        Services.AddSingleton<IConfiguration>(new ConfigurationManager());
+        Services.AddSingleton<ILoggerFactory>(NullLoggerFactory.Instance);
+        Services.AddSingleton<IDashboardClient, DashboardClient>();
+        Services.AddSingleton<IDashboardClientStatus, DashboardClientStatus>();
+        Services.AddSingleton<BrowserTimeProvider>();
+        Services.AddSingleton<IKnownPropertyLookup>(new MockKnownPropertyLookup());
+
+        // Act
+        var cut = RenderComponent<ApplicationName>(builder =>
+        {
+            builder.Add(p => p.ResourceName, "{0} traces");
+            builder.Add(p => p.Loc, new TestStringLocalizer<string>());
+            builder.Add(p => p.AdditionalText, "Hello World");
+        });
+
+        // Assert
+        cut.MarkupMatches("Localized:Aspire traces (Hello World)");
+    }
+
     [Fact]
     public void Render_DashboardClientEnabled_HtmlInName_Success()
     {
@@ -57,4 +81,12 @@ private sealed class MockDashboardClient : IDashboardClient
         public IAsyncEnumerable<IReadOnlyList<ResourceLogLine>> SubscribeConsoleLogs(string resourceName, CancellationToken cancellationToken) => throw new NotImplementedException();
         public Task<ResourceViewModelSubscription> SubscribeResourcesAsync(CancellationToken cancellationToken) => throw new NotImplementedException();
     }
+
+    private sealed class TestStringLocalizer<T> : IStringLocalizer<T>
+    {
+        public LocalizedString this[string name] => new LocalizedString(name, $"Localized:{name}");
+        public LocalizedString this[string name, params object[] arguments] => new LocalizedString(name, $"Localized:{name}:" + string.Join("+", arguments));
+
+        public IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures) => [];
+    }
 }