From a2d69364d30d6d7d7d9c1034d2689dcf0d8fa039 Mon Sep 17 00:00:00 2001
From: hrishikesh-nalawade <hrishikesh.nalawade.17@gmail.com>
Date: Mon, 20 Jan 2025 23:23:07 +0530
Subject: [PATCH] fix(logging): Adding configurable timezone support for log
 timestamps

Signed-off-by: Hrishikesh Nalawade <hnalawade@rocketsoftware.com>
Signed-off-by: hrishikesh-nalawade <hrishikesh.nalawade.17@gmail.com>
---
 caching-service-package/src/main/resources/bin/start.sh | 1 +
 caching-service/src/main/resources/application.yml      | 1 +
 caching-service/src/main/resources/logback.xml          | 3 ++-
 gateway-package/src/main/resources/bin/start.sh         | 1 +
 gateway-service/src/main/resources/application.yml      | 1 +
 gateway-service/src/main/resources/logback-gateway.xml  | 3 ++-
 zaas-package/src/main/resources/bin/start.sh            | 1 +
 zaas-service/src/main/resources/application.yml         | 1 +
 zaas-service/src/main/resources/logback-zaas.xml        | 3 ++-
 9 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/caching-service-package/src/main/resources/bin/start.sh b/caching-service-package/src/main/resources/bin/start.sh
index 5d692cd266..b076460357 100755
--- a/caching-service-package/src/main/resources/bin/start.sh
+++ b/caching-service-package/src/main/resources/bin/start.sh
@@ -241,6 +241,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${CACHING_CODE} ${JAVA_BIN_DIR}java \
   -Dspring.profiles.active=${ZWE_configs_spring_profiles_active:-} \
   -Dspring.profiles.include=$LOG_LEVEL \
   -Dapiml.logs.location=${ZWE_zowe_logDirectory} \
+  -Dapiml.logging.timezone=${ZWE_zowe_logging_timezone} \
   -Dapiml.health.protected=${ZWE_configs_apiml_health_protected:-true} \
   -Dapiml.service.port=${ZWE_configs_port:-7555} \
   -Dapiml.service.hostname=${ZWE_haInstance_hostname:-localhost} \
diff --git a/caching-service/src/main/resources/application.yml b/caching-service/src/main/resources/application.yml
index abb8cbbb34..2f516e9345 100644
--- a/caching-service/src/main/resources/application.yml
+++ b/caching-service/src/main/resources/application.yml
@@ -41,6 +41,7 @@ logging:
         org.apache.tomcat.util.net.SSLUtilBase: ERROR
         org.springframework.security.config.annotation.web.builders.WebSecurity: ERROR
         javax.net.ssl: ERROR
+    timezone: ${apiml.logging.timezone:UTC}
 
 eureka:
     client:
diff --git a/caching-service/src/main/resources/logback.xml b/caching-service/src/main/resources/logback.xml
index bf5983afc9..e440375f01 100644
--- a/caching-service/src/main/resources/logback.xml
+++ b/caching-service/src/main/resources/logback.xml
@@ -5,7 +5,8 @@
     <property name="MIN_INDEX" value="${rollingPolicy.minIndex:-1}"/>
     <property name="MAX_FILE_SIZE" value="${rollingPolicy.file.maxSize:-50MB}"/>
     <property name="STORAGE_LOCATION" value="${apiml.logs.location}" />
-    <property name="apimlLogPattern" value="%d{yyyy-MM-dd HH:mm:ss.SSS,UTC} %clr&lt;${logbackService:-${logbackServiceName}}:%thread:${PID:- }&gt; %magenta(%X{userid:-}) %cyan(%-5level) %clr\(\(%logger{15}\)\) %msg%n"/>
+    <property name="LOGGING_TIMEZONE" value="${logging.timezone:-UTC}"/>
+    <property name="apimlLogPattern" value="%d{yyyy-MM-dd HH:mm:ss.SSS,${LOGGING_TIMEZONE}} %clr&lt;${logbackService:-${logbackServiceName}}:%thread:${PID:- }&gt; %magenta(%X{userid:-}) %cyan(%-5level) %clr\(\(%logger{15}\)\) %msg%n"/>
 
     <turboFilter class="org.zowe.apiml.product.logging.UseridFilter"/>
     <if condition='property("spring.config.activate.on-profile").contains("debug")||property("spring.config.activate.on-profile").contains("diag")||property("spring.config.activate.on-profile").contains("dev")'>
diff --git a/gateway-package/src/main/resources/bin/start.sh b/gateway-package/src/main/resources/bin/start.sh
index f723f3c467..c06e5aedd5 100755
--- a/gateway-package/src/main/resources/bin/start.sh
+++ b/gateway-package/src/main/resources/bin/start.sh
@@ -304,6 +304,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${GATEWAY_CODE} ${JAVA_BIN_DIR}java \
     -Dapiml.connection.idleConnectionTimeoutSeconds=${ZWE_configs_apiml_connection_idleConnectionTimeoutSeconds:-5} \
     -Dapiml.connection.timeToLive=${ZWE_configs_apiml_connection_timeToLive:-10000} \
     -Dapiml.logs.location=${ZWE_zowe_logDirectory} \
+    -Dapiml.logging.timezone=${ZWE_zowe_logging_timezone} \
     -Dapiml.health.protected=${ZWE_configs_apiml_health_protected:-true} \
     -Dapiml.security.ssl.verifySslCertificatesOfServices=${verifySslCertificatesOfServices} \
     -Dapiml.security.ssl.nonStrictVerifySslCertificatesOfServices=${nonStrictVerifySslCertificatesOfServices:-false} \
diff --git a/gateway-service/src/main/resources/application.yml b/gateway-service/src/main/resources/application.yml
index 0a291eda25..3fb7868849 100644
--- a/gateway-service/src/main/resources/application.yml
+++ b/gateway-service/src/main/resources/application.yml
@@ -154,6 +154,7 @@ logging:
         io.netty.resolver.dns: WARN
         javax.net.ssl: ERROR
         org.apache.tomcat.util.net.SSLUtilBase: ERROR
+    timezone: ${apiml.logging.timezone:UTC}
 
 management:
     endpoint:
diff --git a/gateway-service/src/main/resources/logback-gateway.xml b/gateway-service/src/main/resources/logback-gateway.xml
index cd5430a296..92b8b12537 100644
--- a/gateway-service/src/main/resources/logback-gateway.xml
+++ b/gateway-service/src/main/resources/logback-gateway.xml
@@ -5,7 +5,8 @@
     <property name="MIN_INDEX" value="${rollingPolicy.minIndex:-1}"/>
     <property name="MAX_FILE_SIZE" value="${rollingPolicy.file.maxSize:-50MB}"/>
     <property name="STORAGE_LOCATION" value="${apiml.logs.location}" />
-    <property name="apimlLogPattern" value="%d{yyyy-MM-dd HH:mm:ss.SSS,UTC} %clr&lt;${logbackService:-${logbackServiceName}}:%thread:${PID:- }&gt; %magenta(%X{userid:-}) %cyan(%-5level) %clr\(\(%logger{15}\)\) %msg%n"/>
+    <property name="LOGGING_TIMEZONE" value="${logging.timezone:-UTC}"/>
+    <property name="apimlLogPattern" value="%d{yyyy-MM-dd HH:mm:ss.SSS,${LOGGING_TIMEZONE}} %clr&lt;${logbackService:-${logbackServiceName}}:%thread:${PID:- }&gt; %magenta(%X{userid:-}) %cyan(%-5level) %clr\(\(%logger{15}\)\) %msg%n"/>
 
     <turboFilter class="org.zowe.apiml.product.logging.UseridFilter"/>
     <if condition='property("spring.config.activate.on-profile").contains("debug")||property("spring.config.activate.on-profile").contains("diag")||property("spring.config.activate.on-profile").contains("dev")'>
diff --git a/zaas-package/src/main/resources/bin/start.sh b/zaas-package/src/main/resources/bin/start.sh
index 88b0e42e59..ff8c4111ae 100755
--- a/zaas-package/src/main/resources/bin/start.sh
+++ b/zaas-package/src/main/resources/bin/start.sh
@@ -307,6 +307,7 @@ _BPX_JOBNAME=${ZWE_zowe_job_prefix}${ZAAS_CODE} ${JAVA_BIN_DIR}java \
     -Dapiml.connection.idleConnectionTimeoutSeconds=${ZWE_configs_apiml_connection_idleConnectionTimeoutSeconds:-5} \
     -Dapiml.cache.storage.location=${ZWE_zowe_workspaceDirectory}/api-mediation/${ZWE_haInstance_id:-localhost} \
     -Dapiml.logs.location=${ZWE_zowe_logDirectory} \
+    -Dapiml.logging.timezone=${ZWE_zowe_logging_timezone} \
     -Dapiml.security.ssl.verifySslCertificatesOfServices=${verifySslCertificatesOfServices:-true} \
     -Dapiml.security.ssl.nonStrictVerifySslCertificatesOfServices=${nonStrictVerifySslCertificatesOfServices:-false} \
     -Dapiml.security.auth.zosmf.serviceId=${ZWE_configs_apiml_security_auth_zosmf_serviceId:-${ZWE_components_gateway_apiml_security_auth_zosmf_serviceId:-ibmzosmf}} \
diff --git a/zaas-service/src/main/resources/application.yml b/zaas-service/src/main/resources/application.yml
index 6383df8bf0..278ee84a13 100644
--- a/zaas-service/src/main/resources/application.yml
+++ b/zaas-service/src/main/resources/application.yml
@@ -26,6 +26,7 @@ logging:
         org.apache.http.conn.ssl.DefaultHostnameVerifier: DEBUG #logs only SSLException
         org.eclipse.jetty.util.ssl: ERROR
         org.apache.tomcat.util.net.SSLUtilBase: ERROR
+    timezone: ${apiml.logging.timezone:UTC}
 
 apiml:
     service:
diff --git a/zaas-service/src/main/resources/logback-zaas.xml b/zaas-service/src/main/resources/logback-zaas.xml
index cd5430a296..92b8b12537 100644
--- a/zaas-service/src/main/resources/logback-zaas.xml
+++ b/zaas-service/src/main/resources/logback-zaas.xml
@@ -5,7 +5,8 @@
     <property name="MIN_INDEX" value="${rollingPolicy.minIndex:-1}"/>
     <property name="MAX_FILE_SIZE" value="${rollingPolicy.file.maxSize:-50MB}"/>
     <property name="STORAGE_LOCATION" value="${apiml.logs.location}" />
-    <property name="apimlLogPattern" value="%d{yyyy-MM-dd HH:mm:ss.SSS,UTC} %clr&lt;${logbackService:-${logbackServiceName}}:%thread:${PID:- }&gt; %magenta(%X{userid:-}) %cyan(%-5level) %clr\(\(%logger{15}\)\) %msg%n"/>
+    <property name="LOGGING_TIMEZONE" value="${logging.timezone:-UTC}"/>
+    <property name="apimlLogPattern" value="%d{yyyy-MM-dd HH:mm:ss.SSS,${LOGGING_TIMEZONE}} %clr&lt;${logbackService:-${logbackServiceName}}:%thread:${PID:- }&gt; %magenta(%X{userid:-}) %cyan(%-5level) %clr\(\(%logger{15}\)\) %msg%n"/>
 
     <turboFilter class="org.zowe.apiml.product.logging.UseridFilter"/>
     <if condition='property("spring.config.activate.on-profile").contains("debug")||property("spring.config.activate.on-profile").contains("diag")||property("spring.config.activate.on-profile").contains("dev")'>