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

Author: sl0thentr0py

sentry_sdk/integrations/django/__init__.py

@@ -9,7 +9,7 @@
 import sentry_sdk
 from sentry_sdk.consts import OP, SPANDATA, SOURCE_FOR_STYLE, TransactionSource
 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_utils import add_query_source, record_sql_queries
 from sentry_sdk.utils import (
     AnnotatedValue,
@@ -254,6 +254,7 @@ def _django_queryset_repr(
         patch_views()
         patch_templates()
         patch_signals()
+        add_template_context_repr_sequence()
 
         if patch_caching is not None:
             patch_caching()
@@ -709,3 +710,13 @@ def _set_db_data(span: Span, cursor_or_db: Any) -> None:
     server_socket_address = connection_params.get("unix_socket")
     if server_socket_address is not None:
         span.set_attribute(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: ReprProcessor) -> None:
     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")
 
@@ -318,7 +326,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

@@ -249,25 +249,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

@@ -14,6 +14,7 @@
 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
@@ -312,6 +313,30 @@ 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()
+
+    from django.contrib.auth.models import User
+
+    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_span
 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_span(name="socket"):
-        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_span(name="socket"):
-        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.host": "example.com",
-            "address.port": 443,
+            "address.host": "localhost",
+            "address.port": PORT,
             "timeout": timeout,
         }
     )
 
     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_span(name="foo"):
-        socket.create_connection(("example.com", 443), 1, None)
+        socket.create_connection(("localhost", PORT), 1, None)
 
     (event,) = events