return root span only on Android

Author: markushi

sentry/src/main/java/io/sentry/Sentry.java

@@ -15,6 +15,7 @@
 import io.sentry.transport.NoOpEnvelopeCache;
 import io.sentry.util.DebugMetaPropertiesApplier;
 import io.sentry.util.FileUtils;
+import io.sentry.util.Platform;
 import io.sentry.util.thread.IMainThreadChecker;
 import io.sentry.util.thread.MainThreadChecker;
 import io.sentry.util.thread.NoOpMainThreadChecker;
@@ -923,7 +924,7 @@ public static void endSession() {
    *     span.
    */
   public static @Nullable ISpan getSpan() {
-    if (globalHubMode) {
+    if (globalHubMode && Platform.isAndroid()) {
       return getCurrentHub().getTransaction();
     } else {
       return getCurrentHub().getSpan();

sentry/src/main/java/io/sentry/util/Platform.java

@@ -6,7 +6,7 @@
 
 @ApiStatus.Internal
 public final class Platform {
-  private static boolean isAndroid;
+  static boolean isAndroid;
   static boolean isJavaNinePlus;
 
   static {

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

@@ -9,6 +9,7 @@ import io.sentry.internal.modules.IModulesLoader
 import io.sentry.protocol.SdkVersion
 import io.sentry.protocol.SentryId
 import io.sentry.test.ImmediateExecutorService
+import io.sentry.util.PlatformTestManipulator
 import io.sentry.util.thread.IMainThreadChecker
 import io.sentry.util.thread.MainThreadChecker
 import org.awaitility.kotlin.await
@@ -735,7 +736,8 @@ class SentryTest {
     }
 
     @Test
-    fun `getSpan calls returns root span if globalhub mode is enabled`() {
+    fun `getSpan calls returns root span if globalhub mode is enabled on Android`() {
+        PlatformTestManipulator.pretendIsAndroid(true)
         Sentry.init({
             it.dsn = dsn
             it.enableTracing = true
@@ -747,6 +749,23 @@ class SentryTest {
 
         val span = Sentry.getSpan()!!
         assertEquals("op-root", span.operation)
+        PlatformTestManipulator.pretendIsAndroid(false)
+    }
+
+    @Test
+    fun `getSpan calls returns child span if globalhub mode is enabled, but the platform is not Android`() {
+        PlatformTestManipulator.pretendIsAndroid(false)
+        Sentry.init({
+            it.dsn = dsn
+            it.enableTracing = true
+            it.sampleRate = 1.0
+        }, false)
+
+        val transaction = Sentry.startTransaction("name", "op-root", true)
+        transaction.startChild("op-child")
+
+        val span = Sentry.getSpan()!!
+        assertEquals("op-child", span.operation)
     }
 
     @Test

sentry/src/test/java/io/sentry/util/PlatformTestManipulator.kt

@@ -6,5 +6,9 @@ class PlatformTestManipulator {
         fun pretendJavaNinePlus(isJavaNinePlus: Boolean) {
             Platform.isJavaNinePlus = isJavaNinePlus
         }
+
+        fun pretendIsAndroid(isAndroid: Boolean) {
+            Platform.isAndroid = isAndroid
+        }
     }
 }