Merge branch 'master' into patch-1

Author: cleptric

src/ErrorHandler.php

@@ -458,9 +458,9 @@ private function handleException(\Throwable $exception): void
      * @param string                           $file      The filename the backtrace was raised in
      * @param int                              $line      The line number the backtrace was raised at
      *
-     * @return array<int, mixed>
-     *
      * @psalm-param list<StacktraceFrame> $backtrace
+     *
+     * @return array<int, mixed>
      */
     private function cleanBacktraceFromErrorHandlerFrames(array $backtrace, string $file, int $line): array
     {

src/Event.php

@@ -892,12 +892,12 @@ public function setSdkMetadata(string $name, $data): self
     /**
      * Gets the SDK metadata.
      *
-     * @return mixed
-     *
      * @psalm-template T of string|null
      *
      * @psalm-param T $name
      *
+     * @return mixed
+     *
      * @psalm-return (T is string ? mixed : array<string, mixed>|null)
      */
     public function getSdkMetadata(?string $name = null)

src/FrameBuilder.php

@@ -158,9 +158,9 @@ private function isFrameInApp(string $file, ?string $functionName): bool
      *
      * @param array<string, mixed> $backtraceFrame The frame data
      *
-     * @return array<string, mixed>
-     *
      * @psalm-param StacktraceFrame $backtraceFrame
+     *
+     * @return array<string, mixed>
      */
     private function getFunctionArguments(array $backtraceFrame): array
     {

src/Monolog/BreadcrumbHandler.php

@@ -26,13 +26,13 @@ final class BreadcrumbHandler extends AbstractProcessingHandler
     private $hub;
 
     /**
-     * @phpstan-param int|string|Level|LogLevel::* $level
-     *
      * @param HubInterface $hub    The hub to which errors are reported
      * @param int|string   $level  The minimum logging level at which this
      *                             handler will be triggered
      * @param bool         $bubble Whether the messages that are handled can
      *                             bubble up the stack or not
+     *
+     * @phpstan-param int|string|Level|LogLevel::* $level
      */
     public function __construct(HubInterface $hub, $level = Logger::DEBUG, bool $bubble = true)
     {

src/State/Hub.php

@@ -276,7 +276,6 @@ public function startTransaction(TransactionContext $context, array $customSampl
 
             if ($tracesSampler !== null) {
                 $sampleRate = $tracesSampler($samplingContext);
-
                 $sampleSource = 'config:traces_sampler';
             } else {
                 $parentSampleRate = $context->getMetadata()->getParentSamplingRate();
@@ -302,6 +301,12 @@ public function startTransaction(TransactionContext $context, array $customSampl
 
             $transaction->getMetadata()->setSamplingRate($sampleRate);
 
+            // Always overwrite the sample_rate in the DSC
+            $dynamicSamplingContext = $context->getMetadata()->getDynamicSamplingContext();
+            if ($dynamicSamplingContext !== null) {
+                $dynamicSamplingContext->set('sample_rate', (string) $sampleRate, true);
+            }
+
             if ($sampleRate === 0.0) {
                 $transaction->setSampled(false);
 

src/State/HubInterface.php

@@ -51,12 +51,12 @@ public function popScope(): bool;
      *
      * @param callable $callback The callback to be executed
      *
-     * @return mixed|void The callback's return value, upon successful execution
-     *
      * @psalm-template T
      *
      * @psalm-param callable(Scope): T $callback
      *
+     * @return mixed|void The callback's return value, upon successful execution
+     *
      * @psalm-return T
      */
     public function withScope(callable $callback);

src/Tracing/DynamicSamplingContext.php

@@ -40,9 +40,9 @@ private function __construct()
      * @param string $key   the list member key
      * @param string $value the list member value
      */
-    public function set(string $key, string $value): self
+    public function set(string $key, string $value, bool $forceOverwrite = false): self
     {
-        if ($this->isFrozen) {
+        if ($this->isFrozen && !$forceOverwrite) {
             return $this;
         }
 

src/functions.php

@@ -201,12 +201,12 @@ function configureScope(callable $callback): void
  *
  * @param callable $callback The callback to be executed
  *
- * @return mixed|void The callback's return value, upon successful execution
- *
  * @psalm-template T
  *
  * @psalm-param callable(Scope): T $callback
  *
+ * @return mixed|void The callback's return value, upon successful execution
+ *
  * @psalm-return T
  */
 function withScope(callable $callback)

tests/State/HubTest.php

@@ -20,9 +20,11 @@
 use Sentry\Severity;
 use Sentry\State\Hub;
 use Sentry\State\Scope;
+use Sentry\Tracing\DynamicSamplingContext;
 use Sentry\Tracing\PropagationContext;
 use Sentry\Tracing\SamplingContext;
 use Sentry\Tracing\TransactionContext;
+use Sentry\Tracing\TransactionMetadata;
 use Sentry\Util\SentryUid;
 
 final class HubTest extends TestCase
@@ -805,6 +807,27 @@ public function testStartTransactionWithCustomSamplingContext(): void
         $hub->startTransaction(new TransactionContext(), $customSamplingContext);
     }
 
+    public function testStartTransactionUpdatesTheDscSampleRate(): void
+    {
+        $client = $this->createMock(ClientInterface::class);
+        $client->expects($this->once())
+            ->method('getOptions')
+            ->willReturn(new Options([
+                'traces_sampler' => function (SamplingContext $samplingContext): float {
+                    return 1.0;
+                },
+            ]));
+
+        $hub = new Hub($client);
+
+        $dsc = DynamicSamplingContext::fromHeader('sentry-trace_id=d49d9bf66f13450b81f65bc51cf49c03,sentry-public_key=public');
+        $transactionMetaData = new TransactionMetadata(null, $dsc);
+        $transactionContext = new TransactionContext(TransactionContext::DEFAULT_NAME, null, $transactionMetaData);
+
+        $transaction = $hub->startTransaction($transactionContext);
+        $this->assertSame('1', $transaction->getMetadata()->getDynamicSamplingContext()->get('sample_rate'));
+    }
+
     public function testGetTransactionReturnsInstanceSetOnTheScopeIfTransactionIsNotSampled(): void
     {
         $client = $this->createMock(ClientInterface::class);