[release/9.4] Add dashboard telemetry to interaction service (#10315)

github-actions[bot] · web-flow · commit 3c3f8c253d08 · 2025-07-10T21:35:25.000-07:00
diff --git a/src/Aspire.Dashboard/Components/Controls/ResourceDetails.razor.cs b/src/Aspire.Dashboard/Components/Controls/ResourceDetails.razor.cs
@@ -279,7 +279,7 @@ public Task OnViewRelationshipAsync(ResourceDetailRelationshipViewModel relation
     }
 
     // IComponentWithTelemetry impl
-    public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Control, nameof(ResourceDetails));
+    public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Control, TelemetryComponentIds.ResourceDetails);
 
     public void UpdateTelemetryProperties()
     {
diff --git a/src/Aspire.Dashboard/Components/Controls/SpanDetails.razor.cs b/src/Aspire.Dashboard/Components/Controls/SpanDetails.razor.cs
@@ -6,6 +6,7 @@
 using Aspire.Dashboard.Model.Otlp;
 using Aspire.Dashboard.Otlp.Model;
 using Aspire.Dashboard.Otlp.Storage;
+using Aspire.Dashboard.Telemetry;
 using Aspire.Dashboard.Utils;
 using Microsoft.AspNetCore.Components;
 using Microsoft.FluentUI.AspNetCore.Components;
@@ -145,7 +146,7 @@ public async Task OnViewDetailsAsync(SpanLinkViewModel linkVM)
     }
 
     // IComponentWithTelemetry impl
-    public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Control, nameof(SpanDetails));
+    public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Control, TelemetryComponentIds.SpanDetails);
 
     public void Dispose()
     {
diff --git a/src/Aspire.Dashboard/Components/Controls/StructuredLogDetails.razor.cs b/src/Aspire.Dashboard/Components/Controls/StructuredLogDetails.razor.cs
@@ -4,6 +4,7 @@
 using Aspire.Dashboard.Components.Pages;
 using Aspire.Dashboard.Model;
 using Aspire.Dashboard.Model.Otlp;
+using Aspire.Dashboard.Telemetry;
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
 
@@ -149,7 +150,7 @@ private static bool HasTelemetryBaggage(string value)
     }
 
     // IComponentWithTelemetry impl
-    public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Control, nameof(StructuredLogDetails));
+    public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Control, TelemetryComponentIds.StructuredLogDetails);
 
     public void Dispose()
     {
diff --git a/src/Aspire.Dashboard/Components/Interactions/InteractionsProvider.cs b/src/Aspire.Dashboard/Components/Interactions/InteractionsProvider.cs
@@ -5,7 +5,9 @@
 using System.Diagnostics;
 using System.Net;
 using Aspire.Dashboard.Components.Dialogs;
+using Aspire.Dashboard.Components.Pages;
 using Aspire.Dashboard.Model;
+using Aspire.Dashboard.Telemetry;
 using Aspire.Dashboard.Utils;
 using Aspire.DashboardService.Proto.V1;
 using Markdig;
@@ -22,8 +24,20 @@ public class InteractionsProvider : ComponentBase, IAsyncDisposable
 {
     private static readonly MarkdownPipeline s_markdownPipeline = MarkdownHelpers.CreateMarkdownPipelineBuilder().Build();
 
-    internal record InteractionMessageBarReference(int InteractionId, Message Message);
-    internal record InteractionDialogReference(int InteractionId, IDialogReference Dialog);
+    internal record InteractionMessageBarReference(int InteractionId, Message Message, ComponentTelemetryContext TelemetryContext) : IDisposable
+    {
+        public void Dispose()
+        {
+            TelemetryContext?.Dispose();
+        }
+    }
+    internal record InteractionDialogReference(int InteractionId, IDialogReference Dialog, ComponentTelemetryContext TelemetryContext) : IDisposable
+    {
+        public void Dispose()
+        {
+            TelemetryContext?.Dispose();
+        }
+    }
 
     private readonly CancellationTokenSource _cts = new();
     private readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
@@ -53,6 +67,9 @@ internal record InteractionDialogReference(int InteractionId, IDialogReference D
     [Inject]
     public required ILogger<InteractionsProvider> Logger { get; init; }
 
+    [Inject]
+    public required ComponentTelemetryContextProvider TelemetryContextProvider { get; init; }
+
     protected override void OnInitialized()
     {
         // Exit quickly if the dashboard client is not enabled. For example, the dashboard is running in the standalone container.
@@ -119,6 +136,7 @@ private async Task InteractionsDisplayAsync()
                 _pendingInteractions.RemoveAt(0);
 
                 Func<IDialogService, Task<IDialogReference>> openDialog;
+                string dialogComponentId;
 
                 if (item.MessageBox is { } messageBox)
                 {
@@ -184,6 +202,7 @@ private async Task InteractionsDisplayAsync()
                             break;
                     }
 
+                    dialogComponentId = TelemetryComponentIds.InteractionMessageBox;
                     openDialog = dialogService => ShowMessageBoxAsync(dialogService, content, dialogParameters);
                 }
                 else if (item.InputsDialog is { } inputs)
@@ -222,6 +241,7 @@ private async Task InteractionsDisplayAsync()
                         }
                     });
 
+                    dialogComponentId = TelemetryComponentIds.InteractionInputsDialog;
                     openDialog = dialogService => dialogService.ShowDialogAsync<InteractionsInputDialog>(vm, dialogParameters);
                 }
                 else
@@ -236,7 +256,7 @@ await InvokeAsync(async () =>
                 });
 
                 Debug.Assert(currentDialogReference != null, "Dialog should have been created in UI thread.");
-                _interactionDialogReference = new InteractionDialogReference(item.InteractionId, currentDialogReference);
+                _interactionDialogReference = new InteractionDialogReference(item.InteractionId, currentDialogReference, CreateTelemetryContext(dialogComponentId));
             }
             finally
             {
@@ -254,6 +274,7 @@ await InvokeAsync(async () =>
                     {
                         if (_interactionDialogReference?.Dialog == currentDialogReference)
                         {
+                            _interactionDialogReference.Dispose();
                             _interactionDialogReference = null;
                         }
                     }
@@ -270,6 +291,13 @@ await InvokeAsync(async () =>
         }
     }
 
+    private ComponentTelemetryContext CreateTelemetryContext(string componentId)
+    {
+        var telemetryContext = new ComponentTelemetryContext(ComponentType.Control, componentId);
+        TelemetryContextProvider.Initialize(telemetryContext);
+        return telemetryContext;
+    }
+
     private static string GetMessageHtml(WatchInteractionsResponseUpdate item)
     {
         if (!item.EnableMessageMarkdown)
@@ -401,6 +429,7 @@ await InvokeAsync(async () =>
                                         }
 
                                         _openMessageBars.Remove(item.InteractionId);
+                                        openMessageBar.Dispose();
 
                                         await DashboardClient.SendInteractionRequestAsync(request, _cts.Token).ConfigureAwait(false);
                                     }
@@ -409,7 +438,7 @@ await InvokeAsync(async () =>
                         });
 
                         Debug.Assert(message != null, "Message should have been created in UI thread.");
-                        _openMessageBars.Add(new InteractionMessageBarReference(item.InteractionId, message));
+                        _openMessageBars.Add(new InteractionMessageBarReference(item.InteractionId, message, CreateTelemetryContext(TelemetryComponentIds.InteractionMessageBar)));
                         break;
                     case WatchInteractionsResponseUpdate.KindOneofCase.Complete:
                         // Complete interaction.
@@ -428,6 +457,7 @@ await InvokeAsync(async () =>
                             }
                             finally
                             {
+                                _interactionDialogReference.Dispose();
                                 _interactionDialogReference = null;
                             }
                         }
diff --git a/src/Aspire.Dashboard/Components/Pages/ConsoleLogs.razor.cs b/src/Aspire.Dashboard/Components/Pages/ConsoleLogs.razor.cs
@@ -815,7 +815,7 @@ public ConsoleLogsPageState ConvertViewModelToSerializable()
     }
 
     // IComponentWithTelemetry impl
-    public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, nameof(ConsoleLogs));
+    public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, TelemetryComponentIds.ConsoleLogs);
 
     public void UpdateTelemetryProperties()
     {
diff --git a/src/Aspire.Dashboard/Components/Pages/Error.razor.cs b/src/Aspire.Dashboard/Components/Pages/Error.razor.cs
@@ -28,7 +28,7 @@ protected override void OnInitialized()
     public required ComponentTelemetryContextProvider TelemetryContextProvider { get; init;  }
 
     // IComponentWithTelemetry impl
-    public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, nameof(Error));
+    public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, TelemetryComponentIds.Error);
 
     protected override void OnParametersSet()
     {
diff --git a/src/Aspire.Dashboard/Components/Pages/Login.razor.cs b/src/Aspire.Dashboard/Components/Pages/Login.razor.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Aspire.Dashboard.Model;
+using Aspire.Dashboard.Telemetry;
 using Aspire.Dashboard.Utils;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
@@ -117,5 +118,5 @@ public async ValueTask DisposeAsync()
     }
 
     // IComponentWithTelemetry impl
-    public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, nameof(Login));
+    public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, TelemetryComponentIds.Login);
 }
diff --git a/src/Aspire.Dashboard/Components/Pages/Metrics.razor.cs b/src/Aspire.Dashboard/Components/Pages/Metrics.razor.cs
@@ -340,7 +340,7 @@ public void Dispose()
     }
 
     // IComponentWithTelemetry impl
-    public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, nameof(Metrics));
+    public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, TelemetryComponentIds.Metrics);
 
     public void UpdateTelemetryProperties()
     {
diff --git a/src/Aspire.Dashboard/Components/Pages/NotFound.razor.cs b/src/Aspire.Dashboard/Components/Pages/NotFound.razor.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Aspire.Dashboard.Telemetry;
 using Microsoft.AspNetCore.Components;
 
 namespace Aspire.Dashboard.Components.Pages;
@@ -11,7 +12,7 @@ public partial class NotFound : IComponentWithTelemetry, IDisposable
     public required ComponentTelemetryContextProvider TelemetryContextProvider { get; init; }
 
     // IComponentWithTelemetry impl
-    public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, nameof(NotFound));
+    public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, TelemetryComponentIds.NotFound);
 
     protected override void OnInitialized()
     {
diff --git a/src/Aspire.Dashboard/Components/Pages/Resources.razor.cs b/src/Aspire.Dashboard/Components/Pages/Resources.razor.cs
@@ -888,7 +888,7 @@ private async Task ContextMenuClosed(Microsoft.AspNetCore.Components.Web.MouseEv
     }
 
     // IComponentWithTelemetry impl
-    public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, nameof(Resources));
+    public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, TelemetryComponentIds.Resources);
 
     public void UpdateTelemetryProperties()
     {
diff --git a/src/Aspire.Dashboard/Components/Pages/StructuredLogs.razor.cs b/src/Aspire.Dashboard/Components/Pages/StructuredLogs.razor.cs
@@ -489,7 +489,7 @@ public class StructuredLogsPageState
     }
 
     // IComponentWithTelemetry impl
-    public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, nameof(StructuredLogs));
+    public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, TelemetryComponentIds.StructuredLogs);
 
     public void UpdateTelemetryProperties()
     {
diff --git a/src/Aspire.Dashboard/Components/Pages/TraceDetail.razor.cs b/src/Aspire.Dashboard/Components/Pages/TraceDetail.razor.cs
@@ -13,6 +13,7 @@
 using Microsoft.FluentUI.AspNetCore.Components;
 using Icons = Microsoft.FluentUI.AspNetCore.Components.Icons;
 using Microsoft.JSInterop;
+using Aspire.Dashboard.Telemetry;
 
 namespace Aspire.Dashboard.Components.Pages;
 
@@ -346,5 +347,5 @@ public void Dispose()
     }
 
     // IComponentWithTelemetry impl
-    public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, nameof(TraceDetail));
+    public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, TelemetryComponentIds.TraceDetail);
 }
diff --git a/src/Aspire.Dashboard/Components/Pages/Traces.razor.cs b/src/Aspire.Dashboard/Components/Pages/Traces.razor.cs
@@ -11,6 +11,7 @@
 using Aspire.Dashboard.Otlp.Model;
 using Aspire.Dashboard.Otlp.Storage;
 using Aspire.Dashboard.Resources;
+using Aspire.Dashboard.Telemetry;
 using Aspire.Dashboard.Utils;
 using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.Options;
@@ -381,5 +382,5 @@ public class TracesPageState
     }
 
     // IComponentWithTelemetry impl
-    public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, nameof(Traces));
+    public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, TelemetryComponentIds.Traces);
 }
diff --git a/src/Aspire.Dashboard/Telemetry/TelemetryComponentIds.cs b/src/Aspire.Dashboard/Telemetry/TelemetryComponentIds.cs
@@ -0,0 +1,26 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Aspire.Dashboard.Telemetry;
+
+public static class TelemetryComponentIds
+{
+    // Pages
+    public const string Resources = nameof(Resources);
+    public const string Login = nameof(Login);
+    public const string Traces = nameof(Traces);
+    public const string StructuredLogs = nameof(StructuredLogs);
+    public const string NotFound = nameof(NotFound);
+    public const string Metrics = nameof(Metrics);
+    public const string Error = nameof(Error);
+    public const string ConsoleLogs = nameof(ConsoleLogs);
+
+    // Controls
+    public const string TraceDetail = nameof(TraceDetail);
+    public const string StructuredLogDetails = nameof(StructuredLogDetails);
+    public const string SpanDetails = nameof(SpanDetails);
+    public const string ResourceDetails = nameof(ResourceDetails);
+    public const string InteractionMessageBox = nameof(InteractionMessageBox);
+    public const string InteractionMessageBar = nameof(InteractionMessageBar);
+    public const string InteractionInputsDialog = nameof(InteractionInputsDialog);
+}
diff --git a/tests/Aspire.Dashboard.Components.Tests/Interactions/InteractionsProviderTests.cs b/tests/Aspire.Dashboard.Components.Tests/Interactions/InteractionsProviderTests.cs
@@ -2,8 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Threading.Channels;
+using Aspire.Dashboard.Components.Pages;
 using Aspire.Dashboard.Components.Tests.Shared;
 using Aspire.Dashboard.Model;
+using Aspire.Dashboard.Telemetry;
+using Aspire.Dashboard.Tests;
 using Aspire.DashboardService.Proto.V1;
 using Bunit;
 using Microsoft.AspNetCore.InternalTesting;
@@ -346,5 +349,8 @@ private void SetupInteractionProviderServices(TestDashboardClient? dashboardClie
         Services.AddSingleton<IDialogService>(dialogService ?? new TestDialogService());
         Services.AddSingleton<IMessageService, MessageService>();
         Services.AddSingleton<IDashboardClient>(dashboardClient ?? new TestDashboardClient());
+        Services.AddSingleton<DashboardTelemetryService>();
+        Services.AddSingleton<IDashboardTelemetrySender, TestDashboardTelemetrySender>();
+        Services.AddSingleton<ComponentTelemetryContextProvider>();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ public Task OnViewRelationshipAsync(ResourceDetailRelationshipViewModel relation`
`279`	`279`	`}`
`280`	`280`
`281`	`281`	`// IComponentWithTelemetry impl`
`282`		`- public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Control, nameof(ResourceDetails));`
	`282`	`+ public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Control, TelemetryComponentIds.ResourceDetails);`
`283`	`283`
`284`	`284`	`public void UpdateTelemetryProperties()`
`285`	`285`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using Aspire.Dashboard.Model.Otlp;`
`7`	`7`	`using Aspire.Dashboard.Otlp.Model;`
`8`	`8`	`using Aspire.Dashboard.Otlp.Storage;`
	`9`	`+using Aspire.Dashboard.Telemetry;`
`9`	`10`	`using Aspire.Dashboard.Utils;`
`10`	`11`	`using Microsoft.AspNetCore.Components;`
`11`	`12`	`using Microsoft.FluentUI.AspNetCore.Components;`
`@@ -145,7 +146,7 @@ public async Task OnViewDetailsAsync(SpanLinkViewModel linkVM)`
`145`	`146`	`}`
`146`	`147`
`147`	`148`	`// IComponentWithTelemetry impl`
`148`		`- public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Control, nameof(SpanDetails));`
	`149`	`+ public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Control, TelemetryComponentIds.SpanDetails);`
`149`	`150`
`150`	`151`	`public void Dispose()`
`151`	`152`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using Aspire.Dashboard.Components.Pages;`
`5`	`5`	`using Aspire.Dashboard.Model;`
`6`	`6`	`using Aspire.Dashboard.Model.Otlp;`
	`7`	`+using Aspire.Dashboard.Telemetry;`
`7`	`8`	`using Microsoft.AspNetCore.Components;`
`8`	`9`	`using Microsoft.JSInterop;`
`9`	`10`
`@@ -149,7 +150,7 @@ private static bool HasTelemetryBaggage(string value)`
`149`	`150`	`}`
`150`	`151`
`151`	`152`	`// IComponentWithTelemetry impl`
`152`		`- public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Control, nameof(StructuredLogDetails));`
	`153`	`+ public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Control, TelemetryComponentIds.StructuredLogDetails);`
`153`	`154`
`154`	`155`	`public void Dispose()`
`155`	`156`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,9 @@`
`5`	`5`	`using System.Diagnostics;`
`6`	`6`	`using System.Net;`
`7`	`7`	`using Aspire.Dashboard.Components.Dialogs;`
	`8`	`+using Aspire.Dashboard.Components.Pages;`
`8`	`9`	`using Aspire.Dashboard.Model;`
	`10`	`+using Aspire.Dashboard.Telemetry;`
`9`	`11`	`using Aspire.Dashboard.Utils;`
`10`	`12`	`using Aspire.DashboardService.Proto.V1;`
`11`	`13`	`using Markdig;`
`@@ -22,8 +24,20 @@ public class InteractionsProvider : ComponentBase, IAsyncDisposable`
`22`	`24`	`{`
`23`	`25`	`private static readonly MarkdownPipeline s_markdownPipeline = MarkdownHelpers.CreateMarkdownPipelineBuilder().Build();`
`24`	`26`
`25`		`- internal record InteractionMessageBarReference(int InteractionId, Message Message);`
`26`		`- internal record InteractionDialogReference(int InteractionId, IDialogReference Dialog);`
	`27`	`+ internal record InteractionMessageBarReference(int InteractionId, Message Message, ComponentTelemetryContext TelemetryContext) : IDisposable`
	`28`	`+ {`
	`29`	`+ public void Dispose()`
	`30`	`+ {`
	`31`	`+ TelemetryContext?.Dispose();`
	`32`	`+ }`
	`33`	`+ }`
	`34`	`+ internal record InteractionDialogReference(int InteractionId, IDialogReference Dialog, ComponentTelemetryContext TelemetryContext) : IDisposable`
	`35`	`+ {`
	`36`	`+ public void Dispose()`
	`37`	`+ {`
	`38`	`+ TelemetryContext?.Dispose();`
	`39`	`+ }`
	`40`	`+ }`
`27`	`41`
`28`	`42`	`private readonly CancellationTokenSource _cts = new();`
`29`	`43`	`private readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);`
`@@ -53,6 +67,9 @@ internal record InteractionDialogReference(int InteractionId, IDialogReference D`
`53`	`67`	`[Inject]`
`54`	`68`	`public required ILogger<InteractionsProvider> Logger { get; init; }`
`55`	`69`
	`70`	`+ [Inject]`
	`71`	`+ public required ComponentTelemetryContextProvider TelemetryContextProvider { get; init; }`
	`72`	`+`
`56`	`73`	`protected override void OnInitialized()`
`57`	`74`	`{`
`58`	`75`	`// Exit quickly if the dashboard client is not enabled. For example, the dashboard is running in the standalone container.`
`@@ -119,6 +136,7 @@ private async Task InteractionsDisplayAsync()`
`119`	`136`	`_pendingInteractions.RemoveAt(0);`
`120`	`137`
`121`	`138`	`Func<IDialogService, Task<IDialogReference>> openDialog;`
	`139`	`+ string dialogComponentId;`
`122`	`140`
`123`	`141`	`if (item.MessageBox is { } messageBox)`
`124`	`142`	`{`
`@@ -184,6 +202,7 @@ private async Task InteractionsDisplayAsync()`
`184`	`202`	`break;`
`185`	`203`	`}`
`186`	`204`
	`205`	`+ dialogComponentId = TelemetryComponentIds.InteractionMessageBox;`
`187`	`206`	`openDialog = dialogService => ShowMessageBoxAsync(dialogService, content, dialogParameters);`
`188`	`207`	`}`
`189`	`208`	`else if (item.InputsDialog is { } inputs)`
`@@ -222,6 +241,7 @@ private async Task InteractionsDisplayAsync()`
`222`	`241`	`}`
`223`	`242`	`});`
`224`	`243`
	`244`	`+ dialogComponentId = TelemetryComponentIds.InteractionInputsDialog;`
`225`	`245`	`openDialog = dialogService => dialogService.ShowDialogAsync<InteractionsInputDialog>(vm, dialogParameters);`
`226`	`246`	`}`
`227`	`247`	`else`
`@@ -236,7 +256,7 @@ await InvokeAsync(async () =>`
`236`	`256`	`});`
`237`	`257`
`238`	`258`	`Debug.Assert(currentDialogReference != null, "Dialog should have been created in UI thread.");`
`239`		`- _interactionDialogReference = new InteractionDialogReference(item.InteractionId, currentDialogReference);`
	`259`	`+ _interactionDialogReference = new InteractionDialogReference(item.InteractionId, currentDialogReference, CreateTelemetryContext(dialogComponentId));`
`240`	`260`	`}`
`241`	`261`	`finally`
`242`	`262`	`{`
`@@ -254,6 +274,7 @@ await InvokeAsync(async () =>`
`254`	`274`	`{`
`255`	`275`	`if (_interactionDialogReference?.Dialog == currentDialogReference)`
`256`	`276`	`{`
	`277`	`+ _interactionDialogReference.Dispose();`
`257`	`278`	`_interactionDialogReference = null;`
`258`	`279`	`}`
`259`	`280`	`}`
`@@ -270,6 +291,13 @@ await InvokeAsync(async () =>`
`270`	`291`	`}`
`271`	`292`	`}`
`272`	`293`
	`294`	`+ private ComponentTelemetryContext CreateTelemetryContext(string componentId)`
	`295`	`+ {`
	`296`	`+ var telemetryContext = new ComponentTelemetryContext(ComponentType.Control, componentId);`
	`297`	`+ TelemetryContextProvider.Initialize(telemetryContext);`
	`298`	`+ return telemetryContext;`
	`299`	`+ }`
	`300`	`+`
`273`	`301`	`private static string GetMessageHtml(WatchInteractionsResponseUpdate item)`
`274`	`302`	`{`
`275`	`303`	`if (!item.EnableMessageMarkdown)`
`@@ -401,6 +429,7 @@ await InvokeAsync(async () =>`
`401`	`429`	`}`
`402`	`430`
`403`	`431`	`_openMessageBars.Remove(item.InteractionId);`
	`432`	`+ openMessageBar.Dispose();`
`404`	`433`
`405`	`434`	`await DashboardClient.SendInteractionRequestAsync(request, _cts.Token).ConfigureAwait(false);`
`406`	`435`	`}`
`@@ -409,7 +438,7 @@ await InvokeAsync(async () =>`
`409`	`438`	`});`
`410`	`439`
`411`	`440`	`Debug.Assert(message != null, "Message should have been created in UI thread.");`
`412`		`- _openMessageBars.Add(new InteractionMessageBarReference(item.InteractionId, message));`
	`441`	`+ _openMessageBars.Add(new InteractionMessageBarReference(item.InteractionId, message, CreateTelemetryContext(TelemetryComponentIds.InteractionMessageBar)));`
`413`	`442`	`break;`
`414`	`443`	`case WatchInteractionsResponseUpdate.KindOneofCase.Complete:`
`415`	`444`	`// Complete interaction.`
`@@ -428,6 +457,7 @@ await InvokeAsync(async () =>`
`428`	`457`	`}`
`429`	`458`	`finally`
`430`	`459`	`{`
	`460`	`+ _interactionDialogReference.Dispose();`
`431`	`461`	`_interactionDialogReference = null;`
`432`	`462`	`}`
`433`	`463`	`}`
Original file line number	Diff line number	Diff line change
`@@ -815,7 +815,7 @@ public ConsoleLogsPageState ConvertViewModelToSerializable()`
`815`	`815`	`}`
`816`	`816`
`817`	`817`	`// IComponentWithTelemetry impl`
`818`		`- public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, nameof(ConsoleLogs));`
	`818`	`+ public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, TelemetryComponentIds.ConsoleLogs);`
`819`	`819`
`820`	`820`	`public void UpdateTelemetryProperties()`
`821`	`821`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ protected override void OnInitialized()`
`28`	`28`	`public required ComponentTelemetryContextProvider TelemetryContextProvider { get; init; }`
`29`	`29`
`30`	`30`	`// IComponentWithTelemetry impl`
`31`		`- public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, nameof(Error));`
	`31`	`+ public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, TelemetryComponentIds.Error);`
`32`	`32`
`33`	`33`	`protected override void OnParametersSet()`
`34`	`34`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`
`4`	`4`	`using Aspire.Dashboard.Model;`
	`5`	`+using Aspire.Dashboard.Telemetry;`
`5`	`6`	`using Aspire.Dashboard.Utils;`
`6`	`7`	`using Microsoft.AspNetCore.Components;`
`7`	`8`	`using Microsoft.AspNetCore.Components.Authorization;`
`@@ -117,5 +118,5 @@ public async ValueTask DisposeAsync()`
`117`	`118`	`}`
`118`	`119`
`119`	`120`	`// IComponentWithTelemetry impl`
`120`		`- public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, nameof(Login));`
	`121`	`+ public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, TelemetryComponentIds.Login);`
`121`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,7 @@ public void Dispose()`
`340`	`340`	`}`
`341`	`341`
`342`	`342`	`// IComponentWithTelemetry impl`
`343`		`- public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, nameof(Metrics));`
	`343`	`+ public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, TelemetryComponentIds.Metrics);`
`344`	`344`
`345`	`345`	`public void UpdateTelemetryProperties()`
`346`	`346`	`{`
Original file line number	Diff line number	Diff line change
`@@ -888,7 +888,7 @@ private async Task ContextMenuClosed(Microsoft.AspNetCore.Components.Web.MouseEv`
`888`	`888`	`}`
`889`	`889`
`890`	`890`	`// IComponentWithTelemetry impl`
`891`		`- public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, nameof(Resources));`
	`891`	`+ public ComponentTelemetryContext TelemetryContext { get; } = new(ComponentType.Page, TelemetryComponentIds.Resources);`
`892`	`892`
`893`	`893`	`public void UpdateTelemetryProperties()`
`894`	`894`	`{`