Refactor service mapping to a more general location

DataDog · Dec 14, 2023 · eff88d7 · eff88d7
1 parent 810d6de
commit eff88d7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/Integrations/Integrations/DatabaseIntegrationHelper.php b/src/Integrations/Integrations/DatabaseIntegrationHelper.php
@@ -63,10 +63,6 @@ public static function propagateViaSqlComments($query, $databaseService, $mode =
         $tags = [];
 
         if ($databaseService != "") {
-            $mapping = dd_trace_env_config('DD_SERVICE_MAPPING');
-            if (isset($mapping[$databaseService])) {
-                $databaseService = $mapping[$databaseService];
-            }
             $tags["dddbs"] = $databaseService;
         }
 

diff --git a/src/Integrations/Integrations/Integration.php b/src/Integrations/Integrations/Integration.php
@@ -167,13 +167,19 @@ public static function handleInternalSpanServiceName(SpanData $span, $fallbackNa
         if ($flatServiceNames) {
             $rootSpan = \DDTrace\root_span();
             if ($rootSpan) {
-                $span->service = $rootSpan->service;
+                $service = $rootSpan->service;
             } else {
-                $span->service = \ddtrace_config_app_name($fallbackName);
+                $service = \ddtrace_config_app_name($fallbackName);
             }
         } else {
-            $span->service = $fallbackName;
+            $service = $fallbackName;
         }
+
+        $mapping = \dd_trace_env_config('DD_SERVICE_MAPPING');
+        if (isset($mapping[$service])) {
+            $service = $mapping[$service];
+        }
+        $span->service = $service;
     }
 }