Merge branch 'master' into antonpirker/openai-overhaul

Author: antonpirker

sentry_sdk/__init__.py

@@ -49,6 +49,7 @@
     "logger",
     "start_session",
     "end_session",
+    "set_transaction_name",
 ]
 
 # Initialize the debug support after everything is loaded

sentry_sdk/api.py

@@ -84,6 +84,7 @@ def overload(x):
     "monitor",
     "start_session",
     "end_session",
+    "set_transaction_name",
 ]
 
 
@@ -466,3 +467,9 @@ def start_session(
 def end_session():
     # type: () -> None
     return get_isolation_scope().end_session()
+
+
+@scopemethod
+def set_transaction_name(name, source=None):
+    # type: (str, Optional[str]) -> None
+    return get_current_scope().set_transaction_name(name, source)

sentry_sdk/integrations/django/__init__.py

@@ -7,7 +7,7 @@
 import sentry_sdk
 from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.scope import add_global_event_processor, should_send_default_pii
-from sentry_sdk.serializer import add_global_repr_processor
+from sentry_sdk.serializer import add_global_repr_processor, add_repr_sequence_type
 from sentry_sdk.tracing import SOURCE_FOR_STYLE, TransactionSource
 from sentry_sdk.tracing_utils import add_query_source, record_sql_queries
 from sentry_sdk.utils import (
@@ -269,6 +269,7 @@ def _django_queryset_repr(value, hint):
         patch_views()
         patch_templates()
         patch_signals()
+        add_template_context_repr_sequence()
 
         if patch_caching is not None:
             patch_caching()
@@ -745,3 +746,13 @@ def _set_db_data(span, cursor_or_db):
     server_socket_address = connection_params.get("unix_socket")
     if server_socket_address is not None:
         span.set_data(SPANDATA.SERVER_SOCKET_ADDRESS, server_socket_address)
+
+
+def add_template_context_repr_sequence():
+    # type: () -> None
+    try:
+        from django.template.context import BaseContext
+
+        add_repr_sequence_type(BaseContext)
+    except Exception:
+        pass

sentry_sdk/serializer.py

@@ -63,6 +63,14 @@ def add_global_repr_processor(processor):
     global_repr_processors.append(processor)
 
 
+sequence_types = [Sequence, Set]  # type: List[type]
+
+
+def add_repr_sequence_type(ty):
+    # type: (type) -> None
+    sequence_types.append(ty)
+
+
 class Memo:
     __slots__ = ("_ids", "_objs")
 
@@ -332,7 +340,7 @@ def _serialize_node_impl(
             return rv_dict
 
         elif not isinstance(obj, serializable_str_types) and isinstance(
-            obj, (Set, Sequence)
+            obj, tuple(sequence_types)
         ):
             rv_list = []
 

tests/integrations/celery/test_celery.py

@@ -246,25 +246,34 @@ def dummy_task(x, y):
     ]
 
 
-def test_no_stackoverflows(celery):
-    """We used to have a bug in the Celery integration where its monkeypatching
+def test_no_double_patching(celery):
+    """Ensure that Celery tasks are only patched once to prevent stack overflows.
+
+    We used to have a bug in the Celery integration where its monkeypatching
     was repeated for every task invocation, leading to stackoverflows.
 
     See https://github.com/getsentry/sentry-python/issues/265
     """
 
-    results = []
-
     @celery.task(name="dummy_task")
     def dummy_task():
-        sentry_sdk.get_isolation_scope().set_tag("foo", "bar")
-        results.append(42)
+        return 42
 
-    for _ in range(10000):
-        dummy_task.delay()
+    # Initially, the task should not be marked as patched
+    assert not hasattr(dummy_task, "_sentry_is_patched")
+
+    # First invocation should trigger patching
+    result1 = dummy_task.delay()
+    assert result1.get() == 42
+    assert getattr(dummy_task, "_sentry_is_patched", False) is True
+
+    patched_run = dummy_task.run
 
-    assert results == [42] * 10000
-    assert not sentry_sdk.get_isolation_scope()._tags
+    # Second invocation should not re-patch
+    result2 = dummy_task.delay()
+    assert result2.get() == 42
+    assert dummy_task.run is patched_run
+    assert getattr(dummy_task, "_sentry_is_patched", False) is True
 
 
 def test_simple_no_propagation(capture_events, init_celery):

tests/integrations/django/test_basic.py

@@ -10,11 +10,13 @@
 from werkzeug.test import Client
 
 from django import VERSION as DJANGO_VERSION
+
 from django.contrib.auth.models import User
 from django.core.management import execute_from_command_line
 from django.db.utils import OperationalError, ProgrammingError, DataError
 from django.http.request import RawPostDataException
 from django.utils.functional import SimpleLazyObject
+from django.template.context import make_context
 
 try:
     from django.urls import reverse
@@ -310,6 +312,27 @@ def test_queryset_repr(sentry_init, capture_events):
     )
 
 
+@pytest.mark.forked
+@pytest_mark_django_db_decorator()
+def test_context_nested_queryset_repr(sentry_init, capture_events):
+    sentry_init(integrations=[DjangoIntegration()])
+    events = capture_events()
+    User.objects.create_user("john", "[email protected]", "johnpassword")
+
+    try:
+        context = make_context({"entries": User.objects.all()})  # noqa
+        1 / 0
+    except Exception:
+        capture_exception()
+
+    (event,) = events
+
+    (exception,) = event["exception"]["values"]
+    assert exception["type"] == "ZeroDivisionError"
+    (frame,) = exception["stacktrace"]["frames"]
+    assert "<User: " not in frame["vars"]["context"]
+
+
 def test_custom_error_handler_request_context(sentry_init, client, capture_events):
     sentry_init(integrations=[DjangoIntegration()])
     events = capture_events()

tests/integrations/socket/test_socket.py

@@ -2,25 +2,27 @@
 
 from sentry_sdk import start_transaction
 from sentry_sdk.integrations.socket import SocketIntegration
-from tests.conftest import ApproxDict
+from tests.conftest import ApproxDict, create_mock_http_server
+
+PORT = create_mock_http_server()
 
 
 def test_getaddrinfo_trace(sentry_init, capture_events):
     sentry_init(integrations=[SocketIntegration()], traces_sample_rate=1.0)
     events = capture_events()
 
     with start_transaction():
-        socket.getaddrinfo("example.com", 443)
+        socket.getaddrinfo("localhost", PORT)
 
     (event,) = events
     (span,) = event["spans"]
 
     assert span["op"] == "socket.dns"
-    assert span["description"] == "example.com:443"
+    assert span["description"] == f"localhost:{PORT}"  # noqa: E231
     assert span["data"] == ApproxDict(
         {
-            "host": "example.com",
-            "port": 443,
+            "host": "localhost",
+            "port": PORT,
         }
     )
 
@@ -32,28 +34,28 @@ def test_create_connection_trace(sentry_init, capture_events):
     events = capture_events()
 
     with start_transaction():
-        socket.create_connection(("example.com", 443), timeout, None)
+        socket.create_connection(("localhost", PORT), timeout, None)
 
     (event,) = events
     (connect_span, dns_span) = event["spans"]
     # as getaddrinfo gets called in create_connection it should also contain a dns span
 
     assert connect_span["op"] == "socket.connection"
-    assert connect_span["description"] == "example.com:443"
+    assert connect_span["description"] == f"localhost:{PORT}"  # noqa: E231
     assert connect_span["data"] == ApproxDict(
         {
-            "address": ["example.com", 443],
+            "address": ["localhost", PORT],
             "timeout": timeout,
             "source_address": None,
         }
     )
 
     assert dns_span["op"] == "socket.dns"
-    assert dns_span["description"] == "example.com:443"
+    assert dns_span["description"] == f"localhost:{PORT}"  # noqa: E231
     assert dns_span["data"] == ApproxDict(
         {
-            "host": "example.com",
-            "port": 443,
+            "host": "localhost",
+            "port": PORT,
         }
     )
 
@@ -66,7 +68,7 @@ def test_span_origin(sentry_init, capture_events):
     events = capture_events()
 
     with start_transaction(name="foo"):
-        socket.create_connection(("example.com", 443), 1, None)
+        socket.create_connection(("localhost", PORT), 1, None)
 
     (event,) = events
 

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-07-23T07:24:30.467173+00:00
+# Last generated: 2025-07-29T06:07:22.069934+00:00
 
 [tox]
 requires =
@@ -136,9 +136,9 @@ envlist =
 
     # ~~~ AI ~~~
     {py3.8,py3.11,py3.12}-anthropic-v0.16.0
-    {py3.8,py3.11,py3.12}-anthropic-v0.30.1
-    {py3.8,py3.11,py3.12}-anthropic-v0.44.0
-    {py3.8,py3.12,py3.13}-anthropic-v0.58.2
+    {py3.8,py3.11,py3.12}-anthropic-v0.31.2
+    {py3.8,py3.11,py3.12}-anthropic-v0.46.0
+    {py3.8,py3.12,py3.13}-anthropic-v0.60.0
 
     {py3.9,py3.10,py3.11}-cohere-v5.4.0
     {py3.9,py3.11,py3.12}-cohere-v5.9.4
@@ -152,7 +152,8 @@ envlist =
     {py3.8,py3.10,py3.11}-huggingface_hub-v0.22.2
     {py3.8,py3.11,py3.12}-huggingface_hub-v0.26.5
     {py3.8,py3.12,py3.13}-huggingface_hub-v0.30.2
-    {py3.8,py3.12,py3.13}-huggingface_hub-v0.33.4
+    {py3.8,py3.12,py3.13}-huggingface_hub-v0.34.2
+    {py3.8,py3.12,py3.13}-huggingface_hub-v0.35.0rc0
 
 
     # ~~~ DBs ~~~
@@ -184,7 +185,7 @@ envlist =
     {py3.7,py3.12,py3.13}-statsig-v0.55.3
     {py3.7,py3.12,py3.13}-statsig-v0.57.3
     {py3.7,py3.12,py3.13}-statsig-v0.59.1
-    {py3.7,py3.12,py3.13}-statsig-v0.60.0
+    {py3.7,py3.12,py3.13}-statsig-v0.61.0
 
     {py3.8,py3.12,py3.13}-unleash-v6.0.1
     {py3.8,py3.12,py3.13}-unleash-v6.1.0
@@ -215,8 +216,7 @@ envlist =
     {py3.7,py3.8}-grpc-v1.32.0
     {py3.7,py3.9,py3.10}-grpc-v1.46.5
     {py3.7,py3.11,py3.12}-grpc-v1.60.2
-    {py3.9,py3.12,py3.13}-grpc-v1.73.1
-    {py3.9,py3.12,py3.13}-grpc-v1.74.0rc1
+    {py3.9,py3.12,py3.13}-grpc-v1.74.0
 
 
     # ~~~ Tasks ~~~
@@ -267,7 +267,7 @@ envlist =
     {py3.7}-aiohttp-v3.4.4
     {py3.7,py3.8,py3.9}-aiohttp-v3.7.4
     {py3.8,py3.12,py3.13}-aiohttp-v3.10.11
-    {py3.9,py3.12,py3.13}-aiohttp-v3.12.14
+    {py3.9,py3.12,py3.13}-aiohttp-v3.12.15
 
     {py3.6,py3.7}-bottle-v0.12.25
     {py3.8,py3.12,py3.13}-bottle-v0.13.4
@@ -510,13 +510,13 @@ deps =
 
     # ~~~ AI ~~~
     anthropic-v0.16.0: anthropic==0.16.0
-    anthropic-v0.30.1: anthropic==0.30.1
-    anthropic-v0.44.0: anthropic==0.44.0
-    anthropic-v0.58.2: anthropic==0.58.2
+    anthropic-v0.31.2: anthropic==0.31.2
+    anthropic-v0.46.0: anthropic==0.46.0
+    anthropic-v0.60.0: anthropic==0.60.0
     anthropic: pytest-asyncio
     anthropic-v0.16.0: httpx<0.28.0
-    anthropic-v0.30.1: httpx<0.28.0
-    anthropic-v0.44.0: httpx<0.28.0
+    anthropic-v0.31.2: httpx<0.28.0
+    anthropic-v0.46.0: httpx<0.28.0
 
     cohere-v5.4.0: cohere==5.4.0
     cohere-v5.9.4: cohere==5.9.4
@@ -531,7 +531,8 @@ deps =
     huggingface_hub-v0.22.2: huggingface_hub==0.22.2
     huggingface_hub-v0.26.5: huggingface_hub==0.26.5
     huggingface_hub-v0.30.2: huggingface_hub==0.30.2
-    huggingface_hub-v0.33.4: huggingface_hub==0.33.4
+    huggingface_hub-v0.34.2: huggingface_hub==0.34.2
+    huggingface_hub-v0.35.0rc0: huggingface_hub==0.35.0rc0
 
 
     # ~~~ DBs ~~~
@@ -564,7 +565,7 @@ deps =
     statsig-v0.55.3: statsig==0.55.3
     statsig-v0.57.3: statsig==0.57.3
     statsig-v0.59.1: statsig==0.59.1
-    statsig-v0.60.0: statsig==0.60.0
+    statsig-v0.61.0: statsig==0.61.0
     statsig: typing_extensions
 
     unleash-v6.0.1: UnleashClient==6.0.1
@@ -608,8 +609,7 @@ deps =
     grpc-v1.32.0: grpcio==1.32.0
     grpc-v1.46.5: grpcio==1.46.5
     grpc-v1.60.2: grpcio==1.60.2
-    grpc-v1.73.1: grpcio==1.73.1
-    grpc-v1.74.0rc1: grpcio==1.74.0rc1
+    grpc-v1.74.0: grpcio==1.74.0
     grpc: protobuf
     grpc: mypy-protobuf
     grpc: types-protobuf
@@ -712,10 +712,10 @@ deps =
     aiohttp-v3.4.4: aiohttp==3.4.4
     aiohttp-v3.7.4: aiohttp==3.7.4
     aiohttp-v3.10.11: aiohttp==3.10.11
-    aiohttp-v3.12.14: aiohttp==3.12.14
+    aiohttp-v3.12.15: aiohttp==3.12.15
     aiohttp: pytest-aiohttp
     aiohttp-v3.10.11: pytest-asyncio
-    aiohttp-v3.12.14: pytest-asyncio
+    aiohttp-v3.12.15: pytest-asyncio
 
     bottle-v0.12.25: bottle==0.12.25
     bottle-v0.13.4: bottle==0.13.4