Skip to content

feat: Propogating the otel context #1033

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

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
+682 −165
Open

feat: Propogating the otel context #1033

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
42 changes: 30 additions & 12 deletions core/src/main/java/com/google/adk/flows/llmflows/BaseLlmFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,9 @@ public BaseLlmFlow(
* RequestProcessor} transforming the provided {@code llmRequestRef} in-place, and emits the
* events generated by them.
*/
protected Flowable<Event> preprocess(
private Flowable<Event> preprocess(
InvocationContext context, AtomicReference<LlmRequest> llmRequestRef) {
Context currentContext = Context.current();
LlmAgent agent = (LlmAgent) context.agent();

RequestProcessor toolsProcessor =
Expand All @@ -114,9 +115,11 @@ protected Flowable<Event> preprocess(
.concatMap(
processor ->
Single.defer(() -> processor.processRequest(context, llmRequestRef.get()))
.compose(Tracing.withContext(currentContext))
.doOnSuccess(result -> llmRequestRef.set(result.updatedRequest()))
.flattenAsFlowable(
result -> result.events() != null ? result.events() : ImmutableList.of()));
result -> result.events() != null ? result.events() : ImmutableList.of()))
.compose(Tracing.withContext(currentContext));
}

/**
Expand Down Expand Up @@ -146,13 +149,13 @@ protected Flowable<Event> postprocess(
}
Context parentContext = Context.current();

return currentLlmResponse.flatMapPublisher(
updatedResponse -> {
try (Scope scope = parentContext.makeCurrent()) {
return buildPostprocessingEvents(
updatedResponse, eventIterables, context, baseEventForLlmResponse, llmRequest);
}
});
return currentLlmResponse
.compose(Tracing.withContext(parentContext))
.flatMapPublisher(
updatedResponse ->
buildPostprocessingEvents(
updatedResponse, eventIterables, context, baseEventForLlmResponse, llmRequest))
.compose(Tracing.withContext(parentContext));
}

/**
Expand Down Expand Up @@ -222,6 +225,7 @@ private Flowable<LlmResponse> callLlm(
*/
private Maybe<LlmResponse> handleBeforeModelCallback(
InvocationContext context, LlmRequest.Builder llmRequestBuilder, Event modelResponseEvent) {
Context currentContext = Context.current();
Event callbackEvent = modelResponseEvent.toBuilder().build();
CallbackContext callbackContext =
new CallbackContext(context, callbackEvent.actions(), callbackEvent.id());
Expand All @@ -240,7 +244,11 @@ private Maybe<LlmResponse> handleBeforeModelCallback(
Maybe.defer(
() ->
Flowable.fromIterable(callbacks)
.concatMapMaybe(callback -> callback.call(callbackContext, llmRequestBuilder))
.concatMapMaybe(
callback ->
callback
.call(callbackContext, llmRequestBuilder)
.compose(Tracing.withContext(currentContext)))
.firstElement());

return pluginResult.switchIfEmpty(callbackResult);
Expand All @@ -257,6 +265,7 @@ private Maybe<LlmResponse> handleOnModelErrorCallback(
LlmRequest.Builder llmRequestBuilder,
Event modelResponseEvent,
Throwable throwable) {
Context currentContext = Context.current();
Event callbackEvent = modelResponseEvent.toBuilder().build();
CallbackContext callbackContext =
new CallbackContext(context, callbackEvent.actions(), callbackEvent.id());
Expand All @@ -277,7 +286,11 @@ private Maybe<LlmResponse> handleOnModelErrorCallback(
() -> {
LlmRequest llmRequest = llmRequestBuilder.build();
return Flowable.fromIterable(callbacks)
.concatMapMaybe(callback -> callback.call(callbackContext, llmRequest, ex))
.concatMapMaybe(
callback ->
callback
.call(callbackContext, llmRequest, ex)
.compose(Tracing.withContext(currentContext)))
.firstElement();
});

Expand All @@ -292,6 +305,7 @@ private Maybe<LlmResponse> handleOnModelErrorCallback(
*/
private Single<LlmResponse> handleAfterModelCallback(
InvocationContext context, LlmResponse llmResponse, Event modelResponseEvent) {
Context currentContext = Context.current();
Event callbackEvent = modelResponseEvent.toBuilder().build();
CallbackContext callbackContext =
new CallbackContext(context, callbackEvent.actions(), callbackEvent.id());
Expand All @@ -310,7 +324,11 @@ private Single<LlmResponse> handleAfterModelCallback(
Maybe.defer(
() ->
Flowable.fromIterable(callbacks)
.concatMapMaybe(callback -> callback.call(callbackContext, llmResponse))
.concatMapMaybe(
callback ->
callback
.call(callbackContext, llmResponse)
.compose(Tracing.withContext(currentContext)))
.firstElement());

return pluginResult.switchIfEmpty(callbackResult).defaultIfEmpty(llmResponse);
Expand Down
138 changes: 66 additions & 72 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 @@ -42,7 +42,6 @@
import com.google.genai.types.Part;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.reactivex.rxjava3.core.Flowable;
import io.reactivex.rxjava3.core.Maybe;
import io.reactivex.rxjava3.core.Observable;
Expand Down Expand Up @@ -163,7 +162,9 @@ public static Maybe<Event> handleFunctionCalls(
}
return functionResponseEventsObservable
.toList()
.flatMapMaybe(
.toMaybe()
.compose(Tracing.withContext(parentContext))
.flatMap(
events -> {
if (events.isEmpty()) {
return Maybe.empty();
Expand Down Expand Up @@ -226,7 +227,9 @@ public static Maybe<Event> handleFunctionCallsLive(

return responseEventsObservable
.toList()
.flatMapMaybe(
.toMaybe()
.compose(Tracing.withContext(parentContext))
.flatMap(
events -> {
if (events.isEmpty()) {
return Maybe.empty();
Expand All @@ -243,47 +246,45 @@ private static Function<FunctionCall, Maybe<Event>> getFunctionCallMapper(
Context parentContext) {
return functionCall ->
Maybe.defer(
() -> {
try (Scope scope = parentContext.makeCurrent()) {
BaseTool tool = tools.get(functionCall.name().get());
ToolContext toolContext =
ToolContext.builder(invocationContext)
.functionCallId(functionCall.id().orElse(""))
.toolConfirmation(
functionCall.id().map(toolConfirmations::get).orElse(null))
.build();

Map<String, Object> functionArgs =
functionCall.args().map(HashMap::new).orElse(new HashMap<>());

Maybe<Map<String, Object>> maybeFunctionResult =
maybeInvokeBeforeToolCall(invocationContext, tool, functionArgs, toolContext)
.switchIfEmpty(
Maybe.defer(
() -> {
try (Scope innerScope = parentContext.makeCurrent()) {
return isLive
? processFunctionLive(
invocationContext,
tool,
toolContext,
functionCall,
functionArgs,
parentContext)
: callTool(tool, functionArgs, toolContext, parentContext);
}
}));

return postProcessFunctionResult(
maybeFunctionResult,
invocationContext,
tool,
functionArgs,
toolContext,
isLive,
parentContext);
}
});
() -> {
BaseTool tool = tools.get(functionCall.name().get());
ToolContext toolContext =
ToolContext.builder(invocationContext)
.functionCallId(functionCall.id().orElse(""))
.toolConfirmation(
functionCall.id().map(toolConfirmations::get).orElse(null))
.build();

Map<String, Object> functionArgs =
functionCall.args().map(HashMap::new).orElse(new HashMap<>());

Maybe<Map<String, Object>> maybeFunctionResult =
maybeInvokeBeforeToolCall(invocationContext, tool, functionArgs, toolContext)
.switchIfEmpty(
Maybe.defer(
() ->
isLive
? processFunctionLive(
invocationContext,
tool,
toolContext,
functionCall,
functionArgs,
parentContext)
: callTool(
tool, functionArgs, toolContext, parentContext))
.compose(Tracing.withContext(parentContext)));

return postProcessFunctionResult(
maybeFunctionResult,
invocationContext,
tool,
functionArgs,
toolContext,
isLive,
parentContext);
})
.compose(Tracing.withContext(parentContext));
}

/**
Expand Down Expand Up @@ -410,34 +411,27 @@ private static Maybe<Event> postProcessFunctionResult(
})
.flatMapMaybe(
optionalInitialResult -> {
try (Scope scope = parentContext.makeCurrent()) {
Map<String, Object> initialFunctionResult = optionalInitialResult.orElse(null);

return maybeInvokeAfterToolCall(
invocationContext, tool, functionArgs, toolContext, initialFunctionResult)
.map(Optional::of)
.defaultIfEmpty(Optional.ofNullable(initialFunctionResult))
.flatMapMaybe(
finalOptionalResult -> {
Map<String, Object> finalFunctionResult =
finalOptionalResult.orElse(null);
if (tool.longRunning() && finalFunctionResult == null) {
return Maybe.empty();
}
return Maybe.fromCallable(
() ->
buildResponseEvent(
tool,
finalFunctionResult,
toolContext,
invocationContext))
.compose(
Tracing.<Event>trace("tool_response [" + tool.name() + "]")
.setParent(parentContext))
.doOnSuccess(event -> Tracing.traceToolResponse(event.id(), event));
});
}
});
Map<String, Object> initialFunctionResult = optionalInitialResult.orElse(null);

return maybeInvokeAfterToolCall(
invocationContext, tool, functionArgs, toolContext, initialFunctionResult)
.map(Optional::of)
.defaultIfEmpty(Optional.ofNullable(initialFunctionResult))
.flatMapMaybe(
finalOptionalResult -> {
Map<String, Object> finalFunctionResult = finalOptionalResult.orElse(null);
if (tool.longRunning() && finalFunctionResult == null) {
return Maybe.empty();
}
Event event =
buildResponseEvent(
tool, finalFunctionResult, toolContext, invocationContext);
Tracing.traceToolResponse(event.id(), event);
return Maybe.just(event);
});
})
.compose(
Tracing.<Event>trace("tool_response [" + tool.name() + "]").setParent(parentContext));
}

private static Optional<Event> mergeParallelFunctionResponseEvents(
Expand Down
16 changes: 11 additions & 5 deletions core/src/main/java/com/google/adk/plugins/PluginManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@
import com.google.adk.events.Event;
import com.google.adk.models.LlmRequest;
import com.google.adk.models.LlmResponse;
import com.google.adk.telemetry.Tracing;
import com.google.adk.tools.BaseTool;
import com.google.adk.tools.ToolContext;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableList;
import com.google.genai.types.Content;
import io.opentelemetry.context.Context;
import io.reactivex.rxjava3.core.Completable;
import io.reactivex.rxjava3.core.Flowable;
import io.reactivex.rxjava3.core.Maybe;
Expand Down Expand Up @@ -126,6 +128,7 @@ public Maybe<Content> beforeRunCallback(InvocationContext invocationContext) {

@Override
public Completable afterRunCallback(InvocationContext invocationContext) {
Context capturedContext = Context.current();
return Flowable.fromIterable(plugins)
.concatMapCompletable(
plugin ->
Expand All @@ -136,20 +139,22 @@ public Completable afterRunCallback(InvocationContext invocationContext) {
logger.error(
"[{}] Error during callback 'afterRunCallback'",
plugin.getName(),
e)));
e))
.compose(Tracing.withContext(capturedContext)));
}

@Override
public Completable close() {
Context capturedContext = Context.current();
return Flowable.fromIterable(plugins)
.concatMapCompletableDelayError(
plugin ->
plugin
.close()
.doOnError(
e ->
logger.error(
"[{}] Error during callback 'close'", plugin.getName(), e)));
logger.error("[{}] Error during callback 'close'", plugin.getName(), e))
.compose(Tracing.withContext(capturedContext)));
}

@Override
Expand Down Expand Up @@ -227,7 +232,7 @@ public Maybe<Map<String, Object>> onToolErrorCallback(
*/
private <T> Maybe<T> runMaybeCallbacks(
Function<Plugin, Maybe<T>> callbackExecutor, String callbackName) {

Context capturedContext = Context.current();
return Flowable.fromIterable(this.plugins)
.concatMapMaybe(
plugin ->
Expand All @@ -246,7 +251,8 @@ private <T> Maybe<T> runMaybeCallbacks(
"[{}] Error during callback '{}'",
plugin.getName(),
callbackName,
e)))
e))
.compose(Tracing.<T>withContext(capturedContext)))
.firstElement();
}
}
Loading
Loading