Skip to content

Show OLTP timestamps using user's time format preferences #2135

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
drewnoakes merged 1 commit into from
Feb 12, 2024
Merged

Show OLTP timestamps using user's time format preferences #2135

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
24 changes: 22 additions & 2 deletions src/Aspire.Dashboard/Otlp/Model/OtlpHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.Globalization;
using System.Runtime.CompilerServices;
using System.Text;
using System.Text.RegularExpressions;
using Aspire.Dashboard.Otlp.Storage;
using Google.Protobuf;
using Google.Protobuf.Collections;
Expand All @@ -13,8 +14,27 @@

namespace Aspire.Dashboard.Otlp.Model;

public static class OtlpHelpers
public static partial class OtlpHelpers
{
private static readonly string s_longTimePatternWithMilliseconds = GetLongTimePatternWithMilliseconds();

static string GetLongTimePatternWithMilliseconds()
{
// From https://learn.microsoft.com/dotnet/standard/base-types/how-to-display-milliseconds-in-date-and-time-values

// Gets the long time pattern, which is something like "h:mm:ss tt" (en-US), "H:mm:ss" (ja-JP), "HH:mm:ss" (fr-FR).
var longTimePattern = DateTimeFormatInfo.CurrentInfo.LongTimePattern;

// Create a format similar to .fff but based on the current culture.
var millisecondFormat = $"{NumberFormatInfo.CurrentInfo.NumberDecimalSeparator}fff";

// Append millisecond pattern to current culture's long time pattern.
return MatchSecondsInTimeFormatPattern().Replace(longTimePattern, $"$1{millisecondFormat}");
Comment thread
drewnoakes marked this conversation as resolved.
}

[GeneratedRegex("(:ss|:s)")]
Comment thread
drewnoakes marked this conversation as resolved.
private static partial Regex MatchSecondsInTimeFormatPattern();

public static string? GetServiceId(this Resource resource)
{
string? serviceName = null;
Expand Down Expand Up @@ -44,7 +64,7 @@ public static string ToShortenedId(string id) =>

public static string FormatTimeStamp(DateTime timestamp)
Comment thread
drewnoakes marked this conversation as resolved.
{
return timestamp.ToLocalTime().ToString("h:mm:ss.fff tt", CultureInfo.CurrentCulture);
return timestamp.ToLocalTime().ToString(s_longTimePatternWithMilliseconds, CultureInfo.CurrentCulture);
}

public static string ToHexString(ReadOnlyMemory<byte> bytes)
Expand Down