remove comments and add utility method to set data on span

Author: shellmayr

sentry_sdk/integrations/langchain.py

@@ -202,15 +202,7 @@ def on_llm_start(
                 if key in all_params and all_params[key] is not None:
                     set_data_normalized(span, attribute, all_params[key], unpack=False)
 
-            # Handle tools separately with simplified format
-            tools = all_params.get("tools")
-            if tools is not None:
-                simplified_tools = _simplify_langchain_tools(tools)
-                if simplified_tools:
-                    span.set_data(
-                        SPANDATA.GEN_AI_REQUEST_AVAILABLE_TOOLS,
-                        safe_serialize(simplified_tools),
-                    )
+            _set_tools_on_span(span, all_params.get("tools"))
 
             if should_send_default_pii() and self.include_prompts:
                 span.set_data(SPANDATA.GEN_AI_REQUEST_MESSAGES, safe_serialize(prompts))
@@ -255,15 +247,7 @@ def on_chat_model_start(self, serialized, messages, *, run_id, **kwargs):
                 if key in all_params and all_params[key] is not None:
                     set_data_normalized(span, attribute, all_params[key], unpack=False)
 
-            # Handle tools separately with simplified format
-            tools = all_params.get("tools")
-            if tools is not None:
-                simplified_tools = _simplify_langchain_tools(tools)
-                if simplified_tools:
-                    span.set_data(
-                        SPANDATA.GEN_AI_REQUEST_AVAILABLE_TOOLS,
-                        safe_serialize(simplified_tools),
-                    )
+            _set_tools_on_span(span, all_params.get("tools"))
 
             if should_send_default_pii() and self.include_prompts:
                 # Flatten the nested list structure to a single list of message dicts
@@ -566,24 +550,22 @@ def _simplify_langchain_tools(tools):
     for tool in tools:
         try:
             if isinstance(tool, dict):
-                # Handle OpenAI-style tool format
+
                 if "function" in tool and isinstance(tool["function"], dict):
                     func = tool["function"]
                     simplified_tool = {
                         "name": func.get("name"),
                         "description": func.get("description"),
                     }
-                    if simplified_tool["name"]:  # Only add if name exists
+                    if simplified_tool["name"]:
                         simplified_tools.append(simplified_tool)
-                # Handle direct tool dict format
                 elif "name" in tool:
                     simplified_tool = {
                         "name": tool.get("name"),
                         "description": tool.get("description"),
                     }
                     simplified_tools.append(simplified_tool)
                 else:
-                    # Try to extract from any dict structure
                     name = (
                         tool.get("name")
                         or tool.get("tool_name")
@@ -598,7 +580,6 @@ def _simplify_langchain_tools(tools):
                             }
                         )
             elif hasattr(tool, "name"):
-                # Handle tool objects with name attribute
                 simplified_tool = {
                     "name": getattr(tool, "name", None),
                     "description": getattr(tool, "description", None)
@@ -607,25 +588,34 @@ def _simplify_langchain_tools(tools):
                 if simplified_tool["name"]:
                     simplified_tools.append(simplified_tool)
             elif hasattr(tool, "__name__"):
-                # Handle callable objects
                 simplified_tools.append(
                     {
                         "name": tool.__name__,
                         "description": getattr(tool, "__doc__", None),
                     }
                 )
             else:
-                # Fallback - try to convert to string
                 tool_str = str(tool)
                 if tool_str and tool_str != "":
                     simplified_tools.append({"name": tool_str, "description": None})
         except Exception:
-            # Skip problematic tools rather than failing
             continue
 
     return simplified_tools if simplified_tools else None
 
 
+def _set_tools_on_span(span, tools):
+    # type: (Span, Any) -> None
+    """Set available tools data on a span if tools are provided."""
+    if tools is not None:
+        simplified_tools = _simplify_langchain_tools(tools)
+        if simplified_tools:
+            span.set_data(
+                SPANDATA.GEN_AI_REQUEST_AVAILABLE_TOOLS,
+                safe_serialize(simplified_tools),
+            )
+
+
 def _wrap_configure(f):
     # type: (Callable[..., Any]) -> Callable[..., Any]
 
@@ -733,13 +723,7 @@ def new_invoke(self, *args, **kwargs):
             span.set_data(SPANDATA.GEN_AI_OPERATION_NAME, "invoke_agent")
             span.set_data(SPANDATA.GEN_AI_RESPONSE_STREAMING, False)
 
-            if tools:
-                simplified_tools = _simplify_langchain_tools(tools)
-                if simplified_tools:
-                    span.set_data(
-                        SPANDATA.GEN_AI_REQUEST_AVAILABLE_TOOLS,
-                        safe_serialize(simplified_tools),
-                    )
+            _set_tools_on_span(span, tools)
 
             # Run the agent
             result = f(self, *args, **kwargs)
@@ -792,13 +776,7 @@ def new_stream(self, *args, **kwargs):
         span.set_data(SPANDATA.GEN_AI_OPERATION_NAME, "invoke_agent")
         span.set_data(SPANDATA.GEN_AI_RESPONSE_STREAMING, True)
 
-        if tools:
-            simplified_tools = _simplify_langchain_tools(tools)
-            if simplified_tools:
-                span.set_data(
-                    SPANDATA.GEN_AI_REQUEST_AVAILABLE_TOOLS,
-                    safe_serialize(simplified_tools),
-                )
+        _set_tools_on_span(span, tools)
 
         input = args[0].get("input") if len(args) >= 1 else None
         if (