From: addshore Date: Thu, 26 Jul 2018 12:23:38 +0000 (+0100) Subject: Fix PerDbnameStatsdDataFactory metric prefix X-Git-Tag: 1.34.0-rc.0~4617^2 X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=d42d4863dc12565f329635719abd4f6841092b2d;p=lhc%2Fweb%2Fwiklou.git Fix PerDbnameStatsdDataFactory metric prefix This was reporting Mediawikiwikidatawiki for example as the '.' was added inside the rtrim call Bug: T196609 Bug: T200424 Change-Id: Ia8e51371b9a27ed14ec55bb34a52ec9e65ad55cf --- diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php index 6da537d4e1..66d8401de4 100644 --- a/includes/ServiceWiring.php +++ b/includes/ServiceWiring.php @@ -132,7 +132,7 @@ return [ $config = $services->getMainConfig(); $wiki = $config->get( 'DBname' ); return new BufferingStatsdDataFactory( - rtrim( $services->getMainConfig()->get( 'StatsdMetricPrefix' ), '.' ) . $wiki + rtrim( $services->getMainConfig()->get( 'StatsdMetricPrefix' ) ) . '.' . $wiki ); },