Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/392036 )
Change subject: webperf: Add missing mediaWikiLoad to navtiming2
......................................................................
webperf: Add missing mediaWikiLoad to navtiming2
Rename mediaWikiLoadComplete -> mediaWikiLoad (its a delta)
Bug: T180598
Change-Id: I2579fe7e4f1427b223b65875b9b608689e99e238
---
M modules/webperf/files/navtiming.py
M modules/webperf/files/navtiming_fixture.yaml
2 files changed, 35 insertions(+), 2 deletions(-)
Approvals:
Krinkle: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/webperf/files/navtiming.py
b/modules/webperf/files/navtiming.py
index ca5e13b..df1952e 100755
--- a/modules/webperf/files/navtiming.py
+++ b/modules/webperf/files/navtiming.py
@@ -450,7 +450,6 @@
('response', 'responseEnd', 'responseStart'),
('processing', 'domComplete', 'responseEnd'),
('onLoad', 'loadEventEnd', 'loadEventStart'),
- ('mediaWikiLoad', 'mediaWikiLoadEnd', 'mediaWikiLoadStart'),
('ssl', 'connectEnd', 'secureConnectionStart'),
):
if minuend in event and subtrahend in event:
@@ -464,6 +463,8 @@
metrics_nav2['unload'] = event['unload']
if 'redirecting' in event:
metrics_nav2['redirect'] = event['redirecting']
+ if 'mediaWikiLoadComplete' in event:
+ metrics_nav2['mediaWikiLoad'] = event['mediaWikiLoadComplete']
# If one of the metrics are wrong, don't send them at all
for metric, value in metrics_nav2.items():
diff --git a/modules/webperf/files/navtiming_fixture.yaml
b/modules/webperf/files/navtiming_fixture.yaml
index 3f9f408..8a60a17 100644
--- a/modules/webperf/files/navtiming_fixture.yaml
+++ b/modules/webperf/files/navtiming_fixture.yaml
@@ -150,6 +150,12 @@
- frontend.navtiming2.domInteractive.by_browser.Firefox.55:955|ms
- frontend.navtiming2.domInteractive.by_browser.Firefox.all:955|ms
- frontend.navtiming2.domInteractive.by_continent.Europe:955|ms
+ - frontend.navtiming2.mediaWikiLoad.desktop.authenticated:1270|ms
+ - frontend.navtiming2.mediaWikiLoad.desktop.overall:1270|ms
+ - frontend.navtiming2.mediaWikiLoad.overall:1270|ms
+ - frontend.navtiming2.mediaWikiLoad.by_browser.Firefox.55:1270|ms
+ - frontend.navtiming2.mediaWikiLoad.by_browser.Firefox.all:1270|ms
+ - frontend.navtiming2.mediaWikiLoad.by_continent.Europe:1270|ms
Cached page view from desktop:
input: {"event": {"action": "view", "connectEnd": 0, "connectStart": 0,
"dnsLookup": 0, "domComplete": 1201, "domInteractive": 576, "fetchStart": 0,
"firstPaint": 635, "isAnon": true, "isHiDPI": false, "isHttp2": true,
"loadEventEnd": 1203, "loadEventStart": 1201, "mediaWikiLoadComplete": 667,
"mediaWikiVersion": "1.30.0-wmf.19", "namespaceId": 1, "originCountry": "MA",
"originRegion": "01", "pageId": 1, "requestStart": 16, "responseEnd": 373,
"responseStart": 360, "revId": 1, "unload": 0}, "recvFrom": "example",
"revision": 1, "schema": "NavigationTiming", "seqId": 1, "timestamp": 1,
"userAgent": "{\"os_minor\": null, \"is_bot\": false, \"os_major\": null,
\"device_family\": \"Other\", \"os_family\": \"Windows 7\", \"browser_minor\":
\"0\", \"wmf_app_version\": \"-\", \"browser_major\": \"60\",
\"browser_family\": \"Chrome\", \"is_mediawiki\": false}", "uuid": "example",
"webHost": "example", "wiki": "example"}
@@ -289,6 +295,12 @@
- frontend.navtiming2.domInteractive.by_browser.Chrome.60:576|ms
- frontend.navtiming2.domInteractive.by_browser.Chrome.all:576|ms
- frontend.navtiming2.domInteractive.by_continent.Africa:576|ms
+ - frontend.navtiming2.mediaWikiLoad.desktop.anonymous:667|ms
+ - frontend.navtiming2.mediaWikiLoad.desktop.overall:667|ms
+ - frontend.navtiming2.mediaWikiLoad.overall:667|ms
+ - frontend.navtiming2.mediaWikiLoad.by_browser.Chrome.60:667|ms
+ - frontend.navtiming2.mediaWikiLoad.by_browser.Chrome.all:667|ms
+ - frontend.navtiming2.mediaWikiLoad.by_continent.Africa:667|ms
Page view without NavTiming support:
input: {"event": {"action": "delete", "isAnon": false, "isHiDPI": true,
"isHttp2": true, "mediaWikiLoadComplete": 3513, "mediaWikiVersion":
"1.30.0-wmf.19", "namespaceId": 1, "originCountry": "PL", "originRegion": "LD",
"pageId": 1, "revId": 1}, "recvFrom": "example", "revision": 1, "schema":
"NavigationTiming", "seqId": 1, "timestamp": 1, "userAgent": "{\"os_minor\":
\"4\", \"is_bot\": false, \"os_major\": \"4\", \"device_family\": \"Samsung
SM-T230\", \"os_family\": \"Android\", \"browser_minor\": \"0\",
\"wmf_app_version\": \"-\", \"browser_major\": \"59\", \"browser_family\":
\"Chrome\", \"is_mediawiki\": false}", "uuid": "example", "webHost": "example",
"wiki": "example"}
@@ -299,6 +311,12 @@
- frontend.navtiming.mediaWikiLoadComplete.by_browser.Chrome.59:3513|ms
- frontend.navtiming.mediaWikiLoadComplete.by_browser.Chrome.all:3513|ms
- frontend.navtiming.mediaWikiLoadComplete.by_continent.Europe:3513|ms
+ - frontend.navtiming2.mediaWikiLoad.desktop.authenticated:3513|ms
+ - frontend.navtiming2.mediaWikiLoad.desktop.overall:3513|ms
+ - frontend.navtiming2.mediaWikiLoad.overall:3513|ms
+ - frontend.navtiming2.mediaWikiLoad.by_browser.Chrome.59:3513|ms
+ - frontend.navtiming2.mediaWikiLoad.by_browser.Chrome.all:3513|ms
+ - frontend.navtiming2.mediaWikiLoad.by_continent.Europe:3513|ms
Mobile page view:
input: {"event": {"action": "edit", "connectEnd": 0, "connectStart": 0,
"dnsLookup": 0, "domComplete": 3515, "domInteractive": 2936, "fetchStart": 0,
"isAnon": true, "isHiDPI": false, "isHttp2": true, "loadEventEnd": 3520,
"loadEventStart": 3515, "mediaWikiLoadComplete": 907, "mediaWikiVersion":
"1.30.0-wmf.19", "mobileMode": "stable", "namespaceId": 1, "originCountry":
"RU", "originRegion": "PER", "pageId": 1, "requestStart": 1, "responseEnd":
2631, "responseStart": 2367, "revId": 1}, "recvFrom": "example", "revision": 1,
"schema": "NavigationTiming", "seqId": 1, "timestamp": 1, "userAgent":
"{\"os_minor\": \"3\", \"is_bot\": false, \"os_major\": \"9\",
\"device_family\": \"iPad\", \"os_family\": \"iOS\", \"browser_minor\": \"0\",
\"wmf_app_version\": \"-\", \"browser_major\": \"9\", \"browser_family\":
\"Mobile Safari\", \"is_mediawiki\": false}", "uuid": "example", "webHost":
"example", "wiki": "example"}
@@ -442,8 +460,15 @@
- frontend.navtiming2.domInteractive.by_browser.Mobile_Safari.all:2936|ms
- frontend.navtiming2.domInteractive.by_continent.Europe:2936|ms
- frontend.navtiming2.domInteractive.by_country.Russia:2936|ms
+ - frontend.navtiming2.mediaWikiLoad.mobile.anonymous:907|ms
+ - frontend.navtiming2.mediaWikiLoad.mobile.overall:907|ms
+ - frontend.navtiming2.mediaWikiLoad.overall:907|ms
+ - frontend.navtiming2.mediaWikiLoad.by_browser.Mobile_Safari.9_0:907|ms
+ - frontend.navtiming2.mediaWikiLoad.by_browser.Mobile_Safari.all:907|ms
+ - frontend.navtiming2.mediaWikiLoad.by_continent.Europe:907|ms
+ - frontend.navtiming2.mediaWikiLoad.by_country.Russia:907|ms
-View with timings above threshold:
+View with timings above threshold (for navtiming):
input: {"event": {"action": "view", "connectEnd": 0, "connectStart": 0,
"dnsLookup": 0, "domComplete": 203077, "domInteractive": 7403, "fetchStart": 0,
"firstPaint": 9356, "isAnon": true, "isHiDPI": false, "isHttp2": true,
"loadEventEnd": 204085, "loadEventStart": 204083, "mediaWikiLoadComplete":
20922, "mediaWikiVersion": "1.30.0-wmf.19", "namespaceId": 1, "originCountry":
"FR", "originRegion": "X", "pageId": 1, "requestStart": 4484, "responseEnd":
6286, "responseStart": 5027, "revId": 1}, "recvFrom": "example", "revision": 1,
"schema": "NavigationTiming", "seqId": 1, "timestamp": 1, "userAgent":
"{\"os_minor\": null, \"is_bot\": false, \"os_major\": null, \"device_family\":
\"Other\", \"os_family\": \"Windows 10\", \"browser_minor\": \"15063\",
\"wmf_app_version\": \"-\", \"browser_major\": \"15\", \"browser_family\":
\"Edge\", \"is_mediawiki\": false}", "uuid": "example", "webHost": "example",
"wiki": "example"}
expect:
# domComplete, loadEventStart and loadEventEnd are above threshold
@@ -585,6 +610,13 @@
- frontend.navtiming2.domInteractive.by_browser.Edge.all:7403|ms
- frontend.navtiming2.domInteractive.by_continent.Europe:7403|ms
- frontend.navtiming2.domInteractive.by_country.France:7403|ms
+ - frontend.navtiming2.mediaWikiLoad.desktop.anonymous:20922|ms
+ - frontend.navtiming2.mediaWikiLoad.desktop.overall:20922|ms
+ - frontend.navtiming2.mediaWikiLoad.overall:20922|ms
+ - frontend.navtiming2.mediaWikiLoad.by_browser.Edge.15:20922|ms
+ - frontend.navtiming2.mediaWikiLoad.by_browser.Edge.all:20922|ms
+ - frontend.navtiming2.mediaWikiLoad.by_continent.Europe:20922|ms
+ - frontend.navtiming2.mediaWikiLoad.by_country.France:20922|ms
SaveTiming:
input:
--
To view, visit https://gerrit.wikimedia.org/r/392036
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2579fe7e4f1427b223b65875b9b608689e99e238
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Phedenskog <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Volans <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
