fix: incorrect l7 metrics

Author: yuanchaoa

agent/src/common/l7_protocol_info.rs

@@ -378,28 +378,26 @@ where
                 param.flow_id, prev_info.msg_type, prev_info.time, cur_info.msg_type, cur_info.time,
             );
 
-            if prev_info.time > cur_info.time {
-                if !cur_info.on_blacklist && cur_info.msg_type == LogMessageType::Request {
-                    timeout_counter.timeout[index] += 1;
-                }
-                if !prev_info.on_blacklist && prev_info.msg_type == LogMessageType::Request {
-                    timeout_counter.in_cache[index] += 1;
-                }
-                if !cur_info.on_blacklist {
+            if cur_info.msg_type == prev_info.msg_type {
+                let _ = timeout_counter.timeout[index].saturating_add(1);
+
+                let stats = if !cur_info.on_blacklist {
                     Some(L7PerfStats::from(&cur_info))
                 } else {
                     None
-                }
+                };
+                rtt_cache.put(key, cur_info).unwrap();
+
+                stats
             } else {
-                if !prev_info.on_blacklist && prev_info.msg_type == LogMessageType::Request {
-                    timeout_counter.timeout[index] += 1;
+                if !keep_prev {
+                    rtt_cache.pop(&key);
                 }
-                if !cur_info.on_blacklist && cur_info.msg_type == LogMessageType::Request {
-                    timeout_counter.in_cache[index] += 1;
-                }
-                let prev_info = rtt_cache.put(key, cur_info).unwrap();
-                if !prev_info.on_blacklist {
-                    Some(L7PerfStats::from(&prev_info))
+
+                let _ = timeout_counter.in_cache[index].saturating_sub(1);
+
+                if !cur_info.on_blacklist {
+                    Some(L7PerfStats::from(&cur_info))
                 } else {
                     None
                 }

agent/src/common/l7_protocol_log.rs

@@ -352,13 +352,13 @@ impl LogCache {
     pub fn is_request_of(&self, other: &Self) -> bool {
         self.msg_type == LogMessageType::Request
             && other.msg_type == LogMessageType::Response
-            && self.time < other.time
+            && self.time <= other.time
     }
 
     pub fn is_response_of(&self, other: &Self) -> bool {
         self.msg_type == LogMessageType::Response
             && other.msg_type == LogMessageType::Request
-            && self.time > other.time
+            && self.time >= other.time
     }
 }