Add dashboard telemetry to interaction service

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()
     {

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()
     {

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()
     {

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;
                             }
                         }

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

@@ -796,7 +796,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()
     {

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()
     {

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);
 }

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()
     {

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()
     {

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()
     {

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()
     {

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);
 }

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);
 }

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);
+}

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>();
     }
 }