Skip to content
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

fix(federation): recompose test supergraph #6243

Merged
merged 2 commits into from
Nov 8, 2024
Merged

fix(federation): recompose test supergraph #6243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
391a8d8
fix(federation): recompose test supergraph
goto-bus-stop Nov 7, 2024
d2f8036
Tighten up test assertion
goto-bus-stop Nov 8, 2024
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
15 changes: 12 additions & 3 deletions ...rgraphs/rebase_non_intersecting_without_dropping_inline_fragment_due_to_directive.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Composed from subgraphs with hash: 8312d6d045a731f70fd2c9ced19d38ac8ae32ff5
# Composed from subgraphs with hash: 9f65288304601b6cf28091f55f98c58ca3c82972
schema
@link(url: "https://specs.apollo.dev/link/v1.0")
@link(url: "https://specs.apollo.dev/join/v0.4", for: EXECUTION)
@link(url: "https://specs.apollo.dev/join/v0.5", for: EXECUTION)
{
query: Query
}
Expand All @@ -10,7 +10,7 @@ directive @join__directive(graphs: [join__Graph!], name: String!, args: join__Di

directive @join__enumValue(graph: join__Graph!) repeatable on ENUM_VALUE

directive @join__field(graph: join__Graph, requires: join__FieldSet, provides: join__FieldSet, type: String, external: Boolean, override: String, usedOverridden: Boolean, overrideLabel: String) repeatable on FIELD_DEFINITION | INPUT_FIELD_DEFINITION
directive @join__field(graph: join__Graph, requires: join__FieldSet, provides: join__FieldSet, type: String, external: Boolean, override: String, usedOverridden: Boolean, overrideLabel: String, contextArguments: [join__ContextArgument!]) repeatable on FIELD_DEFINITION | INPUT_FIELD_DEFINITION

directive @join__graph(name: String!, url: String!) on ENUM_VALUE

Expand All @@ -28,10 +28,19 @@ interface I
i: Int
}

input join__ContextArgument {
name: String!
type: String!
context: String!
selection: join__FieldValue!
}

scalar join__DirectiveArguments

scalar join__FieldSet

scalar join__FieldValue

enum join__Graph {
SUBGRAPH1 @join__graph(name: "Subgraph1", url: "none")
}
Expand Down
4 changes: 2 additions & 2 deletions apollo-router/src/plugins/telemetry/formatters/json.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ mod test {
.or_else(|| ctx.lookup_current())
.expect("current span expected");
let extracted = extract_dd_trace_id(&current_span);
assert_eq!(extracted, Some("1234".to_string()));
assert_eq!(extracted, Some("1234".to_string()), "should have trace id");
}
}

Expand Down Expand Up @@ -535,7 +535,7 @@ mod test {
}

#[test]
#[should_panic]
#[should_panic(expected = "should have trace id")]
fn test_missing_dd_attribute() {
subscriber::with_default(
Registry::default()
Expand Down
Loading