Merge branch 'main' into fix_issues

Author: intuibase

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

@@ -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/tests/Integration/CakePHPInstrumentationTest.php

@@ -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

@@ -27,7 +27,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
@@ -151,7 +151,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());
                 }