Improve tracing

src/Sentry/Laravel/EventHandler.php

@@ -278,14 +278,16 @@ private function addQueryBreadcrumb($query, $bindings, $time, $connectionName)
             $data['bindings'] = $bindings;
         }
 
-        $transaction = SentrySdk::getCurrentHub()->getTransaction();
-        if (null !== $transaction) {
+        $parentSpan = Integration::currentTracingSpan();
+
+        if (null !== $parentSpan) {
             $context = new SpanContext();
             $context->setOp('sql.query');
             $context->setDescription($query);
             $context->setStartTimestamp(microtime(true) - $time / 1000);
             $context->setEndTimestamp($context->getStartTimestamp() + $time / 1000);
-            $transaction->startChild($context);
+
+            $parentSpan->startChild($context);
         }
 
         Integration::addBreadcrumb(new Breadcrumb(

src/Sentry/Laravel/PublishConfigCommand.php

@@ -63,7 +63,6 @@ public function setEnvironmentValue(array $values)
 
         if (count($values) > 0) {
             foreach ($values as $envKey => $envValue) {
-
                 $str .= "\n"; // In case the searched variable is in the last line without \n
                 $keyPosition = strpos($str, "{$envKey}=");
                 $endOfLinePosition = strpos($str, "\n", $keyPosition);
@@ -75,12 +74,13 @@ public function setEnvironmentValue(array $values)
                 } else {
                     $str = str_replace($oldLine, "{$envKey}={$envValue}", $str);
                 }
-
             }
         }
 
         $str = substr($str, 0, -1);
-        if (!file_put_contents($envFile, $str)) return false;
+        if (!file_put_contents($envFile, $str)) {
+            return false;
+        }
         return true;
     }
 }

src/Sentry/Laravel/Tracing/Middleware.php

@@ -4,6 +4,7 @@
 
 use Closure;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 use Sentry\SentrySdk;
 use Sentry\State\Hub;
 use Sentry\Tracing\SpanContext;
@@ -18,6 +19,13 @@ class Middleware
      */
     protected $transaction;
 
+    /**
+     * The span for the `app.handle` part of the application.
+     *
+     * @var \Sentry\Tracing\Span|null
+     */
+    protected $appSpan;
+
     /**
      * Handle an incoming request.
      *
@@ -46,6 +54,18 @@ public function handle($request, Closure $next)
     public function terminate($request, $response): void
     {
         if ($this->transaction !== null && app()->bound('sentry')) {
+            if ($this->appSpan !== null) {
+                $this->appSpan->finish();
+            }
+
+            // Make sure we set the transaction and not have a child span in the Sentry SDK
+            // If the transaction is not on the scope during finish, the trace.context is wrong
+            SentrySdk::getCurrentHub()->setSpan($this->transaction);
+
+            if ($response instanceof Response) {
+                $this->transaction->setHttpStatus($response->status());
+            }
+
             $this->transaction->finish();
         }
     }
@@ -81,6 +101,13 @@ private function startTransaction(Request $request, Hub $sentry): void
                 $spanContextStart->setStartTimestamp(defined('LARAVEL_START') ? LARAVEL_START : $request->server('REQUEST_TIME_FLOAT', $fallbackTime));
                 $spanContextStart->setEndTimestamp(microtime(true));
                 $this->transaction->startChild($spanContextStart);
+
+                $appContextStart = new SpanContext();
+                $appContextStart->setOp('app.handle');
+                $appContextStart->setStartTimestamp(microtime(true));
+                $this->appSpan = $this->transaction->startChild($appContextStart);
+
+                SentrySdk::getCurrentHub()->setSpan($this->appSpan);
             });
         }
     }

src/Sentry/Laravel/Tracing/ServiceProvider.php

@@ -53,7 +53,6 @@ private function wrapViewEngine(Engine $realEngine): Engine
         /** @var ViewFactory $viewFactory */
         $viewFactory = $this->app->make('view');
 
-        /** @noinspection UnusedFunctionResultInspection */
         $viewFactory->composer('*', static function (View $view) use ($viewFactory) : void {
             $viewFactory->share(ViewEngineDecorator::SHARED_KEY, $view->name());
         });

src/Sentry/Laravel/Tracing/ViewEngineDecorator.php

@@ -1,12 +1,12 @@
 <?php
 
-
 namespace Sentry\Laravel\Tracing;
 
 use Illuminate\Contracts\View\Engine;
 use Illuminate\View\Compilers\CompilerInterface;
 use Illuminate\View\Factory;
 use Sentry\Laravel\Integration;
+use Sentry\SentrySdk;
 use Sentry\Tracing\SpanContext;
 
 final class ViewEngineDecorator implements Engine
@@ -42,15 +42,22 @@ public function get($path, array $data = []): string
 
         $span = $parentSpan->startChild($context);
 
+        $scope = SentrySdk::getCurrentHub()->pushScope();
+        $scope->setSpan($span);
+
         $result = $this->engine->get($path, $data);
 
         $span->finish();
 
+        SentrySdk::getCurrentHub()->popScope();
+
         return $result;
     }
 
     /**
-     * Laravel uses this function internally
+     * Laravel uses this function internally.
+     *
+     * @internal
      */
     public function getCompiler(): CompilerInterface
     {