Revert "[fuchsia_system_metrics] Remove memory metric. Migrated to memory project."
This reverts commit 1eac0e5efb055ac32b630c9034d81ce3d759e901.
Reason for revert: Roller is broken: https://turquoise-internal-review.googlesource.com/c/integration/+/171596
Original change's description:
> [fuchsia_system_metrics] Remove memory metric. Migrated to memory project.
>
> Wait until this CL is landed:
> https://fuchsia-review.googlesource.com/c/fuchsia/+/351355/
>
> Bug: 40088
>
> Change-Id: I3cb99a70bbad4785650664b27a1a358dc369fbc2
TBR=rudominer@google.com,zmbush@google.com,stevefung@google.com,gracelaw@google.com
Change-Id: Ib40f17c7cfd77eb42783b1dff50cfb4a5a447240
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 40088
diff --git a/fuchsia/fuchsia_system_metrics/metrics.yaml b/fuchsia/fuchsia_system_metrics/metrics.yaml
index d3e3c78..cb4e38d 100644
--- a/fuchsia/fuchsia_system_metrics/metrics.yaml
+++ b/fuchsia/fuchsia_system_metrics/metrics.yaml
@@ -114,6 +114,105 @@
expiration_date: "2020/01/17"
#####################################################################
+# fuchsia memory_usage
+#
+# For every minute, we log the memory usage in bytes with breakdowns:
+#####################################################################
+- id: 3
+ metric_name: fuchsia_memory_experimental
+ metric_type: MEMORY_USAGE
+ metric_dimensions:
+ - dimension: memory_breakdown
+ event_codes:
+ 0: TotalBytes
+ 1: UsedBytes
+ 2: FreeBytes
+ 3: VmoBytes
+ 4: KernelFreeHeapBytes
+ 5: MmuBytes
+ 6: IpcBytes
+ 7: KernelTotalHeapBytes
+ 8: WiredBytes
+ 9: OtherBytes
+ reports:
+ #####################################################################
+ # fuchsia_memory_usage
+ #
+ #####################################################################
+ - report_name: fuchsia_memory_usage_numeric_aggr_experimental
+ id: 490323763 # legacy long report_id
+ report_type: NUMERIC_AGGREGATION
+ percentiles: [5, 10, 90, 95, 99]
+ system_profile_field: [BOARD_NAME, PRODUCT_NAME, ARCH, SYSTEM_VERSION, OS, CHANNEL]
+ - report_name: fuchsia_memory_usage_histogram_experimental_2
+ id: 2249350189 # legacy long report_id
+ report_type: INT_RANGE_HISTOGRAM
+ system_profile_field: [BOARD_NAME, PRODUCT_NAME, ARCH, SYSTEM_VERSION, OS, CHANNEL]
+ int_buckets:
+ linear:
+ floor: 0
+ num_buckets: 154
+ step_size: 10485760 # 10 MB
+ meta_data:
+ max_release_stage: GA
+ expiration_date: "2020/10/25"
+
+#####################################################################
+# fuchsia memory_usage with up time breakdown
+#
+# For every minute, we log the memory usage in bytes with breakdowns:
+#####################################################################
+- id: 4
+ metric_name: fuchsia_memory_experimental_2
+ metric_type: MEMORY_USAGE
+ metric_dimensions:
+ - dimension: memory_breakdown
+ event_codes:
+ 0: TotalBytes
+ 1: UsedBytes
+ 2: FreeBytes
+ 3: VmoBytes
+ 4: KernelFreeHeapBytes
+ 5: MmuBytes
+ 6: IpcBytes
+ 7: KernelTotalHeapBytes
+ 8: WiredBytes
+ 9: OtherBytes
+ - dimension: time_since_boot
+ event_codes:
+ 0: Up
+ 1: UpOneMinute
+ 2: UpThirtyMinutes
+ 3: UpOneHour
+ 4: UpSixHours
+ 5: UpTwelveHours
+ 6: UpOneDay
+ 7: UpTwoDays
+ 8: UpThreeDays
+ 9: UpSixDays
+ reports:
+ #####################################################################
+ # fuchsia_memory_usage
+ #####################################################################
+ - report_name: fuchsia_memory_usage_numeric_aggr_experimental
+ id: 490323763 # legacy long report_id
+ report_type: NUMERIC_AGGREGATION
+ percentiles: [5, 10, 90, 95, 99]
+ system_profile_field: [BOARD_NAME, PRODUCT_NAME, ARCH, SYSTEM_VERSION, OS, CHANNEL]
+ - report_name: fuchsia_memory_usage_histogram_experimental
+ id: 57178942 # legacy long report_id
+ report_type: INT_RANGE_HISTOGRAM
+ system_profile_field: [BOARD_NAME, PRODUCT_NAME, ARCH, SYSTEM_VERSION, OS, CHANNEL]
+ int_buckets:
+ linear:
+ floor: 0
+ num_buckets: 154
+ step_size: 10485760 # 10 MB
+ meta_data:
+ max_release_stage: GA
+ expiration_date: "2020/10/25"
+
+#####################################################################
# ****** WILL DEPRECATE. Use id 8 below instead. ******
# fuchsia CPU% * 100 averaged over all cores taken per sec
#
