fix(Instrumentation/Console): remove deprecated traceable attribute CODE_NAMESPACE (#181)

gaelreyrol · web-flow · commit b43820544338 · 2025-06-20T09:10:29.000+02:00
diff --git a/src/Instrumentation/Symfony/Console/TraceableConsoleEventSubscriber.php b/src/Instrumentation/Symfony/Console/TraceableConsoleEventSubscriber.php
@@ -79,8 +79,7 @@ public function startSpan(ConsoleCommandEvent $event): void
         $spanBuilder = $tracer
             ->spanBuilder($name)
             ->setAttributes([
-                TraceAttributes::CODE_FUNCTION_NAME => 'execute',
-                TraceAttributes::CODE_NAMESPACE => $class,
+                TraceAttributes::CODE_FUNCTION_NAME => $class.'::execute',
             ]);
 
         $parent = Context::getCurrent();
diff --git a/tests/Functional/Application/src/Controller/Traceable/ActionTraceableController.php b/tests/Functional/Application/src/Controller/Traceable/ActionTraceableController.php
@@ -92,8 +92,7 @@ public function manual(TracerInterface $tracer): Response
         $spanBuilder = $tracer
             ->spanBuilder('Manual')
             ->setAttributes([
-                TraceAttributes::CODE_FUNCTION_NAME => 'manual',
-                TraceAttributes::CODE_NAMESPACE => self::class,
+                TraceAttributes::CODE_FUNCTION_NAME => self::class.'::manual',
             ]);
 
         $parent = Context::getCurrent();
diff --git a/tests/Functional/Application/src/Controller/Traceable/AutowireTracerController.php b/tests/Functional/Application/src/Controller/Traceable/AutowireTracerController.php
@@ -24,8 +24,7 @@ public function index(): Response
         $spanBuilder = $this->tracer
             ->spanBuilder('Manual')
             ->setAttributes([
-                TraceAttributes::CODE_FUNCTION_NAME => 'manual',
-                TraceAttributes::CODE_NAMESPACE => self::class,
+                TraceAttributes::CODE_FUNCTION_NAME => self::class.'::index',
             ]);
 
         $parent = Context::getCurrent();
diff --git a/tests/Functional/Application/src/Controller/Traceable/ClassTraceableController.php b/tests/Functional/Application/src/Controller/Traceable/ClassTraceableController.php
@@ -31,8 +31,7 @@ public function manual(): Response
         $spanBuilder = $this->tracer
             ->spanBuilder('Manual')
             ->setAttributes([
-                TraceAttributes::CODE_FUNCTION_NAME => 'manual',
-                TraceAttributes::CODE_NAMESPACE => self::class,
+                TraceAttributes::CODE_FUNCTION_NAME => self::class.'::manual',
             ]);
 
         $parent = Context::getCurrent();
diff --git a/tests/Functional/Application/src/Controller/Traceable/DualTracerController.php b/tests/Functional/Application/src/Controller/Traceable/DualTracerController.php
@@ -22,8 +22,7 @@ public function fallback(
         $spanBuilder = $tracer
             ->spanBuilder('Manual')
             ->setAttributes([
-                TraceAttributes::CODE_FUNCTION_NAME => 'manual',
-                TraceAttributes::CODE_NAMESPACE => self::class,
+                TraceAttributes::CODE_FUNCTION_NAME => self::class.'::fallback',
             ]);
 
         $parent = Context::getCurrent();
@@ -49,8 +48,7 @@ public function main(
         $spanBuilder = $tracer
             ->spanBuilder('Manual')
             ->setAttributes([
-                TraceAttributes::CODE_FUNCTION_NAME => 'manual',
-                TraceAttributes::CODE_NAMESPACE => self::class,
+                TraceAttributes::CODE_FUNCTION_NAME => self::class.'::main',
             ]);
 
         $parent = Context::getCurrent();
diff --git a/tests/Functional/Application/src/Service/DummyLoggerService.php b/tests/Functional/Application/src/Service/DummyLoggerService.php
@@ -22,8 +22,7 @@ public function infoWithSpan(string $message): void
 
         $span = $this->tracer->spanBuilder('logWithSpan')
             ->setAttributes([
-                TraceAttributes::CODE_FUNCTION_NAME => 'logWithSpan',
-                TraceAttributes::CODE_NAMESPACE => self::class,
+                TraceAttributes::CODE_FUNCTION_NAME => self::class.'::infoWithSpan',
             ])
             ->setParent($parent)
             ->startSpan();
diff --git a/tests/Functional/DummyLoggerServiceTest.php b/tests/Functional/DummyLoggerServiceTest.php
@@ -47,8 +47,7 @@ public function testInfoWithSpan(): void
         self::assertSpanName($span, 'logWithSpan');
         self::assertSpanStatus($span, StatusData::ok());
         self::assertSpanAttributes($span, [
-            'code.function.name' => 'logWithSpan',
-            'code.namespace' => 'App\Service\DummyLoggerService',
+            'code.function.name' => 'App\Service\DummyLoggerService::infoWithSpan',
         ]);
 
         self::assertSame($span->getSpanId(), $log->getSpanContext()->getSpanId());
diff --git a/tests/Functional/Instrumentation/Console/ConsoleAttributeTracingTest.php b/tests/Functional/Instrumentation/Console/ConsoleAttributeTracingTest.php
@@ -35,8 +35,7 @@ public function testSuccess(): void
         self::assertSpanName($mainSpan, 'traceable:traceable-command');
         self::assertSpanStatus($mainSpan, StatusData::ok());
         self::assertSpanAttributes($mainSpan, [
-            'code.function.name' => 'execute',
-            'code.namespace' => 'App\Command\Traceable\TraceableCommand',
+            'code.function.name' => 'App\Command\Traceable\TraceableCommand::execute',
             'symfony.console.exit_code' => 0,
         ]);
         self::assertSpanEventsCount($mainSpan, 0);
@@ -63,8 +62,7 @@ public function testFailure(): void
         self::assertSpanName($mainSpan, 'traceable:traceable-command');
         self::assertSpanStatus($mainSpan, StatusData::error());
         self::assertSpanAttributes($mainSpan, [
-            'code.function.name' => 'execute',
-            'code.namespace' => 'App\Command\Traceable\TraceableCommand',
+            'code.function.name' => 'App\Command\Traceable\TraceableCommand::execute',
             'symfony.console.exit_code' => 1,
         ]);
         self::assertSpanEventsCount($mainSpan, 0);
@@ -96,8 +94,7 @@ public function testException(): void
         self::assertSpanName($mainSpan, 'traceable:traceable-command');
         self::assertSpanStatus($mainSpan, StatusData::error());
         self::assertSpanAttributes($mainSpan, [
-            'code.function.name' => 'execute',
-            'code.namespace' => 'App\Command\Traceable\TraceableCommand',
+            'code.function.name' => 'App\Command\Traceable\TraceableCommand::execute',
             'symfony.console.exit_code' => 1,
         ]);
 
@@ -132,8 +129,7 @@ public function testFallback(): void
         self::assertSpanName($mainSpan, 'traceable:fallback-command');
         self::assertSpanStatus($mainSpan, StatusData::ok());
         self::assertSpanAttributes($mainSpan, [
-            'code.function.name' => 'execute',
-            'code.namespace' => 'App\Command\Traceable\FallbackCommand',
+            'code.function.name' => 'App\Command\Traceable\FallbackCommand::execute',
             'symfony.console.exit_code' => 0,
         ]);
         self::assertSpanEventsCount($mainSpan, 0);
diff --git a/tests/Functional/Instrumentation/Console/ConsoleAutoTracingTest.php b/tests/Functional/Instrumentation/Console/ConsoleAutoTracingTest.php
@@ -34,8 +34,7 @@ public function testSuccess(): void
         self::assertSpanName($mainSpan, 'traceable:auto-command');
         self::assertSpanStatus($mainSpan, StatusData::ok());
         self::assertSpanAttributes($mainSpan, [
-            'code.function.name' => 'execute',
-            'code.namespace' => 'App\Command\Traceable\AutoCommand',
+            'code.function.name' => 'App\Command\Traceable\AutoCommand::execute',
             'symfony.console.exit_code' => 0,
         ]);
         self::assertSpanEventsCount($mainSpan, 0);
diff --git a/tests/Functional/Instrumentation/Console/ConsoleEmptyExcludesTracingTest.php b/tests/Functional/Instrumentation/Console/ConsoleEmptyExcludesTracingTest.php
@@ -34,8 +34,7 @@ public function testSuccess(): void
         self::assertSpanName($mainSpan, 'traceable:auto-command');
         self::assertSpanStatus($mainSpan, StatusData::ok());
         self::assertSpanAttributes($mainSpan, [
-            'code.function.name' => 'execute',
-            'code.namespace' => 'App\Command\Traceable\AutoCommand',
+            'code.function.name' => 'App\Command\Traceable\AutoCommand::execute',
             'symfony.console.exit_code' => 0,
         ]);
         self::assertSpanEventsCount($mainSpan, 0);
diff --git a/tests/Functional/Instrumentation/HttpKernel/HttpKernelAttributeTracingTest.php b/tests/Functional/Instrumentation/HttpKernel/HttpKernelAttributeTracingTest.php
@@ -194,8 +194,7 @@ public function testManualClass(): void
         self::assertSpanName($manualSpan, 'Manual');
         self::assertSpanStatus($manualSpan, StatusData::ok());
         self::assertSpanAttributes($manualSpan, [
-            'code.function.name' => 'manual',
-            'code.namespace' => 'App\Controller\Traceable\ClassTraceableController',
+            'code.function.name' => 'App\Controller\Traceable\ClassTraceableController::manual',
         ]);
         self::assertSpanEventsCount($manualSpan, 1);
         $manualSpanEvent = $manualSpan->getEvents()[0];
@@ -293,8 +292,7 @@ public function testManualTrace(): void
         self::assertSpanName($manualSpan, 'Manual');
         self::assertSpanStatus($manualSpan, StatusData::ok());
         self::assertSpanAttributes($manualSpan, [
-            'code.function.name' => 'manual',
-            'code.namespace' => 'App\Controller\Traceable\ActionTraceableController',
+            'code.function.name' => 'App\Controller\Traceable\ActionTraceableController::manual',
         ]);
         self::assertSpanEventsCount($manualSpan, 1);
         $manualSpanEvent = $manualSpan->getEvents()[0];
@@ -341,8 +339,7 @@ public function testAutowireTracer(): void
         self::assertSpanName($manualSpan, 'Manual');
         self::assertSpanStatus($manualSpan, StatusData::ok());
         self::assertSpanAttributes($manualSpan, [
-            'code.function.name' => 'manual',
-            'code.namespace' => 'App\Controller\Traceable\AutowireTracerController',
+            'code.function.name' => 'App\Controller\Traceable\AutowireTracerController::index',
         ]);
         self::assertSpanEventsCount($manualSpan, 1);
         $manualSpanEvent = $manualSpan->getEvents()[0];
@@ -387,8 +384,7 @@ public function testFallbackDualTracer(): void
         self::assertSpanName($manualSpan, 'Manual');
         self::assertSpanStatus($manualSpan, StatusData::ok());
         self::assertSpanAttributes($manualSpan, [
-            'code.function.name' => 'manual',
-            'code.namespace' => 'App\Controller\Traceable\DualTracerController',
+            'code.function.name' => 'App\Controller\Traceable\DualTracerController::fallback',
         ]);
         self::assertSpanEventsCount($manualSpan, 1);
         $manualSpanEvent = $manualSpan->getEvents()[0];
@@ -414,8 +410,7 @@ public function testMainDualTracer(): void
         self::assertSpanName($manualSpan, 'Manual');
         self::assertSpanStatus($manualSpan, StatusData::ok());
         self::assertSpanAttributes($manualSpan, [
-            'code.function.name' => 'manual',
-            'code.namespace' => 'App\Controller\Traceable\DualTracerController',
+            'code.function.name' => 'App\Controller\Traceable\DualTracerController::main',
         ]);
         self::assertSpanEventsCount($manualSpan, 1);
         $manualSpanEvent = $manualSpan->getEvents()[0];
