-
Notifications
You must be signed in to change notification settings - Fork 309
Simplify condition handling in coprocessor #7320
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.
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
Conversation
✅ Docs preview has no changesThe preview was not built because there were no changes. Build ID: a961b5dbca49645495c4c6dd |
@IvanGoncharov, please consider creating a changeset entry in |
CI performance tests
|
@@ -19,7 +18,7 @@ use crate::plugins::coprocessor::EXTERNAL_SPAN_NAME; | |||
use crate::services::execution; | |||
|
|||
/// What information is passed to a router request/response stage | |||
#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize, JsonSchema)] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I notice condition
field is skip during serialization in multiple places, e.g.:
router/apollo-router/src/plugins/coprocessor/mod.rs
Lines 316 to 317 in f4ff822
#[serde(skip_serializing)] | |
pub(super) condition: Option<Condition<SubgraphSelector>>, |
That made me wonder where we use serialization of this type and why it's valid to skip conditions. I learned that we don't use serialization for those structs so I removed them.
@@ -5452,8 +5452,7 @@ snapshot_kind: text | |||
}, | |||
"condition": { | |||
"$ref": "#/definitions/Condition_for_RouterSelector", | |||
"description": "#/definitions/Condition_for_RouterSelector", | |||
"nullable": true |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since I removed the Option around the Selector, it now disallows explicit null values.
I'm not sure if it's something we should worry about?
If needed I can either write a config migration to add null
or add support of explicit null
to serde parsing.
* Remove duplicate reqwest (apollographql#7329) * Port first batch of supgraph validation tests (apollographql#7321) - Adds a portion of the subgraph validation tests being ported over from the federation repo. - Exposes error fields on SubgraphError and FederationError for use in the tests. - Creates a public getter method for SubgraphError's error field - Creates a public getter method returning an array of errors associated with a given FederationError - Ports over the build_for_errors() test utility. * chore(deps): update xtask/Cargo.lock h2 dependency (apollographql#7336) * [docs] Add new page for query planning best practices (apollographql#7263) Co-authored-by: Lucas Leadbetter <5595530+lleadbet@users.noreply.github.com> Co-authored-by: Edward Huang <edhuang@gmail.com> * fix: terminate unused Redis connections on schema update (apollographql#7319) Co-authored-by: Renée <renee.kooi@apollographql.com> * test(federation/composition): ported the rest of "@core/@link handling" tests (apollographql#7335) * Add code for add_shareable and has_applied_directive (apollographql#7327) * Basic changes to connect/ * docs: otlp metrics exporters (apollographql#7334) * Removes redundant clones * add const fn warning * Remove const_fn warning * Apply comments * Remove todo comment * Update apollo-federation/src/sources/connect/json_selection/parser.rs Co-authored-by: Dylan Anthony <dylan@apollographql.com> * Update apollo-federation/src/sources/connect/json_selection/parser.rs Co-authored-by: Dylan Anthony <dylan@apollographql.com> * Reformats code after suggestions * fix(deps): update rust crate thiserror to v2 (apollographql#7288) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Renée Kooi <renee.kooi@apollographql.com> * deps: update apollo-compiler (apollographql#7338) * Add _dd.measured to spans when agent sampling is enabled (apollographql#7344) Co-authored-by: bryn <bryn@apollographql.com> * Fix metric `apollo.router.operations.batching.size` (apollographql#7306) Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com> Co-authored-by: Jesse Rosenberger <git@jro.cc> * Clarify coprocessor config `context: true` behaviour (apollographql#7349) * Avoid unnecessary cloning in the deduplication plugin (apollographql#7347) * expanded supergraph now uses join spec v0.5 so that we don't skip the… (apollographql#7351) * make use of new build image when building the router (apollographql#7355) * Move content negotiation to a plugin (apollographql#7316) Co-authored-by: Iryna Shestak <shestak.irina@gmail.com> * Port batch of `subgraph_validation_tests` from federation repo (apollographql#7345) * DOC-391 clarify tracing exporters configs of OTLP * edit overview * Add subgraph validation for interface objects (apollographql#7317) Port `validateKeyOnInterfacesAreAlsoOnAllImplementations()` and `validateInterfaceObjectsAreOnEntities()` from the JS composition code, i.e. the per-subgraph validations for interface objects. Note that as part of this, `printHumanReadableList()` and `joinStrings()`, were also ported. * rewrite upgrade_subgraphs_if_necessary() to minimize cloning and fix tests. (apollographql#7346) * Update schema upgrader to use apollo-compiler 1.28 (apollographql#7356) * test(federation/composition): Port subgraph validation tests (part 2) (apollographql#7343) Co-authored-by: Taylor Ninesling <taylor.ninesling@apollographql.com> * Fix clippy when run with `--all-features` (apollographql#7352) * Move aggressive lints to connectors module * temporarily ignore failing tests in dev (apollographql#7375) * fix-less-performant-code * docs: fix typo in distributed caching (apollographql#7358) * docs: typo on PQ docs (apollographql#7373) * Fix router enforcement of connect spec version. (apollographql#7377) * Add a test in connectors batching for handling gaps (apollographql#7328) * Remove fed1 links and reexpand after fixing federation arguments (apollographql#7374) * DOC-448 clarify apollo_router_session_count_active removal * feat(federation/composition): ported `@external` directive validation (apollographql#7381) * Remove 0.2 version checks in composition for headers & connect-on-type (apollographql#7387) * feat(federation/composition): implemented `UNSUPPORTED_ON_INTERFACE` errors (apollographql#7382) * implement ->joinNotNull method (apollographql#7165) Co-authored-by: Ben Newman <ben@apollographql.com> * chore: remove dead code (apollographql#7391) * Auto-upgrade connect 0.1 subgraphs to 0.2 in composition (apollographql#7388) * telemetry: remove excessive bool from DisplayRouterResponse(refactoring) (apollographql#7331) * Simplify condition handling in coprocessor (apollographql#7320) * Implement demand control directive validations (apollographql#7376) * Remove aws-lc from dependencies (apollographql#7389) * Account for spec aliases/imports when auto-injecting `link` spec directives/types (apollographql#7365) When the `@link` directive definition is missing, we have some logic that automatically adds the `link` spec's type/directive definitions to the schema. We weren't accounting for the link spec's aliases/imports when doing this, while the JS codebase was, so we've ported that logic here. Note that this logic has several bugs, but we're going to port it as-is for now and address the bugs later. * chore(federation/composition): deleted a duplicate test module `link_handling_tests` (apollographql#7392) * fix: decrease log level for JWT authentication failure (apollographql#7396) * fix: make sure all input types end up in the expanded supergraph (apollographql#7383) * remove apollographql#7383 changeset (apollographql#7401) * Revert "Add _dd.measured to spans when agent sampling is enabled" (apollographql#7403) * fix: spans should only include path in `http.route` (apollographql#7390) * fix: propagate client name and version modifications through telemetry (apollographql#7369) * Manage all CI versions through mise and use binstall (backport apollographql#7393) (apollographql#7410) * prep release: v2.2.1-rc.0 * macos specific mise: we need x86_64-apple-darwin + aarch64-apple-darwin these both need to be installed on our releasing image * Remove no-longer-necessary installation of `gh` via Orb ✨ This is now accomplished with `gh` * prep release: v2.2.1-rc.1 * Include inadvertently removed fetch_dependencies This was inadverently removed in apollographql#7410 but should continue to exist. * prep release: v2.2.1 --------- Signed-off-by: Benjamin <5719034+bnjjj@users.noreply.github.com> Co-authored-by: Dylan Anthony <dylan@apollographql.com> Co-authored-by: Chidimma O <conwuegb@users.noreply.github.com> Co-authored-by: Jesse Rosenberger <git@jro.cc> Co-authored-by: Shane Myrick <mail@shanemyrick.com> Co-authored-by: Lucas Leadbetter <5595530+lleadbet@users.noreply.github.com> Co-authored-by: Edward Huang <edhuang@gmail.com> Co-authored-by: Caroline Rodewig <16093297+carodewig@users.noreply.github.com> Co-authored-by: Renée <renee.kooi@apollographql.com> Co-authored-by: Duckki Oe <duckki.oe@apollographql.com> Co-authored-by: Chris Lenfest <clenfest@apollographql.com> Co-authored-by: Julia Naomi <jnboeira@outlook.com> Co-authored-by: Edward Huang <edward.huang@apollographql.com> Co-authored-by: Julia Naomi <naomijub@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Bryn Cooke <BrynCooke@gmail.com> Co-authored-by: bryn <bryn@apollographql.com> Co-authored-by: Coenen Benjamin <benjamin.coenen@hotmail.com> Co-authored-by: Gary Pennington <gary@apollographql.com> Co-authored-by: Lenny Burdette <lenny@apollographql.com> Co-authored-by: Iryna Shestak <shestak.irina@gmail.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Sachin D. Shinde <sachin@apollographql.com> Co-authored-by: Taylor Ninesling <taylor.ninesling@apollographql.com> Co-authored-by: Sam Friedman <sam.friedman@apollographql.com> Co-authored-by: Dale Seo <5466341+DaleSeo@users.noreply.github.com> Co-authored-by: Ben Newman <ben@apollographql.com> Co-authored-by: Dariusz Kuc <9501705+dariuszkuc@users.noreply.github.com> Co-authored-by: Ivan Goncharov <ivan.goncharov.ua@gmail.com>
Pure refactoring, during work on #7280 I notice low hanging fruits in coprocessor code.
Checklist
Complete the checklist (and note appropriate exceptions) before the PR is marked ready-for-review.
Exceptions
Note any exceptions here
Notes
Footnotes
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. ↩
Tick whichever testing boxes are applicable. If you are adding Manual Tests, please document the manual testing (extensively) in the Exceptions. ↩