[PATCH/PO-2958] adds an optional parameter when instantiating statsD

Author: Eduardo Kasper

src/Client/StatsD.php

@@ -5,8 +5,8 @@
 use HelloFresh\Stats\HTTPMetricAlterCallback;
 use HelloFresh\Stats\Incrementer;
 use HelloFresh\Stats\State;
-use HelloFresh\Stats\StatsD\SilentClient as StatsDClient;
 use HelloFresh\Stats\Timer;
+use League\StatsD\Client as StatsDClient;
 use League\StatsD\Exception\ConfigurationException;
 
 class StatsD extends AbstractClient implements Client
@@ -26,12 +26,14 @@ class StatsD extends AbstractClient implements Client
     /**
      * StatsD constructor.
      *
-     * @param  string                 $dsn statsd connection dsn
+     * @param string $dsn    statsd connection dsn
+     * @param Client $client statsd client
+     *
      * @throws ConfigurationException
      */
-    public function __construct($dsn)
+    public function __construct(string $dsn, $client = StatsDClient::class)
     {
-        $this->client = new StatsDClient();
+        $this->client = new $client();
         $this->client->configure($this->buildOptions($dsn));
         $this->resetHTTPRequestSection();
     }
@@ -41,7 +43,7 @@ public function __construct($dsn)
      *
      * @return array
      */
-    protected function buildOptions($dsn)
+    protected function buildOptions(string $dsn): array
     {
         $url = (array)parse_url($dsn);
 

tests/Client/StatsDTest.php

@@ -3,7 +3,19 @@
 
 use HelloFresh\Stats;
 use HelloFresh\Stats\Bucket;
+use League\StatsD\Client;
+use League\StatsD\Exception\ConfigurationException;
 use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject;
+use ReflectionClass;
+
+class ExposedClientStatsD extends StatsD
+{
+    public function getClient()
+    {
+        return $this->client;
+    }
+}
 
 class StatsDTest extends TestCase
 {
@@ -17,7 +29,7 @@ public function testBuildOptions()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $reflection = new \ReflectionClass($statsClient);
+        $reflection = new ReflectionClass($statsClient);
         $methodBuildOptions = $reflection->getMethod('buildOptions');
         $methodBuildOptions->setAccessible(true);
         $this->assertEquals(
@@ -32,6 +44,30 @@ public function testBuildOptions()
         );
     }
 
+    /**
+     * @throws ConfigurationException
+     */
+    public function testDefaultClientInstance()
+    {
+        $dns = 'statsd://stats.local:1234/prefix.ns?timeout=2.5&error=0';
+        $statsD = new ExposedClientStatsD($dns);
+        $instantiatedClient = $statsD->getClient();
+
+        $this->assertInstanceOf(Client::class, $instantiatedClient);
+    }
+
+    /**
+     * @throws ConfigurationException
+     */
+    public function testOptionalClientInstance()
+    {
+        $dns = 'statsd://stats.local:1234/prefix.ns?timeout=2.5&error=0';
+        $statsD = new ExposedClientStatsD($dns, Stats\StatsD\SilentClient::class);
+        $instantiatedClient = $statsD->getClient();
+
+        $this->assertInstanceOf(Stats\StatsD\SilentClient::class, $instantiatedClient);
+    }
+
     public function testInstances()
     {
         if (!class_exists('\League\StatsD\Client')) {
@@ -50,12 +86,12 @@ public function testHTTPRequestSection()
 
         $section = uniqid('section', true);
 
-        /** @var \PHPUnit_Framework_MockObject_MockObject|\League\StatsD\Client $statsd */
+        /** @var PHPUnit_Framework_MockObject_MockObject|Client $statsd */
         $statsd = $this->getMockBuilder('\League\StatsD\Client')->setMethods(['gauge'])->getMock();
 
         $statsClient = new StatsD($statsd);
 
-        $reflection = new \ReflectionClass($statsClient);
+        $reflection = new ReflectionClass($statsClient);
         $reflectionProperty = $reflection->getProperty('httpRequestSection');
         $reflectionProperty->setAccessible(true);