fix macos and stress tests

DataDog · Nov 24, 2023 · 5319404 · 5319404
1 parent 52d5e10
commit 5319404
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 34 deletions.
diff --git a/pkg/security/probe/probe_others.go b/pkg/security/probe/probe_others.go
@@ -12,7 +12,6 @@ import (
 
 	"github.com/DataDog/datadog-agent/pkg/security/config"
 	"github.com/DataDog/datadog-agent/pkg/security/probe/kfilters"
-	"github.com/DataDog/datadog-agent/pkg/security/resolvers"
 	"github.com/DataDog/datadog-agent/pkg/security/secl/compiler/eval"
 	"github.com/DataDog/datadog-agent/pkg/security/secl/model"
 	"github.com/DataDog/datadog-agent/pkg/security/secl/rules"
@@ -87,11 +86,6 @@ func (p *Probe) StatsPollingInterval() time.Duration {
 	return p.Config.Probe.StatsPollingInterval
 }
 
-// GetResolvers returns the resolvers of Probe
-func (p *Probe) GetResolvers() *resolvers.Resolvers {
-	return nil
-}
-
 // FlushDiscarders invalidates all the discarders
 func (p *Probe) FlushDiscarders() error {
 	return nil

diff --git a/pkg/security/probe/probe_windows.go b/pkg/security/probe/probe_windows.go
@@ -246,10 +246,10 @@ func (p *WindowsProbe) NewEvent() *model.Event {
 func (p *WindowsProbe) HandleActions(_ *rules.Rule, _ eval.Event) {}
 
 // AddDiscarderPushedCallback add a callback to the list of func that have to be called when a discarder is pushed to kernel
-func (p *EBPFLessProbe) AddDiscarderPushedCallback(_ DiscarderPushedCallback) {}
+func (p *WindowsProbe) AddDiscarderPushedCallback(_ DiscarderPushedCallback) {}
 
 // GetEventTags returns the event tags
-func (p *EBPFLessProbe) GetEventTags(_ string) []string {
+func (p *WindowsProbe) GetEventTags(_ string) []string {
 	return nil
 }
 

diff --git a/pkg/security/resolvers/resolvers_others.go b/pkg/security/resolvers/resolvers_others.go
diff --git a/pkg/security/tests/stress_test.go b/pkg/security/tests/stress_test.go
@@ -17,6 +17,7 @@ import (
 	"testing"
 	"time"
 
+	sprobe "github.com/DataDog/datadog-agent/pkg/security/probe"
 	"github.com/DataDog/datadog-agent/pkg/security/secl/model"
 	"github.com/DataDog/datadog-agent/pkg/security/secl/rules"
 )
@@ -41,6 +42,11 @@ func stressOpen(t *testing.T, rule *rules.RuleDefinition, pathname string, size
 	}
 	defer test.Close()
 
+	p, ok := test.probe.PlatformProbe.(*sprobe.EBPFProbe)
+	if !ok {
+		b.Skip("not supported")
+	}
+
 	testFolder, _, err := test.Path(path.Dir(pathname))
 	if err != nil {
 		t.Fatal(err)
@@ -53,7 +59,8 @@ func stressOpen(t *testing.T, rule *rules.RuleDefinition, pathname string, size
 		t.Fatal(err)
 	}
 
-	eventStreamMonitor := test.probe.GetMonitors().GetEventStreamMonitor()
+	eventStreamMonitor := p.GetMonitors().GetEventStreamMonitor()
+
 	eventStreamMonitor.GetAndResetLostCount("events", -1)
 	eventStreamMonitor.GetKernelLostCount("events", -1, model.MaxKernelEventType)
 
@@ -183,6 +190,11 @@ func stressExec(t *testing.T, rule *rules.RuleDefinition, pathname string, execu
 	}
 	defer test.Close()
 
+	p, ok := test.probe.PlatformProbe.(*sprobe.EBPFProbe)
+	if !ok {
+		b.Skip("not supported")
+	}
+
 	testFolder, _, err := test.Path(path.Dir(pathname))
 	if err != nil {
 		t.Fatal(err)
@@ -195,7 +207,7 @@ func stressExec(t *testing.T, rule *rules.RuleDefinition, pathname string, execu
 		t.Fatal(err)
 	}
 
-	eventStreamMonitor := test.probe.GetMonitors().GetEventStreamMonitor()
+	eventStreamMonitor := p.GetMonitors().GetEventStreamMonitor()
 	eventStreamMonitor.GetAndResetLostCount("events", -1)
 	eventStreamMonitor.GetKernelLostCount("events", -1, model.MaxKernelEventType)