Update config loader to return clearer err message on invalid duration format

Author: andy-tier1app

internal/agent/api/action_api.go

@@ -176,7 +176,7 @@ func (s *Server) handleYcrashForward(writer http.ResponseWriter, request *http.R
 	fr.Header.Del("ycrash-forward")
 	fr.Close = true
 	client := http.Client{
-		Timeout: config.GlobalConfig.HttpClientTimeout,
+		Timeout: config.GlobalConfig.HttpClientTimeout.Duration(),
 	}
 	r, err := client.Do(fr)
 	if err != nil {

internal/agent/m3/m3.go

@@ -43,7 +43,7 @@ func NewM3App() *M3App {
 func (m3 *M3App) RunLoop() {
 	for {
 		m3.RunSingle()
-		time.Sleep(config.GlobalConfig.M3Frequency)
+		time.Sleep(config.GlobalConfig.M3Frequency.Duration())
 	}
 }
 

internal/agent/ondemand/ondemand.go

@@ -356,7 +356,7 @@ Ignored errors: %v
 		Pid:               pid,
 		TdPath:            tdPath,
 		JavaHome:          config.GlobalConfig.JavaHomePath,
-		TdCaptureDuration: config.GlobalConfig.TDCaptureDuration,
+		TdCaptureDuration: config.GlobalConfig.TDCaptureDuration.Duration(),
 	}
 	threadDump = goCapture(endpoint, capture.WrapRun(capThreadDump))
 
@@ -997,7 +997,7 @@ func RequestFin(endpoint string) (resp []byte, err error) {
 	}
 	httpClient := &http.Client{
 		Transport: transport,
-		Timeout:   config.GlobalConfig.HttpClientTimeout,
+		Timeout:   config.GlobalConfig.HttpClientTimeout.Duration(),
 	}
 	req, err := http.NewRequest("POST", endpoint, nil)
 	if err != nil {

internal/capture/executils/shell.go

@@ -197,7 +197,7 @@ func CommandCombinedOutputToWriter(writer io.Writer, cmd Command, hookers ...Hoo
 	}()
 
 	// execution timer
-	timerDuration := config.GlobalConfig.CmdTimeout
+	timerDuration := config.GlobalConfig.CmdTimeout.Duration()
 	if timerDuration == 0 {
 		timerDuration = 60 * time.Second // fallback to default if not configured, or accidentally set to 0
 	}

internal/capture/healthcheck.go

@@ -150,7 +150,7 @@ func newHTTPClient() *http.Client {
 			DisableKeepAlives:  true,
 			ForceAttemptHTTP2:  true,
 		},
-		Timeout: config.GlobalConfig.HttpClientTimeout,
+		Timeout: config.GlobalConfig.HttpClientTimeout.Duration(),
 	}
 }
 

internal/capture/post.go

@@ -86,7 +86,7 @@ func PostCustomDataWithTimeout(endpoint, params string, file *os.File, timeout t
 }
 
 func PostCustomDataWithPositionFunc(endpoint, params string, file *os.File, position func(file *os.File) error) (msg string, ok bool) {
-	return PostCustomDataWithPositionFuncWithTimeout(endpoint, params, file, position, config.GlobalConfig.HttpClientTimeout)
+	return PostCustomDataWithPositionFuncWithTimeout(endpoint, params, file, position, config.GlobalConfig.HttpClientTimeout.Duration())
 }
 
 func PostCustomDataWithPositionFuncWithTimeout(endpoint, params string, file *os.File, position func(file *os.File) error, timeout time.Duration) (msg string, ok bool) {
@@ -183,7 +183,7 @@ func GetData(endpoint string) (msg string, ok bool) {
 	}
 	httpClient := &http.Client{
 		Transport: transport,
-		Timeout:   config.GlobalConfig.HttpClientTimeout,
+		Timeout:   config.GlobalConfig.HttpClientTimeout.Duration(),
 	}
 	req, err := http.NewRequest("GET", endpoint, nil)
 	if err != nil {

internal/config/config.go

@@ -20,17 +20,17 @@ type Config struct {
 }
 
 type Options struct {
-	Pid               string        `yaml:"p" usage:"The process ID or unique token of the target, for example: 3121, or 'buggyApp'"`
-	ApiKey            string        `yaml:"k" usage:"The API Key that will be used to make API requests, for example: tier1app@12312-12233-1442134-112"`
-	Server            string        `yaml:"s" usage:"The server url that will be used to upload data, for example: https://ycrash.companyname.com"`
-	AppName           string        `yaml:"a" usage:"The APP Name of the target"`
-	HeapDump          bool          `yaml:"hd" usage:"Capture heap dump, default is false"`
-	HeapDumpPath      string        `yaml:"hdPath" usage:"The heap dump file to be uploaded while it exists"`
-	ThreadDumpPath    string        `yaml:"tdPath" usage:"The thread dump file to be uploaded while it exists"`
-	TDCaptureDuration time.Duration `yaml:"tdCaptureDuration" usage:"Total duration to capture thread dumps (e.g., 10m, 30s)"`
-	GCPath            string        `yaml:"gcPath" usage:"The gc log file to be uploaded while it exists"`
-	JavaHomePath      string        `yaml:"j" usage:"The java home path to be used. Default will try to use os env 'JAVA_HOME' if 'JAVA_HOME' is not empty, for example: /usr/lib/jvm/java-8-openjdk-amd64"`
-	DeferDelete       bool          `yaml:"d" usage:"Delete logs folder created during analyse"`
+	Pid               string   `yaml:"p" usage:"The process ID or unique token of the target, for example: 3121, or 'buggyApp'"`
+	ApiKey            string   `yaml:"k" usage:"The API Key that will be used to make API requests, for example: tier1app@12312-12233-1442134-112"`
+	Server            string   `yaml:"s" usage:"The server url that will be used to upload data, for example: https://ycrash.companyname.com"`
+	AppName           string   `yaml:"a" usage:"The APP Name of the target"`
+	HeapDump          bool     `yaml:"hd" usage:"Capture heap dump, default is false"`
+	HeapDumpPath      string   `yaml:"hdPath" usage:"The heap dump file to be uploaded while it exists"`
+	ThreadDumpPath    string   `yaml:"tdPath" usage:"The thread dump file to be uploaded while it exists"`
+	TDCaptureDuration Duration `yaml:"tdCaptureDuration" usage:"Total duration to capture thread dumps (e.g., 10m, 30s)"`
+	GCPath            string   `yaml:"gcPath" usage:"The gc log file to be uploaded while it exists"`
+	JavaHomePath      string   `yaml:"j" usage:"The java home path to be used. Default will try to use os env 'JAVA_HOME' if 'JAVA_HOME' is not empty, for example: /usr/lib/jvm/java-8-openjdk-amd64"`
+	DeferDelete       bool     `yaml:"d" usage:"Delete logs folder created during analyse"`
 
 	ShowVersion bool   `arg:"version" yaml:"-" usage:"Show the version of this program"`
 	ConfigPath  string `arg:"c" yaml:"-" usage:"The config file path to load"`
@@ -41,7 +41,7 @@ type Options struct {
 	CACertPath string `yaml:"caCertPath" usage:"The CA Cert Path"`
 
 	M3                   bool          `arg:"m3" usage:"Run in m3 mode, default is false"`
-	M3Frequency          time.Duration `yaml:"m3Frequency" usage:"Frequency of m3 mode, default is 3 minutes"`
+	M3Frequency          Duration      `yaml:"m3Frequency" usage:"Frequency of m3 mode, default is 3 minutes"`
 	ProcessTokens        ProcessTokens `yaml:"processTokens" usage:"Process tokens of m3 mode"`
 	ExcludeProcessTokens ProcessTokens `yaml:"excludeTokens" usage:"Process exclude tokens of m3 mode"`
 
@@ -94,22 +94,24 @@ type Options struct {
 	EdScript     string `yaml:"edScript" usage:"Extended Data: Path to a custom script that collects extended diagnostics data"`
 	EdDataFolder string `yaml:"edDataFolder" usage:"Extended Data: Directory path where artifacts generated by (-edScript) will be stored and collected."`
 
-	CmdTimeout        time.Duration `yaml:"cmdTimeout" usage:"Command execution timeout duration (e.g., 1m, 30s). Default is 60 seconds."`
-	HttpClientTimeout time.Duration `yaml:"httpClientTimeout" usage:"HTTP client timeout for API requests (e.g., 1m, 30s). Default is 60 seconds."`
+	CmdTimeout        Duration `yaml:"cmdTimeout" usage:"Command execution timeout duration (e.g., 1m, 30s). Default is 60 seconds."`
+	HttpClientTimeout Duration `yaml:"httpClientTimeout" usage:"HTTP client timeout for API requests (e.g., 1m, 30s). Default is 60 seconds."`
 }
 
-type HealthChecks map[string]HealthCheck
+type Command struct {
+	UrlParams UrlParams `yaml:"urlParams" usage:"[DEPRECATED] This option is no longer in use."`
+	Cmd       Cmd       `yaml:"cmd" usage:"[DEPRECATED] This option is no longer in use."`
+}
+
+// Healthcheck
 type HealthCheck struct {
 	Endpoint    string `yaml:"endpoint"`
 	HTTPBody    string `yaml:"httpBody"`
 	TimeoutSecs int    `yaml:"timeoutSecs"`
 }
+type HealthChecks map[string]HealthCheck
 
-type Command struct {
-	UrlParams UrlParams `yaml:"urlParams" usage:"[DEPRECATED] This option is no longer in use."`
-	Cmd       Cmd       `yaml:"cmd" usage:"[DEPRECATED] This option is no longer in use."`
-}
-
+// UrlParams
 type UrlParams string
 type UrlParamsSlice []UrlParams
 
@@ -122,6 +124,7 @@ func (u *UrlParamsSlice) Set(p string) error {
 	return nil
 }
 
+// Cmd
 type Cmd string
 type CmdSlice []Cmd
 
@@ -139,6 +142,7 @@ type CommandsFlagSetPair struct {
 	CmdSlice
 }
 
+// ProcessToken
 type ProcessToken string
 type ProcessTokens []ProcessToken
 
@@ -151,6 +155,7 @@ func (p *ProcessTokens) Set(s string) error {
 	return nil
 }
 
+// AppLog
 type AppLog string
 type AppLogs []AppLog
 
@@ -163,11 +168,39 @@ func (p *AppLogs) Set(s string) error {
 	return nil
 }
 
+// Duration wraps time.Duration to provide better YAML unmarshaling with user-friendly error messages
+type Duration time.Duration
+
+func (d *Duration) UnmarshalYAML(unmarshal func(interface{}) error) error {
+	var s string
+	if err := unmarshal(&s); err != nil {
+		return err
+	}
+
+	duration, err := time.ParseDuration(s)
+	if err != nil {
+		return fmt.Errorf("invalid duration format '%s': %w (expected format like '1m', '30s', '1h30m')", s, err)
+	}
+
+	*d = Duration(duration)
+	return nil
+}
+
+// Duration converts back to time.Duration when needed
+func (d Duration) Duration() time.Duration {
+	return time.Duration(d)
+}
+
+// String returns the string representation of the duration
+func (d Duration) String() string {
+	return time.Duration(d).String()
+}
+
 func defaultConfig() Config {
 	return Config{
 		Options: Options{
 			VerifySSL:         true,
-			M3Frequency:       3 * time.Minute,
+			M3Frequency:       Duration(3 * time.Minute),
 			Address:           "localhost",
 			Port:              -1,
 			LogFileMaxCount:   7,
@@ -176,9 +209,9 @@ func defaultConfig() Config {
 			PingHost:          "google.com",
 			DeferDelete:       true,
 			AppLogLineCount:   10000,
-			TDCaptureDuration: 0 * time.Second, // Setting here 0 seconds as default since handling it in jstack.go
-			CmdTimeout:        60 * time.Second,
-			HttpClientTimeout: 60 * time.Second,
+			TDCaptureDuration: Duration(0 * time.Second), // Setting here 0 seconds as default since handling it in jstack.go
+			CmdTimeout:        Duration(60 * time.Second),
+			HttpClientTimeout: Duration(60 * time.Second),
 		},
 	}
 }
@@ -248,13 +281,20 @@ func copyFlagsValue(dst interface{}, src map[int]interface{}) (err error) {
 		var x reflect.Value
 		fieldValue := value.Field(i)
 		name := typ.Field(i).Name
+		fieldType := typ.Field(i)
+
 		if name == "VerifySSL" {
 			bs := *(s).(*string)
 			b, err := strconv.ParseBool(strings.ToLower(bs))
 			if err != nil {
 				return fmt.Errorf("-verifySSL should be true or false, not %s", bs)
 			}
 			x = reflect.ValueOf(b)
+		} else if fieldType.Type == reflect.TypeOf(Duration(0)) {
+			// Handle Duration fields - convert from *time.Duration to Duration
+			timeDurationPtr := s.(*time.Duration)
+			duration := Duration(*timeDurationPtr)
+			x = reflect.ValueOf(duration)
 		} else {
 			x = reflect.ValueOf(s).Elem()
 		}
@@ -299,8 +339,8 @@ func registerFlags(flagSetName string) (*flag.FlagSet, map[int]interface{}) {
 			flagSet.Var(&appLogs, name, usage)
 			result[i] = &appLogs
 			continue
-		case time.Duration:
-			result[i] = flagSet.Duration(name, v, usage)
+		case Duration:
+			result[i] = flagSet.Duration(name, v.Duration(), usage)
 			continue
 		case HealthChecks:
 			// Ignore this due to nested structure, we don't support this via CLI for now.