From d395445c91f32ffc414bbbbc98320eb6f0e31e95 Mon Sep 17 00:00:00 2001
From: Srishti Sharma <srsharma@microsoft.com>
Date: Thu, 18 Aug 2022 19:48:22 +0530
Subject: [PATCH 1/5] remove line breaks

---
 pom.xml                       | 2 +-
 src/main/resources/log4j2.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5aae94da..803da0c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <groupId>org.opengroup.osdu</groupId>
   <artifactId>core-lib-azure</artifactId>
   <packaging>jar</packaging>
-  <version>0.16.0-SNAPSHOT</version>
+  <version>0.15.2</version>
   <name>core-lib-azure</name>
 
   <properties>
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 0db3227e..cb3394e5 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -27,12 +27,12 @@
 
     <Properties>
         <Property name="LOG_PATTERN">
-            %d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${hostName} --- [%15.15t] %-40.40c{1.} correlation-id=%X{correlation-id} data-partition-id=%X{data-partition-id} api-method=%X{api-method} operation-name=%X{operation-name} user-id=%X{user-id} app-id=%X{app-id}: %m%n%ex
+            %d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${hostName} --- [%15.15t] %-40.40c{1.} correlation-id=%X{correlation-id} data-partition-id=%X{data-partition-id} api-method=%X{api-method} operation-name=%X{operation-name} user-id=%X{user-id} app-id=%X{app-id}: %m%replace{%m}{[\r\n]}{|} %throwable{separator(|)}%n
         </Property>
     </Properties>
     <Appenders>
         <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${hostName} --- [%15.15t] %-40.40c{1.} correlation-id=%X{correlation-id} data-partition-id=%X{data-partition-id} api-method=%X{api-method} operation-name=%X{operation-name} user-id=%X{user-id} app-id=%X{app-id}: %m%n%ex"/>
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${hostName} --- [%15.15t] %-40.40c{1.} correlation-id=%X{correlation-id} data-partition-id=%X{data-partition-id} api-method=%X{api-method} operation-name=%X{operation-name} user-id=%X{user-id} app-id=%X{app-id}: %m%replace{%m}{[\r\n]}{|} %throwable{separator(|)}%n"/>
         </Console>
         <ApplicationInsightsAppender name="aiAppender">
         </ApplicationInsightsAppender>
-- 
GitLab


From 3b462d64306a87ef1cd6d717ec65c17af96ac2f9 Mon Sep 17 00:00:00 2001
From: Srishti Sharma <srsharma@microsoft.com>
Date: Fri, 19 Aug 2022 12:27:07 +0530
Subject: [PATCH 2/5] remove line breaks

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 803da0c4..5aae94da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <groupId>org.opengroup.osdu</groupId>
   <artifactId>core-lib-azure</artifactId>
   <packaging>jar</packaging>
-  <version>0.15.2</version>
+  <version>0.16.0-SNAPSHOT</version>
   <name>core-lib-azure</name>
 
   <properties>
-- 
GitLab


From 0a3f4291c5ce9586aae7dfb0f71d27b905187d50 Mon Sep 17 00:00:00 2001
From: Srishti Sharma <srsharma@microsoft.com>
Date: Mon, 5 Sep 2022 13:18:59 +0530
Subject: [PATCH 3/5] Reducing stacktrace size by filtering out unwanted
 traces, removing new line, adding | separator

---
 pom.xml                       |  2 +-
 src/main/resources/log4j2.xml | 43 +++++++++++++++++------------------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5aae94da..2280484f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <groupId>org.opengroup.osdu</groupId>
   <artifactId>core-lib-azure</artifactId>
   <packaging>jar</packaging>
-  <version>0.16.0-SNAPSHOT</version>
+  <version>0.17.0-SNAPSHOT</version>
   <name>core-lib-azure</name>
 
   <properties>
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index cb3394e5..e0473f58 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -14,31 +14,30 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-
 <Configuration packages="com.microsoft.applicationinsights.log4j.v2">
     <Scripts>
-        <Script name="isAiAppenderEnabled" language="nashorn"><![CDATA[
-            var System = Java.type('java.lang.System'),
-                Boolean = Java.type('java.lang.Boolean');
-            Boolean.parseBoolean(System.getProperty('APPINSIGHTS_LOGGING_ENABLED', 'true'));
-            ]]>
-        </Script>
-    </Scripts>
+            <Script name="isAiAppenderEnabled" language="nashorn"><![CDATA[
+                var System = Java.type('java.lang.System'),
+                    Boolean = Java.type('java.lang.Boolean');
+                Boolean.parseBoolean(System.getProperty('APPINSIGHTS_LOGGING_ENABLED', 'true'));
+                ]]>
+            </Script>
+        </Scripts>
 
-    <Properties>
-        <Property name="LOG_PATTERN">
-            %d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${hostName} --- [%15.15t] %-40.40c{1.} correlation-id=%X{correlation-id} data-partition-id=%X{data-partition-id} api-method=%X{api-method} operation-name=%X{operation-name} user-id=%X{user-id} app-id=%X{app-id}: %m%replace{%m}{[\r\n]}{|} %throwable{separator(|)}%n
-        </Property>
-    </Properties>
-    <Appenders>
-        <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${hostName} --- [%15.15t] %-40.40c{1.} correlation-id=%X{correlation-id} data-partition-id=%X{data-partition-id} api-method=%X{api-method} operation-name=%X{operation-name} user-id=%X{user-id} app-id=%X{app-id}: %m%replace{%m}{[\r\n]}{|} %throwable{separator(|)}%n"/>
-        </Console>
-        <ApplicationInsightsAppender name="aiAppender">
-        </ApplicationInsightsAppender>
-    </Appenders>
-    <Loggers>
-<!--        TODO: In future it will be changed to warn-->
+        <Properties>
+            <Property name="LOG_PATTERN">
+                %d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${hostName} --- [%15.15t] %-40.40c{1.} correlation-id=%X{correlation-id} data-partition-id=%X{data-partition-id} api-method=%X{api-method} operation-name=%X{operation-name} user-id=%X{user-id} app-id=%X{app-id}: %m%xEx{full}{filters(org.apache,org.springframework,sun.reflect,javax.servlet)}{separator(|)}%n"
+            </Property>
+        </Properties>
+        <Appenders>
+            <Console name="Console" target="SYSTEM_OUT">
+                <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${hostName} --- [%15.15t] %-40.40c{1.} correlation-id=%X{correlation-id} data-partition-id=%X{data-partition-id} api-method=%X{api-method} operation-name=%X{operation-name} user-id=%X{user-id} app-id=%X{app-id}:%m%xEx{full}{filters(org.apache,org.springframework,sun.reflect,javax.servlet)}{separator(|)}%n"/>
+            </Console>
+            <ApplicationInsightsAppender name="aiAppender">
+            </ApplicationInsightsAppender>
+        </Appenders>
+        <Loggers>
+    <!--        TODO: In future it will be changed to warn-->
         <Root level="info">
             <AppenderRef ref="Console"  />
             <AppenderRef ref="aiAppender">
-- 
GitLab


From 8e9c0096c66cd8871943f172524e9ee4878fc7e5 Mon Sep 17 00:00:00 2001
From: Srishti Sharma <srsharma@microsoft.com>
Date: Mon, 5 Sep 2022 13:26:55 +0530
Subject: [PATCH 4/5] Reducing stacktrace size by filtering out unwanted
 traces, removing new line, adding | separator

---
 pom.xml                       | 2 +-
 src/main/resources/log4j2.xml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2280484f..5aae94da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <groupId>org.opengroup.osdu</groupId>
   <artifactId>core-lib-azure</artifactId>
   <packaging>jar</packaging>
-  <version>0.17.0-SNAPSHOT</version>
+  <version>0.16.0-SNAPSHOT</version>
   <name>core-lib-azure</name>
 
   <properties>
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index e0473f58..8ee9d453 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -16,13 +16,13 @@
   -->
 <Configuration packages="com.microsoft.applicationinsights.log4j.v2">
     <Scripts>
-            <Script name="isAiAppenderEnabled" language="nashorn"><![CDATA[
+        <Script name="isAiAppenderEnabled" language="nashorn"><![CDATA[
                 var System = Java.type('java.lang.System'),
                     Boolean = Java.type('java.lang.Boolean');
                 Boolean.parseBoolean(System.getProperty('APPINSIGHTS_LOGGING_ENABLED', 'true'));
                 ]]>
-            </Script>
-        </Scripts>
+        </Script>
+    </Scripts>
 
         <Properties>
             <Property name="LOG_PATTERN">
-- 
GitLab


From 74566bee27a4eb78f952fb7710ecccc8c4c6aaa7 Mon Sep 17 00:00:00 2001
From: Srishti Sharma <srsharma@microsoft.com>
Date: Mon, 5 Sep 2022 13:29:37 +0530
Subject: [PATCH 5/5] Reducing stacktrace size by filtering out unwanted
 traces, removing new line, adding | separator

---
 src/main/resources/log4j2.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 8ee9d453..6b996c99 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -17,10 +17,10 @@
 <Configuration packages="com.microsoft.applicationinsights.log4j.v2">
     <Scripts>
         <Script name="isAiAppenderEnabled" language="nashorn"><![CDATA[
-                var System = Java.type('java.lang.System'),
-                    Boolean = Java.type('java.lang.Boolean');
-                Boolean.parseBoolean(System.getProperty('APPINSIGHTS_LOGGING_ENABLED', 'true'));
-                ]]>
+            var System = Java.type('java.lang.System'),
+                Boolean = Java.type('java.lang.Boolean');
+            Boolean.parseBoolean(System.getProperty('APPINSIGHTS_LOGGING_ENABLED', 'true'));
+            ]]>
         </Script>
     </Scripts>
 
-- 
GitLab