fix: fix for external domain resolution

Author: mayankpande88

common/net.go

@@ -236,7 +236,18 @@ func NewDomain(fqdn string, ips []netaddr.IP) *Domain {
 func NewDestinationKey(dst, actualDst netaddr.IPPort, domain *Domain, dstWorkload Workload, actualDestWorkload Workload) DestinationKey {
 	if IsIpExternal(actualDst.IP()) && domain != nil && !domain.SpecifyIP {
 		return DestinationKey{
-			destination: HostPortWithEmptyIP(domain.FQDN, dst.Port()),
+			destination:       HostPortWithEmptyIP(domain.FQDN, dst.Port()),
+			actualDestination: HostPortFromIPPort(actualDst),
+			destinationWorkload: Workload{
+				Kind:      "external",
+				Name:      domain.FQDN,
+				Namespace: "external",
+			},
+			actualDestinationWorkload: Workload{
+				Kind:      "external",
+				Name:      actualDst.IP().String(),
+				Namespace: "external",
+			},
 		}
 	}
 	return DestinationKey{

containers/container.go

@@ -763,7 +763,7 @@ func (c *Container) onDNSRequest(r *l7.RequestData) map[netaddr.IP]*common.Domai
 	return ip2fqdn
 }
 
-func (c *Container) onL7Request(pid uint32, fd uint64, timestamp uint64, r *l7.RequestData, iqfqdn map[netaddr.IP]*common.Domain) map[netaddr.IP]*common.Domain {
+func (c *Container) onL7Request(pid uint32, fd uint64, timestamp uint64, r *l7.RequestData) map[netaddr.IP]*common.Domain {
 	c.lock.Lock()
 	defer c.lock.Unlock()
 
@@ -778,17 +778,6 @@ func (c *Container) onL7Request(pid uint32, fd uint64, timestamp uint64, r *l7.R
 	if timestamp != 0 && conn.Timestamp != timestamp {
 		return nil
 	}
-	if conn.dstWorkload.Namespace == "external" && (r.Protocol == l7.ProtocolHTTP || r.Protocol == l7.ProtocolHTTP2) {
-		if host, ok := iqfqdn[conn.DestinationKey.ActualDestination().IP()]; ok {
-			log.Printf("Setting external host %s", host)
-			conn.dstWorkload.Name = host.FQDN
-		} else {
-			host, error := l7.ParseHostFromHttpRequest(string(r.Payload))
-			if error == nil {
-				conn.dstWorkload.Name = host
-			}
-		}
-	}
 
 	// Parse HTTP request once if needed
 	var req *http.Request

containers/registry.go

@@ -294,7 +294,7 @@ func (r *Registry) handleEvents(ch <-chan ebpftracer.Event) {
 					continue
 				}
 				if c := r.containersByPid[e.Pid]; c != nil {
-					ip2fqdn := c.onL7Request(e.Pid, e.Fd, e.Timestamp, e.L7Request, r.ip2fqdn)
+					ip2fqdn := c.onL7Request(e.Pid, e.Fd, e.Timestamp, e.L7Request)
 					r.ip2fqdnLock.Lock()
 					for ip, domain := range ip2fqdn {
 						r.ip2fqdn[ip] = domain