Drop support for PHP 7.4 and 8.0, introduce support for PHP 8.4, fix semconv deprecations (#315)

* Fixed a bit of warnings and deprecations
* Dropped support for PHP 7.4 and 8.0. Introduced support for PHP 8.4
* Set revision psalm to 6.4.0, more suppressions
* Curl instrumentation fix
* updated packages generating deprecated warnings

Author: intuibase

composer.json

@@ -9,7 +9,7 @@
   "minimum-stability": "dev",
   "prefer-stable": true,
   "require": {
-    "php": "^8.0",
+    "php": "^8.1",
     "ext-opentelemetry": "*",
     "open-telemetry/api": "^1.0",
     "open-telemetry/sem-conv": "^1.30",
@@ -26,10 +26,10 @@
     "php-http/mock-client": "*",
     "phpstan/phpstan": "^1.1",
     "phpstan/phpstan-phpunit": "^1.0",
-    "psalm/plugin-phpunit": "^0.18.4",
+    "psalm/plugin-phpunit": "^0.19.2",
     "open-telemetry/sdk": "^1.0",
     "phpunit/phpunit": "^9.5",
-    "vimeo/psalm": "^5.0",
+    "vimeo/psalm": "6.4.0",
     "symfony/http-client": "^5.4||^6.0",
     "symfony/messenger": "^5.4||^6.0",
     "open-telemetry/opentelemetry-propagation-traceresponse": "*",

src/HttpClientInstrumentation.php

@@ -18,6 +18,7 @@
 
 /**
  * @phan-file-suppress PhanTypeInvalidCallableArraySize
+ * @psalm-suppress UnusedClass
  */
 final class HttpClientInstrumentation
 {
@@ -43,6 +44,7 @@ public static function register(): void
             'https://opentelemetry.io/schemas/1.30.0',
         );
 
+        /** @psalm-suppress UnusedFunctionCall */
         hook(
             HttpClientInterface::class,
             'request',

src/MessengerInstrumentation.php

@@ -32,6 +32,7 @@ final class MessengerInstrumentation
     const ATTRIBUTE_MESSENGER_MESSAGE = 'symfony.messenger.message';
     const ATTRIBUTE_MESSENGER_TRANSPORT = 'symfony.messenger.transport';
 
+    /** @psalm-suppress PossiblyUnusedMethod */
     public static function register(): void
     {
         $instrumentation = new CachedInstrumentation(
@@ -42,7 +43,9 @@ public static function register(): void
 
         /**
          * MessageBusInterface dispatches messages to the handlers.
-         */
+         *
+         * @psalm-suppress UnusedFunctionCall
+        */
         hook(
             MessageBusInterface::class,
             'dispatch',
@@ -107,7 +110,9 @@ public static function register(): void
 
         /**
          * SenderInterface sends messages to a transport.
-         */
+         *
+         * @psalm-suppress UnusedFunctionCall
+        */
         hook(
             SenderInterface::class,
             'send',

src/ResponsePropagationSetter.php

@@ -20,7 +20,9 @@ public static function instance(): self
         return $instance ??= new self();
     }
 
-    /** @psalm-suppress InvalidReturnType */
+    /** @psalm-suppress InvalidReturnType
+     *  @psalm-suppress PossiblyUnusedMethod
+     */
     public function keys($carrier): array
     {
         assert($carrier instanceof Response);

src/SymfonyInstrumentation.php

@@ -18,6 +18,7 @@
 use Symfony\Component\HttpKernel\HttpKernel;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 
+/** @psalm-suppress UnusedClass */
 final class SymfonyInstrumentation
 {
     public const NAME = 'symfony';
@@ -30,6 +31,7 @@ public static function register(): void
             'https://opentelemetry.io/schemas/1.30.0',
         );
 
+        /** @psalm-suppress UnusedFunctionCall */
         hook(
             HttpKernel::class,
             'handle',
@@ -146,16 +148,17 @@ public static function register(): void
             }
         );
 
+        /** @psalm-suppress UnusedFunctionCall */
         hook(
             HttpKernel::class,
             'handleThrowable',
             pre: static function (
-                HttpKernel $kernel,
+                HttpKernel $_kernel,
                 array $params,
-                string $class,
-                string $function,
-                ?string $filename,
-                ?int $lineno,
+                string $_class,
+                string $_function,
+                ?string $_filename,
+                ?int $_lineno,
             ): array {
                 /** @var \Throwable $throwable */
                 $throwable = $params[0];

tests/Integration/HttpClientInstrumentationTest.php

@@ -5,8 +5,6 @@
 namespace OpenTelemetry\Tests\Instrumentation\Symfony\tests\Integration;
 
 use OpenTelemetry\API\Trace\StatusCode;
-use OpenTelemetry\SDK\Trace\EventInterface;
-use OpenTelemetry\SDK\Trace\ImmutableSpan;
 use OpenTelemetry\SemConv\TraceAttributes;
 use Symfony\Component\HttpClient\CurlHttpClient;
 use Symfony\Component\HttpClient\Exception\InvalidArgumentException;
@@ -21,7 +19,7 @@ public static function setUpBeforeClass(): void
         TestHttpServer::start();
     }
 
-    protected function getHttpClient(string $testCase): HttpClientInterface
+    protected function getHttpClient(string $_testCase): HttpClientInterface
     {
         return new CurlHttpClient(['verify_peer' => false, 'verify_host' => false]);
     }
@@ -38,7 +36,6 @@ public function test_send_request(string $method, string $uri, int $statusCode,
         $response->getStatusCode();
         $this->assertCount(1, $this->storage);
 
-        /** @var ImmutableSpan $span */
         $span = $this->storage[0];
 
         $this->assertStringContainsString($method, $span->getName());
@@ -65,7 +62,7 @@ public function test_throw_exception(): void
         $this->assertCount(0, $this->storage);
 
         try {
-            $response = $client->request('GET', 'http://localhost:8057', [
+            $client->request('GET', 'http://localhost:8057', [
                 'bindto' => '127.0.0.1:9876',
                 'auth_ntlm' => [],
             ]);
@@ -74,9 +71,7 @@ public function test_throw_exception(): void
 
         $this->assertCount(1, $this->storage);
 
-        /** @var ImmutableSpan $span */
         $span = $this->storage[0];
-        /** @var EventInterface $event */
         $event = $span->getEvents()[0];
 
         $this->assertTrue($span->getAttributes()->has(TraceAttributes::URL_FULL));

tests/Integration/MessengerInstrumentationTest.php

@@ -6,7 +6,6 @@
 
 use OpenTelemetry\API\Trace\SpanKind;
 use OpenTelemetry\Contrib\Instrumentation\Symfony\MessengerInstrumentation;
-use OpenTelemetry\SDK\Trace\ImmutableSpan;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\MessageBus;
 use Symfony\Component\Messenger\MessageBusInterface;
@@ -23,6 +22,7 @@ public function __construct(string $message)
         $this->message = $message;
     }
 
+    /** @psalm-suppress PossiblyUnusedMethod */
     public function getMessage(): string
     {
         return $this->message;
@@ -61,7 +61,6 @@ public function test_dispatch_message($message, string $spanName, int $kind, arr
 
         $this->assertCount(1, $this->storage);
 
-        /** @var ImmutableSpan $span */
         $span = $this->storage[0];
 
         $this->assertEquals($spanName, $span->getName());
@@ -87,7 +86,6 @@ public function test_send_message($message, string $spanName, int $kind, array $
 
         $this->assertCount(1, $this->storage);
 
-        /** @var ImmutableSpan $span */
         $span = $this->storage[0];
 
         $this->assertEquals($spanName, $span->getName());
@@ -112,9 +110,7 @@ public function dispatch(object $message, array $stamps = []): Envelope
             $bus->dispatch(new SendEmailMessage('Hello Again'));
         } catch (\Throwable $e) {
             $this->assertCount(1, $this->storage);
-
-            /** @var ImmutableSpan $span */
-            $span = $this->storage[0];
+            $this->assertArrayHasKey(0, $this->storage);
         }
     }
 
@@ -146,8 +142,7 @@ public function send(Envelope $envelope): Envelope
             $transport->send(new Envelope(new SendEmailMessage('Hello Again')));
         } catch (\Throwable $e) {
             $this->assertCount(1, $this->storage);
-
-            $span = $this->storage[0];
+            $this->assertArrayHasKey(0, $this->storage);
         }
     }
 

tests/Integration/SymfonyInstrumentationTest.php

@@ -8,7 +8,6 @@
 use OpenTelemetry\API\Trace\StatusCode;
 use OpenTelemetry\Contrib\Propagation\ServerTiming\ServerTimingPropagator;
 use OpenTelemetry\Contrib\Propagation\TraceResponse\TraceResponsePropagator;
-use OpenTelemetry\SDK\Trace\ImmutableSpan;
 use OpenTelemetry\SemConv\TraceAttributes;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -200,13 +199,12 @@ public function test_http_kernel_handle_subrequest(): void
         $kernel->handle($request, HttpKernelInterface::SUB_REQUEST);
         $this->assertCount(1, $this->storage);
 
-        /** @var ImmutableSpan $span */
         $span = $this->storage[0];
         $this->assertSame('GET ErrorController', $span->getName());
         $this->assertSame(SpanKind::KIND_INTERNAL, $span->getKind());
     }
 
-    private function getHttpKernel(EventDispatcherInterface $eventDispatcher, $controller = null, RequestStack $requestStack = null, array $arguments = []): HttpKernel
+    private function getHttpKernel(EventDispatcherInterface $eventDispatcher, $controller = null, ?RequestStack $requestStack = null, array $arguments = []): HttpKernel
     {
         $controller ??= fn () => new Response('Hello');