Use structured loggin scope

src/Messaging/Events/ExportCompleteEvent.cs

@@ -54,25 +54,27 @@ public class ExportCompleteEvent : EventBase
         /// <summary>
         /// Gets or sets files exported with its status
         /// </summary>
-        [JsonProperty(PropertyName = "files")]
-        public Dictionary<string, FileExportStatus> FileStatus { get; set; }
+        [JsonProperty(PropertyName = "file_statuses")]
+        public Dictionary<string, FileExportStatus> FileStatuses { get; set; }
 
         [JsonConstructor]
         public ExportCompleteEvent()
         {
             Status = ExportStatus.Unknown;
-            FileStatus = new Dictionary<string, FileExportStatus>();
+            FileStatuses = new Dictionary<string, FileExportStatus>();
         }
 
-        public ExportCompleteEvent(ExportRequestEvent exportRequest, ExportStatus exportStatus)
+        public ExportCompleteEvent(ExportRequestEvent exportRequest, ExportStatus exportStatus, Dictionary<string, FileExportStatus> fileStatuses)
         {
             Guard.Against.Null(exportRequest, nameof(exportRequest));
             Guard.Against.Null(exportStatus, nameof(exportStatus));
+            Guard.Against.Null(fileStatuses, nameof(fileStatuses));
 
             WorkflowInstanceId = exportRequest.WorkflowInstanceId;
             ExportTaskId = exportRequest.ExportTaskId;
             Message = string.Join(System.Environment.NewLine, exportRequest.ErrorMessages);
             Status = exportStatus;
+            FileStatuses = fileStatuses;
         }
     }
 }

src/Messaging/Events/ExportStatus.cs

@@ -31,6 +31,11 @@ public enum FileExportStatus
         /// </summary>
         Success,
 
+        /// <summary>
+        /// Export failed due to configuration error
+        /// </summary>
+        ConfigurationError,
+
         /// <summary>
         /// File is unsupported
         /// </summary>
@@ -41,6 +46,11 @@ public enum FileExportStatus
         /// </summary>
         ServiceError,
 
+        /// <summary>
+        /// Error downloading file from storage service
+        /// </summary>
+        DownloadError,
+
         /// <summary>
         /// Unknown error
         /// </summary>

src/Messaging/Tests/ExportCompleteEventTest.cs

@@ -54,14 +54,22 @@ public void ShallGenerateExportCompleteMessageTestFromExportRequestMessage()
                 Guid.NewGuid().ToString(),
             };
 
+            var fileStatus = new Dictionary<string, FileExportStatus>()
+            {
+                {Guid.NewGuid().ToString(), FileExportStatus.Success},
+                {Guid.NewGuid().ToString(), FileExportStatus.DownloadError},
+                {Guid.NewGuid().ToString(), FileExportStatus.ConfigurationError},
+            };
+
             exportRequestMessage.AddErrorMessages(errors);
 
-            var exportCompleteMessage = new ExportCompleteEvent(exportRequestMessage, ExportStatus.Success);
+            var exportCompleteMessage = new ExportCompleteEvent(exportRequestMessage, ExportStatus.Success, fileStatus);
 
             Assert.Equal(exportRequestMessage.WorkflowInstanceId, exportCompleteMessage.WorkflowInstanceId);
             Assert.Equal(exportRequestMessage.ExportTaskId, exportCompleteMessage.ExportTaskId);
             Assert.Equal(string.Join(Environment.NewLine, errors), exportCompleteMessage.Message);
             Assert.Equal(ExportStatus.Success, exportCompleteMessage.Status);
+            Assert.Equal(fileStatus, exportCompleteMessage.FileStatuses);
         }
 
         [Fact(DisplayName = "Validation shall throw on error")]

src/Plugins/RabbitMQ/RabbitMqMessagePublisherService.cs

@@ -16,6 +16,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.Tracing;
 using System.Globalization;
 using System.Threading.Tasks;
 using Ardalis.GuardClauses;
@@ -99,7 +100,12 @@ public Task Publish(string topic, Message message)
             Guard.Against.NullOrWhiteSpace(topic, nameof(topic));
             Guard.Against.Null(message, nameof(message));
 
-            using var loggerScope = _logger.BeginScope(string.Format(CultureInfo.InvariantCulture, Logger.LoggingScopeMessageApplication, message.MessageId, message.ApplicationId));
+            using var loggingScope = _logger.BeginScope(new Dictionary<string, object>
+            {
+                ["MessageId"] = message.MessageId,
+                ["ApplicationId"] = message.ApplicationId,
+                ["CorrelationId"] = message.CorrelationId
+            });
 
             _logger.PublshingRabbitMQ(_endpoint, _virtualHost, _exchange, topic);
 

src/Plugins/RabbitMQ/RabbitMqMessageSubscriberService.cs

@@ -143,7 +143,12 @@ public void Subscribe(string[] topics, string queue, Action<MessageReceivedEvent
             var consumer = new EventingBasicConsumer(_channel);
             consumer.Received += (model, eventArgs) =>
             {
-                using var loggerScope = _logger.BeginScope(string.Format(CultureInfo.InvariantCulture, Logger.LoggingScopeMessageApplication, eventArgs.BasicProperties.MessageId, eventArgs.BasicProperties.AppId));
+                using var loggingScope = _logger.BeginScope(new Dictionary<string, object>
+                {
+                    ["MessageId"] = eventArgs.BasicProperties.MessageId,
+                    ["ApplicationId"] = eventArgs.BasicProperties.AppId,
+                    ["CorrelationId"] = eventArgs.BasicProperties.CorrelationId
+                });
 
                 _logger.MessageReceivedFromQueue(queueDeclareResult.QueueName, eventArgs.RoutingKey);
 
@@ -200,7 +205,13 @@ public void SubscribeAsync(string[] topics, string queue, Func<MessageReceivedEv
             var consumer = new EventingBasicConsumer(_channel);
             consumer.Received += async (model, eventArgs) =>
             {
-                using var loggerScope = _logger.BeginScope(string.Format(CultureInfo.InvariantCulture, Logger.LoggingScopeMessageApplication, eventArgs.BasicProperties.MessageId, eventArgs.BasicProperties.AppId));
+                using var loggingScope = _logger.BeginScope(new Dictionary<string, object>
+                {
+                    ["MessageId"] = eventArgs.BasicProperties.MessageId,
+                    ["ApplicationId"] = eventArgs.BasicProperties.AppId,
+                    ["CorrelationId"] = eventArgs.BasicProperties.CorrelationId
+
+                });
 
                 _logger.MessageReceivedFromQueue(queueDeclareResult.QueueName, eventArgs.RoutingKey);