Job queue: prefix metric keys with 'jobqueue'; segment with '.'

Currently names are segmented with a dash (for legacy reasons), which
makes them clutter the top-level MediaWiki.* metric namespace.

Change-Id: I785819723808368fbf9c3f5ea167f50f40733a3a

diff --git a/includes/jobqueue/JobQueue.php b/includes/jobqueue/JobQueue.php
index 013cc61..1cf1b4b 100644 (file)
--- a/includes/jobqueue/JobQueue.php
+++ b/includes/jobqueue/JobQueue.php
@@ -683,8 +683,12 @@ abstract class JobQueue {
         * @since 1.22
         */
        public static function incrStats( $key, $type, $delta = 1 ) {
-               wfIncrStats( $key, $delta );
-               wfIncrStats( "{$key}-{$type}", $delta );
+               static $stats;
+               if ( !$stats ) {
+                       $stats = RequestContext::getMain()->getStats();
+               }
+               $stats->updateCount( "jobqueue.{$key}", $delta );
+               $stats->updateCount( "jobqueue.{$key}.{$type}", $delta );
        }
 
        /**