fix: DNS queries recognition not working

since networking events are global for all containers in a pod we need
to support a single identifier for all networking events and a parent
id for each container event to cross reference the events from
containers to events from pods

cmd/dnsproxy/main.go

@@ -96,8 +96,8 @@ func main() {
 		panic(err)
 	}
 	sourceId := &proto.SourceId{
-		Type: "container",
-		Id:   hostname + "-" + os.Getenv(consts.ContainerNameEnv),
+		Type: "pod",
+		Id:   hostname,
 	}
 	client := CreateDaemonServiceClient(sourceId)
 	search, err := retrieveSearchList()

cmd/entrypoint/main.go

@@ -80,8 +80,9 @@ func xmain() error {
 
 	_, err = client.Monitor(context.Background(), &proto.MonitorPodRequest{
 		Id: &proto.SourceId{
-			Type: "container",
-			Id:   hostname + "-" + os.Getenv(consts.ContainerNameEnv),
+			Type:   "container",
+			Parent: hostname,
+			Id:     hostname + "-" + os.Getenv(consts.ContainerNameEnv),
 		},
 	})
 	if err != nil {

pkg/analyze/analyze.go

@@ -150,7 +150,7 @@ func Analyze(inputFilename string, filters *Filters) (*proto.AnalysisSummary, er
 	}
 
 	for i, s := range sources {
-		if s.GetType() == "host" {
+		if s.GetType() == "host" || s.GetType() == "pod" {
 			continue
 		}
 		sum, err := analyzeContainer(inputFilename, s, searchPaths[i], filters)

pkg/analyze/analyze_failed_connections.go

@@ -121,8 +121,27 @@ func (analyzer *connectionAnalyzer) handleDnsEvent(dns *proto.Event_DnsQueryEven
 	return true
 }
 
+func (analyzer *connectionAnalyzer) isEventRelevant(event *proto.Event) bool {
+	// TODO: compare the host id
+	if event.GetSource().GetType() == "host" {
+		return true
+	}
+	if event.GetSource().GetType() == "container" {
+		if event.GetSource().GetId() == analyzer.sourceId.GetId() {
+			return true
+		}
+	} else if event.GetSource().GetType() == "pod" {
+		if event.GetSource().GetId() == analyzer.sourceId.GetParent() {
+			return true
+		}
+	}
+
+	return false
+
+}
+
 func (analyzer *connectionAnalyzer) handleEvent(event *proto.Event) bool {
-	if (event.GetSource().GetId() != analyzer.sourceId.GetId() || event.GetSource().GetType() != analyzer.sourceId.GetType()) && (event.GetSource().GetType() != "host") {
+	if !analyzer.isEventRelevant(event) {
 		return true
 	}
 	net := event.GetNetwork()

pkg/analyze/analyze_test.go

@@ -17,9 +17,9 @@ package analyze
 import (
 	"testing"
 
+	"github.com/google/containerdbg/proto"
 	"github.com/google/go-cmp/cmp"
 	"google.golang.org/protobuf/testing/protocmp"
-	"github.com/google/containerdbg/proto"
 )
 
 func TestAnalyze(t *testing.T) {
@@ -131,7 +131,7 @@ func TestAnalyze(t *testing.T) {
 			},
 		},
 		{
-			name:     "connection failed to external service error",
+			name:     "connection failed to external service error ubuntu",
 			dataFile: "./testdata/tomcat-ubuntu-host.pb",
 			expected: &proto.AnalysisSummary{
 				ContainerSummaries: []*proto.AnalysisSummary_ContainerSummaryTuple{

pkg/debug/image.go

@@ -116,7 +116,7 @@ func modifyContainer(container *v1.Container) error {
 }
 
 func GetDnsProxyContainer() v1.EphemeralContainerCommon {
-	return v1.EphemeralContainerCommon{
+	container := v1.EphemeralContainerCommon{
 		Name:            "dnsproxy",
 		Image:           build.ImageRepo + "/dnsproxy:" + build.ImageVersion,
 		ImagePullPolicy: v1.PullPolicy(build.PullPolicy),
@@ -126,6 +126,8 @@ func GetDnsProxyContainer() v1.EphemeralContainerCommon {
 			RunAsGroup: pointer.Int64(0),
 		},
 	}
+
+	return container
 }
 
 func ModifyPodSpec(podspec *v1.PodSpec) error {

proto/event.proto

@@ -28,6 +28,7 @@ message DnsQueryError {
 message SourceId {
   string type = 1;
   string id = 2;
+  string parent = 3;
 }
 
 message Event {