From 90b68fec1a364e2eb1c784e190022c601bf23ecd Mon Sep 17 00:00:00 2001
From: Bassem Dghaidi <568794+Link-@users.noreply.github.com>
Date: Wed, 4 Sep 2024 12:23:31 +0200
Subject: [PATCH] Add exponential backoff when generating runner reg tokens
 (#3724)

---
 github/actions/client.go                  | 20 ++++++++++++++++++--
 github/actions/github_api_request_test.go |  2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/github/actions/client.go b/github/actions/client.go
index 2824f7921a..2b40ffce92 100644
--- a/github/actions/client.go
+++ b/github/actions/client.go
@@ -10,6 +10,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"math/rand"
 	"net/http"
 	"net/url"
 	"strconv"
@@ -1139,15 +1140,30 @@ func (c *Client) getActionsServiceAdminConnection(ctx context.Context, rt *regis
 		}
 
 		retry++
-		if retry > 3 {
+		if retry > 5 {
 			return nil, fmt.Errorf("unable to register runner after 3 retries: %w", &GitHubAPIError{
 				StatusCode: resp.StatusCode,
 				RequestID:  resp.Header.Get(HeaderGitHubRequestID),
 				Err:        innerErr,
 			})
 		}
-		time.Sleep(time.Duration(500 * int(time.Millisecond) * (retry + 1)))
+		// Add exponential backoff + jitter to avoid thundering herd
+		// This will generate a backoff schedule:
+		// 1: 1s
+		// 2: 3s
+		// 3: 4s
+		// 4: 8s
+		// 5: 17s
+		baseDelay := 500 * time.Millisecond
+		jitter := time.Duration(rand.Intn(1000))
+		maxDelay := 20 * time.Second
+		delay := baseDelay*(1<<retry) + jitter
+
+		if delay > maxDelay {
+			delay = maxDelay
+		}
 
+		time.Sleep(delay)
 	}
 
 	var actionsServiceAdminConnection *ActionsServiceAdminConnection
diff --git a/github/actions/github_api_request_test.go b/github/actions/github_api_request_test.go
index 18998cddbf..33912a2c75 100644
--- a/github/actions/github_api_request_test.go
+++ b/github/actions/github_api_request_test.go
@@ -170,7 +170,7 @@ func TestNewActionsServiceRequest(t *testing.T) {
 			}
 			failures := 0
 			unauthorizedHandler := func(w http.ResponseWriter, r *http.Request) {
-				if failures < 2 {
+				if failures < 5 {
 					failures++
 					w.Header().Set("Content-Type", "application/json")
 					w.WriteHeader(http.StatusUnauthorized)