Update Datadog/opentelemetry-ebpf-profiler

go.mod

@@ -8,12 +8,11 @@ require (
 	github.com/elastic/go-freelru v0.13.0
 	github.com/google/pprof v0.0.0-20240829160300-da1f7e9f2b25
 	github.com/jsimonetti/rtnetlink v1.4.2
-	github.com/open-telemetry/opentelemetry-ebpf-profiler v0.0.0-20240904113416-6270dc817b1a
+	github.com/open-telemetry/opentelemetry-ebpf-profiler v0.0.0-20240918090752-0a8979a41728
 	github.com/peterbourgon/ff/v3 v3.4.0
 	github.com/sirupsen/logrus v1.9.3
 	github.com/tklauser/numcpus v0.8.0
 	github.com/zeebo/xxh3 v1.0.2
-	golang.org/x/sync v0.7.0
 	golang.org/x/sys v0.21.0
 )
 
@@ -33,11 +32,15 @@ require (
 	golang.org/x/arch v0.8.0 // indirect
 	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
 	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/sync v0.7.0 // indirect
 	golang.org/x/text v0.16.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8 // indirect
 	google.golang.org/grpc v1.64.1 // indirect
 	google.golang.org/protobuf v1.34.1 // indirect
 )
 
-replace github.com/open-telemetry/opentelemetry-ebpf-profiler => github.com/DataDog/opentelemetry-ebpf-profiler v0.0.0-20240904113416-6270dc817b1a
+// To update the Datadog/opentelemetry-ebpf-profiler dependency on latest commit on datadog branch, change the following line to:
+// replace github.com/open-telemetry/opentelemetry-ebpf-profiler => github.com/DataDog/opentelemetry-ebpf-profiler datadog
+// and run `GOPRIVATE=github.com/Datadog/* go mod tidy`
+replace github.com/open-telemetry/opentelemetry-ebpf-profiler => github.com/DataDog/opentelemetry-ebpf-profiler v0.0.0-20240919140712-bacfde8003b0

go.sum

@@ -1,5 +1,5 @@
-github.com/DataDog/opentelemetry-ebpf-profiler v0.0.0-20240904113416-6270dc817b1a h1:dnqxRWylr0qNid4QwEyt/S5BDOtmQqf3X4OesnavhVs=
-github.com/DataDog/opentelemetry-ebpf-profiler v0.0.0-20240904113416-6270dc817b1a/go.mod h1:GQVu1MAtVCPc3mW4Atj8YVUEPdXoC/vo/kp0lNpQZhw=
+github.com/DataDog/opentelemetry-ebpf-profiler v0.0.0-20240919140712-bacfde8003b0 h1:YpIPEZVH7JaUSkXJIrHGZe/UTKe9NyF1NTFftmFXeeM=
+github.com/DataDog/opentelemetry-ebpf-profiler v0.0.0-20240919140712-bacfde8003b0/go.mod h1:GQVu1MAtVCPc3mW4Atj8YVUEPdXoC/vo/kp0lNpQZhw=
 github.com/DataDog/zstd v1.5.6 h1:LbEglqepa/ipmmQJUDnSsfvA8e8IStVcGaFWDuxvGOY=
 github.com/DataDog/zstd v1.5.6/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=

reporter/datadog_reporter.go

@@ -27,7 +27,6 @@ import (
 	"github.com/open-telemetry/opentelemetry-ebpf-profiler/libpf/xsync"
 	"github.com/open-telemetry/opentelemetry-ebpf-profiler/process"
 	"github.com/open-telemetry/opentelemetry-ebpf-profiler/reporter"
-	"github.com/open-telemetry/opentelemetry-ebpf-profiler/util"
 )
 
 // Assert that we implement the full Reporter interface.
@@ -44,7 +43,7 @@ type execInfo struct {
 
 // sourceInfo allows mapping a frame to its source origin.
 type sourceInfo struct {
-	lineNumber     util.SourceLineno
+	lineNumber     libpf.SourceLineno
 	functionOffset uint32
 	functionName   string
 	filePath       string
@@ -226,7 +225,7 @@ func (r *DatadogReporter) ExecutableMetadata(fileID libpf.FileID, fileName, buil
 
 // FrameMetadata accepts metadata associated with a frame and caches this information.
 func (r *DatadogReporter) FrameMetadata(fileID libpf.FileID, addressOrLine libpf.AddressOrLineno,
-	lineNumber util.SourceLineno, functionOffset uint32, functionName, filePath string) {
+	lineNumber libpf.SourceLineno, functionOffset uint32, functionName, filePath string) {
 	if frameMapLock, exists := r.frames.Get(fileID); exists {
 		frameMap := frameMapLock.WLock()
 		defer frameMapLock.WUnlock(&frameMap)