@google/adk 0.2.4 → 0.3.0

package/dist/esm/agents/llm_agent.js

@@ -3,16 +3,34 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+var _a, _b;
+import { context, trace } from "@opentelemetry/api";
 import { cloneDeep } from "lodash-es";
 import { z } from "zod";
-import { BaseCodeExecutor } from "../code_executors/base_code_executor.js";
-import { BuiltInCodeExecutor } from "../code_executors/built_in_code_executor.js";
-import { buildCodeExecutionResultPart, buildExecutableCodePart, convertCodeExecutionParts, extractCodeAndTruncateContent } from "../code_executors/code_execution_utils.js";
+import {
+  isBaseCodeExecutor
+} from "../code_executors/base_code_executor.js";
+import { isBuiltInCodeExecutor } from "../code_executors/built_in_code_executor.js";
+import {
+  buildCodeExecutionResultPart,
+  buildExecutableCodePart,
+  convertCodeExecutionParts,
+  extractCodeAndTruncateContent
+} from "../code_executors/code_execution_utils.js";
 import { CodeExecutorContext } from "../code_executors/code_executor_context.js";
-import { createEvent, createNewEventId, getFunctionCalls, getFunctionResponses, isFinalResponse } from "../events/event.js";
+import {
+  createEvent,
+  createNewEventId,
+  getFunctionCalls,
+  getFunctionResponses,
+  isFinalResponse
+} from "../events/event.js";
 import { createEventActions } from "../events/event_actions.js";
 import { isBaseLlm } from "../models/base_llm.js";
-import { appendInstructions, setOutputSchema } from "../models/llm_request.js";
+import {
+  appendInstructions,
+  setOutputSchema
+} from "../models/llm_request.js";
 import { LLMRegistry } from "../models/registry.js";
 import { State } from "../sessions/state.js";
 import { BaseTool } from "../tools/base_tool.js";
@@ -21,30 +39,49 @@ import { ToolConfirmation } from "../tools/tool_confirmation.js";
 import { ToolContext } from "../tools/tool_context.js";
 import { base64Decode } from "../utils/env_aware_utils.js";
 import { logger } from "../utils/logger.js";
+import {
+  runAsyncGeneratorWithOtelContext,
+  traceCallLlm,
+  tracer
+} from "../telemetry/tracing.js";
 import { BaseAgent } from "./base_agent.js";
-import { BaseLlmRequestProcessor } from "./base_llm_processor.js";
+import {
+  BaseLlmRequestProcessor
+} from "./base_llm_processor.js";
 import { CallbackContext } from "./callback_context.js";
-import { getContents, getCurrentTurnContents } from "./content_processor_utils.js";
-import { generateAuthEvent, generateRequestConfirmationEvent, getLongRunningFunctionCalls, handleFunctionCallList, handleFunctionCallsAsync, populateClientFunctionCallId, REQUEST_CONFIRMATION_FUNCTION_CALL_NAME } from "./functions.js";
+import {
+  getContents,
+  getCurrentTurnContents
+} from "./content_processor_utils.js";
+import {
+  generateAuthEvent,
+  generateRequestConfirmationEvent,
+  getLongRunningFunctionCalls,
+  handleFunctionCallList,
+  handleFunctionCallsAsync,
+  populateClientFunctionCallId,
+  REQUEST_CONFIRMATION_FUNCTION_CALL_NAME
+} from "./functions.js";
 import { injectSessionState } from "./instructions.js";
 import { ReadonlyContext } from "./readonly_context.js";
 import { StreamingMode } from "./run_config.js";
 const ADK_AGENT_NAME_LABEL_KEY = "adk_agent_name";
-async function convertToolUnionToTools(toolUnion, context) {
+async function convertToolUnionToTools(toolUnion, context2) {
   if (toolUnion instanceof BaseTool) {
     return [toolUnion];
   }
-  return await toolUnion.getTools(context);
+  return await toolUnion.getTools(context2);
 }
 class BasicLlmRequestProcessor extends BaseLlmRequestProcessor {
+  // eslint-disable-next-line require-yield
   async *runAsync(invocationContext, llmRequest) {
-    var _a;
+    var _a2;
     const agent = invocationContext.agent;
-    if (!(agent instanceof LlmAgent)) {
+    if (!isLlmAgent(agent)) {
       return;
     }
     llmRequest.model = agent.canonicalModel.model;
-    llmRequest.config = { ...(_a = agent.generateContentConfig) != null ? _a : {} };
+    llmRequest.config = { ...(_a2 = agent.generateContentConfig) != null ? _a2 : {} };
     if (agent.outputSchema) {
       setOutputSchema(llmRequest, agent.outputSchema);
     }
@@ -61,6 +98,7 @@ class BasicLlmRequestProcessor extends BaseLlmRequestProcessor {
 }
 const BASIC_LLM_REQUEST_PROCESSOR = new BasicLlmRequestProcessor();
 class IdentityLlmRequestProcessor extends BaseLlmRequestProcessor {
+  // eslint-disable-next-line require-yield
   async *runAsync(invocationContext, llmRequest) {
     const agent = invocationContext.agent;
     const si = [`You are an agent. Your internal name is "${agent.name}".`];
@@ -75,13 +113,14 @@ class InstructionsLlmRequestProcessor extends BaseLlmRequestProcessor {
   /**
    * Handles instructions and global instructions for LLM flow.
    */
+  // eslint-disable-next-line require-yield
   async *runAsync(invocationContext, llmRequest) {
     const agent = invocationContext.agent;
     if (!(agent instanceof LlmAgent) || !(agent.rootAgent instanceof LlmAgent)) {
       return;
     }
     const rootAgent = agent.rootAgent;
-    if (rootAgent instanceof LlmAgent && rootAgent.globalInstruction) {
+    if (isLlmAgent(rootAgent) && rootAgent.globalInstruction) {
       const { instruction, requireStateInjection } = await rootAgent.canonicalGlobalInstruction(
         new ReadonlyContext(invocationContext)
       );
@@ -111,9 +150,10 @@ class InstructionsLlmRequestProcessor extends BaseLlmRequestProcessor {
 }
 const INSTRUCTIONS_LLM_REQUEST_PROCESSOR = new InstructionsLlmRequestProcessor();
 class ContentRequestProcessor {
+  // eslint-disable-next-line require-yield
   async *runAsync(invocationContext, llmRequest) {
     const agent = invocationContext.agent;
-    if (!agent || !(agent instanceof LlmAgent)) {
+    if (!agent || !isLlmAgent(agent)) {
       return;
     }
     if (agent.includeContents === "default") {
@@ -152,6 +192,7 @@ class AgentTransferLlmRequestProcessor extends BaseLlmRequestProcessor {
       }
     });
   }
+  // eslint-disable-next-line require-yield
   async *runAsync(invocationContext, llmRequest) {
     if (!(invocationContext.agent instanceof LlmAgent)) {
       return;
@@ -201,7 +242,7 @@ to your parent agent.
   getTransferTargets(agent) {
     const targets = [];
     targets.push(...agent.subAgents);
-    if (!agent.parentAgent || !(agent.parentAgent instanceof LlmAgent)) {
+    if (!agent.parentAgent || !isLlmAgent(agent.parentAgent)) {
       return targets;
     }
     if (!agent.disallowTransferToParent) {
@@ -220,9 +261,9 @@ to your parent agent.
 const AGENT_TRANSFER_LLM_REQUEST_PROCESSOR = new AgentTransferLlmRequestProcessor();
 class RequestConfirmationLlmRequestProcessor extends BaseLlmRequestProcessor {
   /** Handles tool confirmation information to build the LLM request. */
-  async *runAsync(invocationContext, llmRequest) {
+  async *runAsync(invocationContext) {
     const agent = invocationContext.agent;
-    if (!(agent instanceof LlmAgent)) {
+    if (!isLlmAgent(agent)) {
       return;
     }
     const events = invocationContext.session.events;
@@ -248,7 +289,9 @@ class RequestConfirmationLlmRequestProcessor extends BaseLlmRequestProcessor {
         foundConfirmation = true;
         let toolConfirmation = null;
         if (functionResponse.response && Object.keys(functionResponse.response).length === 1 && "response" in functionResponse.response) {
-          toolConfirmation = JSON.parse(functionResponse.response["response"]);
+          toolConfirmation = JSON.parse(
+            functionResponse.response["response"]
+          );
         } else if (functionResponse.response) {
           toolConfirmation = new ToolConfirmation({
             hint: functionResponse.response["hint"],
@@ -312,8 +355,12 @@ class RequestConfirmationLlmRequestProcessor extends BaseLlmRequestProcessor {
       if (Object.keys(toolsToResumeWithConfirmation).length === 0) {
         continue;
       }
-      const toolsList = await agent.canonicalTools(new ReadonlyContext(invocationContext));
-      const toolsDict = Object.fromEntries(toolsList.map((tool) => [tool.name, tool]));
+      const toolsList = await agent.canonicalTools(
+        new ReadonlyContext(invocationContext)
+      );
+      const toolsDict = Object.fromEntries(
+        toolsList.map((tool) => [tool.name, tool])
+      );
       const functionResponseEvent = await handleFunctionCallList({
         invocationContext,
         functionCalls: Object.values(toolsToResumeWithArgs),
@@ -342,12 +389,12 @@ class CodeExecutionRequestProcessor extends BaseLlmRequestProcessor {
     for await (const event of runPreProcessor(invocationContext, llmRequest)) {
       yield event;
     }
-    if (!(invocationContext.agent.codeExecutor instanceof BaseCodeExecutor)) {
+    if (!isBaseCodeExecutor(invocationContext.agent.codeExecutor)) {
       return;
     }
     for (const content of llmRequest.contents) {
       const delimeters = invocationContext.agent.codeExecutor.codeBlockDelimiters.length ? invocationContext.agent.codeExecutor.codeBlockDelimiters[0] : ["", ""];
-      const codeExecutionParts = convertCodeExecutionParts(
+      convertCodeExecutionParts(
         content,
         delimeters,
         invocationContext.agent.codeExecutor.executionResultDelimiters
@@ -411,7 +458,10 @@ class CodeExecutionResponseProcessor {
     if (llmResponse.partial) {
       return;
     }
-    for await (const event of runPostProcessor(invocationContext, llmResponse)) {
+    for await (const event of runPostProcessor(
+      invocationContext,
+      llmResponse
+    )) {
       yield event;
     }
   }
@@ -419,27 +469,36 @@ class CodeExecutionResponseProcessor {
 const responseProcessor = new CodeExecutionResponseProcessor();
 async function* runPreProcessor(invocationContext, llmRequest) {
   const agent = invocationContext.agent;
-  if (!(agent instanceof LlmAgent)) {
+  if (!isLlmAgent(agent)) {
     return;
   }
   const codeExecutor = agent.codeExecutor;
-  if (!codeExecutor || !(codeExecutor instanceof BaseCodeExecutor)) {
+  if (!codeExecutor || !isBaseCodeExecutor(codeExecutor)) {
     return;
   }
-  if (codeExecutor instanceof BuiltInCodeExecutor) {
+  if (isBuiltInCodeExecutor(codeExecutor)) {
     codeExecutor.processLlmRequest(llmRequest);
     return;
   }
   if (!codeExecutor.optimizeDataFile) {
     return;
   }
-  const codeExecutorContext = new CodeExecutorContext(new State(invocationContext.session.state));
+  const codeExecutorContext = new CodeExecutorContext(
+    new State(invocationContext.session.state)
+  );
   if (codeExecutorContext.getErrorCount(invocationContext.invocationId) >= codeExecutor.errorRetryAttempts) {
     return;
   }
-  const allInputFiles = extractAndReplaceInlineFiles(codeExecutorContext, llmRequest);
-  const processedFileNames = new Set(codeExecutorContext.getProcessedFileNames());
-  const filesToProcess = allInputFiles.filter((f) => !processedFileNames.has(f.name));
+  const allInputFiles = extractAndReplaceInlineFiles(
+    codeExecutorContext,
+    llmRequest
+  );
+  const processedFileNames = new Set(
+    codeExecutorContext.getProcessedFileNames()
+  );
+  const filesToProcess = allInputFiles.filter(
+    (f) => !processedFileNames.has(f.name)
+  );
   for (const file of filesToProcess) {
     const codeStr = getDataFilePreprocessingCode(file);
     if (!codeStr) {
@@ -459,7 +518,10 @@ async function* runPreProcessor(invocationContext, llmRequest) {
       branch: invocationContext.branch,
       content: codeContent
     });
-    const executionId = getOrSetExecutionId(invocationContext, codeExecutorContext);
+    const executionId = getOrSetExecutionId(
+      invocationContext,
+      codeExecutorContext
+    );
     const codeExecutionResult = await codeExecutor.executeCode({
       invocationContext,
       codeExecutionInput: {
@@ -486,20 +548,22 @@ async function* runPreProcessor(invocationContext, llmRequest) {
 }
 async function* runPostProcessor(invocationContext, llmResponse) {
   const agent = invocationContext.agent;
-  if (!(agent instanceof LlmAgent)) {
+  if (!isLlmAgent(agent)) {
     return;
   }
   const codeExecutor = agent.codeExecutor;
-  if (!codeExecutor || !(codeExecutor instanceof BaseCodeExecutor)) {
+  if (!codeExecutor || !isBaseCodeExecutor(codeExecutor)) {
     return;
   }
   if (!llmResponse || !llmResponse.content) {
     return;
   }
-  if (codeExecutor instanceof BuiltInCodeExecutor) {
+  if (isBuiltInCodeExecutor(codeExecutor)) {
     return;
   }
-  const codeExecutorContext = new CodeExecutorContext(new State(invocationContext.session.state));
+  const codeExecutorContext = new CodeExecutorContext(
+    new State(invocationContext.session.state)
+  );
   if (codeExecutorContext.getErrorCount(invocationContext.invocationId) >= codeExecutor.errorRetryAttempts) {
     return;
   }
@@ -517,7 +581,10 @@ async function* runPostProcessor(invocationContext, llmResponse) {
     branch: invocationContext.branch,
     content: responseContent
   });
-  const executionId = getOrSetExecutionId(invocationContext, codeExecutorContext);
+  const executionId = getOrSetExecutionId(
+    invocationContext,
+    codeExecutorContext
+  );
   const codeExecutionResult = await codeExecutor.executeCode({
     invocationContext,
     codeExecutionInput: {
@@ -537,10 +604,10 @@ async function* runPostProcessor(invocationContext, llmResponse) {
     codeExecutorContext,
     codeExecutionResult
   );
-  llmResponse.content = null;
+  llmResponse.content = void 0;
 }
 function extractAndReplaceInlineFiles(codeExecutorContext, llmRequest) {
-  var _a;
+  var _a2;
   const allInputFiles = codeExecutorContext.getInputFiles();
   const savedFileNames = new Set(allInputFiles.map((f) => f.name));
   for (let i = 0; i < llmRequest.contents.length; i++) {
@@ -550,7 +617,7 @@ function extractAndReplaceInlineFiles(codeExecutorContext, llmRequest) {
     }
     for (let j = 0; j < content.parts.length; j++) {
       const part = content.parts[j];
-      const mimeType = (_a = part.inlineData) == null ? void 0 : _a.mimeType;
+      const mimeType = (_a2 = part.inlineData) == null ? void 0 : _a2.mimeType;
       if (!mimeType || !part.inlineData || !DATA_FILE_UTIL_MAP[mimeType]) {
         continue;
       }
@@ -572,9 +639,9 @@ Available file: \`${fileName}\`
   return allInputFiles;
 }
 function getOrSetExecutionId(invocationContext, codeExecutorContext) {
-  var _a;
+  var _a2;
   const agent = invocationContext.agent;
-  if (!(agent instanceof LlmAgent) || !((_a = agent.codeExecutor) == null ? void 0 : _a.stateful)) {
+  if (!isLlmAgent(agent) || !((_a2 = agent.codeExecutor) == null ? void 0 : _a2.stateful)) {
     return void 0;
   }
   let executionId = codeExecutorContext.getExecutionId();
@@ -592,7 +659,9 @@ async function postProcessCodeExecutionResult(invocationContext, codeExecutorCon
     role: "model",
     parts: [buildCodeExecutionResultPart(codeExecutionResult)]
   };
-  const eventActions = createEventActions({ stateDelta: codeExecutorContext.getStateDelta() });
+  const eventActions = createEventActions({
+    stateDelta: codeExecutorContext.getStateDelta()
+  });
   if (codeExecutionResult.stderr) {
     codeExecutorContext.incrementErrorCount(invocationContext.invocationId);
   } else {
@@ -631,10 +700,7 @@ function getDataFilePreprocessingCode(file) {
     return void 0;
   }
   const varName = getNormalizedFileName(file.name);
-  const loaderCode = DATA_FILE_UTIL_MAP[file.mimeType].loaderCodeTemplate.replace(
-    "{filename}",
-    file.name
-  );
+  const loaderCode = DATA_FILE_UTIL_MAP[file.mimeType].loaderCodeTemplate.replace("{filename}", file.name);
   return `
 ${DATA_FILE_HELPER_LIB}
 
@@ -646,13 +712,19 @@ explore_df(${varName})
 `;
 }
 const CODE_EXECUTION_REQUEST_PROCESSOR = new CodeExecutionRequestProcessor();
-class LlmAgent extends BaseAgent {
+const LLM_AGENT_SIGNATURE_SYMBOL = Symbol.for("google.adk.llmAgent");
+function isLlmAgent(obj) {
+  return typeof obj === "object" && obj !== null && LLM_AGENT_SIGNATURE_SYMBOL in obj && obj[LLM_AGENT_SIGNATURE_SYMBOL] === true;
+}
+class LlmAgent extends (_b = BaseAgent, _a = LLM_AGENT_SIGNATURE_SYMBOL, _b) {
   constructor(config) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a2, _b2, _c, _d, _e, _f, _g, _h, _i;
     super(config);
+    /** A unique symbol to identify ADK LLM agent class. */
+    this[_a] = true;
     this.model = config.model;
-    this.instruction = (_a = config.instruction) != null ? _a : "";
-    this.globalInstruction = (_b = config.globalInstruction) != null ? _b : "";
+    this.instruction = (_a2 = config.instruction) != null ? _a2 : "";
+    this.globalInstruction = (_b2 = config.globalInstruction) != null ? _b2 : "";
     this.tools = (_c = config.tools) != null ? _c : [];
     this.generateContentConfig = config.generateContentConfig;
     this.disallowTransferToParent = (_d = config.disallowTransferToParent) != null ? _d : false;
@@ -730,7 +802,7 @@ class LlmAgent extends BaseAgent {
     }
     let ancestorAgent = this.parentAgent;
     while (ancestorAgent) {
-      if (ancestorAgent instanceof LlmAgent) {
+      if (isLlmAgent(ancestorAgent)) {
         return ancestorAgent.canonicalModel;
       }
       ancestorAgent = ancestorAgent.parentAgent;
@@ -738,47 +810,50 @@ class LlmAgent extends BaseAgent {
     throw new Error(`No model found for ${this.name}.`);
   }
   /**
-   * The resolved self.instruction field to construct instruction for this
+   * The resolved instruction field to construct instruction for this
    * agent.
    *
    * This method is only for use by Agent Development Kit.
    * @param context The context to retrieve the session state.
-   * @returns The resolved self.instruction field.
+   * @returns The resolved instruction field.
    */
-  async canonicalInstruction(context) {
+  async canonicalInstruction(context2) {
     if (typeof this.instruction === "string") {
       return { instruction: this.instruction, requireStateInjection: true };
     }
     return {
-      instruction: await this.instruction(context),
+      instruction: await this.instruction(context2),
       requireStateInjection: false
     };
   }
   /**
-   * The resolved self.instruction field to construct global instruction.
+   * The resolved globalInstruction field to construct global instruction.
    *
    * This method is only for use by Agent Development Kit.
    * @param context The context to retrieve the session state.
-   * @returns The resolved self.global_instruction field.
+   * @returns The resolved globalInstruction field.
    */
-  async canonicalGlobalInstruction(context) {
+  async canonicalGlobalInstruction(context2) {
     if (typeof this.globalInstruction === "string") {
-      return { instruction: this.globalInstruction, requireStateInjection: true };
+      return {
+        instruction: this.globalInstruction,
+        requireStateInjection: true
+      };
     }
     return {
-      instruction: await this.globalInstruction(context),
+      instruction: await this.globalInstruction(context2),
       requireStateInjection: false
     };
   }
   /**
-   * The resolved self.tools field as a list of BaseTool based on the context.
+   * The resolved tools field as a list of BaseTool based on the context.
    *
    * This method is only for use by Agent Development Kit.
    */
-  async canonicalTools(context) {
+  async canonicalTools(context2) {
     const resolvedTools = [];
     for (const toolUnion of this.tools) {
-      const tools = await convertToolUnionToTools(toolUnion, context);
+      const tools = await convertToolUnionToTools(toolUnion, context2);
       resolvedTools.push(...tools);
     }
     return resolvedTools;
@@ -799,7 +874,7 @@ class LlmAgent extends BaseAgent {
     return [callback];
   }
   /**
-   * The resolved self.before_model_callback field as a list of
+   * The resolved beforeModelCallback field as a list of
    * SingleBeforeModelCallback.
    *
    * This method is only for use by Agent Development Kit.
@@ -808,7 +883,7 @@ class LlmAgent extends BaseAgent {
     return LlmAgent.normalizeCallbackArray(this.beforeModelCallback);
   }
   /**
-   * The resolved self.after_model_callback field as a list of
+   * The resolved afterModelCallback field as a list of
    * SingleAfterModelCallback.
    *
    * This method is only for use by Agent Development Kit.
@@ -817,7 +892,7 @@ class LlmAgent extends BaseAgent {
     return LlmAgent.normalizeCallbackArray(this.afterModelCallback);
   }
   /**
-   * The resolved self.before_tool_callback field as a list of
+   * The resolved beforeToolCallback field as a list of
    * BeforeToolCallback.
    *
    * This method is only for use by Agent Development Kit.
@@ -826,7 +901,7 @@ class LlmAgent extends BaseAgent {
     return LlmAgent.normalizeCallbackArray(this.beforeToolCallback);
   }
   /**
-   * The resolved self.after_tool_callback field as a list of AfterToolCallback.
+   * The resolved afterToolCallback field as a list of AfterToolCallback.
    *
    * This method is only for use by Agent Development Kit.
    */
@@ -843,7 +918,7 @@ class LlmAgent extends BaseAgent {
    * @param event The event to process.
    */
   maybeSaveOutputToState(event) {
-    var _a, _b;
+    var _a2, _b2;
     if (event.author !== this.name) {
       logger.debug(
         `Skipping output save for agent ${this.name}: event authored by ${event.author}`
@@ -862,7 +937,7 @@ class LlmAgent extends BaseAgent {
       );
       return;
     }
-    if (!((_b = (_a = event.content) == null ? void 0 : _a.parts) == null ? void 0 : _b.length)) {
+    if (!((_b2 = (_a2 = event.content) == null ? void 0 : _a2.parts) == null ? void 0 : _b2.length)) {
       logger.debug(
         `Skipping output save for agent ${this.name}: event content is empty`
       );
@@ -882,10 +957,10 @@ class LlmAgent extends BaseAgent {
     }
     event.actions.stateDelta[this.outputKey] = result;
   }
-  async *runAsyncImpl(context) {
+  async *runAsyncImpl(context2) {
     while (true) {
       let lastEvent = void 0;
-      for await (const event of this.runOneStepAsync(context)) {
+      for await (const event of this.runOneStepAsync(context2)) {
         lastEvent = event;
         this.maybeSaveOutputToState(event);
         yield event;
@@ -899,19 +974,20 @@ class LlmAgent extends BaseAgent {
       }
     }
   }
-  async *runLiveImpl(context) {
-    for await (const event of this.runLiveFlow(context)) {
+  async *runLiveImpl(context2) {
+    for await (const event of this.runLiveFlow(context2)) {
       this.maybeSaveOutputToState(event);
       yield event;
     }
-    if (context.endInvocation) {
+    if (context2.endInvocation) {
       return;
     }
   }
   // --------------------------------------------------------------------------
   // #START LlmFlow Logic
   // --------------------------------------------------------------------------
-  async *runLiveFlow(invocationContext) {
+  // eslint-disable-next-line require-yield
+  async *runLiveFlow(_invocationContext) {
     await Promise.resolve();
     throw new Error("LlmAgent.runLiveFlow not implemented");
   }
@@ -922,7 +998,10 @@ class LlmAgent extends BaseAgent {
       liveConnectConfig: {}
     };
     for (const processor of this.requestProcessors) {
-      for await (const event of processor.runAsync(invocationContext, llmRequest)) {
+      for await (const event of processor.runAsync(
+        invocationContext,
+        llmRequest
+      )) {
         yield event;
       }
     }
@@ -944,27 +1023,39 @@ class LlmAgent extends BaseAgent {
       author: this.name,
       branch: invocationContext.branch
     });
-    for await (const llmResponse of this.callLlmAsync(
-      invocationContext,
-      llmRequest,
-      modelResponseEvent
-    )) {
-      for await (const event of this.postprocess(
-        invocationContext,
-        llmRequest,
-        llmResponse,
-        modelResponseEvent
-      )) {
-        modelResponseEvent.id = createNewEventId();
-        modelResponseEvent.timestamp = (/* @__PURE__ */ new Date()).getTime();
-        yield event;
+    const span = tracer.startSpan("call_llm");
+    const ctx = trace.setSpan(context.active(), span);
+    yield* runAsyncGeneratorWithOtelContext(
+      ctx,
+      this,
+      async function* () {
+        for await (const llmResponse of this.callLlmAsync(
+          invocationContext,
+          llmRequest,
+          modelResponseEvent
+        )) {
+          for await (const event of this.postprocess(
+            invocationContext,
+            llmRequest,
+            llmResponse,
+            modelResponseEvent
+          )) {
+            modelResponseEvent.id = createNewEventId();
+            modelResponseEvent.timestamp = (/* @__PURE__ */ new Date()).getTime();
+            yield event;
+          }
+        }
       }
-    }
+    );
+    span.end();
   }
   async *postprocess(invocationContext, llmRequest, llmResponse, modelResponseEvent) {
-    var _a;
+    var _a2;
     for (const processor of this.responseProcessors) {
-      for await (const event of processor.runAsync(invocationContext, llmResponse)) {
+      for await (const event of processor.runAsync(
+        invocationContext,
+        llmResponse
+      )) {
         yield event;
       }
     }
@@ -985,7 +1076,7 @@ class LlmAgent extends BaseAgent {
       }
     }
     yield mergedEvent;
-    if (!((_a = getFunctionCalls(mergedEvent)) == null ? void 0 : _a.length)) {
+    if (!((_a2 = getFunctionCalls(mergedEvent)) == null ? void 0 : _a2.length)) {
       return;
     }
     const functionResponseEvent = await handleFunctionCallsAsync({
@@ -998,7 +1089,10 @@ class LlmAgent extends BaseAgent {
     if (!functionResponseEvent) {
       return;
     }
-    const authEvent = generateAuthEvent(invocationContext, functionResponseEvent);
+    const authEvent = generateAuthEvent(
+      invocationContext,
+      functionResponseEvent
+    );
     if (authEvent) {
       yield authEvent;
     }
@@ -1040,7 +1134,7 @@ class LlmAgent extends BaseAgent {
     return agentToRun;
   }
   async *callLlmAsync(invocationContext, llmRequest, modelResponseEvent) {
-    var _a, _b, _c, _d, _e;
+    var _a2, _b2, _c, _d, _e;
     const beforeModelResponse = await this.handleBeforeModelCallback(
       invocationContext,
       llmRequest,
@@ -1050,8 +1144,8 @@ class LlmAgent extends BaseAgent {
       yield beforeModelResponse;
       return;
     }
-    (_a = llmRequest.config) != null ? _a : llmRequest.config = {};
-    (_c = (_b = llmRequest.config).labels) != null ? _c : _b.labels = {};
+    (_a2 = llmRequest.config) != null ? _a2 : llmRequest.config = {};
+    (_c = (_b2 = llmRequest.config).labels) != null ? _c : _b2.labels = {};
     if (!llmRequest.config.labels[ADK_AGENT_NAME_LABEL_KEY]) {
       llmRequest.config.labels[ADK_AGENT_NAME_LABEL_KEY] = this.name;
     }
@@ -1071,6 +1165,12 @@ class LlmAgent extends BaseAgent {
         llmRequest,
         modelResponseEvent
       )) {
+        traceCallLlm({
+          invocationContext,
+          eventId: modelResponseEvent.id,
+          llmRequest,
+          llmResponse
+        });
         const alteredLlmResponse = await this.handleAfterModelCallback(
           invocationContext,
           llmResponse,
@@ -1081,17 +1181,22 @@ class LlmAgent extends BaseAgent {
     }
   }
   async handleBeforeModelCallback(invocationContext, llmRequest, modelResponseEvent) {
-    const callbackContext = new CallbackContext(
-      { invocationContext, eventActions: modelResponseEvent.actions }
-    );
-    const beforeModelCallbackResponse = await invocationContext.pluginManager.runBeforeModelCallback(
-      { callbackContext, llmRequest }
-    );
+    const callbackContext = new CallbackContext({
+      invocationContext,
+      eventActions: modelResponseEvent.actions
+    });
+    const beforeModelCallbackResponse = await invocationContext.pluginManager.runBeforeModelCallback({
+      callbackContext,
+      llmRequest
+    });
     if (beforeModelCallbackResponse) {
       return beforeModelCallbackResponse;
     }
     for (const callback of this.canonicalBeforeModelCallbacks) {
-      const callbackResponse = await callback({ context: callbackContext, request: llmRequest });
+      const callbackResponse = await callback({
+        context: callbackContext,
+        request: llmRequest
+      });
       if (callbackResponse) {
         return callbackResponse;
       }
@@ -1099,17 +1204,22 @@ class LlmAgent extends BaseAgent {
     return void 0;
   }
   async handleAfterModelCallback(invocationContext, llmResponse, modelResponseEvent) {
-    const callbackContext = new CallbackContext(
-      { invocationContext, eventActions: modelResponseEvent.actions }
-    );
-    const afterModelCallbackResponse = await invocationContext.pluginManager.runAfterModelCallback(
-      { callbackContext, llmResponse }
-    );
+    const callbackContext = new CallbackContext({
+      invocationContext,
+      eventActions: modelResponseEvent.actions
+    });
+    const afterModelCallbackResponse = await invocationContext.pluginManager.runAfterModelCallback({
+      callbackContext,
+      llmResponse
+    });
     if (afterModelCallbackResponse) {
       return afterModelCallbackResponse;
     }
     for (const callback of this.canonicalAfterModelCallbacks) {
-      const callbackResponse = await callback({ context: callbackContext, response: llmResponse });
+      const callbackResponse = await callback({
+        context: callbackContext,
+        response: llmResponse
+      });
       if (callbackResponse) {
         return callbackResponse;
       }
@@ -1122,9 +1232,10 @@ class LlmAgent extends BaseAgent {
         yield response;
       }
     } catch (modelError) {
-      const callbackContext = new CallbackContext(
-        { invocationContext, eventActions: modelResponseEvent.actions }
-      );
+      const callbackContext = new CallbackContext({
+        invocationContext,
+        eventActions: modelResponseEvent.actions
+      });
       if (modelError instanceof Error) {
         const onModelErrorCallbackResponse = await invocationContext.pluginManager.runOnModelErrorCallback({
           callbackContext,
@@ -1156,5 +1267,6 @@ class LlmAgent extends BaseAgent {
 export {
   LlmAgent,
   REQUEST_CONFIRMATION_LLM_REQUEST_PROCESSOR,
+  isLlmAgent,
   responseProcessor
 };