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

Jump to bottom

Reconcile dev after merge to main for v1.45.1 #5037

Merged
merged 10 commits into from Apr 29, 2024
Merged

Reconcile dev after merge to main for v1.45.1 #5037

merged 10 commits into from Apr 29, 2024

Conversation

Geal
Copy link
Contributor

@Geal Geal commented Apr 29, 2024

Follow-up to the v1.45.1 being officially released, bringing version bumps and changelog updates into the dev branch.

Separating this from #5036 to solve the conflicts between main and dev without making an additional commit to main

Checklist

Complete the checklist (and note appropriate exceptions) before the PR is marked ready-for-review.

  • Changes are compatible1
  • Documentation2 completed
  • Performance impact assessed and acceptable
  • Tests added and passing3
    • Unit Tests
    • Integration Tests
    • Manual Tests

Exceptions

Note any exceptions here

Notes

Footnotes

  1. 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. ↩

  2. Configuration is an important part of many changes. Where applicable please try to document configuration examples. ↩

  3. Tick whichever testing boxes are applicable. If you are adding Manual Tests, please document the manual testing (extensively) in the Exceptions. ↩

abernix and others added 7 commits April 23, 2024 06:53
@abernix
docs(subscription-support): Try to fix formatting of L3 header. (#5004)
8e9443f
@sorliem @Geal
[docs] Fix list indentation in standard-instruments.mdx (#4991)
594437d 
Add indentation to indicate labels are associated with the above metric.

Thanks!

Co-authored-by: Geoffroy Couprie <apollo@geoffroycouprie.com>
@Roshan-R @Geal
docs(customizations): fix trait implementation for supergraph_service (…
eb02494 
…#4848)

replace trait implementation for supergraph_service from
router::BoxService to supergraph::BoxService

Co-authored-by: Geoffroy Couprie <apollo@geoffroycouprie.com>
@abernix
release: v1.45.1 (#5009)
ff9f666
@glasser
CHANGELOG: regression fixed in v1.45.1 is Redis-specific (#5035)
d59c393
@glasser
CHANGELOG: fix version reference
fc8bba0
@Geal
Merge branch 'dev' into 1.45.0-reconciliation
2219bf8
@Geal Geal requested a review from a team as a code owner April 29, 2024 08:00
@github-actions GitHub Actions
Copy link
Contributor

@Geal, please consider creating a changeset entry in /.changesets/. These instructions describe the process and tooling.

@Geal Geal requested a review from a team April 29, 2024 08:01
@router-perf
Copy link

router-perf bot commented Apr 29, 2024

CI performance tests

  • step - Basic stress test that steps up the number of users over time
  • 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
  • large-request - Stress test with a 1 MB request payload
  • events - Stress test for events with a lot of users and deduplication ENABLED
  • xxlarge-request - Stress test with 100 MB request payload
  • events_without_dedup - Stress test for events with a lot of users and deduplication DISABLED
  • xlarge-request - Stress test with 10 MB request payload
  • step-jemalloc-tuning - Clone of the basic stress test for jemalloc tuning
  • events_callback - Stress test for events with a lot of users and deduplication ENABLED in callback mode
  • no-graphos - Basic stress test, no GraphOS.
  • reload - Reload test over a long period of time at a constant rate of users
  • 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_without_dedup_callback - Stress test for events with a lot of users and deduplication DISABLED using callback mode
  • const - Basic stress test that runs with a constant number of users

Geal
Geal commented Apr 29, 2024
View reviewed changes
apollo-router/src/query_planner/bridge_query_planner.rs
Comment on lines +846 to +847
this.schema.supergraph_schema(),
&this.schema.raw_sdl,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: here's an additional fix to the query hash I just found: the hashing mechanism has to be done on the supergraph schema, not the API schema. If needed I can split that change in a separate PR, that we would merge immediately after

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just want to clarify that while this is an additional fix necessary for the re-introduction of #5028, it does not constitute a necessary fix right now given that #5028 was exhaustive enough in and of itself.

Geal
Geal commented Apr 29, 2024
View reviewed changes
apollo-router/src/spec/query.rs
Comment on lines +301 to +302
schema.supergraph_schema(),
&schema.raw_sdl,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as the other note, this can be moved to a separate PR

@abernix abernix mentioned this pull request Apr 29, 2024
Closed
abernix
abernix reviewed Apr 29, 2024
View reviewed changes
Copy link
Member

@abernix abernix left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we land this and track the follow-up somewhere else?

@Geal
Copy link
Contributor Author

Geal commented Apr 29, 2024

we can land this. There was one additional fix I had to do to make tests pass: 5f86cd4

@Geal
Copy link
Contributor Author

Geal commented Apr 29, 2024

50eb674 is due to the typed conditions PR being merged in dev while 1.45.1 was worked on, so the schema aware hashes for subgraph queries change for those tests because this PR changes the algorithm with the fixes from 1.45.1

@Geal Geal enabled auto-merge (squash) April 29, 2024 17:16
@Geal Geal disabled auto-merge April 29, 2024 17:16
@Geal Geal enabled auto-merge April 29, 2024 17:17
@Geal Geal merged commit c23816a into dev Apr 29, 2024
13 of 14 checks passed
@Geal Geal deleted the 1.45.0-reconciliation branch April 29, 2024 17:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@abernix abernix abernix left review comments

@bnjjj bnjjj bnjjj approved these changes

@o0Ignition0o o0Ignition0o o0Ignition0o approved these changes

Assignees

@Geal Geal

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@Geal @abernix @bnjjj @o0Ignition0o @sorliem @Roshan-R @glasser