cluster telemetry: Report all rendering UMA metrics.

Report all the UMA metrics collected in rendering benchmark
in cluster_telemetry's rendering benchmark too.

BUG=984592

Change-Id: Ic7742eb736bbe353f7676d2e578cc0ee1dcfaa06
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1795628Reviewed-by: Ravi Mistry <rmistry@chromium.org>
Reviewed-by: Caleb Rouleau <crouleau@chromium.org>
Commit-Queue: Caleb Rouleau <crouleau@chromium.org>
Auto-Submit: Sadrul Chowdhury <sadrul@chromium.org>
Cr-Commit-Position: refs/heads/master@{#695719}

tools/perf/benchmarks/rendering.py

@@ -12,6 +12,30 @@ from telemetry.timeline import chrome_trace_category_filter
 from telemetry.web_perf import timeline_based_measurement
 
 
+RENDERING_BENCHMARK_UMA = [
+    'Event.Latency.ScrollBegin.Touch.TimeToScrollUpdateSwapBegin4',
+    'Event.Latency.ScrollUpdate.Touch.TimeToScrollUpdateSwapBegin4',
+    'Event.Latency.ScrollBegin.Wheel.TimeToScrollUpdateSwapBegin4',
+    'Event.Latency.ScrollUpdate.Wheel.TimeToScrollUpdateSwapBegin4',
+    'Graphics.Smoothness.Checkerboarding.CompositorAnimation',
+    'Graphics.Smoothness.Checkerboarding.MainThreadAnimation',
+    'Graphics.Smoothness.Checkerboarding.PinchZoom',
+    'Graphics.Smoothness.Checkerboarding.RAF',
+    'Graphics.Smoothness.Checkerboarding.TouchScroll',
+    'Graphics.Smoothness.Checkerboarding.Video',
+    'Graphics.Smoothness.Checkerboarding.WheelScroll',
+    'Graphics.Smoothness.Throughput.MainThread.MainThreadAnimation',
+    'Graphics.Smoothness.Throughput.MainThread.PinchZoom',
+    'Graphics.Smoothness.Throughput.MainThread.RAF',
+    'Graphics.Smoothness.Throughput.MainThread.TouchScroll',
+    'Graphics.Smoothness.Throughput.MainThread.WheelScroll',
+    'Graphics.Smoothness.Throughput.CompositorThread.CompositorAnimation',
+    'Graphics.Smoothness.Throughput.CompositorThread.PinchZoom',
+    'Graphics.Smoothness.Throughput.CompositorThread.TouchScroll',
+    'Graphics.Smoothness.Throughput.CompositorThread.WheelScroll',
+]
+
+
 class _RenderingBenchmark(perf_benchmark.PerfBenchmark):
   @classmethod
   def AddBenchmarkCommandLineArgs(cls, parser):
@@ -32,26 +56,7 @@ class _RenderingBenchmark(perf_benchmark.PerfBenchmark):
     category_filter = chrome_trace_category_filter.CreateLowOverheadFilter()
     options = timeline_based_measurement.Options(category_filter)
     options.config.chrome_trace_config.EnableUMAHistograms(
-        'Event.Latency.ScrollBegin.Touch.TimeToScrollUpdateSwapBegin4',
-        'Event.Latency.ScrollUpdate.Touch.TimeToScrollUpdateSwapBegin4',
-        'Event.Latency.ScrollBegin.Wheel.TimeToScrollUpdateSwapBegin4',
-        'Event.Latency.ScrollUpdate.Wheel.TimeToScrollUpdateSwapBegin4',
-        'Graphics.Smoothness.Checkerboarding.CompositorAnimation',
-        'Graphics.Smoothness.Checkerboarding.MainThreadAnimation',
-        'Graphics.Smoothness.Checkerboarding.PinchZoom',
-        'Graphics.Smoothness.Checkerboarding.RAF',
-        'Graphics.Smoothness.Checkerboarding.TouchScroll',
-        'Graphics.Smoothness.Checkerboarding.Video',
-        'Graphics.Smoothness.Checkerboarding.WheelScroll',
-        'Graphics.Smoothness.Throughput.MainThread.MainThreadAnimation',
-        'Graphics.Smoothness.Throughput.MainThread.PinchZoom',
-        'Graphics.Smoothness.Throughput.MainThread.RAF',
-        'Graphics.Smoothness.Throughput.MainThread.TouchScroll',
-        'Graphics.Smoothness.Throughput.MainThread.WheelScroll',
-        'Graphics.Smoothness.Throughput.CompositorThread.CompositorAnimation',
-        'Graphics.Smoothness.Throughput.CompositorThread.PinchZoom',
-        'Graphics.Smoothness.Throughput.CompositorThread.TouchScroll',
-        'Graphics.Smoothness.Throughput.CompositorThread.WheelScroll')
+        *RENDERING_BENCHMARK_UMA)
     options.SetTimelineBasedMetrics(['renderingMetric', 'umaMetric'])
     return options
 

tools/perf/contrib/cluster_telemetry/rendering_ct.py

@@ -9,6 +9,8 @@ from telemetry.web_perf import timeline_based_measurement
 
 from core import perf_benchmark
 
+import benchmarks.rendering as rendering
+
 def ScrollToEndOfPage(action_runner):
   action_runner.Wait(1)
   with action_runner.CreateGestureInteraction('ScrollAction'):
@@ -41,7 +43,6 @@ class RenderingCT(perf_benchmark.PerfBenchmark):
     category_filter = chrome_trace_category_filter.CreateLowOverheadFilter()
     options = timeline_based_measurement.Options(category_filter)
     options.config.chrome_trace_config.EnableUMAHistograms(
-        'Event.Latency.ScrollBegin.Touch.TimeToScrollUpdateSwapBegin4',
-        'Event.Latency.ScrollUpdate.Touch.TimeToScrollUpdateSwapBegin4')
+        *rendering.RENDERING_BENCHMARK_UMA)
     options.SetTimelineBasedMetrics(['renderingMetric', 'umaMetric'])
     return options