Skip to content

Commit e4b20b7

Browse files
committed
update tracing
1 parent 3026126 commit e4b20b7

File tree

10 files changed

+483
-182
lines changed

10 files changed

+483
-182
lines changed

veadk/agent.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,6 @@ def model_post_init(self, __context: Any) -> None:
112112

113113
self.tools.append(load_memory)
114114

115-
# if self.tracers:
116-
# for tracer in self.tracers:
117-
# tracer.do_hooks(self)
118-
119115
logger.info(f"{self.__class__.__name__} `{self.name}` init done.")
120116
logger.debug(
121117
f"Agent: {self.model_dump(include={'name', 'model_name', 'model_api_base', 'tools', 'serve_url'})}"
@@ -215,9 +211,6 @@ async def run(
215211
session_service=session_service,
216212
memory_service=self.long_term_memory,
217213
)
218-
if getattr(self, "tracers", None):
219-
for tracer in self.tracers:
220-
tracer.set_app_name(app_name)
221214

222215
logger.info(f"Begin to process prompt {prompt}")
223216
# run

veadk/runner.py

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ def __init__(
6767
# prevent VeRemoteAgent has no long-term memory attr
6868
if isinstance(self.agent, Agent):
6969
self.long_term_memory = self.agent.long_term_memory
70-
# for tracer in self.agent.tracers:
71-
# tracer.set_app_name(self.app_name)
7270
else:
7371
self.long_term_memory = None
7472

@@ -175,7 +173,27 @@ async def run(
175173

176174
return final_output
177175

178-
def _print_trace_id(self):
176+
def get_trace_id(self) -> str:
177+
if not isinstance(self.agent, Agent):
178+
logger.warning(
179+
("The agent is not an instance of VeADK Agent, no trace id provided.")
180+
)
181+
return "<unknown_trace_id>"
182+
183+
if not self.agent.tracers:
184+
logger.warning(
185+
"No tracer is configured in the agent, no trace id provided."
186+
)
187+
return "<unknown_trace_id>"
188+
189+
try:
190+
trace_id = self.agent.tracers[0].trace_id # type: ignore
191+
return trace_id
192+
except Exception as e:
193+
logger.warning(f"Get tracer id failed as {e}")
194+
return "<unknown_trace_id>"
195+
196+
def _print_trace_id(self) -> None:
179197
if not isinstance(self.agent, Agent):
180198
logger.warning(
181199
("The agent is not an instance of VeADK Agent, no trace id provided.")

veadk/tools/builtin_tools/lark.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def check_env():
4646
) from e
4747

4848

49-
check_env()
49+
# check_env()
5050

5151
lark_tools = MCPToolset(
5252
connection_params=StdioServerParameters(

veadk/tracing/telemetry/attributes/extractors/common_attributes_extractors.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ def common_gen_ai_session_id(**kwargs) -> str:
3232
COMMON_ATTRIBUTES = {
3333
"gen_ai.system": common_gen_ai_system,
3434
"gen_ai.system.version": common_gen_ai_system_version,
35-
"gen_ai.app.name": common_gen_ai_app_name,
3635
"gen_ai.agent.name": common_gen_ai_agent_name,
36+
"gen_ai.app.name": common_gen_ai_app_name,
3737
"gen_ai.user.id": common_gen_ai_user_id,
3838
"gen_ai.session.id": common_gen_ai_session_id,
3939
}

0 commit comments

Comments
 (0)