Fix Predis integration for clusters

DataDog · Sep 14, 2019 · d6002bb · d6002bb
1 parent a315d73
commit d6002bb
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/src/DDTrace/Integrations/Predis/PredisIntegration.php b/src/DDTrace/Integrations/Predis/PredisIntegration.php
@@ -7,6 +7,7 @@
 use DDTrace\Type;
 use DDTrace\GlobalTracer;
 use Predis\Configuration\OptionsInterface;
+use Predis\Connection\AbstractConnection;
 use Predis\Pipeline\Pipeline;
 
 const VALUE_PLACEHOLDER = "?";
@@ -221,12 +222,13 @@ public static function storeConnectionParams($predis, $args)
     {
         $tags = [];
 
-        try {
-            $identifier = (string)$predis->getConnection();
-            list($host, $port) = explode(':', $identifier);
-            $tags[Tag::TARGET_HOST] = $host;
-            $tags[Tag::TARGET_PORT] = $port;
-        } catch (\Exception $e) {
+        $connection = $predis->getConnection();
+
+        if ($connection instanceof AbstractConnection) {
+            $connectionParameters = $connection->getParameters();
+
+            $tags[Tag::TARGET_HOST] = $connectionParameters->host;
+            $tags[Tag::TARGET_PORT] = $connectionParameters->port;
         }
 
         if (isset($args[1])) {

diff --git a/tests/Integrations/Predis/PredisTest.php b/tests/Integrations/Predis/PredisTest.php
@@ -83,6 +83,22 @@ public function testPredisConnect()
         ]);
     }
 
+    public function testPredisClusterConnect()
+    {
+        $connectionString = "tcp://{$this->host}";
+
+        $traces = $this->isolateTracer(function () use ($connectionString) {
+            $client = new \Predis\Client([ $connectionString, $connectionString, $connectionString ]);
+            $client->connect();
+        });
+
+        $this->assertSpans($traces, [
+            SpanAssertion::exists('Predis.Client.__construct'),
+            SpanAssertion::build('Predis.Client.connect', 'redis', 'cache', 'Predis.Client.connect')
+                ->withExactTags([]),
+        ]);
+    }
+
     public function testPredisSetCommand()
     {
         $traces = $this->isolateTracer(function () {