Update contrib packages to SemConv 1.30

.github/workflows/php.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2', '8.3']
+        php-version: ['8.0', '8.1', '8.2', '8.3']
         # Sorted alphabetically to ease finding the desired run in the GitHub Workflow UI.
         project: [
           'Aws',
@@ -55,34 +55,6 @@ jobs:
           'Symfony',
         ]
         exclude:
-          - project: 'Instrumentation/Guzzle'
-            php-version: 7.4
-          - project: 'Instrumentation/HttpAsyncClient'
-            php-version: 7.4
-          - project: 'Instrumentation/Slim'
-            php-version: 7.4
-          - project: 'Instrumentation/Psr3'
-            php-version: 7.4
-          - project: 'Instrumentation/Psr6'
-            php-version: 7.4
-          - project: 'Instrumentation/Psr14'
-            php-version: 7.4
-          - project: 'Instrumentation/Psr15'
-            php-version: 7.4
-          - project: 'Instrumentation/Psr16'
-            php-version: 7.4
-          - project: 'Instrumentation/Psr18'
-            php-version: 7.4
-          - project: 'Instrumentation/IO'
-            php-version: 7.4
-          - project: 'Instrumentation/Symfony'
-            php-version: 7.4
-          - project: 'Instrumentation/Laravel'
-            php-version: 7.4
-          - project: 'Instrumentation/CodeIgniter'
-            php-version: 7.4
-          - project: 'Instrumentation/Yii'
-            php-version: 7.4
           - project: 'Instrumentation/IO'
             php-version: 8.0
           - project: 'Instrumentation/IO'
@@ -99,14 +71,12 @@ jobs:
             php-version: 8.0
           - project: 'Instrumentation/MySqli'
             php-version: 8.1
-          - project: 'Instrumentation/PDO'
-            php-version: 7.4
           - project: 'Instrumentation/PDO'
             php-version: 8.0
           - project: 'Instrumentation/PDO'
             php-version: 8.1
-          - project: 'Instrumentation/ExtAmqp'
-            php-version: 7.4
+          - project: 'Instrumentation/Psr3'
+            php-version: 8.0
           - project: 'Instrumentation/ExtAmqp'
             php-version: 8.0
           - project: 'Instrumentation/ExtAmqp'
@@ -117,22 +87,12 @@ jobs:
             php-version: 8.0
           - project: 'Instrumentation/ExtRdKafka'
             php-version: 8.1
-          - project: 'Instrumentation/OpenAIPHP'
-            php-version: 7.4
           - project: 'Instrumentation/OpenAIPHP'
             php-version: 8.0
-          - project: 'Instrumentation/CakePHP'
-            php-version: 7.4
-          - project: 'Propagation/ServerTiming'
-            php-version: 7.4
-          - project: 'ResourceDetectors/Container'
-            php-version: 7.4
-          - project: 'Sampler/RuleBased'
-            php-version: 7.4
+          - project: 'Logs/Monolog'
+            php-version: 8.0
           - project: 'Sampler/RuleBased'
             php-version: 8.0
-          - project: 'Symfony'
-            php-version: 7.4
           - project: 'Symfony'
             php-version: 8.0
     steps:

Makefile

@@ -19,9 +19,9 @@ build: ## Build image
 install: ## Install dependencies
 	$(DC_RUN_PHP) env XDEBUG_MODE=off composer install
 update: ## Update dependencies
-	$(DC_RUN_PHP) env XDEBUG_MODE=off composer update
+	$(DC_RUN_PHP) env XDEBUG_MODE=off composer update --no-plugins
 update-lowest: ## Update dependencies to lowest supported versions
-	$(DC_RUN_PHP) env XDEBUG_MODE=off composer update --prefer-lowest
+	$(DC_RUN_PHP) env XDEBUG_MODE=off composer update --no-plugins --prefer-lowest
 test: ## Run all tests
 	$(DC_RUN_PHP) env XDEBUG_MODE=off vendor/bin/phpunit --testdox --colors=always
 test-unit: ## Run unit tests
@@ -39,7 +39,7 @@ psalm-info: ## Run psalm with info
 phpstan: ## Run phpstan
 	$(DC_RUN_PHP) env XDEBUG_MODE=off vendor/bin/phpstan analyse --memory-limit=256M
 validate: ## Validate composer file
-	$(DC_RUN_PHP) env XDEBUG_MODE=off composer validate
+	$(DC_RUN_PHP) env XDEBUG_MODE=off composer validate --no-plugins
 packages-composer: ## Validate all composer packages
 	$(DC_RUN) php env XDEBUG_MODE=off vendor/bin/otel packages:composer:validate
 bash: ## Bash shell

src/Instrumentation/CakePHP/composer.json

@@ -13,7 +13,7 @@
     "ext-opentelemetry": "*",
     "cakephp/cakephp": "^4 || ^5",
     "open-telemetry/api": "^1.0",
-    "open-telemetry/sem-conv": "^1.24"
+    "open-telemetry/sem-conv": "^1.30"
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^3",

src/Instrumentation/CakePHP/src/CakePHPInstrumentation.php

@@ -18,7 +18,7 @@ public static function register(): void
         $instrumentation = new CachedInstrumentation(
             'io.opentelemetry.contrib.php.cakephp',
             null,
-            'https://opentelemetry.io/schemas/1.24.0'
+            'https://opentelemetry.io/schemas/1.30.0',
         );
         Server::hook($instrumentation);
         Controller::hook($instrumentation);

src/Instrumentation/CakePHP/src/Hooks/Cake/Command/Command.php

@@ -26,10 +26,10 @@ public function instrument(): void
                 $builder = $this->instrumentation
                     ->tracer()
                     ->spanBuilder(sprintf('Command %s', $command->getName() ?: 'unknown'))
-                    ->setAttribute(TraceAttributes::CODE_FUNCTION, $function)
+                    ->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
                     ->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
                     ->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
-                    ->setAttribute(TraceAttributes::CODE_LINENO, $lineno);
+                    ->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno);
 
                 $parent = Context::getCurrent();
                 $span = $builder->startSpan();
@@ -52,9 +52,7 @@ public function instrument(): void
                 $span = Span::fromContext($scope->context());
 
                 if ($exception) {
-                    $span->recordException($exception, [
-                        TraceAttributes::EXCEPTION_ESCAPED => true,
-                    ]);
+                    $span->recordException($exception);
                     $span->setStatus(StatusCode::STATUS_ERROR, $exception->getMessage());
                 }
 

src/Instrumentation/CakePHP/src/Hooks/Cake/Controller/Controller.php

@@ -35,7 +35,7 @@ public function instrument(): void
                 $scope->detach();
                 $span = \OpenTelemetry\API\Trace\Span::fromContext($scope->context());
                 if ($exception) {
-                    $span->recordException($exception, [TraceAttributes::EXCEPTION_ESCAPED => true]);
+                    $span->recordException($exception);
                     $span->setStatus(StatusCode::STATUS_ERROR, $exception->getMessage());
                 }
                 $response = $app->getResponse();

src/Instrumentation/CakePHP/src/Hooks/Cake/Http/Server.php

@@ -49,7 +49,7 @@ public function instrument(): void
                     $span->setAttribute(TraceAttributes::HTTP_ROUTE, $route);
                 }
                 if ($exception) {
-                    $span->recordException($exception, [TraceAttributes::EXCEPTION_ESCAPED => true]);
+                    $span->recordException($exception);
                     $span->setStatus(StatusCode::STATUS_ERROR, $exception->getMessage());
                 }
                 if ($response) {

src/Instrumentation/CakePHP/src/Hooks/CakeHookTrait.php

@@ -57,10 +57,10 @@ protected function buildSpan(?ServerRequestInterface $request, string $class, st
                 : sprintf('%s', $request?->getMethod() ?? 'unknown')
         )
             ->setSpanKind(SpanKind::KIND_SERVER)
-            ->setAttribute(TraceAttributes::CODE_FUNCTION, $function)
+            ->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
             ->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
             ->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
-            ->setAttribute(TraceAttributes::CODE_LINENO, $lineno);
+            ->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno);
         $parent = Context::getCurrent();
         if (!$root && $request) {
             $this->isRoot = true;

src/Instrumentation/CakePHP/tests/Integration/CakePHPInstrumentationTest.php

@@ -45,7 +45,7 @@ public function test_index(): void
         $this->assertSame(SpanKind::KIND_SERVER, $serverSpan->getKind());
         $this->assertGreaterThan(0, $serverSpan->getAttributes()->count());
         $attributes = $serverSpan->getAttributes()->toArray();
-        $this->assertSame('run', $attributes['code.function']);
+        $this->assertSame('run', $attributes['code.function.name']);
         $this->assertSame('GET', $attributes['http.request.method']);
         $this->assertSame(200, $attributes['http.response.status_code']);
         $this->assertSame(self::TRACE_ID, $serverSpan->getParentContext()->getTraceId());
@@ -58,7 +58,7 @@ public function test_index(): void
         $this->assertSame(SpanKind::KIND_INTERNAL, $controllerSpan->getKind());
         $this->assertGreaterThan(0, $controllerSpan->getAttributes()->count());
         $attributes = $controllerSpan->getAttributes()->toArray();
-        $this->assertSame('invokeAction', $attributes['code.function']);
+        $this->assertSame('invokeAction', $attributes['code.function.name']);
         $this->assertSame($serverSpan->getTraceId(), $controllerSpan->getParentContext()->getTraceId());
         $this->assertSame($serverSpan->getSpanId(), $controllerSpan->getParentContext()->getSpanId());
     }

src/Instrumentation/CakePHP/tests/Integration/CommandTest.php

@@ -12,6 +12,9 @@ class CommandTest extends TestCase
 
     public function test_command_tracing(): void
     {
+        if (PHP_VERSION_ID < 80100) {
+            $this->markTestSkipped();
+        }
         $this->assertCount(0, $this->storage);
 
         $this->exec('dummy');

src/Instrumentation/CodeIgniter/composer.json

@@ -13,7 +13,7 @@
       "ext-opentelemetry": "*",
       "codeigniter4/framework": "^4.3",
       "open-telemetry/api": "^1.0",
-      "open-telemetry/sem-conv": "^1.24"
+      "open-telemetry/sem-conv": "^1.30"
     },
     "require-dev": {
       "friendsofphp/php-cs-fixer": "^3.50",

src/Instrumentation/CodeIgniter/src/CodeIgniterInstrumentation.php

@@ -26,7 +26,7 @@ public static function register(): void
         $instrumentation = new CachedInstrumentation(
             'io.opentelemetry.contrib.php.codeigniter',
             null,
-            'https://opentelemetry.io/schemas/1.24.0'
+            'https://opentelemetry.io/schemas/1.30.0',
         );
 
         // The method that creates request/response/controller objects is in the same class as the method
@@ -60,10 +60,10 @@ public static function register(): void
                     /** @phan-suppress-next-line PhanDeprecatedFunction */
                     ->spanBuilder(\sprintf('%s', $request?->getMethod() ?? 'unknown'))
                     ->setSpanKind(SpanKind::KIND_SERVER)
-                    ->setAttribute(TraceAttributes::CODE_FUNCTION, $function)
+                    ->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
                     ->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
                     ->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
-                    ->setAttribute(TraceAttributes::CODE_LINENO, $lineno);
+                    ->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno);
 
                 $parent = Context::getCurrent();
 
@@ -146,7 +146,7 @@ public static function register(): void
                 }
 
                 if ($exception) {
-                    $span->recordException($exception, [TraceAttributes::EXCEPTION_ESCAPED => true]);
+                    $span->recordException($exception);
                     $span->setStatus(StatusCode::STATUS_ERROR, $exception->getMessage());
                 }
 

src/Instrumentation/CodeIgniter/tests/Integration/CodeIgniterInstrumentationTest.php

@@ -76,6 +76,5 @@ public function test_exception()
         $this->assertEquals('Exception', $eventAttributes->get('exception.type'));
         $this->assertEquals('Threw', $eventAttributes->get('exception.message'));
         $this->assertNotNull($eventAttributes->get('exception.stacktrace'));
-        $this->assertTrue($eventAttributes->get('exception.escaped'));
     }
 }