Skip to content

Commit 551bdec

Browse files
committed
Revert "fix(core): Require active session for session trace lifecycle"
This reverts commit d31251a.
1 parent d31251a commit 551bdec

2 files changed

Lines changed: 6 additions & 33 deletions

File tree

sentry/src/main/java/io/sentry/Scopes.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,11 +1024,10 @@ && getOptions().getProfileLifecycle() == ProfileLifecycle.TRACE
10241024

10251025
private @NotNull TransactionContext maybeApplySessionTraceLifecycle(
10261026
final @NotNull TransactionContext transactionContext) {
1027+
final @NotNull PropagationContext propagationContext =
1028+
getCombinedScopeView().getPropagationContext();
10271029
if (getOptions().isEnableSessionTraceLifecycle()
1028-
&& transactionContext.getParentSpanId() == null
1029-
&& getCombinedScopeView().getSession() != null) {
1030-
final @NotNull PropagationContext propagationContext =
1031-
getCombinedScopeView().getPropagationContext();
1030+
&& transactionContext.getParentSpanId() == null) {
10321031
return TransactionContext.fromPropagationContextAsRoot(
10331032
propagationContext, transactionContext);
10341033
}

sentry/src/test/java/io/sentry/ScopesTest.kt

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1822,27 +1822,9 @@ class ScopesTest {
18221822
assertEquals(contexts, transaction.root.spanContext)
18231823
}
18241824

1825-
@Test
1826-
fun `when session trace lifecycle is enabled without active session, root transaction does not use scope propagation context`() {
1827-
val scopes = generateScopes { it.isEnableSessionTraceLifecycle = true }
1828-
var propagationContext: PropagationContext? = null
1829-
scopes.configureScope { propagationContext = it.propagationContext }
1830-
val context = TransactionContext("name", "op")
1831-
1832-
val transaction = scopes.startTransaction(context)
1833-
1834-
assertTrue(transaction is SentryTracer)
1835-
assertEquals(context.traceId, transaction.root.spanContext.traceId)
1836-
assertNotEquals(propagationContext!!.traceId, transaction.root.spanContext.traceId)
1837-
}
1838-
18391825
@Test
18401826
fun `when session trace lifecycle is enabled, startTransaction uses session propagation context`() {
1841-
val scopes = generateScopes {
1842-
it.isEnableSessionTraceLifecycle = true
1843-
it.release = "1.0.0"
1844-
}
1845-
scopes.startSession()
1827+
val scopes = generateScopes { it.isEnableSessionTraceLifecycle = true }
18461828
var propagationContext: PropagationContext? = null
18471829
scopes.configureScope { propagationContext = it.propagationContext }
18481830

@@ -1857,11 +1839,7 @@ class ScopesTest {
18571839

18581840
@Test
18591841
fun `continued trace with parent span is not remapped to session trace`() {
1860-
val scopes = generateScopes {
1861-
it.isEnableSessionTraceLifecycle = true
1862-
it.release = "1.0.0"
1863-
}
1864-
scopes.startSession()
1842+
val scopes = generateScopes { it.isEnableSessionTraceLifecycle = true }
18651843
val traceId = "75302ac48a024bde9a3b3734a82e36c8"
18661844
val parentSpanId = "1000000000000000"
18671845
val context = scopes.continueTrace("$traceId-$parentSpanId-1", emptyList())!!
@@ -1875,11 +1853,7 @@ class ScopesTest {
18751853

18761854
@Test
18771855
fun `when session trace lifecycle is enabled, root transaction uses current propagation context`() {
1878-
val scopes = generateScopes {
1879-
it.isEnableSessionTraceLifecycle = true
1880-
it.release = "1.0.0"
1881-
}
1882-
scopes.startSession()
1856+
val scopes = generateScopes { it.isEnableSessionTraceLifecycle = true }
18831857
val traceId = "75302ac48a024bde9a3b3734a82e36c8"
18841858
val parentSpanId = "1000000000000000"
18851859
scopes.continueTrace("$traceId-$parentSpanId-1", emptyList())

0 commit comments

Comments
 (0)