feat: agent add syscall_trace_id_disabled

Author: TomatoMr

agent/src/config/config.rs

@@ -404,6 +404,7 @@ pub struct EbpfYamlConfig {
     pub syscall_out_of_order_cache_size: usize,
     pub syscall_out_of_order_reassembly: Vec<String>,
     pub syscall_segmentation_reassembly: Vec<String>,
+    pub syscall_trace_id_disabled: bool,
 }
 
 impl Default for EbpfYamlConfig {
@@ -431,6 +432,7 @@ impl Default for EbpfYamlConfig {
             syscall_out_of_order_reassembly: vec![],
             syscall_segmentation_reassembly: vec![],
             syscall_out_of_order_cache_size: 16,
+            syscall_trace_id_disabled: false,
         }
     }
 }
@@ -1412,8 +1414,7 @@ impl RuntimeConfig {
             global_pps_threshold: 2000000,
             #[cfg(target_os = "linux")]
             extra_netns_regex: Default::default(),
-            tap_interface_regex: "^(tap.*|cali.*|veth.*|eth.*|en[ospx].*|lxc.*|lo|[0-9a-f]+_h)$"
-                .into(),
+            tap_interface_regex: "".into(),
             host: Default::default(),
             rsyslog_enabled: false,
             output_vlan: 0,
@@ -1540,7 +1541,9 @@ impl RuntimeConfig {
             )));
         }
 
-        if regex::Regex::new(&self.tap_interface_regex).is_err() {
+        if !self.tap_interface_regex.is_empty()
+            && regex::Regex::new(&self.tap_interface_regex).is_err()
+        {
             return Err(ConfigError::RuntimeConfigInvalid(format!(
                 "malformed tap-interface-regex({})",
                 self.tap_interface_regex

agent/src/config/handler.rs

@@ -2324,6 +2324,13 @@ impl ConfigHandler {
                 callbacks.push(leaky_bucket_callback);
             }
 
+            // FIXME: 仅做测试用
+            if new_config.dispatcher.tap_interface_regex
+                == "^(tap.*|cali.*|veth.*|eth.*|en[osipx].*|lxc.*|lo|[0-9a-f]+_h)$"
+            {
+                new_config.dispatcher.tap_interface_regex = "".to_string();
+            }
+
             info!(
                 "dispatcher config change from {:#?} to {:#?}",
                 candidate_config.dispatcher, new_config.dispatcher

agent/src/dispatcher/analyzer_mode_dispatcher.rs

@@ -282,7 +282,7 @@ impl AnalyzerModeDispatcher {
                     let mut output_batch = Vec::with_capacity(HANDLER_BATCH_SIZE);
                     let mut flow_map = FlowMap::new(
                         id as u32,
-                        flow_output_queue,
+                        Some(flow_output_queue),
                         l7_stats_output_queue,
                         policy_getter,
                         log_output_queue,

agent/src/dispatcher/local_mode_dispatcher.rs

@@ -78,7 +78,7 @@ impl LocalModeDispatcher {
         }
         let mut flow_map = FlowMap::new(
             base.id as u32,
-            base.flow_output_queue.clone(),
+            Some(base.flow_output_queue.clone()),
             base.l7_stats_output_queue.clone(),
             base.policy_getter,
             base.log_output_queue.clone(),

agent/src/dispatcher/local_plus_mode_dispatcher.rs

@@ -125,7 +125,7 @@ impl LocalPlusModeDispatcher {
                     let mut output_batch = Vec::with_capacity(HANDLER_BATCH_SIZE);
                     let mut flow_map = FlowMap::new(
                         id as u32,
-                        flow_output_queue,
+                        Some(flow_output_queue),
                         l7_stats_output_queue,
                         policy_getter,
                         log_output_queue,

agent/src/dispatcher/mirror_mode_dispatcher.rs

@@ -543,7 +543,7 @@ impl MirrorModeDispatcher {
 
         let mut flow_map = FlowMap::new(
             self.base.id as u32,
-            self.base.flow_output_queue.clone(),
+            Some(self.base.flow_output_queue.clone()),
             self.base.l7_stats_output_queue.clone(),
             self.base.policy_getter,
             self.base.log_output_queue.clone(),

agent/src/dispatcher/mirror_plus_mode_dispatcher.rs

@@ -301,7 +301,7 @@ impl MirrorPlusModeDispatcher {
                     let mut batch = Vec::with_capacity(HANDLER_BATCH_SIZE);
                     let mut flow_map = FlowMap::new(
                         id as u32,
-                        flow_output_queue,
+                        Some(flow_output_queue),
                         l7_stats_output_queue,
                         policy_getter,
                         log_output_queue,

agent/src/ebpf_dispatcher/ebpf_dispatcher.rs

@@ -35,7 +35,7 @@ use crate::common::l7_protocol_log::{
 };
 use crate::common::meta_packet::{MetaPacket, SegmentFlags};
 use crate::common::proc_event::{BoxedProcEvents, EventType, ProcEvent};
-use crate::common::{FlowAclListener, FlowAclListenerId, TaggedFlow};
+use crate::common::{FlowAclListener, FlowAclListenerId};
 use crate::config::handler::{CollectorAccess, EbpfAccess, EbpfConfig, LogParserAccess};
 use crate::config::FlowAccess;
 use crate::ebpf;
@@ -221,8 +221,7 @@ struct EbpfDispatcher {
 
     config: EbpfAccess,
     output: DebugSender<Box<AppProto>>, // Send AppProtos to the AppProtoLogsParser
-    flow_output: DebugSender<Arc<BatchedBox<TaggedFlow>>>, // Send TaggedFlows to the QuadrupleGenerator
-    l7_stats_output: DebugSender<BatchedBox<L7Stats>>,     // Send L7Stats to the QuadrupleGenerator
+    l7_stats_output: DebugSender<BatchedBox<L7Stats>>, // Send L7Stats to the QuadrupleGenerator
     stats_collector: Arc<stats::Collector>,
 }
 
@@ -323,7 +322,7 @@ impl EbpfDispatcher {
         );
         let mut flow_map = FlowMap::new(
             self.dispatcher_id as u32,
-            self.flow_output.clone(),
+            None,
             self.l7_stats_output.clone(),
             self.policy_getter,
             self.output.clone(),
@@ -692,6 +691,10 @@ impl EbpfCollector {
                 }
             }
 
+            if config.ebpf.syscall_trace_id_disabled {
+                ebpf::disable_syscall_trace_id();
+            }
+
             if ebpf::running_socket_tracer(
                 Self::ebpf_l7_callback,                    /* 回调接口 rust -> C */
                 config.ebpf.thread_num as i32, /* 工作线程数，是指用户态有多少线程参与数据处理 */
@@ -861,7 +864,6 @@ impl EbpfCollector {
         collector_config: CollectorAccess,
         policy_getter: PolicyGetter,
         output: DebugSender<Box<AppProto>>,
-        flow_output: DebugSender<Arc<BatchedBox<TaggedFlow>>>,
         l7_stats_output: DebugSender<BatchedBox<L7Stats>>,
         proc_event_output: DebugSender<BoxedProcEvents>,
         ebpf_profile_sender: DebugSender<Profile>,
@@ -907,7 +909,6 @@ impl EbpfCollector {
                 config,
                 log_parser_config,
                 output,
-                flow_output,
                 l7_stats_output,
                 flow_map_config,
                 stats_collector,

agent/src/flow_generator/flow_map.rs

@@ -175,7 +175,7 @@ pub struct FlowMap {
 
     tagged_flow_allocator: Allocator<TaggedFlow>,
     l7_stats_allocator: Allocator<L7Stats>,
-    output_queue: DebugSender<Arc<BatchedBox<TaggedFlow>>>,
+    output_queue: Option<DebugSender<Arc<BatchedBox<TaggedFlow>>>>,
     l7_stats_output_queue: DebugSender<BatchedBox<L7Stats>>,
     out_log_queue: DebugSender<Box<AppProto>>,
     output_buffer: Vec<Arc<BatchedBox<TaggedFlow>>>,
@@ -211,7 +211,7 @@ pub struct FlowMap {
 impl FlowMap {
     pub fn new(
         id: u32,
-        output_queue: DebugSender<Arc<BatchedBox<TaggedFlow>>>,
+        output_queue: Option<DebugSender<Arc<BatchedBox<TaggedFlow>>>>,
         l7_stats_output_queue: DebugSender<BatchedBox<L7Stats>>,
         policy_getter: PolicyGetter,
         app_proto_log_queue: DebugSender<Box<AppProto>>,
@@ -1837,8 +1837,13 @@ impl FlowMap {
                     self.l7_stats_buffer.clear();
                 }
             }
-            if self.output_buffer.len() > 0 {
-                if let Err(e) = self.output_queue.send_all(&mut self.output_buffer) {
+            if self.output_queue.is_some() && self.output_buffer.len() > 0 {
+                if let Err(e) = self
+                    .output_queue
+                    .as_ref()
+                    .unwrap()
+                    .send_all(&mut self.output_buffer)
+                {
                     warn!(
                         "flow-map push tagged flows to queue failed, because {:?}",
                         e
@@ -1866,14 +1871,21 @@ impl FlowMap {
             Ordering::Relaxed,
         );
 
-        self.output_buffer.push(tagged_flow);
-        if self.output_buffer.len() >= QUEUE_BATCH_SIZE {
-            if let Err(e) = self.output_queue.send_all(&mut self.output_buffer) {
-                warn!(
-                    "flow-map push tagged flows to queue failed, because {:?}",
-                    e
-                );
-                self.output_buffer.clear();
+        if self.output_queue.is_some() {
+            self.output_buffer.push(tagged_flow);
+            if self.output_buffer.len() >= QUEUE_BATCH_SIZE {
+                if let Err(e) = self
+                    .output_queue
+                    .as_ref()
+                    .unwrap()
+                    .send_all(&mut self.output_buffer)
+                {
+                    warn!(
+                        "flow-map push tagged flows to queue failed, because {:?}",
+                        e
+                    );
+                    self.output_buffer.clear();
+                }
             }
         }
     }
@@ -2505,7 +2517,7 @@ pub fn _new_flow_map_and_receiver(
     config.flow.trident_type = trident_type;
     let flow_map = FlowMap::new(
         0,
-        output_queue_sender,
+        Some(output_queue_sender),
         l7_stats_output_queue_sender,
         policy_getter,
         app_proto_log_queue,

agent/src/flow_generator/protocol_logs/parser.rs

@@ -244,8 +244,8 @@ impl MetaAppProto {
         }
 
         Some(Self {
-            base_info,
             direction: meta_packet.lookup_key.direction,
+            base_info,
             direction_score: flow.flow.direction_score,
             l7_info,
         })