Skip to content

Span details fixes #5946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 30, 2024
Merged

Span details fixes #5946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions src/Aspire.Dashboard/Components/Controls/SpanDetails.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
</div>
<PropertyGrid TItem="OtlpSpanEvent"
Items="@FilteredSpanEvents"
ItemKey="@((r) => r.InternalId)"
GridTemplateColumns="1fr 2fr"
NameColumnTitle="@(Loc[nameof(ControlsStrings.TimeOffsetColumnHeader)])"
ValueColumnTitle="@(Loc[nameof(ControlsStrings.EventColumnHeader)])"
Expand All @@ -96,20 +97,18 @@
@FilteredSpanLinks.Count()
</FluentBadge>
</div>
<FluentDataGrid ResizeLabel="@AspireFluentDataGridHeaderCell.GetResizeLabel(Loc)"
ResizeType="DataGridResizeType.Discrete"
TGridItem="SpanLinkViewModel"
<FluentDataGrid TGridItem="SpanLinkViewModel"
Items="@FilteredSpanLinks"
Style="width:100%"
GenerateHeader="GenerateHeaderOption.Sticky"
GridTemplateColumns="4fr 1fr"
ShowHover="true">
<AspireTemplateColumn Title="@Loc[nameof(ControlsStrings.SpanDetailsSpanColumnHeader)]">
<TemplateColumn Title="@Loc[nameof(ControlsStrings.SpanDetailsSpanColumnHeader)]">
@WriteSpanLink(context)
</AspireTemplateColumn>
<AspireTemplateColumn Title="@Loc[nameof(ControlsStrings.SpanDetailsDetailsColumnHeader)]">
</TemplateColumn>
<TemplateColumn Title="@Loc[nameof(ControlsStrings.SpanDetailsDetailsColumnHeader)]">
<FluentButton Appearance="Appearance.Lightweight" OnClick="@(() => OnViewDetailsAsync(context))">@Loc[nameof(ControlsStrings.ViewAction)]</FluentButton>
</AspireTemplateColumn>
</TemplateColumn>
</FluentDataGrid>
</FluentAccordionItem>
<FluentAccordionItem Heading="@Loc[nameof(ControlsStrings.SpanDetailsBacklinksHeader)]" Expanded="@_isSpanBacklinksExpanded">
Expand All @@ -118,20 +117,18 @@
@FilteredSpanBacklinks.Count()
</FluentBadge>
</div>
<FluentDataGrid ResizeLabel="@AspireFluentDataGridHeaderCell.GetResizeLabel(Loc)"
ResizeType="DataGridResizeType.Discrete"
TGridItem="SpanLinkViewModel"
<FluentDataGrid TGridItem="SpanLinkViewModel"
Items="@FilteredSpanBacklinks"
Style="width:100%"
GenerateHeader="GenerateHeaderOption.Sticky"
GridTemplateColumns="4fr 1fr"
ShowHover="true">
<AspireTemplateColumn Title="@Loc[nameof(ControlsStrings.SpanDetailsSpanColumnHeader)]">
<TemplateColumn Title="@Loc[nameof(ControlsStrings.SpanDetailsSpanColumnHeader)]">
@WriteSpanLink(context)
</AspireTemplateColumn>
<AspireTemplateColumn Title="@Loc[nameof(ControlsStrings.SpanDetailsDetailsColumnHeader)]">
</TemplateColumn>
<TemplateColumn Title="@Loc[nameof(ControlsStrings.SpanDetailsDetailsColumnHeader)]">
<FluentButton Appearance="Appearance.Lightweight" OnClick="@(() => OnViewDetailsAsync(context))">@Loc[nameof(ControlsStrings.ViewAction)]</FluentButton>
</AspireTemplateColumn>
</TemplateColumn>
</FluentDataGrid>
</FluentAccordionItem>
</FluentAccordion>
Expand Down
1 change: 1 addition & 0 deletions src/Aspire.Dashboard/Otlp/Model/OtlpSpanEvent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public class OtlpSpanAttributeItem(string name, string value) : IPropertyGridIte

public class OtlpSpanEvent(OtlpSpan span) : IPropertyGridItem
{
public required Guid InternalId { get; init; }
public required string Name { get; init; }
public required DateTime Time { get; init; }
public required KeyValuePair<string, string>[] Attributes { get; init; }
Expand Down
1 change: 1 addition & 0 deletions src/Aspire.Dashboard/Otlp/Storage/TelemetryRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1022,6 +1022,7 @@ private static OtlpSpan CreateSpan(OtlpApplicationView applicationView, Span spa
{
events.Add(new OtlpSpanEvent(newSpan)
{
InternalId = Guid.NewGuid(),
Name = e.Name,
Time = OtlpHelpers.UnixNanoSecondsToDateTime(e.TimeUnixNano),
Attributes = e.Attributes.ToKeyValuePairs(options)
Expand Down
Loading