chore: Update headers

PiperOrigin-RevId: 908716648

Author: sararob

tests/unit/vertexai/genai/replays/conftest.py

@@ -265,10 +265,6 @@ def client(use_vertex, replays_prefix, http_options, request):
     if http_options.headers is None:
         http_options.headers = {}
 
-    tracking_label = f"{_GENAI_MODULES_TELEMETRY_HEADER}/{aip_version.__version__}"
-    http_options.headers["user-agent"] = tracking_label
-    http_options.headers["x-goog-api-client"] = tracking_label
-
     replay_client = _replay_api_client.ReplayApiClient(
         mode=mode,
         replay_id=replay_id,

vertexai/_genai/client.py

@@ -15,6 +15,7 @@
 
 import asyncio
 import importlib
+import sys
 from typing import Optional, Union, TYPE_CHECKING
 from types import TracebackType, ModuleType
 
@@ -23,6 +24,8 @@
 from google.genai import _common
 from google.genai import client as genai_client
 from google.genai import types
+from google.genai import _api_client as genai_api_client
+from google.genai import version as genai_version
 from . import live
 
 if TYPE_CHECKING:
@@ -41,6 +44,28 @@
 _GENAI_MODULES_TELEMETRY_HEADER = "vertex-genai-modules"
 
 
+def custom_append_library_version_headers(headers: dict[str, str]) -> None:
+    """Custom header injector for vertex-genai-modules."""
+    genai_sdk_version = genai_version.__version__
+    module_version = aip_version.__version__
+    python_version = sys.version.split()[0]
+
+    custom_header = f"google-genai-sdk/{genai_sdk_version}+{_GENAI_MODULES_TELEMETRY_HEADER}/{module_version} gl-python/{python_version}"
+
+    if 'user-agent' in headers and custom_header not in headers['user-agent']:
+        headers['user-agent'] = f"{custom_header} " + headers['user-agent']
+    elif 'user-agent' not in headers:
+        headers['user-agent'] = custom_header
+
+    if 'x-goog-api-client' in headers and custom_header not in headers['x-goog-api-client']:
+        headers['x-goog-api-client'] = f"{custom_header} " + headers['x-goog-api-client']
+    elif 'x-goog-api-client' not in headers:
+        headers['x-goog-api-client'] = custom_header
+
+# Apply the monkeypatch to override the base SDK behavior
+genai_api_client.append_library_version_headers = custom_append_library_version_headers
+
+
 class AsyncClient:
     """Async Gen AI Client for the Vertex SDK."""
 
@@ -208,22 +233,6 @@ def __init__(
         if http_options.headers is None:
             http_options.headers = {}
 
-        tracking_label = f"{_GENAI_MODULES_TELEMETRY_HEADER}/{aip_version.__version__}"
-
-        if "user-agent" in http_options.headers:
-            http_options.headers["user-agent"] = (
-                f"{http_options.headers['user-agent']} {tracking_label}"
-            )
-        else:
-            http_options.headers["user-agent"] = tracking_label
-
-        if "x-goog-api-client" in http_options.headers:
-            http_options.headers["x-goog-api-client"] = (
-                f"{http_options.headers['x-goog-api-client']} {tracking_label}"
-            )
-        else:
-            http_options.headers["x-goog-api-client"] = tracking_label
-
         self._api_client = genai_client.Client._get_api_client(
             vertexai=True,
             api_key=api_key,