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.58.1 #6412

Merged
merged 15 commits into from
Dec 6, 2024
Merged

Reconcile dev after merge to main for v1.58.1 #6412

merged 15 commits into from
Dec 6, 2024

Conversation

IvanGoncharov
Copy link
Member

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

abernix and others added 14 commits November 29, 2024 18:18
@abernix
Start v1.58.1 PR
2fabbf9
@duckki @abernix
fix(dual-query-planner): sort directives before comparison in semanti…
b586a80 
…c diff (#6343)
@abernix
fix(telemetry): fix supergraph query selector (#6324)
1a328b5 
Signed-off-by: Benjamin <[email protected]>

Ref: [ROUTER-885]
@abernix
Manually fix changeset for #5545 which didn't have the feat_ prefix.
ee980fe 
This puts the already released CHANGESET into the right place in the
existing changelog.  This was attempted to get fixed in the preparation for
v1.58.0, but that release was complicated for other reasons and this was
overlooked.
@goto-bus-stop
fix: propagate evaluated plans limit and paths limit to the native qu…
e05c27c 
…ery planner (#6316)
@sachindshinde @lrlna
Miscellaneous @context/@fromcontext bugfixes (#6380)
043e62c 
This fixes a few bugs spotted around the native query planner implementation of `@context`/`@fromContext` bringing the implementation to a more consistent parity with the JavaScript implementation.

Co-authored-by: Iryna Shestak <[email protected]>
@IvanGoncharov
prep release: v1.58.1-rc.0
d4d61d4
@Meschreiber
[docs] update configuration redirect (#6389)
9193b6d
@abernix
Apply suggestions from code review
7e16c78
@lrlna @IvanGoncharov
update hashbrown dep for compliance (#6395)
4c21cef 
We are getting errors with an outdated version of hashbrown that needs to updated due to a bug in borsch serialisation 🍲 . This updates us to a version of hashbrown that fixes this vulnerability.

```
error[vulnerability]: Borsh serialization of HashMap is non-canonical
    ┌─ /Users/ira/Code/apollographql/router/Cargo.lock:261:1
    │
261 │ hashbrown 0.15.0 registry+https://github.com/rust-lang/crates.io-index
    │ ---------------------------------------------------------------------- security vulnerability detected
    │
    = ID: RUSTSEC-2024-0402
    = Advisory: https://rustsec.org/advisories/RUSTSEC-2024-0402
    = The borsh serialization of the HashMap did not follow the borsh specification.
      It potentially produced non-canonical encodings dependent on insertion order.
      It also did not perform canonicty checks on decoding.
```
@IvanGoncharov
prep release: v1.58.1-rc.1
a41eb8d
@IvanGoncharov
prep release: v1.58.1
fb7b755
@IvanGoncharov
release: v1.58.1
12784d4
@abernix
Merge branch 'dev' into abernix/reconcile-dev-after-1.58.1
18eae6e
@svc-apollo-docs
Copy link
Collaborator

svc-apollo-docs commented Dec 6, 2024 •
edited
Loading

✅ Docs Preview Ready

No new or changed pages found.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 6, 2024

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

@router-perf
Copy link

router-perf bot commented Dec 6, 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

@SimonSapin
Update schemaAwareHash in snapshot tests after merging main into dev
78b9b16 
* `main` has commit 043e62c "Miscellaneous @context/@fromcontext bugfixes (#6380)"
* `dev` has commit 92e6847 "tests: Fix snapshots after #6205 was merged (#6367)"
@SimonSapin
Copy link
Contributor

I pushed another commit that updates snapshot tests. It looks like the result of the interaction of merging these related commits:

@IvanGoncharov
Copy link
Member Author

Yes, #6380 changes the directive definitions that weren't part of query hashing before #6205 was merged.
So #6380 didn't trigger hash changes because it used old hashing algorithm but after it was merged with #6205 it resulted in hash changes fixed in 78b9b16

@IvanGoncharov IvanGoncharov merged commit 215ca5f into dev Dec 6, 2024
12 of 13 checks passed
@IvanGoncharov IvanGoncharov deleted the abernix/reconcile-dev-after-1.58.1 branch December 6, 2024 10:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SimonSapin SimonSapin SimonSapin approved these changes

@dariuszkuc dariuszkuc Awaiting requested review from dariuszkuc dariuszkuc is a code owner

@sachindshinde sachindshinde Awaiting requested review from sachindshinde sachindshinde is a code owner

@goto-bus-stop goto-bus-stop Awaiting requested review from goto-bus-stop goto-bus-stop is a code owner

@lrlna lrlna Awaiting requested review from lrlna lrlna is a code owner

@TylerBloom TylerBloom Awaiting requested review from TylerBloom TylerBloom is a code owner

@duckki duckki Awaiting requested review from duckki duckki is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@IvanGoncharov @svc-apollo-docs @SimonSapin @abernix @duckki @goto-bus-stop @sachindshinde @Meschreiber @lrlna