Merge branch 'master' into py-2534-identify-db-ops-related-to-cursor-iteration

Author: ericapisani

scripts/populate_tox/package_dependencies.jsonl

@@ -202,10 +202,13 @@ def fetch_package_dependencies(
     python_version: ThreadedVersion,
 ) -> dict:
     """Fetch package dependencies metadata from cache or, failing that, PyPI."""
+    target = TEST_SUITE_CONFIG[integration]["package"]
     constraints = _get_dependency_probe_constraints(
         integration, version, python_version
     )
-    constraints_hash = hashlib.md5("\n".join(constraints).encode("utf-8")).hexdigest()
+    constraints_hash = hashlib.md5(
+        "\n".join([target, *constraints]).encode("utf-8")
+    ).hexdigest()
     package_dependencies = _fetch_package_dependencies_from_cache(
         package, version, python_version, constraints_hash
     )
@@ -226,7 +229,7 @@ def fetch_package_dependencies(
         "-m",
         "pip",
         "install",
-        f"{package}=={version}",
+        f"{target}=={version}",
         "--only-binary",
         "grpcio-tools",  # Prevent source builds that hang CI. grpcio-tools is a build-time dependency pinned by apache-beam.
         "--dry-run",

scripts/populate_tox/populate_tox.py

@@ -75,14 +75,22 @@ def setup_once() -> None:
         def sentry_patched_call_view(
             registry: "Any", request: "Request", *args: "Any", **kwargs: "Any"
         ) -> "Response":
-            integration = sentry_sdk.get_client().get_integration(PyramidIntegration)
+            client = sentry_sdk.get_client()
+            integration = client.get_integration(PyramidIntegration)
             if integration is None:
                 return old_call_view(registry, request, *args, **kwargs)
 
             _set_transaction_name_and_source(
                 sentry_sdk.get_current_scope(), integration.transaction_style, request
             )
+
             scope = sentry_sdk.get_isolation_scope()
+
+            if should_send_default_pii() and has_span_streaming_enabled(client.options):
+                user_id = authenticated_userid(request)
+                if user_id:
+                    scope.set_user({"id": user_id})
+
             scope.add_event_processor(
                 _make_event_processor(weakref.ref(request), integration)
             )

scripts/populate_tox/releases.jsonl

@@ -527,7 +527,12 @@ def tracing_error(request):
 
 @pytest.mark.parametrize("span_streaming", [True, False])
 def test_span_origin(
-    sentry_init, capture_events, capture_items, get_client, span_streaming
+    sentry_init,
+    pyramid_config,
+    capture_events,
+    capture_items,
+    get_client,
+    span_streaming,
 ):
     sentry_init(
         integrations=[PyramidIntegration()],
@@ -552,3 +557,42 @@ def test_span_origin(
     else:
         (_, event) = events
         assert event["contexts"]["trace"]["origin"] == "auto.http.pyramid"
+
+
+@pytest.mark.parametrize("send_default_pii", [True, False])
+def test_span_sets_user_id_on_segment(
+    sentry_init,
+    pyramid_config,
+    capture_items,
+    get_client,
+    send_default_pii,
+):
+    sentry_init(
+        integrations=[PyramidIntegration()],
+        traces_sample_rate=1.0,
+        send_default_pii=send_default_pii,
+        _experiments={"trace_lifecycle": "stream"},
+    )
+
+    class AuthenticationPolicy:
+        def authenticated_userid(self, request):
+            return "123-abc"
+
+    pyramid_config.set_authorization_policy(ACLAuthorizationPolicy())
+    pyramid_config.set_authentication_policy(AuthenticationPolicy())
+
+    items = capture_items("span")
+
+    client = get_client()
+    client.get("/message")
+
+    sentry_sdk.flush()
+    spans = [i.payload for i in items if i.type == "span"]
+
+    assert len(spans) == 1
+    (segment,) = spans
+
+    if send_default_pii:
+        assert segment["attributes"]["user.id"] == "123-abc"
+    else:
+        assert "user.id" not in segment["attributes"]