Merge branch 'master' into feat/span-first-2

sentrivana · web-flow · commit e0cf4251fe5a · 2026-01-29T16:34:43.000+01:00
diff --git a/sentry_sdk/integrations/__init__.py b/sentry_sdk/integrations/__init__.py
@@ -167,7 +167,7 @@ def iter_default_integrations(
 
 
 _INTEGRATION_DEACTIVATES = {
-    "langchain": {"openai", "anthropic"},
+    "langchain": {"openai", "anthropic", "google_genai"},
     "openai_agents": {"openai"},
     "pydantic_ai": {"openai", "anthropic"},
 }
diff --git a/tests/test_ai_integration_deactivation.py b/tests/test_ai_integration_deactivation.py
@@ -57,6 +57,7 @@ def test_integration_deactivates_map_exists():
     assert "langchain" in _INTEGRATION_DEACTIVATES
     assert "openai" in _INTEGRATION_DEACTIVATES["langchain"]
     assert "anthropic" in _INTEGRATION_DEACTIVATES["langchain"]
+    assert "google_genai" in _INTEGRATION_DEACTIVATES["langchain"]
     assert "openai_agents" in _INTEGRATION_DEACTIVATES
     assert "openai" in _INTEGRATION_DEACTIVATES["openai_agents"]
     assert "pydantic_ai" in _INTEGRATION_DEACTIVATES

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ def iter_default_integrations(`
`167`	`167`
`168`	`168`
`169`	`169`	`_INTEGRATION_DEACTIVATES = {`
`170`		`- "langchain": {"openai", "anthropic"},`
	`170`	`+ "langchain": {"openai", "anthropic", "google_genai"},`
`171`	`171`	`"openai_agents": {"openai"},`
`172`	`172`	`"pydantic_ai": {"openai", "anthropic"},`
`173`	`173`	`}`