Remove custom labels bool in favor Labels tracer type

Author: gnurizen

processmanager/execinfomanager/manager.go

@@ -106,7 +106,6 @@ func NewExecutableInfoManager(
 	sdp nativeunwind.StackDeltaProvider,
 	ebpf pmebpf.EbpfHandler,
 	includeTracers types.IncludedTracers,
-	collectCustomLabels bool,
 ) (*ExecutableInfoManager, error) {
 	// Initialize interpreter loaders.
 	interpreterLoaders := make([]interpreter.Loader, 0)
@@ -139,10 +138,7 @@ func NewExecutableInfoManager(
 	}
 	interpreterLoaders = append(interpreterLoaders, apmint.Loader)
 	if includeTracers.Has(types.Labels) {
-		interpreterLoaders = append(interpreterLoaders, golabels.Loader)
-	}
-	if collectCustomLabels {
-		interpreterLoaders = append(interpreterLoaders, customlabels.Loader)
+		interpreterLoaders = append(interpreterLoaders, golabels.Loader, customlabels.Loader)
 	}
 	interpreterLoaders = append(interpreterLoaders, oomwatcher.Loader, rtld.Loader)
 

processmanager/manager.go

@@ -67,7 +67,7 @@ var (
 func New(ctx context.Context, includeTracers types.IncludedTracers, monitorInterval time.Duration,
 	ebpf pmebpf.EbpfHandler, fileIDMapper FileIDMapper, symbolReporter reporter.SymbolReporter,
 	sdp nativeunwind.StackDeltaProvider, filterErrorFrames bool,
-	collectCustomLabels bool, includeEnvVars libpf.Set[string]) (*ProcessManager, error) {
+	includeEnvVars libpf.Set[string]) (*ProcessManager, error) {
 	if fileIDMapper == nil {
 		var err error
 		fileIDMapper, err = newFileIDMapper(lruFileIDCacheSize)
@@ -83,7 +83,7 @@ func New(ctx context.Context, includeTracers types.IncludedTracers, monitorInter
 	}
 	elfInfoCache.SetLifetime(elfInfoCacheTTL)
 
-	em, err := eim.NewExecutableInfoManager(sdp, ebpf, includeTracers, collectCustomLabels)
+	em, err := eim.NewExecutableInfoManager(sdp, ebpf, includeTracers)
 	if err != nil {
 		return nil, fmt.Errorf("unable to create ExecutableInfoManager: %v", err)
 	}

processmanager/manager_test.go

@@ -311,7 +311,6 @@ func TestInterpreterConvertTrace(t *testing.T) {
 				&symbolReporterMockup{},
 				nil,
 				true,
-				false,
 				libpf.Set[string]{})
 			require.NoError(t, err)
 
@@ -392,7 +391,6 @@ func TestNewMapping(t *testing.T) {
 				symRepMockup,
 				&dummyProvider,
 				true,
-				false,
 				libpf.Set[string]{})
 			require.NoError(t, err)
 
@@ -578,7 +576,6 @@ func TestProcExit(t *testing.T) {
 				repMockup,
 				&dummyProvider,
 				true,
-				false,
 				libpf.Set[string]{})
 			require.NoError(t, err)
 			defer cancel()

testutils/helpers.go

@@ -39,7 +39,6 @@ func (f MockReporter) ExecutableMetadata(_ *reporter.ExecutableMetadataArgs) {
 func StartTracer(ctx context.Context, t *testing.T, et tracertypes.IncludedTracers,
 	r reporter.SymbolReporter, printBpfLogs bool) (chan *host.Trace, *tracer.Tracer) {
 	trc, err := tracer.NewTracer(ctx, &tracer.Config{
-		CollectCustomLabels:    true,
 		Reporter:               r,
 		Intervals:              &MockIntervals{},
 		IncludeTracers:         et,

tools/coredump/coredump.go

@@ -164,7 +164,7 @@ func ExtractTraces(ctx context.Context, pr process.Process, debug bool,
 	includeTracers, _ := tracertypes.Parse("all")
 
 	manager, err := pm.New(todo, includeTracers, monitorInterval, &coredumpEbpfMaps,
-		pm.NewMapFileIDMapper(), symCache, elfunwindinfo.NewStackDeltaProvider(), false, false,
+		pm.NewMapFileIDMapper(), symCache, elfunwindinfo.NewStackDeltaProvider(), false,
 		libpf.Set[string]{})
 	if err != nil {
 		return nil, fmt.Errorf("failed to get Interpreter manager: %v", err)

tracer/tracer.go

@@ -135,9 +135,6 @@ type Config struct {
 	FilterErrorFrames bool
 	// KernelVersionCheck indicates whether the kernel version should be checked.
 	KernelVersionCheck bool
-	// CollectCustomLabels determines whether to collect custom labels in
-	// languages that support them.
-	CollectCustomLabels bool
 	// VerboseMode indicates whether to enable verbose output of eBPF tracers.
 	VerboseMode bool
 	// InstrumentCudaLaunch determines whether to instrument calls to `cudaLaunchKernel`.
@@ -215,7 +212,7 @@ func NewTracer(ctx context.Context, cfg *Config) (*Tracer, error) {
 
 	processManager, err := pm.New(ctx, cfg.IncludeTracers, cfg.Intervals.MonitorInterval(),
 		ebpfHandler, nil, cfg.Reporter, elfunwindinfo.NewStackDeltaProvider(),
-		cfg.FilterErrorFrames, cfg.CollectCustomLabels, cfg.IncludeEnvVars)
+		cfg.FilterErrorFrames, cfg.IncludeEnvVars)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create processManager: %v", err)
 	}