Merge remote-tracking branch 'origin/main' into feat/openapi-tool-httpx-client-factory

Author: darshil3011

.github/workflows/check-file-contents.yml

@@ -111,7 +111,7 @@ jobs:
             # 1. Identify files containing any googleapis.com URL.
             set +e
             FILES_WITH_ENDPOINTS=$(grep -lE 'https?://[a-zA-Z0-9.-]+\.googleapis\.com' $CHANGED_FILES)
-            
+
             # 2. From those, identify files that are MISSING the required mTLS version.
             if [ -n "$FILES_WITH_ENDPOINTS" ]; then
               FILES_MISSING_MTLS=$(grep -L '.mtls.googleapis.com' $FILES_WITH_ENDPOINTS)

contributing/samples/integrations/data_agent/agent.py

@@ -79,6 +79,7 @@
     ],
 )
 
+
 # NOTE: The generate_chart tool requires 'altair' and 'vl-convert-python' to be
 # installed in your environment. You can install them using:
 # pip install altair vl-convert-python

src/google/adk/cli/utils/evals.py

@@ -15,7 +15,8 @@
 from __future__ import annotations
 
 import os
-from typing import Any, TYPE_CHECKING
+from typing import Any
+from typing import TYPE_CHECKING
 
 from pydantic import alias_generators
 from pydantic import BaseModel
@@ -77,9 +78,9 @@ def create_gcs_eval_managers_from_uri(
       from ...evaluation.gcs_eval_sets_manager import GcsEvalSetsManager
     except ImportError as e:
       raise RuntimeError(
-          'GCS evaluation managers require Google Cloud optional dependencies.\n'
-          'Please install them using: pip install google-adk[gcp]\n'
-          'Or: pip install google-cloud-storage>=2.18'
+          'GCS evaluation managers require Google Cloud optional'
+          ' dependencies.\nPlease install them using: pip install'
+          ' google-adk[gcp]\nOr: pip install google-cloud-storage>=2.18'
       ) from e
 
     gcs_bucket = eval_storage_uri.split('://')[1]

src/google/adk/skills/_utils.py

@@ -411,7 +411,8 @@ def _list_skills_in_gcs_dir(
   except ImportError as e:
     raise ImportError(
         "google-cloud-storage is required to list skills in GCS. Install it"
-        " with `pip install google-cloud-storage` or `pip install google-adk[gcp]`."
+        " with `pip install google-cloud-storage` or `pip install"
+        " google-adk[gcp]`."
     ) from e
 
   client = storage.Client(project=project_id, credentials=credentials)
@@ -478,7 +479,8 @@ def _load_skill_from_gcs_dir(
   except ImportError as e:
     raise ImportError(
         "google-cloud-storage is required to load skills from GCS. Install it"
-        " with `pip install google-cloud-storage` or `pip install google-adk[gcp]`."
+        " with `pip install google-cloud-storage` or `pip install"
+        " google-adk[gcp]`."
     ) from e
 
   client = storage.Client(project=project_id, credentials=credentials)

src/google/adk/telemetry/_instrumentation.py

@@ -114,8 +114,8 @@ async def record_agent_invocation(
     _record_agent_metrics(
         agent.name,
         elapsed_ms,
-        ctx.user_content,
-        ctx.session.events,
+        getattr(ctx, "user_content", None),
+        getattr(getattr(ctx, "session", None), "events", []),
         caught_error,
     )
 

tests/unittests/skills/test__utils.py

@@ -393,5 +393,3 @@ def mock_import(name, globals=None, locals=None, fromlist=(), level=0):
   with mock.patch("builtins.__import__", mock_import):
     with pytest.raises(ImportError, match="google-cloud-storage is required"):
       _load_skill_from_gcs_dir("my-bucket", "skills/my-skill/")
-
-

tests/unittests/telemetry/test_instrumentation.py

@@ -19,6 +19,7 @@
 
 from google.adk.telemetry import _instrumentation
 from opentelemetry import trace
+import pytest
 
 
 def test_get_elapsed_ms_span_none():
@@ -80,3 +81,37 @@ def test_get_elapsed_ms_span_non_int_end():
   with mock.patch("time.monotonic", return_value=12.0):
     elapsed = _instrumentation._get_elapsed_ms(mock_span, start_time)
   assert elapsed == 2000.0
+
+
+@pytest.mark.asyncio
+async def test_record_agent_invocation_tolerates_minimal_context():
+  """Tolerates context-likes that lack user_content or session.
+
+  Test doubles, partial migrations, and external embedders can pass an
+  InvocationContext-like object without `user_content` or with a `session`
+  that has no `events` attribute. The telemetry path must not raise
+  AttributeError on the metrics call in those cases.
+  """
+  agent = mock.MagicMock()
+  agent.name = "test_agent"
+  # Bare object without `user_content` and without `session`.
+  bare_ctx = object()
+
+  with (
+      mock.patch.object(
+          _instrumentation, "_record_agent_metrics"
+      ) as mock_record,
+      mock.patch.object(_instrumentation, "tracing") as mock_tracing,
+  ):
+    mock_tracing.tracer.start_as_current_span.return_value.__enter__.return_value = mock.MagicMock(
+        spec=trace.Span
+    )
+    async with _instrumentation.record_agent_invocation(bare_ctx, agent):
+      pass
+
+  mock_record.assert_called_once()
+  call_args = mock_record.call_args
+  # positional: (agent_name, elapsed_ms, user_content, events, caught_error)
+  assert call_args.args[0] == "test_agent"
+  assert call_args.args[2] is None  # user_content default
+  assert call_args.args[3] == []  # events default