pythongh-91048: Add filename and line number to external inspection routines

Author: pablogsal

Lib/asyncio/tools.py

@@ -27,6 +27,7 @@ def _index(result):
         for tid, tname, awaited in tasks:
             id2name[tid] = tname
             for stack, parent_id in awaited:
+                stack = [elem[0] if isinstance(elem, tuple) else elem for elem in stack]
                 awaits.append((parent_id, stack, tid))
     return id2name, awaits
 
@@ -151,6 +152,7 @@ def build_task_table(result):
                     ]
                 )
             for stack, awaiter_id in awaited:
+                stack = [elem[0] if isinstance(elem, tuple) else elem for elem in stack]
                 coroutine_chain = " -> ".join(stack)
                 awaiter_name = id2name.get(awaiter_id, "Unknown")
                 table.append(

Lib/test/test_external_inspection.py

@@ -4,6 +4,7 @@
 import importlib
 import sys
 import socket
+from asyncio import staggered
 from unittest.mock import ANY
 from test.support import os_helper, SHORT_TIMEOUT, busy_retry, requires_gil_enabled
 from test.support.script_helper import make_script
@@ -90,10 +91,10 @@ def foo():
 
 
             expected_stack_trace = [
-                'foo',
-                'baz',
-                'bar',
-                '<module>'
+                ('foo', script_name, 15),
+                ('baz', script_name, 11),
+                ('bar', script_name, 9),
+                ('<module>', script_name, 17),
             ]
             self.assertEqual(stack_trace, expected_stack_trace)
 
@@ -185,7 +186,12 @@ def new_eager_loop():
 
                 root_task = "Task-1"
                 expected_stack_trace = [
-                    ['c5', 'c4', 'c3', 'c2'],
+                    [
+                        ('c5', script_name, 11),
+                        ('c4', script_name, 15),
+                        ('c3', script_name, 18),
+                        ('c2', script_name, 21),
+                    ],
                     'c2_root',
                     [
                         [['_aexit', '__aexit__', 'main'], root_task, []],
@@ -258,7 +264,11 @@ async def main():
             stack_trace[2].sort(key=lambda x: x[1])
 
             expected_stack_trace = [
-                ['gen_nested_call', 'gen', 'main'], 'Task-1', []
+                [('gen_nested_call', script_name, 11),
+                ('gen', script_name, 17),
+                ('main', script_name, 20)],
+                'Task-1',
+                []
             ]
             self.assertEqual(stack_trace, expected_stack_trace)
 
@@ -326,9 +336,10 @@ async def main():
             # sets are unordered, so we want to sort "awaited_by"s
             stack_trace[2].sort(key=lambda x: x[1])
 
-            expected_stack_trace =  [
-                ['deep', 'c1'], 'Task-2', [[['main'], 'Task-1', []]]
-            ]
+            expected_stack_trace = [[('deep', script_name, 12),
+                                     ('c1', script_name, 16)],
+                                    'Task-2',
+                                    [[['main'], 'Task-1', []]]]
             self.assertEqual(stack_trace, expected_stack_trace)
 
     @skip_if_not_supported
@@ -398,10 +409,13 @@ async def main():
             # sets are unordered, so we want to sort "awaited_by"s
             stack_trace[2].sort(key=lambda x: x[1])
 
-            expected_stack_trace = [
-                ['deep', 'c1', 'run_one_coro'],
-                    'Task-2',
-                    [[['staggered_race', 'main'], 'Task-1', []]]
+            expected_stack_trace = [[
+                    ('deep', script_name, 12),
+                    ('c1', script_name, 16),
+                    ('staggered_race.<locals>.run_one_coro', staggered.__file__, 127)
+                ],
+                'Task-2',
+                [[['staggered_race', 'main'], 'Task-1', []]]
             ]
             self.assertEqual(stack_trace, expected_stack_trace)
 
@@ -548,7 +562,7 @@ async def main():
                      "Test only runs on Linux with process_vm_readv support")
     def test_self_trace(self):
         stack_trace = get_stack_trace(os.getpid())
-        self.assertEqual(stack_trace[0], "test_self_trace")
+        self.assertEqual(stack_trace[0], ('TestGetStackTrace.test_self_trace', __file__, 564))
 
 if __name__ == "__main__":
     unittest.main()