Merge remote-tracking branch 'origin/master' into potel-base

Author: sl0thentr0py

scripts/populate_tox/tox.jinja

@@ -269,7 +269,7 @@ deps =
     # Redis
     redis: fakeredis!=1.7.4
     redis: pytest<8.0.0
-    py3.7-redis: fakeredis!=2.26.0  # https://github.com/cunla/fakeredis-py/issues/341
+    {py3.7,py3.8}-redis: fakeredis<2.26.0
     {py3.7,py3.8,py3.9,py3.10,py3.11,py3.12,py3.13}-redis: pytest-asyncio
     redis-v3: redis~=3.0
     redis-v4: redis~=4.0

sentry_sdk/integrations/logging.py

@@ -372,6 +372,13 @@ def _capture_log_from_record(self, client, record):
                         if isinstance(arg, (str, float, int, bool))
                         else safe_repr(arg)
                     )
+            elif isinstance(record.args, dict):
+                for key, value in record.args.items():
+                    attrs[f"sentry.message.parameter.{key}"] = (
+                        value
+                        if isinstance(value, (str, float, int, bool))
+                        else safe_repr(value)
+                    )
         if record.lineno:
             attrs["code.line.number"] = record.lineno
         if record.pathname:

sentry_sdk/scope.py

@@ -1420,8 +1420,11 @@ def new_scope():
         yield new_scope
 
     finally:
-        # restore original scope
-        _current_scope.reset(token)
+        try:
+            # restore original scope
+            _current_scope.reset(token)
+        except LookupError:
+            capture_internal_exception(sys.exc_info())
 
 
 @contextmanager
@@ -1455,8 +1458,11 @@ def use_scope(scope):
         yield scope
 
     finally:
-        # restore original scope
-        _current_scope.reset(token)
+        try:
+            # restore original scope
+            _current_scope.reset(token)
+        except LookupError:
+            capture_internal_exception(sys.exc_info())
 
 
 @contextmanager
@@ -1497,8 +1503,15 @@ def isolation_scope():
 
     finally:
         # restore original scopes
-        _current_scope.reset(current_token)
-        _isolation_scope.reset(isolation_token)
+        try:
+            _current_scope.reset(current_token)
+        except LookupError:
+            capture_internal_exception(sys.exc_info())
+
+        try:
+            _isolation_scope.reset(isolation_token)
+        except LookupError:
+            capture_internal_exception(sys.exc_info())
 
 
 @contextmanager
@@ -1537,8 +1550,15 @@ def use_isolation_scope(isolation_scope):
 
     finally:
         # restore original scopes
-        _current_scope.reset(current_token)
-        _isolation_scope.reset(isolation_token)
+        try:
+            _current_scope.reset(current_token)
+        except LookupError:
+            capture_internal_exception(sys.exc_info())
+
+        try:
+            _isolation_scope.reset(isolation_token)
+        except LookupError:
+            capture_internal_exception(sys.exc_info())
 
 
 def should_send_default_pii():

tests/integrations/bottle/test_bottle.py

@@ -12,8 +12,6 @@
 from werkzeug.test import Client
 from werkzeug.wrappers import Response
 
-import sentry_sdk.integrations.bottle as bottle_sentry
-
 
 @pytest.fixture(scope="function")
 def app(sentry_init):
@@ -46,7 +44,7 @@ def inner():
 
 
 def test_has_context(sentry_init, app, capture_events, get_client):
-    sentry_init(integrations=[bottle_sentry.BottleIntegration()])
+    sentry_init(integrations=[BottleIntegration()])
     events = capture_events()
 
     client = get_client()
@@ -77,11 +75,7 @@ def test_transaction_style(
     capture_events,
     get_client,
 ):
-    sentry_init(
-        integrations=[
-            bottle_sentry.BottleIntegration(transaction_style=transaction_style)
-        ]
-    )
+    sentry_init(integrations=[BottleIntegration(transaction_style=transaction_style)])
     events = capture_events()
 
     client = get_client()
@@ -100,7 +94,7 @@ def test_transaction_style(
 def test_errors(
     sentry_init, capture_exceptions, capture_events, app, debug, catchall, get_client
 ):
-    sentry_init(integrations=[bottle_sentry.BottleIntegration()])
+    sentry_init(integrations=[BottleIntegration()])
 
     app.catchall = catchall
     set_debug(mode=debug)
@@ -127,7 +121,7 @@ def index():
 
 
 def test_large_json_request(sentry_init, capture_events, app, get_client):
-    sentry_init(integrations=[bottle_sentry.BottleIntegration()])
+    sentry_init(integrations=[BottleIntegration()])
 
     data = {"foo": {"bar": "a" * 2000}}
 
@@ -157,7 +151,7 @@ def index():
 
 @pytest.mark.parametrize("data", [{}, []], ids=["empty-dict", "empty-list"])
 def test_empty_json_request(sentry_init, capture_events, app, data, get_client):
-    sentry_init(integrations=[bottle_sentry.BottleIntegration()])
+    sentry_init(integrations=[BottleIntegration()])
 
     @app.route("/", method="POST")
     def index():
@@ -180,7 +174,7 @@ def index():
 
 
 def test_medium_formdata_request(sentry_init, capture_events, app, get_client):
-    sentry_init(integrations=[bottle_sentry.BottleIntegration()])
+    sentry_init(integrations=[BottleIntegration()])
 
     data = {"foo": "a" * 2000}
 
@@ -209,9 +203,7 @@ def index():
 def test_too_large_raw_request(
     sentry_init, input_char, capture_events, app, get_client
 ):
-    sentry_init(
-        integrations=[bottle_sentry.BottleIntegration()], max_request_body_size="small"
-    )
+    sentry_init(integrations=[BottleIntegration()], max_request_body_size="small")
 
     data = input_char * 2000
 
@@ -239,9 +231,7 @@ def index():
 
 
 def test_files_and_form(sentry_init, capture_events, app, get_client):
-    sentry_init(
-        integrations=[bottle_sentry.BottleIntegration()], max_request_body_size="always"
-    )
+    sentry_init(integrations=[BottleIntegration()], max_request_body_size="always")
 
     data = {"foo": "a" * 2000, "file": (BytesIO(b"hello"), "hello.txt")}
 
@@ -278,9 +268,7 @@ def index():
 def test_json_not_truncated_if_max_request_body_size_is_always(
     sentry_init, capture_events, app, get_client
 ):
-    sentry_init(
-        integrations=[bottle_sentry.BottleIntegration()], max_request_body_size="always"
-    )
+    sentry_init(integrations=[BottleIntegration()], max_request_body_size="always")
 
     data = {
         "key{}".format(i): "value{}".format(i) for i in range(MAX_DATABAG_BREADTH + 10)
@@ -309,8 +297,8 @@ def index():
 @pytest.mark.parametrize(
     "integrations",
     [
-        [bottle_sentry.BottleIntegration()],
-        [bottle_sentry.BottleIntegration(), LoggingIntegration(event_level="ERROR")],
+        [BottleIntegration()],
+        [BottleIntegration(), LoggingIntegration(event_level="ERROR")],
     ],
 )
 def test_errors_not_reported_twice(
@@ -324,23 +312,24 @@ def test_errors_not_reported_twice(
 
     @app.route("/")
     def index():
-        try:
-            1 / 0
-        except Exception as e:
-            logger.exception(e)
-            raise e
+        1 / 0
 
     events = capture_events()
 
     client = get_client()
+
     with pytest.raises(ZeroDivisionError):
-        client.get("/")
+        try:
+            client.get("/")
+        except ZeroDivisionError as e:
+            logger.exception(e)
+            raise e
 
     assert len(events) == 1
 
 
 def test_mount(app, capture_exceptions, capture_events, sentry_init, get_client):
-    sentry_init(integrations=[bottle_sentry.BottleIntegration()])
+    sentry_init(integrations=[BottleIntegration()])
 
     app.catchall = False
 
@@ -367,7 +356,7 @@ def crashing_app(environ, start_response):
 
 
 def test_error_in_errorhandler(sentry_init, capture_events, app, get_client):
-    sentry_init(integrations=[bottle_sentry.BottleIntegration()])
+    sentry_init(integrations=[BottleIntegration()])
 
     set_debug(False)
     app.catchall = True
@@ -397,7 +386,7 @@ def error_handler(err):
 
 
 def test_bad_request_not_captured(sentry_init, capture_events, app, get_client):
-    sentry_init(integrations=[bottle_sentry.BottleIntegration()])
+    sentry_init(integrations=[BottleIntegration()])
     events = capture_events()
 
     @app.route("/")
@@ -412,7 +401,7 @@ def index():
 
 
 def test_no_exception_on_redirect(sentry_init, capture_events, app, get_client):
-    sentry_init(integrations=[bottle_sentry.BottleIntegration()])
+    sentry_init(integrations=[BottleIntegration()])
     events = capture_events()
 
     @app.route("/")
@@ -436,7 +425,7 @@ def test_span_origin(
     capture_events,
 ):
     sentry_init(
-        integrations=[bottle_sentry.BottleIntegration()],
+        integrations=[BottleIntegration()],
         traces_sample_rate=1.0,
     )
     events = capture_events()

tests/integrations/logging/test_logging.py

@@ -545,3 +545,82 @@ def test_logger_with_all_attributes(sentry_init, capture_envelopes):
         "sentry.severity_number": 13,
         "sentry.severity_text": "warn",
     }
+
+
+def test_sentry_logs_named_parameters(sentry_init, capture_envelopes):
+    """
+    The python logger module should capture named parameters from dictionary arguments in Sentry logs.
+    """
+    sentry_init(_experiments={"enable_logs": True})
+    envelopes = capture_envelopes()
+
+    python_logger = logging.Logger("test-logger")
+    python_logger.info(
+        "%(source)s call completed, %(input_tk)i input tk, %(output_tk)i output tk (model %(model)s, cost $%(cost).4f)",
+        {
+            "source": "test_source",
+            "input_tk": 100,
+            "output_tk": 50,
+            "model": "gpt-4",
+            "cost": 0.0234,
+        },
+    )
+
+    get_client().flush()
+    logs = envelopes_to_logs(envelopes)
+
+    assert len(logs) == 1
+    attrs = logs[0]["attributes"]
+
+    # Check that the template is captured
+    assert (
+        attrs["sentry.message.template"]
+        == "%(source)s call completed, %(input_tk)i input tk, %(output_tk)i output tk (model %(model)s, cost $%(cost).4f)"
+    )
+
+    # Check that dictionary arguments are captured as named parameters
+    assert attrs["sentry.message.parameter.source"] == "test_source"
+    assert attrs["sentry.message.parameter.input_tk"] == 100
+    assert attrs["sentry.message.parameter.output_tk"] == 50
+    assert attrs["sentry.message.parameter.model"] == "gpt-4"
+    assert attrs["sentry.message.parameter.cost"] == 0.0234
+
+    # Check other standard attributes
+    assert attrs["logger.name"] == "test-logger"
+    assert attrs["sentry.origin"] == "auto.logger.log"
+    assert logs[0]["severity_number"] == 9  # info level
+    assert logs[0]["severity_text"] == "info"
+
+
+def test_sentry_logs_named_parameters_complex_values(sentry_init, capture_envelopes):
+    """
+    The python logger module should handle complex values in named parameters using safe_repr.
+    """
+    sentry_init(_experiments={"enable_logs": True})
+    envelopes = capture_envelopes()
+
+    python_logger = logging.Logger("test-logger")
+    complex_object = {"nested": {"data": [1, 2, 3]}, "tuple": (4, 5, 6)}
+    python_logger.warning(
+        "Processing %(simple)s with %(complex)s data",
+        {
+            "simple": "simple_value",
+            "complex": complex_object,
+        },
+    )
+
+    get_client().flush()
+    logs = envelopes_to_logs(envelopes)
+
+    assert len(logs) == 1
+    attrs = logs[0]["attributes"]
+
+    # Check that simple values are kept as-is
+    assert attrs["sentry.message.parameter.simple"] == "simple_value"
+
+    # Check that complex values are converted using safe_repr
+    assert "sentry.message.parameter.complex" in attrs
+    complex_param = attrs["sentry.message.parameter.complex"]
+    assert isinstance(complex_param, str)
+    assert "nested" in complex_param
+    assert "data" in complex_param

tox.ini

@@ -10,7 +10,7 @@
 # The file (and all resulting CI YAMLs) then need to be regenerated via
 # "scripts/generate-test-files.sh".
 #
-# Last generated: 2025-06-17T14:52:38.697104+00:00
+# Last generated: 2025-06-17T15:01:09.161715+00:00
 
 [tox]
 requires =
@@ -433,7 +433,7 @@ deps =
     # Redis
     redis: fakeredis!=1.7.4
     redis: pytest<8.0.0
-    py3.7-redis: fakeredis!=2.26.0  # https://github.com/cunla/fakeredis-py/issues/341
+    {py3.7,py3.8}-redis: fakeredis<2.26.0
     {py3.7,py3.8,py3.9,py3.10,py3.11,py3.12,py3.13}-redis: pytest-asyncio
     redis-v3: redis~=3.0
     redis-v4: redis~=4.0
@@ -560,6 +560,7 @@ deps =
     graphene: fastapi
     graphene: flask
     graphene: httpx
+    py3.6-graphene: aiocontextvars
 
     strawberry-v0.209.8: strawberry-graphql[fastapi,flask]==0.209.8
     strawberry-v0.231.1: strawberry-graphql[fastapi,flask]==0.231.1
@@ -658,6 +659,7 @@ deps =
     starlette-v0.16.0: httpx<0.28.0
     starlette-v0.26.1: httpx<0.28.0
     starlette-v0.36.3: httpx<0.28.0
+    py3.6-starlette: aiocontextvars
 
     fastapi-v0.79.1: fastapi==0.79.1
     fastapi-v0.91.0: fastapi==0.91.0
@@ -671,6 +673,7 @@ deps =
     fastapi-v0.79.1: httpx<0.28.0
     fastapi-v0.91.0: httpx<0.28.0
     fastapi-v0.103.2: httpx<0.28.0
+    py3.6-fastapi: aiocontextvars
 
 
     # ~~~ Web 2 ~~~
@@ -723,6 +726,7 @@ deps =
     tornado: pytest
     tornado-v6.0.4: pytest<8.2
     tornado-v6.2: pytest<8.2
+    py3.6-tornado: aiocontextvars
 
 
     # ~~~ Misc ~~~