Merge #130857

130857: cli: add retries on datadog metrics upload requests r=aa-joshi a=aa-joshi Previously datadog metrics upload command would fail once we receive an error in datadog request. This was resulting in re-running the entire upload. This change adds retries on datadog requests. Command would skip particular datadog upload request once retries are exhausted. Epic: CC-27740 Release note: None Co-authored-by: Akshay Joshi <[email protected]>
cockroachdb · Sep 23, 2024 · 47da384 · 47da384
2 parents d8f9982 + ef5bbf5
commit 47da384
Showing 1 changed file with 20 additions and 10 deletions.
diff --git a/pkg/cli/tsdump.go b/pkg/cli/tsdump.go
@@ -28,6 +28,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/cockroachdb/cockroach/pkg/base"
 	"github.com/cockroachdb/cockroach/pkg/cli/clierrorplus"
 	"github.com/cockroachdb/cockroach/pkg/cli/clisqlclient"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
@@ -37,6 +38,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/ts/tspb"
 	"github.com/cockroachdb/cockroach/pkg/ts/tsutil"
 	"github.com/cockroachdb/cockroach/pkg/util/httputil"
+	"github.com/cockroachdb/cockroach/pkg/util/retry"
 	"github.com/cockroachdb/cockroach/pkg/util/timeutil"
 	"github.com/cockroachdb/errors"
 	"github.com/spf13/cobra"
@@ -529,18 +531,26 @@ func (d *datadogWriter) Flush() error {
 		return err
 	}
 
-	req, err := http.NewRequest("POST", d.targetURL, &zipBuf)
-	if err != nil {
-		return err
-	}
-	req.Header.Set("DD-API-KEY", d.apiKey)
-	req.Header.Set(server.ContentTypeHeader, "application/json")
-	req.Header.Set(httputil.ContentEncodingHeader, "gzip")
+	retryOpts := base.DefaultRetryOptions()
+	retryOpts.MaxRetries = 3
+	for retry := retry.Start(retryOpts); retry.Next(); {
+		req, err := http.NewRequest("POST", d.targetURL, &zipBuf)
+		if err != nil {
+			return err
+		}
+		req.Header.Set("DD-API-KEY", d.apiKey)
+		req.Header.Set(server.ContentTypeHeader, "application/json")
+		req.Header.Set(httputil.ContentEncodingHeader, "gzip")
 
-	err = d.doRequest(req)
-	if err != nil {
-		return err
+		err = d.doRequest(req)
+		if err != nil {
+			fmt.Printf("retry attempt:%d tsdump: error while sending metrics to datadog: %v\n", retry.CurrentAttempt(), err)
+			continue
+		} else {
+			break
+		}
 	}
+
 	d.series = nil
 	return nil
 }