From d5a355393ee4010ee1c3dc80adc08f5fa5712bb2 Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Thu, 7 Sep 2023 16:37:55 -0700 Subject: [PATCH] Include correlation ID in log entries Signed-off-by: Victor Chang --- .../Services/Connectors/PayloadMoveActionHandler.cs | 3 +++ .../Services/Connectors/PayloadNotificationActionHandler.cs | 4 +++- .../Services/Connectors/PayloadNotificationService.cs | 5 ----- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/InformaticsGateway/Services/Connectors/PayloadMoveActionHandler.cs b/src/InformaticsGateway/Services/Connectors/PayloadMoveActionHandler.cs index 64d291e24..714024c21 100644 --- a/src/InformaticsGateway/Services/Connectors/PayloadMoveActionHandler.cs +++ b/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 moveQueue Guard.Against.Null(moveQueue, nameof(moveQueue)); Guard.Against.Null(notificationQueue, nameof(notificationQueue)); + using var loggerScope = _logger.BeginScope(new LoggingDataDictionary { { "Payload", payload.PayloadId }, { "CorrelationId", payload.CorrelationId } }); + if (payload.State != Payload.PayloadState.Move) { throw new PayloadNotifyException(PayloadNotifyException.FailureReason.IncorrectState, false); diff --git a/src/InformaticsGateway/Services/Connectors/PayloadNotificationActionHandler.cs b/src/InformaticsGateway/Services/Connectors/PayloadNotificationActionHandler.cs index ef8f8960f..ff49a6941 100755 --- a/src/InformaticsGateway/Services/Connectors/PayloadNotificationActionHandler.cs +++ b/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 notification try { + using var loggerScope = _logger.BeginScope(new LoggingDataDictionary { { "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); } } -} \ No newline at end of file +} diff --git a/src/InformaticsGateway/Services/Connectors/PayloadNotificationService.cs b/src/InformaticsGateway/Services/Connectors/PayloadNotificationService.cs index 492c6a821..1188ba9f0 100644 --- a/src/InformaticsGateway/Services/Connectors/PayloadNotificationService.cs +++ b/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 { { "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 { { "Payload", payload.PayloadId }, { "CorrelationId", payload.CorrelationId } }); - try { await _payloadMoveActionHandler.MoveFilesAsync(payload, _moveFileQueue, _publishQueue, _cancellationTokenSource.Token).ConfigureAwait(false);