feat: Add "google-adk" user agent to Parameter Manager and Secret Manager clients

Update unit tests to verify the presence and value of the client_info argument during client initialization.

PiperOrigin-RevId: 900448054

Author: google-genai-bot

src/google/adk/integrations/parameter_manager/parameter_client.py

@@ -18,12 +18,17 @@
 from typing import cast
 from typing import Optional
 
+from google.api_core.gapic_v1 import client_info
 import google.auth
 from google.auth import default as default_service_credential
 import google.auth.transport.requests
 from google.cloud import parametermanager_v1
 from google.oauth2 import service_account
 
+from ... import version
+
+USER_AGENT = f"google-adk/{version.__version__}"
+
 
 class ParameterManagerClient:
   """A client for interacting with Google Cloud Parameter Manager.
@@ -112,7 +117,9 @@ def __init__(
       }
 
     self._client = parametermanager_v1.ParameterManagerClient(
-        credentials=self._credentials, client_options=client_options
+        credentials=self._credentials,
+        client_options=client_options,
+        client_info=client_info.ClientInfo(user_agent=USER_AGENT),
     )
 
   def get_parameter(self, resource_name: str) -> str:

src/google/adk/integrations/secret_manager/secret_client.py

@@ -18,12 +18,17 @@
 from typing import cast
 from typing import Optional
 
+from google.api_core.gapic_v1 import client_info
 import google.auth
 from google.auth import default as default_service_credential
 import google.auth.transport.requests
 from google.cloud import secretmanager
 from google.oauth2 import service_account
 
+from ... import version
+
+USER_AGENT = f"google-adk/{version.__version__}"
+
 
 class SecretManagerClient:
   """A client for interacting with Google Cloud Secret Manager.
@@ -103,7 +108,9 @@ def __init__(
       }
 
     self._client = secretmanager.SecretManagerServiceClient(
-        credentials=self._credentials, client_options=client_options
+        credentials=self._credentials,
+        client_options=client_options,
+        client_info=client_info.ClientInfo(user_agent=USER_AGENT),
     )
 
   def get_secret(self, resource_name: str) -> str:

tests/unittests/integrations/parameter_manager/test_parameter_client.py

@@ -19,6 +19,8 @@
 from unittest.mock import patch
 
 from google.adk.integrations.parameter_manager.parameter_client import ParameterManagerClient
+from google.adk.integrations.parameter_manager.parameter_client import USER_AGENT
+from google.api_core.gapic_v1 import client_info
 import pytest
 
 
@@ -47,9 +49,11 @@ def test_init_with_default_credentials(
     mock_default_service_credential.assert_called_once_with(
         scopes=["https://www.googleapis.com/auth/cloud-platform"]
     )
-    mock_pm_client_class.assert_called_once_with(
-        credentials=mock_credentials, client_options=None
-    )
+    mock_pm_client_class.assert_called_once()
+    call_kwargs = mock_pm_client_class.call_args.kwargs
+    assert call_kwargs["credentials"] == mock_credentials
+    assert call_kwargs["client_options"] is None
+    assert call_kwargs["client_info"].user_agent == USER_AGENT
     assert client._credentials == mock_credentials
     assert client._client == mock_pm_client_class.return_value
 
@@ -77,9 +81,11 @@ def test_init_with_service_account_json(
     mock_from_service_account_info.assert_called_once_with(
         json.loads(service_account_json)
     )
-    mock_pm_client_class.assert_called_once_with(
-        credentials=mock_credentials, client_options=None
-    )
+    mock_pm_client_class.assert_called_once()
+    call_kwargs = mock_pm_client_class.call_args.kwargs
+    assert call_kwargs["credentials"] == mock_credentials
+    assert call_kwargs["client_options"] is None
+    assert call_kwargs["client_info"].user_agent == USER_AGENT
     assert client._credentials == mock_credentials
     assert client._client == mock_pm_client_class.return_value
 
@@ -101,9 +107,11 @@ def test_init_with_auth_token(self, mock_pm_client_class):
 
       # Verify
       mock_credentials.refresh.assert_called_once()
-      mock_pm_client_class.assert_called_once_with(
-          credentials=mock_credentials, client_options=None
-      )
+      mock_pm_client_class.assert_called_once()
+      call_kwargs = mock_pm_client_class.call_args.kwargs
+      assert call_kwargs["credentials"] == mock_credentials
+      assert call_kwargs["client_options"] is None
+      assert call_kwargs["client_info"].user_agent == USER_AGENT
       assert client._credentials == mock_credentials
       assert client._client == mock_pm_client_class.return_value
 
@@ -127,12 +135,13 @@ def test_init_with_location(
     ParameterManagerClient(location=location)
 
     # Verify
-    mock_pm_client_class.assert_called_once_with(
-        credentials=mock_credentials,
-        client_options={
-            "api_endpoint": f"parametermanager.{location}.rep.googleapis.com"
-        },
-    )
+    mock_pm_client_class.assert_called_once()
+    call_kwargs = mock_pm_client_class.call_args.kwargs
+    assert call_kwargs["credentials"] == mock_credentials
+    assert call_kwargs["client_options"] == {
+        "api_endpoint": f"parametermanager.{location}.rep.googleapis.com"
+    }
+    assert call_kwargs["client_info"].user_agent == USER_AGENT
 
   @patch(
       "google.adk.integrations.parameter_manager.parameter_client.default_service_credential"

tests/unittests/integrations/secret_manager/test_secret_client.py

@@ -19,6 +19,8 @@
 from unittest.mock import patch
 
 from google.adk.integrations.secret_manager.secret_client import SecretManagerClient
+from google.adk.integrations.secret_manager.secret_client import USER_AGENT
+from google.api_core.gapic_v1 import client_info
 import pytest
 
 import google
@@ -49,9 +51,11 @@ def test_init_with_default_credentials(
     mock_default_service_credential.assert_called_once_with(
         scopes=["https://www.googleapis.com/auth/cloud-platform"]
     )
-    mock_secret_manager_client.assert_called_once_with(
-        credentials=mock_credentials, client_options=None
-    )
+    mock_secret_manager_client.assert_called_once()
+    call_kwargs = mock_secret_manager_client.call_args.kwargs
+    assert call_kwargs["credentials"] == mock_credentials
+    assert call_kwargs["client_options"] is None
+    assert call_kwargs["client_info"].user_agent == USER_AGENT
     assert client._credentials == mock_credentials
     assert client._client == mock_secret_manager_client.return_value
 
@@ -79,9 +83,11 @@ def test_init_with_service_account_json(
     mock_from_service_account_info.assert_called_once_with(
         json.loads(service_account_json)
     )
-    mock_secret_manager_client.assert_called_once_with(
-        credentials=mock_credentials, client_options=None
-    )
+    mock_secret_manager_client.assert_called_once()
+    call_kwargs = mock_secret_manager_client.call_args.kwargs
+    assert call_kwargs["credentials"] == mock_credentials
+    assert call_kwargs["client_options"] is None
+    assert call_kwargs["client_info"].user_agent == USER_AGENT
     assert client._credentials == mock_credentials
     assert client._client == mock_secret_manager_client.return_value
 
@@ -105,9 +111,11 @@ def test_init_with_auth_token(self, mock_secret_manager_client):
 
       # Verify
       mock_credentials.refresh.assert_called_once()
-      mock_secret_manager_client.assert_called_once_with(
-          credentials=mock_credentials, client_options=None
-      )
+      mock_secret_manager_client.assert_called_once()
+      call_kwargs = mock_secret_manager_client.call_args.kwargs
+      assert call_kwargs["credentials"] == mock_credentials
+      assert call_kwargs["client_options"] is None
+      assert call_kwargs["client_info"].user_agent == USER_AGENT
       assert client._credentials == mock_credentials
       assert client._client == mock_secret_manager_client.return_value
 
@@ -131,12 +139,13 @@ def test_init_with_location(
     SecretManagerClient(location=location)
 
     # Verify
-    mock_secret_manager_client.assert_called_once_with(
-        credentials=mock_credentials,
-        client_options={
-            "api_endpoint": f"secretmanager.{location}.rep.googleapis.com"
-        },
-    )
+    mock_secret_manager_client.assert_called_once()
+    call_kwargs = mock_secret_manager_client.call_args.kwargs
+    assert call_kwargs["credentials"] == mock_credentials
+    assert call_kwargs["client_options"] == {
+        "api_endpoint": f"secretmanager.{location}.rep.googleapis.com"
+    }
+    assert call_kwargs["client_info"].user_agent == USER_AGENT
 
   @patch(
       "google.adk.integrations.secret_manager.secret_client.default_service_credential"