Skip to content

Commit 2f142c9

Browse files
authored
Reapply "Remove emoji icons from JobMonitor log statements"
This reverts commit 0879cfb.
1 parent 0879cfb commit 2f142c9

2 files changed

Lines changed: 11 additions & 12 deletions

File tree

src/Microsoft.DotNet.Helix/JobMonitor/JobMonitorRunner.cs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ private async Task CancelInFlightHelixJobsAsync(
185185
try
186186
{
187187
await _helix.CancelJobAsync(job.JobName, cancellationToken);
188-
_logger.LogInformation("🛑 Requested cancellation of Helix job {JobName}.{nl}{JobUri}",
188+
_logger.LogInformation("Requested cancellation of Helix job {JobName}.{nl}{JobUri}",
189189
job.DisplayName, Environment.NewLine, job.DetailsUri);
190190
}
191191
catch (OperationCanceledException)
@@ -304,7 +304,7 @@ private async Task<int> RunLoopAsync(
304304
int totalWorkItems = _workItemOutcomes.Count;
305305
int failedWorkItems = _workItemOutcomes.Values.Count(passed => !passed);
306306
_logger.LogInformation(
307-
"📊 Final summary:{nl}"
307+
"Final summary:{nl}"
308308
+ " Jobs: {TotalJobs} submitted / {ResubmittedJobs} resubmitted / {ProcessedJobs} processed{nl}"
309309
+ " Work items: {TotalWorkItems} submitted / {ResubmittedWorkItems} resubmitted / {FailedWorkItems} failed",
310310
Environment.NewLine,
@@ -373,7 +373,7 @@ private async Task LogHelixJobStatusAsync(
373373

374374
JobWorkItemStatusCounts counts = GetStatusCounts(orderedJobs, workItemsByJob, completedJobNames, processedJobNames);
375375
_logger.LogInformation(
376-
"ℹ️ Status: {ProcessedJobs} processed / {CompletedJobs} completed / {RunningJobs} running / {WaitingJobs} waiting jobs{nl}"
376+
"Status: {ProcessedJobs} processed / {CompletedJobs} completed / {RunningJobs} running / {WaitingJobs} waiting jobs{nl}"
377377
+ " {ProcessedWorkItems} processed / {CompletedWorkItems} completed / {RunningWorkItems} running / {WaitingWorkItems} waiting work items",
378378
counts.ProcessedJobs,
379379
counts.CompletedJobs,
@@ -478,7 +478,7 @@ private static void AddVerboseJobLines(
478478
{
479479
string jobConnector = isLastJob ? "└─" : "├─";
480480
string childPrefix = isLastJob ? " " : "│ ";
481-
lines.Add($"{jobConnector} 🧪 Helix job {job.DisplayName} [{jobStatus}]");
481+
lines.Add($"{jobConnector} Helix job {job.DisplayName} [{jobStatus}]");
482482

483483
List<WorkItemSummary> orderedWorkItems =
484484
[
@@ -584,8 +584,7 @@ private async Task ProcessCompletedJobAsync(
584584
QueueTestResultUpload(helixJob, workItems, cancellationToken);
585585
}
586586

587-
_logger.LogInformation("{Icon} Job '{JobName}' {Status} ({PassedCount} passed, {FailedCount} failed){nl}{JobUri}",
588-
failedWorkItemCount == 0 ? "✅" : "❌",
587+
_logger.LogInformation("Job '{JobName}' {Status} ({PassedCount} passed, {FailedCount} failed){nl}{JobUri}",
589588
helixJob.DisplayName,
590589
failedWorkItemCount == 0 ? "succeeded" : "failed",
591590
successfulWorkItemCount,
@@ -705,7 +704,7 @@ private void LogFailedWorkItemConsoleLinks(HelixJobInfo helixJob, IReadOnlyColle
705704
continue;
706705
}
707706

708-
LogWarning($"Work item '{workItem.Name}' in job '{helixJob.DisplayName}' failed ({FormatWorkItemState(workItem)}).{Environment.NewLine}Console: {GetConsoleOutputText(workItem.ConsoleOutputUri)}");
707+
LogWarning($"Work item '{workItem.Name}' in job '{helixJob.DisplayName}' failed ({FormatWorkItemState(workItem)}).{Environment.NewLine}Console: {GetConsoleOutputText(workItem.ConsoleOutputUri)}");
709708
}
710709
}
711710

@@ -816,7 +815,7 @@ private void LogFinalFailedWorkItemConsoleInfo()
816815
lines.Add($"{(i == failures.Count - 1 ? " " : "│ ")}└─ Console: {failure.ConsoleOutput}");
817816
}
818817

819-
LogError($"Failed work item console logs:{Environment.NewLine}Test results: {GetTestResultsUri()}{Environment.NewLine}{string.Join(Environment.NewLine, lines)}");
818+
LogError($"Failed work item console logs:{Environment.NewLine}Test results: {GetTestResultsUri()}{Environment.NewLine}{string.Join(Environment.NewLine, lines)}");
820819
}
821820

822821
private string GetTestResultsUri()
@@ -827,7 +826,7 @@ private static string GetConsoleOutputText(string consoleOutputUri)
827826

828827
private async Task<JobResubmissionResult> ResubmitFailedJobsAsync(CancellationToken cancellationToken)
829828
{
830-
_logger.LogInformation("🔁 Checking for failed Helix jobs to resubmit the failed work items...");
829+
_logger.LogInformation("Checking for failed Helix jobs to resubmit the failed work items...");
831830

832831
var retryingHelixSubmitterJobs = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
833832
var resubmittedJobs = new List<HelixJobInfo>();

src/Microsoft.DotNet.Helix/Sdk.Tests/Microsoft.DotNet.Helix.Sdk.Tests/JobMonitorRunnerTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2640,14 +2640,14 @@ public async Task CompletedHelixJob_LogsFailedWorkItemConsoleLinks()
26402640
logger.Messages.Should().Contain(message =>
26412641
message.Contains($"Work item 'wi-fail' in job 'helix-linux' failed (Finished, exit code 1).{Environment.NewLine}Console: https://helix.example/wi-fail/console", StringComparison.Ordinal));
26422642
logger.Messages.Should().Contain(message =>
2643-
message.Contains("##vso[task.logissue type=warning]Work item 'wi-fail' in job 'helix-linux' failed", StringComparison.Ordinal));
2643+
message.Contains("##vso[task.logissue type=warning]Work item 'wi-fail' in job 'helix-linux' failed", StringComparison.Ordinal));
26442644
logger.Messages.Should().Contain(message =>
26452645
message.Contains("Failed work item console logs:", StringComparison.Ordinal)
26462646
&& message.Contains("Test results: https://dev.azure.com/dnceng/public/_build/results?buildId=123&view=ms.vss-test-web.build-test-results-tab", StringComparison.Ordinal)
26472647
&& message.Contains("└─ wi-fail (Job: helix-linux) (Finished, exit code 1)", StringComparison.Ordinal)
26482648
&& message.Contains("└─ Console: https://helix.example/wi-fail/console", StringComparison.Ordinal));
26492649
logger.Messages.Should().Contain(message =>
2650-
message.Contains("##vso[task.logissue type=error]Failed work item console logs:", StringComparison.Ordinal));
2650+
message.Contains("##vso[task.logissue type=error]Failed work item console logs:", StringComparison.Ordinal));
26512651
logger.Messages.Should().NotContain(message =>
26522652
message.Contains("Helix job: helix-linux", StringComparison.Ordinal));
26532653
}
@@ -2733,7 +2733,7 @@ public async Task LoopStatus_VerboseLogsFullHelixJobWorkItemList()
27332733
exitCode.Should().Be(1);
27342734
logger.Messages.Should().Contain(message =>
27352735
message.Contains("Helix job details:", StringComparison.Ordinal)
2736-
&& message.Contains("└─ 🧪 Helix job helix-linux [Running]", StringComparison.Ordinal)
2736+
&& message.Contains("└─ Helix job helix-linux [Running]", StringComparison.Ordinal)
27372737
&& message.Contains(" ├─ wi-01 (Running)", StringComparison.Ordinal)
27382738
&& message.Contains(" ├─ wi-10 (Running)", StringComparison.Ordinal)
27392739
&& message.Contains(" ├─ wi-11 (Running)", StringComparison.Ordinal)

0 commit comments

Comments
 (0)