Feat: Port the adk-python OpenTelemetry metrics contract (Part 2/2)

core/src/agents/base_agent.ts

@@ -10,6 +10,7 @@ import {context, trace} from '@opentelemetry/api';
 import {createEvent, Event} from '../events/event.js';
 
 import {
+  getElapsedS,
   recordAgentInvocationDuration,
   recordAgentRequestSize,
   recordAgentResponseSize,
@@ -283,7 +284,7 @@ export abstract class BaseAgent<
     const startTime = performance.now();
     const agentName = this.name;
     const tally: AgentEventTally = {stepCount: 0};
-    let error: Error | undefined;
+    let error: unknown;
     try {
       yield* runAsyncGeneratorWithOtelContext<BaseAgent, Event>(
         ctx,
@@ -323,12 +324,15 @@ export abstract class BaseAgent<
         },
       );
     } catch (e) {
-      error = e as Error;
+      error = e;
       throw e;
     } finally {
       span.end();
-      const elapsedMs = performance.now() - startTime;
-      recordAgentInvocationDuration(agentName, elapsedMs, error);
+      recordAgentInvocationDuration(
+        agentName,
+        getElapsedS(span, startTime),
+        error,
+      );
       recordAgentWorkflowSteps(agentName, tally.stepCount);
       recordAgentResponseSize(agentName, tally.lastContent);
     }

core/src/agents/functions.ts

@@ -21,7 +21,10 @@ import {ToolConfirmation} from '../tools/tool_confirmation.js';
 import {logger} from '../utils/logger.js';
 import {Context} from './context.js';
 
-import {recordToolExecutionDuration} from '../telemetry/metrics.js';
+import {
+  getElapsedS,
+  recordToolExecutionDuration,
+} from '../telemetry/metrics.js';
 import {
   traceMergedToolCalls,
   tracer,
@@ -179,8 +182,10 @@ async function callToolAsync(
   const startTime = performance.now();
   const agentName = toolContext.invocationContext.agent.name;
   const toolName = tool.name;
+  // e.g. FunctionTool, matching the gen_ai.tool.type span attribute.
+  const toolType = tool.constructor.name;
   return tracer.startActiveSpan(`execute_tool ${tool.name}`, async (span) => {
-    let error: Error | undefined;
+    let error: unknown;
     try {
       logger.debug(`callToolAsync ${tool.name}`);
       const result = await tool.runAsync({args, toolContext});
@@ -196,14 +201,15 @@ async function callToolAsync(
       });
       return result;
     } catch (e) {
-      error = e as Error;
+      error = e;
       throw e;
     } finally {
       span.end();
       recordToolExecutionDuration(
         toolName,
+        toolType,
         agentName,
-        performance.now() - startTime,
+        getElapsedS(span, startTime),
         error,
       );
     }

core/src/agents/llm_agent.ts

@@ -37,6 +37,7 @@ import {logger} from '../utils/logger.js';
 import {Context} from './context.js';
 
 import {
+  getElapsedS,
   recordClientOperationDuration,
   recordClientTokenUsage,
 } from '../telemetry/metrics.js';
@@ -1093,7 +1094,7 @@ export class LlmAgent extends BaseAgent<LlmAgentConfig> {
       invocationContext.incrementLlmCallCount();
       const startTime = performance.now();
       let lastResponse: LlmResponse | undefined;
-      let error: Error | undefined;
+      let error: unknown;
       try {
         const responsesGenerator = llm.generateContentAsync(
           llmRequest,
@@ -1129,18 +1130,21 @@ export class LlmAgent extends BaseAgent<LlmAgentConfig> {
           yield alteredLlmResponse ?? llmResponse;
         }
       } catch (e) {
-        error = e as Error;
+        error = e;
         throw e;
       } finally {
-        const elapsedMs = performance.now() - startTime;
-        recordClientOperationDuration(
-          this.name,
-          elapsedMs,
+        recordClientOperationDuration({
+          agentName: this.name,
+          elapsedS: getElapsedS(undefined, startTime),
           llmRequest,
-          lastResponse,
+          response: lastResponse,
           error,
-        );
-        recordClientTokenUsage(this.name, llmRequest, lastResponse);
+        });
+        recordClientTokenUsage({
+          agentName: this.name,
+          llmRequest,
+          response: lastResponse,
+        });
       }
     }
   }

core/src/common.ts

@@ -321,5 +321,4 @@ export * from './artifacts/base_artifact_service.js';
 export * from './features/feature_registry.js';
 export * from './memory/base_memory_service.js';
 export * from './sessions/base_session_service.js';
-export * from './telemetry/metrics.js';
 export * from './tools/base_tool.js';