Skip to content

Commit

Permalink
[Agent] Improve OpenWire parsing in tcp segmentation case
Browse files Browse the repository at this point in the history
  • Loading branch information
@oldduckruirui
oldduckruirui committed Mar 5, 2024
1 parent 410e205 commit 30b4ec9
Show file tree
Hide file tree
Showing 6 changed files with 453 additions and 111 deletions.
1 change: 1 addition & 0 deletions agent/resources/test/flow_generator/openwire/openwire_correlation_id.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ OpenWireInfo { msg_type: Session, is_tls: false, direction: ClientToServer, is_t
OpenWireInfo { msg_type: Session, is_tls: false, direction: ServerToClient, is_tight_encoding_enabled: false, is_size_prefix_disabled: false, is_cache_enabled: false, version: 11, connection_id: Some("ID:localhost-1-1706669422443-0:1"), broker_url: None, session_id: Some(1), topic: Some("TEST.FOO"), command_type: MessageDispatch, command_id: 20, response_required: false, resp_command_id: 0, req_msg_size: None, res_msg_size: Some(411), status: Ok, err_msg: None, trace_id: None, span_id: None, correlation_id: Some("My own MessageID:15"), rtt: 0 } is_openwire: false
OpenWireInfo { msg_type: Session, is_tls: false, direction: ClientToServer, is_tight_encoding_enabled: false, is_size_prefix_disabled: false, is_cache_enabled: false, version: 11, connection_id: Some("ID:localhost-1-1706669422443-0:1"), broker_url: None, session_id: Some(1), topic: Some("TEST.FOO"), command_type: MessageAck, command_id: 20, response_required: false, resp_command_id: 0, req_msg_size: Some(223), res_msg_size: None, status: Ok, err_msg: None, trace_id: None, span_id: None, correlation_id: None, rtt: 0 } is_openwire: false
OpenWireInfo { msg_type: Session, is_tls: false, direction: ServerToClient, is_tight_encoding_enabled: false, is_size_prefix_disabled: false, is_cache_enabled: false, version: 11, connection_id: Some("ID:localhost-1-1706669422443-0:1"), broker_url: None, session_id: Some(1), topic: Some("TEST.FOO"), command_type: MessageDispatch, command_id: 21, response_required: false, resp_command_id: 0, req_msg_size: None, res_msg_size: Some(411), status: Ok, err_msg: None, trace_id: None, span_id: None, correlation_id: Some("My own MessageID:16"), rtt: 0 } is_openwire: false
OpenWireInfo { msg_type: Session, is_tls: false, direction: ServerToClient, is_tight_encoding_enabled: false, is_size_prefix_disabled: false, is_cache_enabled: false, version: 11, connection_id: Some("ID:localhost-1-1706669422443-0:1"), broker_url: None, session_id: Some(1), topic: Some("TEST.FOO"), command_type: MessageDispatch, command_id: 22, response_required: false, resp_command_id: 0, req_msg_size: None, res_msg_size: Some(411), status: Ok, err_msg: None, trace_id: None, span_id: None, correlation_id: Some("My own MessageID:17"), rtt: 0 } is_openwire: false
OpenWireInfo { msg_type: Session, is_tls: false, direction: ClientToServer, is_tight_encoding_enabled: false, is_size_prefix_disabled: false, is_cache_enabled: false, version: 11, connection_id: Some("ID:localhost-1-1706669422443-0:1"), broker_url: None, session_id: Some(1), topic: Some("TEST.FOO"), command_type: MessageAck, command_id: 21, response_required: false, resp_command_id: 0, req_msg_size: Some(223), res_msg_size: None, status: Ok, err_msg: None, trace_id: None, span_id: None, correlation_id: None, rtt: 0 } is_openwire: false
OpenWireInfo { msg_type: Session, is_tls: false, direction: ClientToServer, is_tight_encoding_enabled: false, is_size_prefix_disabled: false, is_cache_enabled: false, version: 11, connection_id: Some("ID:localhost-1-1706669422443-0:1"), broker_url: None, session_id: Some(1), topic: Some("TEST.FOO"), command_type: MessageAck, command_id: 22, response_required: false, resp_command_id: 0, req_msg_size: Some(223), res_msg_size: None, status: Ok, err_msg: None, trace_id: None, span_id: None, correlation_id: None, rtt: 0 } is_openwire: false
OpenWireInfo { msg_type: Session, is_tls: false, direction: ServerToClient, is_tight_encoding_enabled: false, is_size_prefix_disabled: false, is_cache_enabled: false, version: 11, connection_id: Some("ID:localhost-1-1706669422443-0:1"), broker_url: None, session_id: Some(1), topic: Some("TEST.FOO"), command_type: MessageDispatch, command_id: 23, response_required: false, resp_command_id: 0, req_msg_size: None, res_msg_size: Some(411), status: Ok, err_msg: None, trace_id: None, span_id: None, correlation_id: Some("My own MessageID:18"), rtt: 0 } is_openwire: false
Expand Down
3 changes: 3 additions & 0 deletions agent/resources/test/flow_generator/openwire/openwire_injected.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ OpenWireInfo { msg_type: Session, is_tls: false, direction: ServerToClient, is_t
OpenWireInfo { msg_type: Session, is_tls: false, direction: ServerToClient, is_tight_encoding_enabled: true, is_size_prefix_disabled: false, is_cache_enabled: false, version: 11, connection_id: Some("ID:test.local-64517-1705648339915-1:1"), broker_url: None, session_id: Some(1), topic: Some("TEST"), command_type: MessageDispatch, command_id: 9, response_required: false, resp_command_id: 0, req_msg_size: None, res_msg_size: Some(635), status: Ok, err_msg: None, trace_id: Some("c55c062343a74e58906f7e9948f32155.55.17056483403920009"), span_id: Some("c55c062343a74e58906f7e9948f32155.55.17056483403920008-0"), correlation_id: None, rtt: 0 } is_openwire: false
OpenWireInfo { msg_type: Session, is_tls: false, direction: ServerToClient, is_tight_encoding_enabled: true, is_size_prefix_disabled: false, is_cache_enabled: false, version: 11, connection_id: Some("ID:test.local-64517-1705648339915-1:1"), broker_url: None, session_id: Some(1), topic: Some("TEST"), command_type: MessageDispatch, command_id: 10, response_required: false, resp_command_id: 0, req_msg_size: None, res_msg_size: Some(635), status: Ok, err_msg: None, trace_id: Some("c55c062343a74e58906f7e9948f32155.55.17056483403990011"), span_id: Some("c55c062343a74e58906f7e9948f32155.55.17056483403990010-0"), correlation_id: None, rtt: 0 } is_openwire: false
OpenWireInfo { msg_type: Session, is_tls: false, direction: ClientToServer, is_tight_encoding_enabled: true, is_size_prefix_disabled: false, is_cache_enabled: false, version: 11, connection_id: Some("ID:test.local-64517-1705648339915-1:1"), broker_url: None, session_id: Some(1), topic: Some("TEST"), command_type: MessageAck, command_id: 5, response_required: false, resp_command_id: 0, req_msg_size: Some(161), res_msg_size: None, status: Ok, err_msg: None, trace_id: None, span_id: None, correlation_id: None, rtt: 0 } is_openwire: false
OpenWireInfo { msg_type: Session, is_tls: false, direction: ClientToServer, is_tight_encoding_enabled: true, is_size_prefix_disabled: false, is_cache_enabled: false, version: 11, connection_id: Some("ID:test.local-64517-1705648339915-1:1"), broker_url: None, session_id: Some(1), topic: Some("TEST"), command_type: MessageAck, command_id: 6, response_required: false, resp_command_id: 0, req_msg_size: Some(165), res_msg_size: None, status: Ok, err_msg: None, trace_id: None, span_id: None, correlation_id: None, rtt: 0 } is_openwire: false
OpenWireInfo { msg_type: Session, is_tls: false, direction: ClientToServer, is_tight_encoding_enabled: true, is_size_prefix_disabled: false, is_cache_enabled: false, version: 11, connection_id: Some("ID:test.local-64517-1705648339915-1:1"), broker_url: None, session_id: Some(1), topic: Some("TEST"), command_type: MessageAck, command_id: 7, response_required: false, resp_command_id: 0, req_msg_size: Some(165), res_msg_size: None, status: Ok, err_msg: None, trace_id: None, span_id: None, correlation_id: None, rtt: 0 } is_openwire: false
OpenWireInfo { msg_type: Session, is_tls: false, direction: ClientToServer, is_tight_encoding_enabled: true, is_size_prefix_disabled: false, is_cache_enabled: false, version: 11, connection_id: Some("ID:test.local-64517-1705648339915-1:1"), broker_url: None, session_id: Some(1), topic: Some("TEST"), command_type: MessageAck, command_id: 8, response_required: false, resp_command_id: 0, req_msg_size: Some(165), res_msg_size: None, status: Ok, err_msg: None, trace_id: None, span_id: None, correlation_id: None, rtt: 0 } is_openwire: false
OpenWireInfo { msg_type: Session, is_tls: false, direction: ClientToServer, is_tight_encoding_enabled: true, is_size_prefix_disabled: false, is_cache_enabled: false, version: 11, connection_id: Some("ID:test.local-64517-1705648339915-1:1"), broker_url: None, session_id: Some(1), topic: Some("TEST"), command_type: MessageAck, command_id: 9, response_required: false, resp_command_id: 0, req_msg_size: Some(165), res_msg_size: None, status: Ok, err_msg: None, trace_id: None, span_id: None, correlation_id: None, rtt: 0 } is_openwire: false
OpenWireInfo { msg_type: Session, is_tls: false, direction: ClientToServer, is_tight_encoding_enabled: true, is_size_prefix_disabled: false, is_cache_enabled: false, version: 11, connection_id: Some("ID:test.local-64517-1705648339915-1:1"), broker_url: None, session_id: Some(1), topic: Some("TEST"), command_type: MessageAck, command_id: 10, response_required: false, resp_command_id: 0, req_msg_size: Some(165), res_msg_size: None, status: Ok, err_msg: None, trace_id: None, span_id: None, correlation_id: None, rtt: 0 } is_openwire: false
OpenWireInfo { msg_type: Session, is_tls: false, direction: ServerToClient, is_tight_encoding_enabled: true, is_size_prefix_disabled: false, is_cache_enabled: false, version: 11, connection_id: Some("ID:test.local-64517-1705648339915-1:1"), broker_url: None, session_id: Some(1), topic: Some("TEST"), command_type: MessageDispatch, command_id: 11, response_required: false, resp_command_id: 0, req_msg_size: None, res_msg_size: Some(635), status: Ok, err_msg: None, trace_id: Some("c55c062343a74e58906f7e9948f32155.55.17056483404090013"), span_id: Some("c55c062343a74e58906f7e9948f32155.55.17056483404090012-0"), correlation_id: None, rtt: 0 } is_openwire: false
Expand Down
Binary file added agent/resources/test/flow_generator/openwire/openwire_segmented.pcap
View file
Binary file not shown.
Loading

0 comments on commit 30b4ec9

Please sign in to comment.