Skip to content

Improve telemetry parsing. #74

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 2 commits into from
Oct 31, 2025
Merged

Improve telemetry parsing. #74

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cce6f2
Improve telemetry parsing.
azchohfi Oct 31, 2025
5b6e1bd
Merge branch 'main' into alzollin/telemetryFix
nmetulev Oct 31, 2025
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
36 changes: 24 additions & 12 deletions src/winapp-CLI/WinApp.Cli/Telemetry/Events/CommandInvokedEvent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using Microsoft.Diagnostics.Telemetry;
using Microsoft.Diagnostics.Telemetry.Internal;
using System.CommandLine;
using System.CommandLine.Help;
using System.CommandLine.Parsing;
using System.Diagnostics.Tracing;
using System.Text.Json;
Expand All @@ -25,32 +26,43 @@ internal class CommandInvokedEvent : EventBase
internal CommandInvokedEvent(CommandResult commandResult, DateTime startedTime)
{
CommandName = commandResult.Command.GetType().FullName!;
var argumentsDict = commandResult.Children
.OfType<ArgumentResult>()
.ToDictionary(a => a.Argument.Name, GetValue);
var optionsDict = commandResult.Children
.OfType<OptionResult>()
.ToDictionary(o => o.Option.Name, GetValue);
var commandExecutionContext = new CommandExecutionContext(argumentsDict, optionsDict);
Context = JsonSerializer.Serialize(commandExecutionContext, CommandInvokedEventJsonContext.Default.CommandExecutionContext);
try
{
var argumentsDict = commandResult.Children
.OfType<ArgumentResult>()
.ToDictionary(a => a.Argument.Name, GetValue);
var optionsDict = commandResult.Children
.OfType<OptionResult>()
.ToDictionary(o => o.Option.Name, GetValue);
var commandExecutionContext = new CommandExecutionContext(argumentsDict, optionsDict);
Context = JsonSerializer.Serialize(commandExecutionContext, CommandInvokedEventJsonContext.Default.CommandExecutionContext);
}
catch (Exception ex)
{
Context = $"[error parsing context]: {ex.Message}";
}
StartedTime = startedTime;
}

private string? GetValue(OptionResult o)
{
return !o.Errors.Any() ? GetValue(o.Option.ValueType, o.Implicit, o.GetValueOrDefault<object?>()) : "[error]";
return o.Option is HelpOption
? "true"
: !o.Errors.Any() ? GetValue(o.Option.ValueType, o.Implicit, () => o.GetValueOrDefault<object?>()) : "[error]";
}

private string? GetValue(ArgumentResult a)
{
return !a.Errors.Any() ? GetValue(a.Argument.ValueType, a.Implicit, a.GetValueOrDefault<object?>()) : "[error]";
return !a.Errors.Any()
? GetValue(a.Argument.ValueType, a.Implicit, () => a.GetValueOrDefault<object?>())
: (a.Errors.Any(e => e.Message.StartsWith("Required argument missing for command:")) ? null : "[error]");
}

private static string? GetValue(Type valueType, bool isImplicit, object? value)
private static string? GetValue(Type valueType, bool isImplicit, Func<object?> value)
{
return isImplicit ? null : ((valueType == typeof(string) ||
valueType == typeof(FileInfo) ||
valueType == typeof(DirectoryInfo)) ? "[string]" : value)?.ToString();
valueType == typeof(DirectoryInfo)) ? "[string]" : value != null ? value() : null)?.ToString();
}

public string CommandName { get; private set; }
Expand Down