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": "*",
     "ext-reflection": "*",
     "open-telemetry/api": "^1.0",
@@ -27,10 +27,10 @@
     "phpstan/phpstan-mockery": "^1.1.0",
     "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"
   },
   "autoload": {
     "psr-4": {

src/CallableFormatter.php

@@ -22,8 +22,8 @@ public static function format($callable): string
         if ($callable instanceof Closure || (is_string($callable) && function_exists($callable))) {
             $reflection = new ReflectionFunction($callable);
             $name = $reflection->getShortName();
-            if ($name === '{closure}') {
-                return $name;
+            if ((PHP_VERSION_ID < 80400 && $name === '{closure}') || (PHP_VERSION_ID >= 80400 && str_contains($name, '{closure:'))) {
+                return '{closure}';
             }
             $class = $reflection->getClosureScopeClass()?->getName() ?? '';
             if ($reflection->getClosureScopeClass()?->isAnonymous()) {

src/PsrResponsePropagationSetter.php

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

src/SlimInstrumentation.php

@@ -22,6 +22,7 @@
 use Slim\Routing\RouteContext;
 use Throwable;
 
+/** @psalm-suppress UnusedClass */
 class SlimInstrumentation
 {
     public const NAME = 'slim';
@@ -39,8 +40,10 @@ public static function register(): void
          * requires extension >= 1.0.2beta2
          * @see https://github.com/open-telemetry/opentelemetry-php-instrumentation/pull/136
          */
-        self::$supportsResponsePropagation = version_compare(phpversion('opentelemetry'), '1.0.2beta2') >= 0;
+        $otelVersion = phpversion('opentelemetry');
+        self::$supportsResponsePropagation = $otelVersion !== false && version_compare($otelVersion, '1.0.2beta2') >= 0;
 
+        /** @psalm-suppress UnusedFunctionCall */
         hook(
             App::class,
             'handle',
@@ -122,6 +125,7 @@ public static function register(): void
          * If routing fails (eg 404/not found), then the root span name will not be updated.
          *
          * @psalm-suppress ArgumentTypeCoercion
+         * @psalm-suppress UnusedFunctionCall
          */
         hook(
             RoutingMiddleware::class,
@@ -148,6 +152,7 @@ public static function register(): void
          * Create a span for Slim route's action/controller/callable
          *
          * @psalm-suppress ArgumentTypeCoercion
+         * @psalm-suppress UnusedFunctionCall
          */
         hook(
             InvocationStrategyInterface::class,

tests/Integration/SlimInstrumentationTest.php

@@ -136,7 +136,8 @@ public function performRouting(ServerRequestInterface $request): ServerRequestIn
 
     public function test_response_propagation(): void
     {
-        if (version_compare(phpversion('opentelemetry'), '1.0.2beta2') < 0) {
+        $otelVersion = phpversion('opentelemetry');
+        if ($otelVersion == false || version_compare($otelVersion, '1.0.2beta2') < 0) {
             $this->markTestSkipped('response propagation requires opentelemetry extension >= 1.0.2beta2');
         }
         $request = (new ServerRequest('GET', 'https://example.com/foo'));

tests/Unit/CallableFormatterTest.php

@@ -83,9 +83,11 @@ class TestClass
     public function __invoke()
     {
     }
+    /** @psalm-suppress PossiblyUnusedMethod */
     public function method()
     {
     }
+    /** @psalm-suppress PossiblyUnusedMethod */
     public static function staticMethod()
     {
     }