Fully copy CoroutineInfo for DebugProbes.dumpCoroutinesInfo, it is re…

binary-compatibility-validator/reference-public-api/kotlinx-coroutines-debug.txt

@@ -1,5 +1,6 @@
 public final class kotlinx/coroutines/debug/CoroutineInfo {
 	public final fun component1 ()Lkotlin/coroutines/CoroutineContext;
+	public final fun copy ()Lkotlinx/coroutines/debug/CoroutineInfo;
 	public final fun copy (Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;J)Lkotlinx/coroutines/debug/CoroutineInfo;
 	public static synthetic fun copy$default (Lkotlinx/coroutines/debug/CoroutineInfo;Lkotlin/coroutines/CoroutineContext;Lkotlin/coroutines/jvm/internal/CoroutineStackFrame;JILjava/lang/Object;)Lkotlinx/coroutines/debug/CoroutineInfo;
 	public fun equals (Ljava/lang/Object;)Z

kotlinx-coroutines-debug/src/CoroutineInfo.kt

@@ -44,14 +44,10 @@ public data class CoroutineInfo internal constructor(
     @JvmField
     internal var lastObservedFrame: CoroutineStackFrame? = null
 
-    // Copy constructor
-    internal constructor(coroutine: Continuation<*>, state: CoroutineInfo) : this(
-        coroutine.context,
-        state.creationStackBottom,
-        state.sequenceNumber
-    ) {
-        _state = state.state
-        this.lastObservedFrame = state.lastObservedFrame
+    public fun copy(): CoroutineInfo = CoroutineInfo(context, creationStackBottom, sequenceNumber).also {
+        it._state = _state
+        it.lastObservedFrame = lastObservedFrame
+        it.lastObservedThread = lastObservedThread
     }
 
     /**

kotlinx-coroutines-debug/src/internal/DebugProbesImpl.kt

@@ -80,7 +80,7 @@ internal object DebugProbesImpl {
         check(isInstalled) { "Debug probes are not installed" }
         val jobToStack = capturedCoroutines
             .filter { it.delegate.context[Job] != null }
-            .associateBy({ it.delegate.context[Job]!! }, {it.info})
+            .associateBy({ it.delegate.context[Job]!! }, { it.info })
         return buildString {
             job.build(jobToStack, this, "")
         }
@@ -118,7 +118,7 @@ internal object DebugProbesImpl {
     public fun dumpCoroutinesInfo(): List<CoroutineInfo> {
         check(isInstalled) { "Debug probes are not installed" }
         return capturedCoroutines.asSequence()
-            .map { CoroutineInfo(it.delegate, it.info) }
+            .map { it.info.copy() } // Copy as CoroutineInfo can be mutated concurrently by DebugProbes
             .sortedBy { it.sequenceNumber }
             .toList()
     }
@@ -373,7 +373,7 @@ internal object DebugProbesImpl {
     private fun <T : Throwable> sanitizeStackTrace(throwable: T): List<StackTraceElement> {
         val stackTrace = throwable.stackTrace
         val size = stackTrace.size
-        val probeIndex = stackTrace.indexOfLast { it.className ==  "kotlin.coroutines.jvm.internal.DebugProbesKt" }
+        val probeIndex = stackTrace.indexOfLast { it.className == "kotlin.coroutines.jvm.internal.DebugProbesKt" }
 
         if (!DebugProbes.sanitizeStackTraces) {
             return List(size - probeIndex) {

kotlinx-coroutines-debug/test/RunningThreadStackMergeTest.kt

@@ -167,4 +167,15 @@ class RunningThreadStackMergeTest : DebugTestBase() {
         yield()
         assertTrue(true)
     }
+
+    @Test
+    fun testActiveThread() = runBlocking<Unit> {
+        launchCoroutine()
+        awaitCoroutineStarted()
+        val info = DebugProbes.dumpCoroutinesInfo().find { it.state == State.RUNNING }
+        assertNotNull(info)
+        @Suppress("INVISIBLE_MEMBER") // IDEA bug
+        assertNotNull(info.lastObservedThread)
+        coroutineBlocker.await()
+    }
 }