wip

Author: cleptric

src/Tracing/PropagationContext.php

@@ -193,14 +193,14 @@ private static function parseTraceparentAndBaggage(string $traceparent, string $
         $client = SentrySdk::getCurrentHub()->getClient();
         if ($client !== null) {
             $options = $client->getOptions();
-            $orgId = $options->getOrgId() ?? $options->getDsn()->getOrgId();
+            $orgId = $options->getOrgId() ?? ($options->getDsn() !== null) ? $options->getDsn()->getOrgId() : null;
 
             // Always check if the received org ID in the baggages matches
             // the one configured in the SDK.
             if (
-                $orgId !== null &&
-                $samplingContext->has('org_id') &&
-                $samplingContext->get('org_id') !== (string) $orgId
+                $orgId !== null
+                && $samplingContext->has('org_id')
+                && $samplingContext->get('org_id') !== (string) $orgId
             ) {
                 // We do not continue the trace.
                 return $context;

src/Tracing/TransactionContext.php

@@ -155,14 +155,14 @@ private static function parseTraceAndBaggage(string $sentryTrace, string $baggag
         $client = SentrySdk::getCurrentHub()->getClient();
         if ($client !== null) {
             $options = $client->getOptions();
-            $orgId = $options->getOrgId() ?? $options->getDsn()->getOrgId();
+            $orgId = $options->getOrgId() ?? ($options->getDsn() !== null) ? $options->getDsn()->getOrgId() : null;
 
             // Always check if the received org ID in the baggages matches
             // the one configured in the SDK.
             if (
-                $orgId !== null &&
-                $samplingContext->has('org_id') &&
-                $samplingContext->get('org_id') !== (string) $orgId
+                $orgId !== null
+                && $samplingContext->has('org_id')
+                && $samplingContext->get('org_id') !== (string) $orgId
             ) {
                 // We do not continue the trace.
                 return $context;