feat: get endpoint/request_type from wasm response data

Author: lzf575

agent/src/flow_generator/protocol_logs/mq/mod.rs

@@ -32,7 +32,7 @@ pub use zmtp::{ZmtpInfo, ZmtpLog};
 
 cfg_if::cfg_if! {
     if #[cfg(feature = "enterprise")] {
-        mod webspheremq;
-        pub use webspheremq::{WebSphereMqInfo, WebSphereMqLog};
+        mod web_sphere_mq;
+        pub use web_sphere_mq::{WebSphereMqInfo, WebSphereMqLog};
     }
 }

…enerator/protocol_logs/mq/webspheremq.rs …erator/protocol_logs/mq/web_sphere_mq.rsagent/src/flow_generator/protocol_logs/mq/webspheremq.rs renamed to agent/src/flow_generator/protocol_logs/mq/web_sphere_mq.rs agent/src/flow_generator/protocol_logs/mq/webspheremq.rs renamed to agent/src/flow_generator/protocol_logs/mq/web_sphere_mq.rs

@@ -228,6 +228,14 @@ impl WebSphereMqInfo {
             self.response_exception = custom.resp.exception;
         }
 
+        if !custom.resp.req_type.is_empty() {
+            self.request_type = custom.resp.req_type;
+        }
+
+        if !custom.resp.endpoint.is_empty() {
+            self.endpoint = custom.resp.endpoint;
+        }
+
         //trace info rewrite
         self.trace_ids
             .merge_same_priority(PLUGIN_FIELD_PRIORITY, custom.trace.trace_ids);

agent/src/flow_generator/protocol_logs/plugin/custom_protocol_policy.rs

@@ -181,6 +181,8 @@ impl From<(&CustomPolicyInfo, PacketDirection)> for CustomInfo {
                 code: info.response_code.clone(),
                 exception: info.response_exception.clone(),
                 result: info.response_result.clone(),
+                endpoint: info.endpoint.clone(),
+                req_type: info.request_type.clone(),
             },
             trace: CustomInfoTrace {
                 trace_ids,

agent/src/plugin/WasmPluginApi.proto

@@ -24,6 +24,8 @@ message AppResponse {
     optional int32 code = 2;
     optional string exception = 3;
     optional string result = 4;
+    optional string type = 5;
+    optional string endpoint = 6;
 }
 
 message AppTrace {

agent/src/plugin/c_ffi.rs

@@ -131,6 +131,8 @@ pub struct Response {
     pub(super) code: i32,
     pub(super) exception: [u8; 128],
     pub(super) result: [u8; 512],
+    pub(super) req_type: [u8; 64],
+    pub(super) endpoint: [u8; 128],
 }
 impl std::fmt::Debug for Response {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
@@ -277,6 +279,8 @@ impl TryFrom<ParseInfo> for CustomInfo {
                         code: Some(resp.code),
                         exception: c_str_to_string(&resp.exception).unwrap_or_default(),
                         result: c_str_to_string(&resp.result).unwrap_or_default(),
+                        req_type: c_str_to_string(&resp.req_type).unwrap_or_default(),
+                        endpoint: c_str_to_string(&resp.endpoint).unwrap_or_default(),
                     },
                 )
             }

agent/src/plugin/mod.rs

@@ -64,6 +64,8 @@ pub struct CustomInfoResp {
     pub code: Option<i32>,
     pub exception: String,
     pub result: String,
+    pub req_type: String,
+    pub endpoint: String,
 }
 
 #[derive(Debug, Default, Serialize, Clone)]
@@ -485,6 +487,8 @@ impl CustomInfo {
                     code: r.code,
                     result: r.result.unwrap_or_default(),
                     exception: r.exception.unwrap_or_default(),
+                    req_type: r.r#type.unwrap_or_default(),
+                    endpoint: r.endpoint.unwrap_or_default(),
                 };
             }
             _ => (),

agent/src/plugin/wasm/wasm_plugin.rs

@@ -24,6 +24,10 @@ pub struct AppResponse {
     pub exception: ::core::option::Option<::prost::alloc::string::String>,
     #[prost(string, optional, tag = "4")]
     pub result: ::core::option::Option<::prost::alloc::string::String>,
+    #[prost(string, optional, tag = "5")]
+    pub r#type: ::core::option::Option<::prost::alloc::string::String>,
+    #[prost(string, optional, tag = "6")]
+    pub endpoint: ::core::option::Option<::prost::alloc::string::String>,
 }
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]