Reconcile dev after merge to main for v1.48.1

[abernix]

Supersedes my attempt in #5394, follows #5349 and https://github.com/apollographql/router/releases/tag/v1.48.1

[github-actions]

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

[router-perf]

CI performance tests

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

[goto-bus-stop]

Hmm, why are the commit hashes on this different than the equivalent commits already in dev? That will add duplicates in the commit history 🤔

I guess it's not an actual problem, but it's a bit fishy. Do we have a rebasing step in the release process or something?

[goto-bus-stop]

Rubber ducked it. I guess it makes sense because only some commits are added in this release, which means they necessarily have a different parent than the original.

[abernix]

@goto-bus-stop Fair shout and good observation — we did actually cherry pick more things on this release than usual (we usually have more clean forks from the main trunk) as dev itself had other more substantial changes that are targeted for 1.49.0 than we wanted for a patch release. Thanks for paying attention.