Enable console error metric for system health and v8 browsing benchmarks

Bug: 880432
Change-Id: Ice70a3804321e89f21579436e2de05a76cdeb8fd
Reviewed-on: https://chromium-review.googlesource.com/1216283
Commit-Queue: Ulan Degenbaev <ulan@chromium.org>
Reviewed-by: Ned Nguyen <nednguyen@google.com>
Cr-Commit-Position: refs/heads/master@{#590227}

tools/perf/benchmarks/system_health.py

@@ -39,15 +39,18 @@ class _CommonSystemHealthBenchmark(perf_benchmark.PerfBenchmark):
     cat_filter = chrome_trace_category_filter.ChromeTraceCategoryFilter(
         filter_string='rail,toplevel')
     cat_filter.AddIncludedCategory('accessibility')
+    # Needed for the console error metric.
+    cat_filter.AddIncludedCategory('v8.console')
 
     options = timeline_based_measurement.Options(cat_filter)
     options.config.enable_chrome_trace = True
     options.config.enable_cpu_trace = True
     options.SetTimelineBasedMetrics([
-        'cpuTimeMetric',
-        'tracingMetric',
         'accessibilityMetric',
-        'limitedCpuTimeMetric'
+        'consoleErrorMetric',
+        'cpuTimeMetric',
+        'limitedCpuTimeMetric',
+        'tracingMetric'
     ])
     loading_metrics_category.AugmentOptionsForLoadingMetrics(options)
     # The EQT metric depends on the same categories as the loading metric.
@@ -99,11 +102,16 @@ class _MemorySystemHealthBenchmark(perf_benchmark.PerfBenchmark):
   options = {'pageset_repeat': 3}
 
   def CreateCoreTimelineBasedMeasurementOptions(self):
-    options = timeline_based_measurement.Options(
-        chrome_trace_category_filter.ChromeTraceCategoryFilter(
-            '-*,disabled-by-default-memory-infra'))
+    cat_filter = chrome_trace_category_filter.ChromeTraceCategoryFilter(
+        filter_string='-*,disabled-by-default-memory-infra')
+    # Needed for the console error metric.
+    cat_filter.AddIncludedCategory('v8.console')
+    options = timeline_based_measurement.Options(cat_filter)
     options.config.enable_android_graphics_memtrack = True
-    options.SetTimelineBasedMetrics(['memoryMetric'])
+    options.SetTimelineBasedMetrics([
+      'consoleErrorMetric',
+      'memoryMetric'
+    ])
     # Setting an empty memory dump config disables periodic dumps.
     options.config.chrome_trace_config.SetMemoryDumpConfig(
         chrome_trace_config.MemoryDumpConfig())

tools/perf/benchmarks/v8_browsing.py

@@ -55,10 +55,10 @@ class _V8BrowsingBenchmark(perf_benchmark.PerfBenchmark):
       'navigation',
       'toplevel',
       # V8 categories.
-      'blink.console',
       'disabled-by-default-v8.gc',
       'renderer.scheduler',
       'v8',
+      'v8.console',
       'webkit.console',
       'disabled-by-default-v8.runtime_stats',
       # TODO(crbug.com/616441, primiano): Remove this temporary workaround,
@@ -78,8 +78,13 @@ class _V8BrowsingBenchmark(perf_benchmark.PerfBenchmark):
     options.config.chrome_trace_config.SetMemoryDumpConfig(memory_dump_config)
 
     options.SetTimelineBasedMetrics([
-      'expectedQueueingTimeMetric', 'runtimeStatsTotalMetric', 'gcMetric',
-      'blinkGcMetric', 'memoryMetric'])
+      'blinkGcMetric',
+      'consoleErrorMetric',
+      'expectedQueueingTimeMetric',
+      'gcMetric',
+      'memoryMetric',
+      'runtimeStatsTotalMetric'
+    ])
     return options
 
   @classmethod