Include correlation ID in log entries

Signed-off-by: Victor Chang <[email protected]>

Author: mocsharp

src/InformaticsGateway/Services/Connectors/PayloadMoveActionHandler.cs

@@ -25,6 +25,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using Monai.Deploy.InformaticsGateway.Api;
 using Monai.Deploy.InformaticsGateway.Api.Storage;
 using Monai.Deploy.InformaticsGateway.Common;
 using Monai.Deploy.InformaticsGateway.Configuration;
@@ -67,6 +68,8 @@ public async Task MoveFilesAsync(Payload payload, ActionBlock<Payload> moveQueue
             Guard.Against.Null(moveQueue, nameof(moveQueue));
             Guard.Against.Null(notificationQueue, nameof(notificationQueue));
 
+            using var loggerScope = _logger.BeginScope(new LoggingDataDictionary<string, object> { { "Payload", payload.PayloadId }, { "CorrelationId", payload.CorrelationId } });
+
             if (payload.State != Payload.PayloadState.Move)
             {
                 throw new PayloadNotifyException(PayloadNotifyException.FailureReason.IncorrectState, false);

src/InformaticsGateway/Services/Connectors/PayloadNotificationActionHandler.cs

@@ -23,6 +23,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using Monai.Deploy.InformaticsGateway.Api;
 using Monai.Deploy.InformaticsGateway.Api.Storage;
 using Monai.Deploy.InformaticsGateway.Common;
 using Monai.Deploy.InformaticsGateway.Configuration;
@@ -71,6 +72,7 @@ public async Task NotifyAsync(Payload payload, ActionBlock<Payload> notification
 
             try
             {
+                using var loggerScope = _logger.BeginScope(new LoggingDataDictionary<string, object> { { "Payload", payload.PayloadId }, { "CorrelationId", payload.CorrelationId } });
                 await NotifyPayloadReady(payload).ConfigureAwait(false);
                 await DeletePayload(payload, cancellationToken).ConfigureAwait(false);
             }
@@ -187,4 +189,4 @@ public void Dispose()
             GC.SuppressFinalize(this);
         }
     }
-}
+}

src/InformaticsGateway/Services/Connectors/PayloadNotificationService.cs

@@ -23,7 +23,6 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Monai.Deploy.InformaticsGateway.Api;
 using Monai.Deploy.InformaticsGateway.Api.Rest;
 using Monai.Deploy.InformaticsGateway.Api.Storage;
 using Monai.Deploy.InformaticsGateway.Common;
@@ -153,8 +152,6 @@ private async Task NotificationHandler(Payload payload)
         {
             Guard.Against.Null(payload, nameof(payload));
 
-            using var loggerScope = _logger.BeginScope(new LoggingDataDictionary<string, object> { { "Payload", payload.PayloadId }, { "CorrelationId", payload.CorrelationId } });
-
             try
             {
                 await _payloadNotificationActionHandler.NotifyAsync(payload, _publishQueue, _cancellationTokenSource.Token).ConfigureAwait(false);
@@ -181,8 +178,6 @@ private async Task MoveActionHandler(Payload payload)
         {
             Guard.Against.Null(payload, nameof(payload));
 
-            using var loggerScope = _logger.BeginScope(new LoggingDataDictionary<string, object> { { "Payload", payload.PayloadId }, { "CorrelationId", payload.CorrelationId } });
-
             try
             {
                 await _payloadMoveActionHandler.MoveFilesAsync(payload, _moveFileQueue, _publishQueue, _cancellationTokenSource.Token).ConfigureAwait(false);