From 852a7a985260dfbc0fbb33e6600eee58b4ad7741 Mon Sep 17 00:00:00 2001 From: Neil South Date: Tue, 30 Aug 2022 17:30:28 +0100 Subject: [PATCH 1/9] updates to helm files Signed-off-by: Neil South --- deploy/helm/Gateway.yaml | 7 +- deploy/helm/MTM.yaml | 54 ++++++++++++++++ deploy/helm/MWM.yaml | 5 +- deploy/helm/templates/deployment.yaml | 2 +- deploy/helm/templates/volume.yml | 2 +- deploy/helm/templates/volumeclaim.yml | 2 +- .../Plug-ins/Argo/packages.lock.json | 6 +- .../Database/packages.lock.json | 12 ++-- .../Logging/packages.lock.json | 12 ++-- .../PayloadListener/packages.lock.json | 14 ++-- .../Storage/packages.lock.json | 12 ++-- .../WorkflowExecuter/packages.lock.json | 14 ++-- .../WorkflowManager/packages.lock.json | 26 ++++---- .../WorkflowManager.Tests/packages.lock.json | 64 +++++++++---------- 14 files changed, 146 insertions(+), 86 deletions(-) create mode 100644 deploy/helm/MTM.yaml diff --git a/deploy/helm/Gateway.yaml b/deploy/helm/Gateway.yaml index 3e7eb6dfb..7f3634f65 100644 --- a/deploy/helm/Gateway.yaml +++ b/deploy/helm/Gateway.yaml @@ -16,7 +16,10 @@ replicaCount: 1 image: repository: registry.gitlab.com/answerdigital/londonai/aide/workflow-manager-images/infomatics-gateway pullPolicy: IfNotPresent - tag: 2022-08-01 + tag: 2022-08-30-01 + +imagePullSecrets: + - name: gitlab-image-pull enviromentVariables: InformaticsGateway__messaging__publisherSettings__endpoint: "rabbitmq-monai" @@ -29,6 +32,8 @@ enviromentVariables: InformaticsGateway__storage__settings__accessKey: "rootminio" InformaticsGateway__storage__settings__accessToken: "rootminio" InformaticsGateway__dicom__scp__rejectUnknownSources: false + Kestrel__EndPoints__Http__Url: "http://::5000" + InformaticsGateway__storage__watermarkPercent: 95 service: diff --git a/deploy/helm/MTM.yaml b/deploy/helm/MTM.yaml new file mode 100644 index 000000000..c2f08a14c --- /dev/null +++ b/deploy/helm/MTM.yaml @@ -0,0 +1,54 @@ +# Copyright 2022 MONAI Consortium +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +replicaCount: 1 + +image: + repository: registry.gitlab.com/answerdigital/londonai/aide/workflow-manager-images/task-manager + pullPolicy: IfNotPresent + tag: 2022-08-22-02 + +imagePullSecrets: + - name: gitlab-image-pull + +enviromentVariables: + WorkflowManager__storage__settings__endpoint: "minio.monai:9000" + WorkflowManager__storage__settings__accessKey: "rootminio" + WorkflowManager__storage__settings__accessToken: "rootminio" + WorkflowManager__storage__settings__executableLocation: "mc" + WorkflowManager__messaging__publisherSettings__endpoint: "rabbitmq.monai" + WorkflowManager__messaging__subscriberSettings__endpoint: "rabbitmq.monai" + +enviromentVariablesFromSecrets: + secrets: + - name: WorkflowManager__messaging__subscriberSettings__username + secretName: rabbit-secret-master + secretKey: username + - name: WorkflowManager__messaging__subscriberSettings__password + secretName: rabbit-secret-master + secretKey: password + - name: WorkflowManager__messaging__publisherSettings__username + secretName: rabbit-secret-master + secretKey: username + - name: WorkflowManager__messaging__publisherSettings__password + secretName: rabbit-secret-master + secretKey: password + +service: + type: ClusterIP + port: 5000 + + + + diff --git a/deploy/helm/MWM.yaml b/deploy/helm/MWM.yaml index 31b88e673..f7dabd782 100644 --- a/deploy/helm/MWM.yaml +++ b/deploy/helm/MWM.yaml @@ -27,9 +27,10 @@ enviromentVariables: WorkflowManager__storage__settings__accessKey: "rootminio" WorkflowManager__storage__settings__accessToken: "rootminio" WorkflowManager__storage__settings__executableLocation: "mc" - WorkflowManager__messaging__publisherSettings__endpoint: "rabbitmq.monai" - WorkflowManager__messaging__subscriberSettings__endpoint: "rabbitmq.monai" + WorkflowManager__messaging__publisherSettings__endpoint: "rabbitmq-monai.monai" + WorkflowManager__messaging__subscriberSettings__endpoint: "rabbitmq-monai.monai" WorkloadManagerDatabase__ConnectionString: "mongodb://root:rootpassword@mongo-monai.monai:27017" + Kestrel__EndPoints__Http__Url: "http://::5000" enviromentVariablesFromSecrets: secrets: diff --git a/deploy/helm/templates/deployment.yaml b/deploy/helm/templates/deployment.yaml index 75a4f7261..29eb73a8e 100644 --- a/deploy/helm/templates/deployment.yaml +++ b/deploy/helm/templates/deployment.yaml @@ -63,7 +63,7 @@ spec: value: {{ $value | quote }} {{- end }} - {{- range .Values.enviromentVariablesFromSecrets.secrets }} + {{- range (.Values.enviromentVariablesFromSecrets).secrets }} - name: {{ .name }} valueFrom: secretKeyRef: diff --git a/deploy/helm/templates/volume.yml b/deploy/helm/templates/volume.yml index 2c894e0c6..939459536 100644 --- a/deploy/helm/templates/volume.yml +++ b/deploy/helm/templates/volume.yml @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -{{- if .Values.volumeMounts -}} +{{- if .Values.volumeMounts }} apiVersion: v1 kind: PersistentVolume metadata: diff --git a/deploy/helm/templates/volumeclaim.yml b/deploy/helm/templates/volumeclaim.yml index 6f1afd762..934c4468d 100644 --- a/deploy/helm/templates/volumeclaim.yml +++ b/deploy/helm/templates/volumeclaim.yml @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -{{- if .Values.volumeMounts -}} +{{- if .Values.volumeMounts }} apiVersion: v1 kind: PersistentVolumeClaim metadata: diff --git a/src/TaskManager/Plug-ins/Argo/packages.lock.json b/src/TaskManager/Plug-ins/Argo/packages.lock.json index 6fd6529b0..bb264a7f1 100644 --- a/src/TaskManager/Plug-ins/Argo/packages.lock.json +++ b/src/TaskManager/Plug-ins/Argo/packages.lock.json @@ -28,9 +28,9 @@ }, "Microsoft.Extensions.ApiDescription.Client": { "type": "Direct", - "requested": "[6.0.7, )", - "resolved": "6.0.7", - "contentHash": "69nhXioKWbAyULueGojN8IogiEz4+rh59Yuw8lJqVNL/nUcYj5KSJb7l305mg7rUiDIPqhZRxHbe8swfieH1qw==" + "requested": "[6.0.8, )", + "resolved": "6.0.8", + "contentHash": "fN3zEuHjSql9w2Md29dYkmPbAijxr+LqxoOoJ9B8G2j+fHgAK/N0g89miIUwepwbk8izTi5m8cVyWTKQgkd+ww==" }, "Monai.Deploy.Messaging": { "type": "Direct", diff --git a/src/WorkflowManager/Database/packages.lock.json b/src/WorkflowManager/Database/packages.lock.json index a39fd7de8..374d309e4 100644 --- a/src/WorkflowManager/Database/packages.lock.json +++ b/src/WorkflowManager/Database/packages.lock.json @@ -49,15 +49,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.23", - "contentHash": "5n9mSVksj3vsv5hm7t/GUjv36iT0s0Wu9UCBn+onTKrnIpXZjVbsHBrxzEwA5Ru6Qg0j4Ah4R/+H6LcngTOVfg==" + "resolved": "3.7.12.27", + "contentHash": "pCX0yHPFuREXOqGaEQoCSlPZwsiijT1rBBiyk1pdD19Db8gVFglO7wMbxl37OhRNcLZprmtWJFvaDfuzeV10Wg==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.187", - "contentHash": "Q8wBhVQJQsh7zeaO9KzYOFlWeSOEFRCuwtC//k6XP+8Lw3DIRqHG2HgiY5FyHUrsJrbbUM1uuLGNYG41r8pvDQ==", + "resolved": "3.7.1.191", + "contentHash": "tTIqJ/QKaPzTu5ZPdRFa2sW9p5F441RLV7nDdTAVVuu6oLyemna0bTtE+luGLaw17oE4GZHpa5n5p0oJmpzcxA==", "dependencies": { - "AWSSDK.Core": "[3.7.12.23, 4.0.0)" + "AWSSDK.Core": "[3.7.12.27, 4.0.0)" } }, "DnsClient": { @@ -807,7 +807,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.187, )", + "AWSSDK.SecurityToken": "[3.7.1.191, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", "MongoDB.Bson": "[2.17.1, )", diff --git a/src/WorkflowManager/Logging/packages.lock.json b/src/WorkflowManager/Logging/packages.lock.json index 49b617092..3a9d39658 100644 --- a/src/WorkflowManager/Logging/packages.lock.json +++ b/src/WorkflowManager/Logging/packages.lock.json @@ -41,15 +41,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.23", - "contentHash": "5n9mSVksj3vsv5hm7t/GUjv36iT0s0Wu9UCBn+onTKrnIpXZjVbsHBrxzEwA5Ru6Qg0j4Ah4R/+H6LcngTOVfg==" + "resolved": "3.7.12.27", + "contentHash": "pCX0yHPFuREXOqGaEQoCSlPZwsiijT1rBBiyk1pdD19Db8gVFglO7wMbxl37OhRNcLZprmtWJFvaDfuzeV10Wg==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.187", - "contentHash": "Q8wBhVQJQsh7zeaO9KzYOFlWeSOEFRCuwtC//k6XP+8Lw3DIRqHG2HgiY5FyHUrsJrbbUM1uuLGNYG41r8pvDQ==", + "resolved": "3.7.1.191", + "contentHash": "tTIqJ/QKaPzTu5ZPdRFa2sW9p5F441RLV7nDdTAVVuu6oLyemna0bTtE+luGLaw17oE4GZHpa5n5p0oJmpzcxA==", "dependencies": { - "AWSSDK.Core": "[3.7.12.23, 4.0.0)" + "AWSSDK.Core": "[3.7.12.27, 4.0.0)" } }, "JetBrains.Annotations": { @@ -741,7 +741,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.187, )", + "AWSSDK.SecurityToken": "[3.7.1.191, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", "MongoDB.Bson": "[2.17.1, )", diff --git a/src/WorkflowManager/PayloadListener/packages.lock.json b/src/WorkflowManager/PayloadListener/packages.lock.json index 6026d9c33..888d9224d 100644 --- a/src/WorkflowManager/PayloadListener/packages.lock.json +++ b/src/WorkflowManager/PayloadListener/packages.lock.json @@ -38,15 +38,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.23", - "contentHash": "5n9mSVksj3vsv5hm7t/GUjv36iT0s0Wu9UCBn+onTKrnIpXZjVbsHBrxzEwA5Ru6Qg0j4Ah4R/+H6LcngTOVfg==" + "resolved": "3.7.12.27", + "contentHash": "pCX0yHPFuREXOqGaEQoCSlPZwsiijT1rBBiyk1pdD19Db8gVFglO7wMbxl37OhRNcLZprmtWJFvaDfuzeV10Wg==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.187", - "contentHash": "Q8wBhVQJQsh7zeaO9KzYOFlWeSOEFRCuwtC//k6XP+8Lw3DIRqHG2HgiY5FyHUrsJrbbUM1uuLGNYG41r8pvDQ==", + "resolved": "3.7.1.191", + "contentHash": "tTIqJ/QKaPzTu5ZPdRFa2sW9p5F441RLV7nDdTAVVuu6oLyemna0bTtE+luGLaw17oE4GZHpa5n5p0oJmpzcxA==", "dependencies": { - "AWSSDK.Core": "[3.7.12.23, 4.0.0)" + "AWSSDK.Core": "[3.7.12.27, 4.0.0)" } }, "DnsClient": { @@ -912,7 +912,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.187, )", + "AWSSDK.SecurityToken": "[3.7.1.191, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", "MongoDB.Bson": "[2.17.1, )", @@ -951,7 +951,7 @@ "monai.deploy.workloadmanager.workfowexecuter": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.187, )", + "AWSSDK.SecurityToken": "[3.7.1.191, )", "Ardalis.GuardClauses": "[4.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", "Monai.Deploy.Storage": "[0.2.1, )", diff --git a/src/WorkflowManager/Storage/packages.lock.json b/src/WorkflowManager/Storage/packages.lock.json index 1b1df769c..1a63b0be3 100644 --- a/src/WorkflowManager/Storage/packages.lock.json +++ b/src/WorkflowManager/Storage/packages.lock.json @@ -27,15 +27,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.23", - "contentHash": "5n9mSVksj3vsv5hm7t/GUjv36iT0s0Wu9UCBn+onTKrnIpXZjVbsHBrxzEwA5Ru6Qg0j4Ah4R/+H6LcngTOVfg==" + "resolved": "3.7.12.27", + "contentHash": "pCX0yHPFuREXOqGaEQoCSlPZwsiijT1rBBiyk1pdD19Db8gVFglO7wMbxl37OhRNcLZprmtWJFvaDfuzeV10Wg==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.187", - "contentHash": "Q8wBhVQJQsh7zeaO9KzYOFlWeSOEFRCuwtC//k6XP+8Lw3DIRqHG2HgiY5FyHUrsJrbbUM1uuLGNYG41r8pvDQ==", + "resolved": "3.7.1.191", + "contentHash": "tTIqJ/QKaPzTu5ZPdRFa2sW9p5F441RLV7nDdTAVVuu6oLyemna0bTtE+luGLaw17oE4GZHpa5n5p0oJmpzcxA==", "dependencies": { - "AWSSDK.Core": "[3.7.12.23, 4.0.0)" + "AWSSDK.Core": "[3.7.12.27, 4.0.0)" } }, "JetBrains.Annotations": { @@ -763,7 +763,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.187, )", + "AWSSDK.SecurityToken": "[3.7.1.191, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", "MongoDB.Bson": "[2.17.1, )", diff --git a/src/WorkflowManager/WorkflowExecuter/packages.lock.json b/src/WorkflowManager/WorkflowExecuter/packages.lock.json index 5468118af..12ff7ab95 100644 --- a/src/WorkflowManager/WorkflowExecuter/packages.lock.json +++ b/src/WorkflowManager/WorkflowExecuter/packages.lock.json @@ -13,11 +13,11 @@ }, "AWSSDK.SecurityToken": { "type": "Direct", - "requested": "[3.7.1.187, )", - "resolved": "3.7.1.187", - "contentHash": "Q8wBhVQJQsh7zeaO9KzYOFlWeSOEFRCuwtC//k6XP+8Lw3DIRqHG2HgiY5FyHUrsJrbbUM1uuLGNYG41r8pvDQ==", + "requested": "[3.7.1.191, )", + "resolved": "3.7.1.191", + "contentHash": "tTIqJ/QKaPzTu5ZPdRFa2sW9p5F441RLV7nDdTAVVuu6oLyemna0bTtE+luGLaw17oE4GZHpa5n5p0oJmpzcxA==", "dependencies": { - "AWSSDK.Core": "[3.7.12.23, 4.0.0)" + "AWSSDK.Core": "[3.7.12.27, 4.0.0)" } }, "Monai.Deploy.Messaging": { @@ -57,8 +57,8 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.23", - "contentHash": "5n9mSVksj3vsv5hm7t/GUjv36iT0s0Wu9UCBn+onTKrnIpXZjVbsHBrxzEwA5Ru6Qg0j4Ah4R/+H6LcngTOVfg==" + "resolved": "3.7.12.27", + "contentHash": "pCX0yHPFuREXOqGaEQoCSlPZwsiijT1rBBiyk1pdD19Db8gVFglO7wMbxl37OhRNcLZprmtWJFvaDfuzeV10Wg==" }, "DnsClient": { "type": "Transitive", @@ -915,7 +915,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.187, )", + "AWSSDK.SecurityToken": "[3.7.1.191, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", "MongoDB.Bson": "[2.17.1, )", diff --git a/src/WorkflowManager/WorkflowManager/packages.lock.json b/src/WorkflowManager/WorkflowManager/packages.lock.json index 3f76c1ff9..5a8289411 100644 --- a/src/WorkflowManager/WorkflowManager/packages.lock.json +++ b/src/WorkflowManager/WorkflowManager/packages.lock.json @@ -25,11 +25,11 @@ }, "Microsoft.AspNetCore.Mvc.NewtonsoftJson": { "type": "Direct", - "requested": "[6.0.7, )", - "resolved": "6.0.7", - "contentHash": "zkt7EFRR5fZQUc6taa8sO8aG+EF7XQ6Z7+fPW3gXCh6l7+vyDpZ9PbTODYMsXaS1tOjP1b+jJgf7hY/kaciO4Q==", + "requested": "[6.0.8, )", + "resolved": "6.0.8", + "contentHash": "2imWU1FEnirRogFvtu+wV11xJuC0u7aNprpNQygQLTZvnSlaLPTJhUUrqskFVn6PRDv3kCE4peaBJKwseNv71w==", "dependencies": { - "Microsoft.AspNetCore.JsonPatch": "6.0.7", + "Microsoft.AspNetCore.JsonPatch": "6.0.8", "Newtonsoft.Json": "13.0.1", "Newtonsoft.Json.Bson": "1.0.2" } @@ -186,15 +186,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.23", - "contentHash": "5n9mSVksj3vsv5hm7t/GUjv36iT0s0Wu9UCBn+onTKrnIpXZjVbsHBrxzEwA5Ru6Qg0j4Ah4R/+H6LcngTOVfg==" + "resolved": "3.7.12.27", + "contentHash": "pCX0yHPFuREXOqGaEQoCSlPZwsiijT1rBBiyk1pdD19Db8gVFglO7wMbxl37OhRNcLZprmtWJFvaDfuzeV10Wg==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.187", - "contentHash": "Q8wBhVQJQsh7zeaO9KzYOFlWeSOEFRCuwtC//k6XP+8Lw3DIRqHG2HgiY5FyHUrsJrbbUM1uuLGNYG41r8pvDQ==", + "resolved": "3.7.1.191", + "contentHash": "tTIqJ/QKaPzTu5ZPdRFa2sW9p5F441RLV7nDdTAVVuu6oLyemna0bTtE+luGLaw17oE4GZHpa5n5p0oJmpzcxA==", "dependencies": { - "AWSSDK.Core": "[3.7.12.23, 4.0.0)" + "AWSSDK.Core": "[3.7.12.27, 4.0.0)" } }, "Crc32.NET": { @@ -325,8 +325,8 @@ }, "Microsoft.AspNetCore.JsonPatch": { "type": "Transitive", - "resolved": "6.0.7", - "contentHash": "ybv3udO2SaGW74NKIxj06ozTtcEJf2yOCNj4OGY/ZvB+LG/mZGBVKrwZYaZBXaWR9dakrf4+M3LiMAhasTEamg==", + "resolved": "6.0.8", + "contentHash": "OihHbIG+WAxk0U3jwPxCgh2tQqpeODYis3D0SnwIshpkKoZFhifCwfDNcsTBoppx4Y6ic0dcxkGiHO5NZWtXiw==", "dependencies": { "Microsoft.CSharp": "4.7.0", "Newtonsoft.Json": "13.0.1" @@ -1687,7 +1687,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.187, )", + "AWSSDK.SecurityToken": "[3.7.1.191, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", "MongoDB.Bson": "[2.17.1, )", @@ -1747,7 +1747,7 @@ "monai.deploy.workloadmanager.workfowexecuter": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.187, )", + "AWSSDK.SecurityToken": "[3.7.1.191, )", "Ardalis.GuardClauses": "[4.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", "Monai.Deploy.Storage": "[0.2.1, )", diff --git a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json index 1024c0962..9823196dc 100644 --- a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json +++ b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json @@ -65,13 +65,13 @@ }, "xunit": { "type": "Direct", - "requested": "[2.4.1, )", - "resolved": "2.4.1", - "contentHash": "XNR3Yz9QTtec16O0aKcO6+baVNpXmOnPUxDkCY97J+8krUYxPvXT1szYYEUdKk4sB8GOI2YbAjRIOm8ZnXRfzQ==", + "requested": "[2.4.2, )", + "resolved": "2.4.2", + "contentHash": "6Mj73Ont3zj2CJuoykVJfE0ZmRwn7C+pTuRP8c4bnaaTFjwNG6tGe0prJ1yIbMe9AHrpDys63ctWacSsFJWK/w==", "dependencies": { - "xunit.analyzers": "0.10.0", - "xunit.assert": "[2.4.1]", - "xunit.core": "[2.4.1]" + "xunit.analyzers": "1.0.0", + "xunit.assert": "2.4.2", + "xunit.core": "[2.4.2]" } }, "xunit.runner.visualstudio": { @@ -99,15 +99,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.23", - "contentHash": "5n9mSVksj3vsv5hm7t/GUjv36iT0s0Wu9UCBn+onTKrnIpXZjVbsHBrxzEwA5Ru6Qg0j4Ah4R/+H6LcngTOVfg==" + "resolved": "3.7.12.27", + "contentHash": "pCX0yHPFuREXOqGaEQoCSlPZwsiijT1rBBiyk1pdD19Db8gVFglO7wMbxl37OhRNcLZprmtWJFvaDfuzeV10Wg==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.187", - "contentHash": "Q8wBhVQJQsh7zeaO9KzYOFlWeSOEFRCuwtC//k6XP+8Lw3DIRqHG2HgiY5FyHUrsJrbbUM1uuLGNYG41r8pvDQ==", + "resolved": "3.7.1.191", + "contentHash": "tTIqJ/QKaPzTu5ZPdRFa2sW9p5F441RLV7nDdTAVVuu6oLyemna0bTtE+luGLaw17oE4GZHpa5n5p0oJmpzcxA==", "dependencies": { - "AWSSDK.Core": "[3.7.12.23, 4.0.0)" + "AWSSDK.Core": "[3.7.12.27, 4.0.0)" } }, "Castle.Core": { @@ -265,8 +265,8 @@ }, "Microsoft.AspNetCore.JsonPatch": { "type": "Transitive", - "resolved": "6.0.7", - "contentHash": "ybv3udO2SaGW74NKIxj06ozTtcEJf2yOCNj4OGY/ZvB+LG/mZGBVKrwZYaZBXaWR9dakrf4+M3LiMAhasTEamg==", + "resolved": "6.0.8", + "contentHash": "OihHbIG+WAxk0U3jwPxCgh2tQqpeODYis3D0SnwIshpkKoZFhifCwfDNcsTBoppx4Y6ic0dcxkGiHO5NZWtXiw==", "dependencies": { "Microsoft.CSharp": "4.7.0", "Newtonsoft.Json": "13.0.1" @@ -305,10 +305,10 @@ }, "Microsoft.AspNetCore.Mvc.NewtonsoftJson": { "type": "Transitive", - "resolved": "6.0.7", - "contentHash": "zkt7EFRR5fZQUc6taa8sO8aG+EF7XQ6Z7+fPW3gXCh6l7+vyDpZ9PbTODYMsXaS1tOjP1b+jJgf7hY/kaciO4Q==", + "resolved": "6.0.8", + "contentHash": "2imWU1FEnirRogFvtu+wV11xJuC0u7aNprpNQygQLTZvnSlaLPTJhUUrqskFVn6PRDv3kCE4peaBJKwseNv71w==", "dependencies": { - "Microsoft.AspNetCore.JsonPatch": "6.0.7", + "Microsoft.AspNetCore.JsonPatch": "6.0.8", "Newtonsoft.Json": "13.0.1", "Newtonsoft.Json.Bson": "1.0.2" } @@ -1638,30 +1638,30 @@ }, "xunit.analyzers": { "type": "Transitive", - "resolved": "0.10.0", - "contentHash": "4/IDFCJfIeg6bix9apmUtIMwvOsiwqdEexeO/R2D4GReIGPLIRODTpId/l4LRSrAJk9lEO3Zx1H0Zx6uohJDNg==" + "resolved": "1.0.0", + "contentHash": "BeO8hEgs/c8Ls2647fPfieMngncvf0D0xYNDfIO59MolxtCtVjFRd6SRc+7tj8VMqkVOuJcnc9eh4ngI2cAmLQ==" }, "xunit.assert": { "type": "Transitive", - "resolved": "2.4.1", - "contentHash": "O/Oe0BS5RmSsM+LQOb041TzuPo5MdH2Rov+qXGS37X+KFG1Hxz7kopYklM5+1Y+tRGeXrOx5+Xne1RuqLFQoyQ==", + "resolved": "2.4.2", + "contentHash": "pxJISOFjn2XTTi1mcDCkRZrTFb9OtRRCtx2kZFNF51GdReLr1ls2rnyxvAS4JO247K3aNtflvh5Q0346K5BROA==", "dependencies": { "NETStandard.Library": "1.6.1" } }, "xunit.core": { "type": "Transitive", - "resolved": "2.4.1", - "contentHash": "Zsj5OMU6JasNGERXZy8s72+pcheG6Q15atS5XpZXqAtULuyQiQ6XNnUsp1gyfC6WgqScqMvySiEHmHcOG6Eg0Q==", + "resolved": "2.4.2", + "contentHash": "KB4yGCxNqIVyekhJLXtKSEq6BaXVp/JO3mbGVE1hxypZTLEe7h+sTbAhpA+yZW2dPtXTuiW+C1B2oxxHEkrmOw==", "dependencies": { - "xunit.extensibility.core": "[2.4.1]", - "xunit.extensibility.execution": "[2.4.1]" + "xunit.extensibility.core": "[2.4.2]", + "xunit.extensibility.execution": "[2.4.2]" } }, "xunit.extensibility.core": { "type": "Transitive", - "resolved": "2.4.1", - "contentHash": "yKZKm/8QNZnBnGZFD9SewkllHBiK0DThybQD/G4PiAmQjKtEZyHi6ET70QPU9KtSMJGRYS6Syk7EyR2EVDU4Kg==", + "resolved": "2.4.2", + "contentHash": "W1BoXTIN1C6kpVSMw25huSet25ky6IAQUNovu3zGOGN/jWnbgSoTyCrlIhmXSg0tH5nEf8q7h3OjNHOjyu5PfA==", "dependencies": { "NETStandard.Library": "1.6.1", "xunit.abstractions": "2.0.3" @@ -1669,11 +1669,11 @@ }, "xunit.extensibility.execution": { "type": "Transitive", - "resolved": "2.4.1", - "contentHash": "7e/1jqBpcb7frLkB6XDrHCGXAbKN4Rtdb88epYxCSRQuZDRW8UtTfdTEVpdTl8s4T56e07hOBVd4G0OdCxIY2A==", + "resolved": "2.4.2", + "contentHash": "CZmgcKkwpyo8FlupZdWpJCryrAOWLh1FBPG6gmVZuPQkGQsim/oL4PcP4nfrC2hHgXUFtluvaJ0Sp9PQKUMNpg==", "dependencies": { "NETStandard.Library": "1.6.1", - "xunit.extensibility.core": "[2.4.1]" + "xunit.extensibility.core": "[2.4.2]" } }, "monai.deploy.workflowmanager": { @@ -1681,7 +1681,7 @@ "dependencies": { "Ardalis.GuardClauses": "[4.0.1, )", "Karambolo.Extensions.Logging.File": "[3.3.1, )", - "Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[6.0.7, )", + "Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[6.0.8, )", "Microsoft.AspNetCore.Mvc.Versioning": "[5.0.0, )", "Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer": "[5.0.0, )", "Microsoft.EntityFrameworkCore": "[6.0.8, )", @@ -1748,7 +1748,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.187, )", + "AWSSDK.SecurityToken": "[3.7.1.191, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", "MongoDB.Bson": "[2.17.1, )", @@ -1808,7 +1808,7 @@ "monai.deploy.workloadmanager.workfowexecuter": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.187, )", + "AWSSDK.SecurityToken": "[3.7.1.191, )", "Ardalis.GuardClauses": "[4.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", "Monai.Deploy.Storage": "[0.2.1, )", From 79a352ea66f3d6eccd66f7a9245f71e14f4a6cd6 Mon Sep 17 00:00:00 2001 From: Neil South Date: Fri, 2 Sep 2022 18:37:34 +0100 Subject: [PATCH 2/9] adding serilog to enable logging to elastic Signed-off-by: Neil South --- src/WorkflowManager/Logging/LoggerHelpers.cs | 70 ---- src/WorkflowManager/Logging/Logging/Log.cs | 46 +-- .../Logging/Models/ObjectLog.cs | 29 -- .../Monai.Deploy.WorkflowManager.csproj | 211 +++++++------ .../WorkflowManager/Program.cs | 11 +- .../Properties/launchSettings.json | 4 +- .../WorkflowManager/Services/Http/Startup.cs | 3 + .../appsettings.Development.json | 15 - .../WorkflowManager/appsettings.Local.json | 54 +++- .../WorkflowManager/appsettings.json | 56 +++- .../WorkflowManager/packages.lock.json | 298 +++++++++--------- .../WorkflowManager.Tests/packages.lock.json | 140 ++++++++ 12 files changed, 504 insertions(+), 433 deletions(-) delete mode 100644 src/WorkflowManager/Logging/LoggerHelpers.cs delete mode 100644 src/WorkflowManager/Logging/Models/ObjectLog.cs diff --git a/src/WorkflowManager/Logging/LoggerHelpers.cs b/src/WorkflowManager/Logging/LoggerHelpers.cs deleted file mode 100644 index 0b92d268a..000000000 --- a/src/WorkflowManager/Logging/LoggerHelpers.cs +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright 2021-2022 MONAI Consortium - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -using Monai.Deploy.WorkflowManager.Contracts.Models; - -namespace Monai.Deploy.WorkflowManager.Logging -{ - public static class LoggerHelpers - { - public static object ToTaskCompleteObject(TaskExecution task, WorkflowInstance workflowInstance, PatientDetails patientDetails, string correlationId, string taskStatus) - { - return new - { - ExecutionId = task.ExecutionId, - TaskId = task.TaskId, - WorkflowInstanceId = workflowInstance.Id, - WorkflowId = workflowInstance.WorkflowId, - CorrelationId = correlationId, - TaskStatus = taskStatus, - TaskType = task.TaskType, - TaskStartTime = task.TaskStartTime, - TaskEndTime = DateTime.UtcNow, - TaskStatsObject = task.ExecutionStats, - PatientDetails = patientDetails - }; - } - - public static object ToLogControllerStartObject(string httpType, string path, string queryString, object body, string version, string environment) - { - return new - { - StartTime = DateTime.UtcNow, - HttpType = httpType, - path = path, - queryString = queryString, - body = body, - version = version, - environment = environment - }; - } - - public static object ToLogControllerEndObject(string httpType, string path, string queryString, string statusCode, object result, string version, string environment) - { - return new - { - EndTime = DateTime.UtcNow, - HttpType = httpType, - path = path, - queryString = queryString, - statusCode = statusCode, - result = result, - version = version, - environment = environment - }; - } - } -} diff --git a/src/WorkflowManager/Logging/Logging/Log.cs b/src/WorkflowManager/Logging/Logging/Log.cs index 02b4f064e..678f3c253 100644 --- a/src/WorkflowManager/Logging/Logging/Log.cs +++ b/src/WorkflowManager/Logging/Logging/Log.cs @@ -18,7 +18,6 @@ using Microsoft.AspNetCore.Mvc.Filters; using Microsoft.Extensions.Logging; using Monai.Deploy.WorkflowManager.Contracts.Models; -using Monai.Deploy.WorkflowManager.Logging.Models; using Newtonsoft.Json; namespace Monai.Deploy.WorkflowManager.Logging.Logging @@ -108,36 +107,31 @@ public static partial class Log public static void TaskComplete(this ILogger logger, TaskExecution task, WorkflowInstance workflowInstance, PatientDetails patientDetails, string correlationId, string taskStatus) { - var objectLog = new ObjectLog - { - Message = "Task Complete", - Object = LoggerHelpers.ToTaskCompleteObject(task, workflowInstance, patientDetails, correlationId, taskStatus) - }; - - var jsonString = JsonConvert.SerializeObject(objectLog); - - logger.LogInformation(28, message: jsonString); + logger.LogInformation("TaskComplete Task {task}, workflowInstance {workflowInstance}, patientDetails {patientDetails}, correlationId {correlationId}, taskStatus {taskStatus}", + JsonConvert.SerializeObject(task), JsonConvert.SerializeObject(workflowInstance), JsonConvert.SerializeObject(patientDetails), correlationId, taskStatus); } public static void LogControllerStartTime(this ILogger logger, ActionExecutingContext context) { var request = context.HttpContext.Request; - var body = context.ActionArguments.FirstOrDefault(); - var objectLog = new ObjectLog - { - Message = "ControllerActionStart", - Object = LoggerHelpers.ToLogControllerStartObject(request.Method, request.Path, request.QueryString.Value.ToString(), body.Value ?? "", "", "") - }; - - var jsonString = JsonConvert.SerializeObject(objectLog); - - logger.LogInformation(29, message: jsonString); + var correlationId = request.Headers["correlationId"].FirstOrDefault() ?? Guid.NewGuid().ToString(); + var body = JsonConvert.SerializeObject(context.ActionArguments.FirstOrDefault()); + var startTime = DateTime.UtcNow; + context.HttpContext.Items["startTime"] = startTime; + context.HttpContext.Items["correlationId"] = correlationId; + + logger.LogInformation("ControllerActionStart data StartTime {starttime}, HttpType {httptype}, Path {path}, QueryString {querystring}, Body {body}, CorrelationId {correlationId}", + startTime, request.Method, request.Path, request.QueryString.Value.ToString(), body, correlationId); } public static void LogControllerEndTime(this ILogger logger, ResultExecutedContext context) { var request = context.HttpContext.Request; var response = context.HttpContext.Response; + var correlationId = context.HttpContext.Items["correlationId"] ?? "NotFound"; + + var startTime = context.HttpContext.Items["startTime"] as DateTime? ?? DateTime.UtcNow; + var endtime = DateTime.UtcNow; var objResult = new ObjectResult(""); @@ -146,15 +140,9 @@ public static void LogControllerEndTime(this ILogger logger, ResultExecutedConte objResult = (ObjectResult)context.Result; } - var objectLog = new ObjectLog - { - Message = "ControllerActionEnd", - Object = LoggerHelpers.ToLogControllerEndObject(request.Method, request.Path, request.QueryString.Value.ToString(), response.StatusCode.ToString(), objResult?.Value ?? "", "", "") - }; - - var jsonString = JsonConvert.SerializeObject(objectLog); - - logger.LogInformation(29, message: jsonString); + logger.LogInformation("ControllerActionEnd data StartTime {starttime}, EndTime {endtime}, Duration {duration}, HttpType {httptype}, Path {path}, QueryString {querystring}, StatusCode {statuscode}, Result {result}, CorrelationId {correlationId}", + startTime, endtime, (endtime - startTime).TotalMilliseconds, request.Method, request.Path, + request.QueryString.Value.ToString(), response.StatusCode, JsonConvert.SerializeObject(objResult), correlationId); } } } diff --git a/src/WorkflowManager/Logging/Models/ObjectLog.cs b/src/WorkflowManager/Logging/Models/ObjectLog.cs deleted file mode 100644 index 92abfddaf..000000000 --- a/src/WorkflowManager/Logging/Models/ObjectLog.cs +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2021-2022 MONAI Consortium - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -using Newtonsoft.Json; - -namespace Monai.Deploy.WorkflowManager.Logging.Models -{ - public class ObjectLog - { - [JsonProperty(PropertyName = "message")] - public string Message { get; set; } - - [JsonProperty(PropertyName = "object")] - public object Object { get; set; } - } -} diff --git a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj index c5acec9bf..9b5e70f5a 100644 --- a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj +++ b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj @@ -1,106 +1,109 @@ - - - - - Exe - net6.0 - Monai.Deploy.WorkflowManager - false - false - - - - - - - - - - + + + + + Exe + net6.0 + Monai.Deploy.WorkflowManager + false + false + + + + + + + + + + - - - - - - - - - - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - - - - - - - - Always - - - Always - - - PreserveNewest - - - - - true - true - ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + + + + + + + + + Always + + + Always + + + PreserveNewest + + + + + true + true + ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset + + + + + + + + + + + + + + + + + + + diff --git a/src/WorkflowManager/WorkflowManager/Program.cs b/src/WorkflowManager/WorkflowManager/Program.cs index 526936b1a..83d84e2c6 100644 --- a/src/WorkflowManager/WorkflowManager/Program.cs +++ b/src/WorkflowManager/WorkflowManager/Program.cs @@ -33,12 +33,14 @@ using Monai.Deploy.WorkflowManager.Database.Interfaces; using Monai.Deploy.WorkflowManager.Database.Options; using Monai.Deploy.WorkflowManager.Database.Repositories; -using Monai.Deploy.WorkflowManager.Logging.Attributes; using Monai.Deploy.WorkflowManager.MonaiBackgroundService; using Monai.Deploy.WorkflowManager.Services; using Monai.Deploy.WorkflowManager.Services.DataRetentionService; using Monai.Deploy.WorkflowManager.Services.Http; using MongoDB.Driver; +using Serilog; +using Serilog.Events; +using Serilog.Sinks.Elasticsearch; namespace Monai.Deploy.WorkflowManager { @@ -70,6 +72,13 @@ internal static IHostBuilder CreateHostBuilder(string[] args) => configureLogging.AddConfiguration(builderContext.Configuration.GetSection("Logging")); configureLogging.AddFile(o => o.RootPath = AppContext.BaseDirectory); }) + .UseSerilog((context, services, configuration) => configuration + .ReadFrom.Configuration(context.Configuration) + .ReadFrom.Services(services) + .MinimumLevel.Override("Microsoft", LogEventLevel.Information) + .Enrich.FromLogContext() + //.WriteTo.File("logs/myapp.txt", rollingInterval: RollingInterval.Day) + .WriteTo.Console()) .ConfigureServices((hostContext, services) => { ConfigureServices(hostContext, services); diff --git a/src/WorkflowManager/WorkflowManager/Properties/launchSettings.json b/src/WorkflowManager/WorkflowManager/Properties/launchSettings.json index bc0fc05a7..0e01b1424 100644 --- a/src/WorkflowManager/WorkflowManager/Properties/launchSettings.json +++ b/src/WorkflowManager/WorkflowManager/Properties/launchSettings.json @@ -4,7 +4,9 @@ "commandName": "Project", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Local", - "WorkflowManager__messaging__subscriberSettings__endpoint": "localhost" + "WorkflowManager__messaging__subscriberSettings__endpoint": "localhost", + "Serilog__WriteTo__0__Args__indexFormat": "index-monai{0:yyyy.MM}", + "Serilog__WriteTo__0__Args__nodeUris": "http://localhost:9200" } }, "WSL": { diff --git a/src/WorkflowManager/WorkflowManager/Services/Http/Startup.cs b/src/WorkflowManager/WorkflowManager/Services/Http/Startup.cs index 34bbc90c0..d052b6b44 100644 --- a/src/WorkflowManager/WorkflowManager/Services/Http/Startup.cs +++ b/src/WorkflowManager/WorkflowManager/Services/Http/Startup.cs @@ -24,6 +24,7 @@ using Monai.Deploy.WorkflowManager.Authentication.Extensions; using Monai.Deploy.WorkflowManager.Logging.Attributes; using Newtonsoft.Json.Converters; +using Serilog; namespace Monai.Deploy.WorkflowManager.Services.Http { @@ -107,6 +108,8 @@ public static void Configure(IApplicationBuilder app, IWebHostEnvironment env) app.UseAuthorization(); app.UseEndpointAuthorizationMiddleware(); + app.UseSerilogRequestLogging(); + app.UseEndpoints(endpoints => { endpoints.MapControllers(); diff --git a/src/WorkflowManager/WorkflowManager/appsettings.Development.json b/src/WorkflowManager/WorkflowManager/appsettings.Development.json index 3b8c6843f..f596b3001 100644 --- a/src/WorkflowManager/WorkflowManager/appsettings.Development.json +++ b/src/WorkflowManager/WorkflowManager/appsettings.Development.json @@ -113,21 +113,6 @@ "TimestampFormat": " HH:mm:ss ", "UseUtcTimestamp": true } - }, - "File": { - "BasePath": "Logs", - "FileEncodingName": "utf-8", - "DateFormat": "yyyyMMdd", - "CounterFormat": "000", - "MaxFileSize": 10485760, - "IncludeScopes": true, - "MaxQueueSize": 100, - "TextBuilderType": "Monai.Deploy.WorkflowManager.Configuration.Logging.FileLoggingTextFormatter, Monai.Deploy.WorkflowManager.Configuration", - "Files": [ - { - "Path": "MWM--.log" - } - ] } }, "Kestrel": { diff --git a/src/WorkflowManager/WorkflowManager/appsettings.Local.json b/src/WorkflowManager/WorkflowManager/appsettings.Local.json index ce1487f5c..e8e32e721 100644 --- a/src/WorkflowManager/WorkflowManager/appsettings.Local.json +++ b/src/WorkflowManager/WorkflowManager/appsettings.Local.json @@ -115,22 +115,46 @@ "TimestampFormat": " HH:mm:ss ", "UseUtcTimestamp": true } - }, - "File": { - "BasePath": "Logs", - "FileEncodingName": "utf-8", - "DateFormat": "yyyyMMdd", - "CounterFormat": "000", - "MaxFileSize": 10485760, - "IncludeScopes": true, - "MaxQueueSize": 100, - "TextBuilderType": "Monai.Deploy.WorkflowManager.Configuration.Logging.FileLoggingTextFormatter, Monai.Deploy.WorkflowManager.Configuration", - "Files": [ - { - "Path": "MWM--.log" + }//, + //"File": { + // "BasePath": "Logs", + // "FileEncodingName": "utf-8", + // "DateFormat": "yyyyMMdd", + // "CounterFormat": "000", + // "MaxFileSize": 10485760, + // "IncludeScopes": true, + // "MaxQueueSize": 100, + // "TextBuilderType": "Monai.Deploy.WorkflowManager.Configuration.Logging.FileLoggingTextFormatter, Monai.Deploy.WorkflowManager.Configuration", + // "Files": [ + // { + // "Path": "MWM--.log" + // } + // ] + //} + }, + "Serilog": { + "WriteTo": [ + { + "Name": "Elasticsearch", + "Args": { + //"nodeUris": "http://localhost:9200", + "indexFormat": "index-monai{0:yyyy.MM}", + "bufferBaseFilename": "logs/elasticBuffer", + "restrictedToMinimumLevel": "Verbose" } - ] - } + }, + { + "Name": "File", + "Args": { + "path": "logs/MWM_.txt", + "rollingInterval": "Day", + "rollOnFileSizeLimit": true, + "fileSizeLimitBytes": "10485760", + "retainedFileCountLimit": 30, + "formatter": "Serilog.Formatting.Json.JsonFormatter, Serilog" + } + } + ] }, "Kestrel": { "EndPoints": { diff --git a/src/WorkflowManager/WorkflowManager/appsettings.json b/src/WorkflowManager/WorkflowManager/appsettings.json index 82290dd7f..bce7454cc 100644 --- a/src/WorkflowManager/WorkflowManager/appsettings.json +++ b/src/WorkflowManager/WorkflowManager/appsettings.json @@ -119,22 +119,50 @@ "UseUtcTimestamp": true } }, - "File": { - "BasePath": "Logs", - "FileEncodingName": "utf-8", - "DateFormat": "yyyyMMdd", - "CounterFormat": "000", - "MaxFileSize": 10485760, - "IncludeScopes": true, - "MaxQueueSize": 100, - "TextBuilderType": "Monai.Deploy.WorkflowManager.Configuration.Logging.FileLoggingTextFormatter, Monai.Deploy.WorkflowManager.Configuration", - "Files": [ - { - "Path": "MWM--.log" + //"File": { + // "BasePath": "Logs", + // "FileEncodingName": "utf-8", + // "DateFormat": "yyyyMMdd", + // "CounterFormat": "000", + // "MaxFileSize": 10485760, + // "IncludeScopes": true, + // "MaxQueueSize": 100, + // "TextBuilderType": "Monai.Deploy.WorkflowManager.Configuration.Logging.FileLoggingTextFormatter, Monai.Deploy.WorkflowManager.Configuration", + // "Files": [ + // { + // "Path": "MWM--.log" + // } + // ] + //} + }, + "Serilog": { + "WriteTo": [ + { + "Name": "File", + "Args": { + "path": "logs/MWM-.txt", + "rollingInterval": "Day", + "rollOnFileSizeLimit": true, + "fileSizeLimitBytes": "10485760", + "retainedFileCountLimit": 30, + "formatter": "Serilog.Formatting.Json.JsonFormatter, Serilog" } - ] - } + } + ] }, + //"Serilog": { + // "WriteTo": [ + // { + // "Name": "Elasticsearch", + // "Args": { + // "nodeUris": "http://localhost:9200", + // "indexFormat": "index-monai{0:yyyy.MM}", + // "bufferBaseFilename": "logs/elasticBuffer", + // "restrictedToMinimumLevel": "Verbose" + // } + // } + // ] + //}, "Kestrel": { "EndPoints": { "Http": { diff --git a/src/WorkflowManager/WorkflowManager/packages.lock.json b/src/WorkflowManager/WorkflowManager/packages.lock.json index 5a8289411..8bdddd0a7 100644 --- a/src/WorkflowManager/WorkflowManager/packages.lock.json +++ b/src/WorkflowManager/WorkflowManager/packages.lock.json @@ -166,6 +166,45 @@ "resolved": "13.0.1", "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, + "Serilog": { + "type": "Direct", + "requested": "[2.11.0, )", + "resolved": "2.11.0", + "contentHash": "ysv+hBzTul6Dp+Hvm10FlhJO3yMQcFKSAleus+LpiIzvNstpeV4Z7gGuIZ1OPNfIMulSHOjmLuGAEDKzpnV8ZQ==" + }, + "Serilog.AspNetCore": { + "type": "Direct", + "requested": "[6.0.1, )", + "resolved": "6.0.1", + "contentHash": "5XW90k62V7G9I0D/j9Iz+NyRBB6/SnoFpHUPeLnV40gONV2vs2A/ewWi91QVjQmyHBfzFeqIrkvE/DJMZ0alTg==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection": "5.0.0", + "Microsoft.Extensions.Logging": "5.0.0", + "Serilog": "2.10.0", + "Serilog.Extensions.Hosting": "5.0.1", + "Serilog.Formatting.Compact": "1.1.0", + "Serilog.Settings.Configuration": "3.3.0", + "Serilog.Sinks.Console": "4.0.1", + "Serilog.Sinks.Debug": "2.0.0", + "Serilog.Sinks.File": "5.0.0" + } + }, + "Serilog.Sinks.Elasticsearch": { + "type": "Direct", + "requested": "[8.4.1, )", + "resolved": "8.4.1", + "contentHash": "SM17WdHUshJSm44uC45jEUW4Wzp9wCltbWry5iY5fNgxJ3PkIkW6I8p+WviU5lx/bayCvAoB5uO07UK2qjBSAQ==", + "dependencies": { + "Elasticsearch.Net": "7.8.1", + "Microsoft.CSharp": "4.6.0", + "Serilog": "2.8.0", + "Serilog.Formatting.Compact": "1.0.0", + "Serilog.Formatting.Elasticsearch": "8.4.1", + "Serilog.Sinks.File": "4.0.0", + "Serilog.Sinks.PeriodicBatching": "2.1.1", + "System.Diagnostics.DiagnosticSource": "4.5.1" + } + }, "StyleCop.Analyzers": { "type": "Direct", "requested": "[1.1.118, )", @@ -213,6 +252,16 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Elasticsearch.Net": { + "type": "Transitive", + "resolved": "7.8.1", + "contentHash": "vGHlxY72LH8/DcKb/QDpvrIelQIUFxNnXa+HmS/ifX7M7dgwmTpA2i4SagQ65gg7oi088cteUuDl4fKIystg7Q==", + "dependencies": { + "Microsoft.CSharp": "4.6.0", + "System.Buffers": "4.5.0", + "System.Diagnostics.DiagnosticSource": "4.5.1" + } + }, "JetBrains.Annotations": { "type": "Transitive", "resolved": "2021.3.0", @@ -405,21 +454,6 @@ "resolved": "4.7.0", "contentHash": "pTj+D3uJWyN3My70i2Hqo+OXixq3Os2D1nJ2x92FFo6sk8fYS1m1WLNTs0Dc1uPaViH0YvEEwvzddQ7y4rhXmA==" }, - "Microsoft.DotNet.PlatformAbstractions": { - "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "9KPDwvb/hLEVXYruVHVZ8BkebC8j17DmPb56LnqRF74HqSPLjCkrlFUjOtFpQPA2DeADBRTI/e69aCfRBfrhxw==", - "dependencies": { - "System.AppContext": "4.1.0", - "System.Collections": "4.0.11", - "System.IO": "4.1.0", - "System.IO.FileSystem": "4.0.1", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0" - } - }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", "resolved": "6.0.8", @@ -544,14 +578,10 @@ }, "Microsoft.Extensions.DependencyModel": { "type": "Transitive", - "resolved": "2.1.0", - "contentHash": "nS2XKqi+1A1umnYNLX2Fbm/XnzCxs5i+zXVJ3VC6r9t2z0NZr9FLnJN4VQpKigdcWH/iFTbMuX6M6WQJcTjVIg==", + "resolved": "3.0.0", + "contentHash": "Iaectmzg9Dc4ZbKX/FurrRjgO/I8rTumL5UU+Uube6vZuGetcnXoIgTA94RthFWePhdMVm8MMhVFJZdbzMsdyQ==", "dependencies": { - "Microsoft.DotNet.PlatformAbstractions": "2.1.0", - "Newtonsoft.Json": "9.0.1", - "System.Diagnostics.Debug": "4.0.11", - "System.Dynamic.Runtime": "4.0.11", - "System.Linq": "4.1.0" + "System.Text.Json": "4.6.0" } }, "Microsoft.Extensions.FileProviders.Abstractions": { @@ -950,6 +980,87 @@ "resolved": "4.3.2", "contentHash": "leXiwfiIkW7Gmn7cgnNcdtNAU70SjmKW3jxGj1iKHOvdn0zRWsgv/l2OJUO5zdGdiv2VRFnAsxxhDgMzofPdWg==" }, + "Serilog.Extensions.Hosting": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "o0VUyt3npAqOJaZ6CiWLFeLYs3CYJwfcAqaUqprzsmj7qYIvorcn8cZLVR8AQX6vzX7gee2bD0sQeA17iO2/Aw==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.8", + "Microsoft.Extensions.Hosting.Abstractions": "3.1.8", + "Microsoft.Extensions.Logging.Abstractions": "3.1.8", + "Serilog": "2.10.0", + "Serilog.Extensions.Logging": "3.1.0" + } + }, + "Serilog.Extensions.Logging": { + "type": "Transitive", + "resolved": "3.1.0", + "contentHash": "IWfem7wfrFbB3iw1OikqPFNPEzfayvDuN4WP7Ue1AVFskalMByeWk3QbtUXQR34SBkv1EbZ3AySHda/ErDgpcg==", + "dependencies": { + "Microsoft.Extensions.Logging": "2.0.0", + "Serilog": "2.9.0" + } + }, + "Serilog.Formatting.Compact": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "pNroKVjo+rDqlxNG5PXkRLpfSCuDOBY0ri6jp9PLe505ljqwhwZz8ospy2vWhQlFu5GkIesh3FcDs4n7sWZODA==", + "dependencies": { + "Serilog": "2.8.0" + } + }, + "Serilog.Formatting.Elasticsearch": { + "type": "Transitive", + "resolved": "8.4.1", + "contentHash": "768KS00+XwQSxVIYKJ4KWdqyLd5/w3DKndf+94U8NCk7qpXCeZl4HlczsDeyVsNPTyRF6MVss6Wr9uj4rhprfA==", + "dependencies": { + "Serilog": "2.8.0" + } + }, + "Serilog.Settings.Configuration": { + "type": "Transitive", + "resolved": "3.3.0", + "contentHash": "7GNudISZwqaT902hqEL2OFGTZeUFWfnrNLupJkOqeF41AR3GjcxX+Hwb30xb8gG2/CDXsCMVfF8o0+8KY0fJNg==", + "dependencies": { + "Microsoft.Extensions.DependencyModel": "3.0.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "2.0.0", + "Serilog": "2.10.0" + } + }, + "Serilog.Sinks.Console": { + "type": "Transitive", + "resolved": "4.0.1", + "contentHash": "apLOvSJQLlIbKlbx+Y2UDHSP05kJsV7mou+fvJoRGs/iR+jC22r8cuFVMjjfVxz/AD4B2UCltFhE1naRLXwKNw==", + "dependencies": { + "Serilog": "2.10.0" + } + }, + "Serilog.Sinks.Debug": { + "type": "Transitive", + "resolved": "2.0.0", + "contentHash": "Y6g3OBJ4JzTyyw16fDqtFcQ41qQAydnEvEqmXjhwhgjsnG/FaJ8GUqF5ldsC/bVkK8KYmqrPhDO+tm4dF6xx4A==", + "dependencies": { + "Serilog": "2.10.0" + } + }, + "Serilog.Sinks.File": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "uwV5hdhWPwUH1szhO8PJpFiahqXmzPzJT/sOijH/kFgUx+cyoDTMM8MHD0adw9+Iem6itoibbUXHYslzXsLEAg==", + "dependencies": { + "Serilog": "2.10.0" + } + }, + "Serilog.Sinks.PeriodicBatching": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "L1iZtcEzQdEIYCPvhYJYB2RofPg+i1NhHJfS+DpXLyLSMS6OXebqaI1fxWhmJRIjD9D9BuXi23FkZTQDiP7cHw==", + "dependencies": { + "Serilog": "2.0.0", + "System.Collections.Concurrent": "4.0.12", + "System.Threading.Timer": "4.0.1" + } + }, "SharpCompress": { "type": "Transitive", "resolved": "0.30.1", @@ -976,14 +1087,6 @@ "resolved": "6.4.0", "contentHash": "1Hh3atb3pi8c+v7n4/3N80Jj8RvLOXgWxzix6w3OZhB7zBGRwsy7FWr4e3hwgPweSBpwfElqj4V4nkjYabH9nQ==" }, - "System.AppContext": { - "type": "Transitive", - "resolved": "4.1.0", - "contentHash": "3QjO4jNV7PdKkmQAVp9atA+usVnKRwI3Kx1nMwJ93T0LcQfx7pKAYk0nKz5wn1oP5iqlhZuy6RXOFdhr7rDwow==", - "dependencies": { - "System.Runtime": "4.1.0" - } - }, "System.Buffers": { "type": "Transitive", "resolved": "4.5.1", @@ -1062,28 +1165,6 @@ "System.Runtime": "4.3.0" } }, - "System.Dynamic.Runtime": { - "type": "Transitive", - "resolved": "4.0.11", - "contentHash": "db34f6LHYM0U0JpE+sOmjar27BnqTVkbLJhgfwMpTdgTigG/Hna3m2MYVwnFzGGKnEJk2UXFuoVTr8WUbU91/A==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Globalization": "4.0.11", - "System.Linq": "4.1.0", - "System.Linq.Expressions": "4.1.0", - "System.ObjectModel": "4.0.12", - "System.Reflection": "4.1.0", - "System.Reflection.Emit": "4.0.1", - "System.Reflection.Emit.ILGeneration": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Threading": "4.0.11" - } - }, "System.Globalization": { "type": "Transitive", "resolved": "4.3.0", @@ -1179,30 +1260,6 @@ "System.Runtime.Extensions": "4.3.0" } }, - "System.Linq.Expressions": { - "type": "Transitive", - "resolved": "4.1.0", - "contentHash": "I+y02iqkgmCAyfbqOmSDOgqdZQ5tTj80Akm5BPSS8EeB0VGWdy6X1KCoYe8Pk6pwDoAKZUOdLVxnTJcExiv5zw==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Globalization": "4.0.11", - "System.IO": "4.1.0", - "System.Linq": "4.1.0", - "System.ObjectModel": "4.0.12", - "System.Reflection": "4.1.0", - "System.Reflection.Emit": "4.0.1", - "System.Reflection.Emit.ILGeneration": "4.0.1", - "System.Reflection.Emit.Lightweight": "4.0.1", - "System.Reflection.Extensions": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.Extensions": "4.1.0", - "System.Threading": "4.0.11" - } - }, "System.Memory": { "type": "Transitive", "resolved": "4.5.4", @@ -1252,18 +1309,6 @@ "System.Runtime.Handles": "4.3.0" } }, - "System.ObjectModel": { - "type": "Transitive", - "resolved": "4.0.12", - "contentHash": "tAgJM1xt3ytyMoW4qn4wIqgJYm7L7TShRZG4+Q4Qsi2PCcj96pXN7nRywS9KkB3p/xDUjc2HSwP9SROyPYDYKQ==", - "dependencies": { - "System.Collections": "4.0.11", - "System.Diagnostics.Debug": "4.0.11", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Threading": "4.0.11" - } - }, "System.Reactive": { "type": "Transitive", "resolved": "5.0.0", @@ -1290,50 +1335,6 @@ "System.Runtime": "4.3.0" } }, - "System.Reflection.Emit": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "P2wqAj72fFjpP6wb9nSfDqNBMab+2ovzSDzUZK7MVIm54tBJEPr9jWfSjjoTpPwj1LeKcmX3vr0ttyjSSFM47g==", - "dependencies": { - "System.IO": "4.1.0", - "System.Reflection": "4.1.0", - "System.Reflection.Emit.ILGeneration": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Runtime": "4.1.0" - } - }, - "System.Reflection.Emit.ILGeneration": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "Ov6dU8Bu15Bc7zuqttgHF12J5lwSWyTf1S+FJouUXVMSqImLZzYaQ+vRr1rQ0OZ0HqsrwWl4dsKHELckQkVpgA==", - "dependencies": { - "System.Reflection": "4.1.0", - "System.Reflection.Primitives": "4.0.1", - "System.Runtime": "4.1.0" - } - }, - "System.Reflection.Emit.Lightweight": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "sSzHHXueZ5Uh0OLpUQprhr+ZYJrLPA2Cmr4gn0wj9+FftNKXx8RIMKvO9qnjk2ebPYUjZ+F2ulGdPOsvj+MEjA==", - "dependencies": { - "System.Reflection": "4.1.0", - "System.Reflection.Emit.ILGeneration": "4.0.1", - "System.Reflection.Primitives": "4.0.1", - "System.Runtime": "4.1.0" - } - }, - "System.Reflection.Extensions": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "GYrtRsZcMuHF3sbmRHfMYpvxZoIN2bQGrYGerUiWLEkqdEUQZhH3TRSaC/oI4wO0II1RKBPlpIa1TOMxIcOOzQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Reflection": "4.1.0", - "System.Runtime": "4.1.0" - } - }, "System.Reflection.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -1344,15 +1345,6 @@ "System.Runtime": "4.3.0" } }, - "System.Reflection.TypeExtensions": { - "type": "Transitive", - "resolved": "4.1.0", - "contentHash": "tsQ/ptQ3H5FYfON8lL4MxRk/8kFyE0A+tGPXmVP967cT/gzLHYxIejIYSxp4JmIeFHVP78g/F2FE1mUUTbDtrg==", - "dependencies": { - "System.Reflection": "4.1.0", - "System.Runtime": "4.1.0" - } - }, "System.Resources.ResourceManager": { "type": "Transitive", "resolved": "4.3.0", @@ -1412,20 +1404,6 @@ "System.Runtime.Handles": "4.3.0" } }, - "System.Runtime.InteropServices.RuntimeInformation": { - "type": "Transitive", - "resolved": "4.0.0", - "contentHash": "hWPhJxc453RCa8Z29O91EmfGeZIHX1ZH2A8L6lYQVSaKzku2DfArSfMEb1/MYYzPQRJZeu0c9dmYeJKxW5Fgng==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "System.Reflection": "4.1.0", - "System.Resources.ResourceManager": "4.0.1", - "System.Runtime": "4.1.0", - "System.Runtime.InteropServices": "4.1.0", - "System.Threading": "4.0.11", - "runtime.native.System": "4.0.0" - } - }, "System.Runtime.Numerics": { "type": "Transitive", "resolved": "4.3.0", @@ -1638,6 +1616,16 @@ "resolved": "4.5.4", "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" }, + "System.Threading.Timer": { + "type": "Transitive", + "resolved": "4.0.1", + "contentHash": "saGfUV8uqVW6LeURiqxcGhZ24PzuRNaUBtbhVeuUAvky1naH395A/1nY0P2bWvrw/BreRtIB/EzTDkGBpqCwEw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1", + "Microsoft.NETCore.Targets": "1.0.1", + "System.Runtime": "4.1.0" + } + }, "System.ValueTuple": { "type": "Transitive", "resolved": "4.4.0", diff --git a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json index 9823196dc..f769cf626 100644 --- a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json +++ b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json @@ -134,6 +134,16 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Elasticsearch.Net": { + "type": "Transitive", + "resolved": "7.8.1", + "contentHash": "vGHlxY72LH8/DcKb/QDpvrIelQIUFxNnXa+HmS/ifX7M7dgwmTpA2i4SagQ65gg7oi088cteUuDl4fKIystg7Q==", + "dependencies": { + "Microsoft.CSharp": "4.6.0", + "System.Buffers": "4.5.0", + "System.Diagnostics.DiagnosticSource": "4.5.1" + } + }, "Fare": { "type": "Transitive", "resolved": "2.1.1", @@ -1037,6 +1047,123 @@ "resolved": "4.3.2", "contentHash": "leXiwfiIkW7Gmn7cgnNcdtNAU70SjmKW3jxGj1iKHOvdn0zRWsgv/l2OJUO5zdGdiv2VRFnAsxxhDgMzofPdWg==" }, + "Serilog": { + "type": "Transitive", + "resolved": "2.11.0", + "contentHash": "ysv+hBzTul6Dp+Hvm10FlhJO3yMQcFKSAleus+LpiIzvNstpeV4Z7gGuIZ1OPNfIMulSHOjmLuGAEDKzpnV8ZQ==" + }, + "Serilog.AspNetCore": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "5XW90k62V7G9I0D/j9Iz+NyRBB6/SnoFpHUPeLnV40gONV2vs2A/ewWi91QVjQmyHBfzFeqIrkvE/DJMZ0alTg==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection": "5.0.0", + "Microsoft.Extensions.Logging": "5.0.0", + "Serilog": "2.10.0", + "Serilog.Extensions.Hosting": "5.0.1", + "Serilog.Formatting.Compact": "1.1.0", + "Serilog.Settings.Configuration": "3.3.0", + "Serilog.Sinks.Console": "4.0.1", + "Serilog.Sinks.Debug": "2.0.0", + "Serilog.Sinks.File": "5.0.0" + } + }, + "Serilog.Extensions.Hosting": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "o0VUyt3npAqOJaZ6CiWLFeLYs3CYJwfcAqaUqprzsmj7qYIvorcn8cZLVR8AQX6vzX7gee2bD0sQeA17iO2/Aw==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.8", + "Microsoft.Extensions.Hosting.Abstractions": "3.1.8", + "Microsoft.Extensions.Logging.Abstractions": "3.1.8", + "Serilog": "2.10.0", + "Serilog.Extensions.Logging": "3.1.0" + } + }, + "Serilog.Extensions.Logging": { + "type": "Transitive", + "resolved": "3.1.0", + "contentHash": "IWfem7wfrFbB3iw1OikqPFNPEzfayvDuN4WP7Ue1AVFskalMByeWk3QbtUXQR34SBkv1EbZ3AySHda/ErDgpcg==", + "dependencies": { + "Microsoft.Extensions.Logging": "2.0.0", + "Serilog": "2.9.0" + } + }, + "Serilog.Formatting.Compact": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "pNroKVjo+rDqlxNG5PXkRLpfSCuDOBY0ri6jp9PLe505ljqwhwZz8ospy2vWhQlFu5GkIesh3FcDs4n7sWZODA==", + "dependencies": { + "Serilog": "2.8.0" + } + }, + "Serilog.Formatting.Elasticsearch": { + "type": "Transitive", + "resolved": "8.4.1", + "contentHash": "768KS00+XwQSxVIYKJ4KWdqyLd5/w3DKndf+94U8NCk7qpXCeZl4HlczsDeyVsNPTyRF6MVss6Wr9uj4rhprfA==", + "dependencies": { + "Serilog": "2.8.0" + } + }, + "Serilog.Settings.Configuration": { + "type": "Transitive", + "resolved": "3.3.0", + "contentHash": "7GNudISZwqaT902hqEL2OFGTZeUFWfnrNLupJkOqeF41AR3GjcxX+Hwb30xb8gG2/CDXsCMVfF8o0+8KY0fJNg==", + "dependencies": { + "Microsoft.Extensions.DependencyModel": "3.0.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "2.0.0", + "Serilog": "2.10.0" + } + }, + "Serilog.Sinks.Console": { + "type": "Transitive", + "resolved": "4.0.1", + "contentHash": "apLOvSJQLlIbKlbx+Y2UDHSP05kJsV7mou+fvJoRGs/iR+jC22r8cuFVMjjfVxz/AD4B2UCltFhE1naRLXwKNw==", + "dependencies": { + "Serilog": "2.10.0" + } + }, + "Serilog.Sinks.Debug": { + "type": "Transitive", + "resolved": "2.0.0", + "contentHash": "Y6g3OBJ4JzTyyw16fDqtFcQ41qQAydnEvEqmXjhwhgjsnG/FaJ8GUqF5ldsC/bVkK8KYmqrPhDO+tm4dF6xx4A==", + "dependencies": { + "Serilog": "2.10.0" + } + }, + "Serilog.Sinks.Elasticsearch": { + "type": "Transitive", + "resolved": "8.4.1", + "contentHash": "SM17WdHUshJSm44uC45jEUW4Wzp9wCltbWry5iY5fNgxJ3PkIkW6I8p+WviU5lx/bayCvAoB5uO07UK2qjBSAQ==", + "dependencies": { + "Elasticsearch.Net": "7.8.1", + "Microsoft.CSharp": "4.6.0", + "Serilog": "2.8.0", + "Serilog.Formatting.Compact": "1.0.0", + "Serilog.Formatting.Elasticsearch": "8.4.1", + "Serilog.Sinks.File": "4.0.0", + "Serilog.Sinks.PeriodicBatching": "2.1.1", + "System.Diagnostics.DiagnosticSource": "4.5.1" + } + }, + "Serilog.Sinks.File": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "uwV5hdhWPwUH1szhO8PJpFiahqXmzPzJT/sOijH/kFgUx+cyoDTMM8MHD0adw9+Iem6itoibbUXHYslzXsLEAg==", + "dependencies": { + "Serilog": "2.10.0" + } + }, + "Serilog.Sinks.PeriodicBatching": { + "type": "Transitive", + "resolved": "2.1.1", + "contentHash": "L1iZtcEzQdEIYCPvhYJYB2RofPg+i1NhHJfS+DpXLyLSMS6OXebqaI1fxWhmJRIjD9D9BuXi23FkZTQDiP7cHw==", + "dependencies": { + "Serilog": "2.0.0", + "System.Collections.Concurrent": "4.0.12", + "System.Threading.Timer": "4.0.1" + } + }, "SharpCompress": { "type": "Transitive", "resolved": "0.30.1", @@ -1626,6 +1753,16 @@ "resolved": "4.5.4", "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" }, + "System.Threading.Timer": { + "type": "Transitive", + "resolved": "4.0.1", + "contentHash": "saGfUV8uqVW6LeURiqxcGhZ24PzuRNaUBtbhVeuUAvky1naH395A/1nY0P2bWvrw/BreRtIB/EzTDkGBpqCwEw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1", + "Microsoft.NETCore.Targets": "1.0.1", + "System.Runtime": "4.1.0" + } + }, "System.ValueTuple": { "type": "Transitive", "resolved": "4.4.0", @@ -1701,6 +1838,9 @@ "Monai.Deploy.WorkflowManager.MonaiBackgroundService": "[1.0.0, )", "Monai.Deploy.WorkflowManager.PayloadListener": "[1.0.0, )", "Newtonsoft.Json": "[13.0.1, )", + "Serilog": "[2.11.0, )", + "Serilog.AspNetCore": "[6.0.1, )", + "Serilog.Sinks.Elasticsearch": "[8.4.1, )", "Swashbuckle.AspNetCore": "[6.4.0, )" } }, From 94458d88155bcdf10ab9008c0bb7de6f415f3739 Mon Sep 17 00:00:00 2001 From: Neil South Date: Mon, 12 Sep 2022 08:42:07 +0100 Subject: [PATCH 3/9] logging to http tests Signed-off-by: Neil South --- .gitignore | 1 + deploy/helm/MTM.yaml | 12 +- ....Deploy.WorkflowManager.TaskManager.csproj | 205 +++++++++--------- src/TaskManager/TaskManager/Program.cs | 13 ++ .../TaskManager/appsettings.Development.json | 15 -- .../TaskManager/appsettings.Local.json | 15 -- src/TaskManager/TaskManager/appsettings.json | 37 ++-- .../TaskManager/packages.lock.json | 139 ++++++++++++ .../Monai.Deploy.WorkflowManager.csproj | 3 +- .../WorkflowManager/Program.cs | 7 +- .../WorkflowManager/appsettings.Local.json | 28 +-- .../WorkflowManager/appsettings.json | 32 +-- .../WorkflowManager/packages.lock.json | 67 ++---- .../WorkflowManager.Tests/packages.lock.json | 67 ++---- 14 files changed, 340 insertions(+), 301 deletions(-) diff --git a/.gitignore b/.gitignore index c0184ee48..7d9981739 100644 --- a/.gitignore +++ b/.gitignore @@ -577,3 +577,4 @@ GitExtensions.settings.backup *.AssemblyHooks.vb /src/WorkflowManager/mc.exe *.lutconfig +/src/TaskManager/TaskManager/Properties/launchSettings.json diff --git a/deploy/helm/MTM.yaml b/deploy/helm/MTM.yaml index c2f08a14c..79a761e5a 100644 --- a/deploy/helm/MTM.yaml +++ b/deploy/helm/MTM.yaml @@ -15,9 +15,9 @@ replicaCount: 1 image: - repository: registry.gitlab.com/answerdigital/londonai/aide/workflow-manager-images/task-manager + repository: mtm pullPolicy: IfNotPresent - tag: 2022-08-22-02 + tag: "02" imagePullSecrets: - name: gitlab-image-pull @@ -27,8 +27,12 @@ enviromentVariables: WorkflowManager__storage__settings__accessKey: "rootminio" WorkflowManager__storage__settings__accessToken: "rootminio" WorkflowManager__storage__settings__executableLocation: "mc" - WorkflowManager__messaging__publisherSettings__endpoint: "rabbitmq.monai" - WorkflowManager__messaging__subscriberSettings__endpoint: "rabbitmq.monai" + WorkflowManager__messaging__publisherSettings__endpoint: "rabbit-monai.argo" + WorkflowManager__messaging__publisherSettings__port: "5672" + WorkflowManager__messaging__subscriberSettings__endpoint: "rabbit-monai.argo" + WorkflowManager__messaging__subscriberSettings__port: "5672" + Serilog__WriteTo__0__Args__indexFormat: "index-monai{0:yyyy.MM}" + Serilog__WriteTo__0__Args__nodeUris: "http://192.168.0.22:9200" enviromentVariablesFromSecrets: secrets: diff --git a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj index fb58c61be..7973ca1ca 100644 --- a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj +++ b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj @@ -1,103 +1,106 @@ - - - - - - Exe - net6.0 - enable - enable - false - false - - - - - - - - - - - - - - - - - - - - + + + + + + Exe + net6.0 + enable + enable + false + false + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - Always - - - Always - - - PreserveNewest - - - - - true - true - ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Always + + + Always + + + PreserveNewest + + + + + true + true + ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset + + + + + + + + + + + + + + + + + + + diff --git a/src/TaskManager/TaskManager/Program.cs b/src/TaskManager/TaskManager/Program.cs index 5c4e0dc06..221738849 100644 --- a/src/TaskManager/TaskManager/Program.cs +++ b/src/TaskManager/TaskManager/Program.cs @@ -15,6 +15,7 @@ */ using System.IO.Abstractions; +using Elastic.CommonSchema.Serilog; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -28,6 +29,8 @@ using Monai.Deploy.WorkflowManager.TaskManager.Database.Options; using Monai.Deploy.WorkflowManager.TaskManager.Extensions; using MongoDB.Driver; +using Serilog; +using Serilog.Events; namespace Monai.Deploy.WorkflowManager.TaskManager { @@ -63,6 +66,16 @@ public static IHostBuilder CreateHostBuilder(string[] args) => configureLogging.AddConfiguration(builderContext.Configuration.GetSection("Logging")); configureLogging.AddFile(o => o.RootPath = AppContext.BaseDirectory); }) + .UseSerilog((context, services, configuration) => configuration + .ReadFrom.Configuration(context.Configuration) + .ReadFrom.Services(services) + .MinimumLevel.Override("Microsoft", LogEventLevel.Information) + .Enrich.FromLogContext() + .WriteTo.File( + path: "logs/MTM-.log", + rollingInterval: RollingInterval.Day, + formatter: new EcsTextFormatter()) + .WriteTo.Console()) .ConfigureServices((hostContext, services) => { ConfigureServices(hostContext, services); diff --git a/src/TaskManager/TaskManager/appsettings.Development.json b/src/TaskManager/TaskManager/appsettings.Development.json index e3047c5a9..7c8576e07 100644 --- a/src/TaskManager/TaskManager/appsettings.Development.json +++ b/src/TaskManager/TaskManager/appsettings.Development.json @@ -90,21 +90,6 @@ "TimestampFormat": " HH:mm:ss ", "UseUtcTimestamp": true } - }, - "File": { - "BasePath": "Logs", - "FileEncodingName": "utf-8", - "DateFormat": "yyyyMMdd", - "CounterFormat": "000", - "MaxFileSize": 10485760, - "IncludeScopes": true, - "MaxQueueSize": 100, - "TextBuilderType": "Monai.Deploy.WorkflowManager.Configuration.Logging.FileLoggingTextFormatter, Monai.Deploy.WorkflowManager.Configuration", - "Files": [ - { - "Path": "MWM--.log" - } - ] } }, "Kestrel": { diff --git a/src/TaskManager/TaskManager/appsettings.Local.json b/src/TaskManager/TaskManager/appsettings.Local.json index 29a4f2dc8..2b15da962 100644 --- a/src/TaskManager/TaskManager/appsettings.Local.json +++ b/src/TaskManager/TaskManager/appsettings.Local.json @@ -92,21 +92,6 @@ "TimestampFormat": " HH:mm:ss ", "UseUtcTimestamp": true } - }, - "File": { - "BasePath": "Logs", - "FileEncodingName": "utf-8", - "DateFormat": "yyyyMMdd", - "CounterFormat": "000", - "MaxFileSize": 10485760, - "IncludeScopes": true, - "MaxQueueSize": 100, - "TextBuilderType": "Monai.Deploy.WorkflowManager.Configuration.Logging.FileLoggingTextFormatter, Monai.Deploy.WorkflowManager.Configuration", - "Files": [ - { - "Path": "MWM--.log" - } - ] } }, "Kestrel": { diff --git a/src/TaskManager/TaskManager/appsettings.json b/src/TaskManager/TaskManager/appsettings.json index bc3f2ce46..3d8f82067 100644 --- a/src/TaskManager/TaskManager/appsettings.json +++ b/src/TaskManager/TaskManager/appsettings.json @@ -94,21 +94,28 @@ "TimestampFormat": " HH:mm:ss ", "UseUtcTimestamp": true } - }, - "File": { - "BasePath": "Logs", - "FileEncodingName": "utf-8", - "DateFormat": "yyyyMMdd", - "CounterFormat": "000", - "MaxFileSize": 10485760, - "IncludeScopes": true, - "MaxQueueSize": 100, - "TextBuilderType": "Monai.Deploy.WorkflowManager.Configuration.Logging.FileLoggingTextFormatter, Monai.Deploy.WorkflowManager.Configuration", - "Files": [ - { - "Path": "MWM--.log" - } - ] } + }, + "Serilog": { + "WriteTo": [ + { + "Name": "File", + "Args": { + "path": "logs/MTM-.log", + "rollingInterval": "Day", + "rollOnFileSizeLimit": true, + "fileSizeLimitBytes": "10485760", + "retainedFileCountLimit": 30, + "formatter": "Serilog.Formatting.Json.JsonFormatter, Serilog" + } + }, + { + "Name": "Http", + "Args": { + "requestUri": "http://192.168.0.62:9200/index_settings/_doc", + "queueLimitBytes": null + } + } + ] } } diff --git a/src/TaskManager/TaskManager/packages.lock.json b/src/TaskManager/TaskManager/packages.lock.json index 2aeb560e9..7f1ded5fe 100644 --- a/src/TaskManager/TaskManager/packages.lock.json +++ b/src/TaskManager/TaskManager/packages.lock.json @@ -2,6 +2,17 @@ "version": 1, "dependencies": { "net6.0": { + "Elastic.CommonSchema.Serilog": { + "type": "Direct", + "requested": "[1.5.3, )", + "resolved": "1.5.3", + "contentHash": "bp2qHOWmN15fTKUecFMt7oCra68I1cm3yAEmwPcLuz4v2pQ5YxC8nVtyCTSSibquUS/ZPH5JInjlmuywV3UoyQ==", + "dependencies": { + "Elastic.CommonSchema": "1.5.3", + "Microsoft.AspNetCore.Http.Abstractions": "2.1.0", + "Serilog": "2.9.0" + } + }, "Karambolo.Extensions.Logging.File": { "type": "Direct", "requested": "[3.3.1, )", @@ -133,6 +144,33 @@ "Monai.Deploy.Storage.S3Policy": "0.2.1" } }, + "Serilog.AspNetCore": { + "type": "Direct", + "requested": "[6.0.1, )", + "resolved": "6.0.1", + "contentHash": "5XW90k62V7G9I0D/j9Iz+NyRBB6/SnoFpHUPeLnV40gONV2vs2A/ewWi91QVjQmyHBfzFeqIrkvE/DJMZ0alTg==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection": "5.0.0", + "Microsoft.Extensions.Logging": "5.0.0", + "Serilog": "2.10.0", + "Serilog.Extensions.Hosting": "5.0.1", + "Serilog.Formatting.Compact": "1.1.0", + "Serilog.Settings.Configuration": "3.3.0", + "Serilog.Sinks.Console": "4.0.1", + "Serilog.Sinks.Debug": "2.0.0", + "Serilog.Sinks.File": "5.0.0" + } + }, + "Serilog.Sinks.Http": { + "type": "Direct", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "eHyl2/93Roymf2eudPl/6Eeu2GQ93Ucy4GM1UPF0jyd7CIW8r+Bk5ohdbjjyjB9TQSpP2ovOuj6ltf9DjoWHtg==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "2.0.0", + "Serilog.Sinks.File": "5.0.0" + } + }, "Ardalis.GuardClauses": { "type": "Transitive", "resolved": "4.0.1", @@ -179,6 +217,14 @@ "Microsoft.Win32.Registry": "5.0.0" } }, + "Elastic.CommonSchema": { + "type": "Transitive", + "resolved": "1.5.3", + "contentHash": "JgwhfThYY/s17asUiBCUVqnZtDdGTWO/2hTPG01QDfw2+T6kfwskrj5eh6XpBZsOh6r9SpBL95vSsU+q44i7Zg==", + "dependencies": { + "System.Text.Json": "4.7.0" + } + }, "Fractions": { "type": "Transitive", "resolved": "7.0.0", @@ -238,6 +284,23 @@ "YamlDotNet": "11.2.1" } }, + "Microsoft.AspNetCore.Http.Abstractions": { + "type": "Transitive", + "resolved": "2.1.0", + "contentHash": "vbFDyKsSYBnxl3+RABtN79b0vsTcG66fDY8vD6Nqvu9uLtSej70Q5NcbGlnN6bJpZci5orSdgFTHMhBywivDPg==", + "dependencies": { + "Microsoft.AspNetCore.Http.Features": "2.1.0", + "System.Text.Encodings.Web": "4.5.0" + } + }, + "Microsoft.AspNetCore.Http.Features": { + "type": "Transitive", + "resolved": "2.1.0", + "contentHash": "UmkUePxRjsQW0j5euFFscBwjvTu25b8+qIK/2fI3GvcqQ+mkwgbWNAT8b/Gkoei1m2bTWC07lSdutuRDPPLcJA==", + "dependencies": { + "Microsoft.Extensions.Primitives": "2.1.0" + } + }, "Microsoft.CSharp": { "type": "Transitive", "resolved": "4.7.0", @@ -335,6 +398,14 @@ "resolved": "6.0.0", "contentHash": "xlzi2IYREJH3/m6+lUrQlujzX8wDitm4QGnUu6kUXTQAWPuZY8i+ticFJbzfqaetLA6KR/rO6Ew/HuYD+bxifg==" }, + "Microsoft.Extensions.DependencyModel": { + "type": "Transitive", + "resolved": "3.0.0", + "contentHash": "Iaectmzg9Dc4ZbKX/FurrRjgO/I8rTumL5UU+Uube6vZuGetcnXoIgTA94RthFWePhdMVm8MMhVFJZdbzMsdyQ==", + "dependencies": { + "System.Text.Json": "4.6.0" + } + }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", "resolved": "6.0.0", @@ -682,6 +753,74 @@ "resolved": "4.3.2", "contentHash": "leXiwfiIkW7Gmn7cgnNcdtNAU70SjmKW3jxGj1iKHOvdn0zRWsgv/l2OJUO5zdGdiv2VRFnAsxxhDgMzofPdWg==" }, + "Serilog": { + "type": "Transitive", + "resolved": "2.10.0", + "contentHash": "+QX0hmf37a0/OZLxM3wL7V6/ADvC1XihXN4Kq/p6d8lCPfgkRdiuhbWlMaFjR9Av0dy5F0+MBeDmDdRZN/YwQA==" + }, + "Serilog.Extensions.Hosting": { + "type": "Transitive", + "resolved": "5.0.1", + "contentHash": "o0VUyt3npAqOJaZ6CiWLFeLYs3CYJwfcAqaUqprzsmj7qYIvorcn8cZLVR8AQX6vzX7gee2bD0sQeA17iO2/Aw==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "3.1.8", + "Microsoft.Extensions.Hosting.Abstractions": "3.1.8", + "Microsoft.Extensions.Logging.Abstractions": "3.1.8", + "Serilog": "2.10.0", + "Serilog.Extensions.Logging": "3.1.0" + } + }, + "Serilog.Extensions.Logging": { + "type": "Transitive", + "resolved": "3.1.0", + "contentHash": "IWfem7wfrFbB3iw1OikqPFNPEzfayvDuN4WP7Ue1AVFskalMByeWk3QbtUXQR34SBkv1EbZ3AySHda/ErDgpcg==", + "dependencies": { + "Microsoft.Extensions.Logging": "2.0.0", + "Serilog": "2.9.0" + } + }, + "Serilog.Formatting.Compact": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "pNroKVjo+rDqlxNG5PXkRLpfSCuDOBY0ri6jp9PLe505ljqwhwZz8ospy2vWhQlFu5GkIesh3FcDs4n7sWZODA==", + "dependencies": { + "Serilog": "2.8.0" + } + }, + "Serilog.Settings.Configuration": { + "type": "Transitive", + "resolved": "3.3.0", + "contentHash": "7GNudISZwqaT902hqEL2OFGTZeUFWfnrNLupJkOqeF41AR3GjcxX+Hwb30xb8gG2/CDXsCMVfF8o0+8KY0fJNg==", + "dependencies": { + "Microsoft.Extensions.DependencyModel": "3.0.0", + "Microsoft.Extensions.Options.ConfigurationExtensions": "2.0.0", + "Serilog": "2.10.0" + } + }, + "Serilog.Sinks.Console": { + "type": "Transitive", + "resolved": "4.0.1", + "contentHash": "apLOvSJQLlIbKlbx+Y2UDHSP05kJsV7mou+fvJoRGs/iR+jC22r8cuFVMjjfVxz/AD4B2UCltFhE1naRLXwKNw==", + "dependencies": { + "Serilog": "2.10.0" + } + }, + "Serilog.Sinks.Debug": { + "type": "Transitive", + "resolved": "2.0.0", + "contentHash": "Y6g3OBJ4JzTyyw16fDqtFcQ41qQAydnEvEqmXjhwhgjsnG/FaJ8GUqF5ldsC/bVkK8KYmqrPhDO+tm4dF6xx4A==", + "dependencies": { + "Serilog": "2.10.0" + } + }, + "Serilog.Sinks.File": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "uwV5hdhWPwUH1szhO8PJpFiahqXmzPzJT/sOijH/kFgUx+cyoDTMM8MHD0adw9+Iem6itoibbUXHYslzXsLEAg==", + "dependencies": { + "Serilog": "2.10.0" + } + }, "SharpCompress": { "type": "Transitive", "resolved": "0.30.1", diff --git a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj index 9b5e70f5a..36b749461 100644 --- a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj +++ b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj @@ -37,6 +37,7 @@ + @@ -51,7 +52,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/WorkflowManager/WorkflowManager/Program.cs b/src/WorkflowManager/WorkflowManager/Program.cs index 83d84e2c6..7e7709f80 100644 --- a/src/WorkflowManager/WorkflowManager/Program.cs +++ b/src/WorkflowManager/WorkflowManager/Program.cs @@ -17,6 +17,7 @@ using System; using System.IO; using System.IO.Abstractions; +using Elastic.CommonSchema.Serilog; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Configuration; @@ -40,7 +41,6 @@ using MongoDB.Driver; using Serilog; using Serilog.Events; -using Serilog.Sinks.Elasticsearch; namespace Monai.Deploy.WorkflowManager { @@ -77,7 +77,10 @@ internal static IHostBuilder CreateHostBuilder(string[] args) => .ReadFrom.Services(services) .MinimumLevel.Override("Microsoft", LogEventLevel.Information) .Enrich.FromLogContext() - //.WriteTo.File("logs/myapp.txt", rollingInterval: RollingInterval.Day) + .WriteTo.File( + path: "logs/MWM-.log", + rollingInterval: RollingInterval.Day, + formatter: new EcsTextFormatter()) .WriteTo.Console()) .ConfigureServices((hostContext, services) => { diff --git a/src/WorkflowManager/WorkflowManager/appsettings.Local.json b/src/WorkflowManager/WorkflowManager/appsettings.Local.json index e8e32e721..6317c8cfb 100644 --- a/src/WorkflowManager/WorkflowManager/appsettings.Local.json +++ b/src/WorkflowManager/WorkflowManager/appsettings.Local.json @@ -115,38 +115,14 @@ "TimestampFormat": " HH:mm:ss ", "UseUtcTimestamp": true } - }//, - //"File": { - // "BasePath": "Logs", - // "FileEncodingName": "utf-8", - // "DateFormat": "yyyyMMdd", - // "CounterFormat": "000", - // "MaxFileSize": 10485760, - // "IncludeScopes": true, - // "MaxQueueSize": 100, - // "TextBuilderType": "Monai.Deploy.WorkflowManager.Configuration.Logging.FileLoggingTextFormatter, Monai.Deploy.WorkflowManager.Configuration", - // "Files": [ - // { - // "Path": "MWM--.log" - // } - // ] - //} + } }, "Serilog": { "WriteTo": [ - { - "Name": "Elasticsearch", - "Args": { - //"nodeUris": "http://localhost:9200", - "indexFormat": "index-monai{0:yyyy.MM}", - "bufferBaseFilename": "logs/elasticBuffer", - "restrictedToMinimumLevel": "Verbose" - } - }, { "Name": "File", "Args": { - "path": "logs/MWM_.txt", + "path": "logs/MWM-.log", "rollingInterval": "Day", "rollOnFileSizeLimit": true, "fileSizeLimitBytes": "10485760", diff --git a/src/WorkflowManager/WorkflowManager/appsettings.json b/src/WorkflowManager/WorkflowManager/appsettings.json index bce7454cc..520699960 100644 --- a/src/WorkflowManager/WorkflowManager/appsettings.json +++ b/src/WorkflowManager/WorkflowManager/appsettings.json @@ -118,29 +118,14 @@ "TimestampFormat": " HH:mm:ss ", "UseUtcTimestamp": true } - }, - //"File": { - // "BasePath": "Logs", - // "FileEncodingName": "utf-8", - // "DateFormat": "yyyyMMdd", - // "CounterFormat": "000", - // "MaxFileSize": 10485760, - // "IncludeScopes": true, - // "MaxQueueSize": 100, - // "TextBuilderType": "Monai.Deploy.WorkflowManager.Configuration.Logging.FileLoggingTextFormatter, Monai.Deploy.WorkflowManager.Configuration", - // "Files": [ - // { - // "Path": "MWM--.log" - // } - // ] - //} + } }, "Serilog": { "WriteTo": [ { "Name": "File", "Args": { - "path": "logs/MWM-.txt", + "path": "logs/MWM-.log", "rollingInterval": "Day", "rollOnFileSizeLimit": true, "fileSizeLimitBytes": "10485760", @@ -150,19 +135,6 @@ } ] }, - //"Serilog": { - // "WriteTo": [ - // { - // "Name": "Elasticsearch", - // "Args": { - // "nodeUris": "http://localhost:9200", - // "indexFormat": "index-monai{0:yyyy.MM}", - // "bufferBaseFilename": "logs/elasticBuffer", - // "restrictedToMinimumLevel": "Verbose" - // } - // } - // ] - //}, "Kestrel": { "EndPoints": { "Http": { diff --git a/src/WorkflowManager/WorkflowManager/packages.lock.json b/src/WorkflowManager/WorkflowManager/packages.lock.json index 8bdddd0a7..f5b2cee8f 100644 --- a/src/WorkflowManager/WorkflowManager/packages.lock.json +++ b/src/WorkflowManager/WorkflowManager/packages.lock.json @@ -11,6 +11,17 @@ "JetBrains.Annotations": "2021.3.0" } }, + "Elastic.CommonSchema.Serilog": { + "type": "Direct", + "requested": "[1.5.3, )", + "resolved": "1.5.3", + "contentHash": "bp2qHOWmN15fTKUecFMt7oCra68I1cm3yAEmwPcLuz4v2pQ5YxC8nVtyCTSSibquUS/ZPH5JInjlmuywV3UoyQ==", + "dependencies": { + "Elastic.CommonSchema": "1.5.3", + "Microsoft.AspNetCore.Http.Abstractions": "2.1.0", + "Serilog": "2.9.0" + } + }, "Karambolo.Extensions.Logging.File": { "type": "Direct", "requested": "[3.3.1, )", @@ -189,20 +200,14 @@ "Serilog.Sinks.File": "5.0.0" } }, - "Serilog.Sinks.Elasticsearch": { + "Serilog.Sinks.Http": { "type": "Direct", - "requested": "[8.4.1, )", - "resolved": "8.4.1", - "contentHash": "SM17WdHUshJSm44uC45jEUW4Wzp9wCltbWry5iY5fNgxJ3PkIkW6I8p+WviU5lx/bayCvAoB5uO07UK2qjBSAQ==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "eHyl2/93Roymf2eudPl/6Eeu2GQ93Ucy4GM1UPF0jyd7CIW8r+Bk5ohdbjjyjB9TQSpP2ovOuj6ltf9DjoWHtg==", "dependencies": { - "Elasticsearch.Net": "7.8.1", - "Microsoft.CSharp": "4.6.0", - "Serilog": "2.8.0", - "Serilog.Formatting.Compact": "1.0.0", - "Serilog.Formatting.Elasticsearch": "8.4.1", - "Serilog.Sinks.File": "4.0.0", - "Serilog.Sinks.PeriodicBatching": "2.1.1", - "System.Diagnostics.DiagnosticSource": "4.5.1" + "Microsoft.Extensions.Configuration.Abstractions": "2.0.0", + "Serilog.Sinks.File": "5.0.0" } }, "StyleCop.Analyzers": { @@ -252,14 +257,12 @@ "Microsoft.Win32.Registry": "5.0.0" } }, - "Elasticsearch.Net": { + "Elastic.CommonSchema": { "type": "Transitive", - "resolved": "7.8.1", - "contentHash": "vGHlxY72LH8/DcKb/QDpvrIelQIUFxNnXa+HmS/ifX7M7dgwmTpA2i4SagQ65gg7oi088cteUuDl4fKIystg7Q==", + "resolved": "1.5.3", + "contentHash": "JgwhfThYY/s17asUiBCUVqnZtDdGTWO/2hTPG01QDfw2+T6kfwskrj5eh6XpBZsOh6r9SpBL95vSsU+q44i7Zg==", "dependencies": { - "Microsoft.CSharp": "4.6.0", - "System.Buffers": "4.5.0", - "System.Diagnostics.DiagnosticSource": "4.5.1" + "System.Text.Json": "4.7.0" } }, "JetBrains.Annotations": { @@ -1009,14 +1012,6 @@ "Serilog": "2.8.0" } }, - "Serilog.Formatting.Elasticsearch": { - "type": "Transitive", - "resolved": "8.4.1", - "contentHash": "768KS00+XwQSxVIYKJ4KWdqyLd5/w3DKndf+94U8NCk7qpXCeZl4HlczsDeyVsNPTyRF6MVss6Wr9uj4rhprfA==", - "dependencies": { - "Serilog": "2.8.0" - } - }, "Serilog.Settings.Configuration": { "type": "Transitive", "resolved": "3.3.0", @@ -1051,16 +1046,6 @@ "Serilog": "2.10.0" } }, - "Serilog.Sinks.PeriodicBatching": { - "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "L1iZtcEzQdEIYCPvhYJYB2RofPg+i1NhHJfS+DpXLyLSMS6OXebqaI1fxWhmJRIjD9D9BuXi23FkZTQDiP7cHw==", - "dependencies": { - "Serilog": "2.0.0", - "System.Collections.Concurrent": "4.0.12", - "System.Threading.Timer": "4.0.1" - } - }, "SharpCompress": { "type": "Transitive", "resolved": "0.30.1", @@ -1616,16 +1601,6 @@ "resolved": "4.5.4", "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" }, - "System.Threading.Timer": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "saGfUV8uqVW6LeURiqxcGhZ24PzuRNaUBtbhVeuUAvky1naH395A/1nY0P2bWvrw/BreRtIB/EzTDkGBpqCwEw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Runtime": "4.1.0" - } - }, "System.ValueTuple": { "type": "Transitive", "resolved": "4.4.0", diff --git a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json index f769cf626..7cf74025e 100644 --- a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json +++ b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json @@ -134,14 +134,22 @@ "Microsoft.Win32.Registry": "5.0.0" } }, - "Elasticsearch.Net": { + "Elastic.CommonSchema": { "type": "Transitive", - "resolved": "7.8.1", - "contentHash": "vGHlxY72LH8/DcKb/QDpvrIelQIUFxNnXa+HmS/ifX7M7dgwmTpA2i4SagQ65gg7oi088cteUuDl4fKIystg7Q==", + "resolved": "1.5.3", + "contentHash": "JgwhfThYY/s17asUiBCUVqnZtDdGTWO/2hTPG01QDfw2+T6kfwskrj5eh6XpBZsOh6r9SpBL95vSsU+q44i7Zg==", "dependencies": { - "Microsoft.CSharp": "4.6.0", - "System.Buffers": "4.5.0", - "System.Diagnostics.DiagnosticSource": "4.5.1" + "System.Text.Json": "4.7.0" + } + }, + "Elastic.CommonSchema.Serilog": { + "type": "Transitive", + "resolved": "1.5.3", + "contentHash": "bp2qHOWmN15fTKUecFMt7oCra68I1cm3yAEmwPcLuz4v2pQ5YxC8nVtyCTSSibquUS/ZPH5JInjlmuywV3UoyQ==", + "dependencies": { + "Elastic.CommonSchema": "1.5.3", + "Microsoft.AspNetCore.Http.Abstractions": "2.1.0", + "Serilog": "2.9.0" } }, "Fare": { @@ -1097,14 +1105,6 @@ "Serilog": "2.8.0" } }, - "Serilog.Formatting.Elasticsearch": { - "type": "Transitive", - "resolved": "8.4.1", - "contentHash": "768KS00+XwQSxVIYKJ4KWdqyLd5/w3DKndf+94U8NCk7qpXCeZl4HlczsDeyVsNPTyRF6MVss6Wr9uj4rhprfA==", - "dependencies": { - "Serilog": "2.8.0" - } - }, "Serilog.Settings.Configuration": { "type": "Transitive", "resolved": "3.3.0", @@ -1131,21 +1131,6 @@ "Serilog": "2.10.0" } }, - "Serilog.Sinks.Elasticsearch": { - "type": "Transitive", - "resolved": "8.4.1", - "contentHash": "SM17WdHUshJSm44uC45jEUW4Wzp9wCltbWry5iY5fNgxJ3PkIkW6I8p+WviU5lx/bayCvAoB5uO07UK2qjBSAQ==", - "dependencies": { - "Elasticsearch.Net": "7.8.1", - "Microsoft.CSharp": "4.6.0", - "Serilog": "2.8.0", - "Serilog.Formatting.Compact": "1.0.0", - "Serilog.Formatting.Elasticsearch": "8.4.1", - "Serilog.Sinks.File": "4.0.0", - "Serilog.Sinks.PeriodicBatching": "2.1.1", - "System.Diagnostics.DiagnosticSource": "4.5.1" - } - }, "Serilog.Sinks.File": { "type": "Transitive", "resolved": "5.0.0", @@ -1154,14 +1139,13 @@ "Serilog": "2.10.0" } }, - "Serilog.Sinks.PeriodicBatching": { + "Serilog.Sinks.Http": { "type": "Transitive", - "resolved": "2.1.1", - "contentHash": "L1iZtcEzQdEIYCPvhYJYB2RofPg+i1NhHJfS+DpXLyLSMS6OXebqaI1fxWhmJRIjD9D9BuXi23FkZTQDiP7cHw==", + "resolved": "8.0.0", + "contentHash": "eHyl2/93Roymf2eudPl/6Eeu2GQ93Ucy4GM1UPF0jyd7CIW8r+Bk5ohdbjjyjB9TQSpP2ovOuj6ltf9DjoWHtg==", "dependencies": { - "Serilog": "2.0.0", - "System.Collections.Concurrent": "4.0.12", - "System.Threading.Timer": "4.0.1" + "Microsoft.Extensions.Configuration.Abstractions": "2.0.0", + "Serilog.Sinks.File": "5.0.0" } }, "SharpCompress": { @@ -1753,16 +1737,6 @@ "resolved": "4.5.4", "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" }, - "System.Threading.Timer": { - "type": "Transitive", - "resolved": "4.0.1", - "contentHash": "saGfUV8uqVW6LeURiqxcGhZ24PzuRNaUBtbhVeuUAvky1naH395A/1nY0P2bWvrw/BreRtIB/EzTDkGBpqCwEw==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1", - "Microsoft.NETCore.Targets": "1.0.1", - "System.Runtime": "4.1.0" - } - }, "System.ValueTuple": { "type": "Transitive", "resolved": "4.4.0", @@ -1817,6 +1791,7 @@ "type": "Project", "dependencies": { "Ardalis.GuardClauses": "[4.0.1, )", + "Elastic.CommonSchema.Serilog": "[1.5.3, )", "Karambolo.Extensions.Logging.File": "[3.3.1, )", "Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[6.0.8, )", "Microsoft.AspNetCore.Mvc.Versioning": "[5.0.0, )", @@ -1840,7 +1815,7 @@ "Newtonsoft.Json": "[13.0.1, )", "Serilog": "[2.11.0, )", "Serilog.AspNetCore": "[6.0.1, )", - "Serilog.Sinks.Elasticsearch": "[8.4.1, )", + "Serilog.Sinks.Http": "[8.0.0, )", "Swashbuckle.AspNetCore": "[6.4.0, )" } }, From eadc72d7c731d4f4014a44572d69094daacf7887 Mon Sep 17 00:00:00 2001 From: Neil South Date: Tue, 13 Sep 2022 11:50:53 +0100 Subject: [PATCH 4/9] adding http output Signed-off-by: Neil South --- src/TaskManager/TaskManager/appsettings.json | 2 +- src/WorkflowManager/WorkflowManager/appsettings.json | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/TaskManager/TaskManager/appsettings.json b/src/TaskManager/TaskManager/appsettings.json index 76cab9801..4ac29facf 100644 --- a/src/TaskManager/TaskManager/appsettings.json +++ b/src/TaskManager/TaskManager/appsettings.json @@ -117,7 +117,7 @@ { "Name": "Http", "Args": { - "requestUri": "http://192.168.0.62:9200/index_settings/_doc", + //"requestUri": "http://192.168.0.62:5000", "queueLimitBytes": null } } diff --git a/src/WorkflowManager/WorkflowManager/appsettings.json b/src/WorkflowManager/WorkflowManager/appsettings.json index 89e210a40..715e70a35 100644 --- a/src/WorkflowManager/WorkflowManager/appsettings.json +++ b/src/WorkflowManager/WorkflowManager/appsettings.json @@ -133,6 +133,13 @@ "retainedFileCountLimit": 30, "formatter": "Serilog.Formatting.Json.JsonFormatter, Serilog" } + }, + { + "Name": "Http", + "Args": { + //"requestUri": "http://192.168.0.62:5000", + "queueLimitBytes": null + } } ] }, From 3d9b3daa5d667536c3e34c0f60dbc276d9aeaee3 Mon Sep 17 00:00:00 2001 From: Neil South Date: Tue, 13 Sep 2022 13:23:52 +0100 Subject: [PATCH 5/9] bummped package versions Signed-off-by: Neil South --- ....Deploy.WorkflowManager.TaskManager.csproj | 202 ++++++++--------- .../Monai.Deploy.WorkflowManager.csproj | 208 +++++++++--------- 2 files changed, 205 insertions(+), 205 deletions(-) diff --git a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj index f3ac2af7d..dc1f16e83 100644 --- a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj +++ b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj @@ -1,106 +1,106 @@ - - - - - - Exe - net6.0 - enable - enable - false - false - - - - - - - - - - - - - - - - - - - - + + + + + + Exe + net6.0 + enable + enable + false + false + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - Always - - - Always - - - PreserveNewest - - - - - true - true - ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + Always + + + Always + + + PreserveNewest + + + + + true + true + ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset + + + + + + + + + + + + + + + + + + + diff --git a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj index f6c9a0076..1cecd74bb 100644 --- a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj +++ b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj @@ -1,110 +1,110 @@ - - - - - Exe - net6.0 - Monai.Deploy.WorkflowManager - false - false - - - - - - - - - - + + + + + Exe + net6.0 + Monai.Deploy.WorkflowManager + false + false + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - - - - - - - - - - - - - - - - Always - - - Always - - - PreserveNewest - - - - - true - true - ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Always + + + Always + + + PreserveNewest + + + + + true + true + ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset + + + + + + + + + + + + + + + + + + + From 628dcf226b6f159b01189395f1366d2b72770c83 Mon Sep 17 00:00:00 2001 From: Neil South Date: Thu, 15 Sep 2022 15:56:41 +0100 Subject: [PATCH 6/9] further improving logging Signed-off-by: Neil South --- .../Database/Logging/Log.1000.Database.cs | 8 +- src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs | 10 +- ....Deploy.WorkflowManager.TaskManager.csproj | 2 + src/TaskManager/TaskManager/Program.cs | 10 +- src/TaskManager/TaskManager/TaskManager.cs | 25 ++- src/TaskManager/TaskManager/appsettings.json | 5 + .../TaskManager/packages.lock.json | 88 +++++++--- .../Database/packages.lock.json | 20 ++- .../Logging/Attributes/AuditAttribute.cs | 30 +++- src/WorkflowManager/Logging/Logging/Log.cs | 22 ++- ...onai.Deploy.WorkflowManager.Logging.csproj | 1 + .../Logging/packages.lock.json | 18 +- ...kflowManager.MonaiBackgroundService.csproj | 74 ++++---- .../MonaiBackgroundService/Worker.cs | 4 +- .../Services/EventPayloadRecieverService.cs | 19 +++ .../PayloadListener/packages.lock.json | 22 ++- .../Storage/packages.lock.json | 20 ++- ...loy.WorkloadManager.WorkfowExecuter.csproj | 110 ++++++------ .../Services/WorkflowExecuterService.cs | 32 ++-- .../WorkflowExecuter/packages.lock.json | 22 ++- .../Monai.Deploy.WorkflowManager.csproj | 2 + .../WorkflowManager/Program.cs | 6 + .../WorkflowManager/Services/Http/Startup.cs | 2 - .../WorkflowManager/appsettings.Local.json | 15 -- .../WorkflowManager/appsettings.json | 2 + .../WorkflowManager/packages.lock.json | 141 ++++++++------- .../WorkflowManager.Tests/packages.lock.json | 161 ++++++++++-------- 27 files changed, 535 insertions(+), 336 deletions(-) diff --git a/src/TaskManager/Database/Logging/Log.1000.Database.cs b/src/TaskManager/Database/Logging/Log.1000.Database.cs index f4fb34eb4..776b450b8 100644 --- a/src/TaskManager/Database/Logging/Log.1000.Database.cs +++ b/src/TaskManager/Database/Logging/Log.1000.Database.cs @@ -23,10 +23,10 @@ public static partial class Log [LoggerMessage(EventId = 1000, Level = LogLevel.Error, Message = "Database call failed in {methodName}.")] public static partial void DatabaseException(this ILogger logger, string methodName, Exception ex); - [LoggerMessage(EventId = 1001, Level = LogLevel.Information, Message = "Task dispatch event saved {taskExecutionId}.")] - public static partial void TaskDispatchEventSaved(this ILogger logger, string taskExecutionId); + [LoggerMessage(EventId = 1001, Level = LogLevel.Information, Message = "Task dispatch event saved {executionId}.")] + public static partial void TaskDispatchEventSaved(this ILogger logger, string executionId); - [LoggerMessage(EventId = 1002, Level = LogLevel.Information, Message = "Task dispatch event deleted {taskExecutionId}.")] - public static partial void TaskDispatchEventDeleted(this ILogger logger, string taskExecutionId); + [LoggerMessage(EventId = 1002, Level = LogLevel.Information, Message = "Task dispatch event deleted {executionId}.")] + public static partial void TaskDispatchEventDeleted(this ILogger logger, string executionId); } } diff --git a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs index 297e08ad7..98c6c74d9 100644 --- a/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs +++ b/src/TaskManager/Plug-ins/Argo/ArgoPlugin.cs @@ -129,7 +129,13 @@ private void ValidateEvent() public override async Task ExecuteTask(CancellationToken cancellationToken = default) { - using var loggerScope = _logger.BeginScope($"Workflow ID={Event.WorkflowInstanceId}, Task ID={Event.TaskId}, Execution ID={Event.ExecutionId}, Argo namespace={_namespace}"); + using var loggingScope = _logger.BeginScope(new Dictionary + { + ["correlationId"] = Event.CorrelationId, + ["workflowInstanceId"] = Event.WorkflowInstanceId, + ["taskId"] = Event.TaskId, + ["argoNamespace"] = _namespace + }); Workflow workflow; try @@ -237,7 +243,7 @@ private Dictionary GetExecutuionStats(Workflow workflow) } var stats = new Dictionary { - { "workflowId", Event.WorkflowInstanceId }, + { "workflowInstanceId", Event.WorkflowInstanceId }, { "duration", duration.HasValue ? duration.Value.TotalMilliseconds.ToString() : string.Empty }, { "startedAt", workflow.Status?.StartedAt.ToString() ?? string.Empty }, { "finishedAt", workflow.Status?.FinishedAt.ToString() ?? string.Empty } diff --git a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj index dc1f16e83..13602e783 100644 --- a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj +++ b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj @@ -60,6 +60,8 @@ + + diff --git a/src/TaskManager/TaskManager/Program.cs b/src/TaskManager/TaskManager/Program.cs index 221738849..9cbe3c294 100644 --- a/src/TaskManager/TaskManager/Program.cs +++ b/src/TaskManager/TaskManager/Program.cs @@ -15,7 +15,9 @@ */ using System.IO.Abstractions; +using System.Reflection; using Elastic.CommonSchema.Serilog; +using k8s.KubeConfigModels; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -31,6 +33,7 @@ using MongoDB.Driver; using Serilog; using Serilog.Events; +using Serilog.Exceptions; namespace Monai.Deploy.WorkflowManager.TaskManager { @@ -70,12 +73,17 @@ public static IHostBuilder CreateHostBuilder(string[] args) => .ReadFrom.Configuration(context.Configuration) .ReadFrom.Services(services) .MinimumLevel.Override("Microsoft", LogEventLevel.Information) + .MinimumLevel.Debug() .Enrich.FromLogContext() + .Enrich.WithExceptionDetails() + .Enrich.WithProperty("dllversion", Assembly.GetEntryAssembly()?.GetName().Version) + .Enrich.WithProperty("dllName", Assembly.GetEntryAssembly()?.GetName().Name) .WriteTo.File( path: "logs/MTM-.log", rollingInterval: RollingInterval.Day, formatter: new EcsTextFormatter()) - .WriteTo.Console()) + .WriteTo.Console()) + .ConfigureServices((hostContext, services) => { ConfigureServices(hostContext, services); diff --git a/src/TaskManager/TaskManager/TaskManager.cs b/src/TaskManager/TaskManager/TaskManager.cs index 5d18b0ecd..7bcbb8ca0 100644 --- a/src/TaskManager/TaskManager/TaskManager.cs +++ b/src/TaskManager/TaskManager/TaskManager.cs @@ -31,6 +31,7 @@ using Monai.Deploy.WorkflowManager.Configuration; using Monai.Deploy.WorkflowManager.TaskManager.API.Extensions; using Monai.Deploy.WorkflowManager.TaskManager.Logging; +using Minio.DataModel; namespace Monai.Deploy.WorkflowManager.TaskManager { @@ -133,12 +134,19 @@ private async Task TaskCallBackGeneric(MessageReceivedEventArgs args, Func + { + ["correlationId"] = args.Message.CorrelationId, + ["messageId"] = args.Message.MessageId, + ["messageType"] = args.Message.MessageDescription + }); + JsonMessage? message = null; try { message = args.Message.ConvertToJsonMessage(); + // Run action on the message await func(message).ConfigureAwait(false); } @@ -320,6 +328,13 @@ private async Task HandleDispatchTask(JsonMessage message) var eventInfo = new API.Models.TaskDispatchEventInfo(message.Body); try { + using var messageLoggingScope = _logger.BeginScope(new Dictionary + { + ["workflowInstanceId"] = eventInfo.Event.WorkflowInstanceId, + ["taskId"] = eventInfo.Event.TaskId, + ["executionId"] = eventInfo.Event.ExecutionId + }); + await _taskDispatchEventService.CreateAsync(eventInfo).ConfigureAwait(false); message.Body.Validate(); pluginAssembly = _options.Value.TaskManager.PluginAssemblyMappings[message.Body.TaskPluginType]; @@ -536,7 +551,13 @@ private async Task HandleMessageException(MessageBase message, string WorkflowIn return; } - using var loggerScope = _logger.BeginScope($"Workflow ID={WorkflowInstanceId}, Execution ID={executionId}, Task ID={taskId}, Correlation ID={message.CorrelationId}"); + using var loggingScope = (_logger.BeginScope(new Dictionary + { + ["correlationId"] = message.CorrelationId, + ["workflowInstanceId"] = WorkflowInstanceId, + ["taskId"] = taskId, + ["executionId"] = executionId + })); try { diff --git a/src/TaskManager/TaskManager/appsettings.json b/src/TaskManager/TaskManager/appsettings.json index 4ac29facf..4051c0dd9 100644 --- a/src/TaskManager/TaskManager/appsettings.json +++ b/src/TaskManager/TaskManager/appsettings.json @@ -102,6 +102,11 @@ } }, "Serilog": { + "Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ], + "Properties": { + "enviroment": "Production", + "serviceName": "MTM" + }, "WriteTo": [ { "Name": "File", diff --git a/src/TaskManager/TaskManager/packages.lock.json b/src/TaskManager/TaskManager/packages.lock.json index 97809ac42..6cefccf9d 100644 --- a/src/TaskManager/TaskManager/packages.lock.json +++ b/src/TaskManager/TaskManager/packages.lock.json @@ -162,6 +162,25 @@ "Serilog.Sinks.File": "5.0.0" } }, + "Serilog.Enrichers.Environment": { + "type": "Direct", + "requested": "[2.2.0, )", + "resolved": "2.2.0", + "contentHash": "DMrj3A4l65kc4JouQyZjjFv7N58Y7lGsB81kSzorTwUGeI2wrTy7CVwSOfG90/Pcu/HV5bwGrUmxDZ38pON+5Q==", + "dependencies": { + "Serilog": "2.3.0" + } + }, + "Serilog.Exceptions": { + "type": "Direct", + "requested": "[8.4.0, )", + "resolved": "8.4.0", + "contentHash": "nc/+hUw3lsdo0zCj0KMIybAu7perMx79vu72w0za9Nsi6mWyNkGXxYxakAjWB7nEmYL6zdmhEQRB4oJ2ALUeug==", + "dependencies": { + "Serilog": "2.8.0", + "System.Reflection.TypeExtensions": "4.7.0" + } + }, "Serilog.Sinks.Http": { "type": "Direct", "requested": "[8.0.0, )", @@ -407,6 +426,22 @@ "System.Text.Json": "4.6.0" } }, + "Microsoft.Extensions.Diagnostics.HealthChecks": { + "type": "Transitive", + "resolved": "6.0.8", + "contentHash": "xRbKuDnoKClu/lC3fCqF5f0UqEqVI8iYJ0RN4XpUHajvcfCWYcFC46NEzaUg2Fub7hznTG9m6XNScrVHl1iaSA==", + "dependencies": { + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": "6.0.8", + "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "Microsoft.Extensions.Options": "6.0.0" + } + }, + "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions": { + "type": "Transitive", + "resolved": "6.0.8", + "contentHash": "8mNPugigemlybm8f+KcwB5FOEyJ8mZ72stKvOJJqpUFYjfTjFDKFKYB2L98gru1SaxVD9akjw8OyvtbWkAEimQ==" + }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", "resolved": "6.0.0", @@ -1082,6 +1117,11 @@ "System.Runtime": "4.3.0" } }, + "System.Reflection.TypeExtensions": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "VybpaOQQhqE6siHppMktjfGBw1GCwvCqiufqmP8F1nj7fTUNtW35LOEt3UZTEsECfo+ELAl/9o9nJx3U91i7vA==" + }, "System.Resources.ResourceManager": { "type": "Transitive", "resolved": "4.3.0", @@ -1366,45 +1406,45 @@ "monai.deploy.workflowmanager.configuration": { "type": "Project", "dependencies": { - "Karambolo.Extensions.Logging.File": "3.3.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0012", - "Monai.Deploy.Storage": "0.2.5", - "Newtonsoft.Json": "13.0.1", - "System.IO.Abstractions": "17.1.1" + "Karambolo.Extensions.Logging.File": "[3.3.1, )", + "Microsoft.Extensions.Configuration": "[6.0.1, )", + "Microsoft.Extensions.Logging": "[6.0.0, )", + "Microsoft.Extensions.Options": "[6.0.0, )", + "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", + "Monai.Deploy.Storage": "[0.2.5, )", + "Newtonsoft.Json": "[13.0.1, )", + "System.IO.Abstractions": "[17.1.1, )" } }, "monai.deploy.workflowmanager.taskmanager.api": { "type": "Project", "dependencies": { - "Monai.Deploy.Messaging": "0.1.3-rc0012", - "Monai.Deploy.Storage": "0.2.5", - "MongoDB.Bson": "2.17.1" + "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", + "Monai.Deploy.Storage": "[0.2.5, )", + "MongoDB.Bson": "[2.17.1, )" } }, "monai.deploy.workflowmanager.taskmanager.argo": { "type": "Project", "dependencies": { - "IdentityModel.OidcClient": "5.0.2", - "KubernetesClient": "7.2.19", - "Monai.Deploy.Messaging": "0.1.3-rc0012", - "Monai.Deploy.Storage": "0.2.5", - "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", - "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0", - "Newtonsoft.Json": "13.0.1" + "IdentityModel.OidcClient": "[5.0.2, )", + "KubernetesClient": "[7.2.19, )", + "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", + "Monai.Deploy.Storage": "[0.2.5, )", + "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )", + "Newtonsoft.Json": "[13.0.1, )" } }, "monai.deploy.workflowmanager.taskmanager.database": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Logging.Abstractions": "6.0.1", - "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.WorkflowManager.TaskManager.API": "1.0.0", - "MongoDB.Bson": "2.17.1", - "MongoDB.Driver": "2.17.1" + "Ardalis.GuardClauses": "[4.0.1, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", + "Microsoft.Extensions.Options": "[6.0.0, )", + "Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )", + "MongoDB.Bson": "[2.17.1, )", + "MongoDB.Driver": "[2.17.1, )" } } } diff --git a/src/WorkflowManager/Database/packages.lock.json b/src/WorkflowManager/Database/packages.lock.json index 374d309e4..fd36cb8dc 100644 --- a/src/WorkflowManager/Database/packages.lock.json +++ b/src/WorkflowManager/Database/packages.lock.json @@ -49,15 +49,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.27", - "contentHash": "pCX0yHPFuREXOqGaEQoCSlPZwsiijT1rBBiyk1pdD19Db8gVFglO7wMbxl37OhRNcLZprmtWJFvaDfuzeV10Wg==" + "resolved": "3.7.12.29", + "contentHash": "bxSbEjbCyAzjmUpxVKXiQhkXEvb3w9OHL7AOL9LItY1f5xLB9/qbtHoi5FvmZXTPPi2RahPJr9fDyHMLwQnxiA==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.191", - "contentHash": "tTIqJ/QKaPzTu5ZPdRFa2sW9p5F441RLV7nDdTAVVuu6oLyemna0bTtE+luGLaw17oE4GZHpa5n5p0oJmpzcxA==", + "resolved": "3.7.1.193", + "contentHash": "xDZAerod8OUtyIgIYPiGRO+PRdGDjepGGgH2/DuAK/aoARU/FinaFr+yuUjJItrP53dCezbpdFVSRa1BFpIGfA==", "dependencies": { - "AWSSDK.Core": "[3.7.12.27, 4.0.0)" + "AWSSDK.Core": "[3.7.12.29, 4.0.0)" } }, "DnsClient": { @@ -422,6 +422,11 @@ "Microsoft.NETCore.Targets": "1.0.1" } }, + "Serilog": { + "type": "Transitive", + "resolved": "2.11.0", + "contentHash": "ysv+hBzTul6Dp+Hvm10FlhJO3yMQcFKSAleus+LpiIzvNstpeV4Z7gGuIZ1OPNfIMulSHOjmLuGAEDKzpnV8ZQ==" + }, "SharpCompress": { "type": "Transitive", "resolved": "0.30.1", @@ -807,7 +812,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.191, )", + "AWSSDK.SecurityToken": "[3.7.1.193, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", "MongoDB.Bson": "[2.17.1, )", @@ -819,7 +824,8 @@ "dependencies": { "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Serilog": "[2.11.0, )" } } } diff --git a/src/WorkflowManager/Logging/Attributes/AuditAttribute.cs b/src/WorkflowManager/Logging/Attributes/AuditAttribute.cs index fa270074d..ceba9391c 100644 --- a/src/WorkflowManager/Logging/Attributes/AuditAttribute.cs +++ b/src/WorkflowManager/Logging/Attributes/AuditAttribute.cs @@ -39,8 +39,21 @@ public LogActionFilterAttribute(ILogger logger) /// The current executing context. public override void OnActionExecuting(ActionExecutingContext context) { - _logger.LogControllerStartTime(context); - base.OnActionExecuting(context); + var request = context.HttpContext.Request; + var correlationId = request.Headers["correlationId"].FirstOrDefault() ?? Guid.NewGuid().ToString(); + var startTime = DateTime.UtcNow; + context.HttpContext.Items["startTime"] = startTime; + context.HttpContext.Items["correlationId"] = correlationId; + + using (_logger.BeginScope(new Dictionary + { + ["correlationId"] = correlationId, + ["startTime"] = startTime + })) + { + _logger.LogControllerStartTime(context); + base.OnActionExecuting(context); + } } /// @@ -49,8 +62,17 @@ public override void OnActionExecuting(ActionExecutingContext context) /// The current executing context. public override void OnResultExecuted(ResultExecutedContext context) { - _logger.LogControllerEndTime(context); - base.OnResultExecuted(context); + var startTime = context.HttpContext.Items["startTime"]; + var correlationId = context.HttpContext.Items["correlationId"]; + using (_logger.BeginScope(new Dictionary + { + ["correlationId"] = correlationId, + ["startTime"] = startTime + })) + { + _logger.LogControllerEndTime(context); + base.OnResultExecuted(context); + } } } } diff --git a/src/WorkflowManager/Logging/Logging/Log.cs b/src/WorkflowManager/Logging/Logging/Log.cs index 678f3c253..10e0e1f34 100644 --- a/src/WorkflowManager/Logging/Logging/Log.cs +++ b/src/WorkflowManager/Logging/Logging/Log.cs @@ -24,7 +24,7 @@ namespace Monai.Deploy.WorkflowManager.Logging.Logging { public static partial class Log { - [LoggerMessage(EventId = 1, Level = LogLevel.Information, Message = "{ServiceName} started.")] + [LoggerMessage(EventId = 1, Level = LogLevel.Debug, Message = "{ServiceName} started.")] public static partial void ServiceStarted(this ILogger logger, string serviceName); [LoggerMessage(EventId = 2, Level = LogLevel.Information, Message = "{ServiceName} starting.")] @@ -105,6 +105,9 @@ public static partial class Log [LoggerMessage(EventId = 27, Level = LogLevel.Error, Message = "The following task: {taskId} in workflow {workflowInstanceId} is currently timed out and not processing anymore updates, timed out at {timedOut}.")] public static partial void TaskTimedOut(this ILogger logger, string taskId, string workflowInstanceId, DateTime timedOut); + [LoggerMessage(EventId = 28, Level = LogLevel.Warning, Message = "Not Processing workflow: {workflowInstanceId} as it already has a status of {status}")] + public static partial void WorkflowBadStatus(this ILogger logger, string workflowInstanceId, string status); + public static void TaskComplete(this ILogger logger, TaskExecution task, WorkflowInstance workflowInstance, PatientDetails patientDetails, string correlationId, string taskStatus) { logger.LogInformation("TaskComplete Task {task}, workflowInstance {workflowInstance}, patientDetails {patientDetails}, correlationId {correlationId}, taskStatus {taskStatus}", @@ -114,21 +117,15 @@ public static void TaskComplete(this ILogger logger, TaskExecution task, Workflo public static void LogControllerStartTime(this ILogger logger, ActionExecutingContext context) { var request = context.HttpContext.Request; - var correlationId = request.Headers["correlationId"].FirstOrDefault() ?? Guid.NewGuid().ToString(); var body = JsonConvert.SerializeObject(context.ActionArguments.FirstOrDefault()); - var startTime = DateTime.UtcNow; - context.HttpContext.Items["startTime"] = startTime; - context.HttpContext.Items["correlationId"] = correlationId; - - logger.LogInformation("ControllerActionStart data StartTime {starttime}, HttpType {httptype}, Path {path}, QueryString {querystring}, Body {body}, CorrelationId {correlationId}", - startTime, request.Method, request.Path, request.QueryString.Value.ToString(), body, correlationId); + logger.LogInformation("ControllerActionStart data HttpType {httptype}, Path {path}, QueryString {querystring}, Body {body}", + request.Method, request.Path, request.QueryString.Value.ToString(), body); } public static void LogControllerEndTime(this ILogger logger, ResultExecutedContext context) { var request = context.HttpContext.Request; var response = context.HttpContext.Response; - var correlationId = context.HttpContext.Items["correlationId"] ?? "NotFound"; var startTime = context.HttpContext.Items["startTime"] as DateTime? ?? DateTime.UtcNow; var endtime = DateTime.UtcNow; @@ -140,9 +137,10 @@ public static void LogControllerEndTime(this ILogger logger, ResultExecutedConte objResult = (ObjectResult)context.Result; } - logger.LogInformation("ControllerActionEnd data StartTime {starttime}, EndTime {endtime}, Duration {duration}, HttpType {httptype}, Path {path}, QueryString {querystring}, StatusCode {statuscode}, Result {result}, CorrelationId {correlationId}", - startTime, endtime, (endtime - startTime).TotalMilliseconds, request.Method, request.Path, - request.QueryString.Value.ToString(), response.StatusCode, JsonConvert.SerializeObject(objResult), correlationId); + logger.LogInformation("ControllerActionEnd data EndTime {endtime}, Duration {duration}, HttpType {httptype}, Path {path}, QueryString {querystring}, StatusCode {statuscode}, Result {result}", + endtime, (endtime - startTime).TotalMilliseconds, request.Method, request.Path, + request.QueryString.Value.ToString(), response.StatusCode, JsonConvert.SerializeObject(objResult)); + } } } diff --git a/src/WorkflowManager/Logging/Monai.Deploy.WorkflowManager.Logging.csproj b/src/WorkflowManager/Logging/Monai.Deploy.WorkflowManager.Logging.csproj index 9780b2925..7ec12ddd5 100644 --- a/src/WorkflowManager/Logging/Monai.Deploy.WorkflowManager.Logging.csproj +++ b/src/WorkflowManager/Logging/Monai.Deploy.WorkflowManager.Logging.csproj @@ -28,6 +28,7 @@ + diff --git a/src/WorkflowManager/Logging/packages.lock.json b/src/WorkflowManager/Logging/packages.lock.json index 3a9d39658..404720be6 100644 --- a/src/WorkflowManager/Logging/packages.lock.json +++ b/src/WorkflowManager/Logging/packages.lock.json @@ -31,6 +31,12 @@ "resolved": "6.0.1", "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" }, + "Serilog": { + "type": "Direct", + "requested": "[2.11.0, )", + "resolved": "2.11.0", + "contentHash": "ysv+hBzTul6Dp+Hvm10FlhJO3yMQcFKSAleus+LpiIzvNstpeV4Z7gGuIZ1OPNfIMulSHOjmLuGAEDKzpnV8ZQ==" + }, "Ardalis.GuardClauses": { "type": "Transitive", "resolved": "4.0.1", @@ -41,15 +47,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.27", - "contentHash": "pCX0yHPFuREXOqGaEQoCSlPZwsiijT1rBBiyk1pdD19Db8gVFglO7wMbxl37OhRNcLZprmtWJFvaDfuzeV10Wg==" + "resolved": "3.7.12.29", + "contentHash": "bxSbEjbCyAzjmUpxVKXiQhkXEvb3w9OHL7AOL9LItY1f5xLB9/qbtHoi5FvmZXTPPi2RahPJr9fDyHMLwQnxiA==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.191", - "contentHash": "tTIqJ/QKaPzTu5ZPdRFa2sW9p5F441RLV7nDdTAVVuu6oLyemna0bTtE+luGLaw17oE4GZHpa5n5p0oJmpzcxA==", + "resolved": "3.7.1.193", + "contentHash": "xDZAerod8OUtyIgIYPiGRO+PRdGDjepGGgH2/DuAK/aoARU/FinaFr+yuUjJItrP53dCezbpdFVSRa1BFpIGfA==", "dependencies": { - "AWSSDK.Core": "[3.7.12.27, 4.0.0)" + "AWSSDK.Core": "[3.7.12.29, 4.0.0)" } }, "JetBrains.Annotations": { @@ -741,7 +747,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.191, )", + "AWSSDK.SecurityToken": "[3.7.1.193, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", "MongoDB.Bson": "[2.17.1, )", diff --git a/src/WorkflowManager/MonaiBackgroundService/Monai.Deploy.WorkflowManager.MonaiBackgroundService.csproj b/src/WorkflowManager/MonaiBackgroundService/Monai.Deploy.WorkflowManager.MonaiBackgroundService.csproj index c51f7b5d9..4e93c65b8 100644 --- a/src/WorkflowManager/MonaiBackgroundService/Monai.Deploy.WorkflowManager.MonaiBackgroundService.csproj +++ b/src/WorkflowManager/MonaiBackgroundService/Monai.Deploy.WorkflowManager.MonaiBackgroundService.csproj @@ -1,39 +1,39 @@ - - - - - - net6.0 - enable - enable - Library - ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset - - + + + + + + net6.0 + enable + enable + Library + ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset + + - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/WorkflowManager/MonaiBackgroundService/Worker.cs b/src/WorkflowManager/MonaiBackgroundService/Worker.cs index c63fd2a4d..b775254fc 100644 --- a/src/WorkflowManager/MonaiBackgroundService/Worker.cs +++ b/src/WorkflowManager/MonaiBackgroundService/Worker.cs @@ -55,9 +55,9 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken) IsRunning = true; var time = DateTimeOffset.Now; _logger.ServiceStarted(ServiceName); - _logger.LogInformation("Worker running at: {time}", time); + _logger.LogDebug("Worker running at: {time}", time); await DoWork(); - _logger.LogInformation("Worker completed in: {time} milliseconds", (int)(DateTimeOffset.Now - time).TotalMilliseconds); + _logger.LogDebug("Worker completed in: {time} milliseconds", (int)(DateTimeOffset.Now - time).TotalMilliseconds); await Task.Delay(_options.Value.BackgroundServiceSettings.BackgroundServiceDelay, stoppingToken); } _logger.ServiceStopping(ServiceName); diff --git a/src/WorkflowManager/PayloadListener/Services/EventPayloadRecieverService.cs b/src/WorkflowManager/PayloadListener/Services/EventPayloadRecieverService.cs index 220d20d91..e301fe7f1 100644 --- a/src/WorkflowManager/PayloadListener/Services/EventPayloadRecieverService.cs +++ b/src/WorkflowManager/PayloadListener/Services/EventPayloadRecieverService.cs @@ -57,6 +57,12 @@ public async Task ReceiveWorkflowPayload(MessageReceivedEventArgs message) { var requestEvent = message.Message.ConvertTo(); + using var loggingScope = (Logger.BeginScope(new Dictionary + { + ["correlationId"] = requestEvent.CorrelationId, + ["workflowId"] = requestEvent.Workflows.FirstOrDefault() + })); + var validation = PayloadValidator.ValidateWorkflowRequest(requestEvent); if (!validation) @@ -85,6 +91,7 @@ public async Task ReceiveWorkflowPayload(MessageReceivedEventArgs message) } _messageSubscriber.Acknowledge(message.Message); + } catch (Exception e) { @@ -101,6 +108,13 @@ public async Task TaskUpdatePayload(MessageReceivedEventArgs message) { var payload = message.Message.ConvertTo(); + using var loggerScope = Logger.BeginScope(new Dictionary + { + ["correlationId"] = payload.CorrelationId, + ["workflowInstanceId"] = payload.WorkflowInstanceId, + ["taskId"] = payload.TaskId + }); + if (!PayloadValidator.ValidateTaskUpdate(payload)) { Logger.EventRejectedNoQueue(message.Message.MessageId); @@ -120,6 +134,7 @@ public async Task TaskUpdatePayload(MessageReceivedEventArgs message) } _messageSubscriber.Acknowledge(message.Message); + } catch (Exception e) { @@ -136,6 +151,9 @@ public async Task ExportCompletePayload(MessageReceivedEventArgs message) { var payload = message.Message.ConvertTo(); + using var loggerScope = Logger.BeginScope(new Dictionary { ["workflowInstanceId"] = payload.WorkflowInstanceId }); + + if (!PayloadValidator.ValidateExportComplete(payload)) { Logger.EventRejectedNoQueue(message.Message.MessageId); @@ -154,6 +172,7 @@ public async Task ExportCompletePayload(MessageReceivedEventArgs message) } _messageSubscriber.Acknowledge(message.Message); + } catch (Exception e) { diff --git a/src/WorkflowManager/PayloadListener/packages.lock.json b/src/WorkflowManager/PayloadListener/packages.lock.json index de9573d6d..019f12107 100644 --- a/src/WorkflowManager/PayloadListener/packages.lock.json +++ b/src/WorkflowManager/PayloadListener/packages.lock.json @@ -39,15 +39,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.27", - "contentHash": "pCX0yHPFuREXOqGaEQoCSlPZwsiijT1rBBiyk1pdD19Db8gVFglO7wMbxl37OhRNcLZprmtWJFvaDfuzeV10Wg==" + "resolved": "3.7.12.29", + "contentHash": "bxSbEjbCyAzjmUpxVKXiQhkXEvb3w9OHL7AOL9LItY1f5xLB9/qbtHoi5FvmZXTPPi2RahPJr9fDyHMLwQnxiA==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.191", - "contentHash": "tTIqJ/QKaPzTu5ZPdRFa2sW9p5F441RLV7nDdTAVVuu6oLyemna0bTtE+luGLaw17oE4GZHpa5n5p0oJmpzcxA==", + "resolved": "3.7.1.193", + "contentHash": "xDZAerod8OUtyIgIYPiGRO+PRdGDjepGGgH2/DuAK/aoARU/FinaFr+yuUjJItrP53dCezbpdFVSRa1BFpIGfA==", "dependencies": { - "AWSSDK.Core": "[3.7.12.27, 4.0.0)" + "AWSSDK.Core": "[3.7.12.29, 4.0.0)" } }, "DnsClient": { @@ -511,6 +511,11 @@ "Microsoft.NETCore.Targets": "1.0.1" } }, + "Serilog": { + "type": "Transitive", + "resolved": "2.11.0", + "contentHash": "ysv+hBzTul6Dp+Hvm10FlhJO3yMQcFKSAleus+LpiIzvNstpeV4Z7gGuIZ1OPNfIMulSHOjmLuGAEDKzpnV8ZQ==" + }, "SharpCompress": { "type": "Transitive", "resolved": "0.30.1", @@ -929,7 +934,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.191, )", + "AWSSDK.SecurityToken": "[3.7.1.193, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", "MongoDB.Bson": "[2.17.1, )", @@ -953,7 +958,8 @@ "dependencies": { "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Serilog": "[2.11.0, )" } }, "monai.deploy.workflowmanager.storage": { @@ -968,7 +974,7 @@ "monai.deploy.workloadmanager.workfowexecuter": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.191, )", + "AWSSDK.SecurityToken": "[3.7.1.193, )", "Ardalis.GuardClauses": "[4.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", "Monai.Deploy.Storage": "[0.2.5, )", diff --git a/src/WorkflowManager/Storage/packages.lock.json b/src/WorkflowManager/Storage/packages.lock.json index 141f744b8..f7d04b78c 100644 --- a/src/WorkflowManager/Storage/packages.lock.json +++ b/src/WorkflowManager/Storage/packages.lock.json @@ -28,15 +28,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.27", - "contentHash": "pCX0yHPFuREXOqGaEQoCSlPZwsiijT1rBBiyk1pdD19Db8gVFglO7wMbxl37OhRNcLZprmtWJFvaDfuzeV10Wg==" + "resolved": "3.7.12.29", + "contentHash": "bxSbEjbCyAzjmUpxVKXiQhkXEvb3w9OHL7AOL9LItY1f5xLB9/qbtHoi5FvmZXTPPi2RahPJr9fDyHMLwQnxiA==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.191", - "contentHash": "tTIqJ/QKaPzTu5ZPdRFa2sW9p5F441RLV7nDdTAVVuu6oLyemna0bTtE+luGLaw17oE4GZHpa5n5p0oJmpzcxA==", + "resolved": "3.7.1.193", + "contentHash": "xDZAerod8OUtyIgIYPiGRO+PRdGDjepGGgH2/DuAK/aoARU/FinaFr+yuUjJItrP53dCezbpdFVSRa1BFpIGfA==", "dependencies": { - "AWSSDK.Core": "[3.7.12.27, 4.0.0)" + "AWSSDK.Core": "[3.7.12.29, 4.0.0)" } }, "JetBrains.Annotations": { @@ -413,6 +413,11 @@ "Microsoft.NETCore.Targets": "1.0.1" } }, + "Serilog": { + "type": "Transitive", + "resolved": "2.11.0", + "contentHash": "ysv+hBzTul6Dp+Hvm10FlhJO3yMQcFKSAleus+LpiIzvNstpeV4Z7gGuIZ1OPNfIMulSHOjmLuGAEDKzpnV8ZQ==" + }, "System.AppContext": { "type": "Transitive", "resolved": "4.1.0", @@ -779,7 +784,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.191, )", + "AWSSDK.SecurityToken": "[3.7.1.193, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", "MongoDB.Bson": "[2.17.1, )", @@ -791,7 +796,8 @@ "dependencies": { "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Serilog": "[2.11.0, )" } } } diff --git a/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj b/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj index 87289cd15..7458fd538 100644 --- a/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj +++ b/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj @@ -1,57 +1,57 @@ - - - - - - net6.0 - enable - enable - - - - - - + + + + + + net6.0 + enable + enable + + + + + + - - - - - - - - - - - - - - - - - - - - - - true - true - ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset - - - + + + + + + + + + + + + + + + + + + + + + + true + true + ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset + + + diff --git a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs index 209ff3d93..a455fdb52 100644 --- a/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs +++ b/src/WorkflowManager/WorkflowExecuter/Services/WorkflowExecuterService.cs @@ -139,6 +139,7 @@ public async Task ProcessFirstWorkflowTask(WorkflowInstance workflowInstance, st { if (workflowInstance.Status == Status.Failed) { + _logger.WorkflowBadStatus(workflowInstance.WorkflowId, workflowInstance.Status.ToString()); return; } @@ -534,29 +535,32 @@ private async Task DispatchTask(WorkflowInstance workflowInstance, Workflo return false; } - var outputArtifacts = task.Artifacts?.Output; - - if (outputArtifacts is not null && outputArtifacts.Any()) + using (_logger.BeginScope(new Dictionary { ["correlationId"] = correlationId, ["taskId"] = task.Id })) { - foreach (var artifact in outputArtifacts) + var outputArtifacts = task.Artifacts?.Output; + + if (outputArtifacts is not null && outputArtifacts.Any()) { - if (!string.IsNullOrWhiteSpace(artifact.Value)) + foreach (var artifact in outputArtifacts) { - continue; - } + if (!string.IsNullOrWhiteSpace(artifact.Value)) + { + continue; + } - artifact.Value = $"{{ context.executions.{task.Id}.output_dir }}/{artifact.Name}"; + artifact.Value = $"{{ context.executions.{task.Id}.output_dir }}/{artifact.Name}"; + } } - } - var pathOutputArtifacts = await _artifactMapper.ConvertArtifactVariablesToPath(outputArtifacts ?? Array.Empty(), workflowInstance.PayloadId, workflowInstance.Id, workflowInstance.BucketId, false); + var pathOutputArtifacts = await _artifactMapper.ConvertArtifactVariablesToPath(outputArtifacts ?? Array.Empty(), workflowInstance.PayloadId, workflowInstance.Id, workflowInstance.BucketId, false); - var taskDispatchEvent = EventMapper.ToTaskDispatchEvent(taskExec, workflowInstance, pathOutputArtifacts, correlationId, _storageConfiguration); - var jsonMesssage = new JsonMessage(taskDispatchEvent, MessageBrokerConfiguration.WorkflowManagerApplicationId, taskDispatchEvent.CorrelationId, Guid.NewGuid().ToString()); + var taskDispatchEvent = EventMapper.ToTaskDispatchEvent(taskExec, workflowInstance, pathOutputArtifacts, correlationId, _storageConfiguration); + var jsonMesssage = new JsonMessage(taskDispatchEvent, MessageBrokerConfiguration.WorkflowManagerApplicationId, taskDispatchEvent.CorrelationId, Guid.NewGuid().ToString()); - await _messageBrokerPublisherService.Publish(TaskDispatchRoutingKey, jsonMesssage.ToMessage()); + await _messageBrokerPublisherService.Publish(TaskDispatchRoutingKey, jsonMesssage.ToMessage()); - return await _workflowInstanceRepository.UpdateTaskStatusAsync(workflowInstance.Id, taskExec.TaskId, TaskExecutionStatus.Dispatched); + return await _workflowInstanceRepository.UpdateTaskStatusAsync(workflowInstance.Id, taskExec.TaskId, TaskExecutionStatus.Dispatched); + } } private async Task ExportRequest(WorkflowInstance workflowInstance, TaskExecution taskExec, string[] exportDestinations, IList dicomImages, string correlationId) diff --git a/src/WorkflowManager/WorkflowExecuter/packages.lock.json b/src/WorkflowManager/WorkflowExecuter/packages.lock.json index 2133608e9..b200ab518 100644 --- a/src/WorkflowManager/WorkflowExecuter/packages.lock.json +++ b/src/WorkflowManager/WorkflowExecuter/packages.lock.json @@ -13,11 +13,11 @@ }, "AWSSDK.SecurityToken": { "type": "Direct", - "requested": "[3.7.1.191, )", - "resolved": "3.7.1.191", - "contentHash": "tTIqJ/QKaPzTu5ZPdRFa2sW9p5F441RLV7nDdTAVVuu6oLyemna0bTtE+luGLaw17oE4GZHpa5n5p0oJmpzcxA==", + "requested": "[3.7.1.193, )", + "resolved": "3.7.1.193", + "contentHash": "xDZAerod8OUtyIgIYPiGRO+PRdGDjepGGgH2/DuAK/aoARU/FinaFr+yuUjJItrP53dCezbpdFVSRa1BFpIGfA==", "dependencies": { - "AWSSDK.Core": "[3.7.12.27, 4.0.0)" + "AWSSDK.Core": "[3.7.12.29, 4.0.0)" } }, "Monai.Deploy.Messaging": { @@ -58,8 +58,8 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.27", - "contentHash": "pCX0yHPFuREXOqGaEQoCSlPZwsiijT1rBBiyk1pdD19Db8gVFglO7wMbxl37OhRNcLZprmtWJFvaDfuzeV10Wg==" + "resolved": "3.7.12.29", + "contentHash": "bxSbEjbCyAzjmUpxVKXiQhkXEvb3w9OHL7AOL9LItY1f5xLB9/qbtHoi5FvmZXTPPi2RahPJr9fDyHMLwQnxiA==" }, "DnsClient": { "type": "Transitive", @@ -513,6 +513,11 @@ "Microsoft.NETCore.Targets": "1.0.1" } }, + "Serilog": { + "type": "Transitive", + "resolved": "2.11.0", + "contentHash": "ysv+hBzTul6Dp+Hvm10FlhJO3yMQcFKSAleus+LpiIzvNstpeV4Z7gGuIZ1OPNfIMulSHOjmLuGAEDKzpnV8ZQ==" + }, "SharpCompress": { "type": "Transitive", "resolved": "0.30.1", @@ -931,7 +936,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.191, )", + "AWSSDK.SecurityToken": "[3.7.1.193, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", "MongoDB.Bson": "[2.17.1, )", @@ -955,7 +960,8 @@ "dependencies": { "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Serilog": "[2.11.0, )" } }, "monai.deploy.workflowmanager.storage": { diff --git a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj index 1cecd74bb..6156cf84c 100644 --- a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj +++ b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj @@ -52,6 +52,8 @@ + + all diff --git a/src/WorkflowManager/WorkflowManager/Program.cs b/src/WorkflowManager/WorkflowManager/Program.cs index 7e7709f80..7d9d04eb6 100644 --- a/src/WorkflowManager/WorkflowManager/Program.cs +++ b/src/WorkflowManager/WorkflowManager/Program.cs @@ -17,6 +17,7 @@ using System; using System.IO; using System.IO.Abstractions; +using System.Reflection; using Elastic.CommonSchema.Serilog; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; @@ -41,6 +42,7 @@ using MongoDB.Driver; using Serilog; using Serilog.Events; +using Serilog.Exceptions; namespace Monai.Deploy.WorkflowManager { @@ -76,7 +78,11 @@ internal static IHostBuilder CreateHostBuilder(string[] args) => .ReadFrom.Configuration(context.Configuration) .ReadFrom.Services(services) .MinimumLevel.Override("Microsoft", LogEventLevel.Information) + .MinimumLevel.Debug() .Enrich.FromLogContext() + .Enrich.WithExceptionDetails() + .Enrich.WithProperty("dllversion", Assembly.GetEntryAssembly().GetName().Version) + .Enrich.WithProperty("dllName", Assembly.GetEntryAssembly().GetName().Name) .WriteTo.File( path: "logs/MWM-.log", rollingInterval: RollingInterval.Day, diff --git a/src/WorkflowManager/WorkflowManager/Services/Http/Startup.cs b/src/WorkflowManager/WorkflowManager/Services/Http/Startup.cs index d052b6b44..bff00d30a 100644 --- a/src/WorkflowManager/WorkflowManager/Services/Http/Startup.cs +++ b/src/WorkflowManager/WorkflowManager/Services/Http/Startup.cs @@ -108,8 +108,6 @@ public static void Configure(IApplicationBuilder app, IWebHostEnvironment env) app.UseAuthorization(); app.UseEndpointAuthorizationMiddleware(); - app.UseSerilogRequestLogging(); - app.UseEndpoints(endpoints => { endpoints.MapControllers(); diff --git a/src/WorkflowManager/WorkflowManager/appsettings.Local.json b/src/WorkflowManager/WorkflowManager/appsettings.Local.json index dcfea79b6..822de7502 100644 --- a/src/WorkflowManager/WorkflowManager/appsettings.Local.json +++ b/src/WorkflowManager/WorkflowManager/appsettings.Local.json @@ -118,21 +118,6 @@ } } }, - "Serilog": { - "WriteTo": [ - { - "Name": "File", - "Args": { - "path": "logs/MWM-.log", - "rollingInterval": "Day", - "rollOnFileSizeLimit": true, - "fileSizeLimitBytes": "10485760", - "retainedFileCountLimit": 30, - "formatter": "Serilog.Formatting.Json.JsonFormatter, Serilog" - } - } - ] - }, "Kestrel": { "EndPoints": { "Http": { diff --git a/src/WorkflowManager/WorkflowManager/appsettings.json b/src/WorkflowManager/WorkflowManager/appsettings.json index 715e70a35..c320ea219 100644 --- a/src/WorkflowManager/WorkflowManager/appsettings.json +++ b/src/WorkflowManager/WorkflowManager/appsettings.json @@ -122,6 +122,8 @@ } }, "Serilog": { + "Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ], + "Properties": { "enviroment": "Production", "serviceName": "MWM"}, "WriteTo": [ { "Name": "File", diff --git a/src/WorkflowManager/WorkflowManager/packages.lock.json b/src/WorkflowManager/WorkflowManager/packages.lock.json index 05a21e290..65a686ffe 100644 --- a/src/WorkflowManager/WorkflowManager/packages.lock.json +++ b/src/WorkflowManager/WorkflowManager/packages.lock.json @@ -200,6 +200,25 @@ "Serilog.Sinks.File": "5.0.0" } }, + "Serilog.Enrichers.Environment": { + "type": "Direct", + "requested": "[2.2.0, )", + "resolved": "2.2.0", + "contentHash": "DMrj3A4l65kc4JouQyZjjFv7N58Y7lGsB81kSzorTwUGeI2wrTy7CVwSOfG90/Pcu/HV5bwGrUmxDZ38pON+5Q==", + "dependencies": { + "Serilog": "2.3.0" + } + }, + "Serilog.Exceptions": { + "type": "Direct", + "requested": "[8.4.0, )", + "resolved": "8.4.0", + "contentHash": "nc/+hUw3lsdo0zCj0KMIybAu7perMx79vu72w0za9Nsi6mWyNkGXxYxakAjWB7nEmYL6zdmhEQRB4oJ2ALUeug==", + "dependencies": { + "Serilog": "2.8.0", + "System.Reflection.TypeExtensions": "4.7.0" + } + }, "Serilog.Sinks.Http": { "type": "Direct", "requested": "[8.0.0, )", @@ -230,15 +249,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.27", - "contentHash": "pCX0yHPFuREXOqGaEQoCSlPZwsiijT1rBBiyk1pdD19Db8gVFglO7wMbxl37OhRNcLZprmtWJFvaDfuzeV10Wg==" + "resolved": "3.7.12.29", + "contentHash": "bxSbEjbCyAzjmUpxVKXiQhkXEvb3w9OHL7AOL9LItY1f5xLB9/qbtHoi5FvmZXTPPi2RahPJr9fDyHMLwQnxiA==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.191", - "contentHash": "tTIqJ/QKaPzTu5ZPdRFa2sW9p5F441RLV7nDdTAVVuu6oLyemna0bTtE+luGLaw17oE4GZHpa5n5p0oJmpzcxA==", + "resolved": "3.7.1.193", + "contentHash": "xDZAerod8OUtyIgIYPiGRO+PRdGDjepGGgH2/DuAK/aoARU/FinaFr+yuUjJItrP53dCezbpdFVSRa1BFpIGfA==", "dependencies": { - "AWSSDK.Core": "[3.7.12.27, 4.0.0)" + "AWSSDK.Core": "[3.7.12.29, 4.0.0)" } }, "Crc32.NET": { @@ -1347,6 +1366,11 @@ "System.Runtime": "4.3.0" } }, + "System.Reflection.TypeExtensions": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "VybpaOQQhqE6siHppMktjfGBw1GCwvCqiufqmP8F1nj7fTUNtW35LOEt3UZTEsECfo+ELAl/9o9nJx3U91i7vA==" + }, "System.Resources.ResourceManager": { "type": "Transitive", "resolved": "4.3.0", @@ -1626,111 +1650,112 @@ "monai.deploy.workflowmanager.authentication": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "6.0.8", - "Monai.Deploy.WorkflowManager.Common": "1.0.0" + "Ardalis.GuardClauses": "[4.0.1, )", + "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.8, )", + "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )" } }, "monai.deploy.workflowmanager.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Database": "1.0.0", - "Monai.Deploy.WorkflowManager.Storage": "1.0.0" + "Ardalis.GuardClauses": "[4.0.1, )", + "Microsoft.Extensions.DependencyInjection.Abstractions": "[6.0.0, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" } }, "monai.deploy.workflowmanager.conditionsresolver": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Monai.Deploy.WorkflowManager.Common": "1.0.0", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Database": "1.0.0", - "Monai.Deploy.WorkflowManager.Storage": "1.0.0" + "Ardalis.GuardClauses": "[4.0.1, )", + "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" } }, "monai.deploy.workflowmanager.configuration": { "type": "Project", "dependencies": { - "Karambolo.Extensions.Logging.File": "3.3.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0012", - "Monai.Deploy.Storage": "0.2.5", - "Newtonsoft.Json": "13.0.1", - "System.IO.Abstractions": "17.1.1" + "Karambolo.Extensions.Logging.File": "[3.3.1, )", + "Microsoft.Extensions.Configuration": "[6.0.1, )", + "Microsoft.Extensions.Logging": "[6.0.0, )", + "Microsoft.Extensions.Options": "[6.0.0, )", + "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", + "Monai.Deploy.Storage": "[0.2.5, )", + "Newtonsoft.Json": "[13.0.1, )", + "System.IO.Abstractions": "[17.1.1, )" } }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "3.7.1.191", - "Microsoft.Extensions.Configuration": "6.0.1", - "Monai.Deploy.Messaging": "0.1.3-rc0012", - "MongoDB.Bson": "2.17.1", - "Newtonsoft.Json": "13.0.1" + "AWSSDK.SecurityToken": "[3.7.1.193, )", + "Microsoft.Extensions.Configuration": "[6.0.1, )", + "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", + "MongoDB.Bson": "[2.17.1, )", + "Newtonsoft.Json": "[13.0.1, )" } }, "monai.deploy.workflowmanager.database": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Logging.Abstractions": "6.0.1", - "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Logging": "1.0.0", - "MongoDB.Bson": "2.17.1", - "MongoDB.Driver": "2.17.1" + "Ardalis.GuardClauses": "[4.0.1, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", + "Microsoft.Extensions.Options": "[6.0.0, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", + "MongoDB.Bson": "[2.17.1, )", + "MongoDB.Driver": "[2.17.1, )" } }, "monai.deploy.workflowmanager.logging": { "type": "Project", "dependencies": { - "Microsoft.AspNetCore.Mvc.Core": "2.2.5", - "Microsoft.Extensions.Logging.Abstractions": "6.0.1", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0" + "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Serilog": "[2.11.0, )" } }, "monai.deploy.workflowmanager.monaibackgroundservice": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Hosting": "6.0.1", - "Monai.Deploy.WorkflowManager.Common": "1.0.0", - "Monai.Deploy.WorkloadManager.WorkfowExecuter": "1.0.0" + "Microsoft.Extensions.Hosting": "[6.0.1, )", + "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", + "Monai.Deploy.WorkloadManager.WorkfowExecuter": "[1.0.0, )" } }, "monai.deploy.workflowmanager.payloadlistener": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Monai.Deploy.Storage": "0.2.5", - "Monai.Deploy.WorkflowManager.Common": "1.0.0", - "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Logging": "1.0.0", - "Monai.Deploy.WorkloadManager.WorkfowExecuter": "1.0.0" + "Ardalis.GuardClauses": "[4.0.1, )", + "Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )", + "Monai.Deploy.Storage": "[0.2.5, )", + "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", + "Monai.Deploy.WorkloadManager.WorkfowExecuter": "[1.0.0, )" } }, "monai.deploy.workflowmanager.storage": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Monai.Deploy.Storage": "0.2.5", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Logging": "1.0.0" + "Ardalis.GuardClauses": "[4.0.1, )", + "Monai.Deploy.Storage": "[0.2.5, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )" } }, "monai.deploy.workloadmanager.workfowexecuter": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.187, )", + "AWSSDK.SecurityToken": "[3.7.1.193, )", "Ardalis.GuardClauses": "[4.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", - "Monai.Deploy.Storage": "[0.2.1, )", + "Monai.Deploy.Storage": "[0.2.5, )", "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", "Monai.Deploy.WorkflowManager.ConditionsResolver": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", diff --git a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json index d3ee5db8b..a4c7dd4a5 100644 --- a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json +++ b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json @@ -46,12 +46,12 @@ }, "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.3.0, )", - "resolved": "17.3.0", - "contentHash": "ch4JCT7AZdBzvCAKD36t6fDsl7NEzzunwW7MwXUG2uFPoWcMd8B8KYg5fiwxnpdXJHodJk6yIBdSwMpN3Ikt9w==", + "requested": "[17.3.1, )", + "resolved": "17.3.1", + "contentHash": "jH9W5uYannaJ3HhrPBkzSidf3WkqP6XI+Yke0ODYVuFWM6GLVtBAyNgXvU/uQXPBsHq4aysLTsrN1FvG2hlKoQ==", "dependencies": { - "Microsoft.CodeCoverage": "17.3.0", - "Microsoft.TestPlatform.TestHost": "17.3.0" + "Microsoft.CodeCoverage": "17.3.1", + "Microsoft.TestPlatform.TestHost": "17.3.1" } }, "Moq": { @@ -99,15 +99,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.27", - "contentHash": "pCX0yHPFuREXOqGaEQoCSlPZwsiijT1rBBiyk1pdD19Db8gVFglO7wMbxl37OhRNcLZprmtWJFvaDfuzeV10Wg==" + "resolved": "3.7.12.29", + "contentHash": "bxSbEjbCyAzjmUpxVKXiQhkXEvb3w9OHL7AOL9LItY1f5xLB9/qbtHoi5FvmZXTPPi2RahPJr9fDyHMLwQnxiA==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.191", - "contentHash": "tTIqJ/QKaPzTu5ZPdRFa2sW9p5F441RLV7nDdTAVVuu6oLyemna0bTtE+luGLaw17oE4GZHpa5n5p0oJmpzcxA==", + "resolved": "3.7.1.193", + "contentHash": "xDZAerod8OUtyIgIYPiGRO+PRdGDjepGGgH2/DuAK/aoARU/FinaFr+yuUjJItrP53dCezbpdFVSRa1BFpIGfA==", "dependencies": { - "AWSSDK.Core": "[3.7.12.27, 4.0.0)" + "AWSSDK.Core": "[3.7.12.29, 4.0.0)" } }, "Castle.Core": { @@ -391,8 +391,8 @@ }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.3.0", - "contentHash": "/xxz+e29F2V5pePtInjbLffoqWVTm60KCX87vSj2laNboeWq65WFJ634fGtBcMZO3VEfOmh9/XcoWEfLlWWG+g==" + "resolved": "17.3.1", + "contentHash": "WqB7Ik4v8ku0Y9HZShqTStZdq8R1lyhsZr7IMp8zV/OcL5sHVYvlMnardQR+SDQc3dmbniCIl9mYxYM+V7x8MA==" }, "Microsoft.CSharp": { "type": "Transitive", @@ -806,8 +806,8 @@ }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.3.0", - "contentHash": "6NRzi6QbmWV49Psf8A9z1LTJU4nBrlJdCcDOUyD4Ttm1J2wvksu98GlV+52CkxtpgNsUjGr9Mv1Rbb1/dB06yQ==", + "resolved": "17.3.1", + "contentHash": "n1WSFCMiFt6KmD5JzV+Wye5Ntomez3YP2+d15bu5PS5Z1U0g+V7VBLdJIaJRnahz5BsXJDTnLYNVOUdntwjx6Q==", "dependencies": { "NuGet.Frameworks": "5.11.0", "System.Reflection.Metadata": "1.6.0" @@ -815,10 +815,10 @@ }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.3.0", - "contentHash": "uOJALDWtKXZkISKuNI7kOlRi/lk2CqXZtLkNS0Ei+RXqRUjUpCsjAPYSP+DJ/a4QwJ5cI9CVF52vtajnGOaEpw==", + "resolved": "17.3.1", + "contentHash": "co/GMz6rGxpzn2aJYTDDim61HvEk+SHBVtbXnu2RSrz20HxkaraEh0kltCsMkmLAX/6Hz5sa6NquLngBlURTow==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.3.0", + "Microsoft.TestPlatform.ObjectModel": "17.3.1", "Newtonsoft.Json": "9.0.1" } }, @@ -1093,6 +1093,23 @@ "Serilog.Sinks.File": "5.0.0" } }, + "Serilog.Enrichers.Environment": { + "type": "Transitive", + "resolved": "2.2.0", + "contentHash": "DMrj3A4l65kc4JouQyZjjFv7N58Y7lGsB81kSzorTwUGeI2wrTy7CVwSOfG90/Pcu/HV5bwGrUmxDZ38pON+5Q==", + "dependencies": { + "Serilog": "2.3.0" + } + }, + "Serilog.Exceptions": { + "type": "Transitive", + "resolved": "8.4.0", + "contentHash": "nc/+hUw3lsdo0zCj0KMIybAu7perMx79vu72w0za9Nsi6mWyNkGXxYxakAjWB7nEmYL6zdmhEQRB4oJ2ALUeug==", + "dependencies": { + "Serilog": "2.8.0", + "System.Reflection.TypeExtensions": "4.7.0" + } + }, "Serilog.Extensions.Hosting": { "type": "Transitive", "resolved": "5.0.1", @@ -1478,6 +1495,11 @@ "System.Runtime": "4.3.0" } }, + "System.Reflection.TypeExtensions": { + "type": "Transitive", + "resolved": "4.7.0", + "contentHash": "VybpaOQQhqE6siHppMktjfGBw1GCwvCqiufqmP8F1nj7fTUNtW35LOEt3UZTEsECfo+ELAl/9o9nJx3U91i7vA==" + }, "System.Resources.ResourceManager": { "type": "Transitive", "resolved": "4.3.0", @@ -1819,8 +1841,8 @@ "Microsoft.Extensions.Logging": "[6.0.0, )", "Microsoft.Extensions.Logging.Console": "[6.0.0, )", "Microsoft.Extensions.Options": "[6.0.0, )", - "Monai.Deploy.Messaging.RabbitMQ": "[0.1.3-rc0011, )", - "Monai.Deploy.Storage.MinIO": "[0.2.1, )", + "Monai.Deploy.Messaging.RabbitMQ": "[0.1.3-rc0012, )", + "Monai.Deploy.Storage.MinIO": "[0.2.5, )", "Monai.Deploy.WorkflowManager.Authentication": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", @@ -1832,6 +1854,8 @@ "Newtonsoft.Json": "[13.0.1, )", "Serilog": "[2.11.0, )", "Serilog.AspNetCore": "[6.0.1, )", + "Serilog.Enrichers.Environment": "[2.2.0, )", + "Serilog.Exceptions": "[8.4.0, )", "Serilog.Sinks.Http": "[8.0.0, )", "Swashbuckle.AspNetCore": "[6.4.0, )" } @@ -1839,48 +1863,48 @@ "monai.deploy.workflowmanager.authentication": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.AspNetCore.Authentication.JwtBearer": "6.0.8", - "Monai.Deploy.WorkflowManager.Common": "1.0.0" + "Ardalis.GuardClauses": "[4.0.1, )", + "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.8, )", + "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )" } }, "monai.deploy.workflowmanager.common": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.DependencyInjection.Abstractions": "6.0.0", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Database": "1.0.0", - "Monai.Deploy.WorkflowManager.Storage": "1.0.0" + "Ardalis.GuardClauses": "[4.0.1, )", + "Microsoft.Extensions.DependencyInjection.Abstractions": "[6.0.0, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" } }, "monai.deploy.workflowmanager.conditionsresolver": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Monai.Deploy.WorkflowManager.Common": "1.0.0", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Database": "1.0.0", - "Monai.Deploy.WorkflowManager.Storage": "1.0.0" + "Ardalis.GuardClauses": "[4.0.1, )", + "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Database": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Storage": "[1.0.0, )" } }, "monai.deploy.workflowmanager.configuration": { "type": "Project", "dependencies": { - "Karambolo.Extensions.Logging.File": "3.3.1", - "Microsoft.Extensions.Configuration": "6.0.1", - "Microsoft.Extensions.Logging": "6.0.0", - "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.Messaging": "0.1.3-rc0012", - "Monai.Deploy.Storage": "0.2.5", - "Newtonsoft.Json": "13.0.1", - "System.IO.Abstractions": "17.1.1" + "Karambolo.Extensions.Logging.File": "[3.3.1, )", + "Microsoft.Extensions.Configuration": "[6.0.1, )", + "Microsoft.Extensions.Logging": "[6.0.0, )", + "Microsoft.Extensions.Options": "[6.0.0, )", + "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", + "Monai.Deploy.Storage": "[0.2.5, )", + "Newtonsoft.Json": "[13.0.1, )", + "System.IO.Abstractions": "[17.1.1, )" } }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.191, )", + "AWSSDK.SecurityToken": "[3.7.1.193, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", "MongoDB.Bson": "[2.17.1, )", @@ -1890,60 +1914,61 @@ "monai.deploy.workflowmanager.database": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Logging.Abstractions": "6.0.1", - "Microsoft.Extensions.Options": "6.0.0", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Logging": "1.0.0", - "MongoDB.Bson": "2.17.1", - "MongoDB.Driver": "2.17.1" + "Ardalis.GuardClauses": "[4.0.1, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", + "Microsoft.Extensions.Options": "[6.0.0, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", + "MongoDB.Bson": "[2.17.1, )", + "MongoDB.Driver": "[2.17.1, )" } }, "monai.deploy.workflowmanager.logging": { "type": "Project", "dependencies": { - "Microsoft.AspNetCore.Mvc.Core": "2.2.5", - "Microsoft.Extensions.Logging.Abstractions": "6.0.1", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0" + "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Serilog": "[2.11.0, )" } }, "monai.deploy.workflowmanager.monaibackgroundservice": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Hosting": "6.0.1", - "Monai.Deploy.WorkflowManager.Common": "1.0.0", - "Monai.Deploy.WorkloadManager.WorkfowExecuter": "1.0.0" + "Microsoft.Extensions.Hosting": "[6.0.1, )", + "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", + "Monai.Deploy.WorkloadManager.WorkfowExecuter": "[1.0.0, )" } }, "monai.deploy.workflowmanager.payloadlistener": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Microsoft.Extensions.Hosting.Abstractions": "6.0.0", - "Monai.Deploy.Storage": "0.2.5", - "Monai.Deploy.WorkflowManager.Common": "1.0.0", - "Monai.Deploy.WorkflowManager.Configuration": "1.0.0", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Logging": "1.0.0", - "Monai.Deploy.WorkloadManager.WorkfowExecuter": "1.0.0" + "Ardalis.GuardClauses": "[4.0.1, )", + "Microsoft.Extensions.Hosting.Abstractions": "[6.0.0, )", + "Monai.Deploy.Storage": "[0.2.5, )", + "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", + "Monai.Deploy.WorkloadManager.WorkfowExecuter": "[1.0.0, )" } }, "monai.deploy.workflowmanager.storage": { "type": "Project", "dependencies": { - "Ardalis.GuardClauses": "4.0.1", - "Monai.Deploy.Storage": "0.2.5", - "Monai.Deploy.WorkflowManager.Contracts": "1.0.0", - "Monai.Deploy.WorkflowManager.Logging": "1.0.0" + "Ardalis.GuardClauses": "[4.0.1, )", + "Monai.Deploy.Storage": "[0.2.5, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )" } }, "monai.deploy.workloadmanager.workfowexecuter": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.191, )", + "AWSSDK.SecurityToken": "[3.7.1.193, )", "Ardalis.GuardClauses": "[4.0.1, )", "Monai.Deploy.Messaging": "[0.1.3-rc0012, )", - "Monai.Deploy.Storage": "[0.2.1, )", + "Monai.Deploy.Storage": "[0.2.5, )", "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )", "Monai.Deploy.WorkflowManager.ConditionsResolver": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", From d078a1ba934d1e96c9695db946e3611bce825d14 Mon Sep 17 00:00:00 2001 From: Neil South Date: Thu, 15 Sep 2022 16:31:22 +0100 Subject: [PATCH 7/9] merge fix up Signed-off-by: Neil South --- ....Deploy.WorkflowManager.TaskManager.csproj | 201 +++++++++--------- src/TaskManager/TaskManager/Program.cs | 2 +- .../TaskManager/packages.lock.json | 9 + .../ConditionsResolver/packages.lock.json | 8 +- src/WorkflowManager/Logging/Logging/Log.cs | 4 +- ...loy.WorkloadManager.WorkfowExecuter.csproj | 108 +++++----- .../WorkflowManager/packages.lock.json | 3 +- .../Database.Tests/packages.lock.json | 8 +- .../PayloadListener.Tests/packages.lock.json | 8 +- ...kflowManager.WorkflowExecuter.Tests.csproj | 1 + .../WorkflowManager.Tests/packages.lock.json | 9 +- 11 files changed, 199 insertions(+), 162 deletions(-) diff --git a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj index 5ba3a999c..854b66a00 100644 --- a/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj +++ b/src/TaskManager/TaskManager/Monai.Deploy.WorkflowManager.TaskManager.csproj @@ -1,113 +1,114 @@ - - - - - - Exe - net6.0 - enable - enable - false - false - - - + + + + + + Exe + net6.0 + enable + enable + false + false + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + - - + + - - - - - - - + + + + + + + - - - - - Always - - - Always - - - PreserveNewest - - - - - true - true - ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset - - - - - - - - - - - - - - - - - - - + + + + + Always + + + Always + + + PreserveNewest + + + + + true + true + ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset + + + + + + + + + + + + + + + + + + + diff --git a/src/TaskManager/TaskManager/Program.cs b/src/TaskManager/TaskManager/Program.cs index 4b53592f2..cc5d83dfc 100644 --- a/src/TaskManager/TaskManager/Program.cs +++ b/src/TaskManager/TaskManager/Program.cs @@ -17,7 +17,7 @@ using System.IO.Abstractions; using System.Reflection; using Elastic.CommonSchema.Serilog; -using k8s.KubeConfigModels; +using Microsoft.AspNetCore.StaticFiles; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; diff --git a/src/TaskManager/TaskManager/packages.lock.json b/src/TaskManager/TaskManager/packages.lock.json index c2f02327f..ffe0312f2 100644 --- a/src/TaskManager/TaskManager/packages.lock.json +++ b/src/TaskManager/TaskManager/packages.lock.json @@ -2,6 +2,15 @@ "version": 1, "dependencies": { "net6.0": { + "Elastic.CommonSchema": { + "type": "Direct", + "requested": "[1.5.3, )", + "resolved": "1.5.3", + "contentHash": "JgwhfThYY/s17asUiBCUVqnZtDdGTWO/2hTPG01QDfw2+T6kfwskrj5eh6XpBZsOh6r9SpBL95vSsU+q44i7Zg==", + "dependencies": { + "System.Text.Json": "4.7.0" + } + }, "Elastic.CommonSchema.Serilog": { "type": "Direct", "requested": "[1.5.3, )", diff --git a/src/WorkflowManager/ConditionsResolver/packages.lock.json b/src/WorkflowManager/ConditionsResolver/packages.lock.json index 98693857a..faf9c75fc 100644 --- a/src/WorkflowManager/ConditionsResolver/packages.lock.json +++ b/src/WorkflowManager/ConditionsResolver/packages.lock.json @@ -457,6 +457,11 @@ "Microsoft.NETCore.Targets": "1.0.1" } }, + "Serilog": { + "type": "Transitive", + "resolved": "2.11.0", + "contentHash": "ysv+hBzTul6Dp+Hvm10FlhJO3yMQcFKSAleus+LpiIzvNstpeV4Z7gGuIZ1OPNfIMulSHOjmLuGAEDKzpnV8ZQ==" + }, "SharpCompress": { "type": "Transitive", "resolved": "0.30.1", @@ -876,7 +881,8 @@ "dependencies": { "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Serilog": "[2.11.0, )" } }, "monai.deploy.workflowmanager.storage": { diff --git a/src/WorkflowManager/Logging/Logging/Log.cs b/src/WorkflowManager/Logging/Logging/Log.cs index 202c7aabf..d8aef50f9 100644 --- a/src/WorkflowManager/Logging/Logging/Log.cs +++ b/src/WorkflowManager/Logging/Logging/Log.cs @@ -118,7 +118,7 @@ public static void LogControllerStartTime(this ILogger logger, ActionExecutingCo { var request = context.HttpContext.Request; var body = JsonConvert.SerializeObject(context.ActionArguments.FirstOrDefault()); - logger.LogInformation("ControllerActionStart data HttpType {httptype}, Path {path}, QueryString {querystring}, Body {body}", + logger.LogInformation(29, "ControllerActionStart data HttpType {httptype}, Path {path}, QueryString {querystring}, Body {body}", request.Method, request.Path, request.QueryString.Value.ToString(), body); } @@ -137,7 +137,7 @@ public static void LogControllerEndTime(this ILogger logger, ResultExecutedConte objResult = (ObjectResult)context.Result; } - logger.LogInformation("ControllerActionEnd data EndTime {endtime}, Duration {duration}, HttpType {httptype}, Path {path}, QueryString {querystring}, StatusCode {statuscode}, Result {result}", + logger.LogInformation(30, "ControllerActionEnd data EndTime {endtime}, Duration {duration}, HttpType {httptype}, Path {path}, QueryString {querystring}, StatusCode {statuscode}, Result {result}", endtime, (endtime - startTime).TotalMilliseconds, request.Method, request.Path, request.QueryString.Value.ToString(), response.StatusCode, JsonConvert.SerializeObject(objResult)); diff --git a/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj b/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj index dcaf2eb0f..8916f54cb 100644 --- a/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj +++ b/src/WorkflowManager/WorkflowExecuter/Monai.Deploy.WorkloadManager.WorkfowExecuter.csproj @@ -1,57 +1,57 @@ - - - - - - net6.0 - enable - enable - - - - - - + + + + + + net6.0 + enable + enable + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - true - true - ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset - - - + + + + + + + + + + + + + + + + + true + true + ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset + + + diff --git a/src/WorkflowManager/WorkflowManager/packages.lock.json b/src/WorkflowManager/WorkflowManager/packages.lock.json index 021955e21..b2bd4497e 100644 --- a/src/WorkflowManager/WorkflowManager/packages.lock.json +++ b/src/WorkflowManager/WorkflowManager/packages.lock.json @@ -1716,7 +1716,8 @@ "dependencies": { "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Serilog": "[2.11.0, )" } }, "monai.deploy.workflowmanager.monaibackgroundservice": { diff --git a/tests/UnitTests/Database.Tests/packages.lock.json b/tests/UnitTests/Database.Tests/packages.lock.json index 53d6ddce2..b0b076133 100644 --- a/tests/UnitTests/Database.Tests/packages.lock.json +++ b/tests/UnitTests/Database.Tests/packages.lock.json @@ -670,6 +670,11 @@ "resolved": "4.3.0", "contentHash": "VB5cn/7OzUfzdnC8tqAIMQciVLiq2epm2NrAm1E9OjNRyG4lVhfR61SMcLizejzQP8R8Uf/0l5qOIbUEi+RdEg==" }, + "Serilog": { + "type": "Transitive", + "resolved": "2.11.0", + "contentHash": "ysv+hBzTul6Dp+Hvm10FlhJO3yMQcFKSAleus+LpiIzvNstpeV4Z7gGuIZ1OPNfIMulSHOjmLuGAEDKzpnV8ZQ==" + }, "SharpCompress": { "type": "Transitive", "resolved": "0.30.1", @@ -1527,7 +1532,8 @@ "dependencies": { "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Serilog": "[2.11.0, )" } } } diff --git a/tests/UnitTests/PayloadListener.Tests/packages.lock.json b/tests/UnitTests/PayloadListener.Tests/packages.lock.json index f28bd3ea4..fab33e614 100644 --- a/tests/UnitTests/PayloadListener.Tests/packages.lock.json +++ b/tests/UnitTests/PayloadListener.Tests/packages.lock.json @@ -593,6 +593,11 @@ "Microsoft.NETCore.Targets": "1.0.1" } }, + "Serilog": { + "type": "Transitive", + "resolved": "2.11.0", + "contentHash": "ysv+hBzTul6Dp+Hvm10FlhJO3yMQcFKSAleus+LpiIzvNstpeV4Z7gGuIZ1OPNfIMulSHOjmLuGAEDKzpnV8ZQ==" + }, "SharpCompress": { "type": "Transitive", "resolved": "0.30.1", @@ -1045,7 +1050,8 @@ "dependencies": { "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Serilog": "[2.11.0, )" } }, "monai.deploy.workflowmanager.payloadlistener": { diff --git a/tests/UnitTests/WorkflowExecuter.Tests/Monai.Deploy.WorkflowManager.WorkflowExecuter.Tests.csproj b/tests/UnitTests/WorkflowExecuter.Tests/Monai.Deploy.WorkflowManager.WorkflowExecuter.Tests.csproj index 06e9cc3b1..0084839fd 100644 --- a/tests/UnitTests/WorkflowExecuter.Tests/Monai.Deploy.WorkflowManager.WorkflowExecuter.Tests.csproj +++ b/tests/UnitTests/WorkflowExecuter.Tests/Monai.Deploy.WorkflowManager.WorkflowExecuter.Tests.csproj @@ -26,6 +26,7 @@ + diff --git a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json index f22ae844c..fcd8bc581 100644 --- a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json +++ b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json @@ -1831,6 +1831,7 @@ "type": "Project", "dependencies": { "Ardalis.GuardClauses": "[4.0.1, )", + "Elastic.CommonSchema.Serilog": "[1.5.3, )", "Karambolo.Extensions.Logging.File": "[3.3.1, )", "Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[6.0.8, )", "Microsoft.AspNetCore.Mvc.Versioning": "[5.0.0, )", @@ -1852,6 +1853,11 @@ "Monai.Deploy.WorkflowManager.MonaiBackgroundService": "[1.0.0, )", "Monai.Deploy.WorkflowManager.PayloadListener": "[1.0.0, )", "Newtonsoft.Json": "[13.0.1, )", + "Serilog": "[2.11.0, )", + "Serilog.AspNetCore": "[6.0.1, )", + "Serilog.Enrichers.Environment": "[2.2.0, )", + "Serilog.Exceptions": "[8.4.0, )", + "Serilog.Sinks.Http": "[8.0.0, )", "Swashbuckle.AspNetCore": "[6.4.0, )" } }, @@ -1923,7 +1929,8 @@ "dependencies": { "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", + "Serilog": "[2.11.0, )" } }, "monai.deploy.workflowmanager.monaibackgroundservice": { From 591af2274a8ad21a163cc18b7094200540e0c9b6 Mon Sep 17 00:00:00 2001 From: Neil South Date: Mon, 26 Sep 2022 08:59:26 +0100 Subject: [PATCH 8/9] small update to docs Signed-off-by: Neil South --- guidelines/mwm-developer-setup.md | 14 +- .../Monai.Deploy.WorkflowManager.csproj | 206 +++++++++--------- 2 files changed, 107 insertions(+), 113 deletions(-) diff --git a/guidelines/mwm-developer-setup.md b/guidelines/mwm-developer-setup.md index 8b98da441..cbf9e2f58 100644 --- a/guidelines/mwm-developer-setup.md +++ b/guidelines/mwm-developer-setup.md @@ -74,7 +74,7 @@ Open the post/workflows tab and click `try it out`, paste in the following to th "version": "1.0.0", "description": "Attempt at making a workflow", "informatics_gateway": { - "ae_title": "MonaiSCU", + "ae_title": "MONAISCU", "data_origins": [ "MY_SCANNER" ], @@ -91,25 +91,19 @@ Open the post/workflows tab and click `try it out`, paste in the following to th "namespace":"argo", "workflow_template_name": "simple-workflow", "server_url": "https://localhost:2746", - "allow_insecure": true, - "messaging_endpoint": "rabbit-monai", - "messaging_username" : "admin", - "messaging_password" : "admin", - "messaging_topic" : "md.tasks.callback", - "messaging_exchange" : "monaideploy", - "messaging_vhost" : "monaideploy", + "allow_insecure": true }, "artifacts": { "input": [ { "name": "input_diacom", - "value": "{{ context.input.dicom }}/input_dicom" + "value": "{{ context.input.dicom }}" } ], "output": [ { "name": "report", - "value": "{{ context.output }}/report", + "value": "{{ context.output }}", "Mandatory": false } ] diff --git a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj index 65b944867..e5956825d 100644 --- a/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj +++ b/src/WorkflowManager/WorkflowManager/Monai.Deploy.WorkflowManager.csproj @@ -1,112 +1,112 @@ - - - - - Exe - net6.0 - Monai.Deploy.WorkflowManager - false - false - - - - - - - - - - + + + + + Exe + net6.0 + Monai.Deploy.WorkflowManager + false + false + + + + + + + + + + - - - - + + + + - - - - - - - - - - - + + + + + + + + + + + - + - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - - - - - - - - - - - - - - - - Always - - - Always - - - PreserveNewest - - - - - true - true - ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Always + + + Always + + + PreserveNewest + + + + + true + true + ..\..\.sonarlint\project-monai_monai-deploy-workflow-managercsharp.ruleset + + + + + + + + + + + + + + + + + + + From 2b557ba3d9577b29b86ccc28f0e6331cd0985761 Mon Sep 17 00:00:00 2001 From: Neil South Date: Mon, 26 Sep 2022 09:06:32 +0100 Subject: [PATCH 9/9] Signed-off-by: Neil South Merged --- src/Shared/Configuration/packages.lock.json | 6 +- .../Plug-ins/Argo/packages.lock.json | 12 ++-- .../TaskManager/packages.lock.json | 18 ++--- .../ConditionsResolver/packages.lock.json | 23 +++---- .../Database/packages.lock.json | 23 +++---- .../Logging/packages.lock.json | 18 ++--- .../PayloadListener/packages.lock.json | 31 ++++----- .../Storage/packages.lock.json | 21 +++--- .../WorkflowExecuter/packages.lock.json | 31 ++++----- .../WorkflowManager/packages.lock.json | 55 ++++++++------- .../Database.Tests/packages.lock.json | 23 +++---- .../PayloadListener.Tests/packages.lock.json | 31 ++++----- .../WorkflowManager.Tests/packages.lock.json | 69 +++++++++---------- 13 files changed, 176 insertions(+), 185 deletions(-) diff --git a/src/Shared/Configuration/packages.lock.json b/src/Shared/Configuration/packages.lock.json index 349690c31..07a963e12 100644 --- a/src/Shared/Configuration/packages.lock.json +++ b/src/Shared/Configuration/packages.lock.json @@ -86,9 +86,9 @@ }, "System.IO.Abstractions": { "type": "Direct", - "requested": "[17.1.1, )", - "resolved": "17.1.1", - "contentHash": "LWOM12Bd0kp/gaH4g1o/O2/6JDcHF/fuctF1IqDZt0aAqU2BwGiMihi9Cdcm5jJz8La1wFWbRPuRui8WeX6m8w==" + "requested": "[17.2.3, )", + "resolved": "17.2.3", + "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" }, "Ardalis.GuardClauses": { "type": "Transitive", diff --git a/src/TaskManager/Plug-ins/Argo/packages.lock.json b/src/TaskManager/Plug-ins/Argo/packages.lock.json index 2dc65f55e..23436dc3c 100644 --- a/src/TaskManager/Plug-ins/Argo/packages.lock.json +++ b/src/TaskManager/Plug-ins/Argo/packages.lock.json @@ -28,9 +28,9 @@ }, "Microsoft.Extensions.ApiDescription.Client": { "type": "Direct", - "requested": "[6.0.8, )", - "resolved": "6.0.8", - "contentHash": "fN3zEuHjSql9w2Md29dYkmPbAijxr+LqxoOoJ9B8G2j+fHgAK/N0g89miIUwepwbk8izTi5m8cVyWTKQgkd+ww==" + "requested": "[6.0.9, )", + "resolved": "6.0.9", + "contentHash": "DjwJLPdOzBceBV+V91FfFGHGV2I0UKfOpCLtCXQhaSdkyDF/0Ce2j0GnNrqYesU/LJ9R6n6mIU8fgieD5absMg==" }, "Monai.Deploy.Messaging": { "type": "Direct", @@ -416,8 +416,8 @@ }, "System.IO.Abstractions": { "type": "Transitive", - "resolved": "17.1.1", - "contentHash": "LWOM12Bd0kp/gaH4g1o/O2/6JDcHF/fuctF1IqDZt0aAqU2BwGiMihi9Cdcm5jJz8La1wFWbRPuRui8WeX6m8w==" + "resolved": "17.2.3", + "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" }, "System.Memory": { "type": "Transitive", @@ -560,7 +560,7 @@ "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", "Monai.Deploy.Storage": "[0.2.5, )", "Newtonsoft.Json": "[13.0.1, )", - "System.IO.Abstractions": "[17.1.1, )" + "System.IO.Abstractions": "[17.2.3, )" } }, "monai.deploy.workflowmanager.taskmanager.api": { diff --git a/src/TaskManager/TaskManager/packages.lock.json b/src/TaskManager/TaskManager/packages.lock.json index ffe0312f2..b0667cab5 100644 --- a/src/TaskManager/TaskManager/packages.lock.json +++ b/src/TaskManager/TaskManager/packages.lock.json @@ -249,8 +249,8 @@ }, "Docker.DotNet": { "type": "Transitive", - "resolved": "3.125.10", - "contentHash": "sKu8AFiRPao1IqYPUT2mAxT0c7F+dgEfOonuVfgn5FYdHccHdL9Ge4Jsem0KHlxYzqE6QpOFDt1hR/J1XzqogQ==", + "resolved": "3.125.12", + "contentHash": "lkDh6PUV8SIM1swPCkd3f+8zGB7Z9Am3C2XBLqAjyIIp5jQBCsDFrtbtA1QiVdFMWdYcJscrX/gzzG50kRj0jQ==", "dependencies": { "Newtonsoft.Json": "13.0.1", "System.Buffers": "4.5.1", @@ -499,8 +499,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" + "resolved": "6.0.2", + "contentHash": "pwXCZKaA7m5wgmCj49dW+H1RPSY7U62SKLTQYCcavf/k3Nyt/WnBgAjG4jMGnwy9rElfAZ2KvxvM5CJzJWG0hg==" }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -1001,8 +1001,8 @@ }, "System.IO.Abstractions": { "type": "Transitive", - "resolved": "17.1.1", - "contentHash": "LWOM12Bd0kp/gaH4g1o/O2/6JDcHF/fuctF1IqDZt0aAqU2BwGiMihi9Cdcm5jJz8La1wFWbRPuRui8WeX6m8w==" + "resolved": "17.2.3", + "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" }, "System.IO.FileSystem": { "type": "Transitive", @@ -1425,7 +1425,7 @@ "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", "Monai.Deploy.Storage": "[0.2.5, )", "Newtonsoft.Json": "[13.0.1, )", - "System.IO.Abstractions": "[17.1.1, )" + "System.IO.Abstractions": "[17.2.3, )" } }, "monai.deploy.workflowmanager.taskmanager.api": { @@ -1452,7 +1452,7 @@ "type": "Project", "dependencies": { "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.2, )", "Microsoft.Extensions.Options": "[6.0.0, )", "Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )", "MongoDB.Bson": "[2.17.1, )", @@ -1462,7 +1462,7 @@ "monai.deploy.workflowmanager.taskmanager.docker": { "type": "Project", "dependencies": { - "Docker.DotNet": "[3.125.10, )", + "Docker.DotNet": "[3.125.12, )", "Monai.Deploy.WorkflowManager.Configuration": "[1.0.0, )", "Monai.Deploy.WorkflowManager.TaskManager.API": "[1.0.0, )" } diff --git a/src/WorkflowManager/ConditionsResolver/packages.lock.json b/src/WorkflowManager/ConditionsResolver/packages.lock.json index faf9c75fc..e09a9d89a 100644 --- a/src/WorkflowManager/ConditionsResolver/packages.lock.json +++ b/src/WorkflowManager/ConditionsResolver/packages.lock.json @@ -13,15 +13,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.29", - "contentHash": "bxSbEjbCyAzjmUpxVKXiQhkXEvb3w9OHL7AOL9LItY1f5xLB9/qbtHoi5FvmZXTPPi2RahPJr9fDyHMLwQnxiA==" + "resolved": "3.7.13.8", + "contentHash": "ZfTD73tT+xQ7WrWDQ8G6+NYHZ4bXUc7jVMiL3477BXbQ7JS9xu/jt9lSJTHBecZ+2bOBnpLRCshBcjRJ6+OD/Q==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.193", - "contentHash": "xDZAerod8OUtyIgIYPiGRO+PRdGDjepGGgH2/DuAK/aoARU/FinaFr+yuUjJItrP53dCezbpdFVSRa1BFpIGfA==", + "resolved": "3.7.1.203", + "contentHash": "sTE7CLWvoloHPoTjBDDYGUI1n63nZ8YBttuhWI2pnfmJuaYdyqFWf7a4scqus3g5L9WpPhRW5MsfNe30hgsZjQ==", "dependencies": { - "AWSSDK.Core": "[3.7.12.29, 4.0.0)" + "AWSSDK.Core": "[3.7.13.8, 4.0.0)" } }, "DnsClient": { @@ -308,8 +308,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" + "resolved": "6.0.2", + "contentHash": "pwXCZKaA7m5wgmCj49dW+H1RPSY7U62SKLTQYCcavf/k3Nyt/WnBgAjG4jMGnwy9rElfAZ2KvxvM5CJzJWG0hg==" }, "Microsoft.Extensions.ObjectPool": { "type": "Transitive", @@ -857,7 +857,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.193, )", + "AWSSDK.SecurityToken": "[3.7.1.203, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", "MongoDB.Bson": "[2.17.1, )", @@ -868,7 +868,7 @@ "type": "Project", "dependencies": { "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.2, )", "Microsoft.Extensions.Options": "[6.0.0, )", "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", @@ -880,9 +880,8 @@ "type": "Project", "dependencies": { "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Serilog": "[2.11.0, )" + "Microsoft.Extensions.Logging.Abstractions": "[6.0.2, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" } }, "monai.deploy.workflowmanager.storage": { diff --git a/src/WorkflowManager/Database/packages.lock.json b/src/WorkflowManager/Database/packages.lock.json index 86e359bf2..6896f163c 100644 --- a/src/WorkflowManager/Database/packages.lock.json +++ b/src/WorkflowManager/Database/packages.lock.json @@ -13,9 +13,9 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Direct", - "requested": "[6.0.1, )", - "resolved": "6.0.1", - "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" + "requested": "[6.0.2, )", + "resolved": "6.0.2", + "contentHash": "pwXCZKaA7m5wgmCj49dW+H1RPSY7U62SKLTQYCcavf/k3Nyt/WnBgAjG4jMGnwy9rElfAZ2KvxvM5CJzJWG0hg==" }, "Microsoft.Extensions.Options": { "type": "Direct", @@ -49,15 +49,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.29", - "contentHash": "bxSbEjbCyAzjmUpxVKXiQhkXEvb3w9OHL7AOL9LItY1f5xLB9/qbtHoi5FvmZXTPPi2RahPJr9fDyHMLwQnxiA==" + "resolved": "3.7.13.8", + "contentHash": "ZfTD73tT+xQ7WrWDQ8G6+NYHZ4bXUc7jVMiL3477BXbQ7JS9xu/jt9lSJTHBecZ+2bOBnpLRCshBcjRJ6+OD/Q==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.193", - "contentHash": "xDZAerod8OUtyIgIYPiGRO+PRdGDjepGGgH2/DuAK/aoARU/FinaFr+yuUjJItrP53dCezbpdFVSRa1BFpIGfA==", + "resolved": "3.7.1.203", + "contentHash": "sTE7CLWvoloHPoTjBDDYGUI1n63nZ8YBttuhWI2pnfmJuaYdyqFWf7a4scqus3g5L9WpPhRW5MsfNe30hgsZjQ==", "dependencies": { - "AWSSDK.Core": "[3.7.12.29, 4.0.0)" + "AWSSDK.Core": "[3.7.13.8, 4.0.0)" } }, "DnsClient": { @@ -828,7 +828,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.193, )", + "AWSSDK.SecurityToken": "[3.7.1.203, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", "MongoDB.Bson": "[2.17.1, )", @@ -839,9 +839,8 @@ "type": "Project", "dependencies": { "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Serilog": "[2.11.0, )" + "Microsoft.Extensions.Logging.Abstractions": "[6.0.2, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" } } } diff --git a/src/WorkflowManager/Logging/packages.lock.json b/src/WorkflowManager/Logging/packages.lock.json index 8b3e5980e..ffb5ead72 100644 --- a/src/WorkflowManager/Logging/packages.lock.json +++ b/src/WorkflowManager/Logging/packages.lock.json @@ -27,9 +27,9 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Direct", - "requested": "[6.0.1, )", - "resolved": "6.0.1", - "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" + "requested": "[6.0.2, )", + "resolved": "6.0.2", + "contentHash": "pwXCZKaA7m5wgmCj49dW+H1RPSY7U62SKLTQYCcavf/k3Nyt/WnBgAjG4jMGnwy9rElfAZ2KvxvM5CJzJWG0hg==" }, "Serilog": { "type": "Direct", @@ -47,15 +47,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.29", - "contentHash": "bxSbEjbCyAzjmUpxVKXiQhkXEvb3w9OHL7AOL9LItY1f5xLB9/qbtHoi5FvmZXTPPi2RahPJr9fDyHMLwQnxiA==" + "resolved": "3.7.13.8", + "contentHash": "ZfTD73tT+xQ7WrWDQ8G6+NYHZ4bXUc7jVMiL3477BXbQ7JS9xu/jt9lSJTHBecZ+2bOBnpLRCshBcjRJ6+OD/Q==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.193", - "contentHash": "xDZAerod8OUtyIgIYPiGRO+PRdGDjepGGgH2/DuAK/aoARU/FinaFr+yuUjJItrP53dCezbpdFVSRa1BFpIGfA==", + "resolved": "3.7.1.203", + "contentHash": "sTE7CLWvoloHPoTjBDDYGUI1n63nZ8YBttuhWI2pnfmJuaYdyqFWf7a4scqus3g5L9WpPhRW5MsfNe30hgsZjQ==", "dependencies": { - "AWSSDK.Core": "[3.7.12.29, 4.0.0)" + "AWSSDK.Core": "[3.7.13.8, 4.0.0)" } }, "JetBrains.Annotations": { @@ -763,7 +763,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.193, )", + "AWSSDK.SecurityToken": "[3.7.1.203, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", "MongoDB.Bson": "[2.17.1, )", diff --git a/src/WorkflowManager/PayloadListener/packages.lock.json b/src/WorkflowManager/PayloadListener/packages.lock.json index e78a3c5cf..7c01c659f 100644 --- a/src/WorkflowManager/PayloadListener/packages.lock.json +++ b/src/WorkflowManager/PayloadListener/packages.lock.json @@ -39,15 +39,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.29", - "contentHash": "bxSbEjbCyAzjmUpxVKXiQhkXEvb3w9OHL7AOL9LItY1f5xLB9/qbtHoi5FvmZXTPPi2RahPJr9fDyHMLwQnxiA==" + "resolved": "3.7.13.8", + "contentHash": "ZfTD73tT+xQ7WrWDQ8G6+NYHZ4bXUc7jVMiL3477BXbQ7JS9xu/jt9lSJTHBecZ+2bOBnpLRCshBcjRJ6+OD/Q==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.193", - "contentHash": "xDZAerod8OUtyIgIYPiGRO+PRdGDjepGGgH2/DuAK/aoARU/FinaFr+yuUjJItrP53dCezbpdFVSRa1BFpIGfA==", + "resolved": "3.7.1.203", + "contentHash": "sTE7CLWvoloHPoTjBDDYGUI1n63nZ8YBttuhWI2pnfmJuaYdyqFWf7a4scqus3g5L9WpPhRW5MsfNe30hgsZjQ==", "dependencies": { - "AWSSDK.Core": "[3.7.12.29, 4.0.0)" + "AWSSDK.Core": "[3.7.13.8, 4.0.0)" } }, "DnsClient": { @@ -357,8 +357,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" + "resolved": "6.0.2", + "contentHash": "pwXCZKaA7m5wgmCj49dW+H1RPSY7U62SKLTQYCcavf/k3Nyt/WnBgAjG4jMGnwy9rElfAZ2KvxvM5CJzJWG0hg==" }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -614,8 +614,8 @@ }, "System.IO.Abstractions": { "type": "Transitive", - "resolved": "17.1.1", - "contentHash": "LWOM12Bd0kp/gaH4g1o/O2/6JDcHF/fuctF1IqDZt0aAqU2BwGiMihi9Cdcm5jJz8La1wFWbRPuRui8WeX6m8w==" + "resolved": "17.2.3", + "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" }, "System.IO.FileSystem": { "type": "Transitive", @@ -929,13 +929,13 @@ "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", "Monai.Deploy.Storage": "[0.2.5, )", "Newtonsoft.Json": "[13.0.1, )", - "System.IO.Abstractions": "[17.1.1, )" + "System.IO.Abstractions": "[17.2.3, )" } }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.193, )", + "AWSSDK.SecurityToken": "[3.7.1.203, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", "MongoDB.Bson": "[2.17.1, )", @@ -946,7 +946,7 @@ "type": "Project", "dependencies": { "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.2, )", "Microsoft.Extensions.Options": "[6.0.0, )", "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", @@ -958,9 +958,8 @@ "type": "Project", "dependencies": { "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Serilog": "[2.11.0, )" + "Microsoft.Extensions.Logging.Abstractions": "[6.0.2, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" } }, "monai.deploy.workflowmanager.storage": { @@ -975,7 +974,7 @@ "monai.deploy.workloadmanager.workfowexecuter": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.193, )", + "AWSSDK.SecurityToken": "[3.7.1.203, )", "Ardalis.GuardClauses": "[4.0.1, )", "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", "Monai.Deploy.Storage": "[0.2.5, )", diff --git a/src/WorkflowManager/Storage/packages.lock.json b/src/WorkflowManager/Storage/packages.lock.json index b0d37e580..765323789 100644 --- a/src/WorkflowManager/Storage/packages.lock.json +++ b/src/WorkflowManager/Storage/packages.lock.json @@ -28,15 +28,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.29", - "contentHash": "bxSbEjbCyAzjmUpxVKXiQhkXEvb3w9OHL7AOL9LItY1f5xLB9/qbtHoi5FvmZXTPPi2RahPJr9fDyHMLwQnxiA==" + "resolved": "3.7.13.8", + "contentHash": "ZfTD73tT+xQ7WrWDQ8G6+NYHZ4bXUc7jVMiL3477BXbQ7JS9xu/jt9lSJTHBecZ+2bOBnpLRCshBcjRJ6+OD/Q==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.193", - "contentHash": "xDZAerod8OUtyIgIYPiGRO+PRdGDjepGGgH2/DuAK/aoARU/FinaFr+yuUjJItrP53dCezbpdFVSRa1BFpIGfA==", + "resolved": "3.7.1.203", + "contentHash": "sTE7CLWvoloHPoTjBDDYGUI1n63nZ8YBttuhWI2pnfmJuaYdyqFWf7a4scqus3g5L9WpPhRW5MsfNe30hgsZjQ==", "dependencies": { - "AWSSDK.Core": "[3.7.12.29, 4.0.0)" + "AWSSDK.Core": "[3.7.13.8, 4.0.0)" } }, "JetBrains.Annotations": { @@ -315,8 +315,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" + "resolved": "6.0.2", + "contentHash": "pwXCZKaA7m5wgmCj49dW+H1RPSY7U62SKLTQYCcavf/k3Nyt/WnBgAjG4jMGnwy9rElfAZ2KvxvM5CJzJWG0hg==" }, "Microsoft.Extensions.ObjectPool": { "type": "Transitive", @@ -785,7 +785,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.193, )", + "AWSSDK.SecurityToken": "[3.7.1.203, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", "MongoDB.Bson": "[2.17.1, )", @@ -796,9 +796,8 @@ "type": "Project", "dependencies": { "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Serilog": "[2.11.0, )" + "Microsoft.Extensions.Logging.Abstractions": "[6.0.2, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" } } } diff --git a/src/WorkflowManager/WorkflowExecuter/packages.lock.json b/src/WorkflowManager/WorkflowExecuter/packages.lock.json index 83900a59a..845b6e5ad 100644 --- a/src/WorkflowManager/WorkflowExecuter/packages.lock.json +++ b/src/WorkflowManager/WorkflowExecuter/packages.lock.json @@ -13,11 +13,11 @@ }, "AWSSDK.SecurityToken": { "type": "Direct", - "requested": "[3.7.1.193, )", - "resolved": "3.7.1.193", - "contentHash": "xDZAerod8OUtyIgIYPiGRO+PRdGDjepGGgH2/DuAK/aoARU/FinaFr+yuUjJItrP53dCezbpdFVSRa1BFpIGfA==", + "requested": "[3.7.1.203, )", + "resolved": "3.7.1.203", + "contentHash": "sTE7CLWvoloHPoTjBDDYGUI1n63nZ8YBttuhWI2pnfmJuaYdyqFWf7a4scqus3g5L9WpPhRW5MsfNe30hgsZjQ==", "dependencies": { - "AWSSDK.Core": "[3.7.12.29, 4.0.0)" + "AWSSDK.Core": "[3.7.13.8, 4.0.0)" } }, "Monai.Deploy.Messaging": { @@ -59,8 +59,8 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.29", - "contentHash": "bxSbEjbCyAzjmUpxVKXiQhkXEvb3w9OHL7AOL9LItY1f5xLB9/qbtHoi5FvmZXTPPi2RahPJr9fDyHMLwQnxiA==" + "resolved": "3.7.13.8", + "contentHash": "ZfTD73tT+xQ7WrWDQ8G6+NYHZ4bXUc7jVMiL3477BXbQ7JS9xu/jt9lSJTHBecZ+2bOBnpLRCshBcjRJ6+OD/Q==" }, "DnsClient": { "type": "Transitive", @@ -379,8 +379,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" + "resolved": "6.0.2", + "contentHash": "pwXCZKaA7m5wgmCj49dW+H1RPSY7U62SKLTQYCcavf/k3Nyt/WnBgAjG4jMGnwy9rElfAZ2KvxvM5CJzJWG0hg==" }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -616,8 +616,8 @@ }, "System.IO.Abstractions": { "type": "Transitive", - "resolved": "17.1.1", - "contentHash": "LWOM12Bd0kp/gaH4g1o/O2/6JDcHF/fuctF1IqDZt0aAqU2BwGiMihi9Cdcm5jJz8La1wFWbRPuRui8WeX6m8w==" + "resolved": "17.2.3", + "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" }, "System.IO.FileSystem": { "type": "Transitive", @@ -931,13 +931,13 @@ "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", "Monai.Deploy.Storage": "[0.2.5, )", "Newtonsoft.Json": "[13.0.1, )", - "System.IO.Abstractions": "[17.1.1, )" + "System.IO.Abstractions": "[17.2.3, )" } }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.193, )", + "AWSSDK.SecurityToken": "[3.7.1.203, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", "MongoDB.Bson": "[2.17.1, )", @@ -948,7 +948,7 @@ "type": "Project", "dependencies": { "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.2, )", "Microsoft.Extensions.Options": "[6.0.0, )", "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", @@ -960,9 +960,8 @@ "type": "Project", "dependencies": { "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Serilog": "[2.11.0, )" + "Microsoft.Extensions.Logging.Abstractions": "[6.0.2, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" } }, "monai.deploy.workflowmanager.storage": { diff --git a/src/WorkflowManager/WorkflowManager/packages.lock.json b/src/WorkflowManager/WorkflowManager/packages.lock.json index b2bd4497e..97ba7a74d 100644 --- a/src/WorkflowManager/WorkflowManager/packages.lock.json +++ b/src/WorkflowManager/WorkflowManager/packages.lock.json @@ -62,12 +62,12 @@ }, "Microsoft.EntityFrameworkCore": { "type": "Direct", - "requested": "[6.0.8, )", - "resolved": "6.0.8", - "contentHash": "BDtUZEMjptfhldCvmaDYobVThQvgtcXEmVSGQGmpXDRYaxXuNb6CALJDG0+kTqHaqR+DgbjCKQc7ryi5dB3FGA==", + "requested": "[6.0.9, )", + "resolved": "6.0.9", + "contentHash": "3QxYF6TR14O3cSZitdzM10Smsw+hweLXyB45PN4ZVjrX4GqzUoGZ0ZC06r0ST7O7SgYxNjxw34ay5XXbBTX86A==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.8", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.8", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.9", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.9", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.0", "Microsoft.Extensions.Logging": "6.0.0", @@ -249,15 +249,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.29", - "contentHash": "bxSbEjbCyAzjmUpxVKXiQhkXEvb3w9OHL7AOL9LItY1f5xLB9/qbtHoi5FvmZXTPPi2RahPJr9fDyHMLwQnxiA==" + "resolved": "3.7.13.8", + "contentHash": "ZfTD73tT+xQ7WrWDQ8G6+NYHZ4bXUc7jVMiL3477BXbQ7JS9xu/jt9lSJTHBecZ+2bOBnpLRCshBcjRJ6+OD/Q==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.193", - "contentHash": "xDZAerod8OUtyIgIYPiGRO+PRdGDjepGGgH2/DuAK/aoARU/FinaFr+yuUjJItrP53dCezbpdFVSRa1BFpIGfA==", + "resolved": "3.7.1.203", + "contentHash": "sTE7CLWvoloHPoTjBDDYGUI1n63nZ8YBttuhWI2pnfmJuaYdyqFWf7a4scqus3g5L9WpPhRW5MsfNe30hgsZjQ==", "dependencies": { - "AWSSDK.Core": "[3.7.12.29, 4.0.0)" + "AWSSDK.Core": "[3.7.13.8, 4.0.0)" } }, "Crc32.NET": { @@ -311,8 +311,8 @@ }, "Microsoft.AspNetCore.Authentication.JwtBearer": { "type": "Transitive", - "resolved": "6.0.8", - "contentHash": "ktmldryRkyAMRQpluCZaltRvlcOrlE9SQDmnMOh+XTbck6Vi296UjvwdJb4ULU6PgvZh5j00KAp7uhjpcWQopA==", + "resolved": "6.0.9", + "contentHash": "U02ylUPpnb31C8irNFMVZSq6vn00DlCyQHra5ky1mnzWrbwmZ+Er6tms+hsvfp2dVJqTFLXD9+araslWapWY3g==", "dependencies": { "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } @@ -478,13 +478,13 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.8", - "contentHash": "mZwjzgw9wGc8JPFUwKHe+8OW4gCi1v3jYhe9AhUU4+NW439rN3RnkFlZJ8WBq/yhRbXD3cYers4e+gprOBokew==" + "resolved": "6.0.9", + "contentHash": "XglcSAr6EtjqJpI0DjMMDWkq3l5zG45hRHgrodZFMxNxE7KettJ+X8Em39Aaa0XQwH2P+NHVyK+xhtPX8ogdEA==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.8", - "contentHash": "gUdJEXpS60IGOlGELDsToGQj4cDr1uqlmlet0drUHUoHGE6O+z9oJlOekZQH7gVnaFDmaoO5HIdCT2KgRdXwPw==" + "resolved": "6.0.9", + "contentHash": "rNIx4fr7KWH4ypghhI+78PhCUYBHdjVbQ3yKvj/KmUIe4d9pysHXT3lF9TuReVdMDsn5mEx+3Yez8s80J4/JLA==" }, "Microsoft.Extensions.ApiDescription.Server": { "type": "Transitive", @@ -657,8 +657,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" + "resolved": "6.0.2", + "contentHash": "pwXCZKaA7m5wgmCj49dW+H1RPSY7U62SKLTQYCcavf/k3Nyt/WnBgAjG4jMGnwy9rElfAZ2KvxvM5CJzJWG0hg==" }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -1244,8 +1244,8 @@ }, "System.IO.Abstractions": { "type": "Transitive", - "resolved": "17.1.1", - "contentHash": "LWOM12Bd0kp/gaH4g1o/O2/6JDcHF/fuctF1IqDZt0aAqU2BwGiMihi9Cdcm5jJz8La1wFWbRPuRui8WeX6m8w==" + "resolved": "17.2.3", + "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" }, "System.IO.FileSystem": { "type": "Transitive", @@ -1652,7 +1652,7 @@ "type": "Project", "dependencies": { "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.8, )", + "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.9, )", "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )" } }, @@ -1686,13 +1686,13 @@ "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", "Monai.Deploy.Storage": "[0.2.5, )", "Newtonsoft.Json": "[13.0.1, )", - "System.IO.Abstractions": "[17.1.1, )" + "System.IO.Abstractions": "[17.2.3, )" } }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.193, )", + "AWSSDK.SecurityToken": "[3.7.1.203, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", "MongoDB.Bson": "[2.17.1, )", @@ -1703,7 +1703,7 @@ "type": "Project", "dependencies": { "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.2, )", "Microsoft.Extensions.Options": "[6.0.0, )", "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", @@ -1715,9 +1715,8 @@ "type": "Project", "dependencies": { "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Serilog": "[2.11.0, )" + "Microsoft.Extensions.Logging.Abstractions": "[6.0.2, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" } }, "monai.deploy.workflowmanager.monaibackgroundservice": { @@ -1753,7 +1752,7 @@ "monai.deploy.workloadmanager.workfowexecuter": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.193, )", + "AWSSDK.SecurityToken": "[3.7.1.203, )", "Ardalis.GuardClauses": "[4.0.1, )", "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", "Monai.Deploy.Storage": "[0.2.5, )", diff --git a/tests/UnitTests/Database.Tests/packages.lock.json b/tests/UnitTests/Database.Tests/packages.lock.json index b0b076133..1cc7b0467 100644 --- a/tests/UnitTests/Database.Tests/packages.lock.json +++ b/tests/UnitTests/Database.Tests/packages.lock.json @@ -54,15 +54,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.29", - "contentHash": "bxSbEjbCyAzjmUpxVKXiQhkXEvb3w9OHL7AOL9LItY1f5xLB9/qbtHoi5FvmZXTPPi2RahPJr9fDyHMLwQnxiA==" + "resolved": "3.7.13.8", + "contentHash": "ZfTD73tT+xQ7WrWDQ8G6+NYHZ4bXUc7jVMiL3477BXbQ7JS9xu/jt9lSJTHBecZ+2bOBnpLRCshBcjRJ6+OD/Q==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.193", - "contentHash": "xDZAerod8OUtyIgIYPiGRO+PRdGDjepGGgH2/DuAK/aoARU/FinaFr+yuUjJItrP53dCezbpdFVSRa1BFpIGfA==", + "resolved": "3.7.1.203", + "contentHash": "sTE7CLWvoloHPoTjBDDYGUI1n63nZ8YBttuhWI2pnfmJuaYdyqFWf7a4scqus3g5L9WpPhRW5MsfNe30hgsZjQ==", "dependencies": { - "AWSSDK.Core": "[3.7.12.29, 4.0.0)" + "AWSSDK.Core": "[3.7.13.8, 4.0.0)" } }, "Castle.Core": { @@ -362,8 +362,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" + "resolved": "6.0.2", + "contentHash": "pwXCZKaA7m5wgmCj49dW+H1RPSY7U62SKLTQYCcavf/k3Nyt/WnBgAjG4jMGnwy9rElfAZ2KvxvM5CJzJWG0hg==" }, "Microsoft.Extensions.ObjectPool": { "type": "Transitive", @@ -1508,7 +1508,7 @@ "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.193, )", + "AWSSDK.SecurityToken": "[3.7.1.203, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", "MongoDB.Bson": "[2.17.1, )", @@ -1519,7 +1519,7 @@ "type": "Project", "dependencies": { "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.2, )", "Microsoft.Extensions.Options": "[6.0.0, )", "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", @@ -1531,9 +1531,8 @@ "type": "Project", "dependencies": { "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Serilog": "[2.11.0, )" + "Microsoft.Extensions.Logging.Abstractions": "[6.0.2, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" } } } diff --git a/tests/UnitTests/PayloadListener.Tests/packages.lock.json b/tests/UnitTests/PayloadListener.Tests/packages.lock.json index fab33e614..bba90dd98 100644 --- a/tests/UnitTests/PayloadListener.Tests/packages.lock.json +++ b/tests/UnitTests/PayloadListener.Tests/packages.lock.json @@ -52,15 +52,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.29", - "contentHash": "bxSbEjbCyAzjmUpxVKXiQhkXEvb3w9OHL7AOL9LItY1f5xLB9/qbtHoi5FvmZXTPPi2RahPJr9fDyHMLwQnxiA==" + "resolved": "3.7.13.8", + "contentHash": "ZfTD73tT+xQ7WrWDQ8G6+NYHZ4bXUc7jVMiL3477BXbQ7JS9xu/jt9lSJTHBecZ+2bOBnpLRCshBcjRJ6+OD/Q==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.193", - "contentHash": "xDZAerod8OUtyIgIYPiGRO+PRdGDjepGGgH2/DuAK/aoARU/FinaFr+yuUjJItrP53dCezbpdFVSRa1BFpIGfA==", + "resolved": "3.7.1.203", + "contentHash": "sTE7CLWvoloHPoTjBDDYGUI1n63nZ8YBttuhWI2pnfmJuaYdyqFWf7a4scqus3g5L9WpPhRW5MsfNe30hgsZjQ==", "dependencies": { - "AWSSDK.Core": "[3.7.12.29, 4.0.0)" + "AWSSDK.Core": "[3.7.13.8, 4.0.0)" } }, "Castle.Core": { @@ -393,8 +393,8 @@ }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" + "resolved": "6.0.2", + "contentHash": "pwXCZKaA7m5wgmCj49dW+H1RPSY7U62SKLTQYCcavf/k3Nyt/WnBgAjG4jMGnwy9rElfAZ2KvxvM5CJzJWG0hg==" }, "Microsoft.Extensions.Logging.Configuration": { "type": "Transitive", @@ -700,8 +700,8 @@ }, "System.IO.Abstractions": { "type": "Transitive", - "resolved": "17.1.1", - "contentHash": "LWOM12Bd0kp/gaH4g1o/O2/6JDcHF/fuctF1IqDZt0aAqU2BwGiMihi9Cdcm5jJz8La1wFWbRPuRui8WeX6m8w==" + "resolved": "17.2.3", + "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" }, "System.IO.FileSystem": { "type": "Transitive", @@ -1020,13 +1020,13 @@ "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", "Monai.Deploy.Storage": "[0.2.5, )", "Newtonsoft.Json": "[13.0.1, )", - "System.IO.Abstractions": "[17.1.1, )" + "System.IO.Abstractions": "[17.2.3, )" } }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.193, )", + "AWSSDK.SecurityToken": "[3.7.1.203, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", "MongoDB.Bson": "[2.17.1, )", @@ -1037,7 +1037,7 @@ "type": "Project", "dependencies": { "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.2, )", "Microsoft.Extensions.Options": "[6.0.0, )", "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", @@ -1049,9 +1049,8 @@ "type": "Project", "dependencies": { "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Serilog": "[2.11.0, )" + "Microsoft.Extensions.Logging.Abstractions": "[6.0.2, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" } }, "monai.deploy.workflowmanager.payloadlistener": { @@ -1079,7 +1078,7 @@ "monai.deploy.workloadmanager.workfowexecuter": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.193, )", + "AWSSDK.SecurityToken": "[3.7.1.203, )", "Ardalis.GuardClauses": "[4.0.1, )", "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", "Monai.Deploy.Storage": "[0.2.5, )", diff --git a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json index fcd8bc581..02fd34441 100644 --- a/tests/UnitTests/WorkflowManager.Tests/packages.lock.json +++ b/tests/UnitTests/WorkflowManager.Tests/packages.lock.json @@ -29,20 +29,20 @@ }, "Microsoft.AspNetCore.Mvc.Testing": { "type": "Direct", - "requested": "[6.0.8, )", - "resolved": "6.0.8", - "contentHash": "UGcvJ+uL/g1yQWJ7pxQ/4H6tchXD/4A08wgUpq+jXUbj92KlVmHbWDaKz8kqmfv1tqbsVn3tTQ/VBxjEowgHug==", + "requested": "[6.0.9, )", + "resolved": "6.0.9", + "contentHash": "uFWxuY5Idh/VA4rkRY9U4Ke7yx+c+ZYTHZ/0Wl5j5TplyMPqNMOO13wKVdwssWo3oUOsrrbeI6GsdB+kG84XCQ==", "dependencies": { - "Microsoft.AspNetCore.TestHost": "6.0.8", + "Microsoft.AspNetCore.TestHost": "6.0.9", "Microsoft.Extensions.DependencyModel": "6.0.0", "Microsoft.Extensions.Hosting": "6.0.1" } }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Direct", - "requested": "[6.0.1, )", - "resolved": "6.0.1", - "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" + "requested": "[6.0.2, )", + "resolved": "6.0.2", + "contentHash": "pwXCZKaA7m5wgmCj49dW+H1RPSY7U62SKLTQYCcavf/k3Nyt/WnBgAjG4jMGnwy9rElfAZ2KvxvM5CJzJWG0hg==" }, "Microsoft.NET.Test.Sdk": { "type": "Direct", @@ -99,15 +99,15 @@ }, "AWSSDK.Core": { "type": "Transitive", - "resolved": "3.7.12.29", - "contentHash": "bxSbEjbCyAzjmUpxVKXiQhkXEvb3w9OHL7AOL9LItY1f5xLB9/qbtHoi5FvmZXTPPi2RahPJr9fDyHMLwQnxiA==" + "resolved": "3.7.13.8", + "contentHash": "ZfTD73tT+xQ7WrWDQ8G6+NYHZ4bXUc7jVMiL3477BXbQ7JS9xu/jt9lSJTHBecZ+2bOBnpLRCshBcjRJ6+OD/Q==" }, "AWSSDK.SecurityToken": { "type": "Transitive", - "resolved": "3.7.1.193", - "contentHash": "xDZAerod8OUtyIgIYPiGRO+PRdGDjepGGgH2/DuAK/aoARU/FinaFr+yuUjJItrP53dCezbpdFVSRa1BFpIGfA==", + "resolved": "3.7.1.203", + "contentHash": "sTE7CLWvoloHPoTjBDDYGUI1n63nZ8YBttuhWI2pnfmJuaYdyqFWf7a4scqus3g5L9WpPhRW5MsfNe30hgsZjQ==", "dependencies": { - "AWSSDK.Core": "[3.7.12.29, 4.0.0)" + "AWSSDK.Core": "[3.7.13.8, 4.0.0)" } }, "Castle.Core": { @@ -198,8 +198,8 @@ }, "Microsoft.AspNetCore.Authentication.JwtBearer": { "type": "Transitive", - "resolved": "6.0.8", - "contentHash": "ktmldryRkyAMRQpluCZaltRvlcOrlE9SQDmnMOh+XTbck6Vi296UjvwdJb4ULU6PgvZh5j00KAp7uhjpcWQopA==", + "resolved": "6.0.9", + "contentHash": "U02ylUPpnb31C8irNFMVZSq6vn00DlCyQHra5ky1mnzWrbwmZ+Er6tms+hsvfp2dVJqTFLXD9+araslWapWY3g==", "dependencies": { "Microsoft.IdentityModel.Protocols.OpenIdConnect": "6.10.0" } @@ -374,8 +374,8 @@ }, "Microsoft.AspNetCore.TestHost": { "type": "Transitive", - "resolved": "6.0.8", - "contentHash": "CNG/aeTqlNHSp+nI4ihn+f1Hy1Z0pX0ASyEzt2lq+qcCvxb1cYhLDllFOQfZIa+/eXfeiQWw/CuwryIUQTtwiQ==", + "resolved": "6.0.9", + "contentHash": "ufuQSsTfWANNEIAJejbVZgK96++7SobZwunTC8xGBxK4lGFSQq3Ccdb4gWuKYj4TCCNYQ5c+Al/EgpAUro8fdw==", "dependencies": { "System.IO.Pipelines": "6.0.3" } @@ -401,11 +401,11 @@ }, "Microsoft.EntityFrameworkCore": { "type": "Transitive", - "resolved": "6.0.8", - "contentHash": "BDtUZEMjptfhldCvmaDYobVThQvgtcXEmVSGQGmpXDRYaxXuNb6CALJDG0+kTqHaqR+DgbjCKQc7ryi5dB3FGA==", + "resolved": "6.0.9", + "contentHash": "3QxYF6TR14O3cSZitdzM10Smsw+hweLXyB45PN4ZVjrX4GqzUoGZ0ZC06r0ST7O7SgYxNjxw34ay5XXbBTX86A==", "dependencies": { - "Microsoft.EntityFrameworkCore.Abstractions": "6.0.8", - "Microsoft.EntityFrameworkCore.Analyzers": "6.0.8", + "Microsoft.EntityFrameworkCore.Abstractions": "6.0.9", + "Microsoft.EntityFrameworkCore.Analyzers": "6.0.9", "Microsoft.Extensions.Caching.Memory": "6.0.1", "Microsoft.Extensions.DependencyInjection": "6.0.0", "Microsoft.Extensions.Logging": "6.0.0", @@ -415,13 +415,13 @@ }, "Microsoft.EntityFrameworkCore.Abstractions": { "type": "Transitive", - "resolved": "6.0.8", - "contentHash": "mZwjzgw9wGc8JPFUwKHe+8OW4gCi1v3jYhe9AhUU4+NW439rN3RnkFlZJ8WBq/yhRbXD3cYers4e+gprOBokew==" + "resolved": "6.0.9", + "contentHash": "XglcSAr6EtjqJpI0DjMMDWkq3l5zG45hRHgrodZFMxNxE7KettJ+X8Em39Aaa0XQwH2P+NHVyK+xhtPX8ogdEA==" }, "Microsoft.EntityFrameworkCore.Analyzers": { "type": "Transitive", - "resolved": "6.0.8", - "contentHash": "gUdJEXpS60IGOlGELDsToGQj4cDr1uqlmlet0drUHUoHGE6O+z9oJlOekZQH7gVnaFDmaoO5HIdCT2KgRdXwPw==" + "resolved": "6.0.9", + "contentHash": "rNIx4fr7KWH4ypghhI+78PhCUYBHdjVbQ3yKvj/KmUIe4d9pysHXT3lF9TuReVdMDsn5mEx+3Yez8s80J4/JLA==" }, "Microsoft.Extensions.ApiDescription.Server": { "type": "Transitive", @@ -1363,8 +1363,8 @@ }, "System.IO.Abstractions": { "type": "Transitive", - "resolved": "17.1.1", - "contentHash": "LWOM12Bd0kp/gaH4g1o/O2/6JDcHF/fuctF1IqDZt0aAqU2BwGiMihi9Cdcm5jJz8La1wFWbRPuRui8WeX6m8w==" + "resolved": "17.2.3", + "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ==" }, "System.IO.FileSystem": { "type": "Transitive", @@ -1836,7 +1836,7 @@ "Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[6.0.8, )", "Microsoft.AspNetCore.Mvc.Versioning": "[5.0.0, )", "Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer": "[5.0.0, )", - "Microsoft.EntityFrameworkCore": "[6.0.8, )", + "Microsoft.EntityFrameworkCore": "[6.0.9, )", "Microsoft.Extensions.DependencyInjection.Abstractions": "[6.0.0, )", "Microsoft.Extensions.Hosting": "[6.0.1, )", "Microsoft.Extensions.Logging": "[6.0.0, )", @@ -1865,7 +1865,7 @@ "type": "Project", "dependencies": { "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.8, )", + "Microsoft.AspNetCore.Authentication.JwtBearer": "[6.0.9, )", "Monai.Deploy.WorkflowManager.Common": "[1.0.0, )" } }, @@ -1899,13 +1899,13 @@ "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", "Monai.Deploy.Storage": "[0.2.5, )", "Newtonsoft.Json": "[13.0.1, )", - "System.IO.Abstractions": "[17.1.1, )" + "System.IO.Abstractions": "[17.2.3, )" } }, "monai.deploy.workflowmanager.contracts": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.193, )", + "AWSSDK.SecurityToken": "[3.7.1.203, )", "Microsoft.Extensions.Configuration": "[6.0.1, )", "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", "MongoDB.Bson": "[2.17.1, )", @@ -1916,7 +1916,7 @@ "type": "Project", "dependencies": { "Ardalis.GuardClauses": "[4.0.1, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", + "Microsoft.Extensions.Logging.Abstractions": "[6.0.2, )", "Microsoft.Extensions.Options": "[6.0.0, )", "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", "Monai.Deploy.WorkflowManager.Logging": "[1.0.0, )", @@ -1928,9 +1928,8 @@ "type": "Project", "dependencies": { "Microsoft.AspNetCore.Mvc.Core": "[2.2.5, )", - "Microsoft.Extensions.Logging.Abstractions": "[6.0.1, )", - "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )", - "Serilog": "[2.11.0, )" + "Microsoft.Extensions.Logging.Abstractions": "[6.0.2, )", + "Monai.Deploy.WorkflowManager.Contracts": "[1.0.0, )" } }, "monai.deploy.workflowmanager.monaibackgroundservice": { @@ -1966,7 +1965,7 @@ "monai.deploy.workloadmanager.workfowexecuter": { "type": "Project", "dependencies": { - "AWSSDK.SecurityToken": "[3.7.1.193, )", + "AWSSDK.SecurityToken": "[3.7.1.203, )", "Ardalis.GuardClauses": "[4.0.1, )", "Monai.Deploy.Messaging": "[0.1.6-rc0001, )", "Monai.Deploy.Storage": "[0.2.5, )",