Clean up

Author: JamesNK

playground/Stress/Stress.AppHost/Program.cs

@@ -69,6 +69,7 @@
 serviceBuilder.WithHttpCommand("/log-message-limit", "Log message limit", commandOptions: new() { Method = HttpMethod.Get, IconName = "ContentViewGalleryLightning" });
 serviceBuilder.WithHttpCommand("/multiple-traces-linked", "Multiple traces linked", commandOptions: new() { Method = HttpMethod.Get, IconName = "ContentViewGalleryLightning" });
 serviceBuilder.WithHttpCommand("/overflow-counter", "Overflow counter", commandOptions: new() { Method = HttpMethod.Get, IconName = "ContentViewGalleryLightning" });
+serviceBuilder.WithHttpCommand("/nested-trace-spans", "Out of order nested spans", commandOptions: new() { Method = HttpMethod.Get, IconName = "ContentViewGalleryLightning" });
 
 builder.AddProject<Projects.Stress_TelemetryService>("stress-telemetryservice")
        .WithUrls(c => c.Urls.Add(new() { Url = "https://someplace.com", DisplayText = "Some place" }))

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

@@ -189,7 +189,7 @@ private void UpdateDetailViewData()
         }
 
         Logger.LogInformation("Trace '{TraceId}' has {SpanCount} spans.", _trace.TraceId, _trace.Spans.Count);
-        _spanWaterfallViewModels = GetSpanWaterfallViewModels(_trace);
+        _spanWaterfallViewModels = SpanWaterfallViewModel.Create(_trace, new SpanWaterfallViewModel.TraceDetailState(OutgoingPeerResolvers, _collapsedSpanIds));
         _maxDepth = _spanWaterfallViewModels.Max(s => s.Depth);
     }
 
@@ -249,11 +249,7 @@ private async Task OnToggleCollapse(SpanWaterfallViewModel viewModel)
             _collapsedSpanIds.Add(viewModel.Span.SpanId);
         }
 
-        if (_trace is not null)
-        {
-            _spanWaterfallViewModels = GetSpanWaterfallViewModels(_trace);
-        }
-
+        UpdateDetailViewData();
         await _dataGrid.SafeRefreshDataAsync();
     }
 
@@ -321,11 +317,6 @@ private async Task ClearSelectedSpanAsync(bool causedByUserAction = false)
 
     private string GetResourceName(OtlpApplicationView app) => OtlpApplication.GetResourceName(app, _applications);
 
-    private List<SpanWaterfallViewModel> GetSpanWaterfallViewModels(OtlpTrace trace)
-    {
-        return SpanWaterfallViewModel.Create(trace, new SpanWaterfallViewModel.TraceDetailState(OutgoingPeerResolvers, _collapsedSpanIds));
-    }
-
     public void Dispose()
     {
         foreach (var subscription in _peerChangesSubscriptions)

tests/Aspire.Dashboard.Components.Tests/Pages/TraceDetailsTests.cs

@@ -258,7 +258,6 @@ public void ToggleCollapse_SpanStateChanges()
                                 CreateSpan(traceId: "1", spanId: "3-1",
                                     startTime: s_testTime.AddMinutes(6),
                                     endTime: s_testTime.AddMinutes(10), parentSpanId: "2-1")
-
                             }
                         }
                     }