add back hardcoding retries

cmd/builder/internal/builder/config.go

@@ -10,7 +10,6 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strings"
-	"time"
 
 	"github.com/hashicorp/go-version"
 	"go.uber.org/multierr"
@@ -19,12 +18,8 @@ import (
 
 const defaultOtelColVersion = "0.97.0"
 
-var (
-	// ErrInvalidGoMod indicates an invalid gomod
-	ErrInvalidGoMod = errors.New("invalid gomod specification for module")
-	// ErrIncompatibleConfigurationValues indicates that there is configuration that cannot be combined
-	ErrIncompatibleConfigurationValues = errors.New("cannot combine configuration values")
-)
+// ErrInvalidGoMod indicates an invalid gomod
+var ErrInvalidGoMod = errors.New("invalid gomod specification for module")
 
 // Config holds the builder's configuration
 type Config struct {
@@ -44,8 +39,6 @@ type Config struct {
 	Connectors   []Module     `mapstructure:"connectors"`
 	Replaces     []string     `mapstructure:"replaces"`
 	Excludes     []string     `mapstructure:"excludes"`
-
-	downloadModules retry `mapstructure:"-"`
 }
 
 // Distribution holds the parameters for the final binary
@@ -70,12 +63,6 @@ type Module struct {
 	Path   string `mapstructure:"path"`   // an optional path to the local version of this module
 }
 
-// retry dictates how many times to retry and how long to wait between attempts.
-type retry struct {
-	numRetries int
-	wait       time.Duration
-}
-
 // NewDefaultConfig creates a new config, with default values
 func NewDefaultConfig() Config {
 	log, err := zap.NewDevelopment()
@@ -95,12 +82,6 @@ func NewDefaultConfig() Config {
 			OtelColVersion: defaultOtelColVersion,
 			Module:         "go.opentelemetry.io/collector/cmd/builder",
 		},
-		// basic retry if error from go mod command (in case of transient network error). This could be improved
-		// retry 3 times with 5 second spacing interval
-		downloadModules: retry{
-			numRetries: 3,
-			wait:       5 * time.Second,
-		},
 	}
 }
 

cmd/builder/internal/builder/main.go

@@ -225,12 +225,13 @@ func processAndWrite(cfg Config, tmpl *template.Template, outFile string, tmplPa
 func downloadModules(cfg Config) error {
 	cfg.Logger.Info("Getting go modules")
 
+	retries := 3
 	failReason := "unknown"
-	for i := 1; i <= cfg.downloadModules.numRetries; i++ {
+	for i := 1; i <= retries; i++ {
 		if err := runGoCommand(cfg, "mod", "download"); err != nil {
 			failReason = err.Error()
-			cfg.Logger.Info("Failed modules download", zap.String("retry", fmt.Sprintf("%d/%d", i, cfg.downloadModules.numRetries)))
-			time.Sleep(cfg.downloadModules.wait)
+			cfg.Logger.Info("Failed modules download", zap.String("retry", fmt.Sprintf("%d/%d", i, retries)))
+			time.Sleep(5 * time.Second)
 			continue
 		}
 		return nil