Merge ebb6965 into 31cfb68

adinauer · web-flow · commit a1fc02c106ef · 2024-09-19T11:52:59.000+02:00
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/ActivityLifecycleIntegration.java
@@ -23,6 +23,7 @@
 import io.sentry.SentryLevel;
 import io.sentry.SentryNanotimeDate;
 import io.sentry.SentryOptions;
+import io.sentry.SpanOptions;
 import io.sentry.SpanStatus;
 import io.sentry.TracesSamplingDecision;
 import io.sentry.TransactionContext;
@@ -224,6 +225,7 @@ private void startTracing(final @NotNull Activity activity) {
         }
         transactionOptions.setStartTimestamp(ttidStartTime);
         transactionOptions.setAppStartTransaction(appStartSamplingDecision != null);
+        setSpanOrigin(transactionOptions);
 
         // we can only bind to the scope if there's no running transaction
         ITransaction transaction =
@@ -234,7 +236,9 @@ private void startTracing(final @NotNull Activity activity) {
                     UI_LOAD_OP,
                     appStartSamplingDecision),
                 transactionOptions);
-        setSpanOrigin(transaction);
+
+        final SpanOptions spanOptions = new SpanOptions();
+        setSpanOrigin(spanOptions);
 
         // in case appStartTime isn't available, we don't create a span for it.
         if (!(firstActivityCreated || appStartTime == null || coldStart == null)) {
@@ -244,24 +248,30 @@ private void startTracing(final @NotNull Activity activity) {
                   getAppStartOp(coldStart),
                   getAppStartDesc(coldStart),
                   appStartTime,
-                  Instrumenter.SENTRY);
-          setSpanOrigin(appStartSpan);
+                  Instrumenter.SENTRY,
+                  spanOptions);
 
           // in case there's already an end time (e.g. due to deferred SDK init)
           // we can finish the app-start span
           finishAppStartSpan();
         }
         final @NotNull ISpan ttidSpan =
             transaction.startChild(
-                TTID_OP, getTtidDesc(activityName), ttidStartTime, Instrumenter.SENTRY);
+                TTID_OP,
+                getTtidDesc(activityName),
+                ttidStartTime,
+                Instrumenter.SENTRY,
+                spanOptions);
         ttidSpanMap.put(activity, ttidSpan);
-        setSpanOrigin(ttidSpan);
 
         if (timeToFullDisplaySpanEnabled && fullyDisplayedReporter != null && options != null) {
           final @NotNull ISpan ttfdSpan =
               transaction.startChild(
-                  TTFD_OP, getTtfdDesc(activityName), ttidStartTime, Instrumenter.SENTRY);
-          setSpanOrigin(ttfdSpan);
+                  TTFD_OP,
+                  getTtfdDesc(activityName),
+                  ttidStartTime,
+                  Instrumenter.SENTRY,
+                  spanOptions);
           try {
             ttfdSpanMap.put(activity, ttfdSpan);
             ttfdAutoCloseFuture =
@@ -290,11 +300,8 @@ private void startTracing(final @NotNull Activity activity) {
     }
   }
 
-  private void setSpanOrigin(ISpan span) {
-    if (span != null) {
-      // TODO [POTEL] replace with transactionOptions.setOrigin
-      span.getSpanContext().setOrigin(TRACE_ORIGIN);
-    }
+  private void setSpanOrigin(final @NotNull SpanOptions spanOptions) {
+    spanOptions.setOrigin(TRACE_ORIGIN);
   }
 
   @VisibleForTesting
diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/ActivityLifecycleIntegrationTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/ActivityLifecycleIntegrationTest.kt
@@ -215,6 +215,7 @@ class ActivityLifecycleIntegrationTest {
             check<TransactionOptions> { transactionOptions ->
                 assertEquals(fixture.options.idleTimeout, transactionOptions.idleTimeout)
                 assertEquals(TransactionOptions.DEFAULT_DEADLINE_TIMEOUT_AUTO_TRANSACTION, transactionOptions.deadlineTimeout)
+                assertEquals("auto.ui.activity", transactionOptions.origin)
             }
         )
     }

Original file line number	Diff line number	Diff line change
`@@ -215,6 +215,7 @@ class ActivityLifecycleIntegrationTest {`
`215`	`215`	`check<TransactionOptions> { transactionOptions ->`
`216`	`216`	`assertEquals(fixture.options.idleTimeout, transactionOptions.idleTimeout)`
`217`	`217`	`assertEquals(TransactionOptions.DEFAULT_DEADLINE_TIMEOUT_AUTO_TRANSACTION, transactionOptions.deadlineTimeout)`
	`218`	`+ assertEquals("auto.ui.activity", transactionOptions.origin)`
`218`	`219`	`}`
`219`	`220`	`)`
`220`	`221`	`}`