feat(cirrus): Update user id to nimbus user id

cirrus/server/cirrus/main.py

@@ -208,7 +208,7 @@ async def record_metrics(enrollment_data: list[EnrollmentMetricData]):
     for enrollment in enrollment_data:
         app.state.metrics.cirrus_events.enrollment.record(
             app.state.metrics.cirrus_events.EnrollmentExtra(
-                user_id=enrollment.nimbus_user_id,
+                nimbus_user_id=enrollment.nimbus_user_id,
                 app_id=enrollment.app_id,
                 experiment=enrollment.experiment_slug,
                 branch=enrollment.branch_slug,

cirrus/server/cirrus/sdk.py

@@ -29,7 +29,7 @@ def record_enrollment_statuses(
                     reason=enrollment_status_extra.reason or "",
                     slug=enrollment_status_extra.slug or "",
                     status=enrollment_status_extra.status or "",
-                    user_id=enrollment_status_extra.user_id or "",
+                    nimbus_user_id=enrollment_status_extra.user_id or "",
                 )
             )
         self.pings.enrollment_status.submit()

cirrus/server/telemetry/docs/metrics.md

@@ -31,7 +31,7 @@ In addition to those built-in metrics, the following metrics are added to the pi
 
 | Name | Type | Description | Data reviews | Extras | Expiration | [Data Sensitivity](https://wiki.mozilla.org/Firefox/Data_Collection) |
 | --- | --- | --- | --- | --- | --- | --- |
-| cirrus_events.enrollment |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |Recorded when a user has met the conditions and is first bucketed into an experiment (i.e. targeting matched and they were randomized into a bucket and branch of the experiment). Expected a maximum of once per experiment per user.  |[mozilla/experimenter#9081](https://github.com/mozilla/experimenter/pull/9081#issuecomment-1625751843)|<ul><li>app_id: A unique identifier for application</li><li>branch: The branch slug/identifier that was randomly chosen</li><li>experiment: The slug/unique identifier of the experiment</li><li>experiment_type: Indicates whether this is an experiment or rollout</li><li>user_id: A unique identifier for User/Client sending a request to get feature configuration</li></ul>|never |1 |
+| cirrus_events.enrollment |[event](https://mozilla.github.io/glean/book/user/metrics/event.html) |Recorded when a user has met the conditions and is first bucketed into an experiment (i.e. targeting matched and they were randomized into a bucket and branch of the experiment). Expected a maximum of once per experiment per user.  |[mozilla/experimenter#9081](https://github.com/mozilla/experimenter/pull/9081#issuecomment-1625751843)|<ul><li>app_id: A unique identifier for application</li><li>branch: The branch slug/identifier that was randomly chosen</li><li>experiment: The slug/unique identifier of the experiment</li><li>experiment_type: Indicates whether this is an experiment or rollout</li><li>nimbus_user_id: A unique identifier for User/Client sending a request to get feature configuration</li></ul>|never |1 |
 
 Data categories are [defined here](https://wiki.mozilla.org/Firefox/Data_Collection).
 

cirrus/server/telemetry/metrics.yaml

@@ -19,7 +19,7 @@ cirrus_events:
       experiment_type:
         type: string
         description: Indicates whether this is an experiment or rollout
-      user_id:
+      nimbus_user_id:
         type: string
         description: A unique identifier for User/Client sending a request to get feature configuration
       app_id:
@@ -67,7 +67,7 @@ cirrus_events:
       conflict_slug:
         type: string
         description: If the enrollment hit a feature conflict, the slug of the conflicting experiment/rollout
-      user_id:
+      nimbus_user_id:
         type: string
         description: The ID of the user requesting enrollment
     bugs:

cirrus/server/tests/test_telemetry.py

@@ -27,15 +27,15 @@ def before_enrollment_ping(data):
 
     extra_1 = snapshot[0].extra
     assert extra_1["app_id"] == "test_app_id"
-    assert extra_1["user_id"] == "test_client_id"
+    assert extra_1["nimbus_user_id"] == "test_client_id"
     assert extra_1["experiment"] == "cirrus-test-1"
     assert extra_1["branch"] == "control"
     assert extra_1["experiment_type"] == RecipeType.ROLLOUT.value
     assert extra_1["is_preview"] == "false"
 
     extra_2 = snapshot[1].extra
     assert extra_2["app_id"] == "test_app_id"
-    assert extra_2["user_id"] == "test_client_id"
+    assert extra_2["nimbus_user_id"] == "test_client_id"
     assert extra_2["experiment"] == "cirrus-test-2"
     assert extra_2["branch"] == "control"
     assert extra_2["experiment_type"] == RecipeType.EXPERIMENT.value