Merge branch 'major/3.0' into webb/openai/remove-include-prompts

Author: alexander-alderman-webb

scripts/populate_tox/tox.jinja

@@ -200,6 +200,8 @@ setenv =
     # which targets the workspace `.venv` instead of the tox env and hangs.
     ray: RAY_ENABLE_UV_RUN_RUNTIME_ENV=0
 
+    litellm: LITELLM_LOCAL_MODEL_COST_MAP=true
+
     # Avoid polluting test suite with imports
     common: PYTEST_ADDOPTS="--ignore=tests/test_shadowed_module.py"
     gevent: PYTEST_ADDOPTS="--ignore=tests/test_shadowed_module.py"

sentry_sdk/integrations/langchain.py

@@ -1135,8 +1135,6 @@ def new_invoke(self: "Any", *args: "Any", **kwargs: "Any") -> "Any":
             if run_name:
                 span.set_attribute(SPANDATA.GEN_AI_FUNCTION_ID, run_name)
 
-            _set_tools_on_span(span, tools)
-
             # Run the agent
             result = f(self, *args, **kwargs)
 
@@ -1192,8 +1190,6 @@ def new_stream(self: "Any", *args: "Any", **kwargs: "Any") -> "Any":
         if run_name:
             span.set_attribute(SPANDATA.GEN_AI_FUNCTION_ID, run_name)
 
-        _set_tools_on_span(span, tools)
-
         input = args[0].get("input") if len(args) >= 1 else None
         if input is not None and record_inputs:
             normalized_messages = normalize_message_roles([input])

sentry_sdk/integrations/pydantic_ai/spans/invoke_agent.py

@@ -11,7 +11,6 @@
 from ..consts import SPAN_ORIGIN
 from ..utils import (
     _set_agent_data,
-    _set_available_tools,
     _set_model_data,
     _should_send_inputs,
     _should_send_outputs,
@@ -59,7 +58,6 @@ def invoke_agent_span(
 
     _set_agent_data(span, agent)
     _set_model_data(span, agent, model, model_settings)
-    _set_available_tools(span, agent)
 
     # Add user prompt and system prompts if available and prompts are enabled
     if _should_send_inputs():

tests/integrations/langchain/test_langchain.py

@@ -3328,11 +3328,6 @@ def test_langchain_data_collection_tools(
         for s in spans
         if s["attributes"].get("sentry.op") == "gen_ai.chat"
     ]
-    invoke_agent_span = next(
-        s["attributes"]
-        for s in spans
-        if s["attributes"].get("sentry.op") == "gen_ai.invoke_agent"
-    )
 
     assert len(chat_spans) == 2
 
@@ -3351,7 +3346,6 @@ def test_langchain_data_collection_tools(
     ):
         collected = key in expected_present
         assert (key in chat_spans[1]) is collected
-        assert (key in invoke_agent_span) is collected
 
 
 @pytest.mark.parametrize("send_default_pii", [True, False])

tests/integrations/pydantic_ai/test_pydantic_ai.py

@@ -2980,10 +2980,7 @@ def add_numbers(a: int, b: int) -> int:
         assert SPANDATA.GEN_AI_REQUEST_MODEL in chat_span
 
     # Both the chat and the invoke_agent spans list the agent's available tools
-    for op, span_data in spans:
-        if op not in ("gen_ai.chat", "gen_ai.invoke_agent"):
-            continue
-
+    for span_data in chat_spans:
         if expect_available_tools:
             assert "add_numbers" in span_data[SPANDATA.GEN_AI_REQUEST_AVAILABLE_TOOLS]
         else:

tests/integrations/ray/test_ray.py

@@ -161,10 +161,11 @@ def example_task_with_kwargs(**kwargs):
     [example_task, example_task_with_kwargs],
 )
 def test_tracing_in_ray_tasks(
+    sentry_init,
     task_options,
     task,
 ):
-    sentry_sdk.init(
+    sentry_init(
         integrations=[RayIntegration()],
         disabled_integrations=[StdlibIntegration],
         transport=RayTestTransport(),
@@ -237,8 +238,8 @@ def test_tracing_in_ray_tasks(
     assert client_spans[1]["trace_id"] == worker_spans[1]["trace_id"]
 
 
-def test_errors_in_ray_tasks():
-    sentry_sdk.init(
+def test_errors_in_ray_tasks(sentry_init):
+    sentry_init(
         integrations=[RayIntegration()],
         disabled_integrations=[StdlibIntegration],
         transport=RayTestTransport(),
@@ -288,9 +289,10 @@ def example_task():
 # Arbitrary keyword argument to test all decorator paths
 @pytest.mark.parametrize("remote_kwargs", [{}, {"namespace": "actors"}])
 def test_tracing_in_ray_actors(
+    sentry_init,
     remote_kwargs,
 ):
-    sentry_sdk.init(
+    sentry_init(
         integrations=[RayIntegration()],
         disabled_integrations=[StdlibIntegration],
         transport=RayTestTransport(),
@@ -363,8 +365,8 @@ def increment(self):
     assert len(worker_spans) == 1
 
 
-def test_errors_in_ray_actors():
-    sentry_sdk.init(
+def test_errors_in_ray_actors(sentry_init):
+    sentry_init(
         integrations=[RayIntegration()],
         disabled_integrations=[StdlibIntegration],
         transport=RayLoggingTransport(),

tests/test_data_collection.py

@@ -7,14 +7,14 @@
 from sentry_sdk.utils import has_data_collection_enabled
 
 
-def test_kvcb_invalid_mode():
+def test_kvcb_invalid_mode(sentry_init):
     with pytest.raises(ValueError):
-        sentry_sdk.init(data_collection={"cookies": {"mode": "nope"}})  # type: ignore Purposely ignoring to test invalid option
+        sentry_init(data_collection={"cookies": {"mode": "nope"}})  # type: ignore Purposely ignoring to test invalid option
 
 
-def test_stack_frame_variables_invalid_mode():
+def test_stack_frame_variables_invalid_mode(sentry_init):
     with pytest.raises(ValueError):
-        sentry_sdk.init(data_collection={"stack_frame_variables": {"mode": "nope"}})
+        sentry_init(data_collection={"stack_frame_variables": {"mode": "nope"}})
 
 
 @pytest.mark.parametrize(
@@ -27,45 +27,45 @@ def test_stack_frame_variables_invalid_mode():
         "frame_context_lines_float",
     ],
 )
-def test_frame_context_lines_invalid_value(value):
+def test_frame_context_lines_invalid_value(sentry_init, value):
     with pytest.raises(ValueError):
-        sentry_sdk.init(data_collection={"frame_context_lines": value})
+        sentry_init(data_collection={"frame_context_lines": value})
 
 
-def test_kvcb_from_dict_defaults_mode():
-    sentry_sdk.init(data_collection={"cookies": {"mode": "denylist", "terms": ["x"]}})
+def test_kvcb_from_dict_defaults_mode(sentry_init):
+    sentry_init(data_collection={"cookies": {"mode": "denylist", "terms": ["x"]}})
     client = sentry_sdk.get_client()
     assert client.options["data_collection"]["cookies"] == {
         "mode": "denylist",
         "terms": ["x"],
     }
 
 
-def test_http_headers_collection_defaults():
+def test_http_headers_collection_defaults(sentry_init):
     default_terms = ["forwarded", "-ip", "remote-", "via", "-user"]
 
-    sentry_sdk.init(data_collection={"http_headers": {}})  # type: ignore Purposely ignoring to test invalid option
+    sentry_init(data_collection={"http_headers": {}})  # type: ignore Purposely ignoring to test invalid option
     client = sentry_sdk.get_client()
     assert client.options["data_collection"]["http_headers"]["request"] == {
         "mode": "denylist"
     }
 
-    sentry_sdk.init(data_collection={"http_headers": "off"})  # type: ignore Purposely ignoring to test invalid option
+    sentry_init(data_collection={"http_headers": "off"})  # type: ignore Purposely ignoring to test invalid option
     client = sentry_sdk.get_client()
     assert client.options["data_collection"]["http_headers"]["request"] == {
         "mode": "denylist"
     }
 
-    sentry_sdk.init()
+    sentry_init()
     client = sentry_sdk.get_client()
     assert client.options["data_collection"]["http_headers"]["request"] == {
         "mode": "denylist",
         "terms": default_terms,
     }
 
 
-def test_http_headers_use_default_in_setting_with_missing_config():
-    sentry_sdk.init(
+def test_http_headers_use_default_in_setting_with_missing_config(sentry_init):
+    sentry_init(
         data_collection={
             "http_headers": {
                 "request": {"mode": "allowlist", "terms": ["x-id"]},
@@ -81,8 +81,8 @@ def test_http_headers_use_default_in_setting_with_missing_config():
     }
 
 
-def _initialize_client_with_config(**options):
-    sentry_sdk.init(**options)
+def _initialize_client_with_config(sentry_init, **options):
+    sentry_init(**options)
     return sentry_sdk.get_client().options["data_collection"]
 
 
@@ -323,16 +323,19 @@ def _get(dc, path):
         ),
     ],
 )
-def test_initialize_client_data_collection(options, expected):
-    dc = _initialize_client_with_config(**options)
+def test_initialize_client_data_collection(sentry_init, options, expected):
+    dc = _initialize_client_with_config(sentry_init, **options)
     for path, value in expected.items():
         assert _get(dc, path) == value, f"{path} != {value!r}"
 
 
-def test_initialize_client_data_collection_overrides_send_default_pii_and_warns():
+def test_initialize_client_data_collection_overrides_send_default_pii_and_warns(
+    sentry_init,
+):
     with warnings.catch_warnings(record=True) as caught:
         warnings.simplefilter("always")
         dc = _initialize_client_with_config(
+            sentry_init,
             send_default_pii=True,
             data_collection={"user_info": False},
         )
@@ -377,8 +380,8 @@ def test_initialize_client_data_collection_overrides_send_default_pii_and_warns(
         ),
     ],
 )
-def test_client_data_collection_settings(init_kwargs, expected):
-    sentry_sdk.init(**init_kwargs)
+def test_client_data_collection_settings(sentry_init, init_kwargs, expected):
+    sentry_init(**init_kwargs)
     client = sentry_sdk.get_client()
     for key, value in expected.items():
         if key == "should_send_default_pii":
@@ -419,13 +422,17 @@ def test_has_data_collection_enabled_gates_on_user_provided_config():
         ),
     ],
 )
-def test_has_data_collection_enabled_after_resolution(init_kwargs, expected):
-    sentry_sdk.init(**init_kwargs)
+def test_has_data_collection_enabled_after_resolution(
+    sentry_init, init_kwargs, expected
+):
+    sentry_init(**init_kwargs)
     assert has_data_collection_enabled(sentry_sdk.get_client().options) is expected
 
 
-def test_no_data_collection_values_fall_back_to_send_default_pii_configuration():
-    sentry_sdk.init(send_default_pii=True)
+def test_no_data_collection_values_fall_back_to_send_default_pii_configuration(
+    sentry_init,
+):
+    sentry_init(send_default_pii=True)
     client = sentry_sdk.get_client()
     dc = client.options["data_collection"]
     assert dc["provided_by_user"] is False