Skip to content

[GFX-549] 抽取 ConfigureLogOptions 的 GrafanaLoki 标签收集逻辑为 private 辅助方法消除 Sonar S3776 #366

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
github-actions merged 2 commits into from
Aug 7, 2026
Merged

[GFX-549] 抽取 ConfigureLogOptions 的 GrafanaLoki 标签收集逻辑为 private 辅助方法消除 Sonar S3776 #366

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0350bb6
fix(apphost): 抽取 ConfigureLogOptions 的 GrafanaLoki 标签收集逻辑为 private 辅助…
AlianBlank Aug 6, 2026
df8cbc6
Merge branch 'main' into feature/gfx-549
AlianBlank Aug 7, 2026
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
62 changes: 37 additions & 25 deletions GameFrameX.AppHost/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,31 +138,7 @@ private static async Task Main(string[] args)
/// <param name="startupOptions">启动选项实例 / Startup options instance</param>
private static void ConfigureLogOptions(StartupOptions startupOptions)
{
var properties = typeof(StartupOptions).GetProperties();
foreach (var property in properties)
{
var grafanaLokiLabelTagAttribute = property.GetCustomAttribute<GrafanaLokiLabelTagAttribute>();
if (grafanaLokiLabelTagAttribute == null)
{
continue;
}

if (property.Name.Equals(nameof(StartupOptions.ServerType), StringComparison.Ordinal))
{
continue;
}

var value = property.GetValue(startupOptions)?.ToString();
if (string.IsNullOrEmpty(value))
{
continue;
}

if (!LogOptions.Default.GrafanaLokiLabels.TryAdd(property.Name, value))
{
LogHelper.Warning(LocalizationService.GetString(Keys.StartUp.GrafanaLokiLabelExists, property.Name));
}
}
ApplyGrafanaLokiLabels(startupOptions);

LogOptions.Default.IsConsole = startupOptions.LogIsConsole;
LogOptions.Default.IsGrafanaLoki = startupOptions.LogIsGrafanaLoki;
Expand Down Expand Up @@ -206,6 +182,42 @@ private static void ConfigureLogOptions(StartupOptions startupOptions)
LogOptions.Default.LogTagName = logTypeParts.Count > 0 ? string.Join("_", logTypeParts) : null;
}

/// <summary>
/// 根据启动选项上的 GrafanaLokiLabelTagAttribute 标记，收集并写入日志的 Grafana Loki 标签。
/// </summary>
/// <remarks>
/// Collects Grafana Loki labels from GrafanaLokiLabelTagAttribute markers on startup options and writes them to log options. Extracted from ConfigureLogOptions to keep cognitive complexity under the Sonar S3776 threshold.
/// </remarks>
/// <param name="startupOptions">启动选项实例 / Startup options instance</param>
private static void ApplyGrafanaLokiLabels(StartupOptions startupOptions)
{
var properties = typeof(StartupOptions).GetProperties();
foreach (var property in properties)
{
var grafanaLokiLabelTagAttribute = property.GetCustomAttribute<GrafanaLokiLabelTagAttribute>();
if (grafanaLokiLabelTagAttribute == null)
{
continue;
}

if (property.Name.Equals(nameof(StartupOptions.ServerType), StringComparison.Ordinal))
{
continue;
}

var value = property.GetValue(startupOptions)?.ToString();
if (string.IsNullOrEmpty(value))
{
continue;
}

if (!LogOptions.Default.GrafanaLokiLabels.TryAdd(property.Name, value))
{
LogHelper.Warning(LocalizationService.GetString(Keys.StartUp.GrafanaLokiLabelExists, property.Name));
}
}
}

/// <summary>
/// 根据服务器类型参数解析多个服务器类型。
/// </summary>
Expand Down
Loading