Merge branch 'master' into py-2312-migrate-chalice

ericapisani · web-flow · commit 51cf45a0f57d · 2026-06-11T15:04:41.000-04:00
diff --git a/.github/workflows/changelog-preview.yml b/.github/workflows/changelog-preview.yml
@@ -15,5 +15,5 @@ permissions:
 
 jobs:
   changelog-preview:
-    uses: getsentry/craft/.github/workflows/changelog-preview.yml@4468eb9e399655a61c770534dacc03139d98aa18 # v2
+    uses: getsentry/craft/.github/workflows/changelog-preview.yml@6143e76379c342e247687c4ab5c83d8b900cc273 # v2
     secrets: inherit
diff --git a/.github/workflows/flaky-test-detector.yml b/.github/workflows/flaky-test-detector.yml
@@ -108,7 +108,7 @@ jobs:
       # and the repo, and writes the issue body to flaky-issue-body.md.
       - name: Analyze logs and summarize flaky tests
         if: steps.collect.outputs.collected != '0'
-        uses: anthropics/claude-code-action@fbda2eb1bdc90d319b8d853f5deb53bca199a7c1 # v1.0.140
+        uses: anthropics/claude-code-action@11ba60486e4aec9ddfeafcf4bb3f00b028ac2c16 # v1.0.142
         with:
           anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
           github_token: ${{ github.token }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -31,7 +31,7 @@ jobs:
         token: ${{ steps.token.outputs.token }}
         fetch-depth: 0
     - name: Prepare release
-      uses: getsentry/craft@4468eb9e399655a61c770534dacc03139d98aa18 # v2.26.8
+      uses: getsentry/craft@6143e76379c342e247687c4ab5c83d8b900cc273 # v2.26.9
       env:
         GITHUB_TOKEN: ${{ steps.token.outputs.token }}
       with:
diff --git a/.github/workflows/test-integrations-dbs.yml b/.github/workflows/test-integrations-dbs.yml
@@ -21,7 +21,7 @@ jobs:
         os: [ubuntu-22.04]
     services:
       postgres:
-        image: postgres
+        image: ghcr.io/getsentry/image-mirror-library-postgres:17-alpine
         env:
           POSTGRES_PASSWORD: sentry
         # Set health checks to wait until postgres has started
diff --git a/.github/workflows/test-integrations-tasks.yml b/.github/workflows/test-integrations-tasks.yml
@@ -21,7 +21,7 @@ jobs:
         os: [ubuntu-22.04]
     services:
       redis:
-        image: redis
+        image: ghcr.io/getsentry/image-mirror-library-redis:7.0.8-bullseye
         options: >-
           --health-cmd "redis-cli ping"
           --health-interval 10s
diff --git a/.github/workflows/test-integrations-web-1.yml b/.github/workflows/test-integrations-web-1.yml
@@ -21,7 +21,7 @@ jobs:
         os: [ubuntu-22.04]
     services:
       postgres:
-        image: postgres
+        image: ghcr.io/getsentry/image-mirror-library-postgres:17-alpine
         env:
           POSTGRES_PASSWORD: sentry
         # Set health checks to wait until postgres has started
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,3 @@
 include LICENSE
 include sentry_sdk/py.typed
+graft tests
diff --git a/scripts/split_tox_gh_actions/templates/test_group.jinja b/scripts/split_tox_gh_actions/templates/test_group.jinja
@@ -17,7 +17,7 @@
       {% endif %}
       {% if needs_postgres %}
       postgres:
-        image: postgres
+        image: ghcr.io/getsentry/image-mirror-library-postgres:17-alpine
         env:
           POSTGRES_PASSWORD: sentry
         # Set health checks to wait until postgres has started
@@ -32,7 +32,7 @@
       {% endif %}
       {% if needs_redis %}
       redis:
-        image: redis
+        image: ghcr.io/getsentry/image-mirror-library-redis:7.0.8-bullseye
         options: >-
           --health-cmd "redis-cli ping"
           --health-interval 10s
diff --git a/sentry_sdk/integrations/_asgi_common.py b/sentry_sdk/integrations/_asgi_common.py
@@ -121,13 +121,20 @@ def _get_request_attributes(asgi_scope: "Any") -> "dict[str, Any]":
         for header, value in headers.items():
             attributes[f"http.request.header.{header.lower()}"] = value
 
-        query = _get_query(asgi_scope)
-        if query:
-            attributes["http.query"] = query
-
-        attributes["url.full"] = _get_url(
-            asgi_scope, "http" if ty == "http" else "ws", headers.get("host")
-        )
+        if should_send_default_pii():
+            query = _get_query(asgi_scope)
+            if query:
+                attributes["http.query"] = query
+
+            url_without_query_string = _get_url(
+                asgi_scope, "http" if ty == "http" else "ws", headers.get("host")
+            )
+            query_string = _get_query(asgi_scope)
+            attributes["url.full"] = (
+                f"{url_without_query_string}?{query_string}"
+                if query_string is not None
+                else url_without_query_string
+            )
 
     client = asgi_scope.get("client")
     if client and should_send_default_pii():
diff --git a/sentry_sdk/integrations/litestar.py b/sentry_sdk/integrations/litestar.py
@@ -287,40 +287,37 @@ async def handle_wrapper(
 
         request_data = await body
 
-        def event_processor(event: "Event", _: "Hint") -> "Event":
-            route_handler = scope.get("route_handler")
+        route_handler = scope.get("route_handler")
+
+        func = None
+        if route_handler.name is not None:
+            name = route_handler.name
+        # Accounts for use of type `Ref` in earlier versions of litestar without the need to reference it as a type
+        elif hasattr(route_handler.fn, "value"):
+            func = route_handler.fn.value
+        else:
+            func = route_handler.fn
+        if func is not None:
+            name = transaction_from_function(func)
+
+        source = SOURCE_FOR_STYLE["endpoint"]
 
+        if not name:
+            name = _DEFAULT_TRANSACTION_NAME
+            source = TransactionSource.ROUTE
+
+        sentry_sdk.set_transaction_name(name, source)
+        sentry_scope.set_transaction_name(name, source)
+
+        def event_processor(event: "Event", _: "Hint") -> "Event":
             request_info = event.get("request", {})
             request_info["content_length"] = len(scope.get("_body", b""))
             if should_send_default_pii():
                 request_info["cookies"] = extracted_request_data["cookies"]
             if request_data is not None:
                 request_info["data"] = request_data
 
-            func = None
-            if route_handler.name is not None:
-                tx_name = route_handler.name
-            # Accounts for use of type `Ref` in earlier versions of litestar without the need to reference it as a type
-            elif hasattr(route_handler.fn, "value"):
-                func = route_handler.fn.value
-            else:
-                func = route_handler.fn
-            if func is not None:
-                tx_name = transaction_from_function(func)
-
-            tx_info = {"source": SOURCE_FOR_STYLE["endpoint"]}
-
-            if not tx_name:
-                tx_name = _DEFAULT_TRANSACTION_NAME
-                tx_info = {"source": TransactionSource.ROUTE}
-
-            event.update(
-                {
-                    "request": deepcopy(request_info),
-                    "transaction": tx_name,
-                    "transaction_info": tx_info,
-                }
-            )
+            event["request"] = deepcopy(request_info)
             return event
 
         sentry_scope._name = LitestarIntegration.identifier
diff --git a/sentry_sdk/integrations/starlite.py b/sentry_sdk/integrations/starlite.py
@@ -238,39 +238,36 @@ async def handle_wrapper(
 
         request_data = await body
 
-        def event_processor(event: "Event", _: "Hint") -> "Event":
-            route_handler = scope.get("route_handler")
+        route_handler = scope.get("route_handler")
+
+        func = None
+        if route_handler.name is not None:
+            name = route_handler.name
+        elif isinstance(route_handler.fn, Ref):
+            func = route_handler.fn.value
+        else:
+            func = route_handler.fn
+        if func is not None:
+            name = transaction_from_function(func)
+
+        source = SOURCE_FOR_STYLE["endpoint"]
 
+        if not name:
+            name = _DEFAULT_TRANSACTION_NAME
+            source = TransactionSource.ROUTE
+
+        sentry_sdk.set_transaction_name(name, source)
+        sentry_scope.set_transaction_name(name, source)
+
+        def event_processor(event: "Event", _: "Hint") -> "Event":
             request_info = event.get("request", {})
             request_info["content_length"] = len(scope.get("_body", b""))
             if should_send_default_pii():
                 request_info["cookies"] = extracted_request_data["cookies"]
             if request_data is not None:
                 request_info["data"] = request_data
 
-            func = None
-            if route_handler.name is not None:
-                tx_name = route_handler.name
-            elif isinstance(route_handler.fn, Ref):
-                func = route_handler.fn.value
-            else:
-                func = route_handler.fn
-            if func is not None:
-                tx_name = transaction_from_function(func)
-
-            tx_info = {"source": SOURCE_FOR_STYLE["endpoint"]}
-
-            if not tx_name:
-                tx_name = _DEFAULT_TRANSACTION_NAME
-                tx_info = {"source": TransactionSource.ROUTE}
-
-            event.update(
-                {
-                    "request": deepcopy(request_info),
-                    "transaction": tx_name,
-                    "transaction_info": tx_info,
-                }
-            )
+            event["request"] = deepcopy(request_info)
             return event
 
         sentry_scope._name = StarliteIntegration.identifier
diff --git a/sentry_sdk/scope.py b/sentry_sdk/scope.py
@@ -1741,6 +1741,7 @@ def _apply_user_attributes_to_telemetry(
             ("user.id", "id"),
             ("user.name", "username"),
             ("user.email", "email"),
+            ("user.ip_address", "ip_address"),
         ):
             if user_attribute in self._user and attribute_name not in attributes:
                 attributes[attribute_name] = self._user[user_attribute]
diff --git a/tests/integrations/arq/test_arq.py b/tests/integrations/arq/test_arq.py
@@ -356,12 +356,16 @@ async def division(_, a, b=0):
         sentry_sdk.flush()
         spans = [item.payload for item in items if item.type == "span"]
 
-        assert spans[4]["attributes"]["sentry.op"] == "queue.task.arq"
-        assert spans[4]["name"] == "division"
-        assert spans[4]["attributes"]["sentry.span.source"] == "task"
+        task_spans = [
+            span
+            for span in spans
+            if span["attributes"].get("sentry.op") == "queue.task.arq"
+        ]
+
+        division_span = next(span for span in task_spans if span["name"] == "division")
+        assert division_span["attributes"]["sentry.span.source"] == "task"
 
-        assert spans[15]["attributes"]["sentry.op"] == "queue.task.arq"
-        assert spans[15]["name"] == "cron:division"
+        assert any(span["name"] == "cron:division" for span in task_spans)
     else:
         events = capture_events()
 
diff --git a/tests/integrations/asgi/test_asgi.py b/tests/integrations/asgi/test_asgi.py
@@ -164,6 +164,10 @@ def test_invalid_transaction_style(asgi3_app):
 
 
 @pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "should_send_pii",
+    [True, False],
+)
 @pytest.mark.parametrize(
     "span_streaming",
     [True, False],
@@ -174,9 +178,10 @@ async def test_capture_transaction(
     capture_events,
     capture_items,
     span_streaming,
+    should_send_pii,
 ):
     sentry_init(
-        send_default_pii=True,
+        send_default_pii=should_send_pii,
         traces_sample_rate=1.0,
         _experiments={
             "trace_lifecycle": "stream" if span_streaming else "static",
@@ -203,16 +208,21 @@ async def test_capture_transaction(
         assert span["attributes"]["sentry.span.source"] == "url"
         assert span["attributes"]["sentry.op"] == "http.server"
 
-        assert span["attributes"]["url.full"] == "http://localhost/some_url"
         assert span["attributes"]["network.protocol.name"] == "http"
         assert span["attributes"]["http.request.method"] == "GET"
-        assert span["attributes"]["http.query"] == "somevalue=123"
         assert span["attributes"]["http.request.header.host"] == "localhost"
         assert span["attributes"]["http.request.header.remote-addr"] == "127.0.0.1"
         assert (
             span["attributes"]["http.request.header.user-agent"] == "ASGI-Test-Client"
         )
 
+        if should_send_pii:
+            assert (
+                span["attributes"]["url.full"]
+                == "http://localhost/some_url?somevalue=123"
+            )
+            assert span["attributes"]["http.query"] == "somevalue=123"
+
     else:
         (transaction_event,) = events
 
diff --git a/tests/integrations/litestar/test_litestar.py b/tests/integrations/litestar/test_litestar.py
@@ -138,6 +138,69 @@ def test_catch_exceptions(
     assert event["exception"]["values"][0]["mechanism"]["type"] == "litestar"
 
 
+@pytest.mark.parametrize(
+    "test_url,expected_tx_name",
+    [
+        (
+            "/some_url",
+            "tests.integrations.litestar.test_litestar.litestar_app_factory.<locals>.homepage_handler",
+        ),
+        (
+            "/custom_error",
+            "custom_name",
+        ),
+        (
+            "/controller/error",
+            "tests.integrations.litestar.test_litestar.litestar_app_factory.<locals>.MyController.controller_error",
+        ),
+    ],
+)
+@pytest.mark.parametrize("span_streaming", [True, False])
+def test_transaction_name_and_source(
+    sentry_init,
+    capture_events,
+    test_url,
+    expected_tx_name,
+    capture_items,
+    span_streaming,
+):
+    sentry_init(
+        traces_sample_rate=1.0,
+        integrations=[LitestarIntegration()],
+        _experiments={
+            "trace_lifecycle": "stream" if span_streaming else "static",
+        },
+    )
+    litestar_app = litestar_app_factory()
+    client = TestClient(litestar_app)
+
+    if span_streaming:
+        items = capture_items("span")
+
+        try:
+            client.get(test_url)
+        except Exception:
+            pass
+
+        sentry_sdk.flush()
+        spans = [item.payload for item in items]
+
+        spans = [span for span in spans if expected_tx_name in span["name"]]
+        assert len(spans) == 1
+        assert spans[0]["attributes"]["sentry.span.source"] == "component"
+    else:
+        events = capture_events()
+
+        try:
+            client.get(test_url)
+        except Exception:
+            pass
+
+        (_, transaction) = events
+        assert expected_tx_name in transaction["transaction"]
+        assert transaction["transaction_info"] == {"source": "component"}
+
+
 @pytest.mark.parametrize("span_streaming", [True, False])
 def test_middleware_spans(
     sentry_init,
diff --git a/tests/integrations/starlite/test_starlite.py b/tests/integrations/starlite/test_starlite.py
diff --git a/tests/test_attributes.py b/tests/test_attributes.py
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`include LICENSE`
`2`	`2`	`include sentry_sdk/py.typed`
	`3`	`+graft tests`