Cleanup test

Remove duplicate code

Trigger test process to be processed immediately to get rtld.Loader
and Attach to happen faster.

Author: gnurizen

interpreter/rtld/rtld_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/coreos/pkg/dlopen"
 	log "github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/ebpf-profiler/libpf"
 	"go.opentelemetry.io/ebpf-profiler/metrics"
 	"go.opentelemetry.io/ebpf-profiler/support"
 	"go.opentelemetry.io/ebpf-profiler/testutils"
@@ -21,7 +22,7 @@ import (
 	"go.opentelemetry.io/ebpf-profiler/util"
 )
 
-func TestIntegration(t *testing.T) {
+func test(t *testing.T) {
 	if !testutils.IsRoot() {
 		t.Skip("This test requires root privileges")
 	}
@@ -35,13 +36,21 @@ func TestIntegration(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 	defer cancel()
 
+	enabledTracers, err := tracertypes.Parse("RTLD")
+	require.NoError(t, err, "Failed to parse enabled tracers")
+
 	// Start the tracer with all tracers enabled
 	traceCh, trc := testutils.StartTracer(ctx, t,
-		tracertypes.AllTracers(),
+		enabledTracers,
 		&testutils.MockReporter{},
 		false)
 	defer trc.Close()
 
+	trc.StartPIDEventProcessor(ctx)
+
+	// tickle tihs process to speed things up
+	trc.ForceProcessPID(libpf.PID(uint32(os.Getpid())))
+
 	// Consume traces to prevent blocking
 	go func() {
 		for {
@@ -79,67 +88,17 @@ func TestIntegration(t *testing.T) {
 	}, 5*time.Minute, 100*time.Millisecond)
 }
 
-func TestIntegrationSingleShot(t *testing.T) {
-	if !testutils.IsRoot() {
-		t.Skip("This test requires root privileges")
-	}
-
-	// Enable debug logging for CI debugging
-	if os.Getenv("DEBUG_TEST") != "" {
-		log.SetLevel(log.DebugLevel)
-	}
+func TestIntegration(t *testing.T) {
+	test(t)
+}
 
-	// Override HasMultiUprobeSupport to force single-shot mode
+func TestIntegrationSingleShot(t *testing.T) {
+	// Override HasMultiUprobeSupport to force single-shot mode on newer kernels.
 	multiUProbeOverride := false
 	util.SetTestOnlyMultiUprobeSupport(&multiUProbeOverride)
 	defer util.SetTestOnlyMultiUprobeSupport(nil)
 
-	// Create a context for the tracer
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
-	defer cancel()
-
-	// Start the tracer with all tracers enabled
-	traceCh, trc := testutils.StartTracer(ctx, t,
-		tracertypes.AllTracers(),
-		&testutils.MockReporter{},
-		false)
-	defer trc.Close()
-
-	// Consume traces to prevent blocking
-	go func() {
-		for {
-			select {
-			case <-ctx.Done():
-				return
-			case <-traceCh:
-				// Discard traces
-			}
-		}
-	}()
-
-	// retry a few times to get the metric, our process has to be detected and
-	// the dlopen uprobe has to attach.
-	require.Eventually(t, func() bool {
-		// Get the initial metric value
-		initialCount := getEBPFMetricValue(trc, metrics.IDDlopenUprobeHits)
-		t.Logf("Initial dlopen uprobe metric count: %d", initialCount)
-
-		// Use dlopen to load a shared library
-		// libm is a standard math library that's always present
-		lib, err := dlopen.GetHandle([]string{
-			"/lib/x86_64-linux-gnu/libm.so.6",
-			"libm.so.6",
-		})
-		require.NoError(t, err, "Failed to open libm.so.6")
-		defer lib.Close()
-
-		// Get the metrics after dlopen
-		finalCount := getEBPFMetricValue(trc, metrics.IDDlopenUprobeHits)
-		t.Logf("Final dlopen uprobe metric count: %d", finalCount)
-
-		// Check that the metric was incremented
-		return finalCount > initialCount
-	}, 5*time.Minute, 100*time.Millisecond)
+	test(t)
 }
 
 func getEBPFMetricValue(trc *tracer.Tracer, metricID metrics.MetricID) uint64 {

processmanager/execinfomanager/manager.go

@@ -140,7 +140,10 @@ func NewExecutableInfoManager(
 	if includeTracers.Has(types.Labels) {
 		interpreterLoaders = append(interpreterLoaders, golabels.Loader, customlabels.Loader)
 	}
-	interpreterLoaders = append(interpreterLoaders, oomwatcher.Loader, rtld.Loader)
+	if includeTracers.Has(types.RTLD) {
+		interpreterLoaders = append(interpreterLoaders, rtld.Loader)
+	}
+	interpreterLoaders = append(interpreterLoaders, oomwatcher.Loader)
 
 	if includeTracers.Has(types.CUDATracer) {
 		// USDT support requires cookies

tracer/tracer.go

@@ -1204,3 +1204,7 @@ func (t *Tracer) GetEbpfHandler() interpreter.EbpfHandler {
 func (t *Tracer) GetInterpretersForPID(pid libpf.PID) []interpreter.Instance {
 	return t.processManager.GetInterpretersForPID(pid)
 }
+
+func (t *Tracer) ForceProcessPID(pid libpf.PID) {
+	t.pidEvents <- libpf.PIDTID(uint64(pid) + uint64(pid)<<32)
+}

tracer/types/parse.go

@@ -25,6 +25,7 @@ const (
 	LuaJITTracer
 	GoTracer
 	Labels
+	RTLD
 	CUDATracer
 
 	// maxTracers indicates the max. number of different tracers
@@ -42,6 +43,7 @@ var tracerTypeToName = map[tracerType]string{
 	LuaJITTracer:  "luajit",
 	GoTracer:      "go",
 	Labels:        "labels",
+	RTLD:          "rtld",
 	CUDATracer:    "cuda",
 }