Skip to content

feat: expression support for retry condition #2167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SkArchon merged 21 commits into from
Aug 28, 2025
Merged

feat: expression support for retry condition #2167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
17ca80d
feat: expression support for retry condition
StarpTech Aug 26, 2025
7cb34a3
Merge branch 'main' into dustin/eng-7974-allow-to-configure-retry-con…
StarpTech Aug 26, 2025
c61b167
chore: update modules
StarpTech Aug 26, 2025
7d70025
chore: mutation tests
StarpTech Aug 26, 2025
36c93f0
chore: fix tests
StarpTech Aug 26, 2025
a394639
chore: dont retry on 429 by default
StarpTech Aug 26, 2025
a496eff
fix: staticchecks
SkArchon Aug 26, 2025
d39bcee
fix: retry integration test
SkArchon Aug 26, 2025
d639aec
fix: review comments
SkArchon Aug 26, 2025
259f539
fix: review comments
SkArchon Aug 26, 2025
c5162ac
fix: review comments
SkArchon Aug 26, 2025
a7ddd62
fix: return noop instead of nil to be safer
SkArchon Aug 26, 2025
95de8ad
Merge branch 'main' into dustin/eng-7974-allow-to-configure-retry-con…
SkArchon Aug 26, 2025
4a34c7e
fix: tests
SkArchon Aug 26, 2025
6614c42
fix: review comments
SkArchon Aug 27, 2025
e7d8ed0
fix: review comments
SkArchon Aug 27, 2025
9a2c9d7
fix: validate algorithm
SkArchon Aug 28, 2025
f53e424
fix: tests
SkArchon Aug 28, 2025
80c7cab
Merge branch 'main' into dustin/eng-7974-allow-to-configure-retry-con…
SkArchon Aug 28, 2025
23ac555
fix: tests
SkArchon Aug 28, 2025
8f5d283
fix: cleanup the provided 5xx helper
SkArchon Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions router-tests/error_handling_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1380,7 +1380,7 @@ func TestErrorPropagation(t *testing.T) {
EnableSingleFlight: true,
MaxConcurrentResolvers: 1,
}),
core.WithSubgraphRetryOptions(false, 0, 0, 0),
core.WithSubgraphRetryOptions(false, "", 0, 0, 0, "", nil),
},
}, func(t *testing.T, xEnv *testenv.Environment) {
resp, err := xEnv.MakeGraphQLRequest(testenv.GraphQLRequest{
Expand Down Expand Up @@ -1412,7 +1412,7 @@ func TestErrorPropagation(t *testing.T) {
EnableSingleFlight: true,
MaxConcurrentResolvers: 1,
}),
core.WithSubgraphRetryOptions(false, 0, 0, 0),
core.WithSubgraphRetryOptions(false, "", 0, 0, 0, "", nil),
},
}, func(t *testing.T, xEnv *testenv.Environment) {
resp, err := xEnv.MakeGraphQLRequest(testenv.GraphQLRequest{
Expand Down Expand Up @@ -1444,7 +1444,7 @@ func TestErrorPropagation(t *testing.T) {
EnableSingleFlight: true,
MaxConcurrentResolvers: 1,
}),
core.WithSubgraphRetryOptions(false, 0, 0, 0),
core.WithSubgraphRetryOptions(false, "", 0, 0, 0, "", nil),
},
}, func(t *testing.T, xEnv *testenv.Environment) {
resp, err := xEnv.MakeGraphQLRequest(testenv.GraphQLRequest{
Expand Down Expand Up @@ -1476,7 +1476,7 @@ func TestErrorPropagation(t *testing.T) {
EnableSingleFlight: true,
MaxConcurrentResolvers: 1,
}),
core.WithSubgraphRetryOptions(false, 0, 0, 0),
core.WithSubgraphRetryOptions(false, "", 0, 0, 0, "", nil),
},
}, func(t *testing.T, xEnv *testenv.Environment) {
resp, err := xEnv.MakeGraphQLRequest(testenv.GraphQLRequest{
Expand Down
2 changes: 1 addition & 1 deletion router-tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ require (
github.com/docker/docker-credential-helpers v0.9.3 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/expr-lang/expr v1.17.3 // indirect
github.com/expr-lang/expr v1.17.6 // indirect
Comment thread
SkArchon marked this conversation as resolved.
github.com/fatih/color v1.18.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-chi/chi/v5 v5.2.2 // indirect
Expand Down
4 changes: 2 additions & 2 deletions router-tests/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4
github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
github.com/expr-lang/expr v1.17.3 h1:myeTTuDFz7k6eFe/JPlep/UsiIjVhG61FMHFu63U7j0=
github.com/expr-lang/expr v1.17.3/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
github.com/expr-lang/expr v1.17.6 h1:1h6i8ONk9cexhDmowO/A64VPxHScu7qfSl2k8OlINec=
github.com/expr-lang/expr v1.17.6/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4=
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
Expand Down
4 changes: 2 additions & 2 deletions router-tests/panic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func TestEnginePanic(t *testing.T) {
EnableSingleFlight: true,
MaxConcurrentResolvers: 1,
}),
core.WithSubgraphRetryOptions(false, 0, 0, 0),
core.WithSubgraphRetryOptions(false, "", 0, 0, 0, "", nil),
},
}, func(t *testing.T, xEnv *testenv.Environment) {
res, err := xEnv.MakeGraphQLRequest(testenv.GraphQLRequest{
Expand Down Expand Up @@ -80,7 +80,7 @@ func TestEnginePanic(t *testing.T) {
EnableSingleFlight: true,
ParseKitPoolSize: 1,
}),
core.WithSubgraphRetryOptions(false, 0, 0, 0),
core.WithSubgraphRetryOptions(false, "", 0, 0, 0, "", nil),
},
}, func(t *testing.T, xEnv *testenv.Environment) {
res, err := xEnv.MakeGraphQLRequest(testenv.GraphQLRequest{
Expand Down
Loading
Loading