From 0f33ec53937aeb194c681ae9e595a5cb303a6c03 Mon Sep 17 00:00:00 2001
From: Dave Bottger <David.Bottger@lfg.com>
Date: Fri, 18 Mar 2022 13:22:46 -0500
Subject: [PATCH 1/2] Change date formats in logging to use UTC

---
 agent/hibernation/hibernatelogger_unix.go    | 2 +-
 agent/hibernation/hibernatelogger_windows.go | 2 +-
 agent/log/defaultconfig.go                   | 6 +++---
 seelog_unix.xml                              | 6 +++---
 seelog_windows.xml.template                  | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/agent/hibernation/hibernatelogger_unix.go b/agent/hibernation/hibernatelogger_unix.go
index 1484b7f98..08afea224 100644
--- a/agent/hibernation/hibernatelogger_unix.go
+++ b/agent/hibernation/hibernatelogger_unix.go
@@ -24,7 +24,7 @@ func getHibernateSeelogConfig() string {
 			<rollingfile type="size" filename="/var/log/amazon/ssm/hibernate.log" maxsize="30000" maxrolls="2"/>
 		</outputs>
 		<formats>
-			<format id="fmtinfo" format="%Date %Time %LEVEL %Msg%n"/>
+			<format id="fmtinfo" format="%UTCDateT%UTCTimeZ %LEVEL %Msg%n"/>
 		</formats>
 	</seelog>`
 	return seelogConfig
diff --git a/agent/hibernation/hibernatelogger_windows.go b/agent/hibernation/hibernatelogger_windows.go
index b81e76a30..e1474530f 100644
--- a/agent/hibernation/hibernatelogger_windows.go
+++ b/agent/hibernation/hibernatelogger_windows.go
@@ -34,7 +34,7 @@ func getHibernateSeelogConfig() string {
 			<rollingfile type="size" filename="` + seelogConfigFilePath + `" maxsize="30000" maxrolls="2"/>
 		</outputs>
 		<formats>
-			<format id="fmtinfo" format="%Date %Time %LEVEL %Msg%n"/>
+			<format id="fmtinfo" format="%UTCDateT%UTCTimeZ %LEVEL %Msg%n"/>
 		</formats>
 	</seelog>`
 	return seelogConfig
diff --git a/agent/log/defaultconfig.go b/agent/log/defaultconfig.go
index c20043bdb..274821e0b 100644
--- a/agent/log/defaultconfig.go
+++ b/agent/log/defaultconfig.go
@@ -50,9 +50,9 @@ func LoadLog(defaultLogDir string, logFile string, debugStatus string) []byte {
         </filter>
     </outputs>
     <formats>
-        <format id="fmterror" format="%Date %Time %LEVEL [%FuncShort @ %File.%Line] %Msg%n"/>
-        <format id="fmtdebug" format="%Date %Time %LEVEL [%FuncShort @ %File.%Line] %Msg%n"/>
-        <format id="fmtinfo" format="%Date %Time %LEVEL %Msg%n"/>
+        <format id="fmterror" format="%UTCDateT%UTCTimeZ %LEVEL [%FuncShort @ %File.%Line] %Msg%n"/>
+        <format id="fmtdebug" format="%UTCDateT%UTCTimeZ %LEVEL [%FuncShort @ %File.%Line] %Msg%n"/>
+        <format id="fmtinfo" format="%UTCDateT%UTCTimeZ %LEVEL %Msg%n"/>
     </formats>
 </seelog>
 `
diff --git a/seelog_unix.xml b/seelog_unix.xml
index 93e50d7f9..f057db3d3 100644
--- a/seelog_unix.xml
+++ b/seelog_unix.xml
@@ -13,8 +13,8 @@
         </filter>
     </outputs>
     <formats>
-        <format id="fmterror" format="%Date %Time %LEVEL [%FuncShort @ %File.%Line] %Msg%n"/>
-        <format id="fmtdebug" format="%Date %Time %LEVEL [%FuncShort @ %File.%Line] %Msg%n"/>
-        <format id="fmtinfo" format="%Date %Time %LEVEL %Msg%n"/>
+        <format id="fmterror" format="%UTCDateT%UTCTimeZ %LEVEL [%FuncShort @ %File.%Line] %Msg%n"/>
+        <format id="fmtdebug" format="%UTCDateT%UTCTimeZ %LEVEL [%FuncShort @ %File.%Line] %Msg%n"/>
+        <format id="fmtinfo" format="%UTCDateT%UTCTimeZ %LEVEL %Msg%n"/>
     </formats>
 </seelog>
diff --git a/seelog_windows.xml.template b/seelog_windows.xml.template
index 362104232..64d20cc7d 100644
--- a/seelog_windows.xml.template
+++ b/seelog_windows.xml.template
@@ -16,8 +16,8 @@
         </filter>
     </outputs>
     <formats>
-        <format id="fmterror" format="%Date %Time %LEVEL [%FuncShort @ %File.%Line] %Msg%n"/>
-        <format id="fmtdebug" format="%Date %Time %LEVEL [%FuncShort @ %File.%Line] %Msg%n"/>
-        <format id="fmtinfo" format="%Date %Time %LEVEL %Msg%n"/>
+        <format id="fmterror" format="%UTCDateT%UTCTimeZ %LEVEL [%FuncShort @ %File.%Line] %Msg%n"/>
+        <format id="fmtdebug" format="%UTCDateT%UTCTimeZ %LEVEL [%FuncShort @ %File.%Line] %Msg%n"/>
+        <format id="fmtinfo" format="%UTCDateT%UTCTimeZ %LEVEL %Msg%n"/>
     </formats>
 </seelog>

From bf7ca7b91ccf65d63dadb1a393ee00df6648b9d6 Mon Sep 17 00:00:00 2001
From: Dave Bottger <David.Bottger@lfg.com>
Date: Fri, 8 Apr 2022 12:53:24 -0500
Subject: [PATCH 2/2] default logging to use RFC3339 Date format

---
 agent/hibernation/hibernatelogger_unix.go    | 2 +-
 agent/hibernation/hibernatelogger_windows.go | 2 +-
 agent/log/defaultconfig.go                   | 6 +++---
 seelog_unix.xml                              | 6 +++---
 seelog_windows.xml.template                  | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/agent/hibernation/hibernatelogger_unix.go b/agent/hibernation/hibernatelogger_unix.go
index 08afea224..84dfecc32 100644
--- a/agent/hibernation/hibernatelogger_unix.go
+++ b/agent/hibernation/hibernatelogger_unix.go
@@ -24,7 +24,7 @@ func getHibernateSeelogConfig() string {
 			<rollingfile type="size" filename="/var/log/amazon/ssm/hibernate.log" maxsize="30000" maxrolls="2"/>
 		</outputs>
 		<formats>
-			<format id="fmtinfo" format="%UTCDateT%UTCTimeZ %LEVEL %Msg%n"/>
+			<format id="fmtinfo" format="%Date(2006-01-02T15:04:05Z07:00) %LEVEL %Msg%n"/>
 		</formats>
 	</seelog>`
 	return seelogConfig
diff --git a/agent/hibernation/hibernatelogger_windows.go b/agent/hibernation/hibernatelogger_windows.go
index e1474530f..3e29e035f 100644
--- a/agent/hibernation/hibernatelogger_windows.go
+++ b/agent/hibernation/hibernatelogger_windows.go
@@ -34,7 +34,7 @@ func getHibernateSeelogConfig() string {
 			<rollingfile type="size" filename="` + seelogConfigFilePath + `" maxsize="30000" maxrolls="2"/>
 		</outputs>
 		<formats>
-			<format id="fmtinfo" format="%UTCDateT%UTCTimeZ %LEVEL %Msg%n"/>
+			<format id="fmtinfo" format="%Date(2006-01-02T15:04:05Z07:00) %LEVEL %Msg%n"/>
 		</formats>
 	</seelog>`
 	return seelogConfig
diff --git a/agent/log/defaultconfig.go b/agent/log/defaultconfig.go
index 274821e0b..f4d99908e 100644
--- a/agent/log/defaultconfig.go
+++ b/agent/log/defaultconfig.go
@@ -50,9 +50,9 @@ func LoadLog(defaultLogDir string, logFile string, debugStatus string) []byte {
         </filter>
     </outputs>
     <formats>
-        <format id="fmterror" format="%UTCDateT%UTCTimeZ %LEVEL [%FuncShort @ %File.%Line] %Msg%n"/>
-        <format id="fmtdebug" format="%UTCDateT%UTCTimeZ %LEVEL [%FuncShort @ %File.%Line] %Msg%n"/>
-        <format id="fmtinfo" format="%UTCDateT%UTCTimeZ %LEVEL %Msg%n"/>
+        <format id="fmterror" format="%Date(2006-01-02T15:04:05Z07:00) %LEVEL [%FuncShort @ %File.%Line] %Msg%n"/>
+        <format id="fmtdebug" format="%Date(2006-01-02T15:04:05Z07:00) %LEVEL [%FuncShort @ %File.%Line] %Msg%n"/>
+        <format id="fmtinfo" format="%Date(2006-01-02T15:04:05Z07:00) %LEVEL %Msg%n"/>
     </formats>
 </seelog>
 `
diff --git a/seelog_unix.xml b/seelog_unix.xml
index f057db3d3..44aa54743 100644
--- a/seelog_unix.xml
+++ b/seelog_unix.xml
@@ -13,8 +13,8 @@
         </filter>
     </outputs>
     <formats>
-        <format id="fmterror" format="%UTCDateT%UTCTimeZ %LEVEL [%FuncShort @ %File.%Line] %Msg%n"/>
-        <format id="fmtdebug" format="%UTCDateT%UTCTimeZ %LEVEL [%FuncShort @ %File.%Line] %Msg%n"/>
-        <format id="fmtinfo" format="%UTCDateT%UTCTimeZ %LEVEL %Msg%n"/>
+        <format id="fmterror" format="%Date(2006-01-02T15:04:05Z07:00) %LEVEL [%FuncShort @ %File.%Line] %Msg%n"/>
+        <format id="fmtdebug" format="%Date(2006-01-02T15:04:05Z07:00) %LEVEL [%FuncShort @ %File.%Line] %Msg%n"/>
+        <format id="fmtinfo" format="%Date(2006-01-02T15:04:05Z07:00) %LEVEL %Msg%n"/>
     </formats>
 </seelog>
diff --git a/seelog_windows.xml.template b/seelog_windows.xml.template
index 64d20cc7d..2299486b5 100644
--- a/seelog_windows.xml.template
+++ b/seelog_windows.xml.template
@@ -16,8 +16,8 @@
         </filter>
     </outputs>
     <formats>
-        <format id="fmterror" format="%UTCDateT%UTCTimeZ %LEVEL [%FuncShort @ %File.%Line] %Msg%n"/>
-        <format id="fmtdebug" format="%UTCDateT%UTCTimeZ %LEVEL [%FuncShort @ %File.%Line] %Msg%n"/>
-        <format id="fmtinfo" format="%UTCDateT%UTCTimeZ %LEVEL %Msg%n"/>
+        <format id="fmterror" format="%Date(2006-01-02T15:04:05Z07:00) %LEVEL [%FuncShort @ %File.%Line] %Msg%n"/>
+        <format id="fmtdebug" format="%Date(2006-01-02T15:04:05Z07:00) %LEVEL [%FuncShort @ %File.%Line] %Msg%n"/>
+        <format id="fmtinfo" format="%Date(2006-01-02T15:04:05Z07:00) %LEVEL %Msg%n"/>
     </formats>
 </seelog>