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.

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

Merge dev into next #6204

Merged
merged 58 commits into from
Oct 31, 2024
Merged

Merge dev into next #6204

merged 58 commits into from
Oct 31, 2024

Conversation

dylan-apollo
Copy link
Member

@dylan-apollo dylan-apollo commented Oct 28, 2024

Should fix test-updated which is currently failing on next. Merge conflicts:

  1. Had to remove docs related to experimental_introspection_mode (no longer an option on dev)
  2. Resolve mis-match crate version
  3. Some dependency/import ordering

Closes #6149

Geal and others added 30 commits October 2, 2024 14:42
The following is now done in `QueryAnalysisLayer` instead of in the `BridgeQueryPlanner` service:

* Finding the relevant operation in a GraphQL document based on `operationName`. Now `ParsedDocument` in context contains a reference to the parsed `apollo_compiler::executable::Operation`.
* Scan that operation’s root fields to find which are present: root `__typename`, schema intropsection, and "normal" non-meta fields. This is a preliminary step to moving introspection out of `BridgeQueryPlanner`.

As a side-effect observable to clients, the exact response for some error cases like an empty document changes slightly as the error no longer comes from JavaScript code.

Also drive-by refactor: change `spec::Query` to contain a single `Operation` instead of a `Vec<Operation>`. This removes conditionals and the need to pass `operationName` around in a lot of places, notably in execution code.
Add an Environment variable to the container that's deployed
so that we can easily scan if customers are deploying using
the official Helm Chart or some other way.
…e __typename selections (#6141)

- updated sibling typename optimization to only fold a plain __typename without alias/directives.
- also, fixed __typename ordering in fetch operations to put the plain __typename ahead of others.
Schema introspection now runs natively without involving JavaScript code. We have high confidence that the two implementations return matching responses based on differential testing fuzzing arbitrary queries against a large schema, and testing a corpus of customer schemas against a comprehensive query.

In Router YAML configuration:

* The `experimental_introspection_mode` key is removed, `new` is now the only behavior
* The `supergraph.query_planning.legacy_introspection_caching` key is removed, the behavior is now similar to what was `false`: introspection responses are not part of the query plan cache but instead in a separate, small, in-memory only cache.

Migrations ensure that existing configuration files will keep working.
Co-authored-by: Simon Sapin <[email protected]>
Co-authored-by: Jesse Rosenberger <[email protected]>
Updates to latest router-bridge and federation version. This federation version:
- Fixes a query planning bug where operation variables for a subgraph query wouldn't match what's used in that query.
- Fixes a query planning bug where directives applied to `__typename` may be omitted in the subgraph query.
- Fixes a query planning inefficiency where some redundant subgraph queries were not removed.
- Fixes a query planning inefficiency where some redundant inline fragments in `@key`/`@requires` selection sets were not optimized away.
- Fixes a query planning inefficiency where unnecessary subgraph jumps were being added when using `@context`/`@fromContext`.
abernix and others added 5 commits October 22, 2024 23:30
# Conflicts:
#	CHANGELOG.md
#	Cargo.lock
#	apollo-federation/Cargo.toml
#	apollo-router-benchmarks/Cargo.toml
#	apollo-router-scaffold/Cargo.toml
#	apollo-router-scaffold/templates/base/Cargo.template.toml
#	apollo-router-scaffold/templates/base/xtask/Cargo.template.toml
#	apollo-router/Cargo.toml
#	apollo-router/src/services/mod.rs
#	dockerfiles/tracing/docker-compose.datadog.yml
#	dockerfiles/tracing/docker-compose.jaeger.yml
#	dockerfiles/tracing/docker-compose.zipkin.yml
#	helm/chart/router/Chart.yaml
#	helm/chart/router/README.md
#	licenses.html
#	scripts/install.sh
@svc-apollo-docs
Copy link
Collaborator

svc-apollo-docs commented Oct 28, 2024

✅ Docs Preview Ready

No new or changed pages found.

@router-perf
Copy link

router-perf bot commented Oct 28, 2024

CI performance tests

  • connectors-const - Connectors stress test that runs with a constant number of users
  • const - Basic stress test that runs with a constant number of users
  • demand-control-instrumented - A copy of the step test, but with demand control monitoring and metrics enabled
  • demand-control-uninstrumented - A copy of the step test, but with demand control monitoring enabled
  • enhanced-signature - Enhanced signature enabled
  • events - Stress test for events with a lot of users and deduplication ENABLED
  • events_big_cap_high_rate - Stress test for events with a lot of users, deduplication enabled and high rate event with a big queue capacity
  • events_big_cap_high_rate_callback - Stress test for events with a lot of users, deduplication enabled and high rate event with a big queue capacity using callback mode
  • events_callback - Stress test for events with a lot of users and deduplication ENABLED in callback mode
  • events_without_dedup - Stress test for events with a lot of users and deduplication DISABLED
  • events_without_dedup_callback - Stress test for events with a lot of users and deduplication DISABLED using callback mode
  • extended-reference-mode - Extended reference mode enabled
  • large-request - Stress test with a 1 MB request payload
  • no-tracing - Basic stress test, no tracing
  • reload - Reload test over a long period of time at a constant rate of users
  • step-jemalloc-tuning - Clone of the basic stress test for jemalloc tuning
  • step-local-metrics - Field stats that are generated from the router rather than FTV1
  • step-with-prometheus - A copy of the step test with the Prometheus metrics exporter enabled
  • step - Basic stress test that steps up the number of users over time
  • xlarge-request - Stress test with 10 MB request payload
  • xxlarge-request - Stress test with 100 MB request payload

@dylan-apollo dylan-apollo merged commit 8f76f46 into next Oct 31, 2024
12 of 13 checks passed
@dylan-apollo dylan-apollo deleted the dylan/merge-dev branch October 31, 2024 20:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.