fix: endpoint hash

Author: yuanchaoa

agent/src/collector/collector.rs

@@ -137,7 +137,7 @@ struct StashKey {
     dst_ip: IpAddr,
     src_gpid: u32,
     dst_gpid: u32,
-    endpoint_hash: u32,
+    endpoint_hash: u64,
     // request-reponse time span
     time_span: u32,
     biz_type: u8,
@@ -198,7 +198,7 @@ impl StashKey {
 
     const ACL: Code = Code::ACL_GID.union(Code::TUNNEL_IP_ID).union(Code::VTAP_ID);
 
-    fn new(tagger: &Tagger, src_ip: IpAddr, dst_ip: Option<IpAddr>, endpoint_hash: u32) -> Self {
+    fn new(tagger: &Tagger, src_ip: IpAddr, dst_ip: Option<IpAddr>, endpoint_hash: u64) -> Self {
         let mut fast_id = 0;
         match tagger.code {
             // single point
@@ -779,7 +779,7 @@ impl Stash {
         }
     }
 
-    fn fill_single_l7_stats(&mut self, tagger: Tagger, endpoint_hash: u32, app_meter: AppMeter) {
+    fn fill_single_l7_stats(&mut self, tagger: Tagger, endpoint_hash: u64, app_meter: AppMeter) {
         // The l7_protocol of otel data may not be available, so report all otel data metrics.
         if tagger.l7_protocol != L7Protocol::Unknown || tagger.signal_source == SignalSource::OTel {
             // Only data whose direction is c|s|local|c-p|s-p|c-app|s-app|app has app_meter.
@@ -796,7 +796,7 @@ impl Stash {
         }
     }
 
-    fn fill_edge_l7_stats(&mut self, tagger: Tagger, endpoint_hash: u32, app_meter: AppMeter) {
+    fn fill_edge_l7_stats(&mut self, tagger: Tagger, endpoint_hash: u64, app_meter: AppMeter) {
         // The l7_protocol of otel data may not be available, so report all otel data metrics.
         // application metrics (vtap_app_edge_port)
         if tagger.l7_protocol != L7Protocol::Unknown || tagger.signal_source == SignalSource::OTel {

agent/src/collector/l7_quadruple_generator.rs

@@ -59,8 +59,6 @@ pub struct QgCounter {
     pub stash_total_capacity: AtomicU64,
 }
 
-impl AppMeterWithFlow {}
-
 struct QuadrupleStash {
     meters: HashMap<u64, Vec<Box<AppMeterWithFlow>>>,
 }
@@ -260,7 +258,7 @@ impl SubQuadGen {
         app_meter: &AppMeter,
         time_in_second: Duration,
         time_span: u32,
-        endpoint_hash: u32,
+        endpoint_hash: u64,
         is_active_host0: bool,
         is_active_host1: bool,
     ) -> AppMeterWithFlow {
@@ -284,7 +282,7 @@ impl SubQuadGen {
         &mut self,
         l7_stats: &L7Stats,
         app_meter: &AppMeter,
-        endpoint_hash: u32,
+        endpoint_hash: u64,
         time_in_second: Duration,
         possible_host: &mut Option<PossibleHost>,
     ) {
@@ -638,7 +636,7 @@ impl L7QuadrupleGenerator {
         let l7_stats = l7_stats.unwrap();
 
         let endpoint_hash = match &l7_stats.endpoint {
-            Some(e) => hash_to_u64(e) as u32,
+            Some(e) => hash_to_u64(e),
             None => 0,
         };
 

agent/src/collector/types.rs

@@ -170,7 +170,7 @@ impl FlowMeterWithFlow {
 pub struct AppMeterWithFlow {
     pub flow: MiniFlow,
     pub l7_protocol: L7Protocol,
-    pub endpoint_hash: u32,
+    pub endpoint_hash: u64,
     pub endpoint: Option<String>,
     pub biz_type: u8,
     pub is_active_host0: bool,