Merge pull request #6 from kubescape/feature/integ

Removing external managed code support

cli_flags.go

@@ -82,7 +82,6 @@ type arguments struct {
 	samplesPerSecond       int
 	sendErrorFrames        bool
 	tracers                string
-	externallyManaged      bool
 	verboseMode            bool
 	version                bool
 
@@ -136,8 +135,6 @@ func parseArgs() (*arguments, error) {
 	fs.StringVar(&args.tracers, "t", "all", "Shorthand for -tracers.")
 	fs.StringVar(&args.tracers, "tracers", "all", tracersHelp)
 
-	fs.BoolVar(&args.externallyManaged, "externally-managed", false, externallyManagedHelp)
-
 	fs.BoolVar(&args.verboseMode, "v", false, "Shorthand for -verbose.")
 	fs.BoolVar(&args.verboseMode, "verbose", false, verboseModeHelp)
 	fs.BoolVar(&args.version, "version", false, versionHelp)

main.go

@@ -227,25 +227,18 @@ func mainWithExitCode() exitCode {
 	metrics.Add(metrics.IDProcPIDStartupMs, metrics.MetricValue(time.Since(now).Milliseconds()))
 	log.Debug("Completed initial PID listing")
 
-	if args.externallyManaged {
-		_, err := trc.GetNativeTracerEntry()
-		if err != nil {
-			return failure("Failed to get native tracer entry: %v", err)
-		}
+	// Attach our tracer to the perf event
+	if err := trc.AttachTracer(); err != nil {
+		return failure("Failed to attach to perf event: %v", err)
+	}
+	log.Info("Attached tracer program")
+
+	if args.probabilisticThreshold < tracer.ProbabilisticThresholdMax {
+		trc.StartProbabilisticProfiling(mainCtx)
+		log.Printf("Enabled probabilistic profiling")
 	} else {
-		// Attach our tracer to the perf event
-		if err := trc.AttachTracer(); err != nil {
-			return failure("Failed to attach to perf event: %v", err)
-		}
-		log.Info("Attached tracer program")
-
-		if args.probabilisticThreshold < tracer.ProbabilisticThresholdMax {
-			trc.StartProbabilisticProfiling(mainCtx)
-			log.Printf("Enabled probabilistic profiling")
-		} else {
-			if err := trc.EnableProfiling(); err != nil {
-				return failure("Failed to enable perf events: %v", err)
-			}
+		if err := trc.EnableProfiling(); err != nil {
+			return failure("Failed to enable perf events: %v", err)
 		}
 	}
 

tracer/tracer.go

@@ -1171,7 +1171,7 @@ func (t *Tracer) TraceProcessor() tracehandler.TraceProcessor {
 // GetNativeTracerEntry returns the file descriptor of the native tracer entry program.
 // This allows the client to use the fd to trigger the eBPF program using tail calls.
 func (t *Tracer) GetNativeTracerEntry() (int, error) {
-	tracerProg, ok := t.ebpfProgs["native_tracer_entry"]
+	tracerProg, ok := t.ebpfProgs["native_tracer_entry_kprobe"]
 	if !ok {
 		return 0, fmt.Errorf("entry program is not available")
 	}