NeoAnd/adk-python
1
0
Fork 0
mirror of https://github.com/EvolutionAPI/adk-python.git synced 2025-07-16 04:02:55 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prevent JSON parsing errors and preserve non-ascii characters in telemetry

Browse Source 
PiperOrigin-RevId: 764801572
This commit is contained in:
Selcuk Gun 2025-05-29 11:02:15 -07:00 committed by Copybara-Service
parent 1de5c340d8
commit d587270327
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/google/adk/telemetry.py
View File

@ -38,6 +38,25 @@ from .tools.base_tool import BaseTool
tracer = trace.get_tracer('gcp.vertex.agent') tracer = trace.get_tracer('gcp.vertex.agent')
def _safe_json_serialize(obj) -> str:
"""Convert any Python object to a JSON-serializable type or string.
Args:
obj: The object to serialize.
Returns:
The JSON-serialized object string or <non-serializable> if the object cannot be serialized.
"""
try:
# Try direct JSON serialization first
return json.dumps(
obj, ensure_ascii=False, default=lambda o: '<not serializable>'
)
except (TypeError, OverflowError):
return '<not serializable>'
def trace_tool_call( def trace_tool_call(
tool: BaseTool, tool: BaseTool,
args: dict[str, Any], args: dict[str, Any],
@ -69,11 +88,14 @@ def trace_tool_call(
if not isinstance(tool_response, dict): if not isinstance(tool_response, dict):
tool_response = {'result': tool_response} tool_response = {'result': tool_response}
span.set_attribute('gcp.vertex.agent.tool_call_args', json.dumps(args)) span.set_attribute(
'gcp.vertex.agent.tool_call_args',
_safe_json_serialize(args),
)
span.set_attribute('gcp.vertex.agent.event_id', function_response_event.id) span.set_attribute('gcp.vertex.agent.event_id', function_response_event.id)
span.set_attribute( span.set_attribute(
'gcp.vertex.agent.tool_response', 'gcp.vertex.agent.tool_response',
json.dumps(tool_response), _safe_json_serialize(tool_response),
) )
# Setting empty llm request and response (as UI expect these) while not # Setting empty llm request and response (as UI expect these) while not
# applicable for tool_response. # applicable for tool_response.
@ -159,10 +181,7 @@ def trace_call_llm(
# Consider removing once GenAI SDK provides a way to record this info. # Consider removing once GenAI SDK provides a way to record this info.
span.set_attribute( span.set_attribute(
'gcp.vertex.agent.llm_request', 'gcp.vertex.agent.llm_request',
json.dumps( _safe_json_serialize(_build_llm_request_for_trace(llm_request)),
_build_llm_request_for_trace(llm_request),
default=lambda o: '<not serializable>',
),
) )
# Consider removing once GenAI SDK provides a way to record this info. # Consider removing once GenAI SDK provides a way to record this info.
@ -201,7 +220,7 @@ def trace_send_data(
# information still needs to be recorded by the Agent Development Kit. # information still needs to be recorded by the Agent Development Kit.
span.set_attribute( span.set_attribute(
'gcp.vertex.agent.data', 'gcp.vertex.agent.data',
json.dumps([ _safe_json_serialize([
types.Content(role=content.role, parts=content.parts).model_dump( types.Content(role=content.role, parts=content.parts).model_dump(
exclude_none=True exclude_none=True
) )