improvements

Author: sentrivana

sentry_sdk/integrations/aiohttp.py

@@ -389,11 +389,9 @@ def _prepopulate_attributes(request):
         except ValueError:
             attributes["server.address"] = request.host
 
-    try:
+    with capture_internal_exceptions():
         url = f"{request.scheme}://{request.host}{request.path}"  # noqa: E231
         if request.query_string:
             attributes["url.full"] = f"{url}?{request.query_string}"
-    except Exception:
-        pass
 
     return attributes

sentry_sdk/integrations/asgi.py

@@ -32,6 +32,7 @@
 )
 from sentry_sdk.utils import (
     ContextVar,
+    capture_internal_exceptions,
     event_from_exception,
     HAS_REAL_CONTEXTVARS,
     CONTEXTVARS_ERROR_MESSAGE,
@@ -348,19 +349,18 @@ def _prepopulate_attributes(scope):
             try:
                 host, port = scope[attr]
                 attributes[f"{attr}.address"] = host
-                attributes[f"{attr}.port"] = port
+                if port is not None:
+                    attributes[f"{attr}.port"] = port
             except Exception:
                 pass
 
-    try:
+    with capture_internal_exceptions():
         full_url = _get_url(scope)
         query = _get_query(scope)
         if query:
             attributes["url.query"] = query
             full_url = f"{full_url}?{query}"
 
         attributes["url.full"] = full_url
-    except Exception:
-        pass
 
     return attributes

sentry_sdk/integrations/aws_lambda.py

@@ -468,6 +468,7 @@ def _event_from_error_json(error_json):
 
 
 def _prepopulate_attributes(aws_event, aws_context):
+    # type: (Any, Any) -> dict[str, Any]
     attributes = {
         "cloud.provider": "aws",
     }

sentry_sdk/integrations/celery/__init__.py

@@ -514,6 +514,7 @@ def sentry_publish(self, *args, **kwargs):
 
 
 def _prepopulate_attributes(task, args, kwargs):
+    # type: (Any, *Any, **Any) -> dict[str, str]
     attributes = {
         "celery.job.task": task.name,
         "celery.job.args": _serialize_span_attribute(args),

sentry_sdk/integrations/gcp.py

@@ -236,6 +236,7 @@ def _get_google_cloud_logs_url(final_time):
 
 
 def _prepopulate_attributes(gcp_event):
+    # type: (Any) -> dict[str, Any]
     attributes = {
         "cloud.provider": "gcp",
     }

sentry_sdk/integrations/tornado.py

@@ -254,9 +254,7 @@ def _prepopulate_attributes(request):
         except ValueError:
             attributes["server.address"] = request.host
 
-    try:
+    with capture_internal_exceptions():
         attributes["url.full"] = request.full_url()
-    except Exception:
-        pass
 
     return attributes

sentry_sdk/integrations/wsgi.py

@@ -11,7 +11,6 @@
     _filter_headers,
 )
 from sentry_sdk.sessions import track_session
-from sentry_sdk.scope import use_isolation_scope
 from sentry_sdk.tracing import Transaction, TRANSACTION_SOURCE_ROUTE
 from sentry_sdk.utils import (
     ContextVar,
@@ -324,6 +323,7 @@ def event_processor(event, hint):
 
 
 def _prepopulate_attributes(wsgi_environ, use_x_forwarded_for=False):
+    # type: (dict[str, str], bool) -> dict[str, str]
     """Extract span attributes from the WSGI environment."""
     attributes = {}
 
@@ -339,11 +339,9 @@ def _prepopulate_attributes(wsgi_environ, use_x_forwarded_for=False):
         except Exception:
             attributes["network.protocol.name"] = wsgi_environ["SERVER_PROTOCOL"]
 
-    try:
+    with capture_internal_exceptions():
         url = get_request_url(wsgi_environ, use_x_forwarded_for)
         query = wsgi_environ.get("QUERY_STRING")
         attributes["url.full"] = f"{url}?{query}"
-    except Exception:
-        pass
 
     return attributes