From 5cfcfd6baca7d19b61f9470b94a463d832c3732e Mon Sep 17 00:00:00 2001 From: Eric de Vries <817612+ericdevries@users.noreply.github.com> Date: Wed, 6 Dec 2023 16:44:22 +0100 Subject: [PATCH 1/2] fix: use fromtimestamp instead of deprecated utcfromtimestamp --- ecs_logging/__init__.py | 2 +- ecs_logging/_structlog.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ecs_logging/__init__.py b/ecs_logging/__init__.py index 1bf607d..77e54ec 100644 --- a/ecs_logging/__init__.py +++ b/ecs_logging/__init__.py @@ -20,7 +20,7 @@ from ._stdlib import StdlibFormatter from ._structlog import StructlogFormatter -__version__ = "2.1.0" +__version__ = "2.1.1" __all__ = [ "ECS_VERSION", "StdlibFormatter", diff --git a/ecs_logging/_structlog.py b/ecs_logging/_structlog.py index 70a83ca..0465298 100644 --- a/ecs_logging/_structlog.py +++ b/ecs_logging/_structlog.py @@ -42,9 +42,9 @@ def format_to_ecs(self, event_dict): # type: (Dict[str, Any]) -> Dict[str, Any] if "@timestamp" not in event_dict: event_dict["@timestamp"] = ( - datetime.datetime.utcfromtimestamp(time.time()).strftime( - "%Y-%m-%dT%H:%M:%S.%f" - )[:-3] + datetime.datetime.fromtimestamp( + time.time(), tz=datetime.timezone.utc + ).strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z" ) From 1c8794bfa0328103ceacbce8edca70cb9e325b1b Mon Sep 17 00:00:00 2001 From: Eric de Vries <817612+ericdevries@users.noreply.github.com> Date: Thu, 7 Dec 2023 09:10:08 +0100 Subject: [PATCH 2/2] fix: undo version update --- ecs_logging/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ecs_logging/__init__.py b/ecs_logging/__init__.py index 77e54ec..1bf607d 100644 --- a/ecs_logging/__init__.py +++ b/ecs_logging/__init__.py @@ -20,7 +20,7 @@ from ._stdlib import StdlibFormatter from ._structlog import StructlogFormatter -__version__ = "2.1.1" +__version__ = "2.1.0" __all__ = [ "ECS_VERSION", "StdlibFormatter",