Extend reporter interface to support symbol upload (#55)

interpreter/dotnet/instance.go

@@ -10,6 +10,7 @@ import (
 	"context"
 	"fmt"
 	"hash/fnv"
+	"os"
 	"path"
 	"slices"
 	"strings"
@@ -630,8 +631,11 @@ func (i *dotnetInstance) SynchronizeMappings(ebpf interpreter.EbpfHandler,
 			info.simpleName, info.guid)
 
 		if !info.reported {
-			symbolReporter.ExecutableMetadata(context.TODO(),
-				info.fileID, path.Base(m.Path), info.guid)
+			open := func() (process.ReadAtCloser, error) {
+				return os.Open(m.Path)
+			}
+			symbolReporter.ExecutableMetadata(context.TODO(), info.fileID, path.Base(m.Path),
+				info.guid, libpf.Dotnet, open)
 			info.reported = true
 		}
 

processmanager/manager_test.go

@@ -258,7 +258,8 @@ type symbolReporterMockup struct{}
 
 func (s *symbolReporterMockup) ReportFallbackSymbol(_ libpf.FrameID, _ string) {}
 
-func (s *symbolReporterMockup) ExecutableMetadata(_ context.Context, _ libpf.FileID, _, _ string) {
+func (s *symbolReporterMockup) ExecutableMetadata(_ context.Context, _ libpf.FileID, _, _ string,
+	_ libpf.InterpreterType, _ reporter.ExecutableOpener) {
 }
 
 func (s *symbolReporterMockup) FrameMetadata(_ libpf.FileID, _ libpf.AddressOrLineno,

processmanager/processinfo.go

@@ -301,7 +301,11 @@ func (pm *ProcessManager) getELFInfo(pr process.Process, mapping *process.Mappin
 	}
 
 	buildID, _ := ef.GetBuildID()
-	pm.reporter.ExecutableMetadata(context.TODO(), fileID, baseName, buildID)
+	mapping2 := *mapping // copy to avoid races if callee saves the closure
+	open := func() (process.ReadAtCloser, error) {
+		return pr.OpenMappingFile(&mapping2)
+	}
+	pm.reporter.ExecutableMetadata(context.TODO(), fileID, baseName, buildID, libpf.Native, open)
 
 	return info
 }

reporter/iface.go

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/elastic/otel-profiling-agent/libpf"
+	"github.com/elastic/otel-profiling-agent/process"
 	"github.com/elastic/otel-profiling-agent/util"
 )
 
@@ -48,13 +49,21 @@ type TraceReporter interface {
 	SupportsReportTraceEvent() bool
 }
 
+type ExecutableOpener = func() (process.ReadAtCloser, error)
+
 type SymbolReporter interface {
 	// ReportFallbackSymbol enqueues a fallback symbol for reporting, for a given frame.
 	ReportFallbackSymbol(frameID libpf.FrameID, symbol string)
 
 	// 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)
+	//
+	// The `open` argument can be used to open the executable for reading. Interpreters
+	// that don't support this may pass a `nil` function pointer. Implementations that
+	// wish to upload executables should NOT block this function to do so and instead just
+	// open the file and then enqueue the upload in the background.
+	ExecutableMetadata(ctx context.Context, fileID libpf.FileID, fileName, buildID string,
+		interp libpf.InterpreterType, open ExecutableOpener)
 
 	// FrameMetadata accepts metadata associated with a frame and caches this information before
 	// a periodic reporting to the backend.

reporter/otlp_reporter.go

@@ -166,8 +166,8 @@ 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) {
+func (r *OTLPReporter) ExecutableMetadata(_ context.Context, fileID libpf.FileID, fileName,
+	buildID string, _ libpf.InterpreterType, _ ExecutableOpener) {
 	r.executables.Add(fileID, execInfo{
 		fileName: fileName,
 		buildID:  buildID,

tools/coredump/coredump.go

@@ -17,6 +17,7 @@ import (
 	"unsafe"
 
 	cebpf "github.com/cilium/ebpf"
+	"github.com/elastic/otel-profiling-agent/reporter"
 
 	"github.com/elastic/otel-profiling-agent/config"
 	"github.com/elastic/otel-profiling-agent/libpf"
@@ -65,7 +66,7 @@ func newSymbolizationCache() *symbolizationCache {
 }
 
 func (c *symbolizationCache) ExecutableMetadata(_ context.Context, fileID libpf.FileID,
-	fileName, _ string) {
+	fileName, _ string, _ libpf.InterpreterType, _ reporter.ExecutableOpener) {
 	c.files[fileID] = fileName
 }
 

tracer/ebpf_integration_test.go

@@ -19,10 +19,11 @@ import (
 	cebpf "github.com/cilium/ebpf"
 	"github.com/cilium/ebpf/link"
 
-	"github.com/elastic/otel-profiling-agent/libpf"
 	"github.com/elastic/otel-profiling-agent/config"
 	"github.com/elastic/otel-profiling-agent/host"
 	hostmeta "github.com/elastic/otel-profiling-agent/hostmetadata/host"
+	"github.com/elastic/otel-profiling-agent/libpf"
+	"github.com/elastic/otel-profiling-agent/reporter"
 	"github.com/elastic/otel-profiling-agent/rlimit"
 	"github.com/elastic/otel-profiling-agent/support"
 	"github.com/elastic/otel-profiling-agent/util"
@@ -97,8 +98,10 @@ func (f mockIntervals) PIDCleanupInterval() time.Duration { return 1 * time.Seco
 
 type mockReporter struct{}
 
-func (f mockReporter) ExecutableMetadata(_ context.Context, _ libpf.FileID, _, _ string) {}
-func (f mockReporter) ReportFallbackSymbol(_ libpf.FrameID, _ string)                    {}
+func (f mockReporter) ExecutableMetadata(_ context.Context, _ libpf.FileID, _, _ string,
+	_ libpf.InterpreterType, _ reporter.ExecutableOpener) {
+}
+func (f mockReporter) ReportFallbackSymbol(_ libpf.FrameID, _ string) {}
 func (f mockReporter) FrameMetadata(_ libpf.FileID, _ libpf.AddressOrLineno, _ util.SourceLineno,
 	_ uint32, _, _ string) {
 }

tracer/tracer.go

@@ -169,7 +169,7 @@ func processKernelModulesMetadata(ctx context.Context,
 		}
 
 		result[nameStr] = fileID
-		rep.ExecutableMetadata(ctx, fileID, nameStr, buildID)
+		rep.ExecutableMetadata(ctx, fileID, nameStr, buildID, libpf.Kernel, nil)
 	})
 
 	return result, nil