fix: agent - incorrect grpc ebpf tcp seq

deepflowio · Jul 10, 2024 · da672e9 · da672e9
1 parent 1852758
commit da672e9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/agent/resources/test/flow_generator/http/grpc-service-name.result b/agent/resources/test/flow_generator/http/grpc-service-name.result
@@ -16,6 +16,6 @@ HttpInfo { headers_offset: None, is_req_end: false, is_resp_end: false, rrt: 0,
 HttpInfo { headers_offset: None, is_req_end: false, is_resp_end: false, rrt: 0, proto: Http2, is_tls: false, msg_type: Other, raw_data_type: RawProtocol, stream_id: None, version: Unknown, trace_id: "", span_id: "", method: None, path: "", host: "", user_agent: None, referer: None, client_ip: None, x_request_id_0: "", x_request_id_1: "", req_content_length: None, resp_content_length: None, status_code: 0, status: Ok, grpc_status_code: None, endpoint: None, custom_result: None, custom_exception: None, captured_request_byte: 0, captured_response_byte: 0, attributes: [], is_on_blacklist: false, service_name: None } is_http: false
 HttpInfo { headers_offset: None, is_req_end: false, is_resp_end: false, rrt: 0, proto: Http2, is_tls: false, msg_type: Other, raw_data_type: RawProtocol, stream_id: None, version: Unknown, trace_id: "", span_id: "", method: None, path: "", host: "", user_agent: None, referer: None, client_ip: None, x_request_id_0: "", x_request_id_1: "", req_content_length: None, resp_content_length: None, status_code: 0, status: Ok, grpc_status_code: None, endpoint: None, custom_result: None, custom_exception: None, captured_request_byte: 0, captured_response_byte: 0, attributes: [], is_on_blacklist: false, service_name: None } is_http: false
 HttpInfo { headers_offset: None, is_req_end: false, is_resp_end: false, rrt: 0, proto: Http2, is_tls: false, msg_type: Other, raw_data_type: RawProtocol, stream_id: None, version: Unknown, trace_id: "", span_id: "", method: None, path: "", host: "", user_agent: None, referer: None, client_ip: None, x_request_id_0: "", x_request_id_1: "", req_content_length: None, resp_content_length: None, status_code: 0, status: Ok, grpc_status_code: None, endpoint: None, custom_result: None, custom_exception: None, captured_request_byte: 0, captured_response_byte: 0, attributes: [], is_on_blacklist: false, service_name: None } is_http: false
-HttpInfo { headers_offset: Some(0), is_req_end: false, is_resp_end: false, rrt: 0, proto: Grpc, is_tls: false, msg_type: Response, raw_data_type: RawProtocol, stream_id: Some(1), version: V2, trace_id: "", span_id: "", method: _ResponseHeader, path: "", host: "", user_agent: None, referer: None, client_ip: None, x_request_id_0: "", x_request_id_1: "", req_content_length: None, resp_content_length: Some(108), status_code: 200, status: Ok, grpc_status_code: Some(0), endpoint: None, custom_result: None, custom_exception: None, captured_request_byte: 0, captured_response_byte: 173, attributes: [], is_on_blacklist: false, service_name: None } is_http: true
+HttpInfo { headers_offset: Some(140), is_req_end: false, is_resp_end: false, rrt: 0, proto: Grpc, is_tls: false, msg_type: Response, raw_data_type: RawProtocol, stream_id: Some(1), version: V2, trace_id: "", span_id: "", method: _ResponseHeader, path: "", host: "", user_agent: None, referer: None, client_ip: None, x_request_id_0: "", x_request_id_1: "", req_content_length: None, resp_content_length: Some(108), status_code: 200, status: Ok, grpc_status_code: Some(0), endpoint: None, custom_result: None, custom_exception: None, captured_request_byte: 0, captured_response_byte: 173, attributes: [], is_on_blacklist: false, service_name: None } is_http: true
 HttpInfo { headers_offset: None, is_req_end: false, is_resp_end: false, rrt: 0, proto: Http2, is_tls: false, msg_type: Other, raw_data_type: RawProtocol, stream_id: None, version: Unknown, trace_id: "", span_id: "", method: None, path: "", host: "", user_agent: None, referer: None, client_ip: None, x_request_id_0: "", x_request_id_1: "", req_content_length: None, resp_content_length: None, status_code: 0, status: Ok, grpc_status_code: None, endpoint: None, custom_result: None, custom_exception: None, captured_request_byte: 0, captured_response_byte: 0, attributes: [], is_on_blacklist: false, service_name: None } is_http: false
 HttpInfo { headers_offset: None, is_req_end: false, is_resp_end: false, rrt: 0, proto: Http2, is_tls: false, msg_type: Other, raw_data_type: RawProtocol, stream_id: None, version: Unknown, trace_id: "", span_id: "", method: None, path: "", host: "", user_agent: None, referer: None, client_ip: None, x_request_id_0: "", x_request_id_1: "", req_content_length: None, resp_content_length: None, status_code: 0, status: Ok, grpc_status_code: None, endpoint: None, custom_result: None, custom_exception: None, captured_request_byte: 0, captured_response_byte: 0, attributes: [], is_on_blacklist: false, service_name: None } is_http: false
diff --git a/agent/resources/test/flow_generator/http/h2c_ascii.result b/agent/resources/test/flow_generator/http/h2c_ascii.result
@@ -1,2 +1,2 @@
 HttpInfo { headers_offset: Some(26), is_req_end: false, is_resp_end: false, rrt: 0, proto: Grpc, is_tls: false, msg_type: Request, raw_data_type: RawProtocol, stream_id: Some(1), version: V2, trace_id: "", span_id: "", method: _RequestHeader, path: "/hipstershop.CartService/GetCart", host: "cartservice:7070", user_agent: None, referer: None, client_ip: None, x_request_id_0: "", x_request_id_1: "", req_content_length: Some(43), resp_content_length: None, status_code: 0, status: Ok, grpc_status_code: None, endpoint: Some("/hipstershop.CartService/GetCart"), custom_result: None, custom_exception: None, captured_request_byte: 287, captured_response_byte: 0, attributes: [], is_on_blacklist: false, service_name: Some("hipstershop.CartService") } is_http: true
-HttpInfo { headers_offset: Some(9), is_req_end: false, is_resp_end: false, rrt: 0, proto: Grpc, is_tls: false, msg_type: Response, raw_data_type: RawProtocol, stream_id: Some(1), version: V2, trace_id: "", span_id: "", method: _ResponseHeader, path: "", host: "", user_agent: None, referer: None, client_ip: None, x_request_id_0: "", x_request_id_1: "", req_content_length: None, resp_content_length: Some(21), status_code: 200, status: Ok, grpc_status_code: Some(0), endpoint: None, custom_result: None, custom_exception: None, captured_request_byte: 0, captured_response_byte: 219, attributes: [], is_on_blacklist: false, service_name: None } is_http: true
+HttpInfo { headers_offset: Some(167), is_req_end: false, is_resp_end: false, rrt: 0, proto: Grpc, is_tls: false, msg_type: Response, raw_data_type: RawProtocol, stream_id: Some(1), version: V2, trace_id: "", span_id: "", method: _ResponseHeader, path: "", host: "", user_agent: None, referer: None, client_ip: None, x_request_id_0: "", x_request_id_1: "", req_content_length: None, resp_content_length: Some(21), status_code: 200, status: Ok, grpc_status_code: Some(0), endpoint: None, custom_result: None, custom_exception: None, captured_request_byte: 0, captured_response_byte: 219, attributes: [], is_on_blacklist: false, service_name: None } is_http: true
diff --git a/agent/src/flow_generator/protocol_logs/http.rs b/agent/src/flow_generator/protocol_logs/http.rs
@@ -1240,7 +1240,7 @@ impl HttpLog {
                     info.method =
                         Method::from_frame_type(httpv2_header.frame_type, param.direction);
                 }
-                if !param.is_from_ebpf() && info.headers_offset.is_none() {
+                if info.headers_offset.is_none() || info.grpc_status_code.is_some() {
                     info.headers_offset = Some(headers_offset as u32);
                 }