Merge pull request #260 from Project-MONAI/nds-upping-messaging

upped messaging version

Author: neildsouth

doc/dependency_decisions.yml

@@ -788,17 +788,17 @@
     :when: 2022-08-16 23:06:20.598551507 Z
 - - :approve
   - Monai.Deploy.Messaging
-  - :who: mocsharp
+  - :who: neilsouth
     :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE)
     :versions:
-    - 0.1.11
+    - 0.1.17-rc0020
     :when: 2022-08-16 23:06:21.051573547 Z
 - - :approve
   - Monai.Deploy.Messaging.RabbitMQ
-  - :who: mocsharp
+  - :who: neilsouth
     :why: Apache-2.0 (https://github.com/Project-MONAI/monai-deploy-messaging/raw/main/LICENSE)
     :versions:
-    - 0.1.11
+    - 0.1.17-rc0020
     :when: 2022-08-16 23:06:21.511789690 Z
 - - :approve
   - Monai.Deploy.Storage

src/Api/Monai.Deploy.InformaticsGateway.Api.csproj

@@ -30,7 +30,7 @@
     </PackageReference>
     <PackageReference Include="Macross.Json.Extensions" Version="3.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="6.0.10" />
-    <PackageReference Include="Monai.Deploy.Messaging" Version="0.1.11" />
+    <PackageReference Include="Monai.Deploy.Messaging" Version="0.1.17-rc0020" />
     <PackageReference Include="Monai.Deploy.Storage" Version="0.2.10" />
   </ItemGroup>
 

src/Configuration/Monai.Deploy.InformaticsGateway.Configuration.csproj

@@ -30,7 +30,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
-    <PackageReference Include="Monai.Deploy.Messaging" Version="0.1.11" />
+    <PackageReference Include="Monai.Deploy.Messaging" Version="0.1.17-rc0020" />
     <PackageReference Include="Monai.Deploy.Storage" Version="0.2.10" />
     <PackageReference Include="System.IO.Abstractions" Version="17.2.3" />
   </ItemGroup>

src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj

@@ -48,7 +48,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
-    <PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.11" />
+    <PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.17-rc0020" />
     <PackageReference Include="Monai.Deploy.Storage" Version="0.2.10" />
     <PackageReference Include="Monai.Deploy.Storage.MinIO" Version="0.2.10" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="5.1.5" />

src/InformaticsGateway/Services/Export/ExportServiceBase.cs

@@ -99,7 +99,7 @@ protected ExportServiceBase(
 
             _messageSubscriber.OnConnectionError += (sender, args) =>
             {
-                _logger.MessagingServiceErrorRecover(args.ShutdownEventArguments.ToString());
+                _logger.MessagingServiceErrorRecover(args.ErrorMessage);
                 SetupPolling();
             };
         }
@@ -204,7 +204,7 @@ private void OnMessageReceivedCallback(MessageReceivedEventArgs eventArgs)
         private IEnumerable<ExportRequestDataMessage> DownloadPayloadActionCallback(ExportRequestEventDetails exportRequest, CancellationToken cancellationToken)
         {
             Guard.Against.Null(exportRequest, nameof(exportRequest));
-            using var loggerScope = _logger.BeginScope(new LoggingDataDictionary<string, object> { { "ExportTaskId", exportRequest.ExportTaskId }, { "CorrelationId", exportRequest.CorrelationId } });
+            using var loggerScope = _logger.BeginScope(new Api.LoggingDataDictionary<string, object> { { "ExportTaskId", exportRequest.ExportTaskId }, { "CorrelationId", exportRequest.CorrelationId } });
             var scope = _serviceScopeFactory.CreateScope();
             var storageService = scope.ServiceProvider.GetRequiredService<IStorageService>();
 
@@ -245,7 +245,7 @@ private IEnumerable<ExportRequestDataMessage> DownloadPayloadActionCallback(Expo
 
         private void ReportingActionBlock(ExportRequestDataMessage exportRequestData)
         {
-            using var loggerScope = _logger.BeginScope(new LoggingDataDictionary<string, object> { { "ExportTaskId", exportRequestData.ExportTaskId }, { "CorrelationId", exportRequestData.CorrelationId } });
+            using var loggerScope = _logger.BeginScope(new Api.LoggingDataDictionary<string, object> { { "ExportTaskId", exportRequestData.ExportTaskId }, { "CorrelationId", exportRequestData.CorrelationId } });
 
             var exportRequest = _exportRequests[exportRequestData.ExportTaskId];
             lock (SyncRoot)

tests/Integration.Test/Monai.Deploy.InformaticsGateway.Integration.Test.csproj

@@ -1,4 +1,4 @@
-<!--
+<!--
   ~ Copyright 2022 MONAI Consortium
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,7 +33,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
     <PackageReference Include="Minio" Version="4.0.6" />
-    <PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.11" />
+    <PackageReference Include="Monai.Deploy.Messaging.RabbitMQ" Version="0.1.17-rc0020" />
     <PackageReference Include="Monai.Deploy.Storage.MinIO" Version="0.2.10" />
     <PackageReference Include="Moq" Version="4.18.2" />
     <PackageReference Include="Polly" Version="7.2.3" />