Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update utcnow for python 3.12 deprecation #107

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions json_logging/dto.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from datetime import datetime
from datetime import datetime, timezone

from json_logging import util

Expand Down Expand Up @@ -32,14 +32,14 @@ class DefaultRequestResponseDTO(RequestResponseDTOBase):

def __init__(self, request, **kwargs):
super(DefaultRequestResponseDTO, self).__init__(request, **kwargs)
utcnow = datetime.utcnow()
utcnow = datetime.now(timezone.utc).replace(tzinfo=None)
self._request_start = utcnow
self["request_received_at"] = util.iso_time_format(utcnow)

# noinspection PyAttributeOutsideInit
def on_request_complete(self, response):
super(DefaultRequestResponseDTO, self).on_request_complete(response)
utcnow = datetime.utcnow()
utcnow = datetime.now(timezone.utc).replace(tzinfo=None)
time_delta = utcnow - self._request_start
self["response_time_ms"] = int(time_delta.total_seconds()) * 1000 + int(time_delta.microseconds / 1000)
self["response_sent_at"] = util.iso_time_format(utcnow)
4 changes: 2 additions & 2 deletions json_logging/formatters.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import logging
import sys
import traceback
from datetime import datetime
from datetime import datetime, timezone

import json_logging

Expand Down Expand Up @@ -61,7 +61,7 @@ def format(self, record):
return json_logging.JSON_SERIALIZER(log_object)

def _format_log_object(self, record, request_util):
utcnow = datetime.utcnow()
utcnow = datetime.now(timezone.utc).replace(tzinfo=None)

base_obj = {
"written_at": json_logging.util.iso_time_format(utcnow),
Expand Down
Loading