commit 469caa726f4cf44debd5c1caae703e503b5c83ce
author Francois Rousseau <frousseau@google.com> Thu Oct 14 22:57:53 2021 +0000
committer releases-try-builder <releases-try-builder@fuchsia-infra.iam.gserviceaccount.com> Fri Oct 15 01:08:09 2021 +0000
tree 8a6552e3bf6b6d8e8bbb78c2d9b7938716563410
parent 5c18c4f31bb2185179222c027bbc4adb8aacc708

[local_storage] new data_partition_upgrade metric

* Sampler is sending an Occurrence so the metric type should be
  EVENT_COUNT – going with a new metric ID to be safer
* this still requires fshost to change its Inspect field type and
  the Sampler config to be changed to the new metric ID in
  fxrev.dev/594241
* fix the report name that's redundant with the metric name

TESTED=Cobalt no longer complaining about the metric type

Bug: 86635
Change-Id: Ia400d5aecf253f309971a721e1f5ab8544821119
Reviewed-on: https://fuchsia-review.googlesource.com/c/cobalt-registry/+/594148
Reviewed-by: Steve Fung <stevefung@google.com>
Reviewed-by: Zach Bush <zmbush@google.com>
Privacy-Approval: Steve Fung <stevefung@google.com>
Commit-Queue: Francois Rousseau <frousseau@google.com>

fuchsia/local_storage/metrics.yaml

diff --git a/fuchsia/local_storage/metrics.yaml b/fuchsia/local_storage/metrics.yaml
index 0fef86b..efd38e7 100644
--- a/fuchsia/local_storage/metrics.yaml
+++ b/fuchsia/local_storage/metrics.yaml
@@ -2288,10 +2288,10 @@
 # occurs during boot.  Since the overall procedure is intended to be a one-time
 # event, this should only trigger once per device.
 ################################################################################
-- id: 9000
-  replacement_metric_id: 9001
+- id: 9002
+  replacement_metric_id: 9003
   metric_name: data_partition_upgrade
-  metric_type: EVENT_OCCURRED
+  metric_type: EVENT_COUNT
   metric_dimensions: &dpu_buckets
    - dimension: stage
      event_codes:
@@ -2303,22 +2303,22 @@
        5: Done
      max_event_code: 15
   reports:
-    - report_name: data_partition_upgrade
-      id: 9000
-      report_type: SIMPLE_OCCURRENCE_COUNT
+    - report_name: counts
+      id: 1
+      report_type: EVENT_COMPONENT_OCCURRENCE_COUNT
       system_profile_field: [BOARD_NAME, PRODUCT_NAME, SYSTEM_VERSION, CHANNEL]
       local_privacy_noise_level: NONE
   meta_data:
     max_release_stage: GA
     expiration_date: "2022/09/20"
 
-- id: 9001
+- id: 9003
   metric_name: data_partition_upgrade_migrated
   metric_type: OCCURRENCE
   metric_semantics: [USAGE_COUNTING]
   metric_dimensions: *dpu_buckets
   reports:
-    - report_name: data_partition_upgrade
+    - report_name: counts
       id: 1
       report_type: FLEETWIDE_OCCURRENCE_COUNTS
       privacy_level: NO_ADDED_PRIVACY
@@ -2327,4 +2327,4 @@
     max_release_stage: GA
     expiration_date: "2022/09/20"
 
-# Next ID: 9002
+# Next ID: 9004