[modular] Add new event types for account creation

This also updates the expiration data of all modular metrics, from the
previous arbitrary date to a new arbitrary date.

Change-Id: I2322401f4d8d5737601c2d26d1d3ac458f7ef1a8
diff --git a/fuchsia/modular/metrics.yaml b/fuchsia/modular/metrics.yaml
index 3b4f5f2..3689167 100644
--- a/fuchsia/modular/metrics.yaml
+++ b/fuchsia/modular/metrics.yaml
@@ -11,7 +11,9 @@
 #####################################################################
 # modular_lifetime_events
 #
-# We log each time one of the following events occurs.
+# We log each time one of the following events occurs. A maximum of
+# one Booted* event is expected per power cycle and a maximum of one
+# CreateSession* event is expected per user session.
 #####################################################################
 - id: 1
   metric_name: modular_lifetime_events
@@ -22,6 +24,12 @@
       event_codes:
         0: BootedToBaseMgr
         1: BootedToSessionMgr
+        2: CreateSessionNewPersistentAccount
+        3: CreateSessionExistingPersistentAccount
+        # A session was created where the account ID could not be
+        # confirmed using the set of existing account directories.
+        4: CreateSessionUnverifiablePersistentAccount
+        5: CreateSessionNewEphemeralAccount
       max_event_code: 10
   reports:
     #####################################################################
@@ -38,7 +46,7 @@
       system_profile_field: [BOARD_NAME, PRODUCT_NAME, SYSTEM_VERSION, CHANNEL]
   meta_data:
     max_release_stage: GA
-    expiration_date: "2020/04/26"
+    expiration_date: "2021/03/24"
 
 #####################################################################
 # module_launch_time
@@ -73,7 +81,7 @@
       system_profile_field: [BOARD_NAME, PRODUCT_NAME, SYSTEM_VERSION, CHANNEL]
   meta_data:
     max_release_stage: GA
-    expiration_date: "2020/04/26"
+    expiration_date: "2021/03/24"
 
 #####################################################################
 # story_launch_time
@@ -103,7 +111,7 @@
       system_profile_field: [BOARD_NAME, PRODUCT_NAME, SYSTEM_VERSION, CHANNEL]
   meta_data:
     max_release_stage: GA
-    expiration_date: "2020/04/26"
+    expiration_date: "2021/03/24"
 
 #####################################################################
 # session_agent_events
@@ -137,4 +145,4 @@
       system_profile_field: [BOARD_NAME, PRODUCT_NAME, SYSTEM_VERSION, CHANNEL]
   meta_data:
     max_release_stage: GA
-    expiration_date: "2020/04/26"
+    expiration_date: "2021/03/24"