artifact logging (#432)

* artifact logging

Signed-off-by: Jack Schofield <[email protected]>

Author: jackschofield23

src/WorkflowManager/Logging/Logging/Log.cs

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+using Amazon.Runtime.Internal;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.Logging;
@@ -152,7 +153,13 @@ public static void LogControllerEndTime(this ILogger logger, ResultExecutedConte
         [LoggerMessage(EventId = 33, Level = LogLevel.Debug, Message = "Task destination condition for task {taskId} with condition: {conditions} resolved to false.")]
         public static partial void TaskDestinationConditionFalse(this ILogger logger, string conditions, string taskId);
 
-        [LoggerMessage(EventId = 34, Level = LogLevel.Debug, Message = "Payload already exists for {payloadId}. This is likley due to being requeued")]
+        public static void LogArtifactPassing(this ILogger logger, Artifact artifact, string path, string artifactType, bool exists)
+        {
+            logger.LogInformation(34, "Artifact Passed data  Artifact {artifact}, Path {path}, ArtifactType {artifactType}, Exists {exists}",
+            JsonConvert.SerializeObject(artifact), path, artifactType, exists);
+        }
+
+        [LoggerMessage(EventId = 35, Level = LogLevel.Debug, Message = "Payload already exists for {payloadId}. This is likley due to being requeued")]
         public static partial void PayloadAlreadyExists(this ILogger logger, string payloadId);
     }
 }

src/WorkflowManager/WorkflowExecuter/Common/ArtifactMapper.cs

@@ -70,9 +70,13 @@ public async Task<Dictionary<string, string>> ConvertArtifactVariablesToPath(Art
                 {
                     artifactPathDictionary.Add(mappedArtifact.Key, mappedArtifact.Value);
 
+                    _logger.LogArtifactPassing(artifact, mappedArtifact.Value, shouldExistYet ? "Input" : "Pre-Task Output Path Mapping", true);
+
                     continue;
                 }
 
+                _logger.LogArtifactPassing(artifact, mappedArtifact.Value, shouldExistYet ? "Input" : "Pre-Task Output Path Mapping", false);
+
                 if (artifact.Mandatory)
                 {
                     throw new FileNotFoundException($"Mandatory artifact was not found: {artifact.Name}, {artifact.Value}");

src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs

@@ -119,8 +119,8 @@ public async Task<bool> ProcessPayload(WorkflowRequestEvent message, Payload pay
             var workflowInstances = new List<WorkflowInstance>();
 
             var tasks = workflows.Select(workflow => CreateWorkflowInstanceAsync(message, workflow));
-            await Task.WhenAll(tasks).ConfigureAwait(false);
-            workflowInstances.AddRange(tasks.Select(t => t.Result));
+            var newInstances = await Task.WhenAll(tasks).ConfigureAwait(false);
+            workflowInstances.AddRange(newInstances);
 
             var existingInstances = await _workflowInstanceRepository.GetByWorkflowsIdsAsync(workflowInstances.Select(w => w.WorkflowId).ToList());
 
@@ -423,13 +423,17 @@ private async Task<bool> HandleOutputArtifacts(WorkflowInstance workflowInstance
 
             var validOutputArtifacts = await _storageService.VerifyObjectsExistAsync(workflowInstance.BucketId, artifactDict);
 
-            workflowInstance.Tasks?.ForEach(t =>
+            foreach (var artifact in artifactDict)
             {
-                if (t.TaskId == task.TaskId)
-                {
-                    t.OutputArtifacts = validOutputArtifacts;
-                }
-            });
+                _logger.LogArtifactPassing(new Artifact { Name = artifact.Key, Value = artifact.Value }, artifact.Value, "Post-Task Output Artifact", validOutputArtifacts.ContainsKey(artifact.Key));
+            }
+
+            var currentTask = workflowInstance.Tasks?.FirstOrDefault(t => t.TaskId == task.TaskId);
+
+            if (currentTask is not null)
+            {
+                currentTask.OutputArtifacts = validOutputArtifacts;
+            }
 
             if (validOutputArtifacts is not null && validOutputArtifacts.Any())
             {