fix: errtrace issues with unwrapping errors (#4051)

fixes: #4034
block · Jan 15, 2025 · e034ac8 · e034ac8
1 parent eebf549
commit e034ac8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/common/errors/errors.go b/common/errors/errors.go
@@ -38,15 +38,15 @@ func Innermost(err error) bool {
 	return true
 }
 
-func Join(errs ...error) error { return errors.Join(errs...) }
+func Join(errs ...error) error { return errors.Join(errs...) } //errtrace:skip // errtraces messes up error reporting
 
 func New(text string) error { return errors.New(text) }
 
 func As(err error, target interface{}) bool { return errors.As(err, target) }
 
 func Is(err, target error) bool { return errors.Is(err, target) }
 
-func Unwrap(err error) error { return errors.Unwrap(err) }
+func Unwrap(err error) error { return errors.Unwrap(err) } //errtrace:skip // errtraces messes up error reporting
 
 // DeduplicateErrors de-duplicates equivalent errors.
 func DeduplicateErrors(merr []error) []error {

diff --git a/internal/buildengine/build.go b/internal/buildengine/build.go
@@ -60,7 +60,7 @@ func handleBuildResult(ctx context.Context, projectConfig projectconfig.Config,
 	}
 
 	if len(errs) > 0 {
-		return nil, nil, errors.Join(errs...)
+		return nil, nil, errors.Join(errs...) //errtrace:skip // errtraces messes up error reporting
 	}
 
 	logger.Infof("Module built (%.2fs)", time.Since(result.StartTime).Seconds())