Fixed instrumentation of DB queries - has() seems to only check if in…

…stance already made
scoutapp · Apr 2, 2021 · aefef10 · aefef10
1 parent 2a8885c
commit aefef10
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/Laravel/Providers/ScoutApmServiceProvider.php b/src/Laravel/Providers/ScoutApmServiceProvider.php
@@ -170,9 +170,19 @@ public function boot(
             $runningInConsole = $application->runningInConsole();
         }
 
-        if ($application->has('connection')) {
-            $connection = $application->make('connection');
+        try {
+            $connection = $application->make('db')->connection();
             $this->instrumentDatabaseQueries($agent, $connection);
+        } catch (BindingResolutionException $bindingResolutionException) {
+            $log->info(
+                sprintf(
+                    'Could not set up DB instrumentation: %s',
+                    $bindingResolutionException->getMessage()
+                ),
+                [
+                    'exception' => $bindingResolutionException,
+                ]
+            );
         }
 
         if ($agent->shouldInstrument(self::INSTRUMENT_LARAVEL_QUEUES)) {