Merge 83f7838 into 7ca9895

getsentry · Oct 19, 2023 · f9cd2b8 · f9cd2b8
2 parents 7ca9895 + 83f7838
commit f9cd2b8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Features
+
+- Tag all spans with main thread flag ([#2998](https://github.com/getsentry/sentry-java/pull/2998))
+
 ## 6.32.0
 
 ### Features

diff --git a/sentry/src/main/java/io/sentry/SentryTracer.java b/sentry/src/main/java/io/sentry/SentryTracer.java
@@ -7,6 +7,7 @@
 import io.sentry.protocol.TransactionNameSource;
 import io.sentry.protocol.User;
 import io.sentry.util.Objects;
+import io.sentry.util.thread.MainThreadChecker;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ListIterator;
@@ -384,6 +385,8 @@ private ISpan createChild(
               }
             });
     span.setDescription(description);
+    span.setData(
+        SpanDataConvention.BLOCKED_MAIN_THREAD_KEY, MainThreadChecker.getInstance().isMainThread());
     this.children.add(span);
     return span;
   }

diff --git a/sentry/src/test/java/io/sentry/SentryTracerTest.kt b/sentry/src/test/java/io/sentry/SentryTracerTest.kt
@@ -1236,4 +1236,10 @@ class SentryTracerTest {
         assertTrue(tracer.isFinished)
         verify(fixture.hub).captureTransaction(any(), anyOrNull(), anyOrNull(), anyOrNull())
     }
+
+    @Test
+    fun `when a span is launched, the main thread flag is set as span data`() {
+        val tracer = fixture.getSut()
+        assertNotNull(tracer.startChild("span.op").getData(SpanDataConvention.BLOCKED_MAIN_THREAD_KEY))
+    }
 }