Merge branch 'open-telemetry:main' into react-http

Author: smaddock

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.30"
+    "open-telemetry/sem-conv": "^1.32"
   },
   "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.30.0',
+            'https://opentelemetry.io/schemas/1.32.0',
         );
         Server::hook($instrumentation);
         Controller::hook($instrumentation);

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

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

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.name']);
+        $this->assertSame('Cake\Http\Server::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.name']);
+        $this->assertSame('Cake\Controller\Controller::invokeAction', $attributes['code.function.name']);
         $this->assertSame($serverSpan->getTraceId(), $controllerSpan->getParentContext()->getTraceId());
         $this->assertSame($serverSpan->getSpanId(), $controllerSpan->getParentContext()->getSpanId());
     }

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.30"
+      "open-telemetry/sem-conv": "^1.32"
     },
     "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.30.0',
+            'https://opentelemetry.io/schemas/1.32.0',
         );
 
         // The method that creates request/response/controller objects is in the same class as the method
@@ -65,9 +65,8 @@ public static function register(): void
                     /** @phan-suppress-next-line PhanDeprecatedFunction */
                     ->spanBuilder(\sprintf('%s', $request?->getMethod() ?? 'unknown'))
                     ->setSpanKind(SpanKind::KIND_SERVER)
-                    ->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
-                    ->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
-                    ->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
+                    ->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, sprintf('%s::%s', $class, $function))
+                    ->setAttribute(TraceAttributes::CODE_FILE_PATH, $filename)
                     ->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno);
 
                 $parent = Context::getCurrent();

src/Instrumentation/Curl/composer.json

@@ -20,7 +20,7 @@
     "ext-curl": "*",
     "ext-opentelemetry": "*",
     "open-telemetry/api": "^1.0",
-    "open-telemetry/sem-conv": "^1.30"
+    "open-telemetry/sem-conv": "^1.32"
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^3",

src/Instrumentation/Curl/src/CurlInstrumentation.php

@@ -46,7 +46,7 @@ public static function register(): void
         $instrumentation = new CachedInstrumentation(
             'io.opentelemetry.contrib.php.curl',
             null,
-            Version::VERSION_1_30_0->url(),
+            Version::VERSION_1_32_0->url(),
         );
 
         hook(
@@ -156,7 +156,7 @@ public static function register(): void
                     ->setParent($parent)
                     ->setSpanKind(SpanKind::KIND_CLIENT)
                     ->setAttribute(TraceAttributes::CODE_FUNCTION_NAME, $function)
-                    ->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
+                    ->setAttribute(TraceAttributes::CODE_FILE_PATH, $filename)
                     ->setAttribute(TraceAttributes::CODE_LINE_NUMBER, $lineno)
                     ->setAttributes($curlHandleToAttributes[$params[0]]->getAttributes());