Add additional frame with executable path when available

processmanager/processinfo.go

@@ -319,7 +319,7 @@ func (pm *ProcessManager) getELFInfo(pr process.Process, mapping *process.Mappin
 		buildID, _ = ef.GetGoBuildID()
 	}
 
-	pm.reporter.ExecutableMetadata(context.TODO(), fileID, baseName, buildID)
+	pm.reporter.ExecutableMetadata(context.TODO(), fileID, baseName, mapping.Path, buildID)
 
 	return info
 }

reporter/datadog_reporter.go

@@ -137,9 +137,10 @@ func (r *DatadogReporter) ReportFallbackSymbol(frameID libpf.FrameID, symbol str
 // ExecutableMetadata accepts a fileID with the corresponding filename
 // and caches this information.
 func (r *DatadogReporter) ExecutableMetadata(_ context.Context,
-	fileID libpf.FileID, fileName, buildID string) {
+	fileID libpf.FileID, fileName, filePath string, buildID string) {
 	r.executables.Add(fileID, execInfo{
 		fileName: fileName,
+		filePath: filePath,
 		buildID:  buildID,
 	})
 }
@@ -414,6 +415,8 @@ func (r *DatadogReporter) getPprofProfile() (profile *pprofile.Profile,
 			}
 		}
 
+		var lastExecPath string
+
 		// Walk every frame of the trace.
 		for i := range trace.frameTypes {
 			loc := createPProfLocation(profile, uint64(trace.linenos[i]))
@@ -508,6 +511,18 @@ func (r *DatadogReporter) getPprofProfile() (profile *pprofile.Profile,
 				// To be compliant with the protocol generate a dummy mapping entry.
 				loc.Mapping = getDummyMapping(fileIDtoMapping, profile, trace.files[i])
 			}
+			execInfo, exists := r.executables.Get(trace.files[i])
+			if exists {
+				lastExecPath = execInfo.filePath
+			}
+			sample.Location = append(sample.Location, loc)
+		}
+
+		if lastExecPath != "" {
+			lastLocation := sample.Location[len(sample.Location)-1]
+			loc := createPProfLocation(profile, lastLocation.Address)
+			m := createPprofFunctionEntry(funcMap, profile, lastExecPath, lastExecPath)
+			loc.Line = append(loc.Line, pprofile.Line{Function: m})
 			sample.Location = append(sample.Location, loc)
 		}
 

reporter/iface.go

@@ -57,7 +57,7 @@ type SymbolReporter interface {
 
 	// ExecutableMetadata accepts a fileID with the corresponding filename
 	// and caches this information before a periodic reporting to the backend.
-	ExecutableMetadata(ctx context.Context, fileID libpf.FileID, fileName, buildID string)
+	ExecutableMetadata(ctx context.Context, fileID libpf.FileID, fileName, filePath, buildID string)
 
 	// FrameMetadata accepts metadata associated with a frame and caches this information before
 	// a periodic reporting to the backend.

reporter/otlp_reporter.go

@@ -52,6 +52,7 @@ type sample struct {
 // execInfo enriches an executable with additional metadata.
 type execInfo struct {
 	fileName string
+	filePath string
 	buildID  string
 }
 
@@ -179,9 +180,10 @@ func (r *OTLPReporter) ReportFallbackSymbol(frameID libpf.FrameID, symbol string
 // ExecutableMetadata accepts a fileID with the corresponding filename
 // and caches this information.
 func (r *OTLPReporter) ExecutableMetadata(_ context.Context,
-	fileID libpf.FileID, fileName, buildID string) {
+	fileID libpf.FileID, fileName, filePath, buildID string) {
 	r.executables.Add(fileID, execInfo{
 		fileName: fileName,
+		filePath: filePath,
 		buildID:  buildID,
 	})
 }

reporter/reporter.go

@@ -111,7 +111,7 @@ type executableMetadata struct {
 
 // ExecutableMetadata implements the SymbolReporter interface.
 func (r *GRPCReporter) ExecutableMetadata(ctx context.Context, fileID libpf.FileID,
-	fileName, buildID string) {
+	fileName, filePath, buildID string) {
 	select {
 	case <-ctx.Done():
 		return

tracer/tracer.go

@@ -160,7 +160,7 @@ func processKernelModulesMetadata(ctx context.Context,
 		if err == nil && len(buildID) >= 16 {
 			fileID = pfelf.CalculateKernelFileID(buildID)
 			result[nameStr] = fileID
-			rep.ExecutableMetadata(ctx, fileID, nameStr, buildID)
+			rep.ExecutableMetadata(ctx, fileID, nameStr, "kernel", buildID)
 		} else {
 			log.Errorf("Failed to get GNU BuildID for kernel module %s: '%s' (%v)",
 				nameStr, buildID, err)