dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Ignore DBPerformance thresholds in Special:ConfirmEmail"
[lhc/web/wiklou.git]
/
includes
/
libs
/
BufferingStatsdDataFactory.php
diff --git
a/includes/libs/BufferingStatsdDataFactory.php
b/includes/libs/BufferingStatsdDataFactory.php
index
192b119
..
100d2a4
100644
(file)
--- a/
includes/libs/BufferingStatsdDataFactory.php
+++ b/
includes/libs/BufferingStatsdDataFactory.php
@@
-20,6
+20,7
@@
* @file
*/
* @file
*/
+use Liuggio\StatsdClient\Entity\StatsdData;
use Liuggio\StatsdClient\Entity\StatsdDataInterface;
use Liuggio\StatsdClient\Factory\StatsdDataFactory;
use Liuggio\StatsdClient\Entity\StatsdDataInterface;
use Liuggio\StatsdClient\Factory\StatsdDataFactory;
@@
-42,7
+43,7
@@
class BufferingStatsdDataFactory extends StatsdDataFactory {
/**
* Normalize a metric key for StatsD
*
/**
* Normalize a metric key for StatsD
*
- * Replace occurences of '::' with dots and any other non-alpha
bet
ic
+ * Replace occurences of '::' with dots and any other non-alpha
numer
ic
* characters with underscores. Combine runs of dots or underscores.
* Then trim leading or trailing dots or underscores.
*
* characters with underscores. Combine runs of dots or underscores.
* Then trim leading or trailing dots or underscores.
*
@@
-51,7
+52,7
@@
class BufferingStatsdDataFactory extends StatsdDataFactory {
*/
private static function normalizeMetricKey( $key ) {
$key = preg_replace( '/[:.]+/', '.', $key );
*/
private static function normalizeMetricKey( $key ) {
$key = preg_replace( '/[:.]+/', '.', $key );
- $key = preg_replace( '/[^a-z.]+/i', '_', $key );
+ $key = preg_replace( '/[^a-z
0-9
.]+/i', '_', $key );
$key = trim( $key, '_.' );
return str_replace( array( '._', '_.' ), '.', $key );
}
$key = trim( $key, '_.' );
return str_replace( array( '._', '_.' ), '.', $key );
}
@@
-75,6
+76,9
@@
class BufferingStatsdDataFactory extends StatsdDataFactory {
return $entity;
}
return $entity;
}
+ /**
+ * @return StatsdData[]
+ */
public function getBuffer() {
return $this->buffer;
}
public function getBuffer() {
return $this->buffer;
}