Make sure we have timestamp.

ThePalaceProject · Oct 2, 2023 · 97c0a23 · 97c0a23
1 parent e953374
commit 97c0a23
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/core/service/logging/log.py b/core/service/logging/log.py
@@ -9,6 +9,7 @@
 from watchtower import CloudWatchLogHandler
 
 from core.service.logging.configuration import LogLevel
+from core.util.datetime_helpers import utc_now
 
 if TYPE_CHECKING:
     from mypy_boto3_logs import CloudWatchLogsClient
@@ -54,6 +55,7 @@ def ensure_str(s: Any) -> Any:
             level=record.levelname,
             filename=record.filename,
             message=message,
+            timestamp=utc_now().isoformat(),
         )
         if record.exc_info:
             data["traceback"] = self.formatException(record.exc_info)

diff --git a/tests/core/service/logging/test_log.py b/tests/core/service/logging/test_log.py
@@ -7,6 +7,7 @@
 from unittest.mock import MagicMock
 
 import pytest
+from freezegun import freeze_time
 from watchtower import CloudWatchLogHandler
 
 from core.service.logging.configuration import LogLevel
@@ -20,6 +21,7 @@
 
 
 class TestJSONFormatter:
+    @freeze_time("1990-05-05")
     def test_format(self) -> None:
         formatter = JSONFormatter()
 
@@ -42,6 +44,7 @@ def test_format(self) -> None:
         )
         data = json.loads(formatter.format(record))
         assert "some logger" == data["name"]
+        assert "1990-05-05T00:00:00+00:00" == data["timestamp"]
         assert "DEBUG" == data["level"]
         assert "A message" == data["message"]
         assert "pathname" == data["filename"]