Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add same process and trace_id match #267

Merged
merged 1 commit into from
Jul 22, 2024
Merged

add same process and trace_id match #267

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions app/app/application/l7_flow_tracing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1707,7 +1707,7 @@ def try_attach_client_sys_span_via_sys_span(self,
not (span.process_matched(client_sys_span) and span.time_range_cover(client_sys_span)):
return None, ""

sys_span_matched = x_request_id_match = False
sys_span_matched = x_request_id_match = same_process_trace_match = False
# 优先级：syscall_trace_id > x_request_id
if not client_syscall_match:
# syscall_trace_id 判断
Expand All @@ -1722,13 +1722,19 @@ def try_attach_client_sys_span_via_sys_span(self,
x_request_id_match = span.get_x_request_id_0() and (span.get_x_request_id_0() == client_sys_span.get_x_request_id_0()) \
or (span.get_x_request_id_1() and (span.get_x_request_id_1() == client_sys_span.get_x_request_id_1()\
or span.get_x_request_id_1() == client_sys_span.get_x_request_id_0()))
# for cross-thread span but in same trace_id/process and time range covered
if not client_syscall_match and not sys_span_matched and not x_request_id_match:
# same proces & time cover already find out above, at here we only find out trace_id match
same_process_trace_match = span.flow["trace_id"] and span.flow["trace_id"] == client_sys_span.flow["trace_id"]

if sys_span_matched:
mounted_info = "syscall_trace_id matched to s-p root"
elif x_request_id_match:
mounted_info = "x_request_id matched to s-p root"
elif same_process_trace_match:
mounted_info = "same process/trace_id and time cover by s-p root"

if sys_span_matched or x_request_id_match or client_syscall_match:
if sys_span_matched or x_request_id_match or client_syscall_match or same_process_trace_match:
# 同一进程下，如果既有 x_request_id 匹配关系，也有 syscall_trace_id 匹配，如果扫描 process_span_set 顺序不同，会导致挂错
# 对此类情况，先不要直接追加，应追加到【时间最接近】的一个 process_span_set
return span, f"c-p sys-span mounted due to {mounted_info}"
Expand Down
Loading