Fix inheriting sampling decision from parent. (#1100)

Fixes gh-1099
getsentry · Dec 11, 2020 · de00462 · de00462
1 parent c9e720f
commit de00462
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # vNext
 
+* Fix inheriting sampling decision from parent (#1100)
 * Fixes and Tests: Session serialization and deserialization
 
 # 4.0.0-alpha.2

diff --git a/sentry/src/main/java/io/sentry/Hub.java b/sentry/src/main/java/io/sentry/Hub.java
@@ -685,8 +685,20 @@ public void flush(long timeoutMillis) {
   @Override
   public @Nullable SentryTransaction startTransaction(
       final @NotNull TransactionContext transactionContexts) {
+    return this.startTransaction(transactionContexts, null);
+  }
+
+  @Override
+  public @Nullable SentryTransaction startTransaction(
+      final @NotNull TransactionContext transactionContexts,
+      final @Nullable CustomSamplingContext customSamplingContext) {
     Objects.requireNonNull(transactionContexts, "transactionContexts is required");
 
+    final SamplingContext samplingContext =
+        new SamplingContext(transactionContexts, customSamplingContext);
+    boolean samplingDecision = tracingSampler.sample(samplingContext);
+    transactionContexts.setSampled(samplingDecision);
+
     SentryTransaction transaction = null;
     if (!isEnabled()) {
       options
@@ -706,17 +718,6 @@ public void flush(long timeoutMillis) {
     return transaction;
   }
 
-  @Override
-  public @Nullable SentryTransaction startTransaction(
-      final @NotNull TransactionContext transactionContexts,
-      final @Nullable CustomSamplingContext customSamplingContext) {
-    final SamplingContext samplingContext =
-        new SamplingContext(transactionContexts, customSamplingContext);
-    boolean samplingDecision = tracingSampler.sample(samplingContext);
-    transactionContexts.setSampled(samplingDecision);
-    return this.startTransaction(transactionContexts);
-  }
-
   @Override
   public @Nullable SentryTraceHeader traceHeaders() {
     SentryTraceHeader traceHeader = null;

diff --git a/sentry/src/test/java/io/sentry/HubTest.kt b/sentry/src/test/java/io/sentry/HubTest.kt
@@ -1005,6 +1005,17 @@ class HubTest {
         }
     }
 
+    @Test
+    fun `when startTransaction with parent sampled and no traces sampler provided, transaction inherits sampling decision`() {
+        val hub = generateHub()
+        val transactionContext = TransactionContext("name")
+        transactionContext.parentSampled = true
+        val transaction = hub.startTransaction(transactionContext)
+        assertNotNull(transaction)
+        assertNotNull(transaction.isSampled)
+        assertTrue(transaction.isSampled!!)
+    }
+
     @Test
     fun `Hub should close the sentry executor processor on close call`() {
         val executor = mock<ISentryExecutorService>()