merge dev into next (#6571)

.changesets/fix_junior_granddad_salami_dye.md

@@ -0,0 +1,7 @@
+### Fix missing Content-Length header in subgraph requests ([Issue #6503](https://github.com/apollographql/router/issues/6503))
+
+A change in `1.59.0` caused the Router to send requests to subgraphs without a `Content-Length` header, which would cause issues with some GraphQL servers that depend on that header.
+
+This solves the underlying bug and reintroduces the `Content-Length` header.
+
+By [@nmoutschen](https://github.com/nmoutschen) in https://github.com/apollographql/router/pull/6538

.changesets/fix_tninesling_demand_control_perf.md

@@ -0,0 +1,9 @@
+### Demand control lookup optimizations ([PR #6450](https://github.com/apollographql/router/pull/6450))
+
+Demand Control can reduce router throughput due to the extra processing required for scoring. This change shifts more data to be computed at plugin initialization and consolidates lookup queries.
+
+- Cost directives for arguments are now stored in a map alongside those for field definitions
+- All precomputed directives are bundled into a struct for each field, along with that field's extended schema type. This reduces 5 individual lookups to a single lookup.
+- Response scoring was looking up each field's definition twice. This is now reduced to a single lookup.
+
+By [@tninesling](https://github.com/tninesling) in https://github.com/apollographql/router/pull/6450

Cargo.lock

@@ -174,9 +174,9 @@ checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7"
 
 [[package]]
 name = "apollo-compiler"
-version = "1.0.0-beta.24"
+version = "1.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71153ad85c85f7aa63f0e0a5868912c220bb48e4c764556f5841d37fc17b0103"
+checksum = "2d810db7b42773a4082426bcd58658cb9b311c5b74febd255130a9dcfc13109d"
 dependencies = [
  "ahash",
  "apollo-parser",
@@ -253,9 +253,9 @@ dependencies = [
 
 [[package]]
 name = "apollo-parser"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b64257011a999f2e22275cf7a118f651e58dc9170e11b775d435de768fad0387"
+checksum = "c8f05cbc7da3c2e3bb2f86e985aad5f72571d2e2cd26faf8caa7782131576f84"
 dependencies = [
  "memchr",
  "rowan",
@@ -458,9 +458,9 @@ dependencies = [
 
 [[package]]
 name = "apollo-smith"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d89479524886fdbe62b124d3825879778680e0147304d1a6d32164418f8089a2"
+checksum = "95a04f64d4d4f0048201967b8064257de212ab240fd74e2b153691b39b0e8721"
 dependencies = [
  "apollo-compiler",
  "apollo-parser",
@@ -487,9 +487,9 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
 
 [[package]]
 name = "ariadne"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44055e597c674aef7cb903b2b9f6e4cba1277ed0d2d61dae7cd52d7ffa81f8e2"
+checksum = "31beedec3ce83ae6da3a79592b3d8d7afd146a5b15bb9bb940279aced60faa89"
 dependencies = [
  "concolor",
  "unicode-width",
@@ -4242,15 +4242,6 @@ version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
-[[package]]
-name = "memoffset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "memory-stats"
 version = "1.2.0"
@@ -5925,13 +5916,12 @@ dependencies = [
 
 [[package]]
 name = "rowan"
-version = "0.15.15"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a58fa8a7ccff2aec4f39cc45bf5f985cec7125ab271cf681c279fd00192b49"
+checksum = "417a3a9f582e349834051b8a10c8d71ca88da4211e4093528e36b9845f6b5f21"
 dependencies = [
  "countme",
  "hashbrown 0.14.5",
- "memoffset",
  "rustc-hash 1.1.0",
  "text-size",
 ]

Cargo.toml

@@ -47,9 +47,9 @@ debug = 1
 # Dependencies used in more than one place are specified here in order to keep versions in sync:
 # https://doc.rust-lang.org/cargo/reference/workspaces.html#the-dependencies-table
 [workspace.dependencies]
-apollo-compiler = "=1.0.0-beta.24"
-apollo-parser = "0.8.3"
-apollo-smith = "0.14.0"
+apollo-compiler = "1.25.0"
+apollo-parser = "0.8.4"
+apollo-smith = "0.15.0"
 async-trait = "0.1.77"
 hex = { version = "0.4.3", features = ["serde"] }
 http = "1.1.0"

apollo-federation/src/operation/tests/mod.rs

@@ -1,5 +1,6 @@
 use apollo_compiler::collections::IndexSet;
 use apollo_compiler::name;
+use apollo_compiler::parser::Parser;
 use apollo_compiler::schema::Schema;
 use apollo_compiler::ExecutableDocument;
 
@@ -29,8 +30,9 @@ macro_rules! assert_normalized {
 pub(super) fn parse_schema_and_operation(
     schema_and_operation: &str,
 ) -> (ValidFederationSchema, ExecutableDocument) {
-    let (schema, executable_document) =
-        apollo_compiler::parse_mixed_validate(schema_and_operation, "document.graphql").unwrap();
+    let (schema, executable_document) = Parser::new()
+        .parse_mixed_validate(schema_and_operation, "document.graphql")
+        .unwrap();
     let executable_document = executable_document.into_inner();
     let schema = ValidFederationSchema::new(schema).unwrap();
     (schema, executable_document)

apollo-federation/src/query_graph/path_tree.rs

@@ -563,6 +563,7 @@ where
 mod tests {
     use std::sync::Arc;
 
+    use apollo_compiler::parser::Parser;
     use apollo_compiler::ExecutableDocument;
     use petgraph::stable_graph::NodeIndex;
     use petgraph::visit::EdgeRef;
@@ -585,9 +586,9 @@ mod tests {
     fn parse_schema_and_operation(
         schema_and_operation: &str,
     ) -> (ValidFederationSchema, ExecutableDocument) {
-        let (schema, executable_document) =
-            apollo_compiler::parse_mixed_validate(schema_and_operation, "document.graphql")
-                .unwrap();
+        let (schema, executable_document) = Parser::new()
+            .parse_mixed_validate(schema_and_operation, "document.graphql")
+            .unwrap();
         let executable_document = executable_document.into_inner();
         let schema = ValidFederationSchema::new(schema).unwrap();
         (schema, executable_document)

apollo-federation/src/subgraph/mod.rs

@@ -119,7 +119,7 @@ impl Subgraph {
                     .schema_definition
                     .make_mut()
                     .directives
-                    .push(defaults.applied_link_directive().into());
+                    .push(defaults.applied_link_directive());
                 defaults
             }
         };
@@ -136,7 +136,7 @@ impl Subgraph {
                     .schema_definition
                     .make_mut()
                     .directives
-                    .push(defaults.applied_link_directive().into());
+                    .push(defaults.applied_link_directive());
                 defaults
             }
         };

apollo-router/src/error.rs

@@ -343,7 +343,7 @@ impl IntoGraphQLErrors for FederationErrorBridge {
     }
 }
 
-impl IntoGraphQLErrors for Vec<apollo_compiler::execution::GraphQLError> {
+impl IntoGraphQLErrors for Vec<apollo_compiler::response::GraphQLError> {
     fn into_graphql_errors(self) -> Result<Vec<Error>, Self> {
         Ok(self
             .into_iter()
@@ -554,7 +554,7 @@ impl IntoGraphQLErrors for ParseErrors {
 /// Collection of schema validation errors.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub(crate) struct ValidationErrors {
-    pub(crate) errors: Vec<apollo_compiler::execution::GraphQLError>,
+    pub(crate) errors: Vec<apollo_compiler::response::GraphQLError>,
 }
 
 impl ValidationErrors {

apollo-router/src/graphql/mod.rs

@@ -7,8 +7,8 @@ mod visitor;
 use std::fmt;
 use std::pin::Pin;
 
-use apollo_compiler::execution::GraphQLError as CompilerExecutionError;
-use apollo_compiler::execution::ResponseDataPathElement;
+use apollo_compiler::response::GraphQLError as CompilerExecutionError;
+use apollo_compiler::response::ResponseDataPathSegment;
 use futures::Stream;
 use heck::ToShoutySnakeCase;
 pub use request::Request;
@@ -233,10 +233,10 @@ impl From<CompilerExecutionError> for Error {
             let elements = path
                 .into_iter()
                 .map(|element| match element {
-                    ResponseDataPathElement::Field(name) => {
+                    ResponseDataPathSegment::Field(name) => {
                         JsonPathElement::Key(name.as_str().to_owned(), None)
                     }
-                    ResponseDataPathElement::ListIndex(i) => JsonPathElement::Index(i),
+                    ResponseDataPathSegment::ListIndex(i) => JsonPathElement::Index(i),
                 })
                 .collect();
             Some(Path(elements))

apollo-router/src/graphql/response.rs

@@ -1,6 +1,7 @@
 #![allow(missing_docs)] // FIXME
 use std::time::Instant;
 
+use apollo_compiler::response::ExecutionResponse;
 use bytes::Bytes;
 use serde::Deserialize;
 use serde::Serialize;
@@ -245,25 +246,13 @@ impl IncrementalResponse {
     }
 }
 
-impl From<apollo_compiler::execution::Response> for Response {
-    fn from(response: apollo_compiler::execution::Response) -> Response {
-        let apollo_compiler::execution::Response {
-            errors,
-            data,
-            extensions,
-        } = response;
+impl From<ExecutionResponse> for Response {
+    fn from(response: ExecutionResponse) -> Response {
+        let ExecutionResponse { errors, data } = response;
         Self {
             errors: errors.into_graphql_errors().unwrap(),
-            data: match data {
-                apollo_compiler::execution::ResponseData::Object(map) => {
-                    Some(serde_json_bytes::Value::Object(map))
-                }
-                apollo_compiler::execution::ResponseData::Null => {
-                    Some(serde_json_bytes::Value::Null)
-                }
-                apollo_compiler::execution::ResponseData::Absent => None,
-            },
-            extensions,
+            data: data.map(serde_json_bytes::Value::Object),
+            extensions: Default::default(),
             label: None,
             path: None,
             has_next: None,

apollo-router/src/introspection.rs

@@ -147,23 +147,26 @@ impl IntrospectionCache {
     }
 
     fn execute_introspection(schema: &spec::Schema, doc: &ParsedDocument) -> graphql::Response {
-        let schema = schema.api_schema();
+        let api_schema = schema.api_schema();
         let operation = &doc.operation;
         let variable_values = Default::default();
-        match apollo_compiler::execution::coerce_variable_values(
-            schema,
+        match apollo_compiler::request::coerce_variable_values(
+            api_schema,
             operation,
             &variable_values,
-        ) {
-            Ok(variable_values) => apollo_compiler::execution::execute_introspection_only_query(
-                schema,
+        )
+        .and_then(|variable_values| {
+            apollo_compiler::introspection::partial_execute(
+                api_schema,
+                &schema.implementers_map,
                 &doc.executable,
                 operation,
                 &variable_values,
             )
-            .into(),
+        }) {
+            Ok(response) => response.into(),
             Err(e) => {
-                let error = e.into_graphql_error(&doc.executable.sources);
+                let error = e.to_graphql_error(&doc.executable.sources);
                 graphql::Response::builder().error(error).build()
             }
         }

apollo-router/src/plugins/connectors/tests/mod.rs

@@ -1,7 +1,7 @@
 use std::str::FromStr;
 use std::sync::Arc;
 
-use apollo_compiler::execution::JsonMap;
+use apollo_compiler::response::JsonMap;
 use http::header::CONTENT_TYPE;
 use itertools::EitherOrBoth;
 use itertools::Itertools;