From a9e193608c8d88e070f375d5b28f4797f71844d6 Mon Sep 17 00:00:00 2001
From: Sriharsha Chintalapani <harshach@users.noreply.github.com>
Date: Sun, 21 Jan 2024 22:59:28 -0800
Subject: [PATCH] Fix #14318: Add support of JSON logs (#14783)

---
 conf/openmetadata.yaml       | 8 ++++++++
 openmetadata-service/pom.xml | 4 ++++
 pom.xml                      | 5 +++++
 3 files changed, 17 insertions(+)

diff --git a/conf/openmetadata.yaml b/conf/openmetadata.yaml
index dd60e5a17149..793cbc41a79f 100644
--- a/conf/openmetadata.yaml
+++ b/conf/openmetadata.yaml
@@ -99,6 +99,8 @@ logging:
           timeZone: UTC
         - type: file
           logFormat: "%level [%d{ISO8601,UTC}] [%t] %logger{5} - %msg%n"
+          layout:
+            type: json
           currentLogFilename: ./logs/openmetadata-operations.log
           archivedLogFilenamePattern: ./logs/openmetadata-operations-%d{yyyy-MM-dd}-%i.log.gz
           archivedFileCount: 7
@@ -110,6 +112,9 @@ logging:
       logFormat: "%level [%d{ISO8601,UTC}] [%t] %logger{5} - %msg%n"
       timeZone: UTC
     - type: file
+      layout:
+        type: json
+        appendLineSeparator: true
       filterFactories:
         - type: audit-exclude-filter-factory
       threshold: TRACE
@@ -120,6 +125,9 @@ logging:
       timeZone: UTC
       maxFileSize: 50MB
     - type: file
+      layout:
+        type: json
+        appendLineSeparator: true
       filterFactories:
         - type: audit-only-filter-factory
       threshold: TRACE
diff --git a/openmetadata-service/pom.xml b/openmetadata-service/pom.xml
index cab64538687a..4a8a0a552abd 100644
--- a/openmetadata-service/pom.xml
+++ b/openmetadata-service/pom.xml
@@ -131,6 +131,10 @@
       <groupId>io.github.maksymdolgykh.dropwizard</groupId>
       <artifactId>dropwizard-micrometer-jdbi</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.dropwizard</groupId>
+      <artifactId>dropwizard-json-logging</artifactId>
+    </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
diff --git a/pom.xml b/pom.xml
index 751d468c61bd..7aadbd90e25e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -257,6 +257,11 @@
         <artifactId>logback-classic</artifactId>
         <version>${logback-classic.version}</version>
       </dependency>
+      <dependency>
+        <groupId>io.dropwizard</groupId>
+        <artifactId>dropwizard-json-logging</artifactId>
+        <version>${dropwizard.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.awaitility</groupId>
         <artifactId>awaitility</artifactId>