chore: update latest versions (#3065)

* chore: update latest versions * tests: Latest Predis Version * tests: Setup `test_integrations_predis_[1|latest]` * fix: Replace object key by Predis Connection --------- Co-authored-by: PROFeNoM <[email protected]> Co-authored-by: Alexandre Choura <[email protected]>
DataDog · Feb 4, 2025 · f157156 · f157156
1 parent c11372f
commit f157156
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -560,7 +560,7 @@ TEST_INTEGRATIONS_70 := \
 	test_integrations_phpredis3 \
 	test_integrations_phpredis4 \
 	test_integrations_phpredis5 \
-	test_integrations_predis_latest \
+	test_integrations_predis_1 \
 	test_integrations_sqlsrv
 
 TEST_WEB_70 := \
@@ -602,7 +602,7 @@ TEST_INTEGRATIONS_71 := \
 	test_integrations_phpredis3 \
 	test_integrations_phpredis4 \
 	test_integrations_phpredis5 \
-	test_integrations_predis_latest \
+	test_integrations_predis_1 \
 	test_integrations_sqlsrv \
 	test_opentracing_10
 
@@ -655,6 +655,7 @@ TEST_INTEGRATIONS_72 := \
 	test_integrations_phpredis3 \
 	test_integrations_phpredis4 \
 	test_integrations_phpredis5 \
+	test_integrations_predis_1 \
 	test_integrations_predis_latest \
 	test_integrations_sqlsrv \
 	test_opentracing_10
@@ -714,6 +715,7 @@ TEST_INTEGRATIONS_73 :=\
 	test_integrations_phpredis3 \
 	test_integrations_phpredis4 \
 	test_integrations_phpredis5 \
+	test_integrations_predis_1 \
 	test_integrations_predis_latest \
 	test_integrations_sqlsrv \
 	test_opentracing_10
@@ -774,6 +776,7 @@ TEST_INTEGRATIONS_74 := \
 	test_integrations_phpredis3 \
 	test_integrations_phpredis4 \
 	test_integrations_phpredis5 \
+	test_integrations_predis_1 \
 	test_integrations_predis_latest \
 	test_integrations_roadrunner \
 	test_integrations_sqlsrv \
@@ -839,6 +842,7 @@ TEST_INTEGRATIONS_80 := \
 	test_integrations_guzzle_latest \
 	test_integrations_pcntl \
 	test_integrations_phpredis5 \
+	test_integrations_predis_1 \
 	test_integrations_predis_latest \
 	test_integrations_sqlsrv \
 	test_integrations_swoole_5 \
@@ -892,6 +896,7 @@ TEST_INTEGRATIONS_81 := \
 	test_integrations_pdo \
 	test_integrations_elasticsearch7 \
 	test_integrations_phpredis5 \
+	test_integrations_predis_1 \
 	test_integrations_predis_latest \
 	test_integrations_sqlsrv \
 	test_integrations_swoole_5 \
@@ -949,6 +954,7 @@ TEST_INTEGRATIONS_82 := \
 	test_integrations_elasticsearch7 \
 	test_integrations_elasticsearch_latest \
 	test_integrations_phpredis5 \
+	test_integrations_predis_1 \
 	test_integrations_predis_latest \
 	test_integrations_frankenphp \
 	test_integrations_roadrunner \
@@ -1012,6 +1018,7 @@ TEST_INTEGRATIONS_83 := \
 	test_integrations_elasticsearch7 \
 	test_integrations_elasticsearch_latest \
 	test_integrations_phpredis5 \
+	test_integrations_predis_1 \
 	test_integrations_predis_latest \
 	test_integrations_frankenphp \
 	test_integrations_roadrunner \
@@ -1281,6 +1288,8 @@ test_integrations_phpredis5: global_test_run_dependencies
 	$(call run_tests_debug,tests/Integrations/PHPRedis/V5)
 	$(eval TEST_EXTRA_INI=)
 	$(eval TEST_EXTRA_ENV=)
+test_integrations_predis_1: global_test_run_dependencies tests/Integrations/Predis/V1/composer.lock-php$(PHP_MAJOR_MINOR)
+	$(call run_tests_debug,tests/Integrations/Predis/V1)
 test_integrations_predis_latest: global_test_run_dependencies tests/Integrations/Predis/Latest/composer.lock-php$(PHP_MAJOR_MINOR)
 	$(call run_tests_debug,tests/Integrations/Predis/Latest)
 test_integrations_frankenphp: global_test_run_dependencies

diff --git a/src/DDTrace/Integrations/Predis/PredisIntegration.php b/src/DDTrace/Integrations/Predis/PredisIntegration.php
@@ -105,7 +105,7 @@ public function init(): int
                     $span->name = 'Predis.Pipeline.executePipeline';
                     $span->resource = $span->name;
                     $span->type = Type::REDIS;
-                    PredisIntegration::setMetaAndServiceFromConnection($this, $span);
+                    PredisIntegration::setMetaAndServiceFromConnection($this->getClient(), $span);
                     if (\count($args) < 2) {
                         return;
                     }
@@ -161,8 +161,8 @@ public static function storeConnectionMetaAndService($predis, $args)
             }
         }
 
-        ObjectKVStore::put($predis, 'service', $service);
-        ObjectKVStore::put($predis, 'connection_meta', $tags);
+        ObjectKVStore::put($predis->getConnection(), 'service', $service);
+        ObjectKVStore::put($predis->getConnection(), 'connection_meta', $tags);
     }
 
     /**
@@ -175,12 +175,12 @@ public static function storeConnectionMetaAndService($predis, $args)
      */
     public static function setMetaAndServiceFromConnection($predis, SpanData $span)
     {
-        $span->service = ObjectKVStore::get($predis, 'service', PredisIntegration::DEFAULT_SERVICE_NAME);
+        $span->service = ObjectKVStore::get($predis->getConnection(), 'service', PredisIntegration::DEFAULT_SERVICE_NAME);
         $span->meta[Tag::SPAN_KIND] = 'client';
         $span->meta[Tag::COMPONENT] = PredisIntegration::NAME;
         $span->meta[Tag::DB_SYSTEM] = PredisIntegration::SYSTEM;
 
-        foreach (ObjectKVStore::get($predis, 'connection_meta', []) as $tag => $value) {
+        foreach (ObjectKVStore::get($predis->getConnection(), 'connection_meta', []) as $tag => $value) {
             $span->meta[$tag] = $value;
         }
     }

diff --git a/tests/Frameworks/Laravel/Latest/composer.json b/tests/Frameworks/Laravel/Latest/composer.json
@@ -9,7 +9,7 @@
     "license": "MIT",
     "require": {
         "php": "^8.2",
-        "laravel/framework": "11.39.1",
+        "laravel/framework": "11.41.3",
         "laravel/tinker": "^2.9"
     },
     "require-dev": {

diff --git a/tests/Frameworks/Laravel/Octane/Latest/composer.json b/tests/Frameworks/Laravel/Octane/Latest/composer.json
@@ -10,7 +10,7 @@
     "require": {
         "php": "^8.2",
         "laravel/framework": "^11.0",
-        "laravel/octane": "2.6.0",
+        "laravel/octane": "2.6.1",
         "laravel/tinker": "^2.9"
     },
     "require-dev": {

diff --git a/tests/Frameworks/Symfony/Latest/composer.json b/tests/Frameworks/Symfony/Latest/composer.json
@@ -18,8 +18,8 @@
         "symfony/dotenv": "*",
         "symfony/flex": "^2",
         "symfony/form": "*",
-        "symfony/framework-bundle": "7.2.2",
-        "symfony/messenger": "7.2.1",
+        "symfony/framework-bundle": "7.2.3",
+        "symfony/messenger": "7.2.3",
         "symfony/monolog-bundle": "^3.10",
         "symfony/property-access": "*",
         "symfony/property-info": "*",
@@ -93,4 +93,4 @@
     "require-dev": {
         "symfony/maker-bundle": "^1.49"
     }
-}
+}
diff --git a/tests/Integrations/GoogleSpanner/Latest/composer.json b/tests/Integrations/GoogleSpanner/Latest/composer.json
@@ -1,6 +1,6 @@
 {
     "require": {
-        "google/cloud-spanner": "1.92.0"
+        "google/cloud-spanner": "1.92.1"
     },
     "provide": {
         "ext-grpc": "*"

diff --git a/tests/Integrations/Predis/Latest/PredisTest.php b/tests/Integrations/Predis/Latest/PredisTest.php
@@ -166,7 +166,7 @@ public function testPredisClusterConnect()
         $connectionString = "tcp://{$this->host}";
 
         $traces = $this->isolateTracer(function () use ($connectionString) {
-            $client = new \Predis\Client([$connectionString, $connectionString, $connectionString]);
+            $client = new \Predis\Client([$connectionString, $connectionString, $connectionString], ['cluster' => 'redis']);
             $client->connect();
         });
 
@@ -251,6 +251,8 @@ public function testPredisPipeline()
             Tag::COMPONENT => 'predis',
             Tag::DB_SYSTEM => 'redis',
             'redis.pipeline_length' => '2',
+            Tag::TARGET_HOST => $this->host,
+            Tag::TARGET_PORT => $this->port,
         ];
 
         $this->assertFlameGraph($traces, [

diff --git a/tests/Integrations/Predis/Latest/composer.json b/tests/Integrations/Predis/Latest/composer.json
@@ -1,5 +1,5 @@
 {
     "require": {
-        "predis/predis": "1.1.10"
+        "predis/predis": "2.3.0"
     }
 }
diff --git a/tests/Integrations/Predis/V1/PredisTest.php b/tests/Integrations/Predis/V1/PredisTest.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace DDTrace\Tests\Integrations\Predis\V1;
+
+use DDTrace\Tag;
+use DDTrace\Tests\Common\IntegrationTestCase;
+use DDTrace\Tests\Common\SpanAssertion;
+use Predis\Configuration\Options;
+
+class PredisTest extends \DDTrace\Tests\Integrations\Predis\Latest\PredisTest
+{
+    //
+}
diff --git a/tests/Integrations/Predis/V1/composer.json b/tests/Integrations/Predis/V1/composer.json
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "predis/predis": "^1"
+    }
+}