fix: panic at flow_log::FlowKey

Author: yuanchaoa

agent/src/common/flow.rs

@@ -174,7 +174,18 @@ impl From<FlowKey> for flow_log::FlowKey {
             (IpAddr::V6(ip6), IpAddr::V6(ip6_1)) => {
                 (Ipv4Addr::UNSPECIFIED, Ipv4Addr::UNSPECIFIED, ip6, ip6_1)
             }
-            _ => panic!("FlowKey({:?}) ip_src,ip_dst type mismatch", &f),
+            (IpAddr::V4(ip4), IpAddr::V6(ip6_1)) => (
+                Ipv4Addr::UNSPECIFIED,
+                Ipv4Addr::UNSPECIFIED,
+                ip4.to_ipv6_mapped(),
+                ip6_1,
+            ),
+            (IpAddr::V6(ip6), IpAddr::V4(ip4_1)) => (
+                Ipv4Addr::UNSPECIFIED,
+                Ipv4Addr::UNSPECIFIED,
+                ip6,
+                ip4_1.to_ipv6_mapped(),
+            ),
         };
         flow_log::FlowKey {
             vtap_id: f.agent_id as u32,

agent/src/flow_generator/protocol_logs.rs

@@ -313,7 +313,18 @@ impl From<AppProtoLogsBaseInfo> for flow_log::AppProtoLogsBaseInfo {
             (IpAddr::V6(ip6), IpAddr::V6(ip6_1)) => {
                 (Ipv4Addr::UNSPECIFIED, Ipv4Addr::UNSPECIFIED, ip6, ip6_1)
             }
-            _ => panic!("{:?} ip_src,ip_dst type mismatch", &f),
+            (IpAddr::V4(ip4), IpAddr::V6(ip6_1)) => (
+                Ipv4Addr::UNSPECIFIED,
+                Ipv4Addr::UNSPECIFIED,
+                ip4.to_ipv6_mapped(),
+                ip6_1,
+            ),
+            (IpAddr::V6(ip6), IpAddr::V4(ip4_1)) => (
+                Ipv4Addr::UNSPECIFIED,
+                Ipv4Addr::UNSPECIFIED,
+                ip6,
+                ip4_1.to_ipv6_mapped(),
+            ),
         };
         flow_log::AppProtoLogsBaseInfo {
             start_time: f.start_time.as_nanos() as u64,

agent/src/metric/document.rs

@@ -441,7 +441,14 @@ impl From<Tagger> for metric::MiniTag {
                 (IpAddr::V6(ip6), IpAddr::V6(ip61)) => {
                     (ip6.octets().to_vec(), ip61.octets().to_vec())
                 }
-                _ => panic!("{:?} ip, ip1 type mismatch", &t),
+                (IpAddr::V4(ip4), IpAddr::V6(ip61)) => (
+                    ip4.to_ipv6_mapped().octets().to_vec(),
+                    ip61.octets().to_vec(),
+                ),
+                (IpAddr::V6(ip6), IpAddr::V4(ip41)) => (
+                    ip6.octets().to_vec(),
+                    ip41.to_ipv6_mapped().octets().to_vec(),
+                ),
             }
         } else {
             match t.ip {