Skip to content

feat: Updating the Tracing implementation and updating BaseAgent.runLive #837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Feb 10, 2026
Merged

feat: Updating the Tracing implementation and updating BaseAgent.runLive #837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 34 additions & 12 deletions core/src/main/java/com/google/adk/agents/BaseAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,15 +304,12 @@ public Flowable<Event> runAsync(InvocationContext parentContext) {
Tracer tracer = Tracing.getTracer();
return Flowable.defer(
() -> {
InvocationContext invocationContext = createInvocationContext(parentContext);
Span span =
tracer
.spanBuilder("agent_run [" + name() + "]")
.setParent(Context.current())
.startSpan();
tracer.spanBuilder("invoke_agent " + name()).setParent(Context.current()).startSpan();
Tracing.traceAgentInvocation(span, name(), description(), invocationContext);
Context spanContext = Context.current().with(span);

InvocationContext invocationContext = createInvocationContext(parentContext);

return Tracing.traceFlowable(
spanContext,
span,
Expand Down Expand Up @@ -443,16 +440,41 @@ public Flowable<Event> runLive(InvocationContext parentContext) {
Tracer tracer = Tracing.getTracer();
return Flowable.defer(
() -> {
InvocationContext invocationContext = createInvocationContext(parentContext);
Span span =
tracer
.spanBuilder("agent_run [" + name() + "]")
.setParent(Context.current())
.startSpan();
tracer.spanBuilder("invoke_agent " + name()).setParent(Context.current()).startSpan();
Tracing.traceAgentInvocation(span, name(), description(), invocationContext);
Context spanContext = Context.current().with(span);

InvocationContext invocationContext = createInvocationContext(parentContext);
return Tracing.traceFlowable(
spanContext,
span,
() ->
callCallback(
beforeCallbacksToFunctions(
invocationContext.pluginManager(), beforeAgentCallback),
invocationContext)
.flatMapPublisher(
beforeEventOpt -> {
if (invocationContext.endInvocation()) {
return Flowable.fromOptional(beforeEventOpt);
}

Flowable<Event> beforeEvents = Flowable.fromOptional(beforeEventOpt);
Flowable<Event> mainEvents =
Flowable.defer(() -> runLiveImpl(invocationContext));
Flowable<Event> afterEvents =
Flowable.defer(
() ->
callCallback(
afterCallbacksToFunctions(
invocationContext.pluginManager(),
afterAgentCallback),
invocationContext)
.flatMapPublisher(Flowable::fromOptional));

return Tracing.traceFlowable(spanContext, span, () -> runLiveImpl(invocationContext));
return Flowable.concat(beforeEvents, mainEvents, afterEvents);
}));
});
}

Expand Down
7 changes: 4 additions & 3 deletions core/src/main/java/com/google/adk/flows/llmflows/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ public static Maybe<Event> handleFunctionCalls(
Span mergedSpan =
tracer.spanBuilder("tool_response").setParent(Context.current()).startSpan();
try (Scope scope = mergedSpan.makeCurrent()) {
Tracing.traceToolResponse(invocationContext, mergedEvent.id(), mergedEvent);
Tracing.traceToolResponse(mergedEvent.id(), mergedEvent);
} finally {
mergedSpan.end();
}
Expand Down Expand Up @@ -571,7 +571,8 @@ private static Maybe<Map<String, Object>> callTool(
.setParent(parentContext)
.startSpan();
try (Scope scope = span.makeCurrent()) {
Tracing.traceToolCall(args);
Tracing.traceToolCall(
tool.name(), tool.description(), tool.getClass().getSimpleName(), args);
return tool.runAsync(args, toolContext)
.toMaybe()
.doOnError(span::recordException)
Expand Down Expand Up @@ -620,7 +621,7 @@ private static Event buildResponseEvent(
.content(Content.builder().role("user").parts(partFunctionResponse).build())
.actions(toolContext.eventActions())
.build();
Tracing.traceToolResponse(invocationContext, event.id(), event);
Tracing.traceToolResponse(event.id(), event);
return event;
} finally {
span.end();
Expand Down
Loading