improve the Application::bootstrapWith hook to find Laravel's application name (#3036)

joke2k · web-flow · commit 12e3d77ca237 · 2025-01-16T09:24:07.000+01:00
diff --git a/src/DDTrace/Integrations/Laravel/LaravelIntegration.php b/src/DDTrace/Integrations/Laravel/LaravelIntegration.php
@@ -91,7 +91,12 @@ function ($app) use ($integration) {
                     $configPath = realpath($app->configPath());
                     if (file_exists($configPath . '/app.php')) {
                         $config = require $configPath . '/app.php';
-                        $integration->serviceName = $config['name'];
+                        if (isset($config['name'])) {
+                            $integration->serviceName = $config['name'];
+                        }                        
+                    }
+                    if (empty($integration->serviceName)) {
+                        $integration->serviceName = isset($_ENV['APP_NAME']) ? $_ENV['APP_NAME'] : 'Laravel';
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,12 @@ function ($app) use ($integration) {`
`91`	`91`	`$configPath = realpath($app->configPath());`
`92`	`92`	`if (file_exists($configPath . '/app.php')) {`
`93`	`93`	`$config = require $configPath . '/app.php';`
`94`		`- $integration->serviceName = $config['name'];`
	`94`	`+ if (isset($config['name'])) {`
	`95`	`+ $integration->serviceName = $config['name'];`
	`96`	`+ }`
	`97`	`+ }`
	`98`	`+ if (empty($integration->serviceName)) {`
	`99`	`+ $integration->serviceName = isset($_ENV['APP_NAME']) ? $_ENV['APP_NAME'] : 'Laravel';`
`95`	`100`	`}`
`96`	`101`	`}`
`97`	`102`	`}`