Skip to content
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.

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

trace2: remove inaccurate warning and add UI helper exit calls #1114

Merged
merged 3 commits into from
Feb 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/shared/Atlassian.Bitbucket.UI.Avalonia/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ private static void AppMain(object o)
.GetAwaiter()
.GetResult();

context.Trace2.Stop(exitCode);
Environment.Exit(exitCode);
}
}
Expand Down
8 changes: 2 additions & 6 deletions src/shared/Core/Trace2.cs
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,6 @@ private void TryParseSettings(TextWriter error, IFileSystem fileSystem)
}
}
}

if (_writers.Count == 0)
{
error.WriteLine("warning: unable to set up TRACE2 tracing. No traces will be written.");
}
}

private void WriteVersion(
Expand Down Expand Up @@ -314,8 +309,9 @@ public abstract class Trace2Message
[JsonProperty("sid", Order = 2)]
public string Sid { get; set; }

// TODO: Remove this default value when TRACE2 regions are introduced.
[JsonProperty("thread", Order = 3)]
public string Thread { get; set; }
public string Thread { get; set; } = "main";

[JsonProperty("time", Order = 4)]
public DateTimeOffset Time { get; set; }
Expand Down
1 change: 1 addition & 0 deletions src/shared/Git-Credential-Manager.UI.Avalonia/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ private static void AppMain(object o)
.GetAwaiter()
.GetResult();

context.Trace2.Stop(exitCode);
Environment.Exit(exitCode);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/shared/Git-Credential-Manager/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public static void Main(string[] args)
);
}
}

//
// Git Credential Manager's executable used to be named "git-credential-manager-core" before
// dropping the "-core" suffix. In order to prevent "helper not found" errors for users who
Expand Down
1 change: 1 addition & 0 deletions src/shared/GitHub.UI.Avalonia/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ private static void AppMain(object o)
.GetAwaiter()
.GetResult();

context.Trace2.Stop(exitCode);
Environment.Exit(exitCode);
}
}
Expand Down
1 change: 1 addition & 0 deletions src/shared/GitLab.UI.Avalonia/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ private static void AppMain(object o)
.GetAwaiter()
.GetResult();

context.Trace2.Stop(exitCode);
Environment.Exit(exitCode);
}
}
Expand Down
1 change: 1 addition & 0 deletions src/windows/Atlassian.Bitbucket.UI.Windows/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public static async Task Main(string[] args)
.GetAwaiter()
.GetResult();

context.Trace2.Stop(exitCode);
Environment.Exit(exitCode);
}
}
Expand Down
1 change: 1 addition & 0 deletions src/windows/Git-Credential-Manager.UI.Windows/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public static async Task Main(string[] args)
.GetAwaiter()
.GetResult();

context.Trace2.Stop(exitCode);
Environment.Exit(exitCode);
}
}
Expand Down
1 change: 1 addition & 0 deletions src/windows/GitHub.UI.Windows/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public static async Task Main(string[] args)
.GetAwaiter()
.GetResult();

context.Trace2.Stop(exitCode);
Environment.Exit(exitCode);
}
}
Expand Down
1 change: 1 addition & 0 deletions src/windows/GitLab.UI.Windows/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public static async Task Main(string[] args)
.GetAwaiter()
.GetResult();

context.Trace2.Stop(exitCode);
Environment.Exit(exitCode);
}
}
Expand Down