Fix tracing sampling considering sample_rate rather than the traces_s…

…ample_rate option (#1106)
getsentry · Oct 2, 2020 · 001f2e2 · 001f2e2
1 parent b392480
commit 001f2e2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- fix: Use the traces sample rate for traces instead of the event sample rate (#1106)
+
 ## 3.0.1 (2020-10-01)
 
 - fix: Use Span on Scope instead of Transaction for GuzzleMiddleware (#1099)

diff --git a/src/State/Hub.php b/src/State/Hub.php
@@ -230,7 +230,7 @@ public function startTransaction(TransactionContext $context): Transaction
         $tracesSampler = $options->getTracesSampler();
         $sampleRate = null !== $tracesSampler
             ? $tracesSampler($samplingContext)
-            : $this->getSampleRate($samplingContext->getParentSampled(), $options->getSampleRate());
+            : $this->getSampleRate($samplingContext->getParentSampled(), $options->getTracesSampleRate());
 
         if (!$this->isValidSampleRate($sampleRate)) {
             $transaction->setSampled(false);

diff --git a/tests/State/HubTest.php b/tests/State/HubTest.php
@@ -513,6 +513,24 @@ public function startTransactionDataProvider(): iterable
             false,
         ];
 
+        yield [
+            new Options([
+                'sample_rate' => 1.0,
+                'traces_sample_rate' => 0.0,
+            ]),
+            new TransactionContext(),
+            false,
+        ];
+
+        yield [
+            new Options([
+                'sample_rate' => 0.0,
+                'traces_sample_rate' => 1.0,
+            ]),
+            new TransactionContext(),
+            true,
+        ];
+
         yield [
             new Options([
                 'traces_sample_rate' => 0.5,