Send source for transactions (#2180)

Co-authored-by: Sentry Github Bot <bot+github-bot@sentry.io>
getsentry · Aug 5, 2022 · 14ec39d · 14ec39d
1 parent fc6c136
commit 14ec39d
Show file tree

Hide file tree

Showing 32 changed files with 713 additions and 337 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Features
+
+- Send source for transactions ([#2180](https://github.com/getsentry/sentry-java/pull/2180))
+
 ## 6.3.1
 
 ### Fixes

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
@@ -20,6 +20,9 @@
 import io.sentry.SentryLevel;
 import io.sentry.SentryOptions;
 import io.sentry.SpanStatus;
+import io.sentry.TransactionContext;
+import io.sentry.TransactionOptions;
+import io.sentry.protocol.TransactionNameSource;
 import io.sentry.util.Objects;
 import java.io.Closeable;
 import java.io.IOException;
@@ -152,64 +155,44 @@ private void startTracing(final @NotNull Activity activity) {
       // as we allow a single transaction running on the bound Scope, we finish the previous ones
       stopPreviousTransactions();
 
-      // we can only bind to the scope if there's no running transaction
-      ITransaction transaction;
       final String activityName = getActivityName(activity);
 
       final Date appStartTime =
           foregroundImportance ? AppStartState.getInstance().getAppStartTime() : null;
       final Boolean coldStart = AppStartState.getInstance().isColdStart();
 
+      final TransactionOptions transactionOptions = new TransactionOptions();
+
+      transactionOptions.setWaitForChildren(true);
+      transactionOptions.setTransactionFinishedCallback(
+          (finishingTransaction) -> {
+            @Nullable Activity unwrappedActivity = weakActivity.get();
+            if (unwrappedActivity != null) {
+              activityFramesTracker.setMetrics(
+                  unwrappedActivity, finishingTransaction.getEventId());
+            } else {
+              if (options != null) {
+                options
+                    .getLogger()
+                    .log(
+                        SentryLevel.WARNING,
+                        "Unable to track activity frames as the Activity %s has been destroyed.",
+                        activityName);
+              }
+            }
+          });
+
+      // we can only bind to the scope if there's no running transaction
+      ITransaction transaction =
+          hub.startTransaction(
+              new TransactionContext(activityName, TransactionNameSource.COMPONENT, UI_LOAD_OP),
+              transactionOptions);
+
       // in case appStartTime isn't available, we don't create a span for it.
-      if (firstActivityCreated || appStartTime == null || coldStart == null) {
-        transaction =
-            hub.startTransaction(
-                activityName,
-                UI_LOAD_OP,
-                (Date) null,
-                true,
-                (finishingTransaction) -> {
-                  @Nullable Activity unwrappedActivity = weakActivity.get();
-                  if (unwrappedActivity != null) {
-                    activityFramesTracker.setMetrics(
-                        unwrappedActivity, finishingTransaction.getEventId());
-                  } else {
-                    if (options != null) {
-                      options
-                          .getLogger()
-                          .log(
-                              SentryLevel.WARNING,
-                              "Unable to track activity frames as the Activity %s has been destroyed.",
-                              activityName);
-                    }
-                  }
-                });
-      } else {
-        // start transaction with app start timestamp
-        transaction =
-            hub.startTransaction(
-                activityName,
-                UI_LOAD_OP,
-                appStartTime,
-                true,
-                (finishingTransaction) -> {
-                  @Nullable Activity unwrappedActivity = weakActivity.get();
-                  if (unwrappedActivity != null) {
-                    activityFramesTracker.setMetrics(
-                        unwrappedActivity, finishingTransaction.getEventId());
-                  } else {
-                    if (options != null) {
-                      options
-                          .getLogger()
-                          .log(
-                              SentryLevel.WARNING,
-                              "Unable to track activity frames as the Activity %s has been destroyed.",
-                              activityName);
-                    }
-                  }
-                });
-        // start specific span for app start
+      if (!(firstActivityCreated || appStartTime == null || coldStart == null)) {
+        transactionOptions.setStartTimestamp(appStartTime);
 
+        // start specific span for app start
         appStartSpan =
             transaction.startChild(
                 getAppStartOp(coldStart), getAppStartDesc(coldStart), appStartTime);

diff --git a/...id-core/src/main/java/io/sentry/android/core/internal/gestures/SentryGestureListener.java b/...id-core/src/main/java/io/sentry/android/core/internal/gestures/SentryGestureListener.java
@@ -16,7 +16,10 @@
 import io.sentry.Scope;
 import io.sentry.SentryLevel;
 import io.sentry.SpanStatus;
+import io.sentry.TransactionContext;
+import io.sentry.TransactionOptions;
 import io.sentry.android.core.SentryAndroidOptions;
+import io.sentry.protocol.TransactionNameSource;
 import java.lang.ref.WeakReference;
 import java.util.Collections;
 import java.util.Map;
@@ -249,8 +252,15 @@ private void startTracing(final @NotNull View target, final @NotNull String even
     // we can only bind to the scope if there's no running transaction
     final String name = getActivityName(activity) + "." + viewId;
     final String op = UI_ACTION + "." + eventType;
+
+    final TransactionOptions transactionOptions = new TransactionOptions();
+    transactionOptions.setWaitForChildren(true);
+    transactionOptions.setIdleTimeout(options.getIdleTimeout());
+    transactionOptions.setTrimEnd(true);
+
     final ITransaction transaction =
-        hub.startTransaction(name, op, true, options.getIdleTimeout(), true);
+        hub.startTransaction(
+            new TransactionContext(name, TransactionNameSource.COMPONENT, op), transactionOptions);
 
     hub.configureScope(
         scope -> {

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
@@ -23,6 +23,8 @@ import io.sentry.SpanStatus
 import io.sentry.TraceContext
 import io.sentry.TransactionContext
 import io.sentry.TransactionFinishedCallback
+import io.sentry.TransactionOptions
+import io.sentry.protocol.TransactionNameSource
 import java.util.Date
 import kotlin.test.BeforeTest
 import kotlin.test.Test
@@ -51,7 +53,7 @@ class ActivityLifecycleIntegrationTest {
 
         fun getSut(apiVersion: Int = 29, importance: Int = RunningAppProcessInfo.IMPORTANCE_FOREGROUND): ActivityLifecycleIntegration {
             whenever(hub.options).thenReturn(options)
-            whenever(hub.startTransaction(any(), any(), anyOrNull(), any(), any<TransactionFinishedCallback>())).thenReturn(transaction)
+            whenever(hub.startTransaction(any(), any<TransactionOptions>())).thenReturn(transaction)
             whenever(buildInfo.sdkInfoVersion).thenReturn(apiVersion)
 
             whenever(application.getSystemService(any())).thenReturn(am)
@@ -251,7 +253,7 @@ class ActivityLifecycleIntegrationTest {
         val activity = mock<Activity>()
         sut.onActivityCreated(activity, fixture.bundle)
 
-        verify(fixture.hub, never()).startTransaction(any(), any(), anyOrNull(), any(), any<TransactionFinishedCallback>())
+        verify(fixture.hub, never()).startTransaction(any(), any<TransactionOptions>())
     }
 
     @Test
@@ -264,7 +266,7 @@ class ActivityLifecycleIntegrationTest {
         sut.onActivityCreated(activity, fixture.bundle)
         sut.onActivityCreated(activity, fixture.bundle)
 
-        verify(fixture.hub).startTransaction(any(), any(), anyOrNull(), any(), any<TransactionFinishedCallback>())
+        verify(fixture.hub).startTransaction(any(), any<TransactionOptions>())
     }
 
     @Test
@@ -279,11 +281,11 @@ class ActivityLifecycleIntegrationTest {
         sut.onActivityCreated(activity, fixture.bundle)
 
         verify(fixture.hub).startTransaction(
-            any(),
             check {
-                assertEquals("ui.load", it)
+                assertEquals("ui.load", it.operation)
+                assertEquals(TransactionNameSource.COMPONENT, it.transactionNameSource)
             },
-            anyOrNull(), any(), any<TransactionFinishedCallback>()
+            any<TransactionOptions>()
         )
     }
 
@@ -312,9 +314,10 @@ class ActivityLifecycleIntegrationTest {
 
         verify(fixture.hub).startTransaction(
             check {
-                assertEquals("Activity", it)
+                assertEquals("Activity", it.name)
+                assertEquals(TransactionNameSource.COMPONENT, it.transactionNameSource)
             },
-            any(), anyOrNull(), any(), any<TransactionFinishedCallback>()
+            any<TransactionOptions>()
         )
     }
 
@@ -532,7 +535,7 @@ class ActivityLifecycleIntegrationTest {
         val activity = mock<Activity>()
         sut.onActivityCreated(activity, mock())
 
-        verify(fixture.hub).startTransaction(any(), any(), anyOrNull(), any(), any<TransactionFinishedCallback>())
+        verify(fixture.hub).startTransaction(any(), any<TransactionOptions>())
     }
 
     @Test
@@ -631,7 +634,7 @@ class ActivityLifecycleIntegrationTest {
         sut.onActivityCreated(activity, fixture.bundle)
 
         // call only once
-        verify(fixture.hub).startTransaction(any(), any(), eq(date), any(), any())
+        verify(fixture.hub).startTransaction(any(), check<TransactionOptions> { assertEquals(date, it.startTimestamp) })
     }
 
     @Test
@@ -647,7 +650,7 @@ class ActivityLifecycleIntegrationTest {
         sut.onActivityCreated(activity, fixture.bundle)
 
         // call only once
-        verify(fixture.hub).startTransaction(any(), any(), eq(null), any(), any())
+        verify(fixture.hub).startTransaction(any(), check<TransactionOptions> { assertNull(it.startTimestamp) })
     }
 
     @Test
@@ -730,15 +733,15 @@ class ActivityLifecycleIntegrationTest {
         val activity = mock<Activity>()
         sut.onActivityCreated(activity, fixture.bundle)
 
-        verify(fixture.hub).startTransaction(any(), any(), eq(date), any(), any())
+        verify(fixture.hub).startTransaction(any(), check<TransactionOptions> { assertEquals(date, it.startTimestamp) })
         sut.onActivityCreated(activity, fixture.bundle)
         sut.onActivityPostResumed(activity)
 
         val newActivity = mock<Activity>()
         sut.onActivityCreated(newActivity, fixture.bundle)
 
         val nullDate: Date? = null
-        verify(fixture.hub).startTransaction(any(), any(), eq(nullDate), any(), any())
+        verify(fixture.hub).startTransaction(any(), check<TransactionOptions> { assertNull(it.startTimestamp) })
     }
 
     @Test