From 7d370196cdc48c9de6f4d2ccaea813d7e5644c1d Mon Sep 17 00:00:00 2001 From: Alexandre Choura <42672104+PROFeNoM@users.noreply.github.com> Date: Tue, 7 Jan 2025 14:51:04 +0100 Subject: [PATCH] fix: root span name in Slim V4 (#3020) --- src/DDTrace/Integrations/Slim/SlimIntegration.php | 3 +-- tests/Integrations/Slim/V4/CommonScenariosTest.php | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/DDTrace/Integrations/Slim/SlimIntegration.php b/src/DDTrace/Integrations/Slim/SlimIntegration.php index 0a2fa2f2df..3018a2a2b8 100644 --- a/src/DDTrace/Integrations/Slim/SlimIntegration.php +++ b/src/DDTrace/Integrations/Slim/SlimIntegration.php @@ -34,6 +34,7 @@ function ($app) use ($integration, $appName) { // Overwrite root span info $rootSpan = \DDTrace\root_span(); $integration->addTraceAnalyticsIfEnabled($rootSpan); + $rootSpan->name = 'slim.request'; $rootSpan->service = $appName; $rootSpan->meta[Tag::SPAN_KIND] = 'server'; $rootSpan->meta[Tag::COMPONENT] = SlimIntegration::NAME; @@ -70,8 +71,6 @@ function ($errorMiddleware, $self, $args) use ($rootSpan, $integration) { } if ('3' === $majorVersion) { - $rootSpan->name = 'slim.request'; - // Hook into the router to extract the proper route name \DDTrace\hook_method( 'Slim\\Router', diff --git a/tests/Integrations/Slim/V4/CommonScenariosTest.php b/tests/Integrations/Slim/V4/CommonScenariosTest.php index 1a248bafbe..ba9f9442fd 100644 --- a/tests/Integrations/Slim/V4/CommonScenariosTest.php +++ b/tests/Integrations/Slim/V4/CommonScenariosTest.php @@ -104,7 +104,7 @@ public function provideSpecs() [ 'A simple GET request returning a string' => [ SpanAssertion::build( - 'web.request', + 'slim.request', 'slim_test_app', 'web', 'GET /simple' @@ -133,7 +133,7 @@ public function provideSpecs() ], 'A simple GET request with a view' => [ SpanAssertion::build( - 'web.request', + 'slim.request', 'slim_test_app', 'web', 'GET /simple_view' @@ -170,7 +170,7 @@ public function provideSpecs() ], 'A GET request with an exception' => [ SpanAssertion::build( - 'web.request', + 'slim.request', 'slim_test_app', 'web', 'GET /error' @@ -204,7 +204,7 @@ public function provideSpecs() ], 'A GET request to a route with a parameter' => [ SpanAssertion::build( - 'web.request', + 'slim.request', 'slim_test_app', 'web', 'GET /parameterized/paramValue'