Removed the ensure_integration_enabled

Author: antonpirker

sentry_sdk/integrations/anthropic.py

@@ -191,14 +191,17 @@ def _execute_sync(f, *args, **kwargs):
             return e.value
 
     @wraps(f)
-    @ensure_integration_enabled(AnthropicIntegration, f)
     def _sentry_patched_create_sync(*args, **kwargs):
         # type: (*Any, **Any) -> Any
+        integration = sentry_sdk.get_client().get_integration(AnthropicIntegration)
+        if integration is None or "messages" not in kwargs:
+            return f(*args, **kwargs)
+
         return _execute_sync(f, *args, **kwargs)
 
     return _sentry_patched_create_sync
 
-  
+
 def _wrap_async_message_create(f):
     # type: (Any) -> Any
     async def _execute_async(f, *args, **kwargs):
@@ -220,10 +223,9 @@ async def _execute_async(f, *args, **kwargs):
     async def _sentry_patched_create_async(*args, **kwargs):
         # type: (*Any, **Any) -> Any
         integration = sentry_sdk.get_client().get_integration(AnthropicIntegration)
-        
         if integration is None or "messages" not in kwargs:
-            return f(*args, **kwargs)
-        
+            return await f(*args, **kwargs)
+
         return await _execute_async(f, *args, **kwargs)
 
     return _sentry_patched_create_async

sentry_sdk/integrations/openai.py

@@ -227,9 +227,13 @@ def _execute_sync(f, *args, **kwargs):
             return e.value
 
     @wraps(f)
-    @ensure_integration_enabled(OpenAIIntegration, f)
     def _sentry_patched_create_sync(*args, **kwargs):
         # type: (*Any, **Any) -> Any
+        integration = sentry_sdk.get_client().get_integration(OpenAIIntegration)
+        if integration is None or "messages" not in kwargs:
+            # no "messages" means invalid call (in all versions of openai), let it return error
+            return f(*args, **kwargs)
+
         return _execute_sync(f, *args, **kwargs)
 
     return _sentry_patched_create_sync
@@ -253,9 +257,13 @@ async def _execute_async(f, *args, **kwargs):
             return e.value
 
     @wraps(f)
-    @ensure_integration_enabled(OpenAIIntegration, f)
     async def _sentry_patched_create_async(*args, **kwargs):
         # type: (*Any, **Any) -> Any
+        integration = sentry_sdk.get_client().get_integration(OpenAIIntegration)
+        if integration is None or "messages" not in kwargs:
+            # no "messages" means invalid call (in all versions of openai), let it return error
+            return await f(*args, **kwargs)
+
         return await _execute_async(f, *args, **kwargs)
 
     return _sentry_patched_create_async
@@ -327,9 +335,12 @@ def _execute_sync(f, *args, **kwargs):
             return e.value
 
     @wraps(f)
-    @ensure_integration_enabled(OpenAIIntegration, f)
     def _sentry_patched_create_sync(*args, **kwargs):
         # type: (*Any, **Any) -> Any
+        integration = sentry_sdk.get_client().get_integration(OpenAIIntegration)
+        if integration is None:
+            return f(*args, **kwargs)
+
         return _execute_sync(f, *args, **kwargs)
 
     return _sentry_patched_create_sync
@@ -353,9 +364,12 @@ async def _execute_async(f, *args, **kwargs):
             return e.value
 
     @wraps(f)
-    @ensure_integration_enabled(OpenAIIntegration, f)
     async def _sentry_patched_create_async(*args, **kwargs):
         # type: (*Any, **Any) -> Any
+        integration = sentry_sdk.get_client().get_integration(OpenAIIntegration)
+        if integration is None:
+            return await f(*args, **kwargs)
+
         return await _execute_async(f, *args, **kwargs)
 
-    return _sentry_patched_create_async
+    return _sentry_patched_create_async

tox.ini

@@ -792,5 +792,5 @@ commands =
 [testenv:linters]
 commands =
     flake8 tests sentry_sdk
-    black --check tests sentry_sdk
+    black tests sentry_sdk
     mypy sentry_sdk