@google/adk 0.1.2 → 0.2.0

package/dist/web/models/base_llm.js

@@ -3,16 +3,25 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import { getClientLabels } from "../utils/client_labels.js";
 class BaseLlm {
   /**
    * Creates an instance of BaseLLM.
-   *
-   * @param model The name of the LLM, e.g. gemini-1.5-flash or
+   * @param params The parameters for creating a BaseLlm instance.
+   * @param params.model The name of the LLM, e.g. gemini-1.5-flash or
    *     gemini-1.5-flash-001.
    */
-  constructor(model) {
+  constructor({ model }) {
     this.model = model;
   }
+  get trackingHeaders() {
+    const labels = getClientLabels();
+    const headerValue = labels.join(" ");
+    return {
+      "x-goog-api-client": headerValue,
+      "user-agent": headerValue
+    };
+  }
   /**
    * Appends a user content, so that model can continue to output.
    *

package/dist/web/models/google_llm.js

@@ -37,10 +37,8 @@ var __forAwait = (obj, it, method) => (it = obj[__knownSymbol("asyncIterator")])
  * SPDX-License-Identifier: Apache-2.0
  */
 import { createPartFromText, FinishReason, GoogleGenAI } from "@google/genai";
-import { isBrowser } from "../utils/env_aware_utils.js";
 import { logger } from "../utils/logger.js";
 import { GoogleLLMVariant } from "../utils/variant_utils.js";
-import { version } from "../version.js";
 import { BaseLlm } from "./base_llm.js";
 import { GeminiLlmConnection } from "./gemini_llm_connection.js";
 import { createLlmResponse } from "./llm_response.js";
@@ -51,14 +49,17 @@ class Gemini extends BaseLlm {
    * @param params The parameters for creating a Gemini instance.
    */
   constructor({
-    model = "gemini-2.5-flash",
+    model,
     apiKey,
     vertexai,
     project,
     location,
     headers
-  } = {}) {
-    super(model);
+  }) {
+    if (!model) {
+      model = "gemini-2.5-flash";
+    }
+    super({ model });
     this.project = project;
     this.location = location;
     this.apiKey = apiKey;
@@ -223,21 +224,6 @@ class Gemini extends BaseLlm {
     }
     return this._apiBackend;
   }
-  get trackingHeaders() {
-    if (!this._trackingHeaders) {
-      let frameworkLabel = "google-adk/".concat(version);
-      if (!isBrowser() && process.env[AGENT_ENGINE_TELEMETRY_ENV_VARIABLE_NAME]) {
-        frameworkLabel = "".concat(frameworkLabel, "+").concat(AGENT_ENGINE_TELEMETRY_TAG);
-      }
-      const languageLabel = "gl-typescript/".concat(isBrowser() ? window.navigator.userAgent : process.version);
-      const versionHeaderValue = "".concat(frameworkLabel, " ").concat(languageLabel);
-      this._trackingHeaders = {
-        "x-goog-api-client": versionHeaderValue,
-        "user-agent": versionHeaderValue
-      };
-    }
-    return this._trackingHeaders;
-  }
   get liveApiVersion() {
     if (!this._liveApiVersion) {
       this._liveApiVersion = this.apiBackend === GoogleLLMVariant.VERTEX_AI ? "v1beta1" : "v1alpha";

package/dist/web/models/registry.js

@@ -35,7 +35,7 @@ const _LLMRegistry = class _LLMRegistry {
    * @returns The LLM instance.
    */
   static newLlm(model) {
-    return new (_LLMRegistry.resolve(model))(model);
+    return new (_LLMRegistry.resolve(model))({ model });
   }
   static _register(modelNameRegex, llmCls) {
     if (_LLMRegistry.llmRegistryDict.has(modelNameRegex)) {

package/dist/web/telemetry/google_cloud.js

@@ -0,0 +1,54 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { GoogleAuth } from "google-auth-library";
+import { PeriodicExportingMetricReader } from "@opentelemetry/sdk-metrics";
+import { detectResources } from "@opentelemetry/resources";
+import { gcpDetector } from "@opentelemetry/resource-detector-gcp";
+import { TraceExporter } from "@google-cloud/opentelemetry-cloud-trace-exporter";
+import { BatchSpanProcessor } from "@opentelemetry/sdk-trace-base";
+import { MetricExporter } from "@google-cloud/opentelemetry-cloud-monitoring-exporter";
+import { logger } from "../utils/logger.js";
+const GCP_PROJECT_ERROR_MESSAGE = "Cannot determine GCP Project. OTel GCP Exporters cannot be set up. Please make sure to log into correct GCP Project.";
+async function getGcpProjectId() {
+  try {
+    const auth = new GoogleAuth();
+    const projectId = await auth.getProjectId();
+    return projectId || void 0;
+  } catch (error) {
+    return void 0;
+  }
+}
+async function getGcpExporters(config = {}) {
+  const {
+    enableTracing = false,
+    enableMetrics = false
+    // enableCloudLogging = false,
+  } = config;
+  const projectId = await getGcpProjectId();
+  if (!projectId) {
+    logger.warn(GCP_PROJECT_ERROR_MESSAGE);
+    return {};
+  }
+  return {
+    spanProcessors: enableTracing ? [
+      new BatchSpanProcessor(new TraceExporter({ projectId }))
+    ] : [],
+    metricReaders: enableMetrics ? [
+      new PeriodicExportingMetricReader({
+        exporter: new MetricExporter({ projectId }),
+        exportIntervalMillis: 5e3
+      })
+    ] : [],
+    logRecordProcessors: []
+  };
+}
+function getGcpResource() {
+  return detectResources({ detectors: [gcpDetector] });
+}
+export {
+  getGcpExporters,
+  getGcpResource
+};

package/dist/web/telemetry/setup.js

@@ -0,0 +1,67 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { trace, metrics } from "@opentelemetry/api";
+import { logs } from "@opentelemetry/api-logs";
+import { LoggerProvider, BatchLogRecordProcessor } from "@opentelemetry/sdk-logs";
+import { MeterProvider, PeriodicExportingMetricReader } from "@opentelemetry/sdk-metrics";
+import { detectResources } from "@opentelemetry/resources";
+import { BatchSpanProcessor } from "@opentelemetry/sdk-trace-base";
+import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node";
+import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
+import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-http";
+import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-http";
+function maybeSetOtelProviders(otelHooksToSetup = [], otelResource) {
+  const resource = otelResource || getOtelResource();
+  const allHooks = [...otelHooksToSetup, getOtelExporters()];
+  const spanProcessors = allHooks.flatMap((hooks) => hooks.spanProcessors || []);
+  const metricReaders = allHooks.flatMap((hooks) => hooks.metricReaders || []);
+  const logRecordProcessors = allHooks.flatMap((hooks) => hooks.logRecordProcessors || []);
+  if (spanProcessors.length > 0) {
+    const tracerProvider = new NodeTracerProvider({
+      resource,
+      spanProcessors
+    });
+    tracerProvider.register();
+    trace.setGlobalTracerProvider(tracerProvider);
+  }
+  if (metricReaders.length > 0) {
+    const meterProvider = new MeterProvider({
+      readers: metricReaders,
+      resource
+    });
+    metrics.setGlobalMeterProvider(meterProvider);
+  }
+  if (logRecordProcessors.length > 0) {
+    const loggerProvider = new LoggerProvider({
+      resource,
+      processors: logRecordProcessors
+    });
+    logs.setGlobalLoggerProvider(loggerProvider);
+  }
+}
+function getOtelResource() {
+  return detectResources({
+    detectors: []
+  });
+}
+function getOtelExportersConfig() {
+  return {
+    enableTracing: !!(process.env.OTEL_EXPORTER_OTLP_ENDPOINT || process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT),
+    enableMetrics: !!(process.env.OTEL_EXPORTER_OTLP_ENDPOINT || process.env.OTEL_EXPORTER_OTLP_METRICS_ENDPOINT),
+    enableLogging: !!(process.env.OTEL_EXPORTER_OTLP_ENDPOINT || process.env.OTEL_EXPORTER_OTLP_LOGS_ENDPOINT)
+  };
+}
+function getOtelExporters(config = getOtelExportersConfig()) {
+  const { enableTracing, enableMetrics, enableLogging } = config;
+  return {
+    spanProcessors: enableTracing ? [new BatchSpanProcessor(new OTLPTraceExporter())] : [],
+    metricReaders: enableMetrics ? [new PeriodicExportingMetricReader({ exporter: new OTLPMetricExporter() })] : [],
+    logRecordProcessors: enableLogging ? [new BatchLogRecordProcessor(new OTLPLogExporter())] : []
+  };
+}
+export {
+  maybeSetOtelProviders
+};

package/dist/web/telemetry/tracing.js

@@ -0,0 +1,210 @@
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { trace, context } from "@opentelemetry/api";
+import { version } from "../version.js";
+const GEN_AI_AGENT_DESCRIPTION = "gen_ai.agent.description";
+const GEN_AI_AGENT_NAME = "gen_ai.agent.name";
+const GEN_AI_CONVERSATION_ID = "gen_ai.conversation.id";
+const GEN_AI_OPERATION_NAME = "gen_ai.operation.name";
+const GEN_AI_TOOL_CALL_ID = "gen_ai.tool.call.id";
+const GEN_AI_TOOL_DESCRIPTION = "gen_ai.tool.description";
+const GEN_AI_TOOL_NAME = "gen_ai.tool.name";
+const GEN_AI_TOOL_TYPE = "gen_ai.tool.type";
+const tracer = trace.getTracer(
+  "gcp.vertex.agent",
+  version
+);
+function safeJsonSerialize(obj) {
+  try {
+    return JSON.stringify(obj);
+  } catch (error) {
+    return "<not serializable>";
+  }
+}
+function traceAgentInvocation({
+  agent,
+  invocationContext
+}) {
+  const span = trace.getActiveSpan();
+  if (!span) return;
+  span.setAttributes({
+    [GEN_AI_OPERATION_NAME]: "invoke_agent",
+    // Conditionally Required
+    [GEN_AI_AGENT_DESCRIPTION]: agent.description,
+    [GEN_AI_AGENT_NAME]: agent.name,
+    [GEN_AI_CONVERSATION_ID]: invocationContext.session.id
+  });
+}
+function traceToolCall({
+  tool,
+  args,
+  functionResponseEvent
+}) {
+  var _a, _b;
+  const span = trace.getActiveSpan();
+  if (!span) return;
+  span.setAttributes({
+    [GEN_AI_OPERATION_NAME]: "execute_tool",
+    [GEN_AI_TOOL_DESCRIPTION]: tool.description || "",
+    [GEN_AI_TOOL_NAME]: tool.name,
+    // e.g. FunctionTool
+    [GEN_AI_TOOL_TYPE]: tool.constructor.name,
+    // Setting empty llm request and response (as UI expect these) while not
+    // applicable for tool_response.
+    "gcp.vertex.agent.llm_request": "{}",
+    "gcp.vertex.agent.llm_response": "{}",
+    "gcp.vertex.agent.tool_call_args": shouldAddRequestResponseToSpans() ? safeJsonSerialize(args) : "{}"
+  });
+  let toolCallId = "<not specified>";
+  let toolResponse = "<not specified>";
+  if ((_a = functionResponseEvent.content) == null ? void 0 : _a.parts) {
+    const responseParts = functionResponseEvent.content.parts;
+    const functionResponse = (_b = responseParts[0]) == null ? void 0 : _b.functionResponse;
+    if (functionResponse == null ? void 0 : functionResponse.id) {
+      toolCallId = functionResponse.id;
+    }
+    if (functionResponse == null ? void 0 : functionResponse.response) {
+      toolResponse = functionResponse.response;
+    }
+  }
+  if (typeof toolResponse !== "object" || toolResponse === null) {
+    toolResponse = { result: toolResponse };
+  }
+  span.setAttributes({
+    [GEN_AI_TOOL_CALL_ID]: toolCallId,
+    "gcp.vertex.agent.event_id": functionResponseEvent.id,
+    "gcp.vertex.agent.tool_response": shouldAddRequestResponseToSpans() ? safeJsonSerialize(toolResponse) : "{}"
+  });
+}
+function traceMergedToolCalls({
+  responseEventId,
+  functionResponseEvent
+}) {
+  const span = trace.getActiveSpan();
+  if (!span) return;
+  span.setAttributes({
+    [GEN_AI_OPERATION_NAME]: "execute_tool",
+    [GEN_AI_TOOL_NAME]: "(merged tools)",
+    [GEN_AI_TOOL_DESCRIPTION]: "(merged tools)",
+    [GEN_AI_TOOL_CALL_ID]: responseEventId,
+    "gcp.vertex.agent.tool_call_args": "N/A",
+    "gcp.vertex.agent.event_id": responseEventId,
+    // Setting empty llm request and response (as UI expect these) while not
+    // applicable for tool_response.
+    "gcp.vertex.agent.llm_request": "{}",
+    "gcp.vertex.agent.llm_response": "{}"
+  });
+  span.setAttribute("gcp.vertex.agent.tool_response", shouldAddRequestResponseToSpans() ? safeJsonSerialize(functionResponseEvent) : "{}");
+}
+function traceCallLlm({
+  invocationContext,
+  eventId,
+  llmRequest,
+  llmResponse
+}) {
+  var _a, _b, _c;
+  const span = trace.getActiveSpan();
+  if (!span) return;
+  span.setAttributes({
+    "gen_ai.system": "gcp.vertex.agent",
+    "gen_ai.request.model": llmRequest.model,
+    "gcp.vertex.agent.invocation_id": invocationContext.invocationId,
+    "gcp.vertex.agent.session_id": invocationContext.session.id,
+    "gcp.vertex.agent.event_id": eventId,
+    // Consider removing once GenAI SDK provides a way to record this info.
+    "gcp.vertex.agent.llm_request": shouldAddRequestResponseToSpans() ? safeJsonSerialize(buildLlmRequestForTrace(llmRequest)) : "{}"
+  });
+  if ((_a = llmRequest.config) == null ? void 0 : _a.topP) {
+    span.setAttribute("gen_ai.request.top_p", llmRequest.config.topP);
+  }
+  if (((_b = llmRequest.config) == null ? void 0 : _b.maxOutputTokens) !== void 0) {
+    span.setAttribute("gen_ai.request.max_tokens", llmRequest.config.maxOutputTokens);
+  }
+  span.setAttribute("gcp.vertex.agent.llm_response", shouldAddRequestResponseToSpans() ? safeJsonSerialize(llmResponse) : "{}");
+  if (llmResponse.usageMetadata) {
+    span.setAttribute("gen_ai.usage.input_tokens", llmResponse.usageMetadata.promptTokenCount || 0);
+  }
+  if ((_c = llmResponse.usageMetadata) == null ? void 0 : _c.candidatesTokenCount) {
+    span.setAttribute("gen_ai.usage.output_tokens", llmResponse.usageMetadata.candidatesTokenCount);
+  }
+  if (llmResponse.finishReason) {
+    const finishReasonValue = typeof llmResponse.finishReason === "string" ? llmResponse.finishReason.toLowerCase() : String(llmResponse.finishReason).toLowerCase();
+    span.setAttribute("gen_ai.response.finish_reasons", [finishReasonValue]);
+  }
+}
+function traceSendData({
+  invocationContext,
+  eventId,
+  data
+}) {
+  const span = trace.getActiveSpan();
+  if (!span) return;
+  span.setAttributes({
+    "gcp.vertex.agent.invocation_id": invocationContext.invocationId,
+    "gcp.vertex.agent.event_id": eventId
+  });
+  span.setAttribute("gcp.vertex.agent.data", shouldAddRequestResponseToSpans() ? safeJsonSerialize(data) : "{}");
+}
+function buildLlmRequestForTrace(llmRequest) {
+  const result = {
+    model: llmRequest.model,
+    contents: []
+  };
+  if (llmRequest.config) {
+    const _a = llmRequest.config, { responseSchema } = _a, cleanConfig = __objRest(_a, ["responseSchema"]);
+    result.config = cleanConfig;
+  }
+  result.contents = llmRequest.contents.map((content) => {
+    var _a2;
+    return {
+      role: content.role,
+      parts: ((_a2 = content.parts) == null ? void 0 : _a2.filter((part) => !part.inlineData)) || []
+    };
+  });
+  return result;
+}
+function bindAsyncGenerator(ctx, generator) {
+  return {
+    // Bind the next() method to execute within the provided context
+    next: context.bind(ctx, generator.next.bind(generator)),
+    // Bind the return() method to execute within the provided context
+    return: context.bind(ctx, generator.return.bind(generator)),
+    // Bind the throw() method to execute within the provided context
+    throw: context.bind(ctx, generator.throw.bind(generator)),
+    // Ensure the async iterator symbol also returns a context-bound generator
+    [Symbol.asyncIterator]() {
+      return bindAsyncGenerator(ctx, generator[Symbol.asyncIterator]());
+    }
+  };
+}
+function shouldAddRequestResponseToSpans() {
+  const envValue = process.env.ADK_CAPTURE_MESSAGE_CONTENT_IN_SPANS || "true";
+  return envValue === "true" || envValue === "1";
+}
+export {
+  bindAsyncGenerator,
+  traceAgentInvocation,
+  traceCallLlm,
+  traceMergedToolCalls,
+  traceSendData,
+  traceToolCall,
+  tracer
+};

package/dist/web/utils/client_labels.js

@@ -0,0 +1,26 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { version } from "../version.js";
+import { isBrowser } from "./env_aware_utils.js";
+const ADK_LABEL = "google-adk";
+const LANGUAGE_LABEL = "gl-typescript";
+const AGENT_ENGINE_TELEMETRY_TAG = "remote_reasoning_engine";
+const AGENT_ENGINE_TELEMETRY_ENV_VARIABLE_NAME = "GOOGLE_CLOUD_AGENT_ENGINE_ID";
+function _getDefaultLabels() {
+  let frameworkLabel = "".concat(ADK_LABEL, "/").concat(version);
+  if (!isBrowser() && process.env[AGENT_ENGINE_TELEMETRY_ENV_VARIABLE_NAME]) {
+    frameworkLabel = "".concat(frameworkLabel, "+").concat(AGENT_ENGINE_TELEMETRY_TAG);
+  }
+  const languageLabel = "".concat(LANGUAGE_LABEL, "/").concat(isBrowser() ? window.navigator.userAgent : process.version);
+  return [frameworkLabel, languageLabel];
+}
+function getClientLabels() {
+  const labels = _getDefaultLabels();
+  return labels;
+}
+export {
+  getClientLabels
+};

package/dist/web/version.js

@@ -3,7 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-const version = "0.1.0";
+const version = "0.2.0";
 export {
   version
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/adk",
-  "version": "0.1.2",
+  "version": "0.2.0",
   "description": "Google ADK JS",
   "author": "Google",
   "license": "Apache-2.0",
@@ -38,13 +38,29 @@
     "format": "prettier --write 'src/**/*.ts'",
     "prepublishOnly": "npm run build:bundle"
   },
+  "dependencies": {
+    "@google/genai": "1.32.0",
+    "@modelcontextprotocol/sdk": "^1.24.0",
+    "google-auth-library": "^10.3.0",
+    "zod": "3.25.76"
+  },
   "devDependencies": {
     "openapi-types": "^12.1.3"
   },
   "peerDependencies": {
-    "@google/genai": "1.14.0",
-    "@modelcontextprotocol/sdk": "1.17.5",
+    "@google-cloud/opentelemetry-cloud-monitoring-exporter": "^0.21.0",
+    "@google-cloud/opentelemetry-cloud-trace-exporter": "^3.0.0",
+    "@google-cloud/storage": "^7.17.1",
     "@opentelemetry/api": "1.9.0",
-    "zod": "3.25.76"
+    "@opentelemetry/api-logs": "^0.205.0",
+    "@opentelemetry/exporter-logs-otlp-http": "^0.205.0",
+    "@opentelemetry/exporter-metrics-otlp-http": "^0.205.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.205.0",
+    "@opentelemetry/resource-detector-gcp": "^0.40.0",
+    "@opentelemetry/resources": "^2.1.0",
+    "@opentelemetry/sdk-logs": "^0.205.0",
+    "@opentelemetry/sdk-metrics": "^2.1.0",
+    "@opentelemetry/sdk-trace-base": "^2.1.0",
+    "@opentelemetry/sdk-trace-node": "^2.1.0"
   }
 }