Skip to content

Commit 9b850d7

Browse files
authored
Span details fixes (#5946)
1 parent 35cd89b commit 9b850d7

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

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

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
</div>
7272
<PropertyGrid TItem="OtlpSpanEvent"
7373
Items="@FilteredSpanEvents"
74+
ItemKey="@((r) => r.InternalId)"
7475
GridTemplateColumns="1fr 2fr"
7576
NameColumnTitle="@(Loc[nameof(ControlsStrings.TimeOffsetColumnHeader)])"
7677
ValueColumnTitle="@(Loc[nameof(ControlsStrings.EventColumnHeader)])"
@@ -96,20 +97,18 @@
9697
@FilteredSpanLinks.Count()
9798
</FluentBadge>
9899
</div>
99-
<FluentDataGrid ResizeLabel="@AspireFluentDataGridHeaderCell.GetResizeLabel(Loc)"
100-
ResizeType="DataGridResizeType.Discrete"
101-
TGridItem="SpanLinkViewModel"
100+
<FluentDataGrid TGridItem="SpanLinkViewModel"
102101
Items="@FilteredSpanLinks"
103102
Style="width:100%"
104103
GenerateHeader="GenerateHeaderOption.Sticky"
105104
GridTemplateColumns="4fr 1fr"
106105
ShowHover="true">
107-
<AspireTemplateColumn Title="@Loc[nameof(ControlsStrings.SpanDetailsSpanColumnHeader)]">
106+
<TemplateColumn Title="@Loc[nameof(ControlsStrings.SpanDetailsSpanColumnHeader)]">
108107
@WriteSpanLink(context)
109-
</AspireTemplateColumn>
110-
<AspireTemplateColumn Title="@Loc[nameof(ControlsStrings.SpanDetailsDetailsColumnHeader)]">
108+
</TemplateColumn>
109+
<TemplateColumn Title="@Loc[nameof(ControlsStrings.SpanDetailsDetailsColumnHeader)]">
111110
<FluentButton Appearance="Appearance.Lightweight" OnClick="@(() => OnViewDetailsAsync(context))">@Loc[nameof(ControlsStrings.ViewAction)]</FluentButton>
112-
</AspireTemplateColumn>
111+
</TemplateColumn>
113112
</FluentDataGrid>
114113
</FluentAccordionItem>
115114
<FluentAccordionItem Heading="@Loc[nameof(ControlsStrings.SpanDetailsBacklinksHeader)]" Expanded="@_isSpanBacklinksExpanded">
@@ -118,20 +117,18 @@
118117
@FilteredSpanBacklinks.Count()
119118
</FluentBadge>
120119
</div>
121-
<FluentDataGrid ResizeLabel="@AspireFluentDataGridHeaderCell.GetResizeLabel(Loc)"
122-
ResizeType="DataGridResizeType.Discrete"
123-
TGridItem="SpanLinkViewModel"
120+
<FluentDataGrid TGridItem="SpanLinkViewModel"
124121
Items="@FilteredSpanBacklinks"
125122
Style="width:100%"
126123
GenerateHeader="GenerateHeaderOption.Sticky"
127124
GridTemplateColumns="4fr 1fr"
128125
ShowHover="true">
129-
<AspireTemplateColumn Title="@Loc[nameof(ControlsStrings.SpanDetailsSpanColumnHeader)]">
126+
<TemplateColumn Title="@Loc[nameof(ControlsStrings.SpanDetailsSpanColumnHeader)]">
130127
@WriteSpanLink(context)
131-
</AspireTemplateColumn>
132-
<AspireTemplateColumn Title="@Loc[nameof(ControlsStrings.SpanDetailsDetailsColumnHeader)]">
128+
</TemplateColumn>
129+
<TemplateColumn Title="@Loc[nameof(ControlsStrings.SpanDetailsDetailsColumnHeader)]">
133130
<FluentButton Appearance="Appearance.Lightweight" OnClick="@(() => OnViewDetailsAsync(context))">@Loc[nameof(ControlsStrings.ViewAction)]</FluentButton>
134-
</AspireTemplateColumn>
131+
</TemplateColumn>
135132
</FluentDataGrid>
136133
</FluentAccordionItem>
137134
</FluentAccordion>

src/Aspire.Dashboard/Otlp/Model/OtlpSpanEvent.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public class OtlpSpanAttributeItem(string name, string value) : IPropertyGridIte
1313

1414
public class OtlpSpanEvent(OtlpSpan span) : IPropertyGridItem
1515
{
16+
public required Guid InternalId { get; init; }
1617
public required string Name { get; init; }
1718
public required DateTime Time { get; init; }
1819
public required KeyValuePair<string, string>[] Attributes { get; init; }

src/Aspire.Dashboard/Otlp/Storage/TelemetryRepository.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,6 +1022,7 @@ private static OtlpSpan CreateSpan(OtlpApplicationView applicationView, Span spa
10221022
{
10231023
events.Add(new OtlpSpanEvent(newSpan)
10241024
{
1025+
InternalId = Guid.NewGuid(),
10251026
Name = e.Name,
10261027
Time = OtlpHelpers.UnixNanoSecondsToDateTime(e.TimeUnixNano),
10271028
Attributes = e.Attributes.ToKeyValuePairs(options)

0 commit comments

Comments
 (0)