Merge branch 'master' into ivana/toxgen/again

Author: sentrivana

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 2.26.1
+
+### Various fixes & improvements
+
+- fix(threading): Data leak in ThreadingIntegration between threads (#4281) by @antonpirker
+- fix(logging): Clarify separate warnings case is for Python <3.11 (#4296) by @szokeasaurusrex
+- fix(logging): Add formatted message to log events (#4292) by @szokeasaurusrex
+- fix(logging): Send raw logging parameters (#4291) by @szokeasaurusrex
+- fix: Revert "chore: Deprecate `same_process_as_parent` (#4244)" (#4290) by @sentrivana
+
 ## 2.26.0
 
 ### Various fixes & improvements

docs/conf.py

@@ -31,7 +31,7 @@
 copyright = "2019-{}, Sentry Team and Contributors".format(datetime.now().year)
 author = "Sentry Team and Contributors"
 
-release = "2.26.0"
+release = "2.26.1"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 

sentry_sdk/consts.py

@@ -966,4 +966,4 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "2.26.0"
+VERSION = "2.26.1"

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)
 

setup.py

@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="2.26.0",
+    version="2.26.1",
     author="Sentry Team and Contributors",
     author_email="[email protected]",
     url="https://github.com/getsentry/sentry-python",