Merge remote-tracking branch 'origin/dev' into feature/connectorsheadersvariable3

Author: andrewmcgivery

.changesets/feat_bryn_compute_job_spans.md

@@ -0,0 +1,17 @@
+### Compute job spans ([PR #7236](https://github.com/apollographql/router/pull/7236))
+
+The router uses a separate thread pool called "compute jobs" to ensure that requests do not block tokio io worker threads.
+This PR adds spans to jobs that are on this pool to allow users to see when latency is introduced due to 
+resource contention within the compute job pool.
+
+* `compute_job`:
+  - `job.type`: (`QueryParsing`|`QueryParsing`|`Introspection`)
+* `compute_job.execution`
+  - `job.age`: `P1`-`P8`
+  - `job.type`: (`QueryParsing`|`QueryParsing`|`Introspection`)
+
+Jobs are executed highest priority (`P8`) first. Jobs that are low priority (`P1`) age over time, eventually executing 
+at highest priority. The age of a job is can be used to diagnose if a job was waiting in the queue due to other higher 
+priority jobs also in the queue.
+
+By [@bryncooke](https://github.com/bryncooke) in https://github.com/apollographql/router/pull/7236

.changesets/feat_persisted_query_reporting.md

@@ -0,0 +1,5 @@
+### Enables reporting of persisted query usage by PQ ID to Apollo ([PR #7166](https://github.com/apollographql/router/pull/7166))
+
+This change allows the router to report usage metrics by persisted query ID to Apollo, so that we can show usage stats for PQs.
+
+By [@bonnici](https://github.com/bonnici) in https://github.com/apollographql/router/pull/7166

.changesets/fix_fix_docker_image_fix_for_cloudrun.md

@@ -0,0 +1,11 @@
+### Update Dockerfile exec script to use `#!/bin/bash` instead of `#!/usr/bin/env bash` ([Issue #3517](https://github.com/apollographql/router/issues/3517))
+
+For users of Google Cloud Platform (GCP) Cloud Run platform, using the router's default Docker image was not possible due to an error that would occur during startup: 
+
+```sh
+"/usr/bin/env: 'bash ': No such file or directory"
+```
+
+To avoid this issue, we've changed the script to use `#!/bin/bash` instead of `#!/usr/bin/env bash`, as we use a fixed Linux distribution in Docker which has the Bash binary located there. 
+
+By [@lleadbet](https://github.com/lleadbet) in https://github.com/apollographql/router/pull/7198

CHANGELOG.md

@@ -2,6 +2,28 @@
 
 This project adheres to [Semantic Versioning v2.0.0](https://semver.org/spec/v2.0.0.html).
 
+# [2.1.2] - 2025-04-14
+
+## 🐛 Fixes
+
+### Support `@context`/`@fromContext` when using Connectors ([PR #7132](https://github.com/apollographql/router/pull/7132))
+
+This fixes a bug that dropped the `@context` and `@fromContext` directives when introducing a connector.
+
+By [@lennyburdette](https://github.com/lennyburdette) in https://github.com/apollographql/router/pull/7132
+
+## 📃 Configuration
+
+### Add new configurable delivery pathway for high cardinality Apollo Studio metrics ([PR #7138](https://github.com/apollographql/router/pull/7138))
+
+This change provides a secondary pathway for new "realtime" Studio metrics whose delivery interval is configurable due to their higher cardinality. These metrics will respect `telemetry.apollo.batch_processor.scheduled_delay` as configured on the realtime path.
+
+All other Apollo metrics will maintain the previous hardcoded 60s send interval.
+
+By [@rregitsky](https://github.com/rregitsky) and [@timbotnik](https://github.com/timbotnik) in https://github.com/apollographql/router/pull/7138
+
+
+
 # [2.1.1] - 2025-04-07
 
 ## 🔒 Security