added more scoped logging

Signed-off-by: Neil South <[email protected]>

Author: neildsouth

src/InformaticsGateway/Services/Export/ExportServiceBase.cs

@@ -275,6 +275,10 @@ private IEnumerable<ExportRequestDataMessage> DownloadPayloadActionCallback(Expo
 
         private async Task<ExportRequestDataMessage> ExecuteOutputDataEngineCallback(ExportRequestDataMessage exportDataRequest)
         {
+            using var loggerScope = _logger.BeginScope(new Messaging.Common.LoggingDataDictionary<string, object> {
+                { "WorkflowInstanceId", exportDataRequest.WorkflowInstanceId },
+                { "TaskId", exportDataRequest.ExportTaskId }
+            });
             var outputDataEngine = _scope.ServiceProvider.GetService<IOutputDataPlugInEngine>() ?? throw new ServiceNotFoundException(nameof(IOutputDataPlugInEngine));
 
             outputDataEngine.Configure(exportDataRequest.PlugInAssemblies);

src/InformaticsGateway/Services/Scp/ApplicationEntityManager.cs

@@ -17,8 +17,8 @@
 
 using System;
 using System.Collections.Concurrent;
+using System.Threading;
 using System.Threading.Tasks;
-using Amazon.Runtime.Internal.Transform;
 using Ardalis.GuardClauses;
 using FellowOakDicom.Network;
 using Microsoft.Extensions.DependencyInjection;
@@ -119,7 +119,8 @@ private async Task<string> HandleInstance(DicomCStoreRequest request, string cal
                 { "SOPInstanceUID", uids.SopInstanceUid },
                 { "CorrelationId", associationId },
                 { "calledAeTitle", calledAeTitle},
-                { "callingAeTitle",callingAeTitle}
+                { "callingAeTitle",callingAeTitle},
+                { "ThreadId", Environment.CurrentManagedThreadId}
             }))
             {
                 _logger.InstanceInformation(uids.StudyInstanceUid, uids.SeriesInstanceUid);