wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-24 22:35:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set targetName for apiLoad and restbaseLoad metrics to the correct values again

Browse source 
If70ff601 didn't really fix anything. The only reason you'd want this data is
to distinguish between mobile and desktop data, but it just set the value to
the desktop version always...

Bug: T95432
Change-Id: I76722e3ad8b7dbe644374b24093bec696f27f48c
This commit is contained in:
Alex Monk 2015-04-09 13:48:16 +01:00
parent 8000633fee
commit 19dc7d31fe
4 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
View file

@ -129,7 +129,8 @@
.then( function () { .then( function () {
return mw.libs.ve.targetLoader.requestPageData( return mw.libs.ve.targetLoader.requestPageData(
mw.config.get( 'wgRelevantPageName' ), mw.config.get( 'wgRelevantPageName' ),
uri.query.oldid uri.query.oldid,
'mwTarget' // ve.init.mw.ViewPageTarget.static.name
); );
} ); } );

6
modules/ve-mw/init/ve.init.mw.Target.js
View file

@ -919,7 +919,11 @@ ve.init.mw.Target.prototype.load = function ( dataPromise ) {
} }
this.events.timings.activationStart = ve.now(); this.events.timings.activationStart = ve.now();
this.loading = dataPromise || mw.libs.ve.targetLoader.requestPageData( this.pageName, this.requestedRevId ); this.loading = dataPromise || mw.libs.ve.targetLoader.requestPageData(
this.pageName,
this.requestedRevId,
this.constructor.name
);
this.loading this.loading
.done( ve.init.mw.Target.onLoad.bind( this ) ) .done( ve.init.mw.Target.onLoad.bind( this ) )
.fail( ve.init.mw.Target.onLoadError.bind( this ) ); .fail( ve.init.mw.Target.onLoadError.bind( this ) );

8
modules/ve-mw/init/ve.init.mw.TargetLoader.js
View file

@ -87,7 +87,7 @@
* Request the page HTML and various metadata from the MediaWiki API and Parsoid. * Request the page HTML and various metadata from the MediaWiki API and Parsoid.
* @return {jQuery.Promise} Abortable promise resolved with a JSON object * @return {jQuery.Promise} Abortable promise resolved with a JSON object
*/ */
requestPageData: function ( pageName, oldid ) { requestPageData: function ( pageName, oldid, targetName ) {
var start, apiXhr, restbaseXhr, apiPromise, restbasePromise, dataPromise, var start, apiXhr, restbaseXhr, apiPromise, restbasePromise, dataPromise,
data = { data = {
action: 'visualeditor', action: 'visualeditor',
@ -113,7 +113,8 @@
ve.track( 'mwtiming.performance.system.apiLoad', { ve.track( 'mwtiming.performance.system.apiLoad', {
bytes: $.byteLength( jqxhr.responseText ), bytes: $.byteLength( jqxhr.responseText ),
duration: ve.now() - start, duration: ve.now() - start,
cacheHit: /hit/i.test( jqxhr.getResponseHeader( 'X-Cache' ) ) cacheHit: /hit/i.test( jqxhr.getResponseHeader( 'X-Cache' ) ),
targetName: targetName
} ); } );
return data; return data;
} ); } );
@ -131,7 +132,8 @@
ve.track( 'trace.restbaseLoad.exit' ); ve.track( 'trace.restbaseLoad.exit' );
ve.track( 'mwtiming.performance.system.restbaseLoad', { ve.track( 'mwtiming.performance.system.restbaseLoad', {
bytes: $.byteLength( jqxhr.responseText ), bytes: $.byteLength( jqxhr.responseText ),
duration: ve.now() - start duration: ve.now() - start,
targetName: targetName
} ); } );
return data; return data;
}, },

4
modules/ve-mw/init/ve.init.mw.trackSubscriber.js
View file

@ -133,15 +133,13 @@
} ); } );
ve.trackSubscribe( 'mwtiming.', function ( topic, data ) { ve.trackSubscribe( 'mwtiming.', function ( topic, data ) {
var target;
// Add type for save errors; not in the topic for stupid historical reasons // Add type for save errors; not in the topic for stupid historical reasons
if ( topic === 'mwtiming.performance.user.saveError' ) { if ( topic === 'mwtiming.performance.user.saveError' ) {
topic = topic + '.' + data.type; topic = topic + '.' + data.type;
} }
target = data.targetName || 'mwTarget';
// Map mwtiming.foo --> timing.ve.foo.mobile // Map mwtiming.foo --> timing.ve.foo.mobile
topic = topic.replace( /^mwtiming/, 'timing.ve.' + target ); topic = topic.replace( /^mwtiming/, 'timing.ve.' + data.targetName );
mw.track( topic, data.duration ); mw.track( topic, data.duration );
} ); } );