[system_health] enable performance.mark metrics for Twitter browsing story

R=johnchen@chromium.org
CC=​​cbruni@chromium.org, jdecaires@twitter.com

Bug: 1114635
Change-Id: I224fd77a89e316ba982c958ca9227ebb45db6eaa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2345308
Auto-Submit: Tamer Tas <tmrts@chromium.org>
Commit-Queue: Tamer Tas <tmrts@chromium.org>
Reviewed-by: John Chen <johnchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#810126}

tools/perf/core/shard_maps/timing_data/linux-perf_timing.json

@@ -3367,10 +3367,6 @@
         "duration": "53.0",
         "name": "system_health.common_desktop/browse:social:tumblr_infinite_scroll:2018"
     },
-    {
-        "duration": "45.0",
-        "name": "system_health.common_desktop/browse:social:twitter:2018"
-    },
     {
         "duration": "58.0",
         "name": "system_health.common_desktop/browse:social:twitter_infinite_scroll:2018"
@@ -3683,10 +3679,6 @@
         "duration": "46.0",
         "name": "system_health.memory_desktop/browse:social:tumblr_infinite_scroll:2018"
     },
-    {
-        "duration": "38.0",
-        "name": "system_health.memory_desktop/browse:social:twitter:2018"
-    },
     {
         "duration": "52.0",
         "name": "system_health.memory_desktop/browse:social:twitter_infinite_scroll:2018"
@@ -4039,10 +4031,6 @@
         "duration": "60.0",
         "name": "v8.browsing_desktop-future/browse:social:tumblr_infinite_scroll:2018"
     },
-    {
-        "duration": "48.0",
-        "name": "v8.browsing_desktop-future/browse:social:twitter:2018"
-    },
     {
         "duration": "62.0",
         "name": "v8.browsing_desktop-future/browse:social:twitter_infinite_scroll:2018"
@@ -4147,10 +4135,6 @@
         "duration": "59.0",
         "name": "v8.browsing_desktop/browse:social:tumblr_infinite_scroll:2018"
     },
-    {
-        "duration": "46.0",
-        "name": "v8.browsing_desktop/browse:social:twitter:2018"
-    },
     {
         "duration": "61.0",
         "name": "v8.browsing_desktop/browse:social:twitter_infinite_scroll:2018"

tools/perf/core/shard_maps/timing_data/mac-10_12_laptop_low_end-perf_timing.json

@@ -3403,10 +3403,6 @@
         "duration": "66.0",
         "name": "system_health.common_desktop/browse:social:tumblr_infinite_scroll:2018"
     },
-    {
-        "duration": "53.0",
-        "name": "system_health.common_desktop/browse:social:twitter:2018"
-    },
     {
         "duration": "71.0",
         "name": "system_health.common_desktop/browse:social:twitter_infinite_scroll:2018"
@@ -3719,10 +3715,6 @@
         "duration": "60.0",
         "name": "system_health.memory_desktop/browse:social:tumblr_infinite_scroll:2018"
     },
-    {
-        "duration": "47.0",
-        "name": "system_health.memory_desktop/browse:social:twitter:2018"
-    },
     {
         "duration": "64.0",
         "name": "system_health.memory_desktop/browse:social:twitter_infinite_scroll:2018"
@@ -4075,10 +4067,6 @@
         "duration": "71.0",
         "name": "v8.browsing_desktop-future/browse:social:tumblr_infinite_scroll:2018"
     },
-    {
-        "duration": "58.0",
-        "name": "v8.browsing_desktop-future/browse:social:twitter:2018"
-    },
     {
         "duration": "75.0",
         "name": "v8.browsing_desktop-future/browse:social:twitter_infinite_scroll:2018"
@@ -4183,10 +4171,6 @@
         "duration": "81.0",
         "name": "v8.browsing_desktop/browse:social:tumblr_infinite_scroll:2018"
     },
-    {
-        "duration": "61.0",
-        "name": "v8.browsing_desktop/browse:social:twitter:2018"
-    },
     {
         "duration": "78.0",
         "name": "v8.browsing_desktop/browse:social:twitter_infinite_scroll:2018"

tools/perf/core/shard_maps/timing_data/mac-10_13_laptop_high_end-perf_timing.json

@@ -3367,10 +3367,6 @@
         "duration": "62.0",
         "name": "system_health.common_desktop/browse:social:tumblr_infinite_scroll:2018"
     },
-    {
-        "duration": "46.0",
-        "name": "system_health.common_desktop/browse:social:twitter:2018"
-    },
     {
         "duration": "64.0",
         "name": "system_health.common_desktop/browse:social:twitter_infinite_scroll:2018"
@@ -3683,10 +3679,6 @@
         "duration": "54.0",
         "name": "system_health.memory_desktop/browse:social:tumblr_infinite_scroll:2018"
     },
-    {
-        "duration": "41.0",
-        "name": "system_health.memory_desktop/browse:social:twitter:2018"
-    },
     {
         "duration": "59.0",
         "name": "system_health.memory_desktop/browse:social:twitter_infinite_scroll:2018"
@@ -4039,10 +4031,6 @@
         "duration": "59.0",
         "name": "v8.browsing_desktop-future/browse:social:tumblr_infinite_scroll:2018"
     },
-    {
-        "duration": "47.0",
-        "name": "v8.browsing_desktop-future/browse:social:twitter:2018"
-    },
     {
         "duration": "65.0",
         "name": "v8.browsing_desktop-future/browse:social:twitter_infinite_scroll:2018"
@@ -4147,10 +4135,6 @@
         "duration": "62.0",
         "name": "v8.browsing_desktop/browse:social:tumblr_infinite_scroll:2018"
     },
-    {
-        "duration": "48.0",
-        "name": "v8.browsing_desktop/browse:social:twitter:2018"
-    },
     {
         "duration": "66.0",
         "name": "v8.browsing_desktop/browse:social:twitter_infinite_scroll:2018"

tools/perf/core/shard_maps/timing_data/win-10-perf_timing.json

@@ -3367,10 +3367,6 @@
         "duration": "55.0",
         "name": "system_health.common_desktop/browse:social:tumblr_infinite_scroll:2018"
     },
-    {
-        "duration": "47.0",
-        "name": "system_health.common_desktop/browse:social:twitter:2018"
-    },
     {
         "duration": "60.0",
         "name": "system_health.common_desktop/browse:social:twitter_infinite_scroll:2018"
@@ -3683,10 +3679,6 @@
         "duration": "2.0",
         "name": "system_health.memory_desktop/browse:social:tumblr_infinite_scroll:2018"
     },
-    {
-        "duration": "41.0",
-        "name": "system_health.memory_desktop/browse:social:twitter:2018"
-    },
     {
         "duration": "2.0",
         "name": "system_health.memory_desktop/browse:social:twitter_infinite_scroll:2018"
@@ -4039,10 +4031,6 @@
         "duration": "57.0",
         "name": "v8.browsing_desktop-future/browse:social:tumblr_infinite_scroll:2018"
     },
-    {
-        "duration": "49.0",
-        "name": "v8.browsing_desktop-future/browse:social:twitter:2018"
-    },
     {
         "duration": "63.0",
         "name": "v8.browsing_desktop-future/browse:social:twitter_infinite_scroll:2018"
@@ -4147,10 +4135,6 @@
         "duration": "58.0",
         "name": "v8.browsing_desktop/browse:social:tumblr_infinite_scroll:2018"
     },
-    {
-        "duration": "50.0",
-        "name": "v8.browsing_desktop/browse:social:twitter:2018"
-    },
     {
         "duration": "64.0",
         "name": "v8.browsing_desktop/browse:social:twitter_infinite_scroll:2018"

tools/perf/core/shard_maps/timing_data/win-10_laptop_low_end-perf_hp-candidate_timing.json

@@ -51,10 +51,6 @@
         "duration": "25.0",
         "name": "v8.browsing_desktop/browse:social:tumblr_infinite_scroll:2018"
     },
-    {
-        "duration": "76.0",
-        "name": "v8.browsing_desktop/browse:social:twitter:2018"
-    },
     {
         "duration": "103.0",
         "name": "v8.browsing_desktop/browse:social:twitter_infinite_scroll:2018"

tools/perf/core/shard_maps/timing_data/win-10_laptop_low_end-perf_timing.json

@@ -3367,10 +3367,6 @@
         "duration": "81.0",
         "name": "system_health.common_desktop/browse:social:tumblr_infinite_scroll:2018"
     },
-    {
-        "duration": "68.0",
-        "name": "system_health.common_desktop/browse:social:twitter:2018"
-    },
     {
         "duration": "84.0",
         "name": "system_health.common_desktop/browse:social:twitter_infinite_scroll:2018"
@@ -3683,10 +3679,6 @@
         "duration": "9.0",
         "name": "system_health.memory_desktop/browse:social:tumblr_infinite_scroll:2018"
     },
-    {
-        "duration": "49.0",
-        "name": "system_health.memory_desktop/browse:social:twitter:2018"
-    },
     {
         "duration": "9.0",
         "name": "system_health.memory_desktop/browse:social:twitter_infinite_scroll:2018"
@@ -4039,10 +4031,6 @@
         "duration": "106.0",
         "name": "v8.browsing_desktop-future/browse:social:tumblr_infinite_scroll:2018"
     },
-    {
-        "duration": "89.0",
-        "name": "v8.browsing_desktop-future/browse:social:twitter:2018"
-    },
     {
         "duration": "108.0",
         "name": "v8.browsing_desktop-future/browse:social:twitter_infinite_scroll:2018"
@@ -4147,10 +4135,6 @@
         "duration": "97.0",
         "name": "v8.browsing_desktop/browse:social:tumblr_infinite_scroll:2018"
     },
-    {
-        "duration": "78.0",
-        "name": "v8.browsing_desktop/browse:social:twitter:2018"
-    },
     {
         "duration": "94.0",
         "name": "v8.browsing_desktop/browse:social:twitter_infinite_scroll:2018"

tools/perf/expectations.config

@@ -352,6 +352,7 @@ crbug.com/956191 [ win7 ] system_health.memory_desktop/browse:news:nytimes:2020
 crbug.com/1097065 [ linux ] system_health.memory_desktop/browse:media:googleplaystore:2018 [ Skip ]
 crbug.com/1097065 [ linux ] system_health.memory_desktop/load:social:vk:2018 [ Skip ]
 crbug.com/1097065 [ linux ] system_health.memory_desktop/browse_accessibility:tech:codesearch:2018 [ Skip ]
+crbug.com/1103427 [ linux ] system_health.memory_desktop/browse:social:twitter:2020 [ Skip ]
 crbug.com/1114120 [ win ] system_health.memory_desktop/browse:social:twitter_infinite_scroll:2018 [ Skip ]
 crbug.com/1044682 [ desktop ] system_health.memory_desktop/browse:tools:gmail-labelclick:2020 [ Skip ]
 crbug.com/1044682 [ desktop ] system_health.memory_desktop/browse:tools:gmail-openconversation:2020 [ Skip ]
@@ -391,6 +392,7 @@ crbug.com/1008093 [ linux ] tab_switching.typical_25/multitab:misc:typical24 [ S
 crbug.com/788796 [ linux ] v8.browsing_desktop/browse:media:imgur [ Skip ]
 crbug.com/875159 [ win10 ] v8.browsing_desktop/browse:media:imgur [ Skip ]
 crbug.com/954959 [ linux ] v8.browsing_desktop/browse:media:pinterest:2018 [ Skip ]
+crbug.com/1103427 [ linux ] system_health.memory_desktop/browse:social:twitter:2020 [ Skip ]
 crbug.com/958507 [ desktop ] v8.browsing_desktop/browse:media:imgur [ Skip ]
 crbug.com/1008028 [ desktop ] v8.browsing_desktop/browse:news:hackernews:2018 [ Skip ]
 crbug.com/1009838 [ mac ] v8.browsing_desktop/browse:tools:maps:2019 [ Skip ]

tools/perf/page_sets/data/system_health_desktop.json

@@ -100,6 +100,9 @@
         "browse:social:twitter:2018": {
             "DEFAULT": "system_health_desktop_6bd6f0c70a.wprgo"
         },
+        "browse:social:twitter:2020": {
+            "DEFAULT": "system_health_desktop_3590f84d44.wprgo"
+        },
         "browse:social:twitter_infinite_scroll": {
             "DEFAULT": "system_health_desktop_054.wprgo"
         },

tools/perf/page_sets/data/system_health_desktop_3590f84d44.wprgo.sha1

+3590f84d443227b6410740591606b90785c45427
\ No newline at end of file

tools/perf/page_sets/system_health/browsing_stories.py

@@ -295,13 +295,64 @@ class TwitterMobileStory2019(_ArticleBrowsingStory):
     action_runner.WaitForElement(selector=('[class="css-901oao css-16my406 '
         'r-1qd0xha r-ad9z0x r-bcqeeo r-qvutc0"]'))
 
-class TwitterDesktopStory2018(_ArticleBrowsingStory):
-  NAME = 'browse:social:twitter:2018'
+
+class TwitterDesktopStory2020(_ArticleBrowsingStory):
+  NAME = 'browse:social:twitter:2020'
   URL = 'https://www.twitter.com/nasa'
   IS_SINGLE_PAGE_APP = True
-  ITEM_SELECTOR = '.tweet-text'
+  ITEM_SELECTOR = '[data-testid="tweet"]'
   SUPPORTED_PLATFORMS = platforms.DESKTOP_ONLY
-  TAGS = [story_tags.YEAR_2018]
+  TAGS = [story_tags.YEAR_2020]
+
+  # This map translates page-specific event names to event names needed for
+  # the reported_by_page:* metric.
+  EVENTS_REPORTED_BY_PAGE = '''
+    window.__telemetry_reported_page_events = {
+      'ttft':
+          'telemetry:reported_by_page:viewable',
+      'tti':
+          'telemetry:reported_by_page:interactive'
+    };
+  '''
+
+  # Patch performance.mark to get notified about page events.
+  PERFORMANCE_MARK_PATCH = '''
+    window.__telemetry_observed_page_events = new Set();
+    (function () {
+      let reported = window.__telemetry_reported_page_events;
+      let observed = window.__telemetry_observed_page_events;
+      let performance_mark = window.performance.mark;
+      window.performance.mark = function (label) {
+        performance_mark.call(window.performance, label);
+        if (reported.hasOwnProperty(label)) {
+          performance_mark.call(
+              window.performance, reported[label]);
+          observed.add(reported[label]);
+        }
+      }
+    })();
+  '''
+
+  # Page event queries.
+  INTERACTIVE_EVENT = '''
+    (window.__telemetry_observed_page_events.has(
+        "telemetry:reported_by_page:interactive"))
+  '''
+
+  def __init__(self, story_set, take_memory_measurement):
+    super(TwitterDesktopStory2020, self).__init__(story_set,
+                                                  take_memory_measurement)
+    self.script_to_evaluate_on_commit = js_template.Render(
+        '''{{@events_reported_by_page}}
+        {{@performance_mark}}''',
+        events_reported_by_page=self.EVENTS_REPORTED_BY_PAGE,
+        performance_mark=self.PERFORMANCE_MARK_PATCH)
+
+  def _DidLoadDocument(self, action_runner):
+    # 1. Wait until the page load.
+    action_runner.WaitForJavaScriptCondition(self.INTERACTIVE_EVENT)
+
+    super(TwitterDesktopStory2020, self)._DidLoadDocument(action_runner)
 
 
 class WashingtonPostMobileStory2019(_ArticleBrowsingStory):

tools/perf/system_health_stories.csv

@@ -44,8 +44,8 @@ browse:social:facebook_infinite_scroll:2018,,"desktop,mobile","2018,infinite_scr
 browse:social:instagram:2019,,mobile,"2019,emerging_market"
 browse:social:pinterest_infinite_scroll:2019,,mobile,"2019,health_check,infinite_scroll"
 browse:social:tumblr_infinite_scroll:2018,,"desktop,mobile","2018,health_check,infinite_scroll,javascript_heavy"
-browse:social:twitter:2018,,desktop,2018
 browse:social:twitter:2019,,mobile,"2019,health_check"
+browse:social:twitter:2020,,desktop,2020
 browse:social:twitter_infinite_scroll:2018,,desktop,"2018,infinite_scroll"
 browse:tech:discourse_infinite_scroll:2018,,"desktop,mobile","2018,infinite_scroll"
 browse:tools:docs_scrolling,Google Docs scrolling story:,desktop,"2020,javascript_heavy"