## Summary - Add shared span attributes for tool error diagnostics, including developer-facing messages when present. - Wire those attributes through MCP server, worker RunTool, and HTTP CallTool spans while keeping default MCP response content public-only. - Cover no-leak response behavior, non-recording spans, outputless worker responses, and the shared attribute contract. ## Verification - `uv run ruff format ...` - `uv run ruff check ...` - `uv run pytest -W ignore libs/tests/arcade_mcp_server/test_debug_exposure_integration.py libs/tests/core/test_log_extras.py libs/tests/worker/test_worker_base.py` Made with [Cursor](https://cursor.com) <!-- CURSOR_SUMMARY --> --- > [!NOTE] > **Medium Risk** > Adds new telemetry attributes that propagate tool error messages (including optional developer_message) into active spans across MCP server and worker execution paths; risk is mainly around potential leakage of sensitive developer messages into tracing backends and changes to observability contracts. > > **Overview** > Adds a shared `arcade_core.log_extras.build_tool_error_span_attributes()` helper and wires it into tool error paths so the current OpenTelemetry span is annotated with stable `tool_error_*` attributes (including `developer_message` when present). > > MCP tool calls now record these span attributes on failure while keeping default MCP response content sanitized, and `arcade-serve` records the same attributes on both `RunTool` and HTTP `CallTool` spans (handling `output=None`). Versions and dependency constraints are bumped to consume the new core helper, with tests added/updated to lock the span-attribute contract and verify behavior for non-recording spans and no-leak responses. > > <sup>Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit 33a53991d72140a662152f508dc53e9b769b9f07. Bugbot is set up for automated code reviews on this repo. Configure [here](https://www.cursor.com/dashboard/bugbot).</sup> <!-- /CURSOR_SUMMARY -->
215 lines
7.7 KiB
Python
215 lines
7.7 KiB
Python
import logging
|
|
import os
|
|
import time
|
|
from datetime import datetime
|
|
from typing import Any, Callable, ClassVar
|
|
|
|
from arcade_core.catalog import ToolCatalog, Toolkit
|
|
from arcade_core.executor import ToolExecutor
|
|
from arcade_core.log_extras import build_tool_error_log_extra, build_tool_error_span_attributes
|
|
from arcade_core.schema import (
|
|
ToolCallRequest,
|
|
ToolCallResponse,
|
|
ToolDefinition,
|
|
)
|
|
from opentelemetry import trace
|
|
from opentelemetry.metrics import Meter
|
|
|
|
from arcade_serve.core.common import Router, Worker
|
|
from arcade_serve.core.components import (
|
|
CallToolComponent,
|
|
CatalogComponent,
|
|
HealthCheckComponent,
|
|
WorkerComponent,
|
|
)
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
class BaseWorker(Worker):
|
|
"""
|
|
A base worker class that provides a default implementation for registering tools and invoking them.
|
|
Worker implementations for specific web frameworks will inherit from this class.
|
|
"""
|
|
|
|
base_path = "/worker" # By default, prefix all our routes with /worker
|
|
|
|
default_components: ClassVar[tuple[type[WorkerComponent], ...]] = (
|
|
CatalogComponent,
|
|
CallToolComponent,
|
|
HealthCheckComponent,
|
|
)
|
|
|
|
def __init__(
|
|
self,
|
|
secret: str | None = None,
|
|
disable_auth: bool = False,
|
|
otel_meter: Meter | None = None,
|
|
) -> None:
|
|
"""
|
|
Initialize the BaseWorker with an empty ToolCatalog.
|
|
If no secret is provided, the worker will use the ARCADE_WORKER_SECRET environment variable.
|
|
"""
|
|
self.catalog = ToolCatalog()
|
|
self.disable_auth = disable_auth
|
|
if disable_auth:
|
|
logger.warning(
|
|
"Warning: Worker is running without authentication. Not recommended for production."
|
|
)
|
|
|
|
self.secret = self._set_secret(secret, disable_auth)
|
|
self.environment = os.environ.get("ARCADE_ENVIRONMENT", "local")
|
|
|
|
self.tool_counter = None
|
|
if otel_meter:
|
|
self.tool_counter = otel_meter.create_counter(
|
|
"tool_call", "requests", "Total number of tools called"
|
|
)
|
|
|
|
def _set_secret(self, secret: str | None, disable_auth: bool) -> str:
|
|
if disable_auth:
|
|
return ""
|
|
|
|
# If secret is provided, use it
|
|
if secret:
|
|
return secret
|
|
|
|
# If secret is not provided, try to get it from environment variables
|
|
env_secret = os.environ.get("ARCADE_WORKER_SECRET")
|
|
if env_secret:
|
|
return env_secret
|
|
|
|
raise ValueError(
|
|
"No secret provided for worker. Set the ARCADE_WORKER_SECRET environment variable."
|
|
)
|
|
|
|
def get_catalog(self) -> list[ToolDefinition]:
|
|
"""
|
|
Get the catalog as a list of ToolDefinitions.
|
|
"""
|
|
return [tool.definition for tool in self.catalog]
|
|
|
|
def register_tool(self, tool: Callable, toolkit_name: str) -> None:
|
|
"""
|
|
Register a tool to the catalog.
|
|
"""
|
|
self.catalog.add_tool(tool, toolkit_name)
|
|
|
|
def register_toolkit(self, toolkit: Toolkit) -> None:
|
|
"""
|
|
Register a toolkit to the catalog.
|
|
"""
|
|
self.catalog.add_toolkit(toolkit)
|
|
|
|
async def call_tool(self, tool_request: ToolCallRequest) -> ToolCallResponse:
|
|
"""
|
|
Call (invoke) a tool using the ToolExecutor.
|
|
"""
|
|
tool_fqname = tool_request.tool.get_fully_qualified_name()
|
|
|
|
try:
|
|
materialized_tool = self.catalog.get_tool(tool_fqname)
|
|
except KeyError:
|
|
# Use resolved fqname components to match OTel span / metric labels.
|
|
raise ValueError(
|
|
f"Tool {tool_fqname.name} not found in catalog with toolkit version {tool_fqname.toolkit_version}."
|
|
)
|
|
|
|
start_time = time.time()
|
|
|
|
if self.tool_counter:
|
|
self.tool_counter.add(
|
|
1,
|
|
{
|
|
"tool_name": tool_fqname.name,
|
|
"toolkit_version": str(tool_fqname.toolkit_version),
|
|
"toolkit_name": tool_fqname.toolkit_name,
|
|
"environment": self.environment,
|
|
},
|
|
)
|
|
execution_id = tool_request.execution_id or ""
|
|
logger.info(
|
|
f"{execution_id} | Calling tool: {tool_fqname.name} "
|
|
f"version: {tool_fqname.toolkit_version}"
|
|
)
|
|
logger.debug(f"{execution_id} | Tool inputs: {tool_request.inputs}")
|
|
|
|
tracer = trace.get_tracer(__name__)
|
|
with tracer.start_as_current_span("RunTool") as current_span:
|
|
current_span.set_attribute("tool_name", str(tool_fqname.name))
|
|
current_span.set_attribute("toolkit_version", str(tool_fqname.toolkit_version))
|
|
current_span.set_attribute("toolkit_name", str(tool_fqname.toolkit_name))
|
|
current_span.set_attribute("environment", self.environment)
|
|
|
|
output = await ToolExecutor.run(
|
|
func=materialized_tool.tool,
|
|
definition=materialized_tool.definition,
|
|
input_model=materialized_tool.input_model,
|
|
output_model=materialized_tool.output_model,
|
|
context=tool_request.context,
|
|
**tool_request.inputs or {},
|
|
)
|
|
if output.error:
|
|
for key, value in build_tool_error_span_attributes(output.error).items():
|
|
current_span.set_attribute(key, value)
|
|
|
|
end_time = time.time() # End time in seconds
|
|
duration_ms = (end_time - start_time) * 1000 # Convert to milliseconds
|
|
|
|
if output.error:
|
|
log_extra = build_tool_error_log_extra(
|
|
output.error,
|
|
tool_name=str(tool_fqname.name),
|
|
toolkit_name=str(tool_fqname.toolkit_name),
|
|
toolkit_version=str(tool_fqname.toolkit_version),
|
|
execution_id=execution_id,
|
|
)
|
|
logger.warning(
|
|
f"{execution_id} | Tool {tool_fqname.name} version {tool_fqname.toolkit_version} failed: {output.error.message}",
|
|
extra=log_extra,
|
|
)
|
|
if output.error.developer_message:
|
|
logger.warning(
|
|
f"{execution_id} | Developer message: {output.error.developer_message}",
|
|
)
|
|
logger.debug(
|
|
f"{execution_id} | duration: {duration_ms}ms | Tool output: {output.value}"
|
|
)
|
|
if output.error.stacktrace:
|
|
logger.debug(f"{execution_id} | Tool traceback: {output.error.stacktrace}")
|
|
else:
|
|
# Match the failure-path identifiers for log correlation.
|
|
logger.info(
|
|
f"{execution_id} | Tool {tool_fqname.name} "
|
|
f"version {tool_fqname.toolkit_version} success"
|
|
)
|
|
logger.debug(
|
|
f"{execution_id} | duration: {duration_ms}ms | Tool output: {output.value}"
|
|
)
|
|
|
|
return ToolCallResponse(
|
|
execution_id=execution_id,
|
|
duration=duration_ms,
|
|
finished_at=datetime.now().isoformat(),
|
|
success=not output.error,
|
|
output=output,
|
|
)
|
|
|
|
def health_check(self) -> dict[str, Any]:
|
|
"""
|
|
Provide a health check that serves as a heartbeat of worker health.
|
|
"""
|
|
return {"status": "ok", "tool_count": str(len(self.catalog))}
|
|
|
|
def register_routes(self, router: Router) -> None:
|
|
"""
|
|
Register the necessary routes to the application.
|
|
"""
|
|
# Initialize components list if it doesn't exist
|
|
if not hasattr(self, "components"):
|
|
self.components = []
|
|
|
|
for component_cls in self.default_components:
|
|
component = component_cls(self)
|
|
component.register(router)
|
|
self.components.append(component)
|