Fix trace context being lost when finishing queue transaction

getsentry · Dec 17, 2023 · ff3c28d · ff3c28d
1 parent c8de534
commit ff3c28d
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/src/Sentry/Laravel/Features/QueueIntegration.php b/src/Sentry/Laravel/Features/QueueIntegration.php
@@ -16,6 +16,7 @@
 use Sentry\Tracing\PropagationContext;
 use Sentry\Tracing\SpanContext;
 use Sentry\Tracing\SpanStatus;
+use Sentry\Tracing\Transaction;
 use Sentry\Tracing\TransactionContext;
 use Sentry\Tracing\TransactionSource;
 
@@ -169,8 +170,20 @@ private function finishJobWithStatus(SpanStatus $status): void
         $span = $this->maybePopSpan();
 
         if ($span !== null) {
-            $span->finish();
+            $hub = SentrySdk::getCurrentHub();
+
+            $currentSpan = $hub->getSpan();
+
+            if ($span instanceof Transaction) {
+                $hub->setSpan($span);
+            }
+
             $span->setStatus($status);
+            $span->finish();
+
+            if ($span instanceof Transaction) {
+                $hub->setSpan($currentSpan);
+            }
         }
     }