Merge branch 'main' into feat/gcs-file-data-support

Author: DeanChensj

.github/workflows/pre-commit.yml

@@ -0,0 +1,39 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: pre-commit
+
+on:
+  push:
+    branches: [main, v2]
+    paths:
+      - '**.py'
+      - '.pre-commit-config.yaml'
+      - 'pyproject.toml'
+  pull_request:
+    branches: [main, v2]
+    paths:
+      - '**.py'
+      - '.pre-commit-config.yaml'
+      - 'pyproject.toml'
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v6
+
+      - name: Run pre-commit checks
+        uses: pre-commit/action@v3.0.1

pyproject.toml

@@ -90,6 +90,7 @@ dev = [
   "flit>=3.10.0",
   "isort>=6.0.0",
   "mypy>=1.15.0",
+  "pre-commit>=4.0.0",
   "pyink>=25.12.0",
   "pylint>=2.6.0",
   # go/keep-sorted end

src/google/adk/a2a/converters/from_adk_event.py

@@ -257,7 +257,6 @@ def _serialize_value(value: Any) -> Optional[Any]:
     try:
       dumped = value.model_dump(
           exclude_none=True,
-          exclude_unset=True,
           exclude_defaults=True,
           by_alias=True,
       )

src/google/adk/agents/base_agent.py

@@ -42,8 +42,7 @@
 from ..events.event_actions import EventActions
 from ..features import experimental
 from ..features import FeatureName
-from ..telemetry import tracing
-from ..telemetry.tracing import tracer
+from ..telemetry import _instrumentation
 from ..utils.context_utils import Aclosing
 from .base_agent_config import BaseAgentConfig
 from .callback_context import CallbackContext
@@ -285,9 +284,8 @@ async def run_async(
       Event: the events generated by the agent.
     """
 
-    with tracer.start_as_current_span(f'invoke_agent {self.name}') as span:
-      ctx = self._create_invocation_context(parent_context)
-      tracing.trace_agent_invocation(span, self, ctx)
+    ctx = self._create_invocation_context(parent_context)
+    async with _instrumentation.record_agent_invocation(ctx, self):
       if event := await self._handle_before_agent_callback(ctx):
         yield event
       if ctx.end_invocation:
@@ -318,9 +316,8 @@ async def run_live(
       Event: the events generated by the agent.
     """
 
-    with tracer.start_as_current_span(f'invoke_agent {self.name}') as span:
-      ctx = self._create_invocation_context(parent_context)
-      tracing.trace_agent_invocation(span, self, ctx)
+    ctx = self._create_invocation_context(parent_context)
+    async with _instrumentation.record_agent_invocation(ctx, self):
       if event := await self._handle_before_agent_callback(ctx):
         yield event
       if ctx.end_invocation:

src/google/adk/features/_feature_registry.py

@@ -41,6 +41,12 @@ class FeatureName(str, Enum):
   GOOGLE_CREDENTIALS_CONFIG = "GOOGLE_CREDENTIALS_CONFIG"
   GOOGLE_TOOL = "GOOGLE_TOOL"
   JSON_SCHEMA_FOR_FUNC_DECL = "JSON_SCHEMA_FOR_FUNC_DECL"
+  # Private (leading underscore): not part of the public API surface.
+  # GE flips this on by setting the env var
+  # `ADK_ENABLE_MCP_GRACEFUL_ERROR_HANDLING=1`; nothing should import this
+  # enum member by name. Keeping it private avoids a backward-compat
+  # obligation for what is intended as a temporary, internal kill-switch.
+  _MCP_GRACEFUL_ERROR_HANDLING = "MCP_GRACEFUL_ERROR_HANDLING"
   PROGRESSIVE_SSE_STREAMING = "PROGRESSIVE_SSE_STREAMING"
   PUBSUB_TOOL_CONFIG = "PUBSUB_TOOL_CONFIG"
   PUBSUB_TOOLSET = "PUBSUB_TOOLSET"
@@ -131,6 +137,9 @@ class FeatureConfig:
     FeatureName.JSON_SCHEMA_FOR_FUNC_DECL: FeatureConfig(
         FeatureStage.WIP, default_on=False
     ),
+    FeatureName._MCP_GRACEFUL_ERROR_HANDLING: FeatureConfig(
+        FeatureStage.EXPERIMENTAL, default_on=False
+    ),
     FeatureName.PROGRESSIVE_SSE_STREAMING: FeatureConfig(
         FeatureStage.EXPERIMENTAL, default_on=True
     ),

src/google/adk/flows/llm_flows/functions.py

@@ -22,7 +22,6 @@
 from concurrent.futures import ThreadPoolExecutor
 import contextvars
 import copy
-import functools
 import inspect
 import logging
 import threading
@@ -43,8 +42,8 @@
 from ...auth.auth_tool import AuthToolArguments
 from ...events.event import Event
 from ...events.event_actions import EventActions
+from ...telemetry import _instrumentation
 from ...telemetry.tracing import trace_merged_tool_calls
-from ...telemetry.tracing import trace_tool_call
 from ...telemetry.tracing import tracer
 from ...tools.base_tool import BaseTool
 from ...tools.tool_confirmation import ToolConfirmation
@@ -591,22 +590,11 @@ async def _run_with_trace():
     )
     return function_response_event
 
-  with tracer.start_as_current_span(f'execute_tool {tool.name}'):
-    function_response_event = None
-    caught_error = None
-    try:
-      function_response_event = await _run_with_trace()
-      return function_response_event
-    except Exception as e:
-      caught_error = e
-      raise
-    finally:
-      trace_tool_call(
-          tool=tool,
-          args=function_args,
-          function_response_event=function_response_event,
-          error=caught_error,
-      )
+  async with _instrumentation.record_tool_execution(
+      tool, agent, invocation_context, function_args
+  ) as tel_ctx:
+    tel_ctx.function_response_event = await _run_with_trace()
+    return tel_ctx.function_response_event
 
 
 async def handle_function_calls_live(
@@ -830,22 +818,11 @@ async def _run_with_trace():
     )
     return function_response_event
 
-  with tracer.start_as_current_span(f'execute_tool {tool.name}'):
-    function_response_event = None
-    caught_error = None
-    try:
-      function_response_event = await _run_with_trace()
-      return function_response_event
-    except Exception as e:
-      caught_error = e
-      raise
-    finally:
-      trace_tool_call(
-          tool=tool,
-          args=function_args,
-          function_response_event=function_response_event,
-          error=caught_error,
-      )
+  async with _instrumentation.record_tool_execution(
+      tool, agent, invocation_context, function_args
+  ) as tel_ctx:
+    tel_ctx.function_response_event = await _run_with_trace()
+    return tel_ctx.function_response_event
 
 
 async def _process_function_live_helper(

src/google/adk/plugins/bigquery_agent_analytics_plugin.py

@@ -1949,6 +1949,7 @@ def __init__(
       table_id: Optional[str] = None,
       config: Optional[BigQueryLoggerConfig] = None,
       location: str = "US",
+      credentials: Optional[google.auth.credentials.Credentials] = None,
       **kwargs,
   ) -> None:
     """Initializes the instance.
@@ -1959,6 +1960,8 @@ def __init__(
         table_id: BigQuery table ID (optional, overrides config).
         config: BigQueryLoggerConfig (optional).
         location: BigQuery location (default: "US").
+        credentials: Google Auth credentials (optional). If None, uses
+          Application Default Credentials.
         **kwargs: Additional configuration parameters for BigQueryLoggerConfig.
     """
     super().__init__(name="bigquery_agent_analytics")
@@ -1985,6 +1988,7 @@ def __init__(
     self._startup_error: Optional[Exception] = None
     self._is_shutting_down = False
     self._setup_lock = None
+    self._credentials = credentials
     self.client = None
     self._loop_state_by_loop: dict[asyncio.AbstractEventLoop, _LoopState] = {}
     self._write_stream_name = None  # Resolved stream name
@@ -2097,15 +2101,16 @@ async def _get_loop_state(self) -> _LoopState:
     # grpc.aio clients are loop-bound, so we create one per event loop.
 
     def get_credentials():
-      creds, project_id = google.auth.default(
+      creds, _ = google.auth.default(
           scopes=["https://www.googleapis.com/auth/cloud-platform"]
       )
-      return creds, project_id
+      return creds
 
-    creds, project_id = await loop.run_in_executor(
-        self._executor, get_credentials
-    )
-    quota_project_id = getattr(creds, "quota_project_id", None)
+    if self._credentials is None:
+      self._credentials = await loop.run_in_executor(
+          self._executor, get_credentials
+      )
+    quota_project_id = getattr(self._credentials, "quota_project_id", None)
     options = (
         client_options.ClientOptions(quota_project_id=quota_project_id)
         if quota_project_id
@@ -2119,7 +2124,7 @@ def get_credentials():
     client_info = gapic_client_info.ClientInfo(user_agent=" ".join(user_agents))
 
     write_client = BigQueryWriteAsyncClient(
-        credentials=creds,
+        credentials=self._credentials,
         client_info=client_info,
         client_options=options,
     )
@@ -2173,7 +2178,9 @@ async def _lazy_setup(self, **kwargs) -> None:
       self.client = await loop.run_in_executor(
           self._executor,
           lambda: bigquery.Client(
-              project=self.project_id, location=self.location
+              project=self.project_id,
+              location=self.location,
+              credentials=self._credentials,
           ),
       )
 
@@ -2193,7 +2200,9 @@ async def _lazy_setup(self, **kwargs) -> None:
             self.project_id,
             self.config.gcs_bucket_name,
             self._executor,
-            storage_client=kwargs.get("storage_client"),
+            storage_client=storage.Client(
+                project=self.project_id, credentials=self._credentials
+            ),
         )
 
       self.parser = HybridContentParser(

src/google/adk/sessions/vertex_ai_session_service.py

@@ -48,6 +48,12 @@
 _USAGE_METADATA_CUSTOM_METADATA_KEY = '_usage_metadata'
 
 
+def _quote_filter_literal(value: str) -> str:
+  """Quotes filter values so embedded metacharacters stay inside the literal."""
+  escaped_value = value.replace('\\', '\\\\').replace('"', '\\"')
+  return f'"{escaped_value}"'
+
+
 def _set_internal_custom_metadata(
     metadata_dict: dict[str, Any], *, key: str, value: dict[str, Any]
 ) -> None:
@@ -228,7 +234,7 @@ async def list_sessions(
       sessions = []
       config = {}
       if user_id is not None:
-        config['filter'] = f'user_id="{user_id}"'
+        config['filter'] = f'user_id={_quote_filter_literal(user_id)}'
       sessions_iterator = await api_client.agent_engines.sessions.list(
           name=f'reasoningEngines/{reasoning_engine_id}',
           config=config,