Merged in task/dspace-cris-2024_02_x/DSC-2517 (pull request DSpace#4726)

DSC-2517

Approved-by: Fapohunda, Adamo

Author: vins01-4science

dspace-api/pom.xml

@@ -348,6 +348,11 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j2-impl</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-layout-template-json</artifactId>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-core</artifactId>

dspace/config/log4j2-eks.xml

@@ -11,7 +11,39 @@
     <Appenders>
         <!-- JSON console appender for org.dspace -->
         <Appender name="ConsoleJson" type="Console">
-            <Layout type="JsonLayout" complete="false" compact="true" eventEol="true"/>
+            <!--<Layout
+                    type="JsonLayout"
+                    complete="false"
+                    compact="true"
+                    eventEol="true"
+                    properties="true"
+            />-->
+            <JsonTemplateLayout
+                eventTemplate='{
+                    "timestamp": {
+                      "$resolver": "timestamp",
+                      "pattern": {
+                        "format": "yyyy-MM-dd&apos;T&apos;HH:mm:ss.SSS&apos;Z&apos;",
+                        "timeZone": "UTC",
+                        "locale": "en_US"
+                      }
+                    },
+                    "correlationID": {
+                      "$resolver": "mdc",
+                      "key": "correlationID",
+                      "default": "unknown"
+                    },
+                    "requestID": {
+                      "$resolver": "mdc",
+                      "key": "requestID",
+                      "default": "unknown"
+                    },
+                    "level": { "$resolver": "level", "field": "name" },
+                    "logger": { "$resolver": "logger", "field": "name" },
+                    "thread": { "$resolver": "thread", "field": "name" },
+                    "message": { "$resolver": "message", "stringified": true }
+              }'
+            />
         </Appender>
 
     </Appenders>

pom.xml

@@ -1959,6 +1959,12 @@
                 <artifactId>log4j-slf4j2-impl</artifactId>
                 <version>${log4j.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-layout-template-json</artifactId>
+                <version>${log4j.version}</version>
+                <scope>runtime</scope>
+            </dependency>
 
             <dependency>
                 <groupId>org.apache.pdfbox</groupId>