feat(orphan-hoist-config): adds config for hoisting orphaned errors by aaronArinder · Pull Request #8998 · apollographql/router

aaronArinder · 2026-03-10T16:17:46Z

Checklist

Complete the checklist (and note appropriate exceptions) before the PR is marked ready-for-review.

Exceptions

Note any exceptions here

Notes

It may be appropriate to bring upcoming changes to the attention of other (impacted) groups. Please endeavour to do this before seeking PR approval. The mechanism for doing this will vary considerably, so use your judgement as to how and when to do this. ↩
Configuration is an important part of many changes. Where applicable please try to document configuration examples. ↩
A lot of (if not most) features benefit from built-in observability and debug-level logs. Please read this guidance on metrics best-practices. ↩
Tick whichever testing boxes are applicable. If you are adding Manual Tests, please document the manual testing (extensively) in the Exceptions. ↩

apollo-librarian · 2026-03-10T16:17:54Z

✅ Docs preview ready

The preview is ready to be viewed. View the preview

File Changes

0 new, 2 changed, 0 removed

* graphos/routing/(latest)/observability/router-telemetry-otel/enabling-telemetry/selectors.mdx
* graphos/routing/(latest)/observability/router-telemetry-otel/enabling-telemetry/spans.mdx

Build ID: fbab985d98c32848dea8cd04
Build Logs: View logs

URL: https://www.apollographql.com/docs/deploy-preview/fbab985d98c32848dea8cd04

⚠️ AI Style Review — 236 Issues Found

Summary

The documentation has been updated to align with current style guide standards. Key changes include reframing content to be more reader-centric by using "your" for ownership and adoption-focused language like "move" or "adopt" instead of "migrate." Product and feature naming was standardized, primarily by removing unnecessary articles before standalone names like "Apollo Router," "Rover CLI," and "GraphOS." Voice and tone were shifted from passive or neutral descriptions to an authoritative, prescriptive "happy path" that guides users toward recommended configurations. Technical formatting was improved by ensuring environment variables, CLI commands, and symbols use code font, while version numbers were standardized to plain text with a "v" prefix. Word usage was refined to eliminate discouraged terms such as "allow," "utilize," and "leverage" in favor of simpler alternatives like "enable" and "use," while also ensuring the use of the Oxford comma and dictionary-valid contractions.

Duration: 8177ms
Review Log: View detailed log

This review is AI-generated. Please use common sense when accepting these suggestions, as they may not always be accurate or appropriate for your specific context.

goto-bus-stop · 2026-03-10T16:29:08Z

.changesets/hoist_orphan_errors.md

@@ -0,0 +1,23 @@
+### Add `experimental_hoist_orphan_errors` configuration for controlling orphan error path assignment


I think we should phrase this changeset in a way where users are discouraged to try this out by themselves, instead it should only be enabled based on our advice (since there are spec-compliance concerns).

The prefix for this file is also currently invalid as hoist_. I think the prefix for this changeset should be the exp_ one to match the option.

goto-bus-stop · 2026-03-10T16:30:02Z

apollo-router/src/configuration/mod.rs

+/// every element in an array.
+#[derive(Debug, Clone, Default, Deserialize, Serialize, JsonSchema)]
+#[serde(deny_unknown_fields)]
+pub(crate) struct HoistOrphanErrors {


Can we use SubgraphConfiguration<bool> here? Notably it lets you use all + subgraphs (overriding the all configuration).

oh, yeah, this should be how it's done!

goto-bus-stop

LGTM pending snapshot updates and using SubgraphConfiguration<bool>; probably someone else should do the actual approval after my working hours but the strategy looks good to me

carodewig · 2026-03-10T17:34:32Z

.changesets/exp_hoist_orphan_errors.md

+  all: true
+```
+
+These two configurations (per-subgraph and `all`) are mutually exclusive.


I think this is no longer true, now that you're using the SubgraphConfiguration wrapper?

yeah, dang it, updating

smyrick · 2026-03-10T18:08:27Z

FYI Andy helped with a docs PR if we want to take those changes here or separately: #8999

carodewig

LGTM!

aaronArinder · 2026-03-10T19:41:11Z

@mergify backport dev-v2.10.x

mergify · 2026-03-10T19:41:21Z

backport dev-v2.10.x

✅ Backports have been created

Details

#9000 feat(orphan-hoist-config): adds config for hoisting orphaned errors (backport #8998) has been created for branch dev-v2.10.x but encountered conflicts

Cherry-pick of 810241e has failed:

On branch mergify/bp/dev-v2.10.x/pr-8998
Your branch is up to date with 'origin/dev-v2.10.x'.

You are currently cherry-picking commit 810241ea.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   .changesets/exp_hoist_orphan_errors.md
	modified:   apollo-router/src/configuration/mod.rs
	modified:   apollo-router/src/configuration/snapshots/apollo_router__configuration__tests__schema_generation.snap
	modified:   apollo-router/src/configuration/tests.rs
	modified:   apollo-router/src/query_planner/fetch.rs
	modified:   apollo-router/src/query_planner/tests.rs
	modified:   apollo-router/src/services/fetch_service.rs
	modified:   apollo-router/src/services/supergraph/service.rs
	modified:   apollo-router/src/services/supergraph/snapshots/apollo_router__services__supergraph__tests__deferred_fragment_bounds_nullability-2.snap
	modified:   apollo-router/tests/integration/query_planner/snapshots/integration_tests__integration__query_planner__error_paths__multi_level_response_failure.snap
	modified:   apollo-router/tests/integration/query_planner/snapshots/integration_tests__integration__query_planner__error_paths__nested_response_failure_404.snap
	modified:   apollo-router/tests/integration/query_planner/snapshots/integration_tests__integration__query_planner__error_paths__nested_response_failure_malformed.snap
	modified:   apollo-router/tests/integration/query_planner/snapshots/integration_tests__integration__query_planner__error_paths__second_level_response_failure_empty_path.snap
	modified:   apollo-router/tests/integration/query_planner/snapshots/integration_tests__integration__query_planner__error_paths__second_level_response_failure_malformed.snap
	modified:   apollo-router/tests/integration/snapshots/integration_tests__integration__coprocessor__on_graphql_error_selector__nested_response_failure.snap
	modified:   apollo-router/tests/integration/snapshots/integration_tests__integration__demand_control__requests_exceeding_one_subgraph_cost_are_accepted@federated_ships_required.snap

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   apollo-router/src/executable.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

…8998) (cherry picked from commit 810241e) # Conflicts: # apollo-router/src/executable.rs

…backport #8998) (#9000)

…8998)

aaronArinder requested a review from a team as a code owner March 10, 2026 16:17

This comment has been minimized.

Sign in to view

goto-bus-stop reviewed Mar 10, 2026

View reviewed changes

aaronArinder force-pushed the aaron/orphan-errs-hoisting branch from f31c5ad to 63057cf Compare March 10, 2026 17:28

carodewig reviewed Mar 10, 2026

View reviewed changes

andywgarcia mentioned this pull request Mar 10, 2026

IEP-14: Add docs for experimental_hoist_orphan_errors config #8999

Merged

aaronArinder force-pushed the aaron/orphan-errs-hoisting branch 2 times, most recently from ffdbf89 to 9445118 Compare March 10, 2026 18:01

feat(orphan-hoist-config): adds config for hoisting orphaned errors

852f129

aaronArinder force-pushed the aaron/orphan-errs-hoisting branch from 9445118 to 852f129 Compare March 10, 2026 18:19

carodewig approved these changes Mar 10, 2026

View reviewed changes

aaronArinder changed the base branch from dev to dev-v2.10.x March 10, 2026 19:10

aaronArinder requested a review from a team as a code owner March 10, 2026 19:10

aaronArinder changed the base branch from dev-v2.10.x to dev March 10, 2026 19:11

aaronArinder changed the base branch from dev to dev-v2.10.x March 10, 2026 19:13

aaronArinder force-pushed the aaron/orphan-errs-hoisting branch from 4e2173d to 852f129 Compare March 10, 2026 19:18

aaronArinder changed the base branch from dev-v2.10.x to dev March 10, 2026 19:18

aaronArinder merged commit 810241e into dev Mar 10, 2026
15 checks passed

aaronArinder deleted the aaron/orphan-errs-hoisting branch March 10, 2026 19:41

aaronArinder added a commit that referenced this pull request Mar 10, 2026

feat(orphan-hoist-config): adds config for hoisting orphaned errors (#…

3d88850

…8998) (cherry picked from commit 810241e) # Conflicts: # apollo-router/src/executable.rs

aaronArinder mentioned this pull request Mar 10, 2026

feat(orphan-hoist-config): adds config for hoisting orphaned errors (backport #8998) #9000

Merged

10 tasks

aaronArinder added a commit that referenced this pull request Mar 10, 2026

feat(orphan-hoist-config): adds config for hoisting orphaned errors (…

2871272

…backport #8998) (#9000)

abernix mentioned this pull request Mar 11, 2026

prep release: v2.10.1 #9007

Merged

smyrick pushed a commit that referenced this pull request Mar 17, 2026

feat(orphan-hoist-config): adds config for hoisting orphaned errors (#…

94e1821

…8998)

smyrick pushed a commit that referenced this pull request Mar 20, 2026

feat(orphan-hoist-config): adds config for hoisting orphaned errors (#…

f75ca7a

…8998)

abernix mentioned this pull request Mar 31, 2026

prep release: v2.13.0 #9104

Merged

		@@ -0,0 +1,23 @@
		### Add `experimental_hoist_orphan_errors` configuration for controlling orphan error path assignment

Conversation

aaronArinder commented Mar 10, 2026 • edited by atlassian bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Footnotes

Uh oh!

apollo-librarian bot commented Mar 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Docs preview ready

⚠️ AI Style Review — 236 Issues Found

Uh oh!

This comment has been minimized.

goto-bus-stop Mar 10, 2026

Choose a reason for hiding this comment

Uh oh!

abernix Mar 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

aaronArinder Mar 10, 2026

Choose a reason for hiding this comment

Uh oh!

goto-bus-stop Mar 10, 2026

Choose a reason for hiding this comment

Uh oh!

aaronArinder Mar 10, 2026

Choose a reason for hiding this comment

Uh oh!

goto-bus-stop left a comment

Choose a reason for hiding this comment

Uh oh!

carodewig Mar 10, 2026

Choose a reason for hiding this comment

Uh oh!

aaronArinder Mar 10, 2026

Choose a reason for hiding this comment

Uh oh!

smyrick commented Mar 10, 2026

Uh oh!

carodewig left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

aaronArinder commented Mar 10, 2026

Uh oh!

mergify bot commented Mar 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Backports have been created

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

aaronArinder commented Mar 10, 2026 •

edited by atlassian bot

Loading

apollo-librarian bot commented Mar 10, 2026 •

edited

Loading

abernix Mar 10, 2026 •

edited

Loading

mergify bot commented Mar 10, 2026 •

edited

Loading