feat: Add --trigger_sources and ADK service options to cli_deploy_agent_engine

COPYBARA_INTEGRATE_REVIEW=#5960 from google:adk-api-server 28b1235

Change-Id: If1e5374682468dd1f4d9a11983bcf0f830418ffd

Author: GWeale

pyproject.toml

@@ -176,7 +176,11 @@ optional-dependencies.mcp = [
   "mcp>=1.24,<2",
 ]
 
-optional-dependencies.otel-gcp = [ "opentelemetry-instrumentation-google-genai>=0.6b0,<1" ]
+optional-dependencies.otel-gcp = [
+  "opentelemetry-instrumentation-google-genai>=0.6b0,<1",
+  "opentelemetry-instrumentation-grpc>=0.43b0,<1",
+  "opentelemetry-instrumentation-httpx>=0.54b0,<1",
+]
 optional-dependencies.slack = [ "slack-bolt>=1.22" ]
 optional-dependencies.test = [
   "a2a-sdk>=0.3,<0.4",

src/google/adk/cli/api_server.py

@@ -26,7 +26,6 @@
 import os
 import re
 import sys
-import time
 import traceback
 import typing
 from typing import Any
@@ -548,6 +547,26 @@ def _setup_instrumentation_lib_if_installed():
         "Unable to import GoogleGenAiSdkInstrumentor - some"
         " telemetry will be disabled. Make sure to install google-adk[otel-gcp]"
     )
+  if os.getenv("GOOGLE_CLOUD_AGENT_ENGINE_ID"):
+    # Set up HTTPX and gRPC instrumentation for A2A multi-agent observability.
+    try:
+      from opentelemetry.instrumentation.httpx import HTTPXClientInstrumentor
+
+      HTTPXClientInstrumentor().instrument()
+    except (ImportError, AttributeError):
+      logger.warning(
+          "telemetry enabled but proceeding without HTTPX instrumentation,"
+          " because google-adk[otel-gcp] has not been installed"
+      )
+    try:
+      from opentelemetry.instrumentation.grpc import GrpcInstrumentorClient
+
+      GrpcInstrumentorClient().instrument()
+    except (ImportError, AttributeError):
+      logger.warning(
+          "telemetry enabled but proceeding without gRPC instrumentation,"
+          " because google-adk[otel-gcp] has not been installed"
+      )
 
 
 class ApiServer: