Keep Issue.cs and TimelineRecord.cs aligned in terms of instantiation flow.

In some cases, references to `System.IO.Compression` members are #ifdef'd and only needed when the OS_WINDOWS compiler directive is present.

src/Runner.Common/JobServerQueue.cs

@@ -299,7 +299,7 @@ namespace GitHub.Runner.Common
                         {
                             try
                             {
-                                // Give at most 60s for each request. 
+                                // Give at most 60s for each request.
                                 using (var timeoutTokenSource = new CancellationTokenSource(TimeSpan.FromSeconds(60)))
                                 {
                                     await _jobServer.AppendTimelineRecordFeedAsync(_scopeIdentifier, _hubName, _planId, _jobTimelineId, _jobTimelineRecordId, stepRecordId, batch.Select(logLine => logLine.Line).ToList(), batch[0].LineNumber, timeoutTokenSource.Token);
@@ -600,8 +600,7 @@ namespace GitHub.Runner.Common
                 {
                     foreach (var issue in record.Issues)
                     {
-                        String source;
+                        string source = issue["sourcepath"];
-                        issue.Data.TryGetValue("sourcepath", out source);
                         Trace.Verbose($"        Issue: c={issue.Category}, t={issue.Type}, s={source ?? string.Empty}, m={issue.Message}");
                     }
                 }

src/Runner.Listener/JobDispatcher.cs

@@ -33,7 +33,7 @@ namespace GitHub.Runner.Listener
     // This implementation of IJobDispatcher is not thread safe.
     // It is based on the fact that the current design of the runner is a dequeue
     // and processes one message from the message queue at a time.
-    // In addition, it only executes one job every time, 
+    // In addition, it only executes one job every time,
     // and the server will not send another job while this one is still running.
     public sealed class JobDispatcher : RunnerService, IJobDispatcher
     {
@@ -426,7 +426,7 @@ namespace GitHub.Runner.Listener
                                                 {
                                                     workerOutput.Add(stdout.Data);
                                                 }
-                                                
+
                                                 if (printToStdout)
                                                 {
                                                     term.WriteLine(stdout.Data, skipTracing: true);
@@ -512,7 +512,7 @@ namespace GitHub.Runner.Listener
                         var accessToken = systemConnection?.Authorization?.Parameters["AccessToken"];
                         notification.JobStarted(message.JobId, accessToken, systemConnection.Url);
 
-                        HostContext.WritePerfCounter($"SentJobToWorker_{requestId.ToString()}");
+                        HostContext.WritePerfCounter($"SentJobToWorker_{requestId}");
 
                         try
                         {
@@ -620,7 +620,7 @@ namespace GitHub.Runner.Listener
                                 }
                             }
 
-                            // wait worker to exit 
+                            // wait worker to exit
                             // if worker doesn't exit within timeout, then kill worker.
                             completedTask = await Task.WhenAny(workerProcessTask, Task.Delay(-1, workerCancelTimeoutKillToken));
 
@@ -1014,7 +1014,7 @@ namespace GitHub.Runner.Listener
                 }
 
                 var unhandledExceptionIssue = new Issue() { Type = IssueType.Error, Message = errorMessage };
-                unhandledExceptionIssue.Data[Constants.Runner.InternalTelemetryIssueDataKey] = Constants.Runner.WorkerCrash;
+                unhandledExceptionIssue[Constants.Runner.InternalTelemetryIssueDataKey] = Constants.Runner.WorkerCrash;
                 jobRecord.ErrorCount++;
                 jobRecord.Issues.Add(unhandledExceptionIssue);
                 await jobServer.UpdateTimelineRecordsAsync(message.Plan.ScopeIdentifier, message.Plan.PlanType, message.Plan.PlanId, message.Timeline.Id, new TimelineRecord[] { jobRecord }, CancellationToken.None);

src/Runner.Worker/ActionCommandManager.cs

@@ -270,12 +270,9 @@ namespace GitHub.Runner.Worker
                 if (string.Equals(blocked, envName, StringComparison.OrdinalIgnoreCase))
                 {
                     // Log Telemetry and let user know they shouldn't do this
-                    var issue = new Issue()
+                    var message = $"Can't update {blocked} environment variable using ::set-env:: command.";
-                    {
+                    var metadata = new IssueMetadata(Constants.Runner.InternalTelemetryIssueDataKey, $"{Constants.Runner.UnsupportedCommand}_{envName}");
-                        Type = IssueType.Error,
+                    var issue = context.CreateIssue(IssueType.Error, message, metadata, true);
-                        Message = $"Can't update {blocked} environment variable using ::set-env:: command."
-                    };
-                    issue.Data[Constants.Runner.InternalTelemetryIssueDataKey] = $"{Constants.Runner.UnsupportedCommand}_{envName}";
                     context.AddIssue(issue);
 
                     return;
@@ -309,12 +306,9 @@ namespace GitHub.Runner.Worker
         {
             if (context.Global.Variables.GetBoolean("DistributedTask.DeprecateStepOutputCommands") ?? false)
             {
-                var issue = new Issue()
+                var message = string.Format(Constants.Runner.UnsupportedCommandMessage, this.Command);
-                {
+                var metadata = new IssueMetadata(Constants.Runner.InternalTelemetryIssueDataKey, Constants.Runner.UnsupportedCommand);
-                    Type = IssueType.Warning,
+                var issue = context.CreateIssue(IssueType.Warning, message, metadata, true);
-                    Message = String.Format(Constants.Runner.UnsupportedCommandMessage, this.Command)
-                };
-                issue.Data[Constants.Runner.InternalTelemetryIssueDataKey] = Constants.Runner.UnsupportedCommand;
                 context.AddIssue(issue);
             }
 
@@ -344,12 +338,9 @@ namespace GitHub.Runner.Worker
         {
             if (context.Global.Variables.GetBoolean("DistributedTask.DeprecateStepOutputCommands") ?? false)
             {
-                var issue = new Issue()
+                var message = string.Format(Constants.Runner.UnsupportedCommandMessage, this.Command);
-                {
+                var metadata = new IssueMetadata(Constants.Runner.InternalTelemetryIssueDataKey, Constants.Runner.UnsupportedCommand);
-                    Type = IssueType.Warning,
+                var issue = context.CreateIssue(IssueType.Warning, message, metadata, true);
-                    Message = String.Format(Constants.Runner.UnsupportedCommandMessage, this.Command)
-                };
-                issue.Data[Constants.Runner.InternalTelemetryIssueDataKey] = Constants.Runner.UnsupportedCommand;
                 context.AddIssue(issue);
             }
 
@@ -618,16 +609,11 @@ namespace GitHub.Runner.Worker
                 context.Debug("Enhanced Annotations not enabled on the server. The 'title', 'end_line', and 'end_column' fields are unsupported.");
             }
 
-            Issue issue = new()
+            var issueCategory = "General";
-            {
-                Category = "General",
-                Type = this.Type,
-                Message = command.Data
-            };
 
             if (!string.IsNullOrEmpty(file))
             {
-                issue.Category = "Code";
+                issueCategory = "Code";
 
                 if (container != null)
                 {
@@ -658,14 +644,13 @@ namespace GitHub.Runner.Worker
                 }
             }
 
-            foreach (var property in command.Properties)
+            string keyToExclude = Constants.Runner.InternalTelemetryIssueDataKey;
-            {
+            var filteredDictionaryEntries = command.Properties
-                if (!string.Equals(property.Key, Constants.Runner.InternalTelemetryIssueDataKey, StringComparison.OrdinalIgnoreCase))
+                                                   .Where(kvp => !string.Equals(kvp.Key, keyToExclude, StringComparison.OrdinalIgnoreCase))
-                {
+                                                   .ToList();
-                    issue.Data[property.Key] = property.Value;
-                }
-            }
 
+            var metadata = new IssueMetadata(issueCategory, false, null, filteredDictionaryEntries);
+            var issue = context.CreateIssue(this.Type, command.Data, metadata, true);
             context.AddIssue(issue);
         }
 

src/Runner.Worker/ActionManager.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.IO.Compression;
+using System.IO.Compression;     // required for OS_WINDOWS
 using System.Linq;
 using System.Net;
 using System.Net.Http;

src/Runner.Worker/DiagnosticLogManager.cs

@@ -5,7 +5,6 @@ using System.IO.Compression;
 using GitHub.DistributedTask.WebApi;
 using System.Linq;
 using System.Globalization;
-using System.Threading.Tasks;
 using Pipelines = GitHub.DistributedTask.Pipelines;
 using GitHub.Runner.Common;
 using GitHub.Runner.Sdk;
@@ -32,7 +31,7 @@ namespace GitHub.Runner.Worker
     {
         private static string DateTimeFormat = "yyyyMMdd-HHmmss";
         public void UploadDiagnosticLogs(IExecutionContext executionContext,
-                                         IExecutionContext parentContext, 
+                                         IExecutionContext parentContext,
                                          Pipelines.AgentJobRequestMessage message,
                                          DateTime jobStartTimeUtc)
         {

src/Runner.Worker/ExecutionContext.cs

@@ -16,6 +16,7 @@ using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using GitHub.Runner.Worker.Container;
 using GitHub.Runner.Worker.Handlers;
+using GitHub.Services.Common;
 using Newtonsoft.Json;
 using ObjectTemplating = GitHub.DistributedTask.ObjectTemplating;
 using Pipelines = GitHub.DistributedTask.Pipelines;
@@ -90,7 +91,8 @@ namespace GitHub.Runner.Worker
         void SetGitHubContext(string name, string value);
         void SetOutput(string name, string value, out string reference);
         void SetTimeout(TimeSpan? timeout);
-        void AddIssue(Issue issue, string message = null);
+        IReadOnlyIssue CreateIssue(IssueType issueType, string rawMessage, IssueMetadata metadata, bool writeToLog);
+        void AddIssue(IReadOnlyIssue issue);
         void Progress(int percentage, string currentOperation = null);
         void UpdateDetailTimelineRecord(TimelineRecord record);
 
@@ -124,8 +126,10 @@ namespace GitHub.Runner.Worker
 
         private readonly TimelineRecord _record = new();
         private readonly Dictionary<Guid, TimelineRecord> _detailRecords = new();
+        private readonly List<IReadOnlyIssue> _embeddedIssueCollector;
         private readonly object _loggerLock = new();
         private readonly object _matchersLock = new();
+        private readonly ExecutionContext _parentExecutionContext;
 
         private event OnMatcherChanged _onMatcherChanged;
 
@@ -133,7 +137,6 @@ namespace GitHub.Runner.Worker
 
         private IPagingLogger _logger;
         private IJobServerQueue _jobServerQueue;
-        private ExecutionContext _parentExecutionContext;
 
         private Guid _mainTimelineId;
         private Guid _detailTimelineId;
@@ -147,6 +150,29 @@ namespace GitHub.Runner.Worker
         private long _totalThrottlingDelayInMilliseconds = 0;
         private bool _stepTelemetryPublished = false;
 
+        public ExecutionContext()
+            : this(null, false)
+        {
+        }
+
+        private ExecutionContext(ExecutionContext parent, bool embedded)
+        {
+            if (embedded)
+            {
+                ArgUtil.NotNull(parent, nameof(parent));
+            }
+
+            _parentExecutionContext = parent;
+            this.IsEmbedded = embedded;
+            this.StepTelemetry = new ActionsStepTelemetry
+            {
+                IsEmbedded = embedded
+            };
+
+            //Embedded Execution Contexts pseudo-inherit their parent's embeddedIssueCollector.
+            _embeddedIssueCollector = embedded ? parent._embeddedIssueCollector : new();
+        }
+
         public Guid Id => _record.Id;
         public Guid EmbeddedId { get; private set; }
         public string ScopeName { get; private set; }
@@ -159,7 +185,7 @@ namespace GitHub.Runner.Worker
         public Dictionary<string, VariableValue> JobOutputs { get; private set; }
 
         public ActionsEnvironmentReference ActionsEnvironment { get; private set; }
-        public ActionsStepTelemetry StepTelemetry { get; } = new ActionsStepTelemetry();
+        public ActionsStepTelemetry StepTelemetry { get; private init; }
         public DictionaryContextData ExpressionValues { get; } = new DictionaryContextData();
         public IList<IFunctionInfo> ExpressionFunctions { get; } = new List<IFunctionInfo>();
 
@@ -184,7 +210,7 @@ namespace GitHub.Runner.Worker
 
         // An embedded execution context shares the same record ID, record name, and logger
         // as its enclosing execution context.
-        public bool IsEmbedded { get; private set; }
+        public bool IsEmbedded { get; private init; }
 
         public TaskResult? Result
         {
@@ -319,7 +345,7 @@ namespace GitHub.Runner.Worker
         {
             Trace.Entering();
 
-            var child = new ExecutionContext();
+            var child = new ExecutionContext(this, isEmbedded);
             child.Initialize(HostContext);
             child.Global = Global;
             child.ScopeName = scopeName;
@@ -344,7 +370,6 @@ namespace GitHub.Runner.Worker
                 child.ExpressionFunctions.Add(item);
             }
             child._cancellationTokenSource = cancellationTokenSource ?? new CancellationTokenSource();
-            child._parentExecutionContext = this;
             child.EchoOnActionCommand = EchoOnActionCommand;
 
             if (recordOrder != null)
@@ -365,11 +390,9 @@ namespace GitHub.Runner.Worker
                 child._logger.Setup(_mainTimelineId, recordId);
             }
 
-            child.IsEmbedded = isEmbedded;
             child.StepTelemetry.StepId = recordId;
             child.StepTelemetry.Stage = stage.ToString();
-            child.StepTelemetry.IsEmbedded = isEmbedded;
+            child.StepTelemetry.StepContextName = child.GetFullyQualifiedContextName();
-            child.StepTelemetry.StepContextName = child.GetFullyQualifiedContextName(); ;
 
             return child;
         }
@@ -411,13 +434,24 @@ namespace GitHub.Runner.Worker
                 this.Warning($"The job has experienced {TimeSpan.FromMilliseconds(_totalThrottlingDelayInMilliseconds).TotalSeconds} seconds total delay caused by server throttling.");
             }
 
+            DateTime now = DateTime.UtcNow;
             _record.CurrentOperation = currentOperation ?? _record.CurrentOperation;
             _record.ResultCode = resultCode ?? _record.ResultCode;
-            _record.FinishTime = DateTime.UtcNow;
+            _record.FinishTime = now;
             _record.PercentComplete = 100;
             _record.Result = _record.Result ?? TaskResult.Succeeded;
             _record.State = TimelineRecordState.Completed;
 
+            // Before our main timeline's final QueueTimelineRecordUpdate,
+            //    inject any issues collected by embedded ExecutionContexts.
+            if (!this.IsEmbedded)
+            {
+                foreach (var issue in _embeddedIssueCollector)
+                {
+                    AddIssue(issue);
+                }
+            }
+
             _jobServerQueue.QueueTimelineRecordUpdate(_mainTimelineId, _record);
 
             // complete all detail timeline records.
@@ -425,7 +459,7 @@ namespace GitHub.Runner.Worker
             {
                 foreach (var record in _detailRecords)
                 {
-                    record.Value.FinishTime = record.Value.FinishTime ?? DateTime.UtcNow;
+                    record.Value.FinishTime = record.Value.FinishTime ?? now;
                     record.Value.PercentComplete = record.Value.PercentComplete ?? 100;
                     record.Value.Result = record.Value.Result ?? TaskResult.Succeeded;
                     record.Value.State = TimelineRecordState.Completed;
@@ -545,76 +579,89 @@ namespace GitHub.Runner.Worker
             _jobServerQueue.QueueTimelineRecordUpdate(_mainTimelineId, _record);
         }
 
-        // This is not thread safe, the caller need to take lock before calling issue()
+        // This is not thread safe, the caller needs to take lock before calling issue()
-        public void AddIssue(Issue issue, string logMessage = null)
+        public IReadOnlyIssue CreateIssue(IssueType issueType, string rawMessage, IssueMetadata metadata, bool writeToLog)
+        {
+            string refinedMessage = PrimitiveExtensions.TrimExcess(HostContext.SecretMasker.MaskSecrets(rawMessage), _maxIssueMessageLength);
+
+            var result = new Issue() {
+                Type = issueType,
+                Message = refinedMessage,
+            };
+
+            if (metadata != null)
+            {
+                result.Category = metadata.Category;
+                result.IsInfrastructureIssue = metadata.IsInfrastructureIssue;
+                foreach (var kvp in metadata.Data)
+                {
+                    result[kvp.Key] = kvp.Value;
+                }
+            }
+
+            // It's important to keep track of the step number (key:stepNumber) and the line number (key:logFileLineNumber) of every issue that gets logged.
+            // Actions UI from the run summary page use both values to easily link to an exact locations in logs where annotations originate from.
+            if (_record.Order != null)
+            {
+                result["stepNumber"] = _record.Order.ToString();
+            }
+
+            string wellKnownTag = null;
+            Int32? previousCountForIssueType = null;
+            switch (issueType)
+            {
+                case IssueType.Error:
+                    wellKnownTag = WellKnownTags.Error;
+                    previousCountForIssueType = _record.ErrorCount++;
+                    break;
+                case IssueType.Warning:
+                    wellKnownTag = WellKnownTags.Warning;
+                    previousCountForIssueType = _record.WarningCount++;
+                    break;
+                case IssueType.Notice:
+                    wellKnownTag = WellKnownTags.Notice;
+                    previousCountForIssueType = _record.NoticeCount++;
+                    break;
+            }
+
+            if (!string.IsNullOrEmpty(wellKnownTag))
+            {
+                if (writeToLog)
+                {
+                    //Note that ::Write() has it's own secret masking logic
+                    string logText = metadata?.LogMessageOverride ?? result.Message;
+                    if (!string.IsNullOrEmpty(logText))
+                    {
+                        long logLineNumber = Write(wellKnownTag, logText);
+                        result["logFileLineNumber"] = logLineNumber.ToString();
+                    }
+                }
+                if (previousCountForIssueType.GetValueOrDefault(0) < _maxIssueCount)
+                {
+                    _record.Issues.Add(result);
+                }
+            }
+
+            return result;
+        }
+
+
+        // This is not thread safe, the caller needs to take lock before calling issue()
+        public void AddIssue(IReadOnlyIssue issue)
         {
             ArgUtil.NotNull(issue, nameof(issue));
 
-            if (string.IsNullOrEmpty(logMessage))
+            // Embedded ExecutionContexts (a.k.a. Composite actions) should never upload a timeline record to the server.
+            //    Instead, we store processed issues on a shared (psuedo-inherited) list (belonging to the closest
+            //    non-embedded ancestor ExecutionContext) so that they can be processed when that ancestor completes.
+            if (this.IsEmbedded)
             {
-                logMessage = issue.Message;
+                _embeddedIssueCollector.Add(issue);
             }
-
+            else
-            issue.Message = HostContext.SecretMasker.MaskSecrets(issue.Message);
-            if (issue.Message.Length > _maxIssueMessageLength)
             {
-                issue.Message = issue.Message[.._maxIssueMessageLength];
+                _jobServerQueue.QueueTimelineRecordUpdate(_mainTimelineId, _record);
             }
-
-            // Tracking the line number (logFileLineNumber) and step number (stepNumber) for each issue that gets created
-            // Actions UI from the run summary page use both values to easily link to an exact locations in logs where annotations originate from
-            if (_record.Order != null)
-            {
-                issue.Data["stepNumber"] = _record.Order.ToString();
-            }
-
-            if (issue.Type == IssueType.Error)
-            {
-                if (!string.IsNullOrEmpty(logMessage))
-                {
-                    long logLineNumber = Write(WellKnownTags.Error, logMessage);
-                    issue.Data["logFileLineNumber"] = logLineNumber.ToString();
-                }
-
-                if (_record.ErrorCount < _maxIssueCount)
-                {
-                    _record.Issues.Add(issue);
-                }
-
-                _record.ErrorCount++;
-            }
-            else if (issue.Type == IssueType.Warning)
-            {
-                if (!string.IsNullOrEmpty(logMessage))
-                {
-                    long logLineNumber = Write(WellKnownTags.Warning, logMessage);
-                    issue.Data["logFileLineNumber"] = logLineNumber.ToString();
-                }
-
-                if (_record.WarningCount < _maxIssueCount)
-                {
-                    _record.Issues.Add(issue);
-                }
-
-                _record.WarningCount++;
-            }
-            else if (issue.Type == IssueType.Notice)
-            {
-                if (!string.IsNullOrEmpty(logMessage))
-                {
-                    long logLineNumber = Write(WellKnownTags.Notice, logMessage);
-                    issue.Data["logFileLineNumber"] = logLineNumber.ToString();
-                }
-
-                if (_record.NoticeCount < _maxIssueCount)
-                {
-                    _record.Issues.Add(issue);
-                }
-
-                _record.NoticeCount++;
-            }
-
-            _jobServerQueue.QueueTimelineRecordUpdate(_mainTimelineId, _record);
         }
 
         public void UpdateDetailTimelineRecord(TimelineRecord record)
@@ -975,16 +1022,7 @@ namespace GitHub.Runner.Worker
                             if ((issue.Type == IssueType.Error || issue.Type == IssueType.Warning) &&
                                 !string.IsNullOrEmpty(issue.Message))
                             {
-                                string issueTelemetry;
+                                string issueTelemetry = PrimitiveExtensions.TrimExcess(issue.Message, _maxIssueMessageLengthInTelemetry);
-                                if (issue.Message.Length > _maxIssueMessageLengthInTelemetry)
-                                {
-                                    issueTelemetry = $"{issue.Message[.._maxIssueMessageLengthInTelemetry]}";
-                                }
-                                else
-                                {
-                                    issueTelemetry = issue.Message;
-                                }
-
                                 StepTelemetry.ErrorMessages.Add(issueTelemetry);
 
                                 // Only send over the first 3 issues to avoid sending too much data.
@@ -1085,7 +1123,7 @@ namespace GitHub.Runner.Worker
         {
             if (contextData != null &&
                 contextData.TryGetValue(PipelineTemplateConstants.Vars, out var varsPipelineContextData) &&
-                varsPipelineContextData != null && 
+                varsPipelineContextData != null &&
                 varsPipelineContextData is DictionaryContextData varsContextData)
             {
                 // Set debug variables only when StepDebug/RunnerDebug variables are not present.
@@ -1158,19 +1196,23 @@ namespace GitHub.Runner.Worker
         // Do not add a format string overload. See comment on ExecutionContext.Write().
         public static void Error(this IExecutionContext context, string message)
         {
-            context.AddIssue(new Issue() { Type = IssueType.Error, Message = message });
+            var issue = context.CreateIssue(IssueType.Error, message, null, true);
+            context.AddIssue(issue);
         }
 
         // Do not add a format string overload. See comment on ExecutionContext.Write().
         public static void InfrastructureError(this IExecutionContext context, string message)
         {
-            context.AddIssue(new Issue() { Type = IssueType.Error, Message = message, IsInfrastructureIssue = true });
+            var metadata = new IssueMetadata(null, true, null, Enumerable.Empty<KeyValuePair<string, string>>());
+            var issue = context.CreateIssue(IssueType.Error, message, metadata, true);
+            context.AddIssue(issue);
         }
 
         // Do not add a format string overload. See comment on ExecutionContext.Write().
         public static void Warning(this IExecutionContext context, string message)
         {
-            context.AddIssue(new Issue() { Type = IssueType.Warning, Message = message });
+            var issue = context.CreateIssue(IssueType.Warning, message, null, true);
+            context.AddIssue(issue);
         }
 
         // Do not add a format string overload. See comment on ExecutionContext.Write().

src/Runner.Worker/Handlers/CompositeActionHandler.cs

@@ -294,7 +294,7 @@ namespace GitHub.Runner.Worker.Handlers
                     // Evaluation error
                     Trace.Info("Caught exception from expression for embedded step.env");
                     step.ExecutionContext.Error(ex);
-                    step.ExecutionContext.Complete(TaskResult.Failed);
+                    SetStepConclusion(step, TaskResult.Failed);
                 }
 
                 // Register Callback

src/Runner.Worker/Handlers/OutputManager.cs

@@ -4,6 +4,7 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
+using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Common;
 using GitHub.Runner.Sdk;
 using GitHub.Runner.Worker.Container;
@@ -97,7 +98,7 @@ namespace GitHub.Runner.Worker.Handlers
                 var matchers = _matchers;
 
                 // Strip color codes
-                var stripped = line.Contains(_colorCodePrefix) ? _colorCodeRegex.Replace(line, string.Empty) : line;
+                var refinedLine = line.Contains(_colorCodePrefix) ? _colorCodeRegex.Replace(line, string.Empty) : line;
 
                 foreach (var matcher in matchers)
                 {
@@ -107,8 +108,7 @@ namespace GitHub.Runner.Worker.Handlers
                         // Match
                         try
                         {
-                            match = matcher.Match(stripped);
+                            match = matcher.Match(refinedLine);
-
                             break;
                         }
                         catch (RegexMatchTimeoutException ex)
@@ -116,7 +116,7 @@ namespace GitHub.Runner.Worker.Handlers
                             if (attempt < _maxAttempts)
                             {
                                 // Debug
-                                _executionContext.Debug($"Timeout processing issue matcher '{matcher.Owner}' against line '{stripped}'. Exception: {ex.ToString()}");
+                                _executionContext.Debug($"Timeout processing issue matcher '{matcher.Owner}' against line '{refinedLine}'. Exception: {ex}");
                             }
                             else
                             {
@@ -139,12 +139,10 @@ namespace GitHub.Runner.Worker.Handlers
 
                         // Convert to issue
                         var issue = ConvertToIssue(match);
-
                         if (issue != null)
                         {
                             // Log issue
-                            _executionContext.AddIssue(issue, stripped);
+                            _executionContext.AddIssue(issue);
-
                             return;
                         }
                     }
@@ -196,7 +194,7 @@ namespace GitHub.Runner.Worker.Handlers
             }
         }
 
-        private DTWebApi.Issue ConvertToIssue(IssueMatch match)
+        private DTWebApi.IReadOnlyIssue ConvertToIssue(IssueMatch match)
         {
             // Validate the message
             if (string.IsNullOrWhiteSpace(match.Message))
@@ -225,18 +223,14 @@ namespace GitHub.Runner.Worker.Handlers
                 return null;
             }
 
-            var issue = new DTWebApi.Issue
+            var issueData = new Dictionary<string, string>();
-            {
-                Message = match.Message,
-                Type = issueType,
-            };
 
             // Line
             if (!string.IsNullOrEmpty(match.Line))
             {
                 if (int.TryParse(match.Line, NumberStyles.None, CultureInfo.InvariantCulture, out var line))
                 {
-                    issue.Data["line"] = line.ToString(CultureInfo.InvariantCulture);
+                    issueData["line"] = line.ToString(CultureInfo.InvariantCulture);
                 }
                 else
                 {
@@ -249,7 +243,7 @@ namespace GitHub.Runner.Worker.Handlers
             {
                 if (int.TryParse(match.Column, NumberStyles.None, CultureInfo.InvariantCulture, out var column))
                 {
-                    issue.Data["col"] = column.ToString(CultureInfo.InvariantCulture);
+                    issueData["col"] = column.ToString(CultureInfo.InvariantCulture);
                 }
                 else
                 {
@@ -260,7 +254,7 @@ namespace GitHub.Runner.Worker.Handlers
             // Code
             if (!string.IsNullOrWhiteSpace(match.Code))
             {
-                issue.Data["code"] = match.Code.Trim();
+                issueData["code"] = match.Code.Trim();
             }
 
             // File
@@ -312,7 +306,7 @@ namespace GitHub.Runner.Worker.Handlers
                             var relativePath = file.Substring(repositoryPath.Length).TrimStart(Path.DirectorySeparatorChar);
 
                             // Prefer `/` on all platforms
-                            issue.Data["file"] = relativePath.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
+                            issueData["file"] = relativePath.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
                         }
                         else
                         {
@@ -327,9 +321,11 @@ namespace GitHub.Runner.Worker.Handlers
             }
             catch (Exception ex)
             {
-                _executionContext.Debug($"Dropping file value '{match.File}' and fromPath value '{match.FromPath}'. Exception during validation: {ex.ToString()}");
+                _executionContext.Debug($"Dropping file value '{match.File}' and fromPath value '{match.FromPath}'. Exception during validation: {ex}");
             }
 
+            var metadata = new IssueMetadata(null, false, match.SourceText, issueData);
+            var issue = _executionContext.CreateIssue(issueType, match.Message, metadata, true);
             return issue;
         }
 

src/Runner.Worker/IssueMatcher.cs

@@ -8,6 +8,31 @@ namespace GitHub.Runner.Worker
 {
     public delegate void OnMatcherChanged(object sender, MatcherChangedEventArgs e);
 
+
+    public sealed class IssueMetadata
+    {
+        public IssueMetadata(string key, string value)
+            : this(null, false, null, new []{ KeyValuePair.Create(key, value) })
+        {
+        }
+
+        public IssueMetadata(string category, bool infrastructureIssue, string logMessageOverride, IEnumerable<KeyValuePair<string, string>> data)
+        {
+            this.Category = category;
+            this.IsInfrastructureIssue = infrastructureIssue;
+            this.LogMessageOverride = logMessageOverride;
+
+            // Close-over the incoming IEnumerable to force immediate evaluation.
+            var empty = Enumerable.Empty<KeyValuePair<string, string>>();
+            this.Data = new Dictionary<string, string>(data ?? empty, StringComparer.OrdinalIgnoreCase);
+        }
+
+        public readonly string Category;
+        public readonly bool IsInfrastructureIssue;
+        public readonly string LogMessageOverride;
+        public readonly IEnumerable<KeyValuePair<string, string>> Data;
+    }
+
     public sealed class MatcherChangedEventArgs : EventArgs
     {
         public MatcherChangedEventArgs(IssueMatcherConfig config)
@@ -69,7 +94,7 @@ namespace GitHub.Runner.Worker
 
                 if (regexMatch.Success)
                 {
-                    return new IssueMatch(null, pattern, regexMatch.Groups, DefaultSeverity);
+                    return new IssueMatch(line, null, pattern, regexMatch.Groups, DefaultSeverity);
                 }
 
                 return null;
@@ -110,13 +135,13 @@ namespace GitHub.Runner.Worker
                                 }
 
                                 // Return
-                                return new IssueMatch(runningMatch, pattern, regexMatch.Groups, DefaultSeverity);
+                                return new IssueMatch(line, runningMatch, pattern, regexMatch.Groups, DefaultSeverity);
                             }
                             // Not the last pattern
                             else
                             {
                                 // Store the match
-                                _state[i] = new IssueMatch(runningMatch, pattern, regexMatch.Groups);
+                                _state[i] = new IssueMatch(line, runningMatch, pattern, regexMatch.Groups);
                             }
                         }
                         // Not matched
@@ -184,8 +209,9 @@ namespace GitHub.Runner.Worker
 
     public sealed class IssueMatch
     {
-        public IssueMatch(IssueMatch runningMatch, IssuePattern pattern, GroupCollection groups, string defaultSeverity = null)
+        public IssueMatch(string sourceText, IssueMatch runningMatch, IssuePattern pattern, GroupCollection groups, string defaultSeverity = null)
         {
+            SourceText = sourceText;
             File = runningMatch?.File ?? GetValue(groups, pattern.File);
             Line = runningMatch?.Line ?? GetValue(groups, pattern.Line);
             Column = runningMatch?.Column ?? GetValue(groups, pattern.Column);
@@ -200,6 +226,8 @@ namespace GitHub.Runner.Worker
             }
         }
 
+        public string SourceText { get; }
+
         public string File { get; }
 
         public string Line { get; }
@@ -455,7 +483,7 @@ namespace GitHub.Runner.Worker
             if (Loop && Message == null)
             {
                 throw new ArgumentException($"The {_loopPropertyName} pattern must set '{_messagePropertyName}'");
-            }   
+            }
 
             var regex = new Regex(Pattern ?? string.Empty, RegexOptions);
             var groupCount = regex.GetGroupNumbers().Length;

src/Runner.Worker/JobExtension.cs

@@ -325,10 +325,10 @@ namespace GitHub.Runner.Worker
                         if (message.ContextData.TryGetValue("inputs", out var pipelineContextData))
                         {
                             var inputs = pipelineContextData.AssertDictionary("inputs");
-                            if (inputs.Any()) 
+                            if (inputs.Any())
                             {
                                 context.Output($"##[group] Inputs");
-                                foreach (var input in inputs) 
+                                foreach (var input in inputs)
                                 {
                                     context.Output($"  {input.Key}: {input.Value}");
                                 }
@@ -336,7 +336,7 @@ namespace GitHub.Runner.Worker
                             }
                         }
 
-                        if (!string.IsNullOrWhiteSpace(message.JobDisplayName)) 
+                        if (!string.IsNullOrWhiteSpace(message.JobDisplayName))
                         {
                             context.Output($"Complete job name: {message.JobDisplayName}");
                         }
@@ -660,8 +660,9 @@ namespace GitHub.Runner.Worker
                 var freeSpaceInMB = driveInfo.AvailableFreeSpace / 1024 / 1024;
                 if (freeSpaceInMB < lowDiskSpaceThreshold)
                 {
-                    var issue = new Issue() { Type = IssueType.Warning, Message = $"You are running out of disk space. The runner will stop working when the machine runs out of disk space. Free space left: {freeSpaceInMB} MB" };
+                    var message = $"You are running out of disk space. The runner will stop working when the machine runs out of disk space. Free space left: {freeSpaceInMB} MB";
-                    issue.Data[Constants.Runner.InternalTelemetryIssueDataKey] = Constants.Runner.LowDiskSpace;
+                    var metadata = new IssueMetadata(Constants.Runner.InternalTelemetryIssueDataKey, Constants.Runner.LowDiskSpace);
+                    var issue = context.CreateIssue(IssueType.Warning, message, metadata, true);
                     context.AddIssue(issue);
                     return;
                 }

src/Runner.Worker/JobRunner.cs

@@ -84,7 +84,8 @@ namespace GitHub.Runner.Worker
                         default:
                             throw new ArgumentException(HostContext.RunnerShutdownReason.ToString(), nameof(HostContext.RunnerShutdownReason));
                     }
-                    jobContext.AddIssue(new Issue() { Type = IssueType.Error, Message = errorMessage });
+                    var issue = jobContext.CreateIssue(IssueType.Error, errorMessage, null, true);
+                    jobContext.AddIssue(issue);
                 });
 
                 // Validate directory permissions.

src/Sdk/Common/Common/Utility/PrimitiveExtensions.cs

@@ -27,6 +27,18 @@ namespace GitHub.Services.Common
             }
         }
 
+        public static string TrimExcess(string text, int maxLength)
+        {
+            string result = text;
+
+            if (!string.IsNullOrEmpty(result) && result.Length > maxLength)
+            {
+                result = result.Substring(0, maxLength);
+            }
+
+            return result;
+        }
+
         public static string ToBase64StringNoPaddingFromString(string utf8String)
         {
             return ToBase64StringNoPadding(Encoding.UTF8.GetBytes(utf8String));
@@ -46,7 +58,7 @@ namespace GitHub.Services.Common
 
         //These methods convert To and From base64 strings without padding
         //for JWT scenarios
-        //code taken from the JWS spec here: 
+        //code taken from the JWS spec here:
         //http://tools.ietf.org/html/draft-ietf-jose-json-web-signature-08#appendix-C
         public static String ToBase64StringNoPadding(this byte[] bytes)
         {

src/Sdk/DTWebApi/WebApi/Issue.cs

@@ -1,30 +1,38 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
+using GitHub.Services.Common;
 
 namespace GitHub.DistributedTask.WebApi
 {
+    public interface IReadOnlyIssue
+    {
+        IssueType Type { get; }
+        string Category { get; }
+        string Message { get; }
+        bool? IsInfrastructureIssue { get; }
+        string this[string key] { get; }
+    }
+
     [DataContract]
-    public class Issue
+    public class Issue : IReadOnlyIssue
     {
 
         public Issue()
+            : this(null)
         {
         }
 
-        private Issue(Issue issueToBeCloned)
+        private Issue(Issue original)
         {
-            this.Type = issueToBeCloned.Type;
+            this.EnsureInitialized();
-            this.Category = issueToBeCloned.Category;
+            if (original != null)
-            this.Message = issueToBeCloned.Message;
-            this.IsInfrastructureIssue = issueToBeCloned.IsInfrastructureIssue;
-
-            if (issueToBeCloned.m_data != null)
             {
-                foreach (var item in issueToBeCloned.m_data)
+                this.Type = original.Type;
-                {
+                this.Category = original.Category;
-                    this.Data.Add(item);
+                this.Message = original.Message;
-                }
+                this.IsInfrastructureIssue = original.IsInfrastructureIssue;
+                m_data.AddRange(original.m_data);
             }
         }
 
@@ -36,14 +44,14 @@ namespace GitHub.DistributedTask.WebApi
         }
 
         [DataMember(Order = 2)]
-        public String Category
+        public string Category
         {
             get;
             set;
         }
 
         [DataMember(Order = 3)]
-        public String Message
+        public string Message
         {
             get;
             set;
@@ -56,15 +64,16 @@ namespace GitHub.DistributedTask.WebApi
             set;
         }
 
-        public IDictionary<String, String> Data
+        public string this[string key]
         {
             get
             {
-                if (m_data == null)
+                m_data.TryGetValue(key, out string result);
-                {
+                return result;
-                    m_data = new Dictionary<String, String>(StringComparer.OrdinalIgnoreCase);
+            }
-                }
+            set
-                return m_data;
+            {
+                m_data[key] = value;
             }
         }
 
@@ -77,6 +86,7 @@ namespace GitHub.DistributedTask.WebApi
         private void OnDeserialized(StreamingContext context)
         {
             SerializationHelper.Copy(ref m_serializedData, ref m_data, StringComparer.OrdinalIgnoreCase, true);
+            this.EnsureInitialized();
         }
 
         [OnSerializing]
@@ -91,9 +101,21 @@ namespace GitHub.DistributedTask.WebApi
             m_serializedData = null;
         }
 
-        [DataMember(Name = "Data", EmitDefaultValue = false, Order = 4)]
+        /// <summary>
-        private IDictionary<String, String> m_serializedData;
+        /// DataContractSerializer bypasses all constructor logic and inline initialization!
+        /// This method takes the place of a workhorse constructor for baseline initialization.
+        /// The expectation is for this logic to be accessible to constructors and also to the OnDeserialized helper.
+        /// </summary>
+        private void EnsureInitialized()
+        {
+            //Note that ?? is a short-circuiting operator.
+            m_data = m_data ?? new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        }
+
+        [DataMember(Name = "Data", EmitDefaultValue = false, Order = 4)]
+        private IDictionary<string, string> m_serializedData;
+
+        private IDictionary<string, string> m_data;
 
-        private IDictionary<String, String> m_data;
     }
 }

src/Sdk/DTWebApi/WebApi/TimelineRecord.cs

@@ -10,69 +10,76 @@ namespace GitHub.DistributedTask.WebApi
     public sealed class TimelineRecord
     {
         public TimelineRecord()
+            : this(null)
         {
-            this.Attempt = 1;
         }
 
         private TimelineRecord(TimelineRecord recordToBeCloned)
         {
-            this.Attempt = recordToBeCloned.Attempt;
+            this.EnsureInitialized();
-            this.ChangeId = recordToBeCloned.ChangeId;
+            if (recordToBeCloned != null)
-            this.CurrentOperation = recordToBeCloned.CurrentOperation;
-            this.FinishTime = recordToBeCloned.FinishTime;
-            this.Id = recordToBeCloned.Id;
-            this.Identifier = recordToBeCloned.Identifier;
-            this.LastModified = recordToBeCloned.LastModified;
-            this.Location = recordToBeCloned.Location;
-            this.Name = recordToBeCloned.Name;
-            this.Order = recordToBeCloned.Order;
-            this.ParentId = recordToBeCloned.ParentId;
-            this.PercentComplete = recordToBeCloned.PercentComplete;
-            this.RecordType = recordToBeCloned.RecordType;
-            this.Result = recordToBeCloned.Result;
-            this.ResultCode = recordToBeCloned.ResultCode;
-            this.StartTime = recordToBeCloned.StartTime;
-            this.State = recordToBeCloned.State;
-            this.TimelineId = recordToBeCloned.TimelineId;
-            this.WorkerName = recordToBeCloned.WorkerName;
-            this.RefName = recordToBeCloned.RefName;
-            this.ErrorCount = recordToBeCloned.ErrorCount;
-            this.WarningCount = recordToBeCloned.WarningCount;
-            this.NoticeCount = recordToBeCloned.NoticeCount;
-            this.AgentPlatform = recordToBeCloned.AgentPlatform;
-
-            if (recordToBeCloned.Log != null)
             {
-                this.Log = new TaskLogReference
+                this.Attempt = recordToBeCloned.Attempt;
+                this.ChangeId = recordToBeCloned.ChangeId;
+                this.CurrentOperation = recordToBeCloned.CurrentOperation;
+                this.FinishTime = recordToBeCloned.FinishTime;
+                this.Id = recordToBeCloned.Id;
+                this.Identifier = recordToBeCloned.Identifier;
+                this.LastModified = recordToBeCloned.LastModified;
+                this.Location = recordToBeCloned.Location;
+                this.Name = recordToBeCloned.Name;
+                this.Order = recordToBeCloned.Order;
+                this.ParentId = recordToBeCloned.ParentId;
+                this.PercentComplete = recordToBeCloned.PercentComplete;
+                this.RecordType = recordToBeCloned.RecordType;
+                this.Result = recordToBeCloned.Result;
+                this.ResultCode = recordToBeCloned.ResultCode;
+                this.StartTime = recordToBeCloned.StartTime;
+                this.State = recordToBeCloned.State;
+                this.TimelineId = recordToBeCloned.TimelineId;
+                this.WorkerName = recordToBeCloned.WorkerName;
+                this.RefName = recordToBeCloned.RefName;
+                this.ErrorCount = recordToBeCloned.ErrorCount;
+                this.WarningCount = recordToBeCloned.WarningCount;
+                this.NoticeCount = recordToBeCloned.NoticeCount;
+                this.AgentPlatform = recordToBeCloned.AgentPlatform;
+
+                if (recordToBeCloned.Log != null)
                 {
-                    Id = recordToBeCloned.Log.Id,
+                    this.Log = new TaskLogReference
-                    Location = recordToBeCloned.Log.Location,
+                    {
-                };
+                        Id = recordToBeCloned.Log.Id,
-            }
+                        Location = recordToBeCloned.Log.Location,
+                    };
+                }
 
-            if (recordToBeCloned.Details != null)
+                if (recordToBeCloned.Details != null)
-            {
-                this.Details = new TimelineReference
                 {
-                    ChangeId = recordToBeCloned.Details.ChangeId,
+                    this.Details = new TimelineReference
-                    Id = recordToBeCloned.Details.Id,
+                    {
-                    Location = recordToBeCloned.Details.Location,
+                        ChangeId = recordToBeCloned.Details.ChangeId,
-                };
+                        Id = recordToBeCloned.Details.Id,
-            }
+                        Location = recordToBeCloned.Details.Location,
+                    };
+                }
 
-            if (recordToBeCloned.m_issues?.Count> 0)
+                if (recordToBeCloned.m_issues?.Count > 0)
-            {
+                {
-                this.Issues.AddRange(recordToBeCloned.Issues.Select(i => i.Clone()));
+                    m_issues.AddRange(recordToBeCloned.m_issues.Select(i => i.Clone()));
-            }
+                }
 
-            if (recordToBeCloned.m_previousAttempts?.Count > 0)
+                if (recordToBeCloned.m_previousAttempts?.Count > 0)
-            {
+                {
-                this.PreviousAttempts.AddRange(recordToBeCloned.PreviousAttempts);
+                    m_previousAttempts.AddRange(recordToBeCloned.m_previousAttempts);
-            }
+                }
 
-            if (recordToBeCloned.m_variables?.Count > 0)
+                if (recordToBeCloned.m_variables?.Count > 0)
-            {
+                {
-                this.m_variables = recordToBeCloned.Variables.ToDictionary(k => k.Key, v => v.Value.Clone());
+                    // Don't pave over the case-insensitive Dictionary we initialized above.
+                    foreach (var kvp in recordToBeCloned.m_variables) {
+                        m_variables[kvp.Key] = kvp.Value.Clone();
+                    }
+                }
             }
         }
 
@@ -234,10 +241,6 @@ namespace GitHub.DistributedTask.WebApi
         {
             get
             {
-                if (m_issues == null)
-                {
-                    m_issues = new List<Issue>();
-                }
                 return m_issues;
             }
         }
@@ -274,22 +277,14 @@ namespace GitHub.DistributedTask.WebApi
         {
             get
             {
-                if (m_previousAttempts == null)
-                {
-                    m_previousAttempts = new List<TimelineAttempt>();
-                }
                 return m_previousAttempts;
             }
         }
 
-        public IDictionary<String, VariableValue> Variables
+        public IDictionary<string, VariableValue> Variables
         {
             get
             {
-                if (m_variables == null)
-                {
-                    m_variables = new Dictionary<String, VariableValue>(StringComparer.OrdinalIgnoreCase);
-                }
                 return m_variables;
             }
         }
@@ -299,11 +294,32 @@ namespace GitHub.DistributedTask.WebApi
             return new TimelineRecord(this);
         }
 
+        [OnDeserialized]
+        private void OnDeserialized(StreamingContext context)
+        {
+            this.EnsureInitialized();
+        }
+
+        /// <summary>
+        /// DataContractSerializer bypasses all constructor logic and inline initialization!
+        /// This method takes the place of a workhorse constructor for baseline initialization.
+        /// The expectation is for this logic to be accessible to constructors and also to the OnDeserialized helper.
+        /// </summary>
+        private void EnsureInitialized()
+        {
+            //Note that ?? is a short-circuiting operator.
+            m_issues = m_issues ?? new List<Issue>();
+            m_variables = m_variables ?? new Dictionary<string, VariableValue>(StringComparer.OrdinalIgnoreCase);
+            m_previousAttempts = m_previousAttempts ?? new List<TimelineAttempt>();
+            this.Attempt = Math.Max(this.Attempt, 1);
+        }
+
+
         [DataMember(Name = "Issues", EmitDefaultValue = false, Order = 60)]
         private List<Issue> m_issues;
 
         [DataMember(Name = "Variables", EmitDefaultValue = false, Order = 80)]
-        private Dictionary<String, VariableValue> m_variables;
+        private Dictionary<string, VariableValue> m_variables;
 
         [DataMember(Name = "PreviousAttempts", EmitDefaultValue = false, Order = 120)]
         private List<TimelineAttempt> m_previousAttempts;

src/Test/L0/TestUtil.cs

@@ -2,6 +2,8 @@
 using Xunit;
 using GitHub.Runner.Sdk;
 using System.Runtime.CompilerServices;
+using GitHub.DistributedTask.WebApi;
+using GitHub.Runner.Worker;
 
 namespace GitHub.Runner.Common.Tests
 {
@@ -41,5 +43,26 @@ namespace GitHub.Runner.Common.Tests
             Assert.True(Directory.Exists(testDataDir));
             return testDataDir;
         }
+
+        public static IReadOnlyIssue CreateTestIssue(IssueType type, string message, IssueMetadata metadata, bool writeToLog)
+        {
+            var result = new Issue()
+            {
+                Type = type,
+                Message = message,
+            };
+
+            if (metadata != null)
+            {
+                result.Category = metadata.Category;
+                result.IsInfrastructureIssue = metadata.IsInfrastructureIssue;
+                foreach (var kvp in metadata.Data)
+                {
+                    result[kvp.Key] = kvp.Value;
+                }
+            }
+
+            return result;
+        }
     }
 }

src/Test/L0/Worker/ActionCommandManagerL0.cs

@@ -32,10 +32,10 @@ namespace GitHub.Runner.Common.Tests.Worker
                                 hc.GetTrace().Info($"{tag} {line}");
                                 return 1;
                             });
-                _ec.Setup(x => x.AddIssue(It.IsAny<Issue>(), It.IsAny<string>()))
+                _ec.Setup(x => x.AddIssue(It.IsAny<IReadOnlyIssue>()))
-                   .Callback((Issue issue, string message) =>
+                   .Callback((IReadOnlyIssue issue) =>
                    {
-                       hc.GetTrace().Info($"{issue.Type} {issue.Message} {message ?? string.Empty}");
+                       hc.GetTrace().Info($"{issue.Type} {issue.Message}");
                    });
 
                 _commandManager.EnablePluginInternalCommand();
@@ -59,10 +59,10 @@ namespace GitHub.Runner.Common.Tests.Worker
                                 hc.GetTrace().Info($"{tag} {line}");
                                 return 1;
                             });
-                _ec.Setup(x => x.AddIssue(It.IsAny<Issue>(), It.IsAny<string>()))
+                _ec.Setup(x => x.AddIssue(It.IsAny<IReadOnlyIssue>()))
-                   .Callback((Issue issue, string message) =>
+                   .Callback((IReadOnlyIssue issue) =>
                    {
-                       hc.GetTrace().Info($"{issue.Type} {issue.Message} {message ?? string.Empty}");
+                       hc.GetTrace().Info($"{issue.Type} {issue.Message}");
                    });
 
                 _commandManager.EnablePluginInternalCommand();
@@ -92,10 +92,12 @@ namespace GitHub.Runner.Common.Tests.Worker
                                 return 1;
                             });
 
-                _ec.Setup(x => x.AddIssue(It.IsAny<Issue>(), It.IsAny<string>()))
+                _ec.Setup(x => x.CreateIssue(It.IsAny<IssueType>(), It.IsAny<string>(), It.IsAny<IssueMetadata>(), It.IsAny<bool>()))
-                   .Callback((Issue issue, string message) =>
+                   .Returns(TestUtil.CreateTestIssue);
+                _ec.Setup(x => x.AddIssue(It.IsAny<IReadOnlyIssue>()))
+                   .Callback((IReadOnlyIssue issue) =>
                    {
-                       hc.GetTrace().Info($"{issue.Type} {issue.Message} {message ?? string.Empty}");
+                       hc.GetTrace().Info($"{issue.Type} {issue.Message}");
                    });
 
                 _ec.Object.Global.EnvironmentVariables = new Dictionary<string, string>();

src/Test/L0/Worker/ActionManagerL0.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.IO.Compression;
 using System.Net;
 using System.Net.Http;
 using System.Runtime.CompilerServices;
@@ -14,6 +13,11 @@ using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Sdk;
 using GitHub.Runner.Worker;
 using GitHub.Runner.Worker.Container;
+
+#if OS_WINDOWS
+using System.IO.Compression;
+#endif
+
 using Moq;
 using Moq.Protected;
 using Xunit;
@@ -2147,7 +2151,9 @@ runs:
             _ec.Object.Global.FileTable = new List<String>();
             _ec.Object.Global.Plan = new TaskOrchestrationPlanReference();
             _ec.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>())).Callback((string tag, string message) => { _hc.GetTrace().Info($"[{tag}]{message}"); });
-            _ec.Setup(x => x.AddIssue(It.IsAny<Issue>(), It.IsAny<string>())).Callback((Issue issue, string message) => { _hc.GetTrace().Info($"[{issue.Type}]{issue.Message ?? message}"); });
+            _ec.Setup(x => x.CreateIssue(It.IsAny<IssueType>(), It.IsAny<string>(), It.IsAny<IssueMetadata>(), It.IsAny<bool>()))
+               .Returns(TestUtil.CreateTestIssue);
+            _ec.Setup(x => x.AddIssue(It.IsAny<IReadOnlyIssue>())).Callback((IReadOnlyIssue issue) => { _hc.GetTrace().Info($"[{issue.Type}]{issue.Message}"); });
             _ec.Setup(x => x.GetGitHubContext("workspace")).Returns(Path.Combine(_workFolder, "actions", "actions"));
 
             _dockerManager = new Mock<IDockerCommandManager>();

src/Test/L0/Worker/ActionManifestManagerL0.cs

@@ -4,10 +4,10 @@ using GitHub.DistributedTask.Pipelines.ContextData;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Worker;
 using GitHub.Runner.Worker.Expressions;
+using GitHub.Services.Common;
 using Moq;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Threading;
@@ -670,7 +670,7 @@ namespace GitHub.Runner.Common.Tests.Worker
             {
                 Teardown();
             }
-        }        
+        }
 
         [Fact]
         [Trait("Level", "L0")]
@@ -715,7 +715,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                 //Assert
                 var err = Assert.Throws<ArgumentException>(() => actionManifest.Load(_ec.Object, action_path));
                 Assert.Contains($"Fail to load {action_path}", err.Message);
-                _ec.Verify(x => x.AddIssue(It.Is<Issue>(s => s.Message.Contains("Missing 'using' value. 'using' requires 'composite', 'docker', 'node12' or 'node16'.")), It.IsAny<string>()), Times.Once);
+                _ec.Verify(x => x.AddIssue(It.Is<IReadOnlyIssue>(s => s.Message.Contains("Missing 'using' value. 'using' requires 'composite', 'docker', 'node12' or 'node16'."))), Times.Once);
             }
             finally
             {
@@ -860,7 +860,10 @@ namespace GitHub.Runner.Common.Tests.Worker
             _ec.Setup(x => x.ExpressionValues).Returns(new DictionaryContextData());
             _ec.Setup(x => x.ExpressionFunctions).Returns(new List<IFunctionInfo>());
             _ec.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>())).Callback((string tag, string message) => { _hc.GetTrace().Info($"{tag}{message}"); });
-            _ec.Setup(x => x.AddIssue(It.IsAny<Issue>(), It.IsAny<string>())).Callback((Issue issue, string message) => { _hc.GetTrace().Info($"[{issue.Type}]{issue.Message ?? message}"); });
+
+            _ec.Setup(x => x.CreateIssue(It.IsAny<IssueType>(), It.IsAny<string>(), It.IsAny<IssueMetadata>(), It.IsAny<bool>()))
+               .Returns(TestUtil.CreateTestIssue);
+            _ec.Setup(x => x.AddIssue(It.IsAny<IReadOnlyIssue>())).Callback((IReadOnlyIssue issue) => { _hc.GetTrace().Info($"[{issue.Type}]{issue.Message}"); });
         }
 
         private void Teardown()

src/Test/L0/Worker/ActionRunnerL0.cs

@@ -3,20 +3,15 @@ using GitHub.DistributedTask.ObjectTemplating.Tokens;
 using GitHub.DistributedTask.Pipelines;
 using GitHub.DistributedTask.Pipelines.ContextData;
 using GitHub.DistributedTask.WebApi;
-using GitHub.Runner.Common.Util;
 using GitHub.Runner.Worker;
-using GitHub.Runner.Worker.Container;
 using GitHub.Runner.Worker.Handlers;
+using GitHub.Services.Common;
 using Moq;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.IO.Compression;
-using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Threading;
-using System.Threading.Tasks;
 using Xunit;
 using Pipelines = GitHub.DistributedTask.Pipelines;
 
@@ -330,7 +325,7 @@ namespace GitHub.Runner.Common.Tests.Worker
             Assert.Equal("invalid1", finialInputs["invalid1"]);
             Assert.Equal("invalid2", finialInputs["invalid2"]);
 
-            _ec.Verify(x => x.AddIssue(It.Is<Issue>(s => s.Message.Contains("Unexpected input(s) 'invalid1', 'invalid2'")), It.IsAny<string>()), Times.Once);
+            _ec.Verify(x => x.AddIssue(It.Is<IReadOnlyIssue>(s => s.Message.Contains("Unexpected input(s) 'invalid1', 'invalid2'"))), Times.Once);
         }
 
         [Fact]
@@ -449,7 +444,9 @@ namespace GitHub.Runner.Common.Tests.Worker
             _ec.Setup(x => x.CancellationToken).Returns(_ecTokenSource.Token);
             _ec.Object.Global.Variables = new Variables(_hc, new Dictionary<string, VariableValue>());
             _ec.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>())).Callback((string tag, string message) => { _hc.GetTrace().Info($"[{tag}]{message}"); });
-            _ec.Setup(x => x.AddIssue(It.IsAny<Issue>(), It.IsAny<string>())).Callback((Issue issue, string message) => { _hc.GetTrace().Info($"[{issue.Type}]{issue.Message ?? message}"); });
+            _ec.Setup(x => x.CreateIssue(It.IsAny<IssueType>(), It.IsAny<string>(), It.IsAny<IssueMetadata>(), It.IsAny<bool>()))
+               .Returns(TestUtil.CreateTestIssue);
+            _ec.Setup(x => x.AddIssue(It.IsAny<IReadOnlyIssue>())).Callback((IReadOnlyIssue issue) => { _hc.GetTrace().Info($"[{issue.Type}]{issue.Message}"); });
 
             _hc.SetSingleton<IActionManager>(_actionManager.Object);
             _hc.SetSingleton<IHandlerFactory>(_handlerFactory.Object);

src/Test/L0/Worker/CreateStepSummaryCommandL0.cs

@@ -11,6 +11,7 @@ using Xunit;
 using DTWebApi = GitHub.DistributedTask.WebApi;
 using GitHub.DistributedTask.WebApi;
 using Pipelines = GitHub.DistributedTask.Pipelines;
+using GitHub.Services.Common;
 
 namespace GitHub.Runner.Common.Tests.Worker
 {
@@ -19,7 +20,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         private Mock<IExecutionContext> _executionContext;
         private Mock<IJobServerQueue> _jobServerQueue;
         private ExecutionContext _jobExecutionContext;
-        private List<Tuple<DTWebApi.Issue, string>> _issues;
+        private List<DTWebApi.IReadOnlyIssue> _issues;
         private Variables _variables;
         private string _rootDirectory;
         private CreateStepSummaryCommand _createStepCommand;
@@ -186,7 +187,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         {
             var hostContext = new TestHostContext(this, name);
 
-            _issues = new List<Tuple<DTWebApi.Issue, string>>();
+            _issues = new List<DTWebApi.IReadOnlyIssue>();
 
             // Setup a job request
             TaskOrchestrationPlanReference plan = new();
@@ -247,13 +248,14 @@ namespace GitHub.Runner.Common.Tests.Worker
                     WriteDebug = true,
                     Variables = _variables,
                 });
-            _executionContext.Setup(x => x.AddIssue(It.IsAny<DTWebApi.Issue>(), It.IsAny<string>()))
+            _executionContext.Setup(x => x.AddIssue(It.IsAny<DTWebApi.IReadOnlyIssue>()))
-                .Callback((DTWebApi.Issue issue, string logMessage) =>
+                .Callback((DTWebApi.IReadOnlyIssue issue) =>
                 {
-                    _issues.Add(new Tuple<DTWebApi.Issue, string>(issue, logMessage));
+                    _issues.Add(issue);
-                    var message = !string.IsNullOrEmpty(logMessage) ? logMessage : issue.Message;
+                    _trace.Info($"Issue '{issue.Type}': {issue.Message}");
-                    _trace.Info($"Issue '{issue.Type}': {message}");
                 });
+            _executionContext.Setup(x => x.CreateIssue(It.IsAny<IssueType>(), It.IsAny<string>(), It.IsAny<IssueMetadata>(), It.IsAny<bool>()))
+                             .Returns(TestUtil.CreateTestIssue);
             _executionContext.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>()))
                 .Callback((string tag, string message) =>
                 {

src/Test/L0/Worker/ExecutionContextL0.cs

@@ -52,36 +52,36 @@ namespace GitHub.Runner.Common.Tests.Worker
                 // Act.
                 ec.InitializeJob(jobRequest, CancellationToken.None);
 
-                ec.AddIssue(new Issue() { Type = IssueType.Error, Message = "error" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Error, "error", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Error, Message = "error" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Error, "error", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Error, Message = "error" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Error, "error", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Error, Message = "error" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Error, "error", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Error, Message = "error" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Error, "error", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Error, Message = "error" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Error, "error", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Error, Message = "error" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Error, "error", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Error, Message = "error" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Error, "error", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Error, Message = "error" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Error, "error", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Error, Message = "error" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Error, "error", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Error, Message = "error" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Error, "error", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Error, Message = "error" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Error, "error", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Error, Message = "error" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Error, "error", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Error, Message = "error" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Error, "error", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Error, Message = "error" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Error, "error", null, true));
 
-                ec.AddIssue(new Issue() { Type = IssueType.Warning, Message = "warning" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Warning, "warning", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Warning, Message = "warning" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Warning, "warning", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Warning, Message = "warning" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Warning, "warning", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Warning, Message = "warning" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Warning, "warning", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Warning, Message = "warning" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Warning, "warning", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Warning, Message = "warning" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Warning, "warning", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Warning, Message = "warning" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Warning, "warning", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Warning, Message = "warning" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Warning, "warning", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Warning, Message = "warning" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Warning, "warning", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Warning, Message = "warning" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Warning, "warning", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Warning, Message = "warning" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Warning, "warning", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Warning, Message = "warning" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Warning, "warning", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Warning, Message = "warning" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Warning, "warning", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Warning, Message = "warning" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Warning, "warning", null, true));
 
                 ec.Complete();
 
@@ -190,9 +190,9 @@ namespace GitHub.Runner.Common.Tests.Worker
                     bigMessage += "a";
                 }
 
-                ec.AddIssue(new Issue() { Type = IssueType.Error, Message = bigMessage });
+                ec.AddIssue(ec.CreateIssue(IssueType.Error, bigMessage, null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Warning, Message = bigMessage });
+                ec.AddIssue(ec.CreateIssue(IssueType.Warning, bigMessage, null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Notice, Message = bigMessage });
+                ec.AddIssue(ec.CreateIssue(IssueType.Notice, bigMessage, null, true));
 
                 ec.Complete();
 
@@ -242,13 +242,13 @@ namespace GitHub.Runner.Common.Tests.Worker
                 var embeddedStep = ec.CreateChild(Guid.NewGuid(), "action_1_pre", "action_1_pre", null, null, ActionRunStage.Main, isEmbedded: true);
                 embeddedStep.Start();
 
-                embeddedStep.AddIssue(new Issue() { Type = IssueType.Error, Message = "error annotation that should have step and line number information" });
+                embeddedStep.AddIssue(embeddedStep.CreateIssue(IssueType.Error, "error annotation that should have step and line number information", null, true));
-                embeddedStep.AddIssue(new Issue() { Type = IssueType.Warning, Message = "warning annotation that should have step and line number information" });
+                embeddedStep.AddIssue(embeddedStep.CreateIssue(IssueType.Warning, "warning annotation that should have step and line number information", null, true));
-                embeddedStep.AddIssue(new Issue() { Type = IssueType.Notice, Message = "notice annotation that should have step and line number information" });
+                embeddedStep.AddIssue(embeddedStep.CreateIssue(IssueType.Notice, "notice annotation that should have step and line number information", null, true));
 
-                jobServerQueue.Verify(x => x.QueueTimelineRecordUpdate(It.IsAny<Guid>(), It.Is<TimelineRecord>(t => t.Issues.Where(i => i.Data.ContainsKey("stepNumber") && i.Data.ContainsKey("logFileLineNumber") && i.Type == IssueType.Error).Count() == 1)), Times.AtLeastOnce);
+                jobServerQueue.Verify(x => x.QueueTimelineRecordUpdate(It.IsAny<Guid>(), It.Is<TimelineRecord>(t => t.Issues.Where(i => i["stepNumber"] != null && i["logFileLineNumber"] != null && i.Type == IssueType.Error).Count() == 1)), Times.AtLeastOnce);
-                jobServerQueue.Verify(x => x.QueueTimelineRecordUpdate(It.IsAny<Guid>(), It.Is<TimelineRecord>(t => t.Issues.Where(i => i.Data.ContainsKey("stepNumber") && i.Data.ContainsKey("logFileLineNumber") && i.Type == IssueType.Warning).Count() == 1)), Times.AtLeastOnce);
+                jobServerQueue.Verify(x => x.QueueTimelineRecordUpdate(It.IsAny<Guid>(), It.Is<TimelineRecord>(t => t.Issues.Where(i => i["stepNumber"] != null && i["logFileLineNumber"] != null && i.Type == IssueType.Warning).Count() == 1)), Times.AtLeastOnce);
-                jobServerQueue.Verify(x => x.QueueTimelineRecordUpdate(It.IsAny<Guid>(), It.Is<TimelineRecord>(t => t.Issues.Where(i => i.Data.ContainsKey("stepNumber") && i.Data.ContainsKey("logFileLineNumber") && i.Type == IssueType.Notice).Count() == 1)), Times.AtLeastOnce);
+                jobServerQueue.Verify(x => x.QueueTimelineRecordUpdate(It.IsAny<Guid>(), It.Is<TimelineRecord>(t => t.Issues.Where(i => i["stepNumber"] != null && i["logFileLineNumber"] != null && i.Type == IssueType.Notice).Count() == 1)), Times.AtLeastOnce);
             }
         }
 
@@ -626,12 +626,12 @@ namespace GitHub.Runner.Common.Tests.Worker
                 ec.StepTelemetry.StepId = Guid.NewGuid();
                 ec.StepTelemetry.Stage = "main";
 
-                ec.AddIssue(new Issue() { Type = IssueType.Error, Message = "error" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Error, "error", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Warning, Message = "warning" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Warning, "warning", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Notice, Message = "notice" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Notice, "notice", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Error, Message = "error" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Error, "error", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Warning, Message = "warning" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Warning, "warning", null, true));
-                ec.AddIssue(new Issue() { Type = IssueType.Notice, Message = "notice" });
+                ec.AddIssue(ec.CreateIssue(IssueType.Notice, "notice", null, true));
 
                 ec.Complete();
 
@@ -692,9 +692,9 @@ namespace GitHub.Runner.Common.Tests.Worker
                 embeddedStep.StepTelemetry.Action = "actions/checkout";
                 embeddedStep.StepTelemetry.Ref = "v2";
 
-                embeddedStep.AddIssue(new Issue() { Type = IssueType.Error, Message = "error" });
+                embeddedStep.AddIssue(ec.CreateIssue(IssueType.Error, "error", null, true));
-                embeddedStep.AddIssue(new Issue() { Type = IssueType.Warning, Message = "warning" });
+                embeddedStep.AddIssue(ec.CreateIssue(IssueType.Warning, "warning", null, true));
-                embeddedStep.AddIssue(new Issue() { Type = IssueType.Notice, Message = "notice" });
+                embeddedStep.AddIssue(ec.CreateIssue(IssueType.Notice, "notice", null, true));
 
                 embeddedStep.PublishStepTelemetry();
 
@@ -870,7 +870,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                 inputVarsContext["VARIABLE_2"] = new StringContextData("value2");
                 jobRequest.ContextData["vars"] = inputVarsContext;
 
-                // Arrange: Setup the paging logger. 
+                // Arrange: Setup the paging logger.
                 var pagingLogger1 = new Mock<IPagingLogger>();
                 var jobServerQueue = new Mock<IJobServerQueue>();
                 hc.EnqueueInstance(pagingLogger1.Object);
@@ -884,7 +884,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                 var expected = new DictionaryContextData();
                 expected["VARIABLE_1"] = new StringContextData("value1");
                 expected["VARIABLE_2"] = new StringContextData("value1");
-                
+
                 Assert.True(ExpressionValuesAssertEqual(expected, jobContext.ExpressionValues["vars"] as DictionaryContextData));
             }
         }
@@ -915,7 +915,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                 inputVarsContext[Constants.Variables.Actions.RunnerDebug] = new StringContextData("true");
                 jobRequest.ContextData["vars"] = inputVarsContext;
 
-                // Arrange: Setup the paging logger. 
+                // Arrange: Setup the paging logger.
                 var pagingLogger1 = new Mock<IPagingLogger>();
                 var jobServerQueue = new Mock<IJobServerQueue>();
                 hc.EnqueueInstance(pagingLogger1.Object);
@@ -926,7 +926,7 @@ namespace GitHub.Runner.Common.Tests.Worker
 
                 jobContext.InitializeJob(jobRequest, CancellationToken.None);
 
-                
+
                 Assert.Equal("true", jobContext.Global.Variables.Get(Constants.Variables.Actions.StepDebug));
                 Assert.Equal("true", jobContext.Global.Variables.Get(Constants.Variables.Actions.RunnerDebug));
             }
@@ -961,7 +961,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                 jobRequest.Variables[Constants.Variables.Actions.StepDebug] = "false";
                 jobRequest.Variables[Constants.Variables.Actions.RunnerDebug] = "false";
 
-                // Arrange: Setup the paging logger. 
+                // Arrange: Setup the paging logger.
                 var pagingLogger1 = new Mock<IPagingLogger>();
                 var jobServerQueue = new Mock<IJobServerQueue>();
                 hc.EnqueueInstance(pagingLogger1.Object);
@@ -972,7 +972,7 @@ namespace GitHub.Runner.Common.Tests.Worker
 
                 jobContext.InitializeJob(jobRequest, CancellationToken.None);
 
-                
+
                 Assert.Equal("false", jobContext.Global.Variables.Get(Constants.Variables.Actions.StepDebug));
                 Assert.Equal("false", jobContext.Global.Variables.Get(Constants.Variables.Actions.RunnerDebug));
             }

src/Test/L0/Worker/OutputManagerL0.cs

@@ -9,6 +9,7 @@ using GitHub.Runner.Sdk;
 using GitHub.Runner.Worker;
 using GitHub.Runner.Worker.Container;
 using GitHub.Runner.Worker.Handlers;
+using GitHub.Services.Common;
 using Moq;
 using Xunit;
 using DTWebApi = GitHub.DistributedTask.WebApi;
@@ -21,7 +22,7 @@ namespace GitHub.Runner.Common.Tests.Worker
         private Mock<IActionCommandManager> _commandManager;
         private Variables _variables;
         private OnMatcherChanged _onMatcherChanged;
-        private List<Tuple<DTWebApi.Issue, string>> _issues;
+        private List<DTWebApi.IReadOnlyIssue> _issues;
         private List<string> _messages;
         private List<string> _commands;
         private OutputManager _outputManager;
@@ -82,10 +83,10 @@ namespace GitHub.Runner.Common.Tests.Worker
                 Process("ERROR: message 4");
                 Process("NOT GOOD: message 5");
                 Assert.Equal(4, _issues.Count);
-                Assert.Equal("message 1", _issues[0].Item1.Message);
+                Assert.Equal("message 1", _issues[0].Message);
-                Assert.Equal("message 2", _issues[1].Item1.Message);
+                Assert.Equal("message 2", _issues[1].Message);
-                Assert.Equal("message 3", _issues[2].Item1.Message);
+                Assert.Equal("message 3", _issues[2].Message);
-                Assert.Equal("message 5", _issues[3].Item1.Message);
+                Assert.Equal("message 5", _issues[3].Message);
                 Assert.Equal(0, _commands.Count);
                 Assert.Equal(1, _messages.Count);
                 Assert.Equal("ERROR: message 4", _messages[0]);
@@ -148,11 +149,11 @@ namespace GitHub.Runner.Common.Tests.Worker
                 Process("ERROR: message 4");
                 Process("NOT GOOD: message 5");
                 Assert.Equal(5, _issues.Count);
-                Assert.Equal("message 1", _issues[0].Item1.Message);
+                Assert.Equal("message 1", _issues[0].Message);
-                Assert.Equal("message 2", _issues[1].Item1.Message);
+                Assert.Equal("message 2", _issues[1].Message);
-                Assert.Equal("message 3", _issues[2].Item1.Message);
+                Assert.Equal("message 3", _issues[2].Message);
-                Assert.Equal("message 4", _issues[3].Item1.Message);
+                Assert.Equal("message 4", _issues[3].Message);
-                Assert.Equal("message 5", _issues[4].Item1.Message);
+                Assert.Equal("message 5", _issues[4].Message);
                 Assert.Equal(0, _commands.Count);
                 Assert.Equal(0, _messages.Count);
             }
@@ -188,10 +189,10 @@ namespace GitHub.Runner.Common.Tests.Worker
                 Process("BAD: real bad");
                 Process(": not working");
                 Assert.Equal(2, _issues.Count);
-                Assert.Equal("real bad", _issues[0].Item1.Message);
+                Assert.Equal("real bad", _issues[0].Message);
-                Assert.Equal("BAD", _issues[0].Item1.Data["code"]);
+                Assert.Equal("BAD", _issues[0]["code"]);
-                Assert.Equal("not working", _issues[1].Item1.Message);
+                Assert.Equal("not working", _issues[1].Message);
-                Assert.False(_issues[1].Item1.Data.ContainsKey("code"));
+                Assert.Null(_issues[1]["code"]);
                 Assert.Equal(0, _commands.Count);
                 Assert.Equal(0, _messages.Count);
             }
@@ -238,11 +239,11 @@ namespace GitHub.Runner.Common.Tests.Worker
                 Process("Error: real bad");
                 Process("regular message 2");
                 Assert.Equal(5, _issues.Count);
-                Assert.Equal("it broke", _issues[0].Item1.Message);
+                Assert.Equal("it broke", _issues[0].Message);
-                Assert.Equal("oh no", _issues[1].Item1.Message);
+                Assert.Equal("oh no", _issues[1].Message);
-                Assert.Equal("not good", _issues[2].Item1.Message);
+                Assert.Equal("not good", _issues[2].Message);
-                Assert.Equal("it broke again", _issues[3].Item1.Message);
+                Assert.Equal("it broke again", _issues[3].Message);
-                Assert.Equal("real bad", _issues[4].Item1.Message);
+                Assert.Equal("real bad", _issues[4].Message);
                 Assert.Equal(0, _commands.Count);
                 Assert.Equal(4, _messages.Count);
                 Assert.Equal("Start: hello", _messages[0]);
@@ -293,8 +294,8 @@ namespace GitHub.Runner.Common.Tests.Worker
                 Process("ERROR: it is broken");
                 Process("NOT GOOD: that did not work");
                 Assert.Equal(2, _issues.Count);
-                Assert.Equal("it is broken", _issues[0].Item1.Message);
+                Assert.Equal("it is broken", _issues[0].Message);
-                Assert.Equal("that did not work", _issues[1].Item1.Message);
+                Assert.Equal("that did not work", _issues[1].Message);
                 Assert.Equal(0, _commands.Count);
                 Assert.Equal(0, _messages.Count);
             }
@@ -332,15 +333,15 @@ namespace GitHub.Runner.Common.Tests.Worker
                 Process("(12,thirty-four): it is broken");
                 Process("(twelve,34): not working");
                 Assert.Equal(3, _issues.Count);
-                Assert.Equal("real bad", _issues[0].Item1.Message);
+                Assert.Equal("real bad", _issues[0].Message);
-                Assert.Equal("12", _issues[0].Item1.Data["line"]);
+                Assert.Equal("12", _issues[0]["line"]);
-                Assert.Equal("34", _issues[0].Item1.Data["col"]);
+                Assert.Equal("34", _issues[0]["col"]);
-                Assert.Equal("it is broken", _issues[1].Item1.Message);
+                Assert.Equal("it is broken", _issues[1].Message);
-                Assert.Equal("12", _issues[1].Item1.Data["line"]);
+                Assert.Equal("12", _issues[1]["line"]);
-                Assert.False(_issues[1].Item1.Data.ContainsKey("col"));
+                Assert.Null(_issues[1]["col"]);
-                Assert.Equal("not working", _issues[2].Item1.Message);
+                Assert.Equal("not working", _issues[2].Message);
-                Assert.False(_issues[2].Item1.Data.ContainsKey("line"));
+                Assert.Null(_issues[2]["line"]);
-                Assert.Equal("34", _issues[2].Item1.Data["col"]);
+                Assert.Equal("34", _issues[2]["col"]);
                 Assert.Equal(0, _commands.Count);
                 Assert.Equal(2, _messages.Count);
                 Assert.Equal("##[debug]Unable to parse column number 'thirty-four'", _messages[0]);
@@ -373,8 +374,8 @@ namespace GitHub.Runner.Common.Tests.Worker
                 Process("this line is a command too ##[some-command]even though it contains ERROR: not working again");
                 Process("##[not-command]this line is an ERROR: it is broken again");
                 Assert.Equal(2, _issues.Count);
-                Assert.Equal("it is broken", _issues[0].Item1.Message);
+                Assert.Equal("it is broken", _issues[0].Message);
-                Assert.Equal("it is broken again", _issues[1].Item1.Message);
+                Assert.Equal("it is broken again", _issues[1].Message);
                 Assert.Equal(2, _commands.Count);
                 Assert.Equal("##[some-command]this line is a command even though it contains ERROR: not working", _commands[0]);
                 Assert.Equal("this line is a command too ##[some-command]even though it contains ERROR: not working again", _commands[1]);
@@ -404,8 +405,7 @@ namespace GitHub.Runner.Common.Tests.Worker
                 });
                 Process("the error: \033[31mred, \033[1;31mbright red, \033[mreset");
                 Assert.Equal(1, _issues.Count);
-                Assert.Equal("red, bright red, reset", _issues[0].Item1.Message);
+                Assert.Equal("red, bright red, reset", _issues[0].Message);
-                Assert.Equal("the error: red, bright red, reset", _issues[0].Item2);
                 Assert.Equal(0, _commands.Count);
                 Assert.Equal(0, _messages.Count);
             }
@@ -455,9 +455,9 @@ namespace GitHub.Runner.Common.Tests.Worker
                 Process("ERROR: message 3");
                 Process("NOT GOOD: message 4");
                 Assert.Equal(3, _issues.Count);
-                Assert.Equal("message 1", _issues[0].Item1.Message);
+                Assert.Equal("message 1", _issues[0].Message);
-                Assert.Equal("message 2", _issues[1].Item1.Message);
+                Assert.Equal("message 2", _issues[1].Message);
-                Assert.Equal("message 4", _issues[2].Item1.Message);
+                Assert.Equal("message 4", _issues[2].Message);
                 Assert.Equal(0, _commands.Count);
                 Assert.Equal(1, _messages.Count);
                 Assert.Equal("ERROR: message 3", _messages[0]);
@@ -517,8 +517,8 @@ namespace GitHub.Runner.Common.Tests.Worker
                 Process("Matches both line 1: hello again");
                 Process("oh no, another error");
                 Assert.Equal(2, _issues.Count);
-                Assert.Equal("it broke", _issues[0].Item1.Message);
+                Assert.Equal("it broke", _issues[0].Message);
-                Assert.Equal("oh no, another error", _issues[1].Item1.Message);
+                Assert.Equal("oh no, another error", _issues[1].Message);
                 Assert.Equal(0, _commands.Count);
                 Assert.Equal(4, _messages.Count);
                 Assert.Equal("Matches both line 1: hello", _messages[0]);
@@ -573,14 +573,14 @@ namespace GitHub.Runner.Common.Tests.Worker
                 Process(": not working");
                 Process("ERROR! uh oh");
                 Assert.Equal(4, _issues.Count);
-                Assert.Equal("real bad", _issues[0].Item1.Message);
+                Assert.Equal("real bad", _issues[0].Message);
-                Assert.Equal(DTWebApi.IssueType.Error, _issues[0].Item1.Type);
+                Assert.Equal(DTWebApi.IssueType.Error, _issues[0].Type);
-                Assert.Equal("not great", _issues[1].Item1.Message);
+                Assert.Equal("not great", _issues[1].Message);
-                Assert.Equal(DTWebApi.IssueType.Warning, _issues[1].Item1.Type);
+                Assert.Equal(DTWebApi.IssueType.Warning, _issues[1].Type);
-                Assert.Equal("not working", _issues[2].Item1.Message);
+                Assert.Equal("not working", _issues[2].Message);
-                Assert.Equal(DTWebApi.IssueType.Error, _issues[2].Item1.Type);
+                Assert.Equal(DTWebApi.IssueType.Error, _issues[2].Type);
-                Assert.Equal("uh oh", _issues[3].Item1.Message);
+                Assert.Equal("uh oh", _issues[3].Message);
-                Assert.Equal(DTWebApi.IssueType.Error, _issues[3].Item1.Type);
+                Assert.Equal(DTWebApi.IssueType.Error, _issues[3].Type);
                 Assert.Equal(0, _commands.Count);
                 Assert.Equal(2, _messages.Count);
                 Assert.StartsWith("##[debug]Skipped", _messages[0]);
@@ -633,9 +633,9 @@ namespace GitHub.Runner.Common.Tests.Worker
                 Process("jane.doe@contoso.com");
                 Process("ERR: this error");
                 Assert.Equal(3, _issues.Count);
-                Assert.Equal("john.doe@contoso.com", _issues[0].Item1.Message);
+                Assert.Equal("john.doe@contoso.com", _issues[0].Message);
-                Assert.Contains("Removing issue matcher 'email'", _issues[1].Item1.Message);
+                Assert.Contains("Removing issue matcher 'email'", _issues[1].Message);
-                Assert.Equal("this error", _issues[2].Item1.Message);
+                Assert.Equal("this error", _issues[2].Message);
                 Assert.Equal(0, _commands.Count);
                 Assert.Equal(2, _messages.Where(x => x.StartsWith("##[debug]Timeout processing issue matcher")).Count());
                 Assert.Equal(1, _messages.Where(x => x.Equals("t@t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.t.c%20")).Count());
@@ -725,32 +725,32 @@ namespace GitHub.Runner.Common.Tests.Worker
 
                 Assert.Equal(9, _issues.Count);
 
-                Assert.Equal("some error 1", _issues[0].Item1.Message);
+                Assert.Equal("some error 1", _issues[0].Message);
-                Assert.False(_issues[0].Item1.Data.ContainsKey("file"));
+                Assert.Null(_issues[0]["file"]);
 
-                Assert.Equal("some error 2", _issues[1].Item1.Message);
+                Assert.Equal("some error 2", _issues[1].Message);
-                Assert.Equal(file_workflowRepository.Substring(workflowRepository.Length + 1).Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar), _issues[1].Item1.Data["file"]);
+                Assert.Equal(file_workflowRepository.Substring(workflowRepository.Length + 1).Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar), _issues[1]["file"]);
 
-                Assert.Equal("some error 3", _issues[2].Item1.Message);
+                Assert.Equal("some error 3", _issues[2].Message);
-                Assert.Equal(file_workflowRepository.Substring(workflowRepository.Length + 1).Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar), _issues[2].Item1.Data["file"]);
+                Assert.Equal(file_workflowRepository.Substring(workflowRepository.Length + 1).Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar), _issues[2]["file"]);
 
-                Assert.Equal("some error 4", _issues[3].Item1.Message);
+                Assert.Equal("some error 4", _issues[3].Message);
-                Assert.Equal(file_workflowRepository_nestedDirectory.Substring(workflowRepository.Length + 1).Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar), _issues[3].Item1.Data["file"]);
+                Assert.Equal(file_workflowRepository_nestedDirectory.Substring(workflowRepository.Length + 1).Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar), _issues[3]["file"]);
 
-                Assert.Equal("some error 5", _issues[4].Item1.Message);
+                Assert.Equal("some error 5", _issues[4].Message);
-                Assert.False(_issues[4].Item1.Data.ContainsKey("file"));
+                Assert.Null(_issues[4]["file"]);
 
-                Assert.Equal("some error 6", _issues[5].Item1.Message);
+                Assert.Equal("some error 6", _issues[5].Message);
-                Assert.False(_issues[5].Item1.Data.ContainsKey("file"));
+                Assert.Null(_issues[5]["file"]);
 
-                Assert.Equal("some error 7", _issues[6].Item1.Message);
+                Assert.Equal("some error 7", _issues[6].Message);
-                Assert.False(_issues[6].Item1.Data.ContainsKey("file"));
+                Assert.Null(_issues[6]["file"]);
 
-                Assert.Equal("some error 8", _issues[7].Item1.Message);
+                Assert.Equal("some error 8", _issues[7].Message);
-                Assert.Equal(file_nestedWorkflowRepository.Substring(nestedWorkflowRepository.Length + 1).Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar), _issues[7].Item1.Data["file"]);
+                Assert.Equal(file_nestedWorkflowRepository.Substring(nestedWorkflowRepository.Length + 1).Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar), _issues[7]["file"]);
 
-                Assert.Equal("some error 9", _issues[8].Item1.Message);
+                Assert.Equal("some error 9", _issues[8].Message);
-                Assert.Equal(file_workflowRepositoryUsingSsh.Substring(workflowRepositoryUsingSsh.Length + 1).Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar), _issues[8].Item1.Data["file"]);
+                Assert.Equal(file_workflowRepositoryUsingSsh.Substring(workflowRepositoryUsingSsh.Length + 1).Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar), _issues[8]["file"]);
             }
 
             Environment.SetEnvironmentVariable("RUNNER_TEST_GET_REPOSITORY_PATH_FAILSAFE", "");
@@ -810,11 +810,11 @@ namespace GitHub.Runner.Common.Tests.Worker
 
                 Assert.Equal(2, _issues.Count);
 
-                Assert.Equal("some error 1", _issues[0].Item1.Message);
+                Assert.Equal("some error 1", _issues[0].Message);
-                Assert.Equal("some-file.txt", _issues[0].Item1.Data["file"]);
+                Assert.Equal("some-file.txt", _issues[0]["file"]);
 
-                Assert.Equal("some error 2", _issues[1].Item1.Message);
+                Assert.Equal("some error 2", _issues[1].Message);
-                Assert.Equal("some-file.txt", _issues[1].Item1.Data["file"]);
+                Assert.Equal("some-file.txt", _issues[1]["file"]);
             }
         }
 
@@ -871,11 +871,11 @@ namespace GitHub.Runner.Common.Tests.Worker
 
                 Assert.Equal(2, _issues.Count);
 
-                Assert.Equal("some error 1", _issues[0].Item1.Message);
+                Assert.Equal("some error 1", _issues[0].Message);
-                Assert.Equal("some-file.txt", _issues[0].Item1.Data["file"]);
+                Assert.Equal("some-file.txt", _issues[0]["file"]);
 
-                Assert.Equal("some error 2", _issues[1].Item1.Message);
+                Assert.Equal("some error 2", _issues[1].Message);
-                Assert.Equal("some-file.txt", _issues[1].Item1.Data["file"]);
+                Assert.Equal("some-file.txt", _issues[1]["file"]);
             }
         }
 #endif
@@ -929,8 +929,8 @@ namespace GitHub.Runner.Common.Tests.Worker
                 // Process
                 Process("some-directory/some-file.txt: some error [workflow-repo/some-project/some-project.proj]");
                 Assert.Equal(1, _issues.Count);
-                Assert.Equal("some error", _issues[0].Item1.Message);
+                Assert.Equal("some error", _issues[0].Message);
-                Assert.Equal("some-project/some-directory/some-file.txt", _issues[0].Item1.Data["file"]);
+                Assert.Equal("some-project/some-directory/some-file.txt", _issues[0]["file"]);
                 Assert.Equal(0, _commands.Count);
                 Assert.Equal(0, _messages.Count);
             }
@@ -958,7 +958,7 @@ namespace GitHub.Runner.Common.Tests.Worker
             matchers?.Validate();
 
             _onMatcherChanged = null;
-            _issues = new List<Tuple<DTWebApi.Issue, string>>();
+            _issues = new List<DTWebApi.IReadOnlyIssue>();
             _messages = new List<string>();
             _commands = new List<string>();
 
@@ -983,10 +983,12 @@ namespace GitHub.Runner.Common.Tests.Worker
                 {
                     _onMatcherChanged = handler;
                 });
-            _executionContext.Setup(x => x.AddIssue(It.IsAny<DTWebApi.Issue>(), It.IsAny<string>()))
+            _executionContext.Setup(x => x.CreateIssue(It.IsAny<DTWebApi.IssueType>(), It.IsAny<string>(), It.IsAny<IssueMetadata>(), It.IsAny<bool>()))
-                .Callback((DTWebApi.Issue issue, string logMessage) =>
+                             .Returns(TestUtil.CreateTestIssue);
+            _executionContext.Setup(x => x.AddIssue(It.IsAny<DTWebApi.IReadOnlyIssue>()))
+                .Callback((DTWebApi.IReadOnlyIssue issue) =>
                 {
-                    _issues.Add(new Tuple<DTWebApi.Issue, string>(issue, logMessage));
+                    _issues.Add(issue);
                 });
             _executionContext.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>()))
                 .Callback((string tag, string message) =>

src/Test/L0/Worker/SaveStateFileCommandL0.cs

@@ -21,7 +21,7 @@ namespace GitHub.Runner.Common.Tests.Worker
     public sealed class SaveStateFileCommandL0
     {
         private Mock<IExecutionContext> _executionContext;
-        private List<Tuple<DTWebApi.Issue, string>> _issues;
+        private List<DTWebApi.IReadOnlyIssue> _issues;
         private string _rootDirectory;
         private SaveStateFileCommand _saveStateFileCommand;
         private Dictionary<string, string> _intraActionState;
@@ -390,7 +390,7 @@ namespace GitHub.Runner.Common.Tests.Worker
 
         private TestHostContext Setup([CallerMemberName] string name = "")
         {
-            _issues = new List<Tuple<DTWebApi.Issue, string>>();
+            _issues = new List<DTWebApi.IReadOnlyIssue>();
             _intraActionState = new Dictionary<string, string>();
 
             var hostContext = new TestHostContext(this, name);
@@ -413,12 +413,11 @@ namespace GitHub.Runner.Common.Tests.Worker
                     EnvironmentVariables = new Dictionary<string, string>(VarUtil.EnvironmentVariableKeyComparer),
                     WriteDebug = true,
                 });
-            _executionContext.Setup(x => x.AddIssue(It.IsAny<DTWebApi.Issue>(), It.IsAny<string>()))
+            _executionContext.Setup(x => x.AddIssue(It.IsAny<DTWebApi.IReadOnlyIssue>()))
-                .Callback((DTWebApi.Issue issue, string logMessage) =>
+                .Callback((DTWebApi.IReadOnlyIssue issue) =>
                 {
-                    _issues.Add(new Tuple<DTWebApi.Issue, string>(issue, logMessage));
+                    _issues.Add(issue);
-                    var message = !string.IsNullOrEmpty(logMessage) ? logMessage : issue.Message;
+                    _trace.Info($"Issue '{issue.Type}': {issue.Message}");
-                    _trace.Info($"Issue '{issue.Type}': {message}");
                 });
             _executionContext.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>()))
                 .Callback((string tag, string message) =>

src/Test/L0/Worker/SetEnvFileCommandL0.cs

@@ -1,17 +1,11 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using System.Runtime.CompilerServices;
 using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using GitHub.Runner.Worker;
-using GitHub.Runner.Worker.Container;
-using GitHub.Runner.Worker.Handlers;
 using Moq;
 using Xunit;
 using DTWebApi = GitHub.DistributedTask.WebApi;
@@ -21,7 +15,7 @@ namespace GitHub.Runner.Common.Tests.Worker
     public sealed class SetEnvFileCommandL0
     {
         private Mock<IExecutionContext> _executionContext;
-        private List<Tuple<DTWebApi.Issue, string>> _issues;
+        private List<DTWebApi.IReadOnlyIssue> _issues;
         private string _rootDirectory;
         private SetEnvFileCommand _setEnvFileCommand;
         private ITraceWriter _trace;
@@ -389,7 +383,7 @@ namespace GitHub.Runner.Common.Tests.Worker
 
         private TestHostContext Setup([CallerMemberName] string name = "")
         {
-            _issues = new List<Tuple<DTWebApi.Issue, string>>();
+            _issues = new List<DTWebApi.IReadOnlyIssue>();
 
             var hostContext = new TestHostContext(this, name);
 
@@ -411,12 +405,11 @@ namespace GitHub.Runner.Common.Tests.Worker
                     EnvironmentVariables = new Dictionary<string, string>(VarUtil.EnvironmentVariableKeyComparer),
                     WriteDebug = true,
                 });
-            _executionContext.Setup(x => x.AddIssue(It.IsAny<DTWebApi.Issue>(), It.IsAny<string>()))
+            _executionContext.Setup(x => x.AddIssue(It.IsAny<DTWebApi.IReadOnlyIssue>()))
-                .Callback((DTWebApi.Issue issue, string logMessage) =>
+                .Callback((DTWebApi.IReadOnlyIssue issue) =>
                 {
-                    _issues.Add(new Tuple<DTWebApi.Issue, string>(issue, logMessage));
+                    _issues.Add(issue);
-                    var message = !string.IsNullOrEmpty(logMessage) ? logMessage : issue.Message;
+                    _trace.Info($"Issue '{issue.Type}': {issue.Message}");
-                    _trace.Info($"Issue '{issue.Type}': {message}");
                 });
             _executionContext.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>()))
                 .Callback((string tag, string message) =>

src/Test/L0/Worker/SetOutputFileCommandL0.cs

@@ -1,17 +1,11 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
-using System.Linq;
 using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using System.Runtime.CompilerServices;
 using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using GitHub.Runner.Worker;
-using GitHub.Runner.Worker.Container;
-using GitHub.Runner.Worker.Handlers;
 using Moq;
 using Xunit;
 using DTWebApi = GitHub.DistributedTask.WebApi;
@@ -21,7 +15,7 @@ namespace GitHub.Runner.Common.Tests.Worker
     public sealed class SetOutputFileCommandL0
     {
         private Mock<IExecutionContext> _executionContext;
-        private List<Tuple<DTWebApi.Issue, string>> _issues;
+        private List<DTWebApi.IReadOnlyIssue> _issues;
         private Dictionary<string, string> _outputs;
         private string _rootDirectory;
         private SetOutputFileCommand _setOutputFileCommand;
@@ -390,7 +384,7 @@ namespace GitHub.Runner.Common.Tests.Worker
 
         private TestHostContext Setup([CallerMemberName] string name = "")
         {
-            _issues = new List<Tuple<DTWebApi.Issue, string>>();
+            _issues = new List<DTWebApi.IReadOnlyIssue>();
             _outputs = new Dictionary<string, string>();
 
             var hostContext = new TestHostContext(this, name);
@@ -413,12 +407,11 @@ namespace GitHub.Runner.Common.Tests.Worker
                     EnvironmentVariables = new Dictionary<string, string>(VarUtil.EnvironmentVariableKeyComparer),
                     WriteDebug = true,
                 });
-            _executionContext.Setup(x => x.AddIssue(It.IsAny<DTWebApi.Issue>(), It.IsAny<string>()))
+            _executionContext.Setup(x => x.AddIssue(It.IsAny<DTWebApi.IReadOnlyIssue>()))
-                .Callback((DTWebApi.Issue issue, string logMessage) =>
+                .Callback((DTWebApi.IReadOnlyIssue issue) =>
                 {
-                    _issues.Add(new Tuple<DTWebApi.Issue, string>(issue, logMessage));
+                    _issues.Add(issue);
-                    var message = !string.IsNullOrEmpty(logMessage) ? logMessage : issue.Message;
+                    _trace.Info($"Issue '{issue.Type}': {issue.Message}");
-                    _trace.Info($"Issue '{issue.Type}': {message}");
                 });
             _executionContext.Setup(x => x.Write(It.IsAny<string>(), It.IsAny<string>()))
                 .Callback((string tag, string message) =>