Check if transaction is sampled before creating child spans (#898)

Author: stayallive

src/Sentry/Laravel/Features/CacheIntegration.php

@@ -76,8 +76,8 @@ public function handleRedisCommand(RedisEvents\CommandExecuted $event): void
     {
         $parentSpan = SentrySdk::getCurrentHub()->getSpan();
 
-        // If there is no tracing span active there is no need to handle the event
-        if ($parentSpan === null) {
+        // If there is no sampled span there is no need to handle the event
+        if ($parentSpan === null || !$parentSpan->getSampled()) {
             return;
         }
 

src/Sentry/Laravel/Features/FolioPackageIntegration.php

@@ -45,7 +45,7 @@ public function handleViewMatched(ViewMatched $matched): void
 
         $transaction = SentrySdk::getCurrentHub()->getTransaction();
 
-        if ($transaction === null) {
+        if ($transaction === null || !$transaction->getSampled()) {
             return;
         }
 

src/Sentry/Laravel/Features/HttpClientIntegration.php

@@ -67,8 +67,8 @@ public function handleRequestSendingHandlerForTracing(RequestSending $event): vo
     {
         $parentSpan = SentrySdk::getCurrentHub()->getSpan();
 
-        // If there is no tracing span active there is no need to handle the event
-        if ($parentSpan === null) {
+        // If there is no sampled span there is no need to handle the event
+        if ($parentSpan === null || !$parentSpan->getSampled()) {
             return;
         }
 

src/Sentry/Laravel/Features/LivewirePackageIntegration.php

@@ -107,7 +107,8 @@ public function handleComponentBoot(Component $component, ?string $method = null
 
         $parentSpan = SentrySdk::getCurrentHub()->getSpan();
 
-        if ($parentSpan === null) {
+        // If there is no sampled span there is no need to handle the event
+        if ($parentSpan === null || !$parentSpan->getSampled()) {
             return;
         }
 

src/Sentry/Laravel/Features/NotificationsIntegration.php

@@ -38,7 +38,8 @@ public function handleNotificationSending(NotificationSending $event): void
     {
         $parentSpan = SentrySdk::getCurrentHub()->getSpan();
 
-        if ($parentSpan === null) {
+        // If there is no sampled span there is no need to handle the event
+        if ($parentSpan === null || !$parentSpan->getSampled()) {
             return;
         }
 

src/Sentry/Laravel/Features/QueueIntegration.php

@@ -62,7 +62,7 @@ public function onBoot(Dispatcher $events): void
             Queue::createPayloadUsing(function (?string $connection, ?string $queue, ?array $payload): ?array {
                 $parentSpan = SentrySdk::getCurrentHub()->getSpan();
 
-                if ($parentSpan !== null) {
+                if ($parentSpan !== null && $parentSpan->getSampled()) {
                     $context = (new SpanContext)
                         ->setOp(self::QUEUE_SPAN_OP_QUEUE_PUBLISH)
                         ->setData([

src/Sentry/Laravel/Tracing/EventHandler.php

@@ -165,8 +165,8 @@ protected function queryExecutedHandler(DatabaseEvents\QueryExecuted $query): vo
 
         $parentSpan = SentrySdk::getCurrentHub()->getSpan();
 
-        // If there is no tracing span active there is no need to handle the event
-        if ($parentSpan === null) {
+        // If there is no sampled span there is no need to handle the event
+        if ($parentSpan === null || !$parentSpan->getSampled()) {
             return;
         }
 
@@ -219,8 +219,8 @@ protected function responsePreparingHandler(RoutingEvents\PreparingResponse $eve
 
         $parentSpan = SentrySdk::getCurrentHub()->getSpan();
 
-        // If there is no tracing span active there is no need to handle the event
-        if ($parentSpan === null) {
+        // If there is no sampled span there is no need to handle the event
+        if ($parentSpan === null || !$parentSpan->getSampled()) {
             return;
         }
 
@@ -234,8 +234,8 @@ protected function transactionBeginningHandler(DatabaseEvents\TransactionBeginni
     {
         $parentSpan = SentrySdk::getCurrentHub()->getSpan();
 
-        // If there is no tracing span active there is no need to handle the event
-        if ($parentSpan === null) {
+        // If there is no sampled span there is no need to handle the event
+        if ($parentSpan === null || !$parentSpan->getSampled()) {
             return;
         }
 

src/Sentry/Laravel/Tracing/Integrations/LighthouseIntegration.php

@@ -101,7 +101,8 @@ public function handleStartRequest(StartRequest $startRequest): void
     {
         $this->previousSpan = SentrySdk::getCurrentHub()->getSpan();
 
-        if ($this->previousSpan === null) {
+        // If there is no sampled span there is no need to handle the event
+        if ($this->previousSpan === null || !$this->previousSpan->getSampled()) {
             return;
         }
 

src/Sentry/Laravel/Tracing/Middleware.php

@@ -163,6 +163,11 @@ public function setBootedTimestamp(?float $timestamp = null): void
 
     private function startTransaction(Request $request, HubInterface $sentry): void
     {
+        // Prevent starting a new transaction if we are already in a transaction
+        if ($sentry->getTransaction() !== null) {
+            return;
+        }
+
         // Reset our internal state in case we are handling multiple requests (e.g. in Octane)
         $this->didRouteMatch = false;
 
@@ -193,15 +198,15 @@ private function startTransaction(Request $request, HubInterface $sentry): void
 
         $transaction = $sentry->startTransaction($context);
 
+        SentrySdk::getCurrentHub()->setSpan($transaction);
+
         // If this transaction is not sampled, we can stop here to prevent doing work for nothing
         if (!$transaction->getSampled()) {
             return;
         }
 
         $this->transaction = $transaction;
 
-        SentrySdk::getCurrentHub()->setSpan($this->transaction);
-
         $bootstrapSpan = $this->addAppBootstrapSpan();
 
         $appContextStart = new SpanContext;

src/Sentry/Laravel/Tracing/Routing/TracingRoutingDispatcher.php

@@ -12,10 +12,8 @@ protected function wrapRouteDispatch(callable $dispatch, Route $route)
     {
         $parentSpan = SentrySdk::getCurrentHub()->getSpan();
 
-        // When there is no span we can skip creating
-        // the span and just immediately return with the
-        // callable result because there is no transaction.
-        if ($parentSpan === null) {
+        // If there is no sampled span there is no need to wrap the dispatch
+        if ($parentSpan === null || !$parentSpan->getSampled()) {
             return $dispatch();
         }