Add eBPF event filtering and tagging

src/ebpf/init.go

@@ -1,11 +1,18 @@
 package ebpf
 
-import "github.com/sirupsen/logrus"
+import (
+	"github.com/sirupsen/logrus"
+	"testing"
+)
 
 var Objs BpfObjects
 var Specs BpfSpecs
 
 func init() {
+	if testing.Testing() {
+		return
+	}
+
 	// Load and assign specs
 	specs, err := LoadBpf()
 	if err != nil {

src/mapper/cmd/main.go

@@ -42,13 +42,13 @@ import (
 	"github.com/otterize/intents-operator/src/shared/serviceidresolver"
 	"github.com/otterize/intents-operator/src/shared/telemetries/telemetriesgql"
 	"github.com/otterize/intents-operator/src/shared/telemetries/telemetrysender"
-	"github.com/otterize/network-mapper/src/mapper/pkg/cloudclient"
 	"github.com/otterize/network-mapper/src/mapper/pkg/clouduploader"
 	"github.com/otterize/network-mapper/src/mapper/pkg/config"
 	"github.com/otterize/network-mapper/src/mapper/pkg/intentsstore"
 	"github.com/otterize/network-mapper/src/mapper/pkg/kubefinder"
 	"github.com/otterize/network-mapper/src/mapper/pkg/metricexporter"
 	"github.com/otterize/network-mapper/src/mapper/pkg/resolvers"
+	"github.com/otterize/network-mapper/src/shared/cloudclient"
 	sharedconfig "github.com/otterize/network-mapper/src/shared/config"
 	"github.com/otterize/network-mapper/src/shared/kubeutils"
 	"github.com/otterize/network-mapper/src/shared/version"

src/mapper/pkg/clouduploader/cloud_upload.go

@@ -7,10 +7,10 @@ import (
 	"github.com/otterize/network-mapper/src/mapper/pkg/awsintentsholder"
 	"github.com/otterize/network-mapper/src/mapper/pkg/externaltrafficholder"
 	"github.com/otterize/network-mapper/src/mapper/pkg/incomingtrafficholder"
+	"github.com/otterize/network-mapper/src/shared/cloudclient"
 	"time"
 
 	"github.com/cenkalti/backoff/v4"
-	"github.com/otterize/network-mapper/src/mapper/pkg/cloudclient"
 	"github.com/otterize/network-mapper/src/mapper/pkg/graph/model"
 	"github.com/otterize/network-mapper/src/mapper/pkg/intentsstore"
 	"github.com/samber/lo"

src/mapper/pkg/clouduploader/cloud_uploader_test.go

@@ -7,11 +7,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/otterize/network-mapper/src/mapper/pkg/cloudclient"
-	cloudclientmocks "github.com/otterize/network-mapper/src/mapper/pkg/cloudclient/mocks"
 	"github.com/otterize/network-mapper/src/mapper/pkg/config"
 	"github.com/otterize/network-mapper/src/mapper/pkg/graph/model"
 	"github.com/otterize/network-mapper/src/mapper/pkg/intentsstore"
+	"github.com/otterize/network-mapper/src/shared/cloudclient"
+	cloudclientmocks "github.com/otterize/network-mapper/src/shared/cloudclient/mocks"
 	"github.com/samber/lo"
 	"github.com/stretchr/testify/suite"
 	"go.uber.org/mock/gomock"
@@ -36,7 +36,7 @@ func (s *CloudUploaderTestSuite) SetupTest() {
 	s.incomingHolder = incomingtrafficholder.NewIncomingTrafficIntentsHolder()
 }
 
-func (s *CloudUploaderTestSuite) BeforeTest(_, testName string) {
+func (s *CloudUploaderTestSuite) BeforeTest(_, _ string) {
 	controller := gomock.NewController(s.T())
 	s.clientMock = cloudclientmocks.NewMockCloudClient(controller)
 	s.cloudUploader = NewCloudUploader(s.intentsHolder, Config{UploadBatchSize: config.UploadBatchSizeDefault}, s.clientMock)

src/mapper/pkg/clouduploader/intents_input_matcher.go

@@ -3,7 +3,7 @@ package clouduploader
 import (
 	"fmt"
 	"github.com/google/go-cmp/cmp"
-	"github.com/otterize/network-mapper/src/mapper/pkg/cloudclient"
+	"github.com/otterize/network-mapper/src/shared/cloudclient"
 	"golang.org/x/exp/constraints"
 	"sort"
 )

src/mapper/pkg/clouduploader/models_to_api.go

@@ -1,8 +1,8 @@
 package clouduploader
 
 import (
-	"github.com/otterize/network-mapper/src/mapper/pkg/cloudclient"
 	"github.com/otterize/network-mapper/src/mapper/pkg/graph/model"
+	"github.com/otterize/network-mapper/src/shared/cloudclient"
 	"github.com/samber/lo"
 )
 

src/mapper/pkg/resourcevisibility/ingress_reconciler.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"github.com/otterize/intents-operator/src/shared/errors"
 	"github.com/otterize/intents-operator/src/shared/injectablerecorder"
-	"github.com/otterize/network-mapper/src/mapper/pkg/cloudclient"
+	"github.com/otterize/network-mapper/src/shared/cloudclient"
 	"github.com/samber/lo"
 	networkingv1 "k8s.io/api/networking/v1"
 	"k8s.io/client-go/tools/record"

src/mapper/pkg/resourcevisibility/ingress_reconciler_test.go

@@ -2,9 +2,9 @@ package resourcevisibility
 
 import (
 	"context"
-	"github.com/otterize/network-mapper/src/mapper/pkg/cloudclient"
-	cloudclientmocks "github.com/otterize/network-mapper/src/mapper/pkg/cloudclient/mocks"
 	"github.com/otterize/network-mapper/src/mapper/pkg/mocks"
+	"github.com/otterize/network-mapper/src/shared/cloudclient"
+	cloudclientmocks "github.com/otterize/network-mapper/src/shared/cloudclient/mocks"
 	"github.com/otterize/nilable"
 	"github.com/samber/lo"
 	"github.com/stretchr/testify/suite"

src/mapper/pkg/resourcevisibility/model_convertion.go

@@ -2,7 +2,7 @@ package resourcevisibility
 
 import (
 	"github.com/otterize/intents-operator/src/shared/errors"
-	"github.com/otterize/network-mapper/src/mapper/pkg/cloudclient"
+	"github.com/otterize/network-mapper/src/shared/cloudclient"
 	"github.com/otterize/nilable"
 	"github.com/samber/lo"
 	"github.com/sirupsen/logrus"

src/mapper/pkg/resourcevisibility/svc_reconciler.go

@@ -7,9 +7,9 @@ import (
 	"github.com/hashicorp/golang-lru/v2/expirable"
 	"github.com/otterize/intents-operator/src/shared/errors"
 	"github.com/otterize/intents-operator/src/shared/injectablerecorder"
-	"github.com/otterize/network-mapper/src/mapper/pkg/cloudclient"
 	"github.com/otterize/network-mapper/src/mapper/pkg/config"
 	"github.com/otterize/network-mapper/src/mapper/pkg/graph/model"
+	"github.com/otterize/network-mapper/src/shared/cloudclient"
 	"github.com/samber/lo"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"

src/mapper/pkg/resourcevisibility/svc_reconciler_test.go

@@ -1,10 +1,10 @@
 package resourcevisibility
 
 import (
-	"github.com/otterize/network-mapper/src/mapper/pkg/cloudclient"
-	cloudclientmocks "github.com/otterize/network-mapper/src/mapper/pkg/cloudclient/mocks"
 	"github.com/otterize/network-mapper/src/mapper/pkg/graph/model"
 	"github.com/otterize/network-mapper/src/mapper/pkg/mocks"
+	"github.com/otterize/network-mapper/src/shared/cloudclient"
+	cloudclientmocks "github.com/otterize/network-mapper/src/shared/cloudclient/mocks"
 	"github.com/otterize/nilable"
 	"github.com/samber/lo"
 	"github.com/stretchr/testify/suite"

src/node-agent/cmd/agent/main.go

@@ -4,6 +4,7 @@ import (
 	"github.com/otterize/network-mapper/src/node-agent/pkg/container"
 	"github.com/otterize/network-mapper/src/node-agent/pkg/reconcilers"
 	"github.com/otterize/network-mapper/src/node-agent/pkg/service"
+	"github.com/otterize/network-mapper/src/shared/cloudclient"
 	"github.com/sirupsen/logrus"
 	ctrl "sigs.k8s.io/controller-runtime"
 )
@@ -17,9 +18,18 @@ func main() {
 	criClient := service.CreateCRIClientOrDie()
 	containerManager := container.NewContainerManager(criClient)
 
+	cloudClient, cloudEnabled, err := cloudclient.NewClient(signalHandlerCtx)
+	if err != nil {
+		logrus.WithError(err).Panic("Failed to initialize cloud client")
+	}
+	if !cloudEnabled {
+		logrus.WithError(err).Panic("Cloud client is not enabled")
+	}
+
 	reconcilers.RegisterReconcilersOrDie(
 		mgr,
 		client,
+		cloudClient,
 		containerManager,
 	)
 

src/node-agent/pkg/container/containerinfo.go

@@ -1,12 +1,16 @@
 package container
 
-import "github.com/otterize/network-mapper/src/bintools/bininfo"
+import (
+	"github.com/otterize/network-mapper/src/bintools/bininfo"
+	"k8s.io/apimachinery/pkg/types"
+)
 
 type ContainerInfo struct {
 	Id             string
 	Pid            int    `json:"pid"`
 	PodId          string `json:"sandboxId"`
 	PodIP          string
+	PodName        types.NamespacedName
 	ExecutableInfo ExecutableInfo
 }
 

src/node-agent/pkg/container/manager.go

@@ -8,6 +8,7 @@ import (
 	"github.com/otterize/network-mapper/src/bintools/bininfo"
 	"github.com/sirupsen/logrus"
 	v1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/types"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	"os"
 	"strings"
@@ -50,6 +51,7 @@ func (m *ContainerManager) GetContainerInfo(ctx context.Context, pod v1.Pod, con
 
 	var info ContainerInfo
 	err = json.Unmarshal([]byte(resp.Info["info"]), &info)
+	info.PodName = types.NamespacedName{Name: pod.Name, Namespace: pod.Namespace}
 
 	if err != nil {
 		return ContainerInfo{}, errors.Wrap(err)
@@ -58,6 +60,8 @@ func (m *ContainerManager) GetContainerInfo(ctx context.Context, pod v1.Pod, con
 	info.Id = resp.Status.Id
 	info.PodIP = pod.Status.PodIP
 
+	// TODO: pod ip sometimes is 0, need to handle
+
 	// Get the executable info
 	execInfo, err := m.InspectContainerExec(info.Pid)
 	if err != nil {