feat: client identification headers (#342)

Tymek · web-flow · commit 67997880eadb · 2025-01-29T15:35:54.000+01:00
diff --git a/UnleashClient/__init__.py b/UnleashClient/__init__.py
@@ -21,6 +21,8 @@
     METRIC_LAST_SENT_TIME,
     REQUEST_RETRIES,
     REQUEST_TIMEOUT,
+    SDK_NAME,
+    SDK_VERSION,
 )
 from UnleashClient.events import UnleashEvent, UnleashEventType
 from UnleashClient.loader import load_features
@@ -211,12 +213,19 @@ def initialize_client(self, fetch_toggles: bool = True) -> None:
         if not self.is_initialized:
             # pylint: disable=no-else-raise
             try:
+                headers = {
+                    **self.unleash_custom_headers,
+                    "x-unleash-connection-id": str(uuid.uuid4()),
+                    "x-unleash-appname": self.unleash_app_name,
+                    "x-unleash-sdk": f"{SDK_NAME}:{SDK_VERSION}",
+                }
+
                 # Setup
                 metrics_args = {
                     "url": self.unleash_url,
                     "app_name": self.unleash_app_name,
                     "instance_id": self.unleash_instance_id,
-                    "custom_headers": self.unleash_custom_headers,
+                    "headers": headers,
                     "custom_options": self.unleash_custom_options,
                     "request_timeout": self.unleash_request_timeout,
                     "engine": self.engine,
@@ -229,7 +238,7 @@ def initialize_client(self, fetch_toggles: bool = True) -> None:
                         self.unleash_app_name,
                         self.unleash_instance_id,
                         self.unleash_metrics_interval,
-                        self.unleash_custom_headers,
+                        headers,
                         self.unleash_custom_options,
                         self.strategy_mapping,
                         self.unleash_request_timeout,
@@ -240,7 +249,7 @@ def initialize_client(self, fetch_toggles: bool = True) -> None:
                         "url": self.unleash_url,
                         "app_name": self.unleash_app_name,
                         "instance_id": self.unleash_instance_id,
-                        "custom_headers": self.unleash_custom_headers,
+                        "headers": headers,
                         "custom_options": self.unleash_custom_options,
                         "cache": self.cache,
                         "engine": self.engine,
diff --git a/UnleashClient/api/features.py b/UnleashClient/api/features.py
@@ -13,7 +13,7 @@ def get_feature_toggles(
     url: str,
     app_name: str,
     instance_id: str,
-    custom_headers: dict,
+    headers: dict,
     custom_options: dict,
     request_timeout: int,
     request_retries: int,
@@ -30,7 +30,7 @@ def get_feature_toggles(
     :param url:
     :param app_name:
     :param instance_id:
-    :param custom_headers:
+    :param headers:
     :param custom_options:
     :param request_timeout:
     :param request_retries:
@@ -41,10 +41,13 @@ def get_feature_toggles(
     try:
         LOGGER.info("Getting feature flag.")
 
-        headers = {"UNLEASH-APPNAME": app_name, "UNLEASH-INSTANCEID": instance_id}
+        request_specific_headers = {
+            "UNLEASH-APPNAME": app_name,
+            "UNLEASH-INSTANCEID": instance_id,
+        }
 
         if cached_etag:
-            headers["If-None-Match"] = cached_etag
+            request_specific_headers["If-None-Match"] = cached_etag
 
         base_url = f"{url}{FEATURES_URL}"
         base_params = {}
@@ -60,7 +63,7 @@ def get_feature_toggles(
             session.mount("http://", adapter)
             resp = session.get(
                 base_url,
-                headers={**custom_headers, **headers},
+                headers={**headers, **request_specific_headers},
                 params=base_params,
                 timeout=request_timeout,
                 **custom_options,
diff --git a/UnleashClient/api/metrics.py b/UnleashClient/api/metrics.py
@@ -10,7 +10,7 @@
 def send_metrics(
     url: str,
     request_body: dict,
-    custom_headers: dict,
+    headers: dict,
     custom_options: dict,
     request_timeout: int,
 ) -> bool:
@@ -22,7 +22,7 @@ def send_metrics(
 
     :param url:
     :param request_body:
-    :param custom_headers:
+    :param headers:
     :param custom_options:
     :param request_timeout:
     :return: true if registration successful, false if registration unsuccessful or exception.
@@ -34,7 +34,7 @@ def send_metrics(
         resp = requests.post(
             url + METRICS_URL,
             data=json.dumps(request_body),
-            headers={**custom_headers, **APPLICATION_HEADERS},
+            headers={**headers, **APPLICATION_HEADERS},
             timeout=request_timeout,
             **custom_options,
         )
diff --git a/UnleashClient/api/register.py b/UnleashClient/api/register.py
@@ -22,7 +22,7 @@ def register_client(
     app_name: str,
     instance_id: str,
     metrics_interval: int,
-    custom_headers: dict,
+    headers: dict,
     custom_options: dict,
     supported_strategies: dict,
     request_timeout: int,
@@ -38,7 +38,7 @@ def register_client(
     :param app_name:
     :param instance_id:
     :param metrics_interval:
-    :param custom_headers:
+    :param headers:
     :param custom_options:
     :param supported_strategies:
     :param request_timeout:
@@ -64,7 +64,7 @@ def register_client(
         resp = requests.post(
             url + REGISTER_URL,
             data=json.dumps(registration_request),
-            headers={**custom_headers, **APPLICATION_HEADERS},
+            headers={**headers, **APPLICATION_HEADERS},
             timeout=request_timeout,
             **custom_options,
         )
diff --git a/UnleashClient/periodic_tasks/fetch_and_load.py b/UnleashClient/periodic_tasks/fetch_and_load.py
@@ -13,7 +13,7 @@ def fetch_and_load_features(
     url: str,
     app_name: str,
     instance_id: str,
-    custom_headers: dict,
+    headers: dict,
     custom_options: dict,
     cache: BaseCache,
     request_timeout: int,
@@ -25,7 +25,7 @@ def fetch_and_load_features(
         url,
         app_name,
         instance_id,
-        custom_headers,
+        headers,
         custom_options,
         request_timeout,
         request_retries,
diff --git a/UnleashClient/periodic_tasks/send_metrics.py b/UnleashClient/periodic_tasks/send_metrics.py
@@ -12,7 +12,7 @@ def aggregate_and_send_metrics(
     url: str,
     app_name: str,
     instance_id: str,
-    custom_headers: dict,
+    headers: dict,
     custom_options: dict,
     request_timeout: int,
     engine: UnleashEngine,
@@ -30,8 +30,6 @@ def aggregate_and_send_metrics(
     }
 
     if metrics_bucket:
-        send_metrics(
-            url, metrics_request, custom_headers, custom_options, request_timeout
-        )
+        send_metrics(url, metrics_request, headers, custom_options, request_timeout)
     else:
         LOGGER.debug("No feature flags with metrics, skipping metrics submission.")
diff --git a/tests/unit_tests/test_client.py b/tests/unit_tests/test_client.py
@@ -1032,3 +1032,49 @@ def test_is_enabled_works_with_properties_field_in_the_context_root():
 
     context = {"myContext": "1234"}
     assert unleash_client.is_enabled("customContextToggle", context)
+
+
+@responses.activate
+def test_identification_headers_sent_and_consistent(unleash_client):
+    responses.add(responses.POST, URL + REGISTER_URL, json={}, status=202)
+    responses.add(
+        responses.GET, URL + FEATURES_URL, json=MOCK_FEATURE_RESPONSE, status=200
+    )
+    responses.add(responses.POST, URL + METRICS_URL, json={}, status=202)
+    unleash_client.initialize_client()
+
+    connection_id = responses.calls[0].request.headers["X-UNLEASH-CONNECTION-ID"]
+    app_name = responses.calls[0].request.headers["X-UNLEASH-APPNAME"]
+    sdk = responses.calls[0].request.headers["X-UNLEASH-SDK"]
+
+    for api_call in responses.calls:
+        assert api_call.request.headers["X-UNLEASH-CONNECTION-ID"] == connection_id
+        assert api_call.request.headers["X-UNLEASH-APPNAME"] == app_name
+        assert api_call.request.headers["X-UNLEASH-SDK"] == sdk
+
+
+@responses.activate
+def test_identification_headers_unique_connection_id():
+    responses.add(responses.POST, URL + REGISTER_URL, json={}, status=202)
+    responses.add(
+        responses.GET, URL + FEATURES_URL, json=MOCK_FEATURE_RESPONSE, status=200
+    )
+    responses.add(responses.POST, URL + METRICS_URL, json={}, status=202)
+
+    unleash_client = UnleashClient(
+        URL, APP_NAME, disable_metrics=True, disable_registration=True
+    )
+    unleash_client.initialize_client()
+    connection_id_first_client = responses.calls[0].request.headers[
+        "X-UNLEASH-CONNECTION-ID"
+    ]
+
+    other_unleash_client = UnleashClient(
+        URL, APP_NAME, disable_metrics=True, disable_registration=True
+    )
+    other_unleash_client.initialize_client()
+
+    connection_id_second_client = responses.calls[1].request.headers[
+        "X-UNLEASH-CONNECTION-ID"
+    ]
+    assert connection_id_first_client != connection_id_second_client
