From b7e0dcc4d3cb0407501b46c0694a95696052a86b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 1 Mar 2026 19:13:57 +0000 Subject: [PATCH 1/4] Initial plan From 043c7c54ae66360815257917de97784bb6433ced Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 1 Mar 2026 19:21:36 +0000 Subject: [PATCH 2/4] Increase timeouts and retry limits in e2e test framework to fix flaky integration tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - GetRequest()/PostRequest() HTTP timeout: 1s → 5s - TCPReadinessProbe dial timeout: 1s → 5s - MaxRetries for ConcreteService and CompositeHTTPService: 50 → 100 Co-authored-by: CharlieTLe <3375195+CharlieTLe@users.noreply.github.com> --- integration/e2e/composite_service.go | 2 +- integration/e2e/service.go | 4 ++-- integration/e2e/util.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/integration/e2e/composite_service.go b/integration/e2e/composite_service.go index 2ed6e1ef58a..78f167ba79b 100644 --- a/integration/e2e/composite_service.go +++ b/integration/e2e/composite_service.go @@ -25,7 +25,7 @@ func NewCompositeHTTPService(services ...*HTTPService) *CompositeHTTPService { retryBackoff: backoff.New(context.Background(), backoff.Config{ MinBackoff: 300 * time.Millisecond, MaxBackoff: 600 * time.Millisecond, - MaxRetries: 50, // Sometimes the CI is slow ¯\_(ツ)_/¯ + MaxRetries: 100, // Sometimes the CI is slow ¯\_(ツ)_/¯ }), } } diff --git a/integration/e2e/service.go b/integration/e2e/service.go index 97b535363d1..6c9fcff8d22 100644 --- a/integration/e2e/service.go +++ b/integration/e2e/service.go @@ -71,7 +71,7 @@ func NewConcreteService( retryBackoff: backoff.New(context.Background(), backoff.Config{ MinBackoff: 300 * time.Millisecond, MaxBackoff: 600 * time.Millisecond, - MaxRetries: 50, // Sometimes the CI is slow ¯\_(ツ)_/¯ + MaxRetries: 100, // Sometimes the CI is slow ¯\_(ツ)_/¯ }), } } @@ -476,7 +476,7 @@ func (p *TCPReadinessProbe) Ready(service *ConcreteService) (err error) { return errors.New("service has stopped") } - conn, err := net.DialTimeout("tcp", endpoint, time.Second) + conn, err := net.DialTimeout("tcp", endpoint, 5*time.Second) if err != nil { return err } diff --git a/integration/e2e/util.go b/integration/e2e/util.go index 49795257ce9..4f15958f857 100644 --- a/integration/e2e/util.go +++ b/integration/e2e/util.go @@ -84,14 +84,14 @@ func BuildArgs(flags map[string]string) []string { } func GetRequest(url string) (*http.Response, error) { - const timeout = 1 * time.Second + const timeout = 5 * time.Second client := &http.Client{Timeout: timeout} return client.Get(url) } func PostRequest(url string) (*http.Response, error) { - const timeout = 1 * time.Second + const timeout = 5 * time.Second client := &http.Client{Timeout: timeout} return client.Post(url, "", strings.NewReader("")) From 2d001996f25542b69acf7fe2001e894d50b1239d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 1 Mar 2026 19:24:50 +0000 Subject: [PATCH 3/4] Final: fix flaky integration tests Co-authored-by: CharlieTLe <3375195+CharlieTLe@users.noreply.github.com> --- website/go.mod | 2 -- website/go.sum | 5 ----- 2 files changed, 7 deletions(-) diff --git a/website/go.mod b/website/go.mod index 6c662a5e7fd..7ac16297c2a 100644 --- a/website/go.mod +++ b/website/go.mod @@ -1,5 +1,3 @@ module github.com/cortexproject/cortex/website go 1.16 - -require github.com/google/docsy v0.4.0 // indirect diff --git a/website/go.sum b/website/go.sum index d0073ccbe7a..e69de29bb2d 100644 --- a/website/go.sum +++ b/website/go.sum @@ -1,5 +0,0 @@ -github.com/FortAwesome/Font-Awesome v0.0.0-20210804190922-7d3d774145ac/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo= -github.com/google/docsy v0.4.0 h1:Eyt2aiDC1fnw/Qq/9xnIqUU5n5Yyk4c8gX3nBDdTv/4= -github.com/google/docsy v0.4.0/go.mod h1:vJjGkHNaw9bO42gpFTWwAUzHZWZEVlK46Kx7ikY5c7Y= -github.com/google/docsy/dependencies v0.4.0/go.mod h1:2zZxHF+2qvkyXhLZtsbnqMotxMukJXLaf8fAZER48oo= -github.com/twbs/bootstrap v4.6.1+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0= From b372d596a9e2faee503f6d017890b4fd3a73efae Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 1 Mar 2026 19:25:27 +0000 Subject: [PATCH 4/4] Revert unintentional website/go.mod and website/go.sum changes Co-authored-by: CharlieTLe <3375195+CharlieTLe@users.noreply.github.com> --- website/go.mod | 2 ++ website/go.sum | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/website/go.mod b/website/go.mod index 7ac16297c2a..6c662a5e7fd 100644 --- a/website/go.mod +++ b/website/go.mod @@ -1,3 +1,5 @@ module github.com/cortexproject/cortex/website go 1.16 + +require github.com/google/docsy v0.4.0 // indirect diff --git a/website/go.sum b/website/go.sum index e69de29bb2d..d0073ccbe7a 100644 --- a/website/go.sum +++ b/website/go.sum @@ -0,0 +1,5 @@ +github.com/FortAwesome/Font-Awesome v0.0.0-20210804190922-7d3d774145ac/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo= +github.com/google/docsy v0.4.0 h1:Eyt2aiDC1fnw/Qq/9xnIqUU5n5Yyk4c8gX3nBDdTv/4= +github.com/google/docsy v0.4.0/go.mod h1:vJjGkHNaw9bO42gpFTWwAUzHZWZEVlK46Kx7ikY5c7Y= +github.com/google/docsy/dependencies v0.4.0/go.mod h1:2zZxHF+2qvkyXhLZtsbnqMotxMukJXLaf8fAZER48oo= +github.com/twbs/bootstrap v4.6.1+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=