Skip to content

ref(aiohttp): Remove support for send_default_pii #7632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sentrivana merged 7 commits into from
Sep 23, 2026
+116 −316
Merged

ref(aiohttp): Remove support for send_default_pii #7632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
25da377
ref(aiohttp): Remove support for send_default_pii
sentrivana Sep 23, 2026
4e2d6f8
.
sentrivana Sep 23, 2026
7c77752
.
sentrivana Sep 23, 2026
e8cd793
.
sentrivana Sep 23, 2026
3897ad2
Merge branch 'major/3.0' into ivana/drop-pii-aiohttp
sentrivana Sep 23, 2026
627b51d
.
sentrivana Sep 23, 2026
697e3fe
.
sentrivana Sep 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
163 changes: 52 additions & 111 deletions sentry_sdk/integrations/aiohttp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
request_body_within_bounds,
)
from sentry_sdk.integrations.logging import ignore_logger_for_events
from sentry_sdk.scope import Scope, should_send_default_pii
from sentry_sdk.scope import Scope
from sentry_sdk.sessions import track_session
from sentry_sdk.traces import (
BAGGAGE_HEADER_NAME,
Expand All @@ -42,7 +42,6 @@
capture_internal_exceptions,
ensure_integration_enabled,
event_from_exception,
has_data_collection_enabled,
logger,
parse_url,
parse_version,
Expand Down Expand Up @@ -146,52 +145,28 @@ async def sentry_app_handle(
url_attributes = {}
client_address_attributes = {}

if has_data_collection_enabled(client.options):
url_attributes["url.full"] = "%s://%s%s" % (
request.scheme,
request.host,
request.path,
)
url_attributes["url.path"] = request.path

if request.query_string:
filtered_query_string = (
_apply_data_collection_filtering_to_query_string(
query_string=request.query_string,
behaviour=client.options["data_collection"][
"url_query_params"
],
)
url_attributes["url.full"] = "%s://%s%s" % (
request.scheme,
request.host,
request.path,
)
url_attributes["url.path"] = request.path

if request.query_string:
filtered_query_string = (
_apply_data_collection_filtering_to_query_string(
query_string=request.query_string,
behaviour=client.options["data_collection"][
"url_query_params"
],
)
if filtered_query_string:
url_attributes["url.query"] = filtered_query_string
url_attributes["url.full"] += (
"?" + filtered_query_string
)

if request.remote:
if client.options["data_collection"]["user_info"]:
client_address_attributes["client.address"] = (
request.remote
)
scope.set_attribute(
SPANDATA.USER_IP_ADDRESS, request.remote
)

elif should_send_default_pii():
url_full = "%s://%s%s" % (
request.scheme,
request.host,
request.path,
)
if request.query_string:
url_full += "?" + request.query_string
url_attributes["url.query"] = request.query_string
if filtered_query_string:
url_attributes["url.query"] = filtered_query_string
url_attributes["url.full"] += "?" + filtered_query_string

url_attributes["url.full"] = url_full
url_attributes["url.path"] = request.path

if request.remote:
if request.remote:
if client.options["data_collection"]["user_info"]:
client_address_attributes["client.address"] = request.remote
scope.set_attribute(
SPANDATA.USER_IP_ADDRESS, request.remote
Expand Down Expand Up @@ -347,43 +322,26 @@ async def on_request_start(
"http.request.method": method,
}
if parsed_url is not None:
if has_data_collection_enabled(client.options):
url_full = parsed_url.url
attributes["url.path"] = params.url.path

if parsed_url.query:
filtered_query = _apply_data_collection_filtering_to_query_string(
query_string=parsed_url.query,
behaviour=client.options["data_collection"]["url_query_params"],
)
if filtered_query:
attributes["url.query"] = filtered_query
url_full += "?" + filtered_query
breadcrumb[SPANDATA.HTTP_QUERY] = filtered_query

if parsed_url.fragment:
attributes["url.fragment"] = parsed_url.fragment
url_full += "#" + parsed_url.fragment
breadcrumb[SPANDATA.HTTP_FRAGMENT] = parsed_url.fragment

attributes["url.full"] = url_full
breadcrumb["url"] = url_full

elif should_send_default_pii():
url_full = parsed_url.url
attributes["url.path"] = params.url.path

if parsed_url.query:
url_full += "?" + parsed_url.query
attributes["url.query"] = parsed_url.query
breadcrumb[SPANDATA.HTTP_QUERY] = parsed_url.query
if parsed_url.fragment:
url_full += "#" + parsed_url.fragment
attributes["url.fragment"] = parsed_url.fragment
breadcrumb[SPANDATA.HTTP_FRAGMENT] = parsed_url.fragment

attributes["url.full"] = url_full
breadcrumb["url"] = url_full
url_full = parsed_url.url
attributes["url.path"] = params.url.path

if parsed_url.query:
filtered_query = _apply_data_collection_filtering_to_query_string(
query_string=parsed_url.query,
behaviour=client.options["data_collection"]["url_query_params"],
)
if filtered_query:
attributes["url.query"] = filtered_query
url_full += "?" + filtered_query
breadcrumb[SPANDATA.HTTP_QUERY] = filtered_query

if parsed_url.fragment:
attributes["url.fragment"] = parsed_url.fragment
url_full += "#" + parsed_url.fragment
breadcrumb[SPANDATA.HTTP_FRAGMENT] = parsed_url.fragment

attributes["url.full"] = url_full
breadcrumb["url"] = url_full

if sentry_sdk.get_current_span() is not None:
span = sentry_sdk.start_span(name=span_name, attributes=attributes)
Expand Down Expand Up @@ -480,6 +438,7 @@ async def on_request_end(

with capture_internal_exceptions():
add_http_request_source(span)

span.end()

trace_config = TraceConfig()
Expand Down Expand Up @@ -511,44 +470,26 @@ def aiohttp_processor(
request.path,
)

if has_data_collection_enabled(client_options):
if request.query_string:
filtered_query_string = (
_apply_data_collection_filtering_to_query_string(
query_string=request.query_string,
behaviour=client_options["data_collection"][
"url_query_params"
],
)
if request.query_string:
filtered_query_string = (
_apply_data_collection_filtering_to_query_string(
query_string=request.query_string,
behaviour=client_options["data_collection"]["url_query_params"],
)
if filtered_query_string:
request_info["query_string"] = filtered_query_string
else:
request_info["query_string"] = request.query_string
)
if filtered_query_string:
request_info["query_string"] = filtered_query_string

request_info["method"] = request.method
request_info["headers"] = _filter_headers(dict(request.headers))

# 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}
request_info["headers"] = _filter_headers(dict(request.headers))

# Just attach raw data here if it is within bounds, if available.
# Unfortunately there's no way to get structured data from aiohttp
# without awaiting on some coroutine.
if has_data_collection_enabled(client_options):
if (
"incoming_request"
in client_options["data_collection"]["http_bodies"]
):
request_info["data"] = get_aiohttp_request_data(request)
else:
# We never gated this prior to data collection, so it should be attached
# when data collection is not enabled.
if "incoming_request" in client_options["data_collection"]["http_bodies"]:
request_info["data"] = get_aiohttp_request_data(request)

return event
Expand Down
Loading
Loading