diff --git a/sentry_sdk/integrations/logging.py b/sentry_sdk/integrations/logging.py index ec13c86c6e..bf538ac7c7 100644 --- a/sentry_sdk/integrations/logging.py +++ b/sentry_sdk/integrations/logging.py @@ -1,4 +1,5 @@ import logging +import sys from datetime import datetime, timezone from fnmatch import fnmatch @@ -248,27 +249,25 @@ def _emit(self, record): event["level"] = level # type: ignore[typeddict-item] event["logger"] = record.name - # Log records from `warnings` module as separate issues - record_captured_from_warnings_module = ( - record.name == "py.warnings" and record.msg == "%s" - ) - if record_captured_from_warnings_module: - # use the actual message and not "%s" as the message - # this prevents grouping all warnings under one "%s" issue - msg = record.args[0] # type: ignore - - event["logentry"] = { - "message": msg, - "formatted": record.getMessage(), - "params": (), - } - + if ( + sys.version_info < (3, 11) + and record.name == "py.warnings" + and record.msg == "%s" + ): + # warnings module on Python 3.10 and below sets record.msg to "%s" + # and record.args[0] to the actual warning message. + # This was fixed in https://github.com/python/cpython/pull/30975. + message = record.args[0] + params = () else: - event["logentry"] = { - "formatted": record.getMessage(), - "message": to_string(record.msg), - "params": record.args, - } + message = record.msg + params = record.args + + event["logentry"] = { + "message": to_string(message), + "formatted": record.getMessage(), + "params": params, + } event["extra"] = self._extra_from_record(record)