Fix app config telemetry (Azure#40360)

* Updating Endpoint + Remove Feature Id

* Update _azureappconfigurationprovider.py

Author: mrm9084

sdk/appconfiguration/azure-appconfiguration-provider/azure/appconfiguration/provider/_azureappconfigurationprovider.py

@@ -366,7 +366,11 @@ def refresh(self, **kwargs) -> None:  # pylint: disable=too-many-statements
                     if self._feature_flag_refresh_enabled:
                         need_ff_refresh, refresh_on_feature_flags, feature_flags, filters_used = (
                             client.refresh_feature_flags(
-                                self._refresh_on_feature_flags, self._feature_flag_selectors, headers=headers, **kwargs
+                                self._refresh_on_feature_flags,
+                                self._feature_flag_selectors,
+                                headers,
+                                self._origin_endpoint,
+                                **kwargs,
                             )
                         )
                         if refresh_on_feature_flags:
@@ -425,7 +429,11 @@ def _load_all(self, **kwargs):
                 configuration_settings_processed = self._process_configurations(configuration_settings)
                 if self._feature_flag_enabled:
                     feature_flags, feature_flag_sentinel_keys, used_filters = client.load_feature_flags(
-                        self._feature_flag_selectors, self._feature_flag_refresh_enabled, headers=headers, **kwargs
+                        self._feature_flag_selectors,
+                        self._feature_flag_refresh_enabled,
+                        self._origin_endpoint,
+                        headers=headers,
+                        **kwargs,
                     )
                     self._feature_filter_usage = used_filters
                     configuration_settings_processed[FEATURE_MANAGEMENT_KEY] = {}

sdk/appconfiguration/azure-appconfiguration-provider/azure/appconfiguration/provider/_client_manager.py

@@ -158,13 +158,20 @@ def load_configuration_settings(
 
     @distributed_trace
     def load_feature_flags(
-        self, feature_flag_selectors: List[SettingSelector], feature_flag_refresh_enabled: bool, **kwargs
-    ) -> Tuple[List[FeatureFlagConfigurationSetting], Dict[Tuple[str, str], str], Dict[str, bool]]:
+        self,
+        feature_flag_selectors: List[SettingSelector],
+        feature_flag_refresh_enabled: bool,
+        provided_endpoint: str,
+        **kwargs
+    ) -> Tuple[
+        List[FeatureFlagConfigurationSetting],
+        Dict[Tuple[str, str], str],
+        Dict[str, bool],
+    ]:
         feature_flag_sentinel_keys = {}
         loaded_feature_flags = []
         # Needs to be removed unknown keyword argument for list_configuration_settings
         kwargs.pop("sentinel_keys", None)
-        endpoint = self._client._impl._config.endpoint  # pylint: disable=protected-access
         filters_used: Dict[str, bool] = {}
         for select in feature_flag_selectors:
             feature_flags = self._client.list_configuration_settings(
@@ -178,7 +185,7 @@ def load_feature_flags(
 
                 feature_flag_value = json.loads(feature_flag.value)
 
-                self._feature_flag_telemetry(endpoint, feature_flag, feature_flag_value)
+                self._feature_flag_telemetry(provided_endpoint, feature_flag, feature_flag_value)
                 self._feature_flag_appconfig_telemetry(feature_flag, filters_used)
 
                 loaded_feature_flags.append(feature_flag_value)
@@ -228,6 +235,7 @@ def refresh_feature_flags(
         refresh_on: Mapping[Tuple[str, str], Optional[str]],
         feature_flag_selectors: List[SettingSelector],
         headers: Dict[str, str],
+        provided_endpoint: str,
         **kwargs
     ) -> Tuple[bool, Optional[Mapping[Tuple[str, str], Optional[str]]], Optional[List[Any]], Dict[str, bool]]:
         """
@@ -236,6 +244,7 @@ def refresh_feature_flags(
         :param Mapping[Tuple[str, str], Optional[str]] refresh_on: The feature flags to check for changes
         :param List[SettingSelector] feature_flag_selectors: The selectors to use to load feature flags
         :param Mapping[str, str] headers: The headers to use for the request
+        :param str provided_endpoint: The endpoint provided by the user
 
         :return: A tuple with the first item being true/false if a change is detected. The second item is the updated
         value of the feature flag sentinel keys. The third item is the updated feature flags.
@@ -246,7 +255,7 @@ def refresh_feature_flags(
             changed = self._check_configuration_setting(key=key, label=label, etag=etag, headers=headers, **kwargs)
             if changed:
                 feature_flags, feature_flag_sentinel_keys, filters_used = self.load_feature_flags(
-                    feature_flag_selectors, True, headers=headers, **kwargs
+                    feature_flag_selectors, True, provided_endpoint, headers=headers, **kwargs
                 )
                 return True, feature_flag_sentinel_keys, feature_flags, filters_used
         return False, None, None, {}

sdk/appconfiguration/azure-appconfiguration-provider/azure/appconfiguration/provider/_client_manager_base.py

@@ -4,8 +4,6 @@
 # license information.
 # -------------------------------------------------------------------------
 import random
-import hashlib
-import base64
 from dataclasses import dataclass
 from typing import Dict, Mapping, Any, Optional
 from azure.appconfiguration import (  # type:ignore # pylint:disable=no-name-in-module
@@ -23,7 +21,6 @@
     METADATA_KEY,
     ETAG_KEY,
     FEATURE_FLAG_REFERENCE_KEY,
-    FEATURE_FLAG_ID_KEY,
 )
 
 FALLBACK_CLIENT_REFRESH_EXPIRED_INTERVAL = 3600  # 1 hour in seconds
@@ -36,15 +33,6 @@
 class _ConfigurationClientWrapperBase:
     endpoint: str
 
-    @staticmethod
-    def _calculate_feature_id(key, label):
-        basic_value = f"{key}\n"
-        if label and not label.isspace():
-            basic_value += f"{label}"
-        feature_flag_id_hash_bytes = hashlib.sha256(basic_value.encode()).digest()
-        encoded_flag = base64.urlsafe_b64encode(feature_flag_id_hash_bytes)
-        return encoded_flag[: encoded_flag.find(b"=")]
-
     def _feature_flag_telemetry(
         self, endpoint: str, feature_flag: FeatureFlagConfigurationSetting, feature_flag_value: Dict
     ):
@@ -60,9 +48,6 @@ def _feature_flag_telemetry(
                 feature_flag_reference += f"?label={feature_flag.label}"
             if feature_flag_value[TELEMETRY_KEY].get("enabled"):
                 feature_flag_value[TELEMETRY_KEY][METADATA_KEY][FEATURE_FLAG_REFERENCE_KEY] = feature_flag_reference
-                feature_flag_value[TELEMETRY_KEY][METADATA_KEY][FEATURE_FLAG_ID_KEY] = self._calculate_feature_id(
-                    feature_flag.key, feature_flag.label
-                )
 
     def _feature_flag_appconfig_telemetry(
         self, feature_flag: FeatureFlagConfigurationSetting, filters_used: Dict[str, bool]

sdk/appconfiguration/azure-appconfiguration-provider/azure/appconfiguration/provider/_constants.py

@@ -22,7 +22,6 @@
 
 ETAG_KEY = "ETag"
 FEATURE_FLAG_REFERENCE_KEY = "FeatureFlagReference"
-FEATURE_FLAG_ID_KEY = "FeatureFlagId"
 
 PERCENTAGE_FILTER_NAMES = ["Percentage", "PercentageFilter", "Microsoft.Percentage", "Microsoft.PercentageFilter"]
 TIME_WINDOW_FILTER_NAMES = ["TimeWindow", "TimeWindowFilter", "Microsoft.TimeWindow", "Microsoft.TimeWindowFilter"]

sdk/appconfiguration/azure-appconfiguration-provider/azure/appconfiguration/provider/aio/_async_client_manager.py

@@ -160,13 +160,20 @@ async def load_configuration_settings(
 
     @distributed_trace
     async def load_feature_flags(
-        self, feature_flag_selectors: List[SettingSelector], feature_flag_refresh_enabled: bool, **kwargs
-    ) -> Tuple[List[FeatureFlagConfigurationSetting], Dict[Tuple[str, str], str], Dict[str, bool]]:
+        self,
+        feature_flag_selectors: List[SettingSelector],
+        feature_flag_refresh_enabled: bool,
+        provided_endpoint: str,
+        **kwargs
+    ) -> Tuple[
+        List[FeatureFlagConfigurationSetting],
+        Dict[Tuple[str, str], str],
+        Dict[str, bool],
+    ]:
         feature_flag_sentinel_keys = {}
         loaded_feature_flags = []
         # Needs to be removed unknown keyword argument for list_configuration_settings
         kwargs.pop("sentinel_keys", None)
-        endpoint = self._client._impl._config.endpoint  # pylint: disable=protected-access
         filters_used: Dict[str, bool] = {}
         for select in feature_flag_selectors:
             feature_flags = self._client.list_configuration_settings(
@@ -180,7 +187,7 @@ async def load_feature_flags(
 
                 feature_flag_value = json.loads(feature_flag.value)
 
-                self._feature_flag_telemetry(endpoint, feature_flag, feature_flag_value)
+                self._feature_flag_telemetry(provided_endpoint, feature_flag, feature_flag_value)
                 self._feature_flag_appconfig_telemetry(feature_flag, filters_used)
 
                 loaded_feature_flags.append(feature_flag_value)
@@ -232,6 +239,7 @@ async def refresh_feature_flags(
         refresh_on: Mapping[Tuple[str, str], Optional[str]],
         feature_flag_selectors: List[SettingSelector],
         headers: Dict[str, str],
+        provided_endpoint: str,
         **kwargs
     ) -> Tuple[bool, Optional[Mapping[Tuple[str, str], Optional[str]]], Optional[List[Any]], Dict[str, bool]]:
         """
@@ -240,6 +248,7 @@ async def refresh_feature_flags(
         :param Mapping[Tuple[str, str], Optional[str]] refresh_on: The feature flags to check for changes
         :param List[SettingSelector] feature_flag_selectors: The selectors to use to load feature flags
         :param Mapping[str, str] headers: The headers to use for the request
+        :param str provided_endpoint: The endpoint provided by the user
 
         :return: A tuple with the first item being true/false if a change is detected. The second item is the updated
         value of the feature flag sentinel keys. The third item is the updated feature flags.
@@ -252,7 +261,7 @@ async def refresh_feature_flags(
             )
             if changed:
                 feature_flags, feature_flag_sentinel_keys, filters_used = await self.load_feature_flags(
-                    feature_flag_selectors, True, headers=headers, **kwargs
+                    feature_flag_selectors, True, provided_endpoint, headers=headers, **kwargs
                 )
                 return True, feature_flag_sentinel_keys, feature_flags, filters_used
         return False, None, None, {}

sdk/appconfiguration/azure-appconfiguration-provider/azure/appconfiguration/provider/aio/_azureappconfigurationproviderasync.py

@@ -383,7 +383,11 @@ async def refresh(self, **kwargs) -> None:  # pylint: disable=too-many-statement
                     if self._feature_flag_refresh_enabled:
                         need_ff_refresh, refresh_on_feature_flags, feature_flags, filters_used = (
                             await client.refresh_feature_flags(
-                                self._refresh_on_feature_flags, self._feature_flag_selectors, headers=headers, **kwargs
+                                self._refresh_on_feature_flags,
+                                self._feature_flag_selectors,
+                                headers,
+                                self._origin_endpoint,
+                                **kwargs,
                             )
                         )
                         if refresh_on_feature_flags:
@@ -442,7 +446,11 @@ async def _load_all(self, **kwargs):
                 configuration_settings_processed = await self._process_configurations(configuration_settings)
                 if self._feature_flag_enabled:
                     feature_flags, feature_flag_sentinel_keys, used_filters = await client.load_feature_flags(
-                        self._feature_flag_selectors, self._feature_flag_refresh_enabled, headers=headers, **kwargs
+                        self._feature_flag_selectors,
+                        self._feature_flag_refresh_enabled,
+                        self._origin_endpoint,
+                        headers=headers,
+                        **kwargs,
                     )
                     self._feature_filter_usage = used_filters
                     configuration_settings_processed[FEATURE_MANAGEMENT_KEY] = {}