moved biggestbinarysize logic from reporter/symbol/elf.go to reporter/symbol_uploader.go

Author: theomagellan

reporter/symbol/elf.go

@@ -10,7 +10,6 @@ import (
 	"fmt"
 	"os"
 	"runtime"
-	"sync/atomic"
 
 	log "github.com/sirupsen/logrus"
 	"go.opentelemetry.io/ebpf-profiler/libpf"
@@ -125,19 +124,6 @@ func (e *Elf) Close() {
 	}
 }
 
-var BiggestBinarySize int64
-
-func updateBiggestBinarySize(size int64) {
-	for {
-		current := atomic.LoadInt64(&BiggestBinarySize)
-		if current >= size {
-			break
-		}
-		if atomic.CompareAndSwapInt64(&BiggestBinarySize, current, size) {
-			break
-		}
-	}
-}
 
 // GetSize returns the size of the elf file or data it contains.
 // It will return 0 if the size can't be retrieved.
@@ -161,8 +147,6 @@ func (e *Elf) GetSize() int64 {
 		size = fi.Size()
 	}
 
-	updateBiggestBinarySize(size)
-
 	return size
 }
 

reporter/symbol_uploader.go

@@ -77,6 +77,7 @@ type DatadogSymbolUploader struct {
 	retrievalQueue      chan *reporter.ExecutableMetadata
 	pipeline            pipeline.Pipeline[*reporter.ExecutableMetadata]
 	mut                 sync.Mutex
+	biggestBinarySize   int64
 }
 
 type goPCLnTabDump struct {
@@ -449,6 +450,18 @@ func newSymbolUploadRequestMetadata(e *symbol.Elf, symbolSource symbol.Source, p
 	}
 }
 
+func (d *DatadogSymbolUploader) updateBiggestBinarySize(size int64) {
+	for {
+		current := atomic.LoadInt64(&d.biggestBinarySize)
+		if current >= size {
+			break
+		}
+		if atomic.CompareAndSwapInt64(&d.biggestBinarySize, current, size) {
+			break
+		}
+	}
+}
+
 func (d *DatadogSymbolUploader) createSymbolFile(ctx context.Context, e *symbol.Elf) (*os.File, error) {
 	symbolFile, err := os.CreateTemp("", "objcopy-debug")
 	if err != nil {
@@ -481,7 +494,14 @@ func (d *DatadogSymbolUploader) createSymbolFile(ctx context.Context, e *symbol.
 		sectionsToKeep = e.GetSectionsRequiredForDynamicSymbols()
 	}
 
+	d.updateBiggestBinarySize(e.GetSize())
 	err = CopySymbols(ctx, elfPath, symbolFile.Name(), goPCLnTabInfo, sectionsToKeep, d.compressDebugSections)
+
+	var exitError *exec.ExitError
+	if errors.As(err, &exitError) && exitError.ExitCode() == -1 { // killed by signal
+		return nil, fmt.Errorf("failed to copy symbols: got killed. Consider increasing memory limits to at least %v (biggest uncompressed elf file size found)", atomic.LoadInt64(&d.biggestBinarySize))
+	}
+
 	if err != nil {
 		return nil, fmt.Errorf("failed to copy symbols: %w", err)
 	}
@@ -590,7 +610,7 @@ func CopySymbols(ctx context.Context, inputPath, outputPath string, goPCLnTabInf
 	if err := cmd.Wait(); err != nil {
 		var ExitError *exec.ExitError
 		if errors.As(err, &ExitError) && ExitError.ExitCode() == -1 { // killed by signal
-			return fmt.Errorf("got killed. Consider increasing memory limits to at least %v (biggest uncompressed elf file size found)", atomic.LoadInt64(&symbol.BiggestBinarySize))
+			return ExitError
 		}
 		return fmt.Errorf("failed to extract debug symbols: %w", cleanCmdError(err))
 	}