Set revision psalm to 6.4.0, more suppressions

intuibase · intuibase · commit 8a290bea1045 · 2025-02-12T12:50:42.000+01:00
diff --git a/src/Aws/composer.json b/src/Aws/composer.json
@@ -29,7 +29,7 @@
         "phpstan/phpstan-phpunit": "^1.0",
         "phpunit/phpunit": "~9",
         "psalm/plugin-phpunit": "^0.19.2",
-        "vimeo/psalm": "^6.0"
+        "vimeo/psalm": "6.4.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Aws/src/Eks/DataProvider.php b/src/Aws/src/Eks/DataProvider.php
@@ -28,7 +28,7 @@ public function getK8sHeader(): ?string
             return null;
         }
 
-        return 'Bearer' . file_get_contents($this->k8sTokenPath) ?: '';
+        return 'Bearer' . (file_get_contents($this->k8sTokenPath) ?: '');
     }
 
     // Check if there exists a k8s certification file
diff --git a/src/Context/Swoole/composer.json b/src/Context/Swoole/composer.json
@@ -31,6 +31,6 @@
     "psalm/plugin-phpunit": "^0.19.2",
     "open-telemetry/sdk": "^1.0",
     "phpunit/phpunit": "^9.5",
-    "vimeo/psalm": "^6.0"
+    "vimeo/psalm": "6.4.0"
   }
 }
diff --git a/src/Instrumentation/CakePHP/composer.json b/src/Instrumentation/CakePHP/composer.json
@@ -26,7 +26,7 @@
     "psalm/plugin-phpunit": "^0.19.2",
     "open-telemetry/sdk": "^1.0",
     "phpunit/phpunit": "^9.5|^10.5",
-    "vimeo/psalm": "^6.0",
+    "vimeo/psalm": "6.4.0",
     "symfony/http-client": "^6 || ^7"
   },
   "suggest": {
@@ -54,4 +54,4 @@
       "php-http/discovery": true
     }
   }
-}
+}
diff --git a/src/Instrumentation/CodeIgniter/composer.json b/src/Instrumentation/CodeIgniter/composer.json
@@ -24,7 +24,7 @@
       "phpstan/phpstan-phpunit": "^1.0",
       "psalm/plugin-phpunit": "^0.19.2",
       "phpunit/phpunit": "^9.5",
-      "vimeo/psalm": "^6.0"
+      "vimeo/psalm": "6.4.0"
     },
     "autoload": {
       "psr-4": {
diff --git a/src/Instrumentation/Curl/composer.json b/src/Instrumentation/Curl/composer.json
@@ -31,7 +31,7 @@
     "psalm/plugin-phpunit": "^0.19.2",
     "open-telemetry/sdk": "^1.0",
     "phpunit/phpunit": "^9.5",
-    "vimeo/psalm": "^6.0"
+    "vimeo/psalm": "6.4.0"
   },
   "autoload": {
     "psr-4": {
diff --git a/src/Instrumentation/ExtAmqp/composer.json b/src/Instrumentation/ExtAmqp/composer.json
@@ -24,7 +24,7 @@
     "psalm/plugin-phpunit": "^0.19.2",
     "open-telemetry/sdk": "^1.0",
     "phpunit/phpunit": "^9.5",
-    "vimeo/psalm": "^6.0"
+    "vimeo/psalm": "6.4.0"
   },
   "autoload": {
     "psr-4": {
diff --git a/src/Instrumentation/ExtAmqp/src/ExtAmqpInstrumentation.php b/src/Instrumentation/ExtAmqp/src/ExtAmqpInstrumentation.php
@@ -22,6 +22,7 @@
  * This uses SemConv 1.24, until messaging SemConv becomes stable.
  * @see https://opentelemetry.io/docs/specs/semconv/messaging/rabbitmq/
  * @phan-file-suppress PhanDeprecatedClassConstant
+ * @psalm-suppress UnusedClass
  */
 final class ExtAmqpInstrumentation
 {
@@ -35,6 +36,7 @@ public static function register(): void
             'https://opentelemetry.io/schemas/1.24.0',
         );
 
+        /** @psalm-suppress UnusedFunctionCall */
         hook(
             AMQPExchange::class,
             'publish',
@@ -148,6 +150,7 @@ public static function register(): void
 
     protected static function createInteractionWithQueueSpan(CachedInstrumentation $instrumentation, $class, string $method)
     {
+        /** @psalm-suppress UnusedFunctionCall */
         hook(
             $class,
             $method,
diff --git a/src/Instrumentation/ExtAmqp/tests/Integration/ExtAmqpInstrumentationTest.php b/src/Instrumentation/ExtAmqp/tests/Integration/ExtAmqpInstrumentationTest.php
@@ -44,7 +44,7 @@ public function tearDown(): void
 
     public function test_rabbit_basic_publish_without_args_works(): void
     {
-        list($connection, $routing_key, $channel, $exchange, $queue) = $this->setUpQueue();
+        list($connection, $routing_key, $_channel, $exchange, $queue) = $this->setUpQueue();
 
         try {
             $exchange->publish('test', $routing_key);
@@ -78,7 +78,7 @@ public function test_rabbit_basic_publish_without_args_works(): void
      */
     public function test_rabbit_basic_publish(string $messageInteraction): void
     {
-        list($connection, $routing_key, $channel, $exchange, $queue) = $this->setUpQueue();
+        list($connection, $routing_key, $_channel, $exchange, $queue) = $this->setUpQueue();
 
         try {
             $exchange->publish('test', $routing_key, AMQP_NOPARAM, []);
@@ -106,7 +106,6 @@ public function test_rabbit_basic_publish(string $messageInteraction): void
 
             $this->assertCount(2, $this->storage);
 
-            /** @var ImmutableSpan $publishSpan */
             $interactionSpan = $this->storage[1];
             $this->assertEquals(SpanKind::KIND_CLIENT, $interactionSpan->getKind());
             $this->assertEquals($queue->getName() . ' ' . $messageInteraction, $interactionSpan->getName());
diff --git a/src/Instrumentation/ExtRdKafka/composer.json b/src/Instrumentation/ExtRdKafka/composer.json
@@ -26,7 +26,7 @@
     "psalm/plugin-phpunit": "^0.19.2",
     "open-telemetry/sdk": "^1.0",
     "phpunit/phpunit": "^9.5",
-    "vimeo/psalm": "^6.0"
+    "vimeo/psalm": "6.4.0"
   },
   "autoload": {
     "psr-4": {
diff --git a/src/Instrumentation/ExtRdKafka/src/ExtRdKafkaInstrumentation.php b/src/Instrumentation/ExtRdKafka/src/ExtRdKafkaInstrumentation.php
@@ -9,6 +9,7 @@
 use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
 use OpenTelemetry\API\Trace\Span;
 use OpenTelemetry\API\Trace\SpanKind;
+use OpenTelemetry\API\Trace\StatusCode;
 use OpenTelemetry\Context\Context;
 use function OpenTelemetry\Instrumentation\hook;
 use OpenTelemetry\SemConv\TraceAttributes;
@@ -22,6 +23,7 @@
 
 use Throwable;
 
+/** @psalm-suppress UnusedClass */
 class ExtRdKafkaInstrumentation
 {
     public const NAME = 'ext_rdkafka';
@@ -44,6 +46,7 @@ public static function register(): void
 
     private static function addCommitHooks($functionName)
     {
+        /** @psalm-suppress UnusedFunctionCall */
         hook(
             KafkaConsumer::class,
             $functionName,
@@ -61,6 +64,7 @@ private static function addCommitHooks($functionName)
 
     private static function addProductionHooks($instrumentation)
     {
+        /** @psalm-suppress UnusedFunctionCall */
         hook(
             ProducerTopic::class,
             'producev',
@@ -120,6 +124,10 @@ private static function addProductionHooks($instrumentation)
 
                 $scope->detach();
                 $span = Span::fromContext($scope->context());
+                if ($exception) {
+                    $span->recordException($exception);
+                    $span->setStatus(StatusCode::STATUS_ERROR, $exception->getMessage());
+                }
                 $span->end();
 
                 return $returnValue;
@@ -129,14 +137,15 @@ private static function addProductionHooks($instrumentation)
 
     private static function addConsumeHooks($instrumentation)
     {
+        /** @psalm-suppress UnusedFunctionCall */
         hook(
             KafkaConsumer::class,
             'consume',
             post: static function (
                 ?KafkaConsumer $exchange,
                 array $params,
                 ?Message $message,
-                ?Throwable $exception
+                ?Throwable $_exception
             ) use ($instrumentation) : void {
                 // This is to ensure that there is data. Packages periodically poll this method in order to
                 // determine if there is a message there. If there is not, we don't want to create a span.
diff --git a/src/Instrumentation/Guzzle/composer.json b/src/Instrumentation/Guzzle/composer.json
@@ -26,7 +26,7 @@
     "psalm/plugin-phpunit": "^0.19.2",
     "open-telemetry/sdk": "^1.0",
     "phpunit/phpunit": "^9.5",
-    "vimeo/psalm": "^6.0"
+    "vimeo/psalm": "6.4.0"
   },
   "autoload": {
     "psr-4": {
diff --git a/src/Instrumentation/Guzzle/src/GuzzleInstrumentation.php b/src/Instrumentation/Guzzle/src/GuzzleInstrumentation.php
@@ -21,6 +21,7 @@
 use function strtolower;
 use Throwable;
 
+/** @psalm-suppress UnusedClass */
 class GuzzleInstrumentation
 {
     /** @psalm-suppress ArgumentTypeCoercion */
@@ -34,6 +35,7 @@ public static function register(): void
             'https://opentelemetry.io/schemas/1.30.0',
         );
 
+        /** @psalm-suppress UnusedFunctionCall */
         hook(
             Client::class,
             'transfer',
diff --git a/src/Instrumentation/Guzzle/tests/Integration/GuzzleInstrumentationTest.php b/src/Instrumentation/Guzzle/tests/Integration/GuzzleInstrumentationTest.php
@@ -139,7 +139,7 @@ public function test_concurrent_async(): void
             'two'   => $this->client->getAsync('www.example.com/two'),
         ];
         $this->assertCount(0, $this->storage);
-        $responses = Utils::unwrap($promises);
+        $_responses = Utils::unwrap($promises);
         $this->assertCount(2, $this->storage);
 
         $spanOne = $this->storage->offsetGet(0);
diff --git a/src/Instrumentation/HttpAsyncClient/composer.json b/src/Instrumentation/HttpAsyncClient/composer.json
@@ -35,7 +35,7 @@
     "psalm/plugin-phpunit": "^0.19.2",
     "open-telemetry/sdk": "^1.0",
     "phpunit/phpunit": "^9.5",
-    "vimeo/psalm": "^6.0"
+    "vimeo/psalm": "6.4.0"
   },
   "config": {
     "allow-plugins": {
diff --git a/src/Instrumentation/IO/composer.json b/src/Instrumentation/IO/composer.json
@@ -23,7 +23,7 @@
     "psalm/plugin-phpunit": "^0.19.2",
     "open-telemetry/sdk": "^1.0",
     "phpunit/phpunit": "^9.5",
-    "vimeo/psalm": "^6.0"
+    "vimeo/psalm": "6.4.0"
   },
   "autoload": {
     "psr-4": {
diff --git a/src/Instrumentation/Laravel/composer.json b/src/Instrumentation/Laravel/composer.json
@@ -29,7 +29,7 @@
     "phpunit/phpunit": "^9.5",
     "psalm/plugin-phpunit": "^0.19.2",
     "spatie/laravel-ignition": "*",
-    "vimeo/psalm": "^6.0"
+    "vimeo/psalm": "6.4.0"
   },
   "autoload": {
     "psr-4": {
diff --git a/src/Instrumentation/MongoDB/composer.json b/src/Instrumentation/MongoDB/composer.json
@@ -22,7 +22,7 @@
     "psalm/plugin-phpunit": "^0.19.2",
     "open-telemetry/sdk": "^1.0",
     "phpunit/phpunit": "^9.5",
-    "vimeo/psalm": "^6.0"
+    "vimeo/psalm": "6.4.0"
   },
   "autoload": {
     "psr-4": {
diff --git a/src/Instrumentation/MySqli/composer.json b/src/Instrumentation/MySqli/composer.json
@@ -36,7 +36,7 @@
     "psalm/plugin-phpunit": "^0.19.2",
     "open-telemetry/sdk": "^1.0",
     "phpunit/phpunit": "^9.5",
-    "vimeo/psalm": "^6.0"
+    "vimeo/psalm": "6.4.0"
   },
   "autoload": {
     "psr-4": {
diff --git a/src/Instrumentation/OpenAIPHP/composer.json b/src/Instrumentation/OpenAIPHP/composer.json
@@ -26,7 +26,7 @@
     "nyholm/psr7": "^1",
     "open-telemetry/sdk": "^1.0",
     "phpunit/phpunit": "^9.5",
-    "vimeo/psalm": "^6.0"
+    "vimeo/psalm": "6.4.0"
   },
   "autoload": {
     "psr-4": {
diff --git a/src/Instrumentation/PDO/composer.json b/src/Instrumentation/PDO/composer.json
@@ -28,7 +28,7 @@
     "psalm/plugin-phpunit": "^0.19.2",
     "open-telemetry/sdk": "^1.0",
     "phpunit/phpunit": "^9.5",
-    "vimeo/psalm": "^6.0"
+    "vimeo/psalm": "6.4.0"
   },
   "autoload": {
     "psr-4": {
diff --git a/src/Instrumentation/Psr14/composer.json b/src/Instrumentation/Psr14/composer.json
@@ -39,7 +39,7 @@
     "psalm/plugin-phpunit": "^0.19.2",
     "open-telemetry/sdk": "^1.0",
     "phpunit/phpunit": "^9.5",
-    "vimeo/psalm": "^6.0"
+    "vimeo/psalm": "6.4.0"
   },
   "config": {
     "allow-plugins": {
diff --git a/src/Instrumentation/Psr15/composer.json b/src/Instrumentation/Psr15/composer.json
@@ -33,6 +33,6 @@
     "psalm/plugin-phpunit": "^0.19.2",
     "open-telemetry/sdk": "^1.0",
     "phpunit/phpunit": "^9.5",
-    "vimeo/psalm": "^6.0"
+    "vimeo/psalm": "6.4.0"
   }
 }
diff --git a/src/Instrumentation/Psr16/composer.json b/src/Instrumentation/Psr16/composer.json
@@ -25,7 +25,7 @@
     "psalm/plugin-phpunit": "^0",
     "open-telemetry/sdk": "^1.0",
     "phpunit/phpunit": "^9.5",
-    "vimeo/psalm": "^6.0"
+    "vimeo/psalm": "6.4.0"
   },
   "autoload": {
     "psr-4": {
diff --git a/src/Instrumentation/Psr18/composer.json b/src/Instrumentation/Psr18/composer.json
@@ -33,6 +33,6 @@
     "psalm/plugin-phpunit": "^0.19.2",
     "open-telemetry/sdk": "^1.0",
     "phpunit/phpunit": "^9.5",
-    "vimeo/psalm": "^6.0"
+    "vimeo/psalm": "6.4.0"
   }
 }
diff --git a/src/Instrumentation/Psr3/composer.json b/src/Instrumentation/Psr3/composer.json
@@ -44,7 +44,7 @@
     "psalm/plugin-phpunit": "^0.19.2",
     "open-telemetry/sdk": "^1.0",
     "phpunit/phpunit": "^9.5",
-    "vimeo/psalm": "^6.0"
+    "vimeo/psalm": "6.4.0"
   },
   "config": {
     "allow-plugins": {
diff --git a/src/Instrumentation/Psr6/composer.json b/src/Instrumentation/Psr6/composer.json
@@ -25,7 +25,7 @@
     "psalm/plugin-phpunit": "^0",
     "open-telemetry/sdk": "^1.0",
     "phpunit/phpunit": "^9.5",
-    "vimeo/psalm": "^6.0"
+    "vimeo/psalm": "6.4.0"
   },
   "autoload": {
     "psr-4": {
diff --git a/src/Instrumentation/Slim/composer.json b/src/Instrumentation/Slim/composer.json
@@ -30,7 +30,7 @@
     "psalm/plugin-phpunit": "^0.19.2",
     "open-telemetry/sdk": "^1.0",
     "phpunit/phpunit": "^9.5",
-    "vimeo/psalm": "^6.0"
+    "vimeo/psalm": "6.4.0"
   },
   "autoload": {
     "psr-4": {
diff --git a/src/Instrumentation/Symfony/composer.json b/src/Instrumentation/Symfony/composer.json
@@ -29,7 +29,7 @@
     "psalm/plugin-phpunit": "^0.19.2",
     "open-telemetry/sdk": "^1.0",
     "phpunit/phpunit": "^9.5",
-    "vimeo/psalm": "^6.0",
+    "vimeo/psalm": "6.4.0",
     "symfony/http-client": "^5.4||^6.0",
     "symfony/messenger": "^5.4||^6.0",
     "open-telemetry/opentelemetry-propagation-traceresponse": "*",
diff --git a/src/Instrumentation/Wordpress/composer.json b/src/Instrumentation/Wordpress/composer.json
@@ -24,7 +24,7 @@
     "phpstan/phpstan-phpunit": "^1.0",
     "psalm/plugin-phpunit": "^0.19.2",
     "phpunit/phpunit": "^9.5",
-    "vimeo/psalm": "^6.0"
+    "vimeo/psalm": "6.4.0"
   },
   "autoload": {
     "psr-4": {
diff --git a/src/Instrumentation/Yii/composer.json b/src/Instrumentation/Yii/composer.json
@@ -22,7 +22,7 @@
       "phpstan/phpstan-phpunit": "^1.0",
       "psalm/plugin-phpunit": "^0.19.2",
       "phpunit/phpunit": "^9.5",
-      "vimeo/psalm": "^6.0"
+      "vimeo/psalm": "6.4.0"
     },
     "repositories": [
       {
diff --git a/src/Logs/Monolog/composer.json b/src/Logs/Monolog/composer.json
@@ -31,7 +31,7 @@
     "phpstan/phpstan-phpunit": "^1.0",
     "psalm/plugin-phpunit": "^0.19.2",
     "phpunit/phpunit": "^9.5",
-    "vimeo/psalm": "^6.0"
+    "vimeo/psalm": "6.4.0"
   },
   "config": {
     "allow-plugins": {
diff --git a/src/Propagation/TraceResponse/composer.json b/src/Propagation/TraceResponse/composer.json
@@ -25,7 +25,7 @@
     "psalm/plugin-phpunit": "^0.19.2",
     "open-telemetry/sdk": "^1.0",
     "phpunit/phpunit": "^9.5",
-    "vimeo/psalm": "^6.0",
+    "vimeo/psalm": "6.4.0",
     "symfony/http-client": "^5.4|^6.0",
     "guzzlehttp/promises": "^2",
     "php-http/message-factory": "^1.0",
diff --git a/src/ResourceDetectors/Azure/composer.json b/src/ResourceDetectors/Azure/composer.json
@@ -31,7 +31,7 @@
         "phpstan/phpstan-phpunit": "^1.0",
         "phpunit/phpunit": "~9",
         "psalm/plugin-phpunit": "^0.19.2",
-        "vimeo/psalm": "^6.0"
+        "vimeo/psalm": "6.4.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/ResourceDetectors/Container/composer.json b/src/ResourceDetectors/Container/composer.json
diff --git a/src/Sampler/RuleBased/composer.json b/src/Sampler/RuleBased/composer.json
diff --git a/src/Shims/OpenTracing/composer.json b/src/Shims/OpenTracing/composer.json
diff --git a/src/Symfony/composer.json b/src/Symfony/composer.json

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function getK8sHeader(): ?string`
`28`	`28`	`return null;`
`29`	`29`	`}`
`30`	`30`
`31`		`- return 'Bearer' . file_get_contents($this->k8sTokenPath) ?: '';`
	`31`	`+ return 'Bearer' . (file_get_contents($this->k8sTokenPath) ?: '');`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`// Check if there exists a k8s certification file`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,6 @@`
`31`	`31`	`"psalm/plugin-phpunit": "^0.19.2",`
`32`	`32`	`"open-telemetry/sdk": "^1.0",`
`33`	`33`	`"phpunit/phpunit": "^9.5",`
`34`		`- "vimeo/psalm": "^6.0"`
	`34`	`+ "vimeo/psalm": "6.4.0"`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`"psalm/plugin-phpunit": "^0.19.2",`
`27`	`27`	`"open-telemetry/sdk": "^1.0",`
`28`	`28`	`"phpunit/phpunit": "^9.5\|^10.5",`
`29`		`- "vimeo/psalm": "^6.0",`
	`29`	`+ "vimeo/psalm": "6.4.0",`
`30`	`30`	`"symfony/http-client": "^6 \|\| ^7"`
`31`	`31`	`},`
`32`	`32`	`"suggest": {`
`@@ -54,4 +54,4 @@`
`54`	`54`	`"php-http/discovery": true`
`55`	`55`	`}`
`56`	`56`	`}`
`57`		`-}`
	`57`	`+}`