feat(router): Subgraph Timeout Configuration

.changeset/asd.md

@@ -0,0 +1,9 @@
+---
+config: minor
+router: minor
+executor: minor
+---
+
+# Subgraph Request Timeout Feature
+
+Adds support for configurable subgraph request timeouts via the `traffic_shaping` configuration. The `request_timeout` option allows you to specify the maximum time the router will wait for a response from a subgraph before timing out the request. You can set a static timeout (e.g., `30s`) globally or per-subgraph, or use dynamic timeouts with VRL expressions to vary timeout values based on request characteristics. This helps protect your router from hanging requests and enables fine-grained control over how long requests to different subgraphs should be allowed to run.

.gemini/styleguide.md

@@ -81,6 +81,33 @@ async fn handle(user: &User, req: &Request) -> Result<Response> {
     Ok(...)
 }
 
+---
+
+## `std::time::Duration` in `router-config` Crate
+
+When using `std::time::Duration` in the `router-config` crate **only**, you **must** add both serde and schemars attributes:
+
+```rust
+use std::time::Duration;
+
+#[derive(serde::Serialize, serde::Deserialize)]
+struct Config {
+    #[serde(
+        deserialize_with = "humantime_serde::deserialize",
+        serialize_with = "humantime_serde::serialize",
+    )]
+    #[schemars(with = "String")]
+    timeout: Duration,
+}
+```
+
+- **`#[serde(...)]`** enables human-readable time formats (e.g., `"30s"`, `"1m30s"`) in config files.
+- **`#[schemars(with = "String")]`** ensures the JSON schema correctly represents the field as a string, not as a numeric value.
+
+**Important:** This pattern applies **only** to the `router-config` crate.
+
+---
+
 ## Releasing
 
 We are using `knope` with changesets for declaring changes. If you detect a new file in a PR under `.changeset/` directory, please confirm the following rules:

bin/router/src/pipeline/progressive_override.rs

@@ -2,7 +2,7 @@ use std::collections::{BTreeMap, HashMap, HashSet};
 
 use hive_router_config::override_labels::{LabelOverrideValue, OverrideLabelsConfig};
 use hive_router_plan_executor::{
-    execution::client_request_details::ClientRequestDetails, utils::expression::compile_expression,
+    execution::client_request_details::ClientRequestDetails, expressions::CompileExpression,
 };
 use hive_router_query_planner::{
     graph::{PlannerOverrideContext, PERCENTAGE_SCALE_FACTOR},
@@ -135,7 +135,7 @@ impl OverrideLabelsEvaluator {
                     static_enabled_labels.insert(label.clone());
                 }
                 LabelOverrideValue::Expression { expression } => {
-                    let program = compile_expression(expression, None).map_err(|err| {
+                    let program = expression.compile_expression(None).map_err(|err| {
                         OverrideLabelsCompileError {
                             label: label.clone(),
                             error: err.to_string(),

bin/router/src/schema_state.rs

@@ -54,7 +54,7 @@ pub enum SupergraphManagerError {
     PlannerBuilderError(#[from] PlannerError),
     #[error("Failed to build authorization: {0}")]
     AuthorizationMetadataError(#[from] AuthorizationMetadataError),
-    #[error("Failed to init executor: {0}")]
+    #[error(transparent)]
     ExecutorInitError(#[from] SubgraphExecutorError),
     #[error("Unexpected: failed to load initial supergraph")]
     FailedToLoadInitialSupergraph,

docs/README.md

@@ -16,7 +16,7 @@
 |[**override\_subgraph\_urls**](#override_subgraph_urls)|`object`|Configuration for overriding subgraph URLs.<br/>Default: `{}`<br/>||
 |[**query\_planner**](#query_planner)|`object`|Query planning configuration.<br/>Default: `{"allow_expose":false,"timeout":"10s"}`<br/>||
 |[**supergraph**](#supergraph)|`object`|Configuration for the Federation supergraph source. By default, the router will use a local file-based supergraph source (`./supergraph.graphql`).<br/>||
-|[**traffic\_shaping**](#traffic_shaping)|`object`|Configuration for the traffic-shaping of the executor. Use these configurations to control how requests are being executed to subgraphs.<br/>Default: `{"dedupe_enabled":true,"max_connections_per_host":100,"pool_idle_timeout":"50s"}`<br/>||
+|[**traffic\_shaping**](#traffic_shaping)|`object`|Configuration for the traffic-shaping of the executor. Use these configurations to control how requests are being executed to subgraphs.<br/>Default: `{"all":{"dedupe_enabled":true,"pool_idle_timeout":"50s","request_timeout":"30s"},"max_connections_per_host":100}`<br/>||
 
 **Additional Properties:** not allowed  
 **Example**
@@ -113,9 +113,11 @@ query_planner:
   timeout: 10s
 supergraph: {}
 traffic_shaping:
-  dedupe_enabled: true
+  all:
+    dedupe_enabled: true
+    pool_idle_timeout: 50s
+    request_timeout: 30s
   max_connections_per_host: 100
-  pool_idle_timeout: 50s
 
 ```
 
@@ -1744,7 +1746,7 @@ The path can be either absolute or relative to the router's working directory.
 |Name|Type|Description|Required|
 |----|----|-----------|--------|
 |**path**|`string`|The path to the supergraph file.<br/><br/>Can also be set using the `SUPERGRAPH_FILE_PATH` environment variable.<br/>Format: `"path"`<br/>|yes|
-|[**poll\_interval**](#option1poll_interval)|`object`, `null`|Optional interval at which the file should be polled for changes.<br/>|yes|
+|**poll\_interval**|`string`|Optional interval at which the file should be polled for changes.<br/>If not provided, the file will only be loaded once when the router starts.<br/>|no|
 |**source**|`string`|Constant Value: `"file"`<br/>|yes|
 
 **Additional Properties:** not allowed  
@@ -1766,11 +1768,11 @@ Loads a supergraph from Hive Console CDN.
 |Name|Type|Description|Required|
 |----|----|-----------|--------|
 |**accept\_invalid\_certs**|`boolean`|Whether to accept invalid TLS certificates when connecting to the Hive Console CDN.<br/>Default: `false`<br/>|no|
-|[**connect\_timeout**](#option2connect_timeout)|`object`|Connect timeout for the Hive Console CDN requests.<br/>Default: `"10s"`<br/>|yes|
+|**connect\_timeout**|`string`|Connect timeout for the Hive Console CDN requests.<br/>Default: `"10s"`<br/>|no|
 |**endpoint**|`string`|The CDN endpoint from Hive Console target.<br/><br/>Can also be set using the `HIVE_CDN_ENDPOINT` environment variable.<br/>|yes|
 |**key**|`string`|The CDN Access Token with from the Hive Console target.<br/><br/>Can also be set using the `HIVE_CDN_KEY` environment variable.<br/>|yes|
-|[**poll\_interval**](#option2poll_interval)|`object`|Interval at which the Hive Console should be polled for changes.<br/>Default: `"10s"`<br/>|yes|
-|[**request\_timeout**](#option2request_timeout)|`object`|Request timeout for the Hive Console CDN requests.<br/>Default: `"1m"`<br/>|yes|
+|**poll\_interval**|`string`|Interval at which the Hive Console should be polled for changes.<br/><br/>Can also be set using the `HIVE_CDN_POLL_INTERVAL` environment variable.<br/>Default: `"10s"`<br/>|no|
+|**request\_timeout**|`string`|Request timeout for the Hive Console CDN requests.<br/>Default: `"1m"`<br/>|no|
 |[**retry\_policy**](#option2retry_policy)|`object`|Interval at which the Hive Console should be polled for changes.<br/>Default: `{"max_retries":10}`<br/>|yes|
 |**source**|`string`|Constant Value: `"hive"`<br/>|yes|
 
@@ -1788,132 +1790,99 @@ retry_policy:
 ```
 
 
-<a name="option1poll_interval"></a>
-## Option 1: poll\_interval: object,null
-
-Optional interval at which the file should be polled for changes.
-If not provided, the file will only be loaded once when the router starts.
-
-
-**Properties**
-
-|Name|Type|Description|Required|
-|----|----|-----------|--------|
-|**nanos**|`integer`|Format: `"uint32"`<br/>Minimum: `0`<br/>|yes|
-|**secs**|`integer`|Format: `"uint64"`<br/>Minimum: `0`<br/>|yes|
-
-**Example**
-
-```yaml
-{}
-
-```
+<a name="option2retry_policy"></a>
+## Option 2: retry\_policy: object
 
-<a name="option2connect_timeout"></a>
-## Option 2: connect\_timeout: object
+Interval at which the Hive Console should be polled for changes.
 
-Connect timeout for the Hive Console CDN requests.
+By default, an exponential backoff retry policy is used, with 10 attempts.
 
 
 **Properties**
 
 |Name|Type|Description|Required|
 |----|----|-----------|--------|
-|**nanos**|`integer`|Format: `"uint32"`<br/>Minimum: `0`<br/>|yes|
-|**secs**|`integer`|Format: `"uint64"`<br/>Minimum: `0`<br/>|yes|
+|**max\_retries**|`integer`|The maximum number of retries to attempt.<br/><br/>Retry mechanism is based on exponential backoff, see https://docs.rs/retry-policies/latest/retry_policies/policies/struct.ExponentialBackoff.html for additional details.<br/>Format: `"uint32"`<br/>Minimum: `0`<br/>|yes|
 
 **Example**
 
 ```yaml
-10s
+max_retries: 10
 
 ```
 
-<a name="option2poll_interval"></a>
-## Option 2: poll\_interval: object
-
-Interval at which the Hive Console should be polled for changes.
+<a name="traffic_shaping"></a>
+## traffic\_shaping: object
 
-Can also be set using the `HIVE_CDN_POLL_INTERVAL` environment variable.
+Configuration for the traffic-shaping of the executor. Use these configurations to control how requests are being executed to subgraphs.
 
 
 **Properties**
 
 |Name|Type|Description|Required|
 |----|----|-----------|--------|
-|**nanos**|`integer`|Format: `"uint32"`<br/>Minimum: `0`<br/>|yes|
-|**secs**|`integer`|Format: `"uint64"`<br/>Minimum: `0`<br/>|yes|
+|[**all**](#traffic_shapingall)|`object`|The default configuration that will be applied to all subgraphs, unless overridden by a specific subgraph configuration.<br/>Default: `{"dedupe_enabled":true,"pool_idle_timeout":"50s","request_timeout":"30s"}`<br/>||
+|**max\_connections\_per\_host**|`integer`|Limits the concurrent amount of requests/connections per host/subgraph.<br/>Default: `100`<br/>Format: `"uint"`<br/>Minimum: `0`<br/>||
+|[**subgraphs**](#traffic_shapingsubgraphs)|`object`|Optional per-subgraph configurations that will override the default configuration for specific subgraphs.<br/>||
 
+**Additional Properties:** not allowed  
 **Example**
 
 ```yaml
-10s
+all:
+  dedupe_enabled: true
+  pool_idle_timeout: 50s
+  request_timeout: 30s
+max_connections_per_host: 100
 
 ```
 
-<a name="option2request_timeout"></a>
-## Option 2: request\_timeout: object
+<a name="traffic_shapingall"></a>
+### traffic\_shaping\.all: object
 
-Request timeout for the Hive Console CDN requests.
+The default configuration that will be applied to all subgraphs, unless overridden by a specific subgraph configuration.
 
 
 **Properties**
 
 |Name|Type|Description|Required|
 |----|----|-----------|--------|
-|**nanos**|`integer`|Format: `"uint32"`<br/>Minimum: `0`<br/>|yes|
-|**secs**|`integer`|Format: `"uint64"`<br/>Minimum: `0`<br/>|yes|
+|**dedupe\_enabled**|`boolean`|Enables/disables request deduplication to subgraphs.<br/><br/>When requests exactly matches the hashing mechanism (e.g., subgraph name, URL, headers, query, variables), and are executed at the same time, they will<br/>be deduplicated by sharing the response of other in-flight requests.<br/>Default: `true`<br/>||
+|**pool\_idle\_timeout**|`string`|Timeout for idle sockets being kept-alive.<br/>Default: `"50s"`<br/>||
+|**request\_timeout**||Optional timeout configuration for requests to subgraphs.<br/><br/>Example with a fixed duration:<br/>```yaml<br/>  timeout:<br/>    duration: 5s<br/>```<br/><br/>Or with a VRL expression that can return a duration based on the operation kind:<br/>```yaml<br/>  timeout:<br/>    expression: \|<br/>     if (.request.operation.type == "mutation") {<br/>       "10s"<br/>     } else {<br/>       "15s"<br/>     }<br/>```<br/>Default: `"30s"`<br/>||
 
+**Additional Properties:** not allowed  
 **Example**
 
 ```yaml
-1m
+dedupe_enabled: true
+pool_idle_timeout: 50s
+request_timeout: 30s
 
 ```
 
-<a name="option2retry_policy"></a>
-## Option 2: retry\_policy: object
+<a name="traffic_shapingsubgraphs"></a>
+### traffic\_shaping\.subgraphs: object
 
-Interval at which the Hive Console should be polled for changes.
-
-By default, an exponential backoff retry policy is used, with 10 attempts.
+Optional per-subgraph configurations that will override the default configuration for specific subgraphs.
 
 
-**Properties**
+**Additional Properties**
 
 |Name|Type|Description|Required|
 |----|----|-----------|--------|
-|**max\_retries**|`integer`|The maximum number of retries to attempt.<br/><br/>Retry mechanism is based on exponential backoff, see https://docs.rs/retry-policies/latest/retry_policies/policies/struct.ExponentialBackoff.html for additional details.<br/>Format: `"uint32"`<br/>Minimum: `0`<br/>|yes|
-
-**Example**
-
-```yaml
-max_retries: 10
-
-```
-
-<a name="traffic_shaping"></a>
-## traffic\_shaping: object
-
-Configuration for the traffic-shaping of the executor. Use these configurations to control how requests are being executed to subgraphs.
+|[**Additional Properties**](#traffic_shapingsubgraphsadditionalproperties)|`object`|||
 
+<a name="traffic_shapingsubgraphsadditionalproperties"></a>
+#### traffic\_shaping\.subgraphs\.additionalProperties: object
 
 **Properties**
 
 |Name|Type|Description|Required|
 |----|----|-----------|--------|
-|**dedupe\_enabled**|`boolean`|Enables/disables request deduplication to subgraphs.<br/><br/>When requests exactly matches the hashing mechanism (e.g., subgraph name, URL, headers, query, variables), and are executed at the same time, they will<br/>be deduplicated by sharing the response of other in-flight requests.<br/>Default: `true`<br/>||
-|**max\_connections\_per\_host**|`integer`|Limits the concurrent amount of requests/connections per host/subgraph.<br/>Default: `100`<br/>Format: `"uint"`<br/>Minimum: `0`<br/>||
-|**pool\_idle\_timeout**|`string`|Timeout for idle sockets being kept-alive.<br/>Default: `"50s"`<br/>||
+|**dedupe\_enabled**|`boolean`, `null`|Enables/disables request deduplication to subgraphs.<br/><br/>When requests exactly matches the hashing mechanism (e.g., subgraph name, URL, headers, query, variables), and are executed at the same time, they will<br/>be deduplicated by sharing the response of other in-flight requests.<br/>||
+|**pool\_idle\_timeout**|`string`, `null`|Timeout for idle sockets being kept-alive.<br/>||
+|**request\_timeout**||Optional timeout configuration for requests to subgraphs.<br/><br/>Example with a fixed duration:<br/>```yaml<br/>  timeout:<br/>    duration: 5s<br/>```<br/><br/>Or with a VRL expression that can return a duration based on the operation kind:<br/>```yaml<br/>  timeout:<br/>    expression: \|<br/>     if (.request.operation.type == "mutation") {<br/>       "10s"<br/>     } else {<br/>       "15s"<br/>     }<br/>```<br/>||
 
 **Additional Properties:** not allowed  
-**Example**
-
-```yaml
-dedupe_enabled: true
-max_connections_per_host: 100
-pool_idle_timeout: 50s
-
-```
-
 

e2e/configs/timeout_per_subgraph_dynamic.router.yaml

@@ -0,0 +1,18 @@
+# yaml-language-server: $schema=../../router-config.schema.json
+supergraph:
+  source: file
+  path: ../supergraph.graphql
+traffic_shaping:
+  all:
+    request_timeout: 2s
+    # Disable deduplication to better hunt for deadlocks in tests
+    dedupe_enabled: false
+  subgraphs:
+    accounts:
+      request_timeout:
+        expression: |
+          if (.request.headers."x-timeout" == "short") {
+            "10s"
+          } else {
+            .default
+          }

e2e/configs/timeout_per_subgraph_static.router.yaml

@@ -0,0 +1,12 @@
+# yaml-language-server: $schema=../../router-config.schema.json
+supergraph:
+  source: file
+  path: ../supergraph.graphql
+traffic_shaping:
+  all:
+    request_timeout: 2s
+    # Disable deduplication to better hunt for deadlocks in tests
+    dedupe_enabled: false
+  subgraphs:
+    accounts:
+      request_timeout: 5s

e2e/src/lib.rs

@@ -16,3 +16,5 @@ mod probes;
 mod supergraph;
 #[cfg(test)]
 mod testkit;
+#[cfg(test)]
+mod timeout_per_subgraph;