ref: Remove client_options from event_from_exception

Author: sentrivana

sentry_sdk/integrations/aiohttp.py

@@ -503,7 +503,6 @@ def _capture_exception() -> "ExcInfo":
     exc_info = sys.exc_info()
     event, hint = event_from_exception(
         exc_info,
-        client_options=sentry_sdk.get_client().options,
         mechanism={"type": "aiohttp", "handled": False},
     )
     sentry_sdk.capture_event(event, hint=hint)

sentry_sdk/integrations/anthropic.py

@@ -266,7 +266,6 @@ def setup_once() -> None:
 def _capture_exception(exc: "Any") -> None:
     event, hint = event_from_exception(
         exc,
-        client_options=sentry_sdk.get_client().options,
         mechanism={"type": "anthropic", "handled": False},
     )
     sentry_sdk.capture_event(event, hint=hint)

sentry_sdk/integrations/ariadne.py

@@ -80,7 +80,6 @@ def _sentry_patched_handle_graphql_errors(
                 for error in errors:
                     event, hint = event_from_exception(
                         error,
-                        client_options=client.options,
                         mechanism={
                             "type": AriadneIntegration.identifier,
                             "handled": False,
@@ -105,7 +104,6 @@ def _sentry_patched_handle_query_result(
                 for error in result.errors or []:
                     event, hint = event_from_exception(
                         error,
-                        client_options=client.options,
                         mechanism={
                             "type": AriadneIntegration.identifier,
                             "handled": False,

sentry_sdk/integrations/arq.py

@@ -127,7 +127,6 @@ def _capture_exception(exc_info: "ExcInfo") -> None:
 
     event, hint = event_from_exception(
         exc_info,
-        client_options=sentry_sdk.get_client().options,
         mechanism={"type": ArqIntegration.identifier, "handled": False},
     )
     sentry_sdk.capture_event(event, hint=hint)

sentry_sdk/integrations/asgi.py

@@ -64,7 +64,6 @@
 def _capture_exception(exc: "Any", mechanism_type: str = "asgi") -> None:
     event, hint = event_from_exception(
         exc,
-        client_options=sentry_sdk.get_client().options,
         mechanism={"type": mechanism_type, "handled": False},
     )
     sentry_sdk.capture_event(event, hint=hint)

sentry_sdk/integrations/asyncio.py

@@ -202,7 +202,6 @@ def _capture_exception() -> "ExcInfo":
     if integration is not None:
         event, hint = event_from_exception(
             exc_info,
-            client_options=client.options,
             mechanism={"type": "asyncio", "handled": False},
         )
         sentry_sdk.capture_event(event, hint=hint)

sentry_sdk/integrations/aws_lambda.py

@@ -65,16 +65,13 @@ def _get_user_from_event(aws_event: "dict[str, Any]") -> "dict[str, Any]":
 def _wrap_init_error(init_error: "F") -> "F":
     @ensure_integration_enabled(AwsLambdaIntegration, init_error)
     def sentry_init_error(*args: "Any", **kwargs: "Any") -> "Any":
-        client = sentry_sdk.get_client()
-
         with capture_internal_exceptions():
             sentry_sdk.get_isolation_scope().clear_breadcrumbs()
 
             exc_info = sys.exc_info()
             if exc_info and all(exc_info):
                 sentry_event, hint = event_from_exception(
                     exc_info,
-                    client_options=client.options,
                     mechanism={"type": "aws_lambda", "handled": False},
                 )
                 sentry_sdk.capture_event(sentry_event, hint=hint)
@@ -231,7 +228,6 @@ def sentry_handler(
                     exc_info = sys.exc_info()
                     sentry_event, hint = event_from_exception(
                         exc_info,
-                        client_options=client.options,
                         mechanism={"type": "aws_lambda", "handled": False},
                     )
                     sentry_sdk.capture_event(sentry_event, hint=hint)

sentry_sdk/integrations/beam.py

@@ -136,11 +136,8 @@ def _capture_exception(exc_info: "ExcInfo") -> None:
     """
     Send Beam exception to Sentry.
     """
-    client = sentry_sdk.get_client()
-
     event, hint = event_from_exception(
         exc_info,
-        client_options=client.options,
         mechanism={"type": "beam", "handled": False},
     )
     sentry_sdk.capture_event(event, hint=hint)

sentry_sdk/integrations/bottle.py

@@ -208,7 +208,6 @@ def event_processor(event: "Event", hint: "dict[str, Any]") -> "Event":
 def _capture_exception(exception: BaseException, handled: bool) -> None:
     event, hint = event_from_exception(
         exception,
-        client_options=sentry_sdk.get_client().options,
         mechanism={"type": "bottle", "handled": handled},
     )
     sentry_sdk.capture_event(event, hint=hint)

sentry_sdk/integrations/celery/__init__.py

@@ -115,7 +115,6 @@ def _capture_exception(task: "Any", exc_info: "ExcInfo") -> None:
 
     event, hint = event_from_exception(
         exc_info,
-        client_options=client.options,
         mechanism={"type": "celery", "handled": False},
     )