chore: Update user-agent header

sararob · copybara-github · commit 4c8f5166b059 · 2026-04-08T08:59:55.000-07:00
PiperOrigin-RevId: 896025555
diff --git a/tests/unit/vertexai/genai/replays/conftest.py b/tests/unit/vertexai/genai/replays/conftest.py
@@ -23,6 +23,8 @@
     client as vertexai_genai_client_module,
 )
 from vertexai._genai import _agent_engines_utils
+from vertexai._genai.client import _GENAI_MODULES_TELEMETRY_HEADER
+from google.cloud.aiplatform import version as aip_version
 from google.cloud import storage, bigquery
 from google.genai import _replay_api_client
 from google.genai import types as genai_types
@@ -260,7 +262,10 @@ def client(use_vertex, replays_prefix, http_options, request):
         http_options = genai_types.HttpOptions()
     if http_options.headers is None:
         http_options.headers = {}
-    http_options.headers["x-goog-vertex-sdk"] = "true"
+
+    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,
diff --git a/vertexai/_genai/client.py b/vertexai/_genai/client.py
@@ -41,26 +41,29 @@
 
 _GENAI_MODULES_TELEMETRY_HEADER = "vertex-genai-modules"
 
-genai_append_method = _api_client.append_library_version_headers
+# genai_append_method = _api_client.append_library_version_headers
 
 
-def _add_tracking_headers(headers: dict[str, str]) -> None:
-    """Adds Vertex Gen AI tracking headers."""
-    is_vertex = headers.get(
-        "x-goog-vertex-sdk"
-    ) == "true" or "vertex-genai-modules" in headers.get("user-agent", "")
-    if is_vertex:
-        tracking_label = f"{_GENAI_MODULES_TELEMETRY_HEADER}/{aip_version.__version__}"
+# def _add_tracking_headers(headers: dict[str, str]) -> None:
+#     """Adds Vertex Gen AI tracking headers."""
+#     is_vertex = headers.get(
+#         "x-goog-vertex-sdk"
+#     ) == "true" or "vertex-genai-modules" in headers.get("user-agent", "")
+#     if is_vertex:
+#         tracking_label = (
+#             f"{_GENAI_MODULES_TELEMETRY_HEADER}/{aip_version.__version__} "
+#             f"gl-python/{aip_version.__version__}"
+#         )
 
-        headers["user-agent"] = tracking_label
-        headers["x-goog-api-client"] = tracking_label
+#         headers["user-agent"] = tracking_label
+#         headers["x-goog-api-client"] = tracking_label
 
-        headers.pop("x-goog-vertex-sdk", None)
-    else:
-        genai_append_method(headers)
+#         headers.pop("x-goog-vertex-sdk", None)
+#     else:
+#         genai_append_method(headers)
 
 
-_api_client.append_library_version_headers = _add_tracking_headers
+# _api_client.append_library_version_headers = _add_tracking_headers
 
 
 class AsyncClient:
@@ -229,7 +232,24 @@ def __init__(
             http_options = types.HttpOptions()
         if http_options.headers is None:
             http_options.headers = {}
-        http_options.headers["x-goog-vertex-sdk"] = "true"
+
+        tracking_label = (
+            f"{_GENAI_MODULES_TELEMETRY_HEADER}/{aip_version.__version__}"
+        )
+
+        if "user-agent" in http_options.headers:
+            http_options.headers["user-agent"] = (
+                f"{tracking_label} {http_options.headers['user-agent']}"
+            )
+        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"{tracking_label} {http_options.headers['x-goog-api-client']}"
+            )
+        else:
+            http_options.headers["x-goog-api-client"] = tracking_label
 
         self._api_client = genai_client.Client._get_api_client(
             vertexai=True,
