wip4

Author: ionmincu

src/uipath/core/tracing/manager.py

@@ -153,27 +153,41 @@ def _get_bottom_most_span(
 
         # Check if one span is an ancestor of the other by walking parent pointers
         # Check if external_span is an ancestor of current_span
+        current_is_descendant_of_external = False
         temp_id = current_span_id
         depth = 0
         while temp_id is not None and depth < 100:  # Prevent infinite loops
             if temp_id == external_span_id:
-                logger.info(f"RESULT: current_span is a descendant of external_span (found at depth {depth}) -> returning current_span")
-                logger.info("=" * 80)
-                return current_span
+                current_is_descendant_of_external = True
+                logger.info(f"current_span is a descendant of external_span (found at depth {depth})")
+                break
             temp_id = parent_map.get(temp_id)
             depth += 1
 
         # Check if current_span is an ancestor of external_span
+        external_is_descendant_of_current = False
         temp_id = external_span_id
         depth = 0
         while temp_id is not None and depth < 100:  # Prevent infinite loops
             if temp_id == current_span_id:
-                logger.info(f"RESULT: external_span is a descendant of current_span (found at depth {depth}) -> returning external_span")
-                logger.info("=" * 80)
-                return external_span
+                external_is_descendant_of_current = True
+                logger.info(f"external_span is a descendant of current_span (found at depth {depth})")
+                break
             temp_id = parent_map.get(temp_id)
             depth += 1
 
+        # If they're in the same hierarchy (one is ancestor of the other)
+        if current_is_descendant_of_external:
+            # current_span is deeper (descendant means further down the tree)
+            logger.info("RESULT: current_span is a descendant of external_span -> returning current_span (deeper)")
+            logger.info("=" * 80)
+            return current_span
+        elif external_is_descendant_of_current:
+            # external_span is deeper (descendant means further down the tree)
+            logger.info("RESULT: external_span is a descendant of current_span -> returning external_span (deeper)")
+            logger.info("=" * 80)
+            return external_span
+
         # Neither is an ancestor of the other - they're in different branches
         # Use chain length as tiebreaker
         if len(current_chain) > len(external_chain):