Merge branch 'main' into feature/exp-telemetry

Author: mrm9084

CHANGELOG.md

@@ -1,32 +1,3 @@
 # Release History
 
-## 2.0.0b3 (11/14/2024)
-
-* Fixes a bug where no allocation reason is set if a user is allocated to exactly 100.
-* Fixes a bug where VariantAssignmentPercentage wasn't correct for default when enabled.
-
-## 2.0.0b2 (10/11/2024)
-
-* Adds VariantAssignmentPercentage, DefaultWhenEnabled, and AllocationId to telemetry.
-* Allocation seed value is now None by default, and only defaults to `allocation\n<feature.id>` when assigning variants.
-
-## 2.0.0b1 (09/10/2024)
-
-* Adds support for Feature Variants.
-* Adds support for Telemetry.
-
-## 1.0.0 (06/26/2024)
-
-Updated version to 1.0.0.
-
-## 1.0.0b1 (05/22/2024)
-
-New Feature Management library.
-
-Provides the ability to manage feature flags in a project. Enables:
-
-* Loading of feature flags from a file, see: https://github.com/Azure/AppConfiguration/blob/main/docs/FeatureManagement/FeatureManagement.v2.0.0.schema.json
-* Loading of feature flags from Azure App Configuration.
-* Checking if a feature is enabled.
-* Default feature filters: TimeWindowFilter, TargetingFilter.
-* Custom feature filters.
+See [Release Notes](https://github.com/Azure/AppConfiguration/blob/main/releaseNotes/PythonFeatureManagement.md) for the full release history.

featuremanagement/_version.py

@@ -4,4 +4,4 @@
 # license information.
 # -------------------------------------------------------------------------
 
-VERSION = "2.0.0b3"
+VERSION = "2.0.0"

featuremanagement/azuremonitor/_send_telemetry.py

@@ -39,7 +39,7 @@
 
 EVENT_NAME = "FeatureEvaluation"
 
-EVALUATION_EVENT_VERSION = "1.1.0"
+EVALUATION_EVENT_VERSION = "1.0.0"
 
 
 def track_event(event_name: str, user: str, event_properties: Optional[Dict[str, Optional[str]]] = None) -> None:

pyproject.toml

@@ -19,7 +19,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "FeatureManagement"
-version = "2.0.0b3"
+version = "2.0.0"
 authors = [
   { name="Microsoft Corporation", email="appconfig@microsoft.com" },
 ]

tests/test_send_telemetry_appinsights.py

@@ -26,7 +26,6 @@ def test_send_telemetry_appinsights(self):
                         "ETag": "cmwBRcIAq1jUyKL3Kj8bvf9jtxBrFg-R-ayExStMC90",
                         "FeatureFlagReference": "fake-store-uri/kv/.appconfig.featureflag/TestFeature",
                         "FeatureFlagId": "fake-feature-flag-id",
-                        "AllocationId": "fake-allocation-id",
                     },
                 },
             }
@@ -50,16 +49,12 @@ def test_send_telemetry_appinsights(self):
             assert mock_track_event.call_args[0][1]["Enabled"] == "True"
             assert mock_track_event.call_args[0][1]["TargetingId"] == "test_user"
             assert mock_track_event.call_args[0][1]["Variant"] == "TestVariant"
-            assert mock_track_event.call_args[0][1]["VariantAssignmentReason"] == "DefaultWhenDisabled"
-            assert "VariantAssignmentPercentage" not in mock_track_event.call_args[0][1]
             assert mock_track_event.call_args[0][1]["ETag"] == "cmwBRcIAq1jUyKL3Kj8bvf9jtxBrFg-R-ayExStMC90"
             assert (
                 mock_track_event.call_args[0][1]["FeatureFlagReference"]
                 == "fake-store-uri/kv/.appconfig.featureflag/TestFeature"
             )
             assert mock_track_event.call_args[0][1]["FeatureFlagId"] == "fake-feature-flag-id"
-            assert mock_track_event.call_args[0][1]["AllocationId"] == "fake-allocation-id"
-            assert "DefaultWhenEnabled" not in mock_track_event.call_args[0][1]
 
     def test_send_telemetry_appinsights_no_user(self):
         feature_flag = FeatureFlag.convert_from_json({"id": "TestFeature"})
@@ -82,8 +77,6 @@ def test_send_telemetry_appinsights_no_user(self):
             assert "TargetingId" not in mock_track_event.call_args[0][1]
             assert mock_track_event.call_args[0][1]["Variant"] == "TestVariant"
             assert mock_track_event.call_args[0][1]["VariantAssignmentReason"] == "DefaultWhenDisabled"
-            assert "VariantAssignmentPercentage" not in mock_track_event.call_args[0][1]
-            assert "DefaultWhenEnabled" not in mock_track_event.call_args[0][1]
 
     def test_send_telemetry_appinsights_no_variant(self):
         feature_flag = FeatureFlag.convert_from_json({"id": "TestFeature"})
@@ -147,9 +140,6 @@ def test_send_telemetry_appinsights_default_when_enabled(self):
             assert mock_track_event.call_args[0][1]["TargetingId"] == "test_user"
             assert mock_track_event.call_args[0][1]["Variant"] == "big"
             assert mock_track_event.call_args[0][1]["VariantAssignmentReason"] == "DefaultWhenEnabled"
-            assert mock_track_event.call_args[0][1]["VariantAssignmentPercentage"] == "25"
-            assert "DefaultWhenEnabled" in mock_track_event.call_args[0][1]
-            assert mock_track_event.call_args[0][1]["DefaultWhenEnabled"] == "big"
 
     def test_send_telemetry_appinsights_default_when_enabled_no_percentile(self):
         feature_flag = FeatureFlag.convert_from_json(
@@ -180,9 +170,6 @@ def test_send_telemetry_appinsights_default_when_enabled_no_percentile(self):
             assert mock_track_event.call_args[0][1]["TargetingId"] == "test_user"
             assert mock_track_event.call_args[0][1]["Variant"] == "big"
             assert mock_track_event.call_args[0][1]["VariantAssignmentReason"] == "DefaultWhenEnabled"
-            assert mock_track_event.call_args[0][1]["VariantAssignmentPercentage"] == "100"
-            assert "DefaultWhenEnabled" in mock_track_event.call_args[0][1]
-            assert mock_track_event.call_args[0][1]["DefaultWhenEnabled"] == "big"
 
     def test_send_telemetry_appinsights_allocation(self):
         feature_flag = FeatureFlag.convert_from_json(