docs: add signature generation configuration

.changesets/feat_bnjjj_add_operation_name_router_selector.md

@@ -0,0 +1,18 @@
+### Add selector for router service in custom telemetry ([PR #5392](https://github.com/apollographql/router/pull/5392))
+
+Instead of having to access to the operation_name using the response_context at the router service, we now provide a selector for operation name at the router service in instrumentations.
+
+example:
+
+```yaml
+telemetry:
+  instrumentation:
+    instruments:
+      router:
+        http.server.request.duration:
+          attributes:
+            graphql.operation.name:
+              operation_name: string
+```
+
+By [@bnjjj](https://github.com/bnjjj) in https://github.com/apollographql/router/pull/5392

.changesets/maint_bryn_demand_control_studio_traces.md

@@ -0,0 +1,5 @@
+### Add cost information to protobuf traces ([PR #5430](https://github.com/apollographql/router/pull/5430))
+
+If `experimental_demand_control` is enabled, cost information for queries is now exported on Apollo protobuf traces for display in studio.
+
+By [@BrynCooke](https://github.com/BrynCooke) in https://github.com/apollographql/router/pull/5430

Cargo.lock

@@ -220,7 +220,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-federation"
-version = "1.48.1"
+version = "1.49.0-rc.1"
 dependencies = [
  "apollo-compiler",
  "derive_more",
@@ -266,7 +266,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-router"
-version = "1.48.1"
+version = "1.49.0-rc.1"
 dependencies = [
  "access-json",
  "anyhow",
@@ -430,7 +430,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-router-benchmarks"
-version = "1.48.1"
+version = "1.49.0-rc.1"
 dependencies = [
  "apollo-parser",
  "apollo-router",
@@ -446,7 +446,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-router-scaffold"
-version = "1.48.1"
+version = "1.49.0-rc.1"
 dependencies = [
  "anyhow",
  "cargo-scaffold",
@@ -5528,9 +5528,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.3"
+version = "1.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -6228,12 +6228,14 @@ dependencies = [
 
 [[package]]
 name = "serde_json_bytes"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feb260b2939374fad6f939f803662d4971d03395fcd03752b674bdba06565779"
+checksum = "9eb67259abd83636e3b2f4700ddc3ecfdbfe7b1b89e824da42bfea6530caf03b"
 dependencies = [
  "bytes",
  "indexmap 2.2.3",
+ "jsonpath-rust",
+ "regex",
  "serde",
  "serde_json",
 ]

Cargo.toml

@@ -70,7 +70,7 @@ serde_json = { version = "1.0.114", features = [
     "preserve_order",
     "float_roundtrip",
 ] }
-serde_json_bytes = { version = "0.2.2", features = ["preserve_order"] }
+serde_json_bytes = { version = "0.2.3", features = ["preserve_order"] }
 sha1 = "0.10.6"
 tempfile = "3.10.0"
 tokio = { version = "1.36.0", features = ["full"] }

apollo-federation/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "apollo-federation"
-version = "1.48.1"
+version = "1.49.0-rc.1"
 authors = ["The Apollo GraphQL Contributors"]
 edition = "2021"
 description = "Apollo Federation"

apollo-federation/src/operation/mod.rs

@@ -188,13 +188,21 @@ impl Operation {
 /// - For the type, stores the schema and the position in that schema instead of just the
 ///   `NamedType`.
 /// - Stores selections in a map so they can be normalized efficiently.
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone)]
 pub(crate) struct SelectionSet {
     pub(crate) schema: ValidFederationSchema,
     pub(crate) type_position: CompositeTypeDefinitionPosition,
     pub(crate) selections: Arc<SelectionMap>,
 }
 
+impl PartialEq for SelectionSet {
+    fn eq(&self, other: &Self) -> bool {
+        self.selections == other.selections
+    }
+}
+
+impl Eq for SelectionSet {}
+
 mod selection_map {
     use std::borrow::Cow;
     use std::iter::Map;

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

@@ -1439,9 +1439,7 @@ fn add_at_path_merge_subselections() {
     insta::assert_snapshot!(selection_set, @r#"{ a { b { c { d e(arg: 1) } } } }"#);
 }
 
-// TODO: `.add_at_path` should collapse unnecessary fragments
 #[test]
-#[ignore]
 fn add_at_path_collapses_unnecessary_fragments() {
     let schema =
         apollo_compiler::Schema::parse_and_validate(ADD_AT_PATH_TEST_SCHEMA, "schema.graphql")

apollo-federation/src/query_graph/graph_path.rs

@@ -3562,12 +3562,18 @@ impl OpPath {
             match element.as_ref() {
                 OpPathElement::InlineFragment(fragment) => {
                     if let Some(type_condition) = &fragment.data().type_condition_position {
-                        if schema.get_type(type_condition.type_name().clone()).is_ok() {
-                            let updated_fragment = fragment.with_updated_type_condition(None);
-                            filtered
-                                .push(Arc::new(OpPathElement::InlineFragment(updated_fragment)));
+                        if schema.get_type(type_condition.type_name().clone()).is_err() {
+                            if element.directives().is_empty() {
+                                continue; // skip this element
+                            } else {
+                                // Replace this element with an unconditioned inline fragment
+                                let updated_fragment = fragment.with_updated_type_condition(None);
+                                filtered.push(Arc::new(OpPathElement::InlineFragment(
+                                    updated_fragment,
+                                )));
+                            }
                         } else {
-                            continue;
+                            filtered.push(element.clone());
                         }
                     } else {
                         filtered.push(element.clone());

apollo-federation/src/query_plan/fetch_dependency_graph.rs

@@ -3062,6 +3062,10 @@ fn compute_nodes_for_key_resolution<'a>(
     let dest = stack_item.tree.graph.node_weight(dest_id)?;
     // We shouldn't have a key on a non-composite type
     let source_type: CompositeTypeDefinitionPosition = source.type_.clone().try_into()?;
+    let source_schema: ValidFederationSchema = dependency_graph
+        .federated_query_graph
+        .schema_by_source(&source.source)?
+        .clone();
     let dest_type: CompositeTypeDefinitionPosition = dest.type_.clone().try_into()?;
     let dest_schema: ValidFederationSchema = dependency_graph
         .federated_query_graph
@@ -3153,7 +3157,7 @@ fn compute_nodes_for_key_resolution<'a>(
     let node =
         FetchDependencyGraph::node_weight_mut(&mut dependency_graph.graph, stack_item.node_id)?;
     let typename_field = Arc::new(OpPathElement::Field(Field::new_introspection_typename(
-        &dependency_graph.supergraph_schema,
+        &source_schema,
         &source_type,
         None,
     )));
@@ -3852,6 +3856,7 @@ fn handle_requires(
             let inputs = inputs_for_require(
                 dependency_graph,
                 entity_type_position.clone(),
+                entity_type_schema,
                 query_graph_edge_id,
                 context,
                 false,
@@ -4024,6 +4029,7 @@ fn defer_context_for_conditions(base_context: &DeferContext) -> DeferContext {
 fn inputs_for_require(
     fetch_dependency_graph: &mut FetchDependencyGraph,
     entity_type_position: ObjectTypeDefinitionPosition,
+    entity_type_schema: ValidFederationSchema,
     query_graph_edge_id: EdgeIndex,
     context: &OpGraphPathContext,
     include_key_inputs: bool,
@@ -4108,7 +4114,7 @@ fn inputs_for_require(
         // should just use `entity_type` (that @interfaceObject type), not input type which will be an implementation the
         // subgraph does not know in that particular case.
         let mut key_inputs =
-            SelectionSet::for_composite_type(edge_conditions.schema.clone(), input_type.clone());
+            SelectionSet::for_composite_type(entity_type_schema, entity_type_position.into());
         key_inputs.add_selection_set(&key_condition)?;
 
         Ok((
@@ -4148,6 +4154,7 @@ fn add_post_require_inputs(
     let (inputs, key_inputs) = inputs_for_require(
         dependency_graph,
         entity_type_position.clone(),
+        entity_type_schema.clone(),
         query_graph_edge_id,
         context,
         true,

apollo-federation/src/query_plan/query_planner.rs

@@ -2,21 +2,19 @@ use std::cell::Cell;
 use std::num::NonZeroU32;
 use std::sync::Arc;
 
-use apollo_compiler::schema::ExtendedType;
 use apollo_compiler::schema::Name;
 use apollo_compiler::validation::Valid;
 use apollo_compiler::ExecutableDocument;
 use apollo_compiler::NodeStr;
 use indexmap::IndexMap;
 use indexmap::IndexSet;
+use itertools::Itertools;
 use petgraph::csr::NodeIndex;
 use petgraph::stable_graph::IndexType;
 
 use crate::error::FederationError;
 use crate::error::SingleFederationError;
 use crate::link::federation_spec_definition::FederationSpecDefinition;
-use crate::link::federation_spec_definition::FEDERATION_INTERFACEOBJECT_DIRECTIVE_NAME_IN_SPEC;
-use crate::link::spec::Identity;
 use crate::operation::normalize_operation;
 use crate::operation::NamedFragments;
 use crate::operation::RebasedFragments;
@@ -219,34 +217,35 @@ impl QueryPlanner {
             Some(true),
         )?;
 
-        let metadata = supergraph_schema.metadata().unwrap();
-
-        let federation_link = metadata.for_identity(&Identity::federation_identity());
-        let interface_object_directive =
-            federation_link.map_or(FEDERATION_INTERFACEOBJECT_DIRECTIVE_NAME_IN_SPEC, |link| {
-                link.directive_name_in_schema(&FEDERATION_INTERFACEOBJECT_DIRECTIVE_NAME_IN_SPEC)
-            });
-
-        let is_interface_object =
-            |ty: &ExtendedType| ty.is_object() && ty.directives().has(&interface_object_directive);
-
         let interface_types_with_interface_objects = supergraph
             .schema
             .get_types()
             .filter_map(|position| match position {
                 TypeDefinitionPosition::Interface(interface_position) => Some(interface_position),
                 _ => None,
             })
-            .filter(|position| {
-                query_graph.subgraphs().any(|(_name, schema)| {
-                    schema
-                        .schema()
-                        .types
-                        .get(&position.type_name)
-                        .is_some_and(is_interface_object)
-                })
+            .map(|position| {
+                let is_interface_object = query_graph
+                    .subgraphs()
+                    .map(|(_name, schema)| {
+                        let Some(position) = schema.try_get_type(position.type_name.clone()) else {
+                            return Ok(false);
+                        };
+                        schema.is_interface_object_type(position)
+                    })
+                    .process_results(|mut iter| iter.any(|b| b))?;
+                Ok::<_, FederationError>((position, is_interface_object))
             })
-            .collect::<IndexSet<_>>();
+            .process_results(|iter| {
+                iter.flat_map(|(position, is_interface_object)| {
+                    if is_interface_object {
+                        Some(position)
+                    } else {
+                        None
+                    }
+                })
+                .collect::<IndexSet<_>>()
+            })?;
 
         let is_inconsistent = |position: AbstractTypeDefinitionPosition| {
             let mut sources = query_graph.subgraphs().filter_map(|(_name, subgraph)| {
@@ -995,10 +994,7 @@ type User
         "###);
     }
 
-    // TODO: This fails with "Subgraph unexpectedly does not use federation spec"
-    // which seems...unusual
     #[test]
-    #[ignore]
     fn plan_simple_root_field_query_for_multiple_subgraphs() {
         let supergraph = Supergraph::new(TEST_SUPERGRAPH).unwrap();
         let planner = QueryPlanner::new(&supergraph, Default::default()).unwrap();
@@ -1022,26 +1018,70 @@ type User
         .unwrap();
         let plan = planner.build_query_plan(&document, None).unwrap();
         insta::assert_snapshot!(plan, @r###"
-        QueryPlan {
-          Parallel {
-            Fetch(service: "accounts") {
-              {
+              QueryPlan {
+                Parallel {
+                  Fetch(service: "accounts") {
+                    {
                       userById(id: 1) {
-                  name
-                  email
-                }
-              }
-            }
-            Fetch(service: "products") {
-              {
-                      bestRatedProducts {
-                  id
-                  avg_rating
-                }
+                        name
+                        email
+                      }
+                    }
+                  },
+                  Sequence {
+                    Fetch(service: "reviews") {
+                      {
+                        bestRatedProducts {
+                          __typename
+                          id
+                          ... on Book {
+                            __typename
+                            id
+                            reviews {
+                              rating
+                            }
+                          }
+                          ... on Movie {
+                            __typename
+                            id
+                            reviews {
+                              rating
+                            }
+                          }
+                        }
+                      }
+                    },
+                    Flatten(path: "bestRatedProducts.@") {
+                      Fetch(service: "products") {
+                        {
+                          ... on Book {
+                            __typename
+                            id
+                            reviews {
+                              rating
+                            }
+                          }
+                          ... on Movie {
+                            __typename
+                            id
+                            reviews {
+                              rating
+                            }
+                          }
+                        } =>
+                        {
+                          ... on Book {
+                            avg_rating
+                          }
+                          ... on Movie {
+                            avg_rating
+                          }
+                        }
+                      },
+                    },
+                  },
+                },
               }
-            }
-          }
-        }
         "###);
     }