Skip to content

Commit df15184

Browse files
antonpirkerantonpirker
committed
thats not the way
1 parent f6012fc commit df15184

File tree

2 files changed

+28
-74
lines changed

2 files changed

+28
-74
lines changed

‎sentry_sdk/integrations/anthropic.py‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -363,12 +363,7 @@ def _sentry_patched_create_sync(*args, **kwargs):
363363
integration = sentry_sdk.get_client().get_integration(AnthropicIntegration)
364364
kwargs["integration"] = integration
365365

366-
try:
367-
return _execute_sync(f, *args, **kwargs)
368-
finally:
369-
span = sentry_sdk.get_current_span()
370-
if span is not None and span.status == SPANSTATUS.ERROR:
371-
span.__exit__(None, None, None)
366+
return _execute_sync(f, *args, **kwargs)
372367

373368
return _sentry_patched_create_sync
374369

@@ -401,11 +396,6 @@ async def _sentry_patched_create_async(*args, **kwargs):
401396
integration = sentry_sdk.get_client().get_integration(AnthropicIntegration)
402397
kwargs["integration"] = integration
403398

404-
try:
405-
return await _execute_async(f, *args, **kwargs)
406-
finally:
407-
span = sentry_sdk.get_current_span()
408-
if span is not None and span.status == SPANSTATUS.ERROR:
409-
span.__exit__(None, None, None)
399+
return await _execute_async(f, *args, **kwargs)
410400

411401
return _sentry_patched_create_async

‎sentry_sdk/integrations/openai.py‎

Lines changed: 26 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -461,18 +461,12 @@ def _execute_sync(f, *args, **kwargs):
461461
@wraps(f)
462462
def _sentry_patched_create_sync(*args, **kwargs):
463463
# type: (Any, Any) -> Any
464-
try:
465-
integration = sentry_sdk.get_client().get_integration(OpenAIIntegration)
466-
if integration is None or "messages" not in kwargs:
467-
# no "messages" means invalid call (in all versions of openai), let it return error
468-
return f(*args, **kwargs)
469-
470-
return _execute_sync(f, *args, **kwargs)
464+
integration = sentry_sdk.get_client().get_integration(OpenAIIntegration)
465+
if integration is None or "messages" not in kwargs:
466+
# no "messages" means invalid call (in all versions of openai), let it return error
467+
return f(*args, **kwargs)
471468

472-
finally:
473-
span = sentry_sdk.get_current_span()
474-
if span is not None and span.status == SPANSTATUS.ERROR:
475-
span.__exit__(None, None, None)
469+
return _execute_sync(f, *args, **kwargs)
476470

477471
return _sentry_patched_create_sync
478472

@@ -502,18 +496,12 @@ async def _execute_async(f, *args, **kwargs):
502496
@wraps(f)
503497
async def _sentry_patched_create_async(*args, **kwargs):
504498
# type: (Any, Any) -> Any
505-
try:
506-
integration = sentry_sdk.get_client().get_integration(OpenAIIntegration)
507-
if integration is None or "messages" not in kwargs:
508-
# no "messages" means invalid call (in all versions of openai), let it return error
509-
return await f(*args, **kwargs)
499+
integration = sentry_sdk.get_client().get_integration(OpenAIIntegration)
500+
if integration is None or "messages" not in kwargs:
501+
# no "messages" means invalid call (in all versions of openai), let it return error
502+
return await f(*args, **kwargs)
510503

511-
return await _execute_async(f, *args, **kwargs)
512-
finally:
513-
514-
span = sentry_sdk.get_current_span()
515-
if span is not None and span.status == SPANSTATUS.ERROR:
516-
span.__exit__(None, None, None)
504+
return await _execute_async(f, *args, **kwargs)
517505

518506
return _sentry_patched_create_async
519507

@@ -566,17 +554,11 @@ def _execute_sync(f, *args, **kwargs):
566554
@wraps(f)
567555
def _sentry_patched_create_sync(*args, **kwargs):
568556
# type: (Any, Any) -> Any
569-
try:
570-
integration = sentry_sdk.get_client().get_integration(OpenAIIntegration)
571-
if integration is None:
572-
return f(*args, **kwargs)
557+
integration = sentry_sdk.get_client().get_integration(OpenAIIntegration)
558+
if integration is None:
559+
return f(*args, **kwargs)
573560

574-
return _execute_sync(f, *args, **kwargs)
575-
576-
finally:
577-
span = sentry_sdk.get_current_span()
578-
if span is not None and span.status == SPANSTATUS.ERROR:
579-
span.__exit__(None, None, None)
561+
return _execute_sync(f, *args, **kwargs)
580562

581563
return _sentry_patched_create_sync
582564

@@ -606,17 +588,11 @@ async def _execute_async(f, *args, **kwargs):
606588
@wraps(f)
607589
async def _sentry_patched_create_async(*args, **kwargs):
608590
# type: (Any, Any) -> Any
609-
try:
610-
integration = sentry_sdk.get_client().get_integration(OpenAIIntegration)
611-
if integration is None:
612-
return await f(*args, **kwargs)
613-
614-
return await _execute_async(f, *args, **kwargs)
591+
integration = sentry_sdk.get_client().get_integration(OpenAIIntegration)
592+
if integration is None:
593+
return await f(*args, **kwargs)
615594

616-
finally:
617-
span = sentry_sdk.get_current_span()
618-
if span is not None and span.status == SPANSTATUS.ERROR:
619-
span.__exit__(None, None, None)
595+
return await _execute_async(f, *args, **kwargs)
620596

621597
return _sentry_patched_create_async
622598

@@ -671,17 +647,11 @@ def _execute_sync(f, *args, **kwargs):
671647
@wraps(f)
672648
def _sentry_patched_create_sync(*args, **kwargs):
673649
# type: (Any, Any) -> Any
674-
try:
675-
integration = sentry_sdk.get_client().get_integration(OpenAIIntegration)
676-
if integration is None:
677-
return f(*args, **kwargs)
650+
integration = sentry_sdk.get_client().get_integration(OpenAIIntegration)
651+
if integration is None:
652+
return f(*args, **kwargs)
678653

679-
return _execute_sync(f, *args, **kwargs)
680-
681-
finally:
682-
span = sentry_sdk.get_current_span()
683-
if span is not None and span.status == SPANSTATUS.ERROR:
684-
span.__exit__(None, None, None)
654+
return _execute_sync(f, *args, **kwargs)
685655

686656
return _sentry_patched_create_sync
687657

@@ -711,16 +681,10 @@ async def _execute_async(f, *args, **kwargs):
711681
@wraps(f)
712682
async def _sentry_patched_responses_async(*args, **kwargs):
713683
# type: (Any, Any) -> Any
714-
try:
715-
integration = sentry_sdk.get_client().get_integration(OpenAIIntegration)
716-
if integration is None:
717-
return await f(*args, **kwargs)
684+
integration = sentry_sdk.get_client().get_integration(OpenAIIntegration)
685+
if integration is None:
686+
return await f(*args, **kwargs)
718687

719-
return await _execute_async(f, *args, **kwargs)
720-
721-
finally:
722-
span = sentry_sdk.get_current_span()
723-
if span is not None and span.status == SPANSTATUS.ERROR:
724-
span.__exit__(None, None, None)
688+
return await _execute_async(f, *args, **kwargs)
725689

726690
return _sentry_patched_responses_async

0 commit comments

Comments
 (0)