Skip to content

fix: overwrite DSC sample_rate when sampling #4374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Flash0ver merged 20 commits into from
Jul 30, 2025
Merged

fix: overwrite DSC sample_rate when sampling #4374

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
c354d31
test: normalize ContinueTrace tests
Flash0ver Jul 21, 2025
37908a3
test: use Assertion over type-cast
Flash0ver Jul 21, 2025
23a45c2
fix: DSC contains actual SampleRate
Flash0ver Jul 21, 2025
5cace1f
test: fix catch and handle failed Assertions
Flash0ver Jul 21, 2025
4401a98
style: reformat HubTests
Flash0ver Jul 21, 2025
3197ab6
test: fix HubTests
Flash0ver Jul 21, 2025
bc91dd3
docs: update CHANGELOG.md
Flash0ver Jul 21, 2025
755bbef
test: skip failing test on Android & iOS (device tests)
Flash0ver Jul 23, 2025
6259233
fix: DSC sample_rate when sampling forced
Flash0ver Jul 24, 2025
fd39406
test: fix PushAndLockScope when GlobalMode
Flash0ver Jul 24, 2025
3be7eee
Merge branch 'main' into fix/update-dsc-sample-rate
Flash0ver Jul 24, 2025
cd5355b
fix: forced sampling is only considered when TracesSampler has not de…
Flash0ver Jul 24, 2025
8dbe5e3
fix: no longer overwrite DSC sample_rate when upstream sampling decis…
Flash0ver Jul 25, 2025
2dc8666
Merge branch 'main' into fix/update-dsc-sample-rate
Flash0ver Jul 25, 2025
fa43554
fix: overwrite DSC sample_rate only when TracesSampler or TracesSampl…
Flash0ver Jul 28, 2025
2382943
ref: remove Debug.Assert
Flash0ver Jul 28, 2025
8c5588f
docs: add comment to test
Flash0ver Jul 28, 2025
50edc11
Merge branch 'main' into fix/update-dsc-sample-rate
Flash0ver Jul 30, 2025
758028c
docs: update CHANGELOG
Flash0ver Jul 30, 2025
a13b7e0
fix: TransactionTracer was assumed to be considered even when TracesS…
Flash0ver Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test: use Assertion over type-cast
  • Loading branch information
@Flash0ver
Flash0ver committed Jul 21, 2025
commit 37908a3ecdb69916acf66ff63ba7cdf656bf899e
32 changes: 15 additions & 17 deletions test/Sentry.Tests/HubTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,8 +708,8 @@ public void StartTransaction_DynamicSamplingContextWithReplayId_UsesActiveReplay
var transaction = hub.StartTransaction(transactionContext, new Dictionary<string, object>(), dsc);

// Assert
var transactionTracer = ((TransactionTracer)transaction);
transactionTracer.IsSampled.Should().Be(true);
var transactionTracer = transaction.Should().BeOfType<TransactionTracer>().Subject;
transactionTracer.IsSampled.Should().BeTrue();
transactionTracer.DynamicSamplingContext.Should().NotBeNull();
foreach (var dscItem in dsc!.Items)
{
Expand Down Expand Up @@ -743,7 +743,7 @@ public void StartTransaction_NoDynamicSamplingContext_UsesActiveReplaySessionId(
var transaction = hub.StartTransaction(transactionContext, new Dictionary<string, object>());

// Assert
var transactionTracer = ((TransactionTracer)transaction);
var transactionTracer = transaction.Should().BeOfType<TransactionTracer>().Subject;
transactionTracer.SampleRand.Should().NotBeNull();
transactionTracer.DynamicSamplingContext.Should().NotBeNull();
if (replaySessionIsActive)
Expand All @@ -770,7 +770,7 @@ public void StartTransaction_NoDynamicSamplingContext_GeneratesSampleRand()
var transaction = hub.StartTransaction(transactionContext, customContext);

// Assert
var transactionTracer = ((TransactionTracer)transaction);
var transactionTracer = transaction.Should().BeOfType<TransactionTracer>().Subject;
transactionTracer.SampleRand.Should().NotBeNull();
transactionTracer.DynamicSamplingContext.Should().NotBeNull();
transactionTracer.DynamicSamplingContext!.Items.Should().ContainKey("sample_rand");
Expand All @@ -789,7 +789,7 @@ public void StartTransaction_DynamicSamplingContextWithoutSampleRand_SampleRandN
var transaction = hub.StartTransaction(transactionContext, new Dictionary<string, object>(), DynamicSamplingContext.Empty);

// Assert
var transactionTracer = ((TransactionTracer)transaction);
var transactionTracer = transaction.Should().BeOfType<TransactionTracer>().Subject;
transactionTracer.SampleRand.Should().NotBeNull();
transactionTracer.DynamicSamplingContext.Should().NotBeNull();
// See https://develop.sentry.dev/sdk/telemetry/traces/dynamic-sampling-context/#freezing-dynamic-sampling-context
Expand Down Expand Up @@ -818,8 +818,8 @@ public void StartTransaction_DynamicSamplingContextWithSampleRand_InheritsSample
var transaction = hub.StartTransaction(transactionContext, new Dictionary<string, object>(), dsc);

// Assert
var transactionTracer = ((TransactionTracer)transaction);
transactionTracer.IsSampled.Should().Be(true);
var transactionTracer = transaction.Should().BeOfType<TransactionTracer>().Subject;
transactionTracer.IsSampled.Should().BeTrue();
transactionTracer.SampleRate.Should().Be(0.4);
transactionTracer.SampleRand.Should().Be(0.1234);
transactionTracer.DynamicSamplingContext.Should().Be(dsc);
Expand Down Expand Up @@ -851,17 +851,16 @@ public void StartTransaction_TraceSampler_UsesSampleRand(double sampleRate, bool
// Assert
if (expectedIsSampled)
{
transaction.Should().BeOfType<TransactionTracer>();
var transactionTracer = ((TransactionTracer)transaction);
transactionTracer.IsSampled.Should().Be(true);
var transactionTracer = transaction.Should().BeOfType<TransactionTracer>().Subject;
transactionTracer.IsSampled.Should().BeTrue();
transactionTracer.SampleRate.Should().Be(sampleRate);
transactionTracer.SampleRand.Should().Be(0.1234);
transactionTracer.DynamicSamplingContext.Should().Be(dsc);
}
else
{
transaction.Should().BeOfType<UnsampledTransaction>();
var unsampledTransaction = ((UnsampledTransaction)transaction);
var unsampledTransaction = transaction.Should().BeOfType<UnsampledTransaction>().Subject;
unsampledTransaction.IsSampled.Should().BeFalse();
unsampledTransaction.SampleRate.Should().Be(sampleRate);
unsampledTransaction.SampleRand.Should().Be(0.1234);
unsampledTransaction.DynamicSamplingContext.Should().Be(dsc);
Expand Down Expand Up @@ -894,17 +893,16 @@ public void StartTransaction_StaticSampler_UsesSampleRand(double sampleRate, boo
// Assert
if (expectedIsSampled)
{
transaction.Should().BeOfType<TransactionTracer>();
var transactionTracer = ((TransactionTracer)transaction);
transactionTracer.IsSampled.Should().Be(expectedIsSampled);
var transactionTracer = transaction.Should().BeOfType<TransactionTracer>().Subject;
transactionTracer.IsSampled.Should().BeTrue();
transactionTracer.SampleRate.Should().Be(sampleRate);
transactionTracer.SampleRand.Should().Be(0.1234);
transactionTracer.DynamicSamplingContext.Should().Be(dsc);
}
else
{
transaction.Should().BeOfType<UnsampledTransaction>();
var unsampledTransaction = ((UnsampledTransaction)transaction);
var unsampledTransaction = transaction.Should().BeOfType<UnsampledTransaction>().Subject;
unsampledTransaction.IsSampled.Should().BeFalse();
unsampledTransaction.SampleRate.Should().Be(sampleRate);
unsampledTransaction.SampleRand.Should().Be(0.1234);
unsampledTransaction.DynamicSamplingContext.Should().Be(dsc);
Expand Down