From c1e036a82627018b90a73557c126090e539a4a7c Mon Sep 17 00:00:00 2001
From: Victor Chang <mocsharp@users.noreply.github.com>
Date: Thu, 13 Oct 2022 12:54:21 -0700
Subject: [PATCH] Include scope properties (#210)

Signed-off-by: Victor Chang <vicchang@nvidia.com>
---
 src/InformaticsGateway/Program.cs  | 2 +-
 src/InformaticsGateway/nlog.config | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/InformaticsGateway/Program.cs b/src/InformaticsGateway/Program.cs
index 67e055999..f1212ad8e 100644
--- a/src/InformaticsGateway/Program.cs
+++ b/src/InformaticsGateway/Program.cs
@@ -189,7 +189,7 @@ internal static IHostBuilder CreateHostBuilder(string[] args) =>
 
         private static NLog.Logger ConfigureNLog(string assemblyVersionNumber)
         {
-            LayoutRenderer.Register("servicename", logEvent => Assembly.GetEntryAssembly()?.GetName().Name);
+            LayoutRenderer.Register("servicename", logEvent => typeof(Program).Namespace);
             LayoutRenderer.Register("serviceversion", logEvent => assemblyVersionNumber);
             LayoutRenderer.Register("machinename", logEvent => Environment.MachineName);
 
diff --git a/src/InformaticsGateway/nlog.config b/src/InformaticsGateway/nlog.config
index 33925ea64..7bd771f7e 100644
--- a/src/InformaticsGateway/nlog.config
+++ b/src/InformaticsGateway/nlog.config
@@ -1,4 +1,6 @@
-<!-- 
+<?xml version="1.0" encoding="utf-8" ?>
+
+<!-- 
 Copyright 2022 MONAI Consortium
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +16,6 @@ See the License for the specific language governing permissions and
 limitations under the License. 
 -->
 
-<?xml version="1.0" encoding="utf-8" ?>
 <nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       autoReload="true"
@@ -47,7 +48,7 @@ limitations under the License.
     <target xsi:type="ColoredConsole" name="lifetimeConsole" layout="${longdate}|${event-properties:item=EventId:whenEmpty=0}|${uppercase:${level}}|${logger}|${scopenested}|${message} ${exception:format=tostring}" />
 
     <target name="logstash" xsi:type="Network" address="${environment:LOGSTASH_URL}" newLine="true">
-      <layout xsi:type="JsonLayout" includeAllProperties="true" >
+      <layout xsi:type="JsonLayout" IncludeEventProperties="true" IncludeScopeProperties="true">
         <attribute name="Tag" layout="${environment:ENVIRONMENT_NAME}" />
         <attribute name="ServiceName" layout="${servicename}" />
         <attribute name="ServiceVersion" layout="${serviceversion}" />