From 2ee189fc3f5dd8882f3f1c274ddc8bc87ad2d187 Mon Sep 17 00:00:00 2001 From: Martin Linzmayer Date: Thu, 19 Nov 2026 16:09:45 +0100 Subject: [PATCH] fix(ds): dont override existing dynamic sampling context --- src/State/Scope.php | 25 ++++++++++++++----------- tests/State/ScopeTest.php | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 11 deletions(-) diff --git a/src/State/Scope.php b/src/State/Scope.php index 911c918a6..233d5914c 100644 --- a/src/State/Scope.php +++ b/src/State/Scope.php @@ -576,18 +576,21 @@ public function applyToEvent(Event $event, ?EventHint $hint = null, ?Options $op $event->setContext('trace', $traceContext); } - if ($this->span !== null) { - // Apply the dynamic sampling context to errors if there is a Transaction on the Scope - $transaction = $this->span->getTransaction(); - if ($transaction !== null) { - $event->setSdkMetadata('dynamic_sampling_context', $transaction->getDynamicSamplingContext()); - } - } elseif ($externalPropagationContext === null) { - $dynamicSamplingContext = $this->propagationContext->getDynamicSamplingContext(); - if ($dynamicSamplingContext === null && $options !== null) { - $dynamicSamplingContext = DynamicSamplingContext::fromOptions($options, $this); + // Do not override a dynamic sampling context already present, a transaction sets its own when it finishes + if ($event->getSdkMetadata('dynamic_sampling_context') === null) { + if ($this->span !== null) { + // Apply the dynamic sampling context to errors if there is a Transaction on the Scope + $transaction = $this->span->getTransaction(); + if ($transaction !== null) { + $event->setSdkMetadata('dynamic_sampling_context', $transaction->getDynamicSamplingContext()); + } + } elseif ($externalPropagationContext === null) { + $dynamicSamplingContext = $this->propagationContext->getDynamicSamplingContext(); + if ($dynamicSamplingContext === null && $options !== null) { + $dynamicSamplingContext = DynamicSamplingContext::fromOptions($options, $this); + } + $event->setSdkMetadata('dynamic_sampling_context', $dynamicSamplingContext); } - $event->setSdkMetadata('dynamic_sampling_context', $dynamicSamplingContext); } foreach (array_merge($this->contexts, $event->getContexts()) as $name => $data) { diff --git a/tests/State/ScopeTest.php b/tests/State/ScopeTest.php index 2a01c409e..c55e9386a 100644 --- a/tests/State/ScopeTest.php +++ b/tests/State/ScopeTest.php @@ -805,6 +805,39 @@ public function testApplyToEventSkipsDynamicSamplingContextWhenUsingExternalProp Scope::clearExternalPropagationContext(); } + public function testApplyToEventKeepsDynamicSamplingContextOfEventWithoutSpanOnScope(): void + { + $dynamicSamplingContext = DynamicSamplingContext::fromHeader('sentry-trace_id=566e3688a61d4bc888951642d6f14a19,sentry-transaction=foo'); + + $event = Event::createTransaction(); + $event->setSdkMetadata('dynamic_sampling_context', $dynamicSamplingContext); + + $scope = new Scope(); + $event = $scope->applyToEvent($event, null, new Options([ + 'dsn' => 'http://public@example.com/1', + 'traces_sample_rate' => 1.0, + ])); + + $this->assertNotNull($event); + $this->assertSame($dynamicSamplingContext, $event->getSdkMetadata('dynamic_sampling_context')); + } + + public function testApplyToEventKeepsDynamicSamplingContextOfEventWithOtherTransactionOnScope(): void + { + $dynamicSamplingContext = DynamicSamplingContext::fromHeader('sentry-trace_id=566e3688a61d4bc888951642d6f14a19,sentry-transaction=foo'); + + $event = Event::createTransaction(); + $event->setSdkMetadata('dynamic_sampling_context', $dynamicSamplingContext); + + $scope = new Scope(); + $scope->setSpan(new Transaction(new TransactionContext('bar'))); + + $event = $scope->applyToEvent($event); + + $this->assertNotNull($event); + $this->assertSame($dynamicSamplingContext, $event->getSdkMetadata('dynamic_sampling_context')); + } + /** * @dataProvider eventWithLogCountProvider */