better error handling of start/fallback

DataDog · May 8, 2024 · 67f84ef · 67f84ef
1 parent 316fe3d
commit 67f84ef
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/kprobe.go b/kprobe.go
@@ -41,11 +41,11 @@ func (p *Probe) attachKprobe() error {
 		startFunc, fallbackFunc = eventsFunc, pmuFunc
 	}
 
-	var err error
+	var startErr, fallbackErr error
 	var tl *tracefsLink
-	if tl, err = startFunc(); err != nil {
-		if tl, err = fallbackFunc(); err != nil {
-			return err
+	if tl, startErr = startFunc(); startErr != nil {
+		if tl, fallbackErr = fallbackFunc(); fallbackErr != nil {
+			return errors.Join(startErr, fallbackErr)
 		}
 	}
 

diff --git a/uprobe.go b/uprobe.go
@@ -2,6 +2,7 @@ package manager
 
 import (
 	"debug/elf"
+	"errors"
 	"fmt"
 	"regexp"
 )
@@ -142,11 +143,11 @@ func (p *Probe) attachUprobe() error {
 		startFunc, fallbackFunc = eventsFunc, pmuFunc
 	}
 
-	var err error
+	var startErr, fallbackErr error
 	var tl *tracefsLink
-	if tl, err = startFunc(); err != nil {
-		if tl, err = fallbackFunc(); err != nil {
-			return err
+	if tl, startErr = startFunc(); startErr != nil {
+		if tl, fallbackErr = fallbackFunc(); fallbackErr != nil {
+			return errors.Join(startErr, fallbackErr)
 		}
 	}