Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don’t track build statistics for unnamed modules

Browse source 
Module::getName() is allowed to return null (and there are some existing
modules where it returns null, such as Wikibase’s SitesModule). Passing
the null name directly into strtr() produces a warning in PHP 8.1, but
more importantly, it will also result in tracking the metric
`resourceloader_build.` without any stat name (under any PHP version).
Fix this by not tracking the individual module in this case.

Bug: T319219
Change-Id: I2b2905d7452bd2694c5c1af3272e0fb0e95ff144
This commit is contained in:
Lucas Werkmeister 2022-11-02 13:43:33 +01:00
parent 8d785f979d
commit 2c93649672
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
includes/ResourceLoader/Module.php
View file

@ -883,9 +883,12 @@ abstract class Module implements LoggerAwareInterface {
}
$statTiming = microtime( true ) - $statStart;
$statName = strtr( $this->getName(), '.', '_' );
$stats->timing( "resourceloader_build.all", 1000 * $statTiming );
$stats->timing( "resourceloader_build.$statName", 1000 * $statTiming );
$name = $this->getName();
if ( $name !== null ) {
$statName = strtr( $name, '.', '_' );
$stats->timing( "resourceloader_build.$statName", 1000 * $statTiming );
}
return $content;
}