ref(sanic): Drop send_default_pii support

Author: pabloDeputter

sentry_sdk/integrations/sanic.py

@@ -11,13 +11,11 @@
 )
 from sentry_sdk.integrations import DidNotEnable, Integration, _check_minimum_version
 from sentry_sdk.integrations._wsgi_common import RequestExtractor, _filter_headers
-from sentry_sdk.scope import should_send_default_pii
 from sentry_sdk.traces import SegmentNameSource
 from sentry_sdk.utils import (
     capture_internal_exceptions,
     ensure_integration_enabled,
     event_from_exception,
-    has_data_collection_enabled,
     parse_version,
     reraise,
 )
@@ -135,12 +133,8 @@ async def _context_enter(request: "Request") -> None:
     sentry_sdk.continue_trace(dict(request.headers))
     scope.set_custom_sampling_context({"sanic_request": request})
 
-    if request.remote_addr:
-        if has_data_collection_enabled(client.options):
-            if client.options["data_collection"]["user_info"]:
-                scope.set_attribute(SPANDATA.USER_IP_ADDRESS, request.remote_addr)
-        elif should_send_default_pii():
-            scope.set_attribute(SPANDATA.USER_IP_ADDRESS, request.remote_addr)
+    if request.remote_addr and client.options["data_collection"]["user_info"]:
+        scope.set_attribute(SPANDATA.USER_IP_ADDRESS, request.remote_addr)
 
     span = sentry_sdk.start_span(
         # Unless the request results in a 404 error, the name and source
@@ -258,35 +252,23 @@ def _get_request_attributes(request: "Request") -> "Dict[str, Any]":
     urlparts = urlsplit(request.url)
     client_options = sentry_sdk.get_client().options
 
-    if has_data_collection_enabled(client_options):
-        attributes["url.path"] = urlparts.path
+    attributes["url.path"] = urlparts.path
 
-        filtered_query = None
-        if urlparts.query:
-            filtered_query = _apply_data_collection_filtering_to_query_string(
-                query_string=urlparts.query,
-                behaviour=client_options["data_collection"]["url_query_params"],
-            )
-            if filtered_query:
-                attributes[SPANDATA.HTTP_QUERY] = filtered_query
-
-        attributes[SPANDATA.URL_FULL] = urlparts._replace(
-            query=filtered_query or ""
-        ).geturl()
-
-        if request.remote_addr:
-            if client_options["data_collection"]["user_info"]:
-                attributes[SPANDATA.CLIENT_ADDRESS] = request.remote_addr
-
-    elif should_send_default_pii():
-        attributes[SPANDATA.URL_FULL] = request.url
-        attributes["url.path"] = urlparts.path
+    filtered_query = None
+    if urlparts.query:
+        filtered_query = _apply_data_collection_filtering_to_query_string(
+            query_string=urlparts.query,
+            behaviour=client_options["data_collection"]["url_query_params"],
+        )
+        if filtered_query:
+            attributes[SPANDATA.HTTP_QUERY] = filtered_query
 
-        if urlparts.query:
-            attributes[SPANDATA.HTTP_QUERY] = urlparts.query
+    attributes[SPANDATA.URL_FULL] = urlparts._replace(
+        query=filtered_query or ""
+    ).geturl()
 
-        if request.remote_addr:
-            attributes[SPANDATA.CLIENT_ADDRESS] = request.remote_addr
+    if request.remote_addr and client_options["data_collection"]["user_info"]:
+        attributes[SPANDATA.CLIENT_ADDRESS] = request.remote_addr
 
     if urlparts.scheme:
         attributes[SPANDATA.NETWORK_PROTOCOL_NAME] = urlparts.scheme
@@ -320,25 +302,17 @@ def sanic_processor(event: "Event", hint: "Optional[Hint]") -> "Optional[Event]"
             )
 
             client_options = sentry_sdk.get_client().options
-            if has_data_collection_enabled(client_options):
-                if urlparts.query:
-                    filtered_query = _apply_data_collection_filtering_to_query_string(
-                        query_string=urlparts.query,
-                        behaviour=client_options["data_collection"]["url_query_params"],
-                    )
-                    if filtered_query:
-                        request_info["query_string"] = filtered_query
-            else:
-                request_info["query_string"] = urlparts.query
+            if urlparts.query:
+                filtered_query = _apply_data_collection_filtering_to_query_string(
+                    query_string=urlparts.query,
+                    behaviour=client_options["data_collection"]["url_query_params"],
+                )
+                if filtered_query:
+                    request_info["query_string"] = filtered_query
 
             request_info["method"] = request.method
 
-            # REMOTE_ADDR was unconditionally set pre-data collection, so it
-            # continues to be set when data collection is not enabled.
-            if (
-                not has_data_collection_enabled(client_options)
-                or client_options["data_collection"]["user_info"]
-            ):
+            if client_options["data_collection"]["user_info"]:
                 request_info["env"] = {"REMOTE_ADDR": request.remote_addr}
             request_info["headers"] = _filter_headers(dict(request.headers))