feat: Add --trigger_sources and --artifact_service_uri to cli_deploy_agent_engine

Co-authored-by: Yeesian Ng <ysian@google.com>
PiperOrigin-RevId: 899594873

Author: yeesian

pyproject.toml

@@ -131,7 +131,11 @@ optional-dependencies.extensions = [
   "pypika>=0.50",                                                    # For crewai->chromadb dependency
   "toolbox-adk>=1,<2",                                               # For tools.toolbox_toolset.ToolboxToolset
 ]
-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/adk_web_server.py

@@ -600,11 +600,29 @@ def _setup_instrumentation_lib_if_installed():
     from opentelemetry.instrumentation.google_genai import GoogleGenAiSdkInstrumentor
 
     GoogleGenAiSdkInstrumentor().instrument()
-  except ImportError:
+  except (ImportError, AttributeError):
     logger.warning(
         "Unable to import GoogleGenAiSdkInstrumentor - some"
         " telemetry will be disabled. Make sure to install google-adk[otel-gcp]"
     )
+  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 AdkWebServer: