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

Reconcile dev after merge to main for v1.51.0 #5677

Merged
merged 20 commits into from
Jul 16, 2024
Merged

Reconcile dev after merge to main for v1.51.0 #5677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
7de456d
docs: fix typo (#5523)
Meschreiber Jul 3, 2024
9b821b8
prep release: v1.51.0-rc.0
abernix Jul 10, 2024
6814d2b
Revert "prep release: v1.51.0-rc.0"
abernix Jul 10, 2024
1a8c174
Merge branch 'dev' into 1.51.0
abernix Jul 10, 2024
4e65e28
prep release: v1.51.0-rc.0
abernix Jul 10, 2024
813aa76
docs: Changelog editorial
abernix Jul 11, 2024
4420a4e
Update .changesets/fix_datadog_trace_resource_mapping.md
abernix Jul 11, 2024
3be23cf
Update selectors.mdx
bnjjj Jul 12, 2024
70b4ea2
Update feat_bnjjj_feat_284.md
bnjjj Jul 12, 2024
47a9a8e
Update fix_bnjjj_fix_event_instr_response_context_sel.md
bnjjj Jul 12, 2024
217cfea
Update fix_bnjjj_fix_rhai_traceid.md
bnjjj Jul 12, 2024
e71d131
Apply suggestions from code review
abernix Jul 15, 2024
8f58805
chore(docs): Point to local PQ manifests when using Offline Licenses …
abernix Jul 15, 2024
fa9e6e2
Apply suggestions from code review
abernix Jul 16, 2024
972a519
Apply suggestions from code review
abernix Jul 16, 2024
2fc4acc
Merge branch 'main' into 1.51.0
abernix Jul 16, 2024
3bf1347
prep release: v1.51.0
abernix Jul 16, 2024
4cb0a2b
chore(tests): Apply nextest retries rules to known-flaky tests. (#5577)
abernix Jul 15, 2024
c39637c
prep release: v1.51.0 (#5669)
abernix Jul 16, 2024
9e440e5
release: v1.51.0
abernix Jul 16, 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
49 changes: 0 additions & 49 deletions .changesets/breaking_bnjjj_fix_5282.md
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions .changesets/docs_feature_ignoreotherprefixesdocupdate.md
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions .changesets/feat_bnjjj_feat_284.md
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions .changesets/feat_bnjjj_feat_condition_copro.md
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions .changesets/feat_geal_configure_introspection_caching.md
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions .changesets/fix_bnjjj_fix_event_instr_response_context_sel.md
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions .changesets/fix_bnjjj_fix_rhai_traceid.md
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions .changesets/fix_error_locations.md
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions .changesets/fix_garypen_router_411_batching_entity_caching.md
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions .changesets/fix_timeout_and_rate_limit_error.md
View file
Open in desktop

This file was deleted.

89 changes: 89 additions & 0 deletions .config/nextest.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,92 @@
[[profile.default.overrides]]
# These are known flaky tests according to the test flakiness report provided
# in CircleCI insights, based on the `dev` branch:
#
# https://app.circleci.com/insights/github/apollographql/router/workflows/ci_checks/tests
#
# We will retry these tests up to 2 additional times. Retry counts are recorded.
# Items on this list should be prioritized to get improved and removed from this
# list at the time they are fixed.
#
# Frankly, it may be best to just retry all tests in the apollo-router::integration_tests
# module, as they have a high failure rate, in general.
retries = 2
filter = '''
( binary_id(=apollo-router) & test(=axum_factory::axum_http_server_factory::tests::request_cancel_log) )
or ( binary_id(=apollo-router) & test(=axum_factory::axum_http_server_factory::tests::request_cancel_no_log) )
or ( binary_id(=apollo-router) & test(=notification::tests::it_test_ttl) )
or ( binary_id(=apollo-router) & test(=plugins::telemetry::metrics::apollo::test::apollo_metrics_enabled) )
or ( binary_id(=apollo-router) & test(=plugins::telemetry::tests::it_test_prometheus_metrics) )
or ( binary_id(=apollo-router) & test(=services::subgraph_service::tests::test_subgraph_service_websocket_with_error) )
or ( binary_id(=apollo-router) & test(=uplink::license_stream::test::license_expander_claim_pause_claim) )
or ( binary_id(=apollo-router) & test(=uplink::persisted_queries_manifest_stream::test::integration_test) )
or ( binary_id(=apollo-router-benchmarks) & test(=tests::test) )
or ( binary_id(=apollo-router::apollo_otel_traces) & test(=test_batch_send_header) )
or ( binary_id(=apollo-router::apollo_otel_traces) & test(=test_batch_trace_id) )
or ( binary_id(=apollo-router::apollo_otel_traces) & test(=test_condition_if) )
or ( binary_id(=apollo-router::apollo_otel_traces) & test(=test_trace_id) )
or ( binary_id(=apollo-router::apollo_reports) & test(=non_defer) )
or ( binary_id(=apollo-router::apollo_reports) & test(=test_batch_stats) )
or ( binary_id(=apollo-router::apollo_reports) & test(=test_client_name) )
or ( binary_id(=apollo-router::apollo_reports) & test(=test_client_version) )
or ( binary_id(=apollo-router::apollo_reports) & test(=test_condition_if) )
or ( binary_id(=apollo-router::apollo_reports) & test(=test_send_header) )
or ( binary_id(=apollo-router::apollo_reports) & test(=test_trace_id) )
or ( binary_id(=apollo-router::integration_tests) & test(=api_schema_hides_field) )
or ( binary_id(=apollo-router::integration_tests) & test(=automated_persisted_queries) )
or ( binary_id(=apollo-router::integration_tests) & test(=defer_default_variable) )
or ( binary_id(=apollo-router::integration_tests) & test(=defer_path) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::batching::it_batches_with_errors_in_multi_graph) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::batching::it_batches_with_errors_in_single_graph) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::batching::it_handles_cancelled_by_coprocessor) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::batching::it_handles_cancelled_by_rhai) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::batching::it_handles_indefinite_timeouts) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::batching::it_handles_short_timeouts) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::batching::it_handles_single_invalid_graphql) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::batching::it_handles_single_request_cancelled_by_coprocessor) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::batching::it_handles_single_request_cancelled_by_rhai) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::batching::it_supports_multi_subgraph_batching) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::batching::it_supports_single_subgraph_batching) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::coprocessor::test_error_not_propagated_to_client) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::file_upload::it_fails_incompatible_query_order) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::file_upload::it_fails_invalid_file_order) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::file_upload::it_fails_invalid_multipart_order) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::file_upload::it_fails_upload_without_file) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::file_upload::it_fails_with_file_count_limits) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::file_upload::it_fails_with_file_size_limit) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::file_upload::it_fails_with_no_boundary_in_multipart) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::file_upload::it_uploads_to_multiple_subgraphs) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::lifecycle::test_graceful_shutdown) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::lifecycle::test_happy) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::lifecycle::test_reload_config_valid) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::lifecycle::test_reload_config_with_broken_plugin) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::lifecycle::test_reload_config_with_broken_plugin_recovery) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::redis::apq) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::redis::connection_failure_blocks_startup) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::redis::entity_cache) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::redis::query_planner_redis_update_defer) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::redis::query_planner_redis_update_query_fragments) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::redis::query_planner_redis_update_reuse_query_fragments) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::redis::test::connection_failure_blocks_startup) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::telemetry::jaeger::test_decimal_trace_id) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::telemetry::logging::test_json) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::telemetry::logging::test_json_sampler_off) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::telemetry::logging::test_text_sampler_off) )
or ( binary_id(=apollo-router::integration_tests) & test(=integration::telemetry::metrics::test_subgraph_auth_metrics) )
or ( binary_id(=apollo-router::samples) & test(=/enterprise/entity-cache/invalidation) )
or ( binary_id(=apollo-router::samples) & test(=/enterprise/entity-cache/invalidation-subgraph) )
or ( binary_id(=apollo-router::samples) & test(=/enterprise/entity-cache/invalidation-subgraph-type) )
or ( binary_id(=apollo-router::samples) & test(=/enterprise/query-planning-redis) )
or ( binary_id(=apollo-router::set_context) & test(=test_set_context) )
or ( binary_id(=apollo-router::set_context) & test(=test_set_context_dependent_fetch_failure) )
or ( binary_id(=apollo-router::set_context) & test(=test_set_context_list) )
or ( binary_id(=apollo-router::set_context) & test(=test_set_context_list_of_lists) )
or ( binary_id(=apollo-router::set_context) & test(=test_set_context_no_typenames) )
or ( binary_id(=apollo-router::set_context) & test(=test_set_context_type_mismatch) )
or ( binary_id(=apollo-router::set_context) & test(=test_set_context_union) )
or ( binary_id(=apollo-router::set_context) & test(=test_set_context_unrelated_fetch_failure) )
'''

[profile.ci]
# Print out output for failing tests as soon as they fail, and also at the end
# of the run (for easy scrollability).
Expand Down
Loading
Loading