Revert "Count API and hook calls, with 1:1000 sampling"

This seems to use 3.67% of index.php real time per xenon.

This reverts commit c4cd2399390f7922c88bb521c39bfbefe000338e.

Change-Id: I1eb8dfc72036493e430271f0db3f2f2f96b149c3

diff --git a/includes/Hooks.php b/includes/Hooks.php
index c726538..036d65c 100644 (file)
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -135,10 +135,6 @@ class Hooks {
         *   returning null) is equivalent to returning true.
         */
        public static function run( $event, array $args = array(), $deprecatedVersion = null ) {
-               $stats = RequestContext::getMain()->getStats();
-               $metric = $stats->increment( 'hooks.' . $event );
-               $metric->setSampleRate( 0.001 );
-
                foreach ( self::getHandlers( $event ) as $hook ) {
                        // Turn non-array values into an array. (Can't use casting because of objects.)
                        if ( !is_array( $hook ) ) {

diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 8ce505a..f2059d7 100644 (file)
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -1089,14 +1089,8 @@ class ApiMain extends ApiBase {
 
                $this->checkAsserts( $params );
 
-               $stats = $this->getContext()->getStats();
-               $statsPath = 'api.modules.' . strtr( $module->getModulePath(), '+', '.' );
-               $metric = $stats->increment( $statsPath );
-               $metric->setSampleRate( 0.001 );
-
                // Execute
                $module->execute();
-
                Hooks::run( 'APIAfterExecute', array( &$module ) );
 
                $this->reportUnusedParams();

diff --git a/includes/api/ApiQuery.php b/includes/api/ApiQuery.php
index 8959a46..5378e92 100644 (file)
--- a/includes/api/ApiQuery.php
+++ b/includes/api/ApiQuery.php
@@ -276,7 +276,6 @@ class ApiQuery extends ApiBase {
                }
 
                $cacheMode = $this->mPageSet->getCacheMode();
-               $stats =  $this->getContext()->getStats();
 
                // Execute all unfinished modules
                /** @var $module ApiQueryBase */
@@ -284,11 +283,6 @@ class ApiQuery extends ApiBase {
                        $params = $module->extractRequestParams();
                        $cacheMode = $this->mergeCacheMode(
                                $cacheMode, $module->getCacheMode( $params ) );
-
-                       $statsPath = 'api.modules.' . strtr( $module->getModulePath(), '+', '.' );
-                       $metric = $stats->increment( $statsPath );
-                       $metric->setSampleRate( 0.001 );
-
                        $module->execute();
                        Hooks::run( 'APIQueryAfterExecute', array( &$module ) );
                }