parca specific fixups

Author: gnurizen

interpreter/customlabels/customlabels.go

@@ -8,7 +8,6 @@ import (
 
 	"go.opentelemetry.io/ebpf-profiler/interpreter"
 	"go.opentelemetry.io/ebpf-profiler/libpf"
-	"go.opentelemetry.io/ebpf-profiler/libpf/pfelf"
 	"go.opentelemetry.io/ebpf-profiler/remotememory"
 	"go.opentelemetry.io/ebpf-profiler/support"
 )
@@ -44,7 +43,7 @@ func Loader(_ interpreter.EbpfHandler, info *interpreter.LoaderInfo) (interprete
 	}
 	abiVersionSym, err := ef.LookupSymbol(abiVersionExport)
 	if err != nil {
-		if errors.Is(err, pfelf.ErrSymbolNotFound) {
+		if errors.Is(err, libpf.ErrSymbolNotFound) {
 			return nil, nil
 		}
 

interpreter/golabels/golabels.go

@@ -58,7 +58,7 @@ func Loader(_ interpreter.EbpfHandler, info *interpreter.LoaderInfo) (interprete
 	log.Debugf("file %s detected as go version %s", info.FileName(), goVersion)
 
 	offsets := getOffsets(goVersion)
-	tlsOffset, err := extractTLSGOffset(file, info.FileName())
+	tlsOffset, err := extractTLSGOffset(file)
 	if err != nil {
 		return nil, fmt.Errorf("failed to extract TLS offset: %w", err)
 	}

interpreter/golabels/tls_amd64.go

@@ -63,6 +63,6 @@ func extractTLSGOffset(f *pfelf.File) (int32, error) {
 		}
 	}
 exit:
-	log.Warnf("Failed to decode stackcheck symbol, Go label collection might not work %s", path)
+	log.Warnf("Failed to decode stackcheck symbol, Go label collection might not work")
 	return -8, nil
 }

interpreter/golabels/tls_arm64.go

@@ -21,7 +21,7 @@ import (
 //	0x000000000007f270 <+16>:    mov     x27, #0x30                      // #48
 //	0x000000000007f274 <+20>:    ldr     x28, [x0, x27]
 //	0x000000000007f278 <+24>:    ret
-func extractTLSGOffset(f *pfelf.File, path string) (int32, error) {
+func extractTLSGOffset(f *pfelf.File) (int32, error) {
 	iscgo, err := f.IsCgoEnabled()
 	if err != nil || !iscgo {
 		return 0, err
@@ -55,6 +55,6 @@ func extractTLSGOffset(f *pfelf.File, path string) (int32, error) {
 			}
 		}
 	}
-	log.Warnf("Failed to decode load_g symbol, Go label collection might not work with CGO frames (%s)", path)
+	log.Warnf("Failed to decode load_g symbol, Go label collection might not work with CGO frames")
 	return 0, nil
 }

interpreter/luajit/offsets.go

@@ -358,7 +358,7 @@ func (o *offsetData) readSym(sym *libpf.Symbol) ([]byte, error) {
 
 func (o *offsetData) lookupSymbol(name libpf.SymbolName) (s *libpf.Symbol, err error) {
 	s, err = o.f.LookupSymbol(name)
-	if err == pfelf.ErrSymbolNotFound && o.syms != nil {
+	if err == libpf.ErrSymbolNotFound && o.syms != nil {
 		s, err = o.syms.LookupSymbol(name)
 	}
 	if s == nil && o.dsyms != nil {