Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 34k
gh-102402: Fix floating point math issue by using time.time_ns() in logging.LogRecord#102412
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
Merged
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
Show all changes
24 commits Select commit Hold shift + click to select a range
2f046c2 Add test for 102402 100msecs
dougthor42 2460f88 Update logging.LogRecord to use time_ns.
dougthor42 059f856 Simplify msecs calculation
dougthor42 997bd41 Add blurb
dougthor42 2e7cde3 Fix comments, remove superfluous comment
dougthor42 5505cea Merge branch 'main' into fix-gh-102402-logging-msecs
dougthor42 411a421 Switch to math algorithm rather than string manipulation.
dougthor42 d3a1f78 Correct and update comment
dougthor42 5fa370b Use unittest.mock.patch instead of manual monkeypatching
dougthor42 39cab9d formatting in test_logging.py
dougthor42 920bf74 Update docs
dougthor42 8bdc406 Keep ref to gh-89047
dougthor42 bf68b26 Use modulo arithmetic, update comment
dougthor42 e404ca0 Add comment
dougthor42 9661499 Correct comment
dougthor42 ec74b0e Rename test
dougthor42 710f3ac Add test for relativeCreated
dougthor42 ff8140c remove issue num from test names; move to comment
dougthor42 fd45694 Use importhelper instead of importlib.reload
dougthor42 84b931b Also assert record.created
dougthor42 5a604f9 Update test to check multiple offset values
dougthor42 dc90919 Optimize loop vs import CM
dougthor42 502ff65 Move item to variable
dougthor42 65ea1b5 Merge branch 'main' into fix-gh-102402-logging-msecs
vsajip File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -56,7 +56,7 @@ | ||
| # | ||
| #_startTime is used as the base when calculating the relative time of events | ||
| # | ||
| _startTime = time.time() | ||
| _startTime = time.time_ns() | ||
| # | ||
| #raiseExceptions is used to see if exceptions during handling should be | ||
| @@ -300,7 +300,7 @@ def __init__(self, name, level, pathname, lineno, | ||
| """ | ||
| Initialize a logging record with interesting information. | ||
| """ | ||
| ct = time.time() | ||
| ct = time.time_ns() | ||
| self.name = name | ||
| self.msg = msg | ||
| # | ||
| @@ -339,9 +339,14 @@ def __init__(self, name, level, pathname, lineno, | ||
| self.stack_info = sinfo | ||
| self.lineno = lineno | ||
| self.funcName = func | ||
| self.created = ct | ||
| self.msecs = int((ct - int(ct)) * 1000) + 0.0 # see gh-89047 | ||
| self.relativeCreated = (self.created - _startTime) * 1000 | ||
| self.created = ct / 1e9 # ns to float seconds | ||
| # Get the number of whole milliseconds (0-999) in the fractional part of seconds. | ||
| # Eg: 1_677_903_920_999_998_503 ns --> 999_998_503 ns--> 999 ms | ||
| # Convert to float by adding 0.0 for historical reasons. See gh-89047 | ||
| self.msecs = (ct % 1_000_000_000) // 1_000_000 + 0.0 | ||
| self.relativeCreated = (ct - _startTime) / 1e6 | ||
| if logThreads: | ||
| self.thread = threading.get_ident() | ||
| self.threadName = threading.current_thread().name | ||
| @@ -572,7 +577,7 @@ class Formatter(object): | ||
| %(lineno)d Source line number where the logging call was issued | ||
| (if available) | ||
| %(funcName)s Function name | ||
| %(created)f Time when the LogRecord was created (time.time() | ||
| %(created)f Time when the LogRecord was created (time.time_ns() / 1e9 | ||
serhiy-storchaka marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading. Please reload this page. | ||
| return value) | ||
| %(asctime)s Textual time when the LogRecord was created | ||
| %(msecs)d Millisecond portion of the creation time | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -60,6 +60,7 @@ | ||
| import weakref | ||
| from http.server import HTTPServer, BaseHTTPRequestHandler | ||
| from unittest.mock import patch | ||
| from urllib.parse import urlparse, parse_qs | ||
| from socketserver import (ThreadingUDPServer, DatagramRequestHandler, | ||
| ThreadingTCPServer, StreamRequestHandler) | ||
| @@ -4552,6 +4553,44 @@ def test_issue_89047(self): | ||
| s = f.format(r) | ||
| self.assertNotIn('.1000', s) | ||
| def test_msecs_has_no_floating_point_precision_loss(self): | ||
| # See issue gh-102402 | ||
| tests = ( | ||
| # time_ns is approx. 2023-03-04 04:25:20 UTC | ||
| # (time_ns, expected_msecs_value) | ||
| (1_677_902_297_100_000_000, 100.0), # exactly 100ms | ||
| (1_677_903_920_999_998_503, 999.0), # check truncating doesn't round | ||
| (1_677_903_920_000_998_503, 0.0), # check truncating doesn't round | ||
| ) | ||
| for ns, want in tests: | ||
| with patch('time.time_ns') as patched_ns: | ||
| patched_ns.return_value = ns | ||
| record = logging.makeLogRecord({'msg': 'test'}) | ||
| self.assertEqual(record.msecs, want) | ||
serhiy-storchaka marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading. Please reload this page.
serhiy-storchaka marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading. Please reload this page. | ||
| self.assertEqual(record.created, ns / 1e9) | ||
| def test_relativeCreated_has_higher_precision(self): | ||
| # See issue gh-102402 | ||
| ns = 1_677_903_920_000_998_503 # approx. 2023-03-04 04:25:20 UTC | ||
| offsets_ns = (200, 500, 12_354, 99_999, 1_677_903_456_999_123_456) | ||
| orig_modules = import_helper._save_and_remove_modules(['logging']) | ||
| try: | ||
| with patch("time.time_ns") as patched_ns: | ||
| # mock for module import | ||
| patched_ns.return_value = ns | ||
| import logging | ||
| for offset_ns in offsets_ns: | ||
| new_ns = ns + offset_ns | ||
| # mock for log record creation | ||
| patched_ns.return_value = new_ns | ||
| record = logging.makeLogRecord({'msg': 'test'}) | ||
| self.assertAlmostEqual(record.created, new_ns / 1e9, places=6) | ||
| # After PR gh-102412, precision (places) increases from 3 to 7 | ||
| self.assertAlmostEqual(record.relativeCreated, offset_ns / 1e6, places=7) | ||
| finally: | ||
| import_helper._save_and_remove_modules(['logging']) | ||
| sys.modules.update(orig_modules) | ||
| class TestBufferingFormatter(logging.BufferingFormatter): | ||
| def formatHeader(self, records): | ||
2 changes: 2 additions & 0 deletions 2 Misc/NEWS.d/next/Library/2023-03-03-21-13-08.gh-issue-102402.fpkRO1.rst
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| Adjust ``logging.LogRecord`` to use ``time.time_ns()`` and fix minor bug | ||
| related to floating point math. |
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.