commit 0406a20aee24ce12f30bc8962e098f18bedb0cd8
author Parth Sane <parthsane@google.com> Thu Aug 24 11:08:52 2023 +0000
committer Parth Sane <parthsane@google.com> Thu Aug 24 18:25:00 2023 +0000
tree 117f3732e802c60fe6990e2dbe994441de43103f
parent c9dd257f3c87a3058a92897950fa9fb4c18f5bfb

Add Android Monitor Contention Aggregated Metric

Test: <trace_processer_shell> --run-metrics android_monitor_contention_agg <trace>
Test: tools/diff_test_trace_processor.py <trace_processer_shell> --name-filter=.*monitor_contention_agg*
Bug: 296403757
Change-Id: Ia27dfa70301b011b4d2870322c01fb7898e3053a

Android.bp

diff --git a/Android.bp b/Android.bp
index 83823dc..aaff342 100644
--- a/Android.bp
+++ b/Android.bp
@@ -4616,6 +4616,7 @@
         "protos/perfetto/metrics/android/lmk_reason_metric.proto",
         "protos/perfetto/metrics/android/mem_metric.proto",
         "protos/perfetto/metrics/android/mem_unagg_metric.proto",
+        "protos/perfetto/metrics/android/monitor_contention_agg_metric.proto",
         "protos/perfetto/metrics/android/monitor_contention_metric.proto",
         "protos/perfetto/metrics/android/multiuser_metric.proto",
         "protos/perfetto/metrics/android/network_metric.proto",
@@ -4696,6 +4697,7 @@
         "protos/perfetto/metrics/android/lmk_reason_metric.proto",
         "protos/perfetto/metrics/android/mem_metric.proto",
         "protos/perfetto/metrics/android/mem_unagg_metric.proto",
+        "protos/perfetto/metrics/android/monitor_contention_agg_metric.proto",
         "protos/perfetto/metrics/android/monitor_contention_metric.proto",
         "protos/perfetto/metrics/android/multiuser_metric.proto",
         "protos/perfetto/metrics/android/network_metric.proto",
@@ -4758,6 +4760,7 @@
         "protos/perfetto/metrics/android/lmk_reason_metric.proto",
         "protos/perfetto/metrics/android/mem_metric.proto",
         "protos/perfetto/metrics/android/mem_unagg_metric.proto",
+        "protos/perfetto/metrics/android/monitor_contention_agg_metric.proto",
         "protos/perfetto/metrics/android/monitor_contention_metric.proto",
         "protos/perfetto/metrics/android/multiuser_metric.proto",
         "protos/perfetto/metrics/android/network_metric.proto",
@@ -10430,6 +10433,7 @@
         "src/trace_processor/metrics/sql/android/android_mem.sql",
         "src/trace_processor/metrics/sql/android/android_mem_unagg.sql",
         "src/trace_processor/metrics/sql/android/android_monitor_contention.sql",
+        "src/trace_processor/metrics/sql/android/android_monitor_contention_agg.sql",
         "src/trace_processor/metrics/sql/android/android_multiuser.sql",
         "src/trace_processor/metrics/sql/android/android_multiuser_populator.sql",
         "src/trace_processor/metrics/sql/android/android_netperf.sql",