ref!: Stop disabling client integrations when an agent integration is present

scripts/populate_tox/populate_tox.py

@@ -65,7 +65,6 @@
     "aws_lambda",
     "cloud_resource_context",
     "common",
-    "integration_deactivation",
     "shadowed_module",
     "gcp",
     "gevent",

scripts/populate_tox/tox.jinja

@@ -22,9 +22,6 @@ envlist =
     # === Gevent ===
     {py3.7,py3.8,py3.10,py3.11,py3.12}-gevent
 
-    # === Integration Deactivation ===
-    {py3.9,py3.10,py3.11,py3.12,py3.13,py3.14}-integration_deactivation
-
     # === Shadowed Module ===
     {py3.7,py3.8,py3.9,py3.10,py3.11,py3.12,py3.13,py3.14,py3.14t,py3.15,py3.15t}-shadowed_module
 
@@ -113,11 +110,6 @@ deps =
     {py3.10,py3.11}-gevent: zope.event<5.0.0
     {py3.10,py3.11}-gevent: zope.interface<8.0
 
-    # === Integration Deactivation ===
-    integration_deactivation: openai
-    integration_deactivation: anthropic
-    integration_deactivation: langchain
-
     # === Integrations ===
 
     # Asgi
@@ -215,7 +207,6 @@ setenv =
     # TESTPATH definitions for test suites not managed by toxgen
     common: _TESTPATH=tests
     gevent: _TESTPATH=tests
-    integration_deactivation: _TESTPATH=tests/test_ai_integration_deactivation.py
     shadowed_module: _TESTPATH=tests/test_shadowed_module.py
     asgi: _TESTPATH=tests/integrations/asgi
     aws_lambda: _TESTPATH=tests/integrations/aws_lambda

scripts/split_tox_gh_actions/split_tox_gh_actions.py

@@ -166,7 +166,6 @@
         "pure_eval",
         "trytond_wsgi",
         "typer",
-        "integration_deactivation",
         "shadowed_module",
     ],
 }

sentry_sdk/integrations/__init__.py

@@ -180,13 +180,6 @@ def iter_default_integrations(
 }
 
 
-_INTEGRATION_DEACTIVATES = {
-    "langchain": {"openai", "anthropic", "google_genai"},
-    "openai_agents": {"openai"},
-    "pydantic_ai": {"openai", "anthropic"},
-}
-
-
 def setup_integrations(
     integrations: "Sequence[Integration]",
     with_defaults: bool = True,
@@ -202,24 +195,13 @@ def setup_integrations(
 
     `disabled_integrations` takes precedence over `with_defaults` and
     `with_auto_enabling_integrations`.
-
-    Some integrations are designed to automatically deactivate other integrations
-    in order to avoid conflicts and prevent duplicate telemetry from being collected.
-    For example, enabling the `langchain` integration will auto-deactivate both the
-    `openai` and `anthropic` integrations.
-
-    Users can override this behavior by:
-      - Explicitly providing an integration in the `integrations=[]` list, or
-      - Disabling the higher-level integration via the `disabled_integrations` option.
     """
     integrations = dict(
         (integration.identifier, integration) for integration in integrations or ()
     )
 
     logger.debug("Setting up integrations (with default = %s)", with_defaults)
 
-    user_provided_integrations = set(integrations.keys())
-
     # Integrations that will not be enabled
     disabled_integrations = [
         integration if isinstance(integration, type) else type(integration)
@@ -238,27 +220,6 @@ def setup_integrations(
                 integrations[instance.identifier] = instance
                 used_as_default_integration.add(instance.identifier)
 
-    disabled_integration_identifiers = {
-        integration.identifier for integration in disabled_integrations
-    }
-
-    for integration, targets_to_deactivate in _INTEGRATION_DEACTIVATES.items():
-        if (
-            integration in integrations
-            and integration not in disabled_integration_identifiers
-        ):
-            for target in targets_to_deactivate:
-                if target not in user_provided_integrations:
-                    for cls in iter_default_integrations(True):
-                        if cls.identifier == target:
-                            if cls not in disabled_integrations:
-                                disabled_integrations.append(cls)
-                                logger.debug(
-                                    "Auto-deactivating %s integration because %s integration is active",
-                                    target,
-                                    integration,
-                                )
-
     for identifier, integration in integrations.items():
         with _installer_lock:
             if identifier not in _processed_integrations:

sentry_sdk/integrations/anthropic.py

@@ -709,6 +709,9 @@ def _sentry_patched_create_sync(f: "Any", *args: "Any", **kwargs: "Any") -> "Any
     if integration is None:
         return f(*args, **kwargs)
 
+    if sentry_sdk.get_current_scope()._agent_framework_chat_generation_entered:
+        return f(*args, **kwargs)
+
     if "messages" not in kwargs:
         return f(*args, **kwargs)
 
@@ -796,6 +799,9 @@ async def _sentry_patched_create_async(
     if integration is None:
         return await f(*args, **kwargs)
 
+    if sentry_sdk.get_current_scope()._agent_framework_chat_generation_entered:
+        return await f(*args, **kwargs)
+
     if "messages" not in kwargs:
         return await f(*args, **kwargs)
 
@@ -1002,6 +1008,9 @@ def _wrap_message_stream(f: "Any") -> "Any":
 
     @wraps(f)
     def _sentry_patched_stream(*args: "Any", **kwargs: "Any") -> "MessageStreamManager":
+        if sentry_sdk.get_current_scope()._agent_framework_chat_generation_entered:
+            return f(*args, **kwargs)
+
         stream_manager = f(*args, **kwargs)
 
         stream_manager._max_tokens = kwargs.get("max_tokens")
@@ -1101,6 +1110,9 @@ def _wrap_async_message_stream(f: "Any") -> "Any":
     def _sentry_patched_stream(
         *args: "Any", **kwargs: "Any"
     ) -> "AsyncMessageStreamManager":
+        if sentry_sdk.get_current_scope()._agent_framework_chat_generation_entered:
+            return f(*args, **kwargs)
+
         stream_manager = f(*args, **kwargs)
 
         stream_manager._max_tokens = kwargs.get("max_tokens")

sentry_sdk/integrations/google_genai/__init__.py

@@ -75,6 +75,9 @@ def new_generate_content_stream(
         if integration is None:
             return f(self, *args, **kwargs)
 
+        if sentry_sdk.get_current_scope()._agent_framework_chat_generation_entered:
+            return f(self, *args, **kwargs)
+
         _model, contents, model_name = prepare_generate_content_args(args, kwargs)
 
         chat_span = sentry_sdk.traces.start_span(
@@ -136,6 +139,9 @@ async def new_async_generate_content_stream(
         if integration is None:
             return await f(self, *args, **kwargs)
 
+        if sentry_sdk.get_current_scope()._agent_framework_chat_generation_entered:
+            return f(self, *args, **kwargs)
+
         _model, contents, model_name = prepare_generate_content_args(args, kwargs)
 
         chat_span = sentry_sdk.traces.start_span(
@@ -193,6 +199,9 @@ def new_generate_content(self: "Any", *args: "Any", **kwargs: "Any") -> "Any":
         if integration is None:
             return f(self, *args, **kwargs)
 
+        if sentry_sdk.get_current_scope()._agent_framework_chat_generation_entered:
+            return f(self, *args, **kwargs)
+
         model, contents, model_name = prepare_generate_content_args(args, kwargs)
 
         with sentry_sdk.traces.start_span(
@@ -233,6 +242,9 @@ async def new_async_generate_content(
         if integration is None:
             return await f(self, *args, **kwargs)
 
+        if sentry_sdk.get_current_scope()._agent_framework_chat_generation_entered:
+            return f(self, *args, **kwargs)
+
         model, contents, model_name = prepare_generate_content_args(args, kwargs)
 
         with sentry_sdk.traces.start_span(