normalize sample rate (#128)

* normalize sample rate

* lint

Author: gh123man

src/DogStatsd.php

@@ -171,7 +171,7 @@ private function flushTelemetry()
      */
     public function timing($stat, $time, $sampleRate = 1.0, $tags = null)
     {
-        $time = $this->normalizeStat($time);
+        $time = $this->normalizeValue($time);
         $this->send(array($stat => "$time|ms"), $sampleRate, $tags);
     }
 
@@ -200,7 +200,7 @@ public function microtiming($stat, $time, $sampleRate = 1.0, $tags = null)
      **/
     public function gauge($stat, $value, $sampleRate = 1.0, $tags = null)
     {
-        $value = $this->normalizeStat($value);
+        $value = $this->normalizeValue($value);
         $this->send(array($stat => "$value|g"), $sampleRate, $tags);
     }
 
@@ -215,7 +215,7 @@ public function gauge($stat, $value, $sampleRate = 1.0, $tags = null)
      **/
     public function histogram($stat, $value, $sampleRate = 1.0, $tags = null)
     {
-        $value = $this->normalizeStat($value);
+        $value = $this->normalizeValue($value);
         $this->send(array($stat => "$value|h"), $sampleRate, $tags);
     }
 
@@ -230,7 +230,7 @@ public function histogram($stat, $value, $sampleRate = 1.0, $tags = null)
      **/
     public function distribution($stat, $value, $sampleRate = 1.0, $tags = null)
     {
-        $value = $this->normalizeStat($value);
+        $value = $this->normalizeValue($value);
         $this->send(array($stat => "$value|d"), $sampleRate, $tags);
     }
 
@@ -246,7 +246,7 @@ public function distribution($stat, $value, $sampleRate = 1.0, $tags = null)
     public function set($stat, $value, $sampleRate = 1.0, $tags = null)
     {
         if (!is_string($value)) {
-            $value = $this->normalizeStat($value);
+            $value = $this->normalizeValue($value);
         }
 
         $this->send(array($stat => "$value|s"), $sampleRate, $tags);
@@ -295,7 +295,7 @@ public function decrement($stats, $sampleRate = 1.0, $tags = null, $value = -1)
      **/
     public function updateStats($stats, $delta = 1, $sampleRate = 1.0, $tags = null)
     {
-        $delta = $this->normalizeStat($delta);
+        $delta = $this->normalizeValue($delta);
         if (!is_array($stats)) {
             $stats = array($stats);
         }
@@ -381,6 +381,7 @@ private function normalizeTags($tags)
      **/
     public function send($data, $sampleRate = 1.0, $tags = null)
     {
+        $sampleRate = $this->normalizeValue($sampleRate);
         $this->metrics_sent += count($data);
         // sampling
         $sampledData = array();
@@ -640,7 +641,7 @@ private function eventUdp($vals)
      *
      * @return string Formatted value
      */
-    private function normalizeStat($value)
+    private function normalizeValue($value)
     {
         // Controlls the way things are converted to a string.
         // Otherwise localization settings impact float to string conversion (e.x 1.3 -> 1,3 and 10000 => 10,000)

tests/UnitTests/DogStatsd/SocketsTest.php

@@ -1302,6 +1302,23 @@ public function testFloatLocalization()
         setlocale(LC_ALL, $defaultLocale);
     }
 
+    public function testSampleRateFloatLocalization()
+    {
+        $defaultLocale = setlocale(LC_ALL, 0);
+        setlocale(LC_ALL, 'de_DE');
+        $dog = new DogStatsd(array("disable_telemetry" => true));
+
+        while (!array_key_exists(0, $this->getSocketSpy()->argsFromSocketSendtoCalls)) {
+            $dog->timing('test', 21.21000, 0.3);
+        }
+
+        $this->assertSame(
+            'test:21.21|ms|@0.3',
+            $this->getSocketSpy()->argsFromSocketSendtoCalls[0][1]
+        );
+        setlocale(LC_ALL, $defaultLocale);
+    }
+
     public function testMetricPrefix()
     {
       $dog = new DogStatsd(array("disable_telemetry" => false, "metric_prefix" => 'test_prefix'));