AC-1029 improvements to argo plugin loggin (#656)

* minor improvement to logging in argo plugin

Signed-off-by: Lillie Dae <[email protected]>

Author: lillie-dae

src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs

@@ -76,6 +76,15 @@ public ArgoPlugin(
 
         private void Initialize()
         {
+            using var loggingScope = _logger.BeginScope(new Dictionary<string, object>
+            {
+                ["correlationId"] = Event.CorrelationId,
+                ["workflowInstanceId"] = Event.WorkflowInstanceId,
+                ["taskId"] = Event.TaskId,
+                ["executionId"] = Event.ExecutionId,
+                ["payloadId"] = Event.PayloadId
+            });
+
             if (Event.TaskPluginArguments.ContainsKey(Keys.TimeoutSeconds) &&
                 int.TryParse(Event.TaskPluginArguments[Keys.TimeoutSeconds], out var result))
             {
@@ -128,7 +137,11 @@ private void Initialize()
                 Task.Run(() => _taskDispatchEventService.UpdateTaskPluginArgsAsync(eventInfo, Event.TaskPluginArguments));
             }
 
-            _logger.Initialized(_namespace, _baseUrl, _activeDeadlineSeconds, (!string.IsNullOrWhiteSpace(_apiToken)));
+            _logger.Initialized(_namespace,
+                _baseUrl,
+                _activeDeadlineSeconds,
+                !string.IsNullOrWhiteSpace(_apiToken) ? "true" : "false",
+                _allowInsecure ? "true" : "false");
         }
 
         private void ValidateEvent()

src/TaskManager/Plug-ins/Argo/Logging/Log.cs

@@ -50,8 +50,8 @@ public static partial class Log
         [LoggerMessage(EventId = 1009, Level = LogLevel.Debug, Message = "Creating Argo workflow: {generateName}")]
         public static partial void CreatingArgoWorkflow(this ILogger logger, string generateName);
 
-        [LoggerMessage(EventId = 1010, Level = LogLevel.Information, Message = "Argo plugin initialized: namespace={argoNamespace}, base URL={baseUrl}, activeDeadlineSeconds={activeDeadlineSeconds}, apiToken configured={apiTokenSet}.")]
-        public static partial void Initialized(this ILogger logger, string argoNamespace, string baseUrl, int? activeDeadlineSeconds, bool apiTokenSet);
+        [LoggerMessage(EventId = 1010, Level = LogLevel.Information, Message = "Argo plugin initialized: namespace={argoNamespace}, base URL={baseUrl}, activeDeadlineSeconds={activeDeadlineSeconds}, apiToken configured={apiTokenSet}. allowInsecure={allowInsecure}")]
+        public static partial void Initialized(this ILogger logger, string argoNamespace, string baseUrl, int? activeDeadlineSeconds, string apiTokenSet, string allowInsecure);
 
         [LoggerMessage(EventId = 1011, Level = LogLevel.Error, Message = "Error generating Argo workflow.")]
         public static partial void ErrorGeneratingWorkflow(this ILogger logger, Exception ex);

src/TaskManager/Plug-ins/Argo/Strings.cs

@@ -19,7 +19,7 @@ namespace Monai.Deploy.WorkflowManager.TaskManager.Argo
     public static class Strings
     {
         public const string ArgoApiVersion = "argoproj.io/v1alpha1";
-        public const string DefaultNamespace = "default";
+        public const string DefaultNamespace = "argo";
         public const string KindWorkflow = "Workflow";
 
         public const string TaskIdLabelSelectorName = "md-task-id";

src/TaskManager/TaskManager/appsettings.Development.json

@@ -25,7 +25,7 @@
         "test": "Monai.Deploy.WorkflowManager.TaskManager.TestPlugin.Repositories.TestPluginRepository, Monai.Deploy.WorkflowManager.TaskManager.TestPlugin"
       },
       "argoPluginArguments": {
-        "server_url": "http://argo-argo-workflows-server.argo:2746"
+        "server_url": "http://localhost:2746"
       }
     },
     "storage": {

src/TaskManager/TaskManager/appsettings.Local.json

@@ -25,7 +25,7 @@
         "test": "Monai.Deploy.WorkflowManager.TaskManager.TestPlugin.Repositories.TestPluginRepository, Monai.Deploy.WorkflowManager.TaskManager.TestPlugin"
       },
       "argoPluginArguments": {
-        "server_url": "http://argo-argo-workflows-server.argo:2746"
+        "server_url": "http://localhost:2746"
       }
     },
     "storage": {

tests/UnitTests/TaskManager.Argo.Tests/ArgoPluginTest.cs

@@ -135,7 +135,7 @@ public void ArgoPlugin_InitializesValues()
         var message = GenerateTaskDispatchEventWithValidArguments();
 
         _ = new ArgoPlugin(_serviceScopeFactory.Object, _logger.Object, _options, message);
-        _logger.VerifyLogging($"Argo plugin initialized: namespace=namespace, base URL=http://api-endpoint/, activeDeadlineSeconds=50, apiToken configured=True.", LogLevel.Information, Times.Once());
+        _logger.VerifyLogging($"Argo plugin initialized: namespace=namespace, base URL=http://api-endpoint/, activeDeadlineSeconds=50, apiToken configured=true. allowInsecure=true", LogLevel.Information, Times.Once());
     }
 
     [Fact(DisplayName = "ExecuteTask - returns ExecutionStatus on failure")]