improve retries

Signed-off-by: Markus Blaschke <mblaschke82@gmail.com>

Author: mblaschke

README.md

@@ -21,12 +21,18 @@ Application Options:
       --log.source=[|short|file|full]              Show source for every log message (useful for debugging and bug reports) [$LOG_SOURCE]
       --log.color=[|auto|yes|no]                   Enable color for logs [$LOG_COLOR]
       --log.time                                   Show log time [$LOG_TIME]
-      --shelly.request.timeout=                    Request timeout (default: 5s) [$SHELLY_REQUEST_TIMEOUT]
+      --shelly.request.timeout=                    Request timeout (default: 2s) [$SHELLY_REQUEST_TIMEOUT]
+      --shelly.request.retry.count=                Retry count for failing requests (default: 3) [$SHELLY_REQUEST_RETRY_COUNT]
+      --shelly.request.retry.waittime=             Wait time after retry (default: 100ms) [$SHELLY_REQUEST_RETRY_WAITTIME]
+      --shelly.request.retry.waittimemax=          Maximum wait time after retry (default: 1s) [$SHELLY_REQUEST_RETRY_WAITTIMEMAX]
       --shelly.auth.username=                      Username for shelly plug login [$SHELLY_AUTH_USERNAME]
       --shelly.auth.password=                      Password for shelly plug login [$SHELLY_AUTH_PASSWORD]
-      --shelly.host.shellyplug=                    shellyplug device IP or hostname to scrape. Pass multiple times for multiple hosts [$SHELLY_HOST_SHELLYPLUGS]
-      --shelly.host.shellyplus=                    shellyplus device IP or hostname to scrape. Pass multiple times for multiple hosts [$SHELLY_HOST_SHELLYPLUSES]
-      --shelly.host.shellypro=                     shellypro device IP or hostname to scrape. Pass multiple times for multiple hosts [$SHELLY_HOST_SHELLYPROS]
+      --shelly.host.shellyplug=                    shellyplug device IP or hostname to scrape. Pass multiple times for multiple hosts
+                                                   [$SHELLY_HOST_SHELLYPLUGS]
+      --shelly.host.shellyplus=                    shellyplus device IP or hostname to scrape. Pass multiple times for multiple hosts
+                                                   [$SHELLY_HOST_SHELLYPLUSES]
+      --shelly.host.shellypro=                     shellypro device IP or hostname to scrape. Pass multiple times for multiple hosts
+                                                   [$SHELLY_HOST_SHELLYPROS]
       --shelly.servicediscovery.timeout=           mDNS discovery response timeout (default: 15s) [$SHELLY_SERVICEDISCOVERY_TIMEOUT]
       --shelly.servicediscovery.refresh=           mDNS discovery refresh time (default: 15m) [$SHELLY_SERVICEDISCOVERY_REFRESH]
       --server.bind=                               Server address (default: :8080) [$SERVER_BIND]

config/opts.go

@@ -18,7 +18,10 @@ type (
 
 		Shelly struct {
 			Request struct {
-				Timeout time.Duration `long:"shelly.request.timeout"  env:"SHELLY_REQUEST_TIMEOUT"  description:"Request timeout" default:"5s"`
+				Timeout          time.Duration `long:"shelly.request.timeout"            env:"SHELLY_REQUEST_TIMEOUT"            description:"Request timeout" default:"2s"`
+				RetryCount       int           `long:"shelly.request.retry.count"        env:"SHELLY_REQUEST_RETRY_COUNT"        description:"Retry count for failing requests" default:"3"`
+				RetryWaitTime    time.Duration `long:"shelly.request.retry.waittime"     env:"SHELLY_REQUEST_RETRY_WAITTIME"     description:"Wait time after retry" default:"100ms"`
+				RetryWaitTimeMax time.Duration `long:"shelly.request.retry.waittimemax"  env:"SHELLY_REQUEST_RETRY_WAITTIMEMAX"  description:"Maximum wait time after retry" default:"1s"`
 			}
 
 			Auth struct {

probe.go

@@ -24,6 +24,7 @@ func newShellyProber(ctx context.Context, registry *prometheus.Registry, logger
 	sp := shellyplug.New(ctx, registry, logger)
 	sp.SetUserAgent(UserAgent + gitTag)
 	sp.SetTimeout(Opts.Shelly.Request.Timeout)
+	sp.EnableRetry(Opts.Shelly.Request.RetryCount, Opts.Shelly.Request.RetryWaitTime, Opts.Shelly.Request.RetryWaitTimeMax)
 	if len(Opts.Shelly.Auth.Username) >= 1 {
 		sp.SetHttpAuth(Opts.Shelly.Auth.Username, Opts.Shelly.Auth.Password)
 	}

shellyplug/prober.go

@@ -26,7 +26,11 @@ type (
 		}
 
 		resty struct {
-			timeout   time.Duration
+			timeout          time.Duration
+			retryCount       int
+			retryWaitTime    time.Duration
+			retryWaitTimeMax time.Duration
+
 			userAgent string
 		}
 

shellyplug/resty.go

@@ -26,6 +26,12 @@ func (sp *ShellyPlug) SetTimeout(timeout time.Duration) {
 	sp.resty.timeout = timeout
 }
 
+func (sp *ShellyPlug) EnableRetry(retries int, waitTime, waitTimeMax time.Duration) {
+	sp.resty.retryCount = retries
+	sp.resty.retryWaitTime = waitTime
+	sp.resty.retryWaitTimeMax = waitTimeMax
+}
+
 func (sp *ShellyPlug) SetHttpAuth(username, password string) {
 	sp.auth.username = username
 	sp.auth.password = password
@@ -56,9 +62,16 @@ func (sp *ShellyPlug) restyClient(ctx context.Context, target discovery.Discover
 		client.SetHeader("User-Agent", sp.resty.userAgent)
 	}
 
-	client.SetRetryCount(2).
-		SetRetryWaitTime(1 * time.Second).
-		SetRetryMaxWaitTime(5 * time.Second)
+	if sp.resty.retryCount > 0 {
+		client.SetRetryCount(sp.resty.retryCount)
+
+		if sp.resty.retryWaitTime.Seconds() > 0 {
+			client.SetRetryWaitTime(sp.resty.retryWaitTime)
+		}
+		if sp.resty.retryWaitTimeMax.Seconds() > 0 {
+			client.SetRetryWaitTime(sp.resty.retryWaitTimeMax)
+		}
+	}
 
 	if sp.auth.username != "" {
 		client.SetDisableWarn(true)