CVE-2024-32971: Insufficient Information (NVD-CWE-noinfo)
value: Apollo Router is a configurable, graph router written in Rust to run a federated supergraph that uses Apollo Federation 2. The affected versions of Apollo Router contain a bug that in limited circumstances, could lead to unexpected operations being executed which can result in unintended data or effects. This only affects Router instances configured to use distributed query plan caching. The root cause of this defect is a bug in Apollo Router’s cache retrieval logic: When this defect is present and distributed query planning caching is enabled, asking the Router to execute an operation (whether it is a query, a mutation, or a subscription) may result in an unexpected variation of that operation being executed or the generation of unexpected errors. The issue stems from inadvertently executing a modified version of a previously executed operation, whose query plan is stored in the underlying cache (specifically, Redis). Depending on the type of the operation, the result may vary. For a query, results may be fetched that don’t match what was requested (e.g., rather than running `fetchUsers(type: ENTERPRISE)` the Router may run `fetchUsers(type: TRIAL)`. For a mutation, this may result in incorrect mutations being sent to underlying subgraph servers (e.g., rather than sending `deleteUser(id: 10)` to a subgraph, the Router may run `deleteUser(id: 12)`. Users who are using distributed query plan caching, are advised to either upgrade to version 1.45.1 or above or downgrade to version 1.43.2 of the Apollo Router. Apollo Router versions 1.44.0 or 1.45.0 are not recommended for use and have been withdrawn. Users unable to upgrade can disable distributed query plan caching to mitigate this issue.
CWE description: There is insufficient information about the issue to classify it; details are unkown or unspecified.
Published: 2024-05-02T07:15Z
Repository: https://github.com/apollographql/router
Language: Rust
Files changed: .circleci/config.yml, CHANGELOG.md, Cargo.lock, apollo-router-benchmarks/Cargo.toml, apollo-router-scaffold/Cargo.toml, apollo-router-scaffold/templates/base/Cargo.toml, apollo-router-scaffold/templates/base/xtask/Cargo.toml, apollo-router/Cargo.toml, apollo-router/src/plugins/progressive_override/snapshots/apollo_router__plugins__progressive_override__tests__non_overridden_field_yields_expected_query_plan.snap, apollo-router/src/plugins/progressive_override/snapshots/apollo_router__plugins__progressive_override__tests__overridden_field_yields_expected_query_plan.snap, apollo-router/src/plugins/snapshots/apollo_router__plugins__expose_query_plan__tests__it_expose_query_plan-2.snap, apollo-router/src/plugins/snapshots/apollo_router__plugins__expose_query_plan__tests__it_expose_query_plan.snap, apollo-router/src/plugins/telemetry/apollo_exporter.rs, apollo-router/src/plugins/telemetry/tracing/datadog.rs, apollo-router/src/query_planner/bridge_query_planner.rs, apollo-router/src/query_planner/caching_query_planner.rs, apollo-router/src/query_planner/fetch.rs, apollo-router/src/query_planner/plan.rs, apollo-router/src/query_planner/snapshots/apollo_router__query_planner__bridge_query_planner__tests__plan_root.snap, apollo-router/src/spec/query.rs, apollo-router/src/spec/query/change.rs, apollo-router/tests/integration/redis.rs, apollo-router/tests/integration/snapshots/integration_tests__integration__redis__test__query_planner.snap, dockerfiles/tracing/docker-compose.datadog.yml, dockerfiles/tracing/docker-compose.jaeger.yml, dockerfiles/tracing/docker-compose.zipkin.yml, helm/chart/router/Chart.yaml, helm/chart/router/README.md, licenses.html, scripts/install.sh
Commit date: 2024-04-26 23:52:11 +0300
Commit message: release: v1.45.1 (#5009)


Diff: diff --git a/.circleci/config.yml b/.circleci/config.yml
index acd03f946..1dc484375 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -46,18 +46,18 @@ executors:
   macos_build: &macos_build_executor
     macos:
       # See https://circleci.com/docs/xcode-policy along with the support matrix
       # at https://circleci.com/docs/using-macos#supported-xcode-versions.
       # We use the major.minor notation to bring in compatible patches.
-      xcode: 14.2
+      xcode: "14.2.0"
     resource_class: macos.m1.medium.gen1
   macos_test: &macos_test_executor
     macos:
       # See https://circleci.com/docs/xcode-policy along with the support matrix
       # at https://circleci.com/docs/using-macos#supported-xcode-versions.
       # We use the major.minor notation to bring in compatible patches.
-      xcode: 14.2
+      xcode: "14.2.0"
     resource_class: macos.m1.medium.gen1
   windows_build: &windows_build_executor
     machine:
       image: "windows-server-2019-vs2019:2022.08.1"
     resource_class: windows.xlarge
@@ -199,11 +199,11 @@ commands:
             date +%j > ~/.daily_version
             # The checksum of the xtask/src directory, so that when we make changes to xtask we cause a full rebuild
             find xtask/src -type f | while read name; do md5sum $name; done | sort -k 2 | md5sum > ~/.xtask_version
             # The closest common ancestor to the default branch, so that test jobs can take advantage previous compiles
             git remote set-head origin -a
-            TARGET_BRANCH=$(git rev-parse --abbrev-ref origin/HEAD)    
+            TARGET_BRANCH=$(git rev-parse --abbrev-ref origin/HEAD)
             echo "Target branch is ${TARGET_BRANCH}"
             COMMON_ANCESTOR_REF=$(git merge-base HEAD "${TARGET_BRANCH}")
             echo "Common ancestor is ${COMMON_ANCESTOR_REF}"
             echo "${CIRCLE_PROJECT_REPONAME}-${COMMON_ANCESTOR_REF}" > ~/.merge_version
 
@@ -713,12 +713,12 @@ jobs:
                   docker buildx build --load --platform linux/amd64 --build-arg ARTIFACT_URL="${ARTIFACT_URL}" --build-arg ROUTER_RELEASE=${VERSION} -f dockerfiles/Dockerfile.router -t ${ROUTER_TAG}:${VERSION} .
                   docker push ${ROUTER_TAG}:${VERSION}
                   # save containers for analysis
                   mkdir built-containers
                   docker save -o built-containers/router_${VERSION}-debug.tar ${ROUTER_TAG}:${VERSION}-debug
-                  docker save -o built-containers/router_${VERSION}.tar ${ROUTER_TAG}:${VERSION}  
-                 
+                  docker save -o built-containers/router_${VERSION}.tar ${ROUTER_TAG}:${VERSION}
+
             - persist_to_workspace:
                 root: .
                 paths:
                   - "built-containers/*.tar"
             - run:
@@ -969,12 +969,12 @@ workflows:
             - build_release
           container-dir: /tmp/workspace/built-containers
           # Disables all PR comments from this job
           do-pr-comments: false
           # Scan job will return 1 if findings violating the Wiz policy are found.
-          # Toggle off to prevent any CI failures OR 
-          # contact Apollo's Security team to adjust what violates the 
+          # Toggle off to prevent any CI failures OR
+          # contact Apollo's Security team to adjust what violates the
           # Wiz policy used in this scan.
           fail-on-findings: true
           # Configure scan job to use a policy specific to apollo-router.
           # This allows us to tailor the policy applied during the scans to router.
           wiz-policies: Apollo-Router-Vulnerabilities-Policy
@@ -1067,11 +1067,11 @@ workflows:
           filters:
             branches:
               ignore: /.*/
             tags:
               only: /v.*/
-  
+
   security-scans:
     when:
       not: << pipeline.parameters.nightly >>
     jobs:
       - secops/gitleaks:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef575a10b..056daa8a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,12 +2,41 @@
 
 All notable changes to Router will be documented in this file.
 
 This project adheres to [Semantic Versioning v2.0.0](https://semver.org/spec/v2.0.0.html).
 
+# [1.45.1] - 2024-04-26
+
+## 🐛 Fixes
+
+### Correct v1.44.0 regression in query plan cache ([PR #5028](https://github.com/apollographql/router/pull/5028))
+
+Correct a critical regression that was introduced in [v1.44.0](https://github.com/apollographql/router/pull/4883) which could lead to execution of an incorrect query plan.
+
+By [@o0Ignition0o](https://github.com/o0Ignition0o) in https://github.com/apollographql/router/pull/5028
+
+### Use entire schema when hashing an introspection query ([Issue #5006](https://github.com/apollographql/router/issues/5006))
+
+Correct a _different_ hashing bug which impacted introspection queries which was also introduced in [v1.44.0](https://github.com/apollographql/router/pull/4883).  This other hashing bug failed to account for introspection queries, resulting in introspection results being misaligned to the current schema. 
+
+This release fixes the hashing mechanism by adding the schema string to hashed data if an introspection field is encountered. As a result, the entire schema is taken into account and the correct introspection result is returned.
+
+By [@Geal](https://github.com/Geal) in https://github.com/apollographql/router/pull/5007
+
+### Fix subgraph name mapping of Datadog exporter ([PR #5012](https://github.com/apollographql/router/pull/5012))
+
+Previously in the router v1.45.0, subgraph name mapping didn't work correctly in the router's Datadog exporter. The exporter used the incorrect value `apollo.subgraph.name` for mapping attributes when it should have used the value `subgraph.name`. This issue has been fixed in this release.
+
+By [@garypen](https://github.com/garypen) in https://github.com/apollographql/router/pull/5012
+
+
 # [1.45.0] - 2024-04-22
 
+> **Warning**
+>
+> **This version has a critical bug impacting all users.  See the _Fixes_ in [v1.45.1](https://github.com/apollographql/router/releases/tag/v1.45.1) for details.  We highly recommend using v1.45.1 or v1.43.2 over v1.45.0.**
+
 ## 🚀 Features
 
 ### Query validation process with Rust ([PR #4551](https://github.com/apollographql/router/pull/4551))
 
 The router has been updated with a new Rust-based query validation process using `apollo-compiler` from the `apollo-rs` project. It replaces the Javascript implementation in the query planner. It improves query planner performance by moving the validation out of the query planner and into the router service, which frees up space in the query planner cache. 
@@ -152,10 +181,15 @@ The feature is configured with the `experimental_apollo_metrics_generation_mode`
 
 By [@bonnici](https://github.com/bonnici) in https://github.com/apollographql/router/pull/4796
 
 # [1.44.0] - 2024-04-12
 
+> **Warning**
+>
+> **This version has a critical bug impacting all users.  See the _Fixes_ in [v1.45.1](https://github.com/apollographql/router/releases/tag/v1.45.1) for details.  We highly recommend using v1.45.1 or v1.43.2 over v1.44.0.**
+
+
 ## 🚀 Features
 
 ### Add details to `router service call failed` errors ([Issue #4899](https://github.com/apollographql/router/issues/4899))
 
 The router now includes more details in `router service call failed` error messages to improve their understandability and debuggability.
diff --git a/Cargo.lock b/Cargo.lock
index 156bf8d35..f7e2a3fba 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -248,11 +248,11 @@ dependencies = [
  "thiserror",
 ]
 
 [[package]]
 name = "apollo-router"
-version = "1.45.0"
+version = "1.45.1"
 dependencies = [
  "access-json",
  "anyhow",
  "apollo-compiler",
  "apollo-federation",
@@ -409,11 +409,11 @@ dependencies = [
  "zstd-safe",
 ]
 
 [[package]]
 name = "apollo-router-benchmarks"
-version = "1.45.0"
+version = "1.45.1"
 dependencies = [
  "apollo-parser",
  "apollo-router",
  "apollo-smith",
  "arbitrary",
@@ -425,11 +425,11 @@ dependencies = [
  "tower",
 ]
 
 [[package]]
 name = "apollo-router-scaffold"
-version = "1.45.0"
+version = "1.45.1"
 dependencies = [
  "anyhow",
  "cargo-scaffold",
  "clap",
  "copy_dir",
diff --git a/apollo-router-benchmarks/Cargo.toml b/apollo-router-benchmarks/Cargo.toml
index f33eea0f8..2c0e6c32b 100644
--- a/apollo-router-benchmarks/Cargo.toml
+++ b/apollo-router-benchmarks/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "apollo-router-benchmarks"
-version = "1.45.0"
+version = "1.45.1"
 authors = ["Apollo Graph, Inc. <packages@apollographql.com>"]
 edition = "2021"
 license = "Elastic-2.0"
 publish = false
 
diff --git a/apollo-router-scaffold/Cargo.toml b/apollo-router-scaffold/Cargo.toml
index e7772cd9a..95d195dfb 100644
--- a/apollo-router-scaffold/Cargo.toml
+++ b/apollo-router-scaffold/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "apollo-router-scaffold"
-version = "1.45.0"
+version = "1.45.1"
 authors = ["Apollo Graph, Inc. <packages@apollographql.com>"]
 edition = "2021"
 license = "Elastic-2.0"
 publish = false
 
diff --git a/apollo-router-scaffold/templates/base/Cargo.toml b/apollo-router-scaffold/templates/base/Cargo.toml
index 47ff9108a..78785f27e 100644
--- a/apollo-router-scaffold/templates/base/Cargo.toml
+++ b/apollo-router-scaffold/templates/base/Cargo.toml
@@ -20,11 +20,11 @@ apollo-router = { path ="{{integration_test}}apollo-router" }
 {{else}}
 {{#if branch}}
 apollo-router = { git="https://github.com/apollographql/router.git", branch="{{branch}}" }
 {{else}}
 # Note if you update these dependencies then also update xtask/Cargo.toml
-apollo-router = "1.45.0"
+apollo-router = "1.45.1"
 {{/if}}
 {{/if}}
 async-trait = "0.1.52"
 futures = "0.3.21"
 schemars = "0.8.10"
diff --git a/apollo-router-scaffold/templates/base/xtask/Cargo.toml b/apollo-router-scaffold/templates/base/xtask/Cargo.toml
index bdace8921..f0cf6dc71 100644
--- a/apollo-router-scaffold/templates/base/xtask/Cargo.toml
+++ b/apollo-router-scaffold/templates/base/xtask/Cargo.toml
@@ -11,10 +11,10 @@ version = "0.1.0"
 apollo-router-scaffold = { path ="{{integration_test}}apollo-router-scaffold" }
 {{else}}
 {{#if branch}}
 apollo-router-scaffold = { git="https://github.com/apollographql/router.git", branch="{{branch}}" }
 {{else}}
-apollo-router-scaffold = { git = "https://github.com/apollographql/router.git", tag = "v1.45.0" }
+apollo-router-scaffold = { git = "https://github.com/apollographql/router.git", tag = "v1.45.1" }
 {{/if}}
 {{/if}}
 anyhow = "1.0.58"
 clap = "4.0.32"
diff --git a/apollo-router/Cargo.toml b/apollo-router/Cargo.toml
index 8070eee9e..a3eebd4ab 100644
--- a/apollo-router/Cargo.toml
+++ b/apollo-router/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "apollo-router"
-version = "1.45.0"
+version = "1.45.1"
 authors = ["Apollo Graph, Inc. <packages@apollographql.com>"]
 repository = "https://github.com/apollographql/router/"
 documentation = "https://docs.rs/apollo-router"
 description = "A configurable, high-performance routing runtime for Apollo Federation 🚀"
 license = "Elastic-2.0"
diff --git a/apollo-router/src/plugins/progressive_override/snapshots/apollo_router__plugins__progressive_override__tests__non_overridden_field_yields_expected_query_plan.snap b/apollo-router/src/plugins/progressive_override/snapshots/apollo_router__plugins__progressive_override__tests__non_overridden_field_yields_expected_query_plan.snap
index 1961250dd..d680c0b53 100644
--- a/apollo-router/src/plugins/progressive_override/snapshots/apollo_router__plugins__progressive_override__tests__non_overridden_field_yields_expected_query_plan.snap
+++ b/apollo-router/src/plugins/progressive_override/snapshots/apollo_router__plugins__progressive_override__tests__non_overridden_field_yields_expected_query_plan.snap
@@ -16,11 +16,11 @@ expression: query_plan
           "operationName": null,
           "operationKind": "query",
           "id": null,
           "inputRewrites": null,
           "outputRewrites": null,
-          "schemaAwareHash": "9358047754b11522aac502a3c6a668cd4286c07d489680834e63d6e033db4eb5",
+          "schemaAwareHash": "12dda6193654ae4fe6e38bc09d4f81cc73d0c9e098692096f72d2158eef4776f",
           "authorization": {
             "is_authenticated": false,
             "scopes": [],
             "policies": []
           }
diff --git a/apollo-router/src/plugins/progressive_override/snapshots/apollo_router__plugins__progressive_override__tests__overridden_field_yields_expected_query_plan.snap b/apollo-router/src/plugins/progressive_override/snapshots/apollo_router__plugins__progressive_override__tests__overridden_field_yields_expected_query_plan.snap
index 5d4e064a6..612b147fc 100644
--- a/apollo-router/src/plugins/progressive_override/snapshots/apollo_router__plugins__progressive_override__tests__overridden_field_yields_expected_query_plan.snap
+++ b/apollo-router/src/plugins/progressive_override/snapshots/apollo_router__plugins__progressive_override__tests__overridden_field_yields_expected_query_plan.snap
@@ -21,11 +21,11 @@ expression: query_plan
               "operationName": null,
               "operationKind": "query",
               "id": null,
               "inputRewrites": null,
               "outputRewrites": null,
-              "schemaAwareHash": "8f445761c0bcdda90b8da35ccd13fd98e474514f3efc071bd2c39495b5af94e5",
+              "schemaAwareHash": "00ad582ea45fc1bce436b36b21512f3d2c47b74fdbdc61e4b349289722c9ecf2",
               "authorization": {
                 "is_authenticated": false,
                 "scopes": [],
                 "policies": []
               }
@@ -59,11 +59,11 @@ expression: query_plan
                 "operationName": null,
                 "operationKind": "query",
                 "id": null,
                 "inputRewrites": null,
                 "outputRewrites": null,
-                "schemaAwareHash": "9a1feab7ee8c57c8a4ab4db29712412a9cfe94009bfcb40dc0d22ea54c410865",
+                "schemaAwareHash": "a8ebdc2151a2e5207882e43c6906c0c64167fd9a8e0c7c4becc47736a5105096",
                 "authorization": {
                   "is_authenticated": false,
                   "scopes": [],
                   "policies": []
                 }
diff --git a/apollo-router/src/plugins/snapshots/apollo_router__plugins__expose_query_plan__tests__it_expose_query_plan-2.snap b/apollo-router/src/plugins/snapshots/apollo_router__plugins__expose_query_plan__tests__it_expose_query_plan-2.snap
index 0767d22f8..b32a905c0 100644
--- a/apollo-router/src/plugins/snapshots/apollo_router__plugins__expose_query_plan__tests__it_expose_query_plan-2.snap
+++ b/apollo-router/src/plugins/snapshots/apollo_router__plugins__expose_query_plan__tests__it_expose_query_plan-2.snap
@@ -66,11 +66,11 @@ expression: "serde_json::to_value(response).unwrap()"
               "operationName": "TopProducts__products__0",
               "operationKind": "query",
               "id": null,
               "inputRewrites": null,
               "outputRewrites": null,
-              "schemaAwareHash": "34be619a78867ab9d0670048f4c93574e38cd9253e9cc032f567078355b25086",
+              "schemaAwareHash": "7245d488e97c3b2ac9f5fa4dd4660940b94ad81af070013305b2c0f76337b2f9",
               "authorization": {
                 "is_authenticated": false,
                 "scopes": [],
                 "policies": []
               }
@@ -105,11 +105,11 @@ expression: "serde_json::to_value(response).unwrap()"
                 "operationName": "TopProducts__reviews__1",
                 "operationKind": "query",
                 "id": null,
                 "inputRewrites": null,
                 "outputRewrites": null,
-                "schemaAwareHash": "f1582d942020b23347d84f6ae46c018492ae7c59c9b1472e0b442121ddf16368",
+                "schemaAwareHash": "6e0b4156706ea0cf924500cfdc99dd44b9f0ed07e2d3f888d4aff156e6a33238",
                 "authorization": {
                   "is_authenticated": false,
                   "scopes": [],
                   "policies": []
                 }
@@ -151,11 +151,11 @@ expression: "serde_json::to_value(response).unwrap()"
                     "operationName": "TopProducts__products__2",
                     "operationKind": "query",
                     "id": null,
                     "inputRewrites": null,
                     "outputRewrites": null,
-                    "schemaAwareHash": "6fa5a74c5af2b18f343e9e69bbcbc9335e9faaa46c3d8964d199002dfeb0026f",
+                    "schemaAwareHash": "ff649f3d70241d5a8cd5f5d03ff4c41ecff72b0e4129a480207b05ac92318042",
                     "authorization": {
                       "is_authenticated": false,
                       "scopes": [],
                       "policies": []
                     }
@@ -194,11 +194,11 @@ expression: "serde_json::to_value(response).unwrap()"
                     "operationName": "TopProducts__accounts__3",
                     "operationKind": "query",
                     "id": null,
                     "inputRewrites": null,
                     "outputRewrites": null,
-                    "schemaAwareHash": "6fa5a74c5af2b18f343e9e69bbcbc9335e9faaa46c3d8964d199002dfeb0026f",
+                    "schemaAwareHash": "bf9f3beda78a7a565e47c862157bad4ec871d724d752218da1168455dddca074",
                     "authorization": {
                       "is_authenticated": false,
                       "scopes": [],
                       "policies": []
                     }
diff --git a/apollo-router/src/plugins/snapshots/apollo_router__plugins__expose_query_plan__tests__it_expose_query_plan.snap b/apollo-router/src/plugins/snapshots/apollo_router__plugins__expose_query_plan__tests__it_expose_query_plan.snap
index 0767d22f8..b32a905c0 100644
--- a/apollo-router/src/plugins/snapshots/apollo_router__plugins__expose_query_plan__tests__it_expose_query_plan.snap
+++ b/apollo-router/src/plugins/snapshots/apollo_router__plugins__expose_query_plan__tests__it_expose_query_plan.snap
@@ -66,11 +66,11 @@ expression: "serde_json::to_value(response).unwrap()"
               "operationName": "TopProducts__products__0",
               "operationKind": "query",
               "id": null,
               "inputRewrites": null,
               "outputRewrites": null,
-              "schemaAwareHash": "34be619a78867ab9d0670048f4c93574e38cd9253e9cc032f567078355b25086",
+              "schemaAwareHash": "7245d488e97c3b2ac9f5fa4dd4660940b94ad81af070013305b2c0f76337b2f9",
               "authorization": {
                 "is_authenticated": false,
                 "scopes": [],
                 "policies": []
               }
@@ -105,11 +105,11 @@ expression: "serde_json::to_value(response).unwrap()"
                 "operationName": "TopProducts__reviews__1",
                 "operationKind": "query",
                 "id": null,
                 "inputRewrites": null,
                 "outputRewrites": null,
-                "schemaAwareHash": "f1582d942020b23347d84f6ae46c018492ae7c59c9b1472e0b442121ddf16368",
+                "schemaAwareHash": "6e0b4156706ea0cf924500cfdc99dd44b9f0ed07e2d3f888d4aff156e6a33238",
                 "authorization": {
                   "is_authenticated": false,
                   "scopes": [],
                   "policies": []
                 }
@@ -151,11 +151,11 @@ expression: "serde_json::to_value(response).unwrap()"
                     "operationName": "TopProducts__products__2",
                     "operationKind": "query",
                     "id": null,
                     "inputRewrites": null,
                     "outputRewrites": null,
-                    "schemaAwareHash": "6fa5a74c5af2b18f343e9e69bbcbc9335e9faaa46c3d8964d199002dfeb0026f",
+                    "schemaAwareHash": "ff649f3d70241d5a8cd5f5d03ff4c41ecff72b0e4129a480207b05ac92318042",
                     "authorization": {
                       "is_authenticated": false,
                       "scopes": [],
                       "policies": []
                     }
@@ -194,11 +194,11 @@ expression: "serde_json::to_value(response).unwrap()"
                     "operationName": "TopProducts__accounts__3",
                     "operationKind": "query",
                     "id": null,
                     "inputRewrites": null,
                     "outputRewrites": null,
-                    "schemaAwareHash": "6fa5a74c5af2b18f343e9e69bbcbc9335e9faaa46c3d8964d199002dfeb0026f",
+                    "schemaAwareHash": "bf9f3beda78a7a565e47c862157bad4ec871d724d752218da1168455dddca074",
                     "authorization": {
                       "is_authenticated": false,
                       "scopes": [],
                       "policies": []
                     }
diff --git a/apollo-router/src/plugins/telemetry/apollo_exporter.rs b/apollo-router/src/plugins/telemetry/apollo_exporter.rs
index 531cc94dc..f6bfcc6fc 100644
--- a/apollo-router/src/plugins/telemetry/apollo_exporter.rs
+++ b/apollo-router/src/plugins/telemetry/apollo_exporter.rs
@@ -440,19 +440,5 @@ where
             ts_strukt.end()
         }
         None => serializer.serialize_none(),
     }
 }
-
-#[cfg(not(windows))] // git checkout converts \n to \r\n, making == below fail
-#[test]
-fn check_reports_proto_is_up_to_date() {
-    let proto_url = "https://usage-reporting.api.apollographql.com/proto/reports.proto";
-    let response = reqwest::blocking::get(proto_url).unwrap();
-    let content = response.text().unwrap();
-    // Not using assert_eq! as printing the entire file would be too verbose
-    assert!(
-        content == include_str!("proto/reports.proto"),
-        "Protobuf file is out of date. Run this command to update it:\n\n    \
-            curl -f {proto_url} > apollo-router/src/plugins/telemetry/proto/reports.proto\n\n"
-    );
-}
diff --git a/apollo-router/src/plugins/telemetry/tracing/datadog.rs b/apollo-router/src/plugins/telemetry/tracing/datadog.rs
index 74497c534..cd5f4351a 100644
--- a/apollo-router/src/plugins/telemetry/tracing/datadog.rs
+++ b/apollo-router/src/plugins/telemetry/tracing/datadog.rs
@@ -27,11 +27,11 @@ lazy_static! {
     static ref SPAN_RESOURCE_NAME_ATTRIBUTE_MAPPING: HashMap<&'static str, &'static str> = {
         let mut map = HashMap::new();
         map.insert("request", "http.route");
         map.insert("supergraph", "graphql.operation.name");
         map.insert("query_planning", "graphql.operation.name");
-        map.insert("subgraph", "apollo.subgraph.name");
+        map.insert("subgraph", "subgraph.name");
         map.insert("subgraph_request", "graphql.operation.name");
         map
     };
     static ref DEFAULT_ENDPOINT: Uri = Uri::from_static("http://127.0.0.1:8126");
 }
diff --git a/apollo-router/src/query_planner/bridge_query_planner.rs b/apollo-router/src/query_planner/bridge_query_planner.rs
index e740f0aa4..62e7197e6 100644
--- a/apollo-router/src/query_planner/bridge_query_planner.rs
+++ b/apollo-router/src/query_planner/bridge_query_planner.rs
@@ -377,11 +377,13 @@ impl BridgeQueryPlanner {
             .await
             .map_err(QueryPlannerError::RouterBridgeError)?
             .into_result()
         {
             Ok(mut plan) => {
-                plan.data.query_plan.hash_subqueries(&self.subgraph_schemas);
+                plan.data
+                    .query_plan
+                    .hash_subqueries(&self.subgraph_schemas, &self.schema.raw_sdl);
                 plan.data
                     .query_plan
                     .extract_authorization_metadata(&self.schema.definitions, &key);
                 plan
             }
@@ -581,23 +583,26 @@ impl Service<QueryPlannerRequest> for BridgeQueryPlanner {
             let mut doc = match context.extensions().lock().get::<ParsedDocument>().cloned() {
                 None => return Err(QueryPlannerError::SpecError(SpecError::UnknownFileId)),
                 Some(d) => d,
             };
 
-            let schema = &this.schema.api_schema().definitions;
-            match add_defer_labels(schema, &doc.ast) {
+            let api_schema = this.schema.api_schema();
+            let api_schema_definitions = &api_schema.definitions;
+            match add_defer_labels(api_schema_definitions, &doc.ast) {
                 Err(e) => {
                     return Err(QueryPlannerError::SpecError(SpecError::TransformError(
                         e.to_string(),
                     )))
                 }
                 Ok(modified_query) => {
                     let executable_document = modified_query
-                        .to_executable_validate(schema)
+                        .to_executable_validate(api_schema_definitions)
+                        // Assume transformation creates a valid document: ignore conversion errors
                         .map_err(|e| SpecError::ValidationError(e.into()))?;
                     let hash = QueryHashVisitor::hash_query(
-                        schema,
+                        api_schema_definitions,
+                        &api_schema.raw_sdl,
                         &executable_document,
                         operation_name.as_deref(),
                     )
                     .map_err(|e| SpecError::QueryHashing(e.to_string()))?;
                     doc = Arc::new(ParsedDocumentInner {
@@ -713,10 +718,11 @@ impl BridgeQueryPlanner {
             let executable_document = new_doc
                 .to_executable_validate(&self.schema.api_schema().definitions)
                 .map_err(|e| SpecError::ValidationError(e.into()))?;
             let hash = QueryHashVisitor::hash_query(
                 &self.schema.definitions,
+                &self.schema.raw_sdl,
                 &executable_document,
                 key.operation_name.as_deref(),
             )
             .map_err(|e| SpecError::QueryHashing(e.to_string()))?;
             doc = Arc::new(ParsedDocumentInner {
@@ -805,13 +811,17 @@ struct QueryPlan {
     /// The hierarchical nodes that make up the query plan
     node: Option<PlanNode>,
 }
 
 impl QueryPlan {
-    fn hash_subqueries(&mut self, schemas: &HashMap<String, Arc<Valid<apollo_compiler::Schema>>>) {
+    fn hash_subqueries(
+        &mut self,
+        schemas: &HashMap<String, Arc<Valid<apollo_compiler::Schema>>>,
+        supergraph_schema_hash: &str,
+    ) {
         if let Some(node) = self.node.as_mut() {
-            node.hash_subqueries(schemas);
+            node.hash_subqueries(schemas, supergraph_schema_hash);
         }
     }
 
     fn extract_authorization_metadata(
         &mut self,
diff --git a/apollo-router/src/query_planner/caching_query_planner.rs b/apollo-router/src/query_planner/caching_query_planner.rs
index 96689c131..4e8172bd7 100644
--- a/apollo-router/src/query_planner/caching_query_planner.rs
+++ b/apollo-router/src/query_planner/caching_query_planner.rs
@@ -139,10 +139,11 @@ where
                             query,
                             operation,
                             hash,
                             metadata,
                             plan_options,
+                            ..
                         },
                         _,
                     )| WarmUpCachingQueryKey {
                         query: query.clone(),
                         operation: operation.clone(),
@@ -204,10 +205,11 @@ where
 
             let caching_key = CachingQueryKey {
                 query: query.clone(),
                 operation: operation.clone(),
                 hash: doc.hash.clone(),
+                sdl: Arc::clone(&self.schema.raw_sdl),
                 metadata,
                 plan_options,
             };
 
             if experimental_reuse_query_plans {
@@ -384,10 +386,11 @@ where
 
         let caching_key = CachingQueryKey {
             query: request.query.clone(),
             operation: request.operation_name.to_owned(),
             hash: doc.hash.clone(),
+            sdl: Arc::clone(&self.schema.raw_sdl),
             metadata,
             plan_options,
         };
 
         let context = request.context.clone();
@@ -520,10 +523,11 @@ fn stats_report_key_hash(stats_report_key: &str) -> String {
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub(crate) struct CachingQueryKey {
     pub(crate) query: String,
+    pub(crate) sdl: Arc<String>,
     pub(crate) operation: Option<String>,
     pub(crate) hash: Arc<QueryHash>,
     pub(crate) metadata: CacheKeyMetadata,
     pub(crate) plan_options: PlanOptions,
 }
@@ -539,10 +543,11 @@ impl std::fmt::Display for CachingQueryKey {
         let mut hasher = Sha256::new();
         hasher.update(&serde_json::to_vec(&self.metadata).expect("serialization should not fail"));
         hasher.update(
             &serde_json::to_vec(&self.plan_options).expect("serialization should not fail"),
         );
+        hasher.update(&serde_json::to_vec(&self.sdl).expect("serialization should not fail"));
         let metadata = hex::encode(hasher.finalize());
 
         write!(
             f,
             "plan:{}:{}:{}:{}",
diff --git a/apollo-router/src/query_planner/fetch.rs b/apollo-router/src/query_planner/fetch.rs
index 07207b23b..58c22cae0 100644
--- a/apollo-router/src/query_planner/fetch.rs
+++ b/apollo-router/src/query_planner/fetch.rs
@@ -495,16 +495,24 @@ impl FetchNode {
 
     pub(crate) fn operation_kind(&self) -> &OperationKind {
         &self.operation_kind
     }
 
-    pub(crate) fn hash_subquery(&mut self, schema: &Valid<apollo_compiler::Schema>) {
+    pub(crate) fn hash_subquery(
+        &mut self,
+        schema: &Valid<apollo_compiler::Schema>,
+        supergraph_schema_hash: &str,
+    ) {
         let doc = ExecutableDocument::parse(schema, &self.operation, "query.graphql")
             .expect("subgraph queries should be valid");
 
-        if let Ok(hash) = QueryHashVisitor::hash_query(schema, &doc, self.operation_name.as_deref())
-        {
+        if let Ok(hash) = QueryHashVisitor::hash_query(
+            schema,
+            supergraph_schema_hash,
+            &doc,
+            self.operation_name.as_deref(),
+        ) {
             self.schema_aware_hash = Arc::new(QueryHash(hash));
         }
     }
 
     pub(crate) fn extract_authorization_metadata(
diff --git a/apollo-router/src/query_planner/plan.rs b/apollo-router/src/query_planner/plan.rs
index 4d0f76e37..c734541fb 100644
--- a/apollo-router/src/query_planner/plan.rs
+++ b/apollo-router/src/query_planner/plan.rs
@@ -313,56 +313,59 @@ impl PlanNode {
     }
 
     pub(crate) fn hash_subqueries(
         &mut self,
         schemas: &HashMap<String, Arc<Valid<apollo_compiler::Schema>>>,
+        supergraph_schema_hash: &str,
     ) {
         match self {
             PlanNode::Fetch(fetch_node) => {
                 if let Some(schema) = schemas.get(&fetch_node.service_name) {
-                    fetch_node.hash_subquery(schema);
+                    fetch_node.hash_subquery(schema, supergraph_schema_hash);
                 }
             }
 
             PlanNode::Sequence { nodes } => {
                 for node in nodes {
-                    node.hash_subqueries(schemas);
+                    node.hash_subqueries(schemas, supergraph_schema_hash);
                 }
             }
             PlanNode::Parallel { nodes } => {
                 for node in nodes {
-                    node.hash_subqueries(schemas);
+                    node.hash_subqueries(schemas, supergraph_schema_hash);
                 }
             }
-            PlanNode::Flatten(flatten) => flatten.node.hash_subqueries(schemas),
+            PlanNode::Flatten(flatten) => flatten
+                .node
+                .hash_subqueries(schemas, supergraph_schema_hash),
             PlanNode::Defer { primary, deferred } => {
                 if let Some(node) = primary.node.as_mut() {
-                    node.hash_subqueries(schemas);
+                    node.hash_subqueries(schemas, supergraph_schema_hash);
                 }
                 for deferred_node in deferred {
                     if let Some(node) = deferred_node.node.take() {
                         let mut new_node = (*node).clone();
-                        new_node.hash_subqueries(schemas);
+                        new_node.hash_subqueries(schemas, supergraph_schema_hash);
                         deferred_node.node = Some(Arc::new(new_node));
                     }
                 }
             }
             PlanNode::Subscription { primary: _, rest } => {
                 if let Some(node) = rest.as_mut() {
-                    node.hash_subqueries(schemas);
+                    node.hash_subqueries(schemas, supergraph_schema_hash);
                 }
             }
             PlanNode::Condition {
                 condition: _,
                 if_clause,
                 else_clause,
             } => {
                 if let Some(node) = if_clause.as_mut() {
-                    node.hash_subqueries(schemas);
+                    node.hash_subqueries(schemas, supergraph_schema_hash);
                 }
                 if let Some(node) = else_clause.as_mut() {
-                    node.hash_subqueries(schemas);
+                    node.hash_subqueries(schemas, supergraph_schema_hash);
                 }
             }
         }
     }
 
diff --git a/apollo-router/src/query_planner/snapshots/apollo_router__query_planner__bridge_query_planner__tests__plan_root.snap b/apollo-router/src/query_planner/snapshots/apollo_router__query_planner__bridge_query_planner__tests__plan_root.snap
index 5e07a0cfd..974ccc03c 100644
--- a/apollo-router/src/query_planner/snapshots/apollo_router__query_planner__bridge_query_planner__tests__plan_root.snap
+++ b/apollo-router/src/query_planner/snapshots/apollo_router__query_planner__bridge_query_planner__tests__plan_root.snap
@@ -12,11 +12,11 @@ Fetch(
         operation_kind: Query,
         id: None,
         input_rewrites: None,
         output_rewrites: None,
         schema_aware_hash: QueryHash(
-            "68a86d7602ea2876e77b84d7942f585ef6b6101887bb2979d1f0af3b28c9a0ed",
+            "a4ab3ffe0fd7863aea8cd1e85d019d2c64ec0351d62f9759bed3c9dc707ea315",
         ),
         authorization: CacheKeyMetadata {
             is_authenticated: false,
             scopes: [],
             policies: [],
diff --git a/apollo-router/src/spec/query.rs b/apollo-router/src/spec/query.rs
index 89a80aa77..9f0170284 100644
--- a/apollo-router/src/spec/query.rs
+++ b/apollo-router/src/spec/query.rs
@@ -278,24 +278,31 @@ impl Query {
             Ok(ast) => ast,
             Err(errors) => {
                 return Err(SpecError::ParseError(errors.into()));
             }
         };
-        let schema = &schema.api_schema().definitions;
-        let executable_document = match ast.to_executable_validate(schema) {
+        let api_schema = schema.api_schema();
+        let api_schema_definitions = &api_schema.definitions;
+        let executable_document = match ast.to_executable_validate(api_schema_definitions) {
             Ok(doc) => doc,
             Err(errors) => {
                 return Err(SpecError::ValidationError(errors.into()));
             }
         };
 
         // Trace log recursion limit data
         let recursion_limit = parser.recursion_reached();
         tracing::trace!(?recursion_limit, "recursion limit data");
 
-        let hash = QueryHashVisitor::hash_query(schema, &executable_document, operation_name)
-            .map_err(|e| SpecError::QueryHashing(e.to_string()))?;
+        let hash = QueryHashVisitor::hash_query(
+            api_schema_definitions,
+            &api_schema.raw_sdl,
+            &executable_document,
+            operation_name,
+        )
+        .map_err(|e| SpecError::QueryHashing(e.to_string()))?;
+
         Ok(Arc::new(ParsedDocumentInner {
             ast,
             executable: Arc::new(executable_document),
             hash: Arc::new(QueryHash(hash)),
         }))
@@ -341,11 +348,11 @@ impl Query {
         let operations = document
             .all_operations()
             .map(|operation| Operation::from_hir(operation, schema, &mut defer_stats, &fragments))
             .collect::<Result<Vec<_>, SpecError>>()?;
 
-        let mut visitor = QueryHashVisitor::new(&schema.definitions, document);
+        let mut visitor = QueryHashVisitor::new(&schema.definitions, &schema.raw_sdl, document);
         traverse::document(&mut visitor, document, operation_name).map_err(|e| {
             SpecError::QueryHashing(format!("could not calculate the query hash: {e}"))
         })?;
         let hash = visitor.finish();
 
diff --git a/apollo-router/src/spec/query/change.rs b/apollo-router/src/spec/query/change.rs
index bebb8efa7..eeb29efa3 100644
--- a/apollo-router/src/spec/query/change.rs
+++ b/apollo-router/src/spec/query/change.rs
@@ -31,30 +31,38 @@ pub(crate) const JOIN_TYPE_DIRECTIVE_NAME: &str = "join__type";
 /// schema which affect the query.
 /// This means that if a schema update does not affect an existing query (example: adding a field),
 /// then the hash will stay the same
 pub(crate) struct QueryHashVisitor<'a> {
     schema: &'a schema::Schema,
+    // TODO: remove once introspection has been moved out of query planning
+    // For now, introspection is stiull handled by the planner, so when an
+    // introspection query is hashed, it should take the whole schema into account
+    schema_str: &'a str,
     hasher: Sha256,
     fragments: HashMap<&'a ast::Name, &'a Node<executable::Fragment>>,
     hashed_types: HashSet<String>,
     // name, field
     hashed_fields: HashSet<(String, String)>,
+    seen_introspection: bool,
     join_field_directive_name: Option<String>,
     join_type_directive_name: Option<String>,
 }
 
 impl<'a> QueryHashVisitor<'a> {
     pub(crate) fn new(
         schema: &'a schema::Schema,
+        schema_str: &'a str,
         executable: &'a executable::ExecutableDocument,
     ) -> Self {
         Self {
             schema,
+            schema_str,
             hasher: Sha256::new(),
             fragments: executable.fragments.iter().collect(),
             hashed_types: HashSet::new(),
             hashed_fields: HashSet::new(),
+            seen_introspection: false,
             // should we just return an error if we do not find those directives?
             join_field_directive_name: Schema::directive_name(
                 schema,
                 JOIN_SPEC_BASE_URL,
                 ">=0.1.0",
@@ -69,15 +77,17 @@ impl<'a> QueryHashVisitor<'a> {
         }
     }
 
     pub(crate) fn hash_query(
         schema: &'a schema::Schema,
+        schema_str: &'a str,
         executable: &'a executable::ExecutableDocument,
         operation_name: Option<&str>,
     ) -> Result<Vec<u8>, BoxError> {
-        let mut visitor = QueryHashVisitor::new(schema, executable);
+        let mut visitor = QueryHashVisitor::new(schema, schema_str, executable);
         traverse::document(&mut visitor, executable, operation_name)?;
+        executable.to_string().hash(&mut visitor);
         Ok(visitor.finish())
     }
 
     pub(crate) fn finish(self) -> Vec<u8> {
         self.hasher.finalize().as_slice().into()
@@ -355,10 +365,16 @@ impl<'a> Visitor for QueryHashVisitor<'a> {
         &mut self,
         parent_type: &str,
         field_def: &ast::FieldDefinition,
         node: &executable::Field,
     ) -> Result<(), BoxError> {
+        if !self.seen_introspection && (field_def.name == "__schema" || field_def.name == "__type")
+        {
+            self.seen_introspection = true;
+            self.schema_str.hash(self);
+        }
+
         self.hash_field(
             parent_type.to_string(),
             field_def.name.as_str().to_string(),
             field_def,
             &node.arguments,
@@ -409,39 +425,71 @@ mod tests {
     use apollo_compiler::validation::Valid;
 
     use super::QueryHashVisitor;
     use crate::spec::query::traverse;
 
+    #[derive(Debug)]
+    struct HashComparator {
+        from_visitor: String,
+        from_hash_query: String,
+    }
+
+    impl From<(String, String)> for HashComparator {
+        fn from(value: (String, String)) -> Self {
+            Self {
+                from_visitor: value.0,
+                from_hash_query: value.1,
+            }
+        }
+    }
+
+    // The non equality check is not the same
+    // as one would expect from PartialEq.
+    // This is why HashComparator doesn't implement it.
+    impl HashComparator {
+        fn equals(&self, other: &Self) -> bool {
+            self.from_visitor == other.from_visitor && self.from_hash_query == other.from_hash_query
+        }
+        fn doesnt_match(&self, other: &Self) -> bool {
+            // This is intentional, we check to prevent BOTH hashes from being equal
+            self.from_visitor != other.from_visitor && self.from_hash_query != other.from_hash_query
+        }
+    }
+
     #[track_caller]
-    fn hash(schema: &str, query: &str) -> String {
-        let schema = Schema::parse(schema, "schema.graphql")
+    fn hash(schema_str: &str, query: &str) -> HashComparator {
+        let schema = Schema::parse(schema_str, "schema.graphql")
             .unwrap()
             .validate()
             .unwrap();
         let doc = Document::parse(query, "query.graphql").unwrap();
 
         let exec = doc
             .to_executable(&schema)
             .unwrap()
             .validate(&schema)
             .unwrap();
-        let mut visitor = QueryHashVisitor::new(&schema, &exec);
+        let mut visitor = QueryHashVisitor::new(&schema, schema_str, &exec);
         traverse::document(&mut visitor, &exec, None).unwrap();
 
-        hex::encode(visitor.finish())
+        (
+            hex::encode(visitor.finish()),
+            hex::encode(QueryHashVisitor::hash_query(&schema, schema_str, &exec, None).unwrap()),
+        )
+            .into()
     }
 
     #[track_caller]
-    fn hash_subgraph_query(schema: &str, query: &str) -> String {
-        let schema = Valid::assume_valid(Schema::parse(schema, "schema.graphql").unwrap());
+    fn hash_subgraph_query(schema_str: &str, query: &str) -> String {
+        let schema = Valid::assume_valid(Schema::parse(schema_str, "schema.graphql").unwrap());
         let doc = Document::parse(query, "query.graphql").unwrap();
         let exec = doc
             .to_executable(&schema)
             .unwrap()
             .validate(&schema)
             .unwrap();
-        let mut visitor = QueryHashVisitor::new(&schema, &exec);
+        let mut visitor = QueryHashVisitor::new(&schema, schema_str, &exec);
         traverse::document(&mut visitor, &exec, None).unwrap();
 
         hex::encode(visitor.finish())
     }
 
@@ -477,24 +525,22 @@ mod tests {
           id: ID!
           name: String
         }
         "#;
         let query = "query { me { name } }";
-        assert_eq!(hash(schema1, query), hash(schema2, query));
+        assert!(hash(schema1, query).equals(&hash(schema2, query)));
 
         // id is nullable in 1, non nullable in 2
         let query = "query { me { id name } }";
-        assert_ne!(hash(schema1, query), hash(schema2, query));
+        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
 
         // simple normalization
         let query = "query {  moi: me { name   } }";
-        assert_eq!(hash(schema1, query), hash(schema2, query));
+        assert!(hash(schema1, query).equals(&hash(schema2, query)));
 
-        assert_ne!(
-            hash(schema1, "query { me { id name } }"),
-            hash(schema1, "query { me { name id } }")
-        );
+        assert!(hash(schema1, "query { me { id name } }")
+            .doesnt_match(&hash(schema1, "query { me { name id } }")));
     }
 
     #[test]
     fn directive() {
         let schema1: &str = r#"
@@ -530,17 +576,17 @@ mod tests {
           id: ID! @test
           name: String
         }
         "#;
         let query = "query { me { name } }";
-        assert_eq!(hash(schema1, query), hash(schema2, query));
+        assert!(hash(schema1, query).equals(&hash(schema2, query)));
 
         let query = "query { me { id name } }";
-        assert_ne!(hash(schema1, query), hash(schema2, query));
+        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
 
         let query = "query { customer { id } }";
-        assert_ne!(hash(schema1, query), hash(schema2, query));
+        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
     }
 
     #[test]
     fn interface() {
         let schema1: &str = r#"
@@ -584,17 +630,17 @@ mod tests {
           name: String
         }
         "#;
 
         let query = "query { me { id name } }";
-        assert_eq!(hash(schema1, query), hash(schema2, query));
+        assert!(hash(schema1, query).equals(&hash(schema2, query)));
 
         let query = "query { customer { id } }";
-        assert_ne!(hash(schema1, query), hash(schema2, query));
+        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
 
         let query = "query { customer { ... on User { name } } }";
-        assert_ne!(hash(schema1, query), hash(schema2, query));
+        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
     }
 
     #[test]
     fn arguments() {
         let schema1: &str = r#"
@@ -612,23 +658,23 @@ mod tests {
             c(i: Int = 2, j: Int): Int
           }
         "#;
 
         let query = "query { a(i: 0) }";
-        assert_ne!(hash(schema1, query), hash(schema2, query));
+        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
 
         let query = "query { b }";
-        assert_ne!(hash(schema1, query), hash(schema2, query));
+        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
 
         let query = "query { b(i: 0)}";
-        assert_ne!(hash(schema1, query), hash(schema2, query));
+        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
 
         let query = "query { c(j: 0)}";
-        assert_ne!(hash(schema1, query), hash(schema2, query));
+        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
 
         let query = "query { c(i:0, j: 0)}";
-        assert_ne!(hash(schema1, query), hash(schema2, query));
+        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
     }
 
     #[test]
     fn entities() {
         let schema1: &str = r#"
@@ -815,14 +861,14 @@ mod tests {
             id: ID! @test
             name :String
         }
         "#;
         let query = "query { me { name } }";
-        assert_ne!(hash(schema1, query), hash(schema2, query));
+        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
 
         let query = "query { itf { name } }";
-        assert_ne!(hash(schema1, query), hash(schema2, query));
+        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
     }
 
     #[test]
     fn join_field_requires() {
         let schema1: &str = r#"
@@ -943,11 +989,97 @@ mod tests {
             id: ID!
             name: String @test
         }
         "#;
         let query = "query { me { username } }";
-        assert_ne!(hash(schema1, query), hash(schema2, query));
+        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
 
         let query = "query { me { a } }";
-        assert_ne!(hash(schema1, query), hash(schema2, query));
+        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
+    }
+
+    #[test]
+    fn introspection() {
+        let schema1: &str = r#"
+        schema {
+          query: Query
+        }
+    
+        type Query {
+          me: User
+          customer: User
+        }
+    
+        type User {
+          id: ID
+          name: String
+        }
+        "#;
+
+        let schema2: &str = r#"
+        schema {
+            query: Query
+        }
+    
+        type Query {
+          me: NotUser
+        }
+    
+    
+        type NotUser {
+          id: ID!
+          name: String
+        }
+        "#;
+
+        let query = "{ __schema { types { name } } }";
+
+        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
+    }
+
+    #[test]
+    fn fields_with_different_arguments_have_different_hashes() {
+        let schema: &str = r#"
+        schema {
+          query: Query
+        }
+    
+        type Query {
+          test(arg: Int): String
+        }
+        "#;
+
+        let query_one = "query { a: test(arg: 1) b: test(arg: 2) }";
+        let query_two = "query { a: test(arg: 1) b: test(arg: 3) }";
+
+        // This assertion tests an internal hash function that isn't directly
+        // used for the query hash, and we'll need to make it pass to rely
+        // solely on the internal function again.
+        //
+        // assert!(hash(schema, query_one).doesnt_match(&hash(schema,
+        // query_two)));
+        assert!(hash(schema, query_one).from_hash_query != hash(schema, query_two).from_hash_query);
+    }
+
+    #[test]
+    fn fields_with_different_aliases_have_different_hashes() {
+        let schema: &str = r#"
+        schema {
+          query: Query
+        }
+    
+        type Query {
+          test(arg: Int): String
+        }
+        "#;
+
+        let query_one = "query { a: test }";
+        let query_two = "query { b: test }";
+
+        // This assertion tests an internal hash function that isn't directly
+        // used for the query hash, and we'll need to make it pass to rely
+        // solely on the internal function again.
+        //
+        // assert!(hash(schema, query_one).doesnt_match(&hash(schema, query_two)));
+        assert!(hash(schema, query_one).from_hash_query != hash(schema, query_two).from_hash_query);
     }
 }
diff --git a/apollo-router/tests/integration/redis.rs b/apollo-router/tests/integration/redis.rs
index 5a340fea0..0eaf7ce94 100644
--- a/apollo-router/tests/integration/redis.rs
+++ b/apollo-router/tests/integration/redis.rs
@@ -26,16 +26,16 @@ mod test {
         // If this test fails and the cache key format changed you'll need to update the key here.
         // 1. Force this test to run locally by removing the cfg() line at the top of this file.
         // 2. run `docker compose up -d` and connect to the redis container by running `docker exec -ti <container_id> /bin/bash`.
         // 3. Run the `redis-cli` command from the shell and start the redis `monitor` command.
         // 4. Run this test and yank the updated cache key from the redis logs.
-        let known_cache_key = "plan:v2.7.2:af1ee357bc75cfbbcc6adda41089a56e7d1d52f6d44c049739dde2c259314f58:3973e022e93220f9212c18d0d0c543ae7c309e46640da93a4a0314de999f5112:2bf7810d3a47b31d8a77ebb09cdc784a3f77306827dc55b06770030a858167c7";
+        let known_cache_key = "plan:v2.7.2:121b9859eba2d8fa6dde0a54b6e3781274cf69f7ffb0af912e92c01c6bfff6ca:3973e022e93220f9212c18d0d0c543ae7c309e46640da93a4a0314de999f5112:5c7a72fa35639949328548d77b56dba2e77d0dfa90c19b69978da119e996bb92";
 
-        let config = RedisConfig::from_url("redis://127.0.0.1:6379")?;
+        let config = RedisConfig::from_url("redis://127.0.0.1:6379").unwrap();
         let client = RedisClient::new(config, None, None, None);
         let connection_task = client.connect();
-        client.wait_for_connect().await?;
+        client.wait_for_connect().await.unwrap();
 
         client.del::<String, _>(known_cache_key).await.unwrap();
 
         let supergraph = apollo_router::TestHarness::builder()
             .with_subgraph_network_requests()
@@ -51,21 +51,29 @@ mod test {
                                 "ttl": "10s"
                             }
                         }
                     }
                 }
-            }))?
+            }))
+            .unwrap()
             .schema(include_str!("../fixtures/supergraph.graphql"))
             .build_supergraph()
-            .await?;
+            .await
+            .unwrap();
 
         let request = supergraph::Request::fake_builder()
             .query(r#"{ topProducts { name name2:name } }"#)
             .method(Method::POST)
-            .build()?;
+            .build()
+            .unwrap();
 
-        let _ = supergraph.oneshot(request).await?.next_response().await;
+        let _ = supergraph
+            .oneshot(request)
+            .await
+            .unwrap()
+            .next_response()
+            .await;
 
         let s: String = match client.get(known_cache_key).await {
             Ok(s) => s,
             Err(e) => {
                 println!("keys in Redis server:");
@@ -114,30 +122,38 @@ mod test {
                                 "ttl": "10s"
                             }
                         }
                     }
                 }
-            }))?
+            }))
+            .unwrap()
             .schema(include_str!("../fixtures/supergraph.graphql"))
             .build_supergraph()
-            .await?;
+            .await
+            .unwrap();
 
         let request = supergraph::Request::fake_builder()
             .query(r#"{ topProducts { name name2:name } }"#)
             .method(Method::POST)
-            .build()?;
-        let _ = supergraph.oneshot(request).await?.next_response().await;
+            .build()
+            .unwrap();
+        let _ = supergraph
+            .oneshot(request)
+            .await
+            .unwrap()
+            .next_response()
+            .await;
         let new_exp: i64 = client
             .custom_raw(cmd!("EXPIRETIME"), vec![known_cache_key.to_string()])
             .await
             .and_then(|frame| frame.try_into())
             .and_then(|value: RedisValue| value.convert())
             .unwrap();
 
         assert!(exp < new_exp);
 
-        client.quit().await?;
+        client.quit().await.unwrap();
         // calling quit ends the connection and event listener tasks
         let _ = connection_task.await;
         Ok(())
     }
 
@@ -147,14 +163,14 @@ mod test {
         plan: QueryPlan,
     }
 
     #[tokio::test(flavor = "multi_thread")]
     async fn apq() -> Result<(), BoxError> {
-        let config = RedisConfig::from_url("redis://127.0.0.1:6379")?;
+        let config = RedisConfig::from_url("redis://127.0.0.1:6379").unwrap();
         let client = RedisClient::new(config, None, None, None);
         let connection_task = client.connect();
-        client.wait_for_connect().await?;
+        client.wait_for_connect().await.unwrap();
 
         let config = json!({
             "apq": {
                 "router": {
                     "cache": {
@@ -170,14 +186,16 @@ mod test {
             }
         });
 
         let router = apollo_router::TestHarness::builder()
             .with_subgraph_network_requests()
-            .configuration_json(config.clone())?
+            .configuration_json(config.clone())
+            .unwrap()
             .schema(include_str!("../fixtures/supergraph.graphql"))
             .build_router()
-            .await?;
+            .await
+            .unwrap();
 
         let query_hash = "4c45433039407593557f8a982dafd316a66ec03f0e1ed5fa1b7ef8060d76e8ec";
 
         client
             .del::<String, _>(&format!("apq:{query_hash}"))
@@ -192,23 +210,26 @@ mod test {
         // an APQ should fail if we do not know about the hash
         // it should not set a value in Redis
         let request: router::Request = supergraph::Request::fake_builder()
             .extension("persistedQuery", persisted.clone())
             .method(Method::POST)
-            .build()?
+            .build()
+            .unwrap()
             .try_into()
             .unwrap();
 
         let res = router
             .clone()
             .oneshot(request)
-            .await?
+            .await
+            .unwrap()
             .into_graphql_response_stream()
             .await
             .next()
             .await
-            .unwrap()?;
+            .unwrap()
+            .unwrap();
         assert_eq!(
             res.errors.first().unwrap().message,
             "PersistedQueryNotFound"
         );
         let r: Option<String> = client.get(&format!("apq:{query_hash}")).await.unwrap();
@@ -218,70 +239,78 @@ mod test {
         // it should set a value in Redis
         let request: router::Request = supergraph::Request::fake_builder()
             .query(r#"{ topProducts { name name2:name } }"#)
             .extension("persistedQuery", persisted.clone())
             .method(Method::POST)
-            .build()?
+            .build()
+            .unwrap()
             .try_into()
             .unwrap();
 
         let res = router
             .clone()
             .oneshot(request)
-            .await?
+            .await
+            .unwrap()
             .into_graphql_response_stream()
             .await
             .next()
             .await
-            .unwrap()?;
+            .unwrap()
+            .unwrap();
         assert!(res.data.is_some());
         assert!(res.errors.is_empty());
 
         let s: Option<String> = client.get(&format!("apq:{query_hash}")).await.unwrap();
         insta::assert_display_snapshot!(s.unwrap());
 
         // we start a new router with the same config
         // it should have the same connection to Redis, but the in memory cache has been reset
         let router = apollo_router::TestHarness::builder()
             .with_subgraph_network_requests()
-            .configuration_json(config.clone())?
+            .configuration_json(config.clone())
+            .unwrap()
             .schema(include_str!("../fixtures/supergraph.graphql"))
             .build_router()
-            .await?;
+            .await
+            .unwrap();
 
         // a request with only the hash should succeed because it is stored in Redis
         let request: router::Request = supergraph::Request::fake_builder()
             .extension("persistedQuery", persisted.clone())
             .method(Method::POST)
-            .build()?
+            .build()
+            .unwrap()
             .try_into()
             .unwrap();
 
         let res = router
             .clone()
             .oneshot(request)
-            .await?
+            .await
+            .unwrap()
             .into_graphql_response_stream()
             .await
             .next()
             .await
-            .unwrap()?;
+            .unwrap()
+            .unwrap();
         assert!(res.data.is_some());
         assert!(res.errors.is_empty());
 
-        client.quit().await?;
+        client.quit().await.unwrap();
         // calling quit ends the connection and event listener tasks
         let _ = connection_task.await;
         Ok(())
     }
 
     #[tokio::test(flavor = "multi_thread")]
     async fn entity_cache() -> Result<(), BoxError> {
-        let config = RedisConfig::from_url("redis://127.0.0.1:6379")?;
+        let config = RedisConfig::from_url("redis://127.0.0.1:6379").unwrap();
         let client = RedisClient::new(config, None, None, None);
         let connection_task = client.connect();
-        client.wait_for_connect().await?;
+        client.wait_for_connect().await.unwrap();
 
         let mut subgraphs = MockedSubgraphs::default();
         subgraphs.insert(
             "products",
             MockSubgraph::builder()
@@ -355,38 +384,41 @@ mod test {
                     }
                 },
                 "include_subgraph_errors": {
                     "all": true
                 }
-            }))?
+            }))
+            .unwrap()
             .extra_plugin(subgraphs)
             .schema(include_str!("../fixtures/supergraph-auth.graphql"))
             .build_supergraph()
             .await
             .unwrap();
 
         let request = supergraph::Request::fake_builder()
             .query(r#"{ topProducts { name reviews { body } } }"#)
             .method(Method::POST)
-            .build()?;
+            .build()
+            .unwrap();
 
         let response = supergraph
             .oneshot(request)
-            .await?
+            .await
+            .unwrap()
             .next_response()
             .await
             .unwrap();
         insta::assert_json_snapshot!(response);
 
         let s:String = client
-          .get("subgraph:products:Query:07bd08ba4eb8b85451edd3b3aae3c3ad3dc0892d86deedde6e6d53f6415f807f:d9d84a3c7ffc27b0190a671212f3740e5b8478e84e23825830e97822e25cf05c")
+          .get("subgraph:products:Query:0df945dc1bc08f7fc02e8905b4c72aa9112f29bb7a214e4a38d199f0aa635b48:d9d84a3c7ffc27b0190a671212f3740e5b8478e84e23825830e97822e25cf05c")
           .await
           .unwrap();
         let v: Value = serde_json::from_str(&s).unwrap();
         insta::assert_json_snapshot!(v.as_object().unwrap().get("data").unwrap());
 
-        let s: String = client.get("subgraph:reviews:Product:4911f7a9dbad8a47b8900d65547503a2f3c0359f65c0bc5652ad9b9843281f66:826d5cf03645266e30655c7475530e2d40e0d5978595b0ab16318b1ce87c0fe1:d9d84a3c7ffc27b0190a671212f3740e5b8478e84e23825830e97822e25cf05c").await.unwrap();
+        let s: String = client.get("subgraph:reviews:Product:4911f7a9dbad8a47b8900d65547503a2f3c0359f65c0bc5652ad9b9843281f66:1de543dab57fde0f00247922ccc4f76d4c916ae26a89dd83cd1a62300d0cda20:d9d84a3c7ffc27b0190a671212f3740e5b8478e84e23825830e97822e25cf05c").await.unwrap();
         let v: Value = serde_json::from_str(&s).unwrap();
         insta::assert_json_snapshot!(v.as_object().unwrap().get("data").unwrap());
 
         // we abuse the query shape to return a response with a different but overlapping set of entities
         let mut subgraphs = MockedSubgraphs::default();
@@ -457,49 +489,52 @@ mod test {
                     }
                 },
                 "include_subgraph_errors": {
                     "all": true
                 }
-            }))?
+            }))
+            .unwrap()
             .extra_plugin(subgraphs)
             .schema(include_str!("../fixtures/supergraph-auth.graphql"))
             .build_supergraph()
             .await
             .unwrap();
 
         let request = supergraph::Request::fake_builder()
             .query(r#"{ topProducts(first: 2) { name reviews { body } } }"#)
             .method(Method::POST)
-            .build()?;
+            .build()
+            .unwrap();
 
         let response = supergraph
             .oneshot(request)
-            .await?
+            .await
+            .unwrap()
             .next_response()
             .await
             .unwrap();
         insta::assert_json_snapshot!(response);
 
         let s:String = client
-        .get("subgraph:reviews:Product:d9a4cd73308dd13ca136390c10340823f94c335b9da198d2339c886c738abf0d:826d5cf03645266e30655c7475530e2d40e0d5978595b0ab16318b1ce87c0fe1:d9d84a3c7ffc27b0190a671212f3740e5b8478e84e23825830e97822e25cf05c")
+        .get("subgraph:reviews:Product:d9a4cd73308dd13ca136390c10340823f94c335b9da198d2339c886c738abf0d:1de543dab57fde0f00247922ccc4f76d4c916ae26a89dd83cd1a62300d0cda20:d9d84a3c7ffc27b0190a671212f3740e5b8478e84e23825830e97822e25cf05c")
         .await
         .unwrap();
         let v: Value = serde_json::from_str(&s).unwrap();
         insta::assert_json_snapshot!(v.as_object().unwrap().get("data").unwrap());
 
-        client.quit().await?;
+        client.quit().await.unwrap();
         // calling quit ends the connection and event listener tasks
         let _ = connection_task.await;
         Ok(())
     }
 
     #[tokio::test(flavor = "multi_thread")]
     async fn entity_cache_authorization() -> Result<(), BoxError> {
-        let config = RedisConfig::from_url("redis://127.0.0.1:6379")?;
+        let config = RedisConfig::from_url("redis://127.0.0.1:6379").unwrap();
         let client = RedisClient::new(config, None, None, None);
         let connection_task = client.connect();
-        client.wait_for_connect().await?;
+        client.wait_for_connect().await.unwrap();
 
         let mut subgraphs = MockedSubgraphs::default();
         subgraphs.insert(
             "accounts",
             MockSubgraph::builder().with_json(
@@ -657,11 +692,12 @@ mod test {
                     }
                 },
                 "include_subgraph_errors": {
                     "all": true
                 }
-            }))?
+            }))
+            .unwrap()
             .extra_plugin(subgraphs)
             .schema(include_str!("../fixtures/supergraph-auth.graphql"))
             .build_supergraph()
             .await
             .unwrap();
@@ -677,23 +713,25 @@ mod test {
             .query(
                 r#"{ me { id name } topProducts { name reviews { body author { username } } } }"#,
             )
             .context(context)
             .method(Method::POST)
-            .build()?;
+            .build()
+            .unwrap();
 
         let response = supergraph
             .clone()
             .oneshot(request)
-            .await?
+            .await
+            .unwrap()
             .next_response()
             .await
             .unwrap();
         insta::assert_json_snapshot!(response);
 
         let s:String = client
-          .get("subgraph:products:Query:07bd08ba4eb8b85451edd3b3aae3c3ad3dc0892d86deedde6e6d53f6415f807f:d9d84a3c7ffc27b0190a671212f3740e5b8478e84e23825830e97822e25cf05c")
+          .get("subgraph:products:Query:0df945dc1bc08f7fc02e8905b4c72aa9112f29bb7a214e4a38d199f0aa635b48:d9d84a3c7ffc27b0190a671212f3740e5b8478e84e23825830e97822e25cf05c")
           .await
           .unwrap();
         let v: Value = serde_json::from_str(&s).unwrap();
         assert_eq!(
             v.as_object().unwrap().get("data").unwrap(),
@@ -710,11 +748,11 @@ mod test {
                 }]
             }}
         );
 
         let s: String = client
-        .get("subgraph:reviews:Product:4911f7a9dbad8a47b8900d65547503a2f3c0359f65c0bc5652ad9b9843281f66:826d5cf03645266e30655c7475530e2d40e0d5978595b0ab16318b1ce87c0fe1:d9d84a3c7ffc27b0190a671212f3740e5b8478e84e23825830e97822e25cf05c")
+        .get("subgraph:reviews:Product:4911f7a9dbad8a47b8900d65547503a2f3c0359f65c0bc5652ad9b9843281f66:1de543dab57fde0f00247922ccc4f76d4c916ae26a89dd83cd1a62300d0cda20:d9d84a3c7ffc27b0190a671212f3740e5b8478e84e23825830e97822e25cf05c")
         .await
         .unwrap();
         let v: Value = serde_json::from_str(&s).unwrap();
         assert_eq!(
             v.as_object().unwrap().get("data").unwrap(),
@@ -742,23 +780,25 @@ mod test {
             .query(
                 r#"{ me { id name } topProducts { name reviews { body author { username } } } }"#,
             )
             .context(context)
             .method(Method::POST)
-            .build()?;
+            .build()
+            .unwrap();
 
         let response = supergraph
             .clone()
             .oneshot(request)
-            .await?
+            .await
+            .unwrap()
             .next_response()
             .await
             .unwrap();
         insta::assert_json_snapshot!(response);
 
         let s:String = client
-          .get("subgraph:reviews:Product:4911f7a9dbad8a47b8900d65547503a2f3c0359f65c0bc5652ad9b9843281f66:c75297b98da101021e30020db99a3a11c2f9ac2008de94ce410c47940162e304:d9d84a3c7ffc27b0190a671212f3740e5b8478e84e23825830e97822e25cf05c")
+          .get("subgraph:reviews:Product:4911f7a9dbad8a47b8900d65547503a2f3c0359f65c0bc5652ad9b9843281f66:3b6ef3c8fd34c469d59f513942c5f4c8f91135e828712de2024e2cd4613c50ae:d9d84a3c7ffc27b0190a671212f3740e5b8478e84e23825830e97822e25cf05c")
           .await
           .unwrap();
         let v: Value = serde_json::from_str(&s).unwrap();
         assert_eq!(
             v.as_object().unwrap().get("data").unwrap(),
@@ -787,22 +827,24 @@ mod test {
             .query(
                 r#"{ me { id name } topProducts { name reviews { body author { username } } } }"#,
             )
             .context(context)
             .method(Method::POST)
-            .build()?;
+            .build()
+            .unwrap();
 
         let response = supergraph
             .clone()
             .oneshot(request)
-            .await?
+            .await
+            .unwrap()
             .next_response()
             .await
             .unwrap();
         insta::assert_json_snapshot!(response);
 
-        client.quit().await?;
+        client.quit().await.unwrap();
         // calling quit ends the connection and event listener tasks
         let _ = connection_task.await;
         Ok(())
     }
 
diff --git a/apollo-router/tests/integration/snapshots/integration_tests__integration__redis__test__query_planner.snap b/apollo-router/tests/integration/snapshots/integration_tests__integration__redis__test__query_planner.snap
index 1fad999d1..4714fe224 100644
--- a/apollo-router/tests/integration/snapshots/integration_tests__integration__redis__test__query_planner.snap
+++ b/apollo-router/tests/integration/snapshots/integration_tests__integration__redis__test__query_planner.snap
@@ -10,11 +10,11 @@ expression: query_plan
   "operationName": null,
   "operationKind": "query",
   "id": null,
   "inputRewrites": null,
   "outputRewrites": null,
-  "schemaAwareHash": "af1ee357bc75cfbbcc6adda41089a56e7d1d52f6d44c049739dde2c259314f58",
+  "schemaAwareHash": "121b9859eba2d8fa6dde0a54b6e3781274cf69f7ffb0af912e92c01c6bfff6ca",
   "authorization": {
     "is_authenticated": false,
     "scopes": [],
     "policies": []
   }
diff --git a/dockerfiles/tracing/docker-compose.datadog.yml b/dockerfiles/tracing/docker-compose.datadog.yml
index f8558665b..df9995368 100644
--- a/dockerfiles/tracing/docker-compose.datadog.yml
+++ b/dockerfiles/tracing/docker-compose.datadog.yml
@@ -1,11 +1,11 @@
 version: "3.9"
 services:
 
   apollo-router:
     container_name: apollo-router
-    image: ghcr.io/apollographql/router:v1.45.0
+    image: ghcr.io/apollographql/router:v1.45.1
     volumes:
       - ./supergraph.graphql:/etc/config/supergraph.graphql
       - ./router/datadog.router.yaml:/etc/config/configuration.yaml
     command:
       [
diff --git a/dockerfiles/tracing/docker-compose.jaeger.yml b/dockerfiles/tracing/docker-compose.jaeger.yml
index 6d224643a..4d3f756a8 100644
--- a/dockerfiles/tracing/docker-compose.jaeger.yml
+++ b/dockerfiles/tracing/docker-compose.jaeger.yml
@@ -2,11 +2,11 @@ version: "3.9"
 services:
 
   apollo-router:
     container_name: apollo-router
     #build: ./router
-    image: ghcr.io/apollographql/router:v1.45.0
+    image: ghcr.io/apollographql/router:v1.45.1
     volumes:
       - ./supergraph.graphql:/etc/config/supergraph.graphql
       - ./router/jaeger.router.yaml:/etc/config/configuration.yaml
     command:
       [
diff --git a/dockerfiles/tracing/docker-compose.zipkin.yml b/dockerfiles/tracing/docker-compose.zipkin.yml
index 8dbfeb308..f4887b62e 100644
--- a/dockerfiles/tracing/docker-compose.zipkin.yml
+++ b/dockerfiles/tracing/docker-compose.zipkin.yml
@@ -2,11 +2,11 @@ version: "3.9"
 services:
 
   apollo-router:
     container_name: apollo-router
     build: ./router
-    image: ghcr.io/apollographql/router:v1.45.0
+    image: ghcr.io/apollographql/router:v1.45.1
     volumes:
       - ./supergraph.graphql:/etc/config/supergraph.graphql
       - ./router/zipkin.router.yaml:/etc/config/configuration.yaml
     command:
       [
diff --git a/helm/chart/router/Chart.yaml b/helm/chart/router/Chart.yaml
index f5080d2a4..a2882ca4c 100644
--- a/helm/chart/router/Chart.yaml
+++ b/helm/chart/router/Chart.yaml
@@ -18,12 +18,12 @@ type: application
 
 # This is the chart version, but we have chosen to match it with our appVersion
 # so it matches the shape of our release process and release automation.
 # By proxy of that decision, this version uses SemVer 2.0.0, though the prefix
 # of "v" is not included.
-version: 1.45.0
+version: 1.45.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v1.45.0"
+appVersion: "v1.45.1"
diff --git a/helm/chart/router/README.md b/helm/chart/router/README.md
index bb2f7a13b..287502706 100644
--- a/helm/chart/router/README.md
+++ b/helm/chart/router/README.md
@@ -1,27 +1,27 @@
 # router
 
 [router](https://github.com/apollographql/router) Rust Graph Routing runtime for Apollo Federation
 
-![Version: 1.45.0](https://img.shields.io/badge/Version-1.45.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.45.0](https://img.shields.io/badge/AppVersion-v1.45.0-informational?style=flat-square)
+![Version: 1.45.1](https://img.shields.io/badge/Version-1.45.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.45.1](https://img.shields.io/badge/AppVersion-v1.45.1-informational?style=flat-square)
 
 ## Prerequisites
 
 * Kubernetes v1.19+
 
 ## Get Repo Info
 
 ```console
-helm pull oci://ghcr.io/apollographql/helm-charts/router --version 1.45.0
+helm pull oci://ghcr.io/apollographql/helm-charts/router --version 1.45.1
 ```
 
 ## Install Chart
 
 **Important:** only helm3 is supported
 
 ```console
-helm upgrade --install [RELEASE_NAME] oci://ghcr.io/apollographql/helm-charts/router --version 1.45.0 --values my-values.yaml
+helm upgrade --install [RELEASE_NAME] oci://ghcr.io/apollographql/helm-charts/router --version 1.45.1 --values my-values.yaml
 ```
 
 _See [configuration](#configuration) below._
 
 ## Configuration
diff --git a/licenses.html b/licenses.html
index 730fe407d..1e2c8a0a0 100644
--- a/licenses.html
+++ b/licenses.html
@@ -42,11 +42,11 @@
             <p>This page lists the licenses of the dependencies used in the Apollo router.</p>
         </div>
     
         <h2>Overview of licenses:</h2>
         <ul class="licenses-overview">
-            <li><a href="#Apache-2.0">Apache License 2.0</a> (508)</li>
+            <li><a href="#Apache-2.0">Apache License 2.0</a> (481)</li>
             <li><a href="#MIT">MIT License</a> (154)</li>
             <li><a href="#BSD-3-Clause">BSD 3-Clause &quot;New&quot; or &quot;Revised&quot; License</a> (12)</li>
             <li><a href="#ISC">ISC License</a> (11)</li>
             <li><a href="#BSD-2-Clause">BSD 2-Clause &quot;Simplified&quot; License</a> (3)</li>
             <li><a href="#Elastic-2.0">Elastic License 2.0</a> (3)</li>
@@ -4650,208 +4650,10 @@
       defend, and hold each Contributor harmless for any liability
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
-</pre>
-            </li>
-            <li class="license">
-                <h3 id="Apache-2.0">Apache License 2.0</h3>
-                <h4>Used by:</h4>
-                <ul class="license-used-by">
-                    <li><a href=" https://github.com/yoshuawuyts/kv-log-macro ">kv-log-macro</a></li>
-                </ul>
-                <pre class="license-text">                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      &quot;License&quot; shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      &quot;Licensor&quot; shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      &quot;Legal Entity&quot; shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      &quot;control&quot; means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      &quot;You&quot; (or &quot;Your&quot;) shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      &quot;Source&quot; form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      &quot;Object&quot; form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      &quot;Work&quot; shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      &quot;Derivative Works&quot; shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      &quot;Contribution&quot; shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, &quot;submitted&quot;
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as &quot;Not a Contribution.&quot;
-
-      &quot;Contributor&quot; shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a &quot;NOTICE&quot; text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an &quot;AS IS&quot; BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   Copyright 2019 Yoshua Wuyts
-
-   Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
 </pre>
             </li>
             <li class="license">
                 <h3 id="Apache-2.0">Apache License 2.0</h3>
                 <h4>Used by:</h4>
@@ -8409,30 +8211,17 @@ limitations under the License.</pre>
                     <li><a href=" https://github.com/gimli-rs/addr2line ">addr2line</a></li>
                     <li><a href=" https://github.com/tkaitchuck/ahash ">ahash</a></li>
                     <li><a href=" https://github.com/rust-fuzz/arbitrary/ ">arbitrary</a></li>
                     <li><a href=" https://github.com/vorner/arc-swap ">arc-swap</a></li>
                     <li><a href=" https://github.com/smol-rs/async-channel ">async-channel</a></li>
-                    <li><a href=" https://github.com/smol-rs/async-channel ">async-channel</a></li>
                     <li><a href=" https://github.com/Nullus157/async-compression ">async-compression</a></li>
-                    <li><a href=" https://github.com/smol-rs/async-executor ">async-executor</a></li>
-                    <li><a href=" https://github.com/Keruspe/async-global-executor ">async-global-executor</a></li>
-                    <li><a href=" https://github.com/smol-rs/async-io ">async-io</a></li>
-                    <li><a href=" https://github.com/smol-rs/async-io ">async-io</a></li>
-                    <li><a href=" https://github.com/smol-rs/async-lock ">async-lock</a></li>
-                    <li><a href=" https://github.com/smol-rs/async-lock ">async-lock</a></li>
-                    <li><a href=" https://github.com/smol-rs/async-process ">async-process</a></li>
-                    <li><a href=" https://github.com/smol-rs/async-signal ">async-signal</a></li>
-                    <li><a href=" https://github.com/async-rs/async-std ">async-std</a></li>
-                    <li><a href=" https://github.com/smol-rs/async-task ">async-task</a></li>
-                    <li><a href=" https://github.com/smol-rs/atomic-waker ">atomic-waker</a></li>
                     <li><a href=" https://github.com/cuviper/autocfg ">autocfg</a></li>
                     <li><a href=" https://github.com/rust-lang/backtrace-rs ">backtrace</a></li>
                     <li><a href=" https://github.com/marshallpierce/rust-base64 ">base64</a></li>
                     <li><a href=" https://github.com/marshallpierce/rust-base64 ">base64</a></li>
                     <li><a href=" https://github.com/bitflags/bitflags ">bitflags</a></li>
                     <li><a href=" https://github.com/bitflags/bitflags ">bitflags</a></li>
-                    <li><a href=" https://github.com/smol-rs/blocking ">blocking</a></li>
                     <li><a href=" https://github.com/BurntSushi/bstr ">bstr</a></li>
                     <li><a href=" https://github.com/fitzgen/bumpalo ">bumpalo</a></li>
                     <li><a href=" https://github.com/vorner/bytes-utils ">bytes-utils</a></li>
                     <li><a href=" https://github.com/rust-lang/cc-rs ">cc</a></li>
                     <li><a href=" https://github.com/alexcrichton/cfg-if ">cfg-if</a></li>
@@ -8451,24 +8240,20 @@ limitations under the License.</pre>
                     <li><a href=" https://github.com/rust-fuzz/arbitrary ">derive_arbitrary</a></li>
                     <li><a href=" https://github.com/bluss/either ">either</a></li>
                     <li><a href=" https://github.com/sagiegurari/envmnt.git ">envmnt</a></li>
                     <li><a href=" https://github.com/cuviper/equivalent ">equivalent</a></li>
                     <li><a href=" https://github.com/smol-rs/event-listener ">event-listener</a></li>
-                    <li><a href=" https://github.com/smol-rs/event-listener ">event-listener</a></li>
-                    <li><a href=" https://github.com/smol-rs/event-listener ">event-listener</a></li>
-                    <li><a href=" https://github.com/smol-rs/event-listener ">event-listener-strategy</a></li>
                     <li><a href=" https://github.com/smol-rs/fastrand ">fastrand</a></li>
                     <li><a href=" https://github.com/smol-rs/fastrand ">fastrand</a></li>
                     <li><a href=" https://github.com/alexcrichton/filetime ">filetime</a></li>
                     <li><a href=" https://github.com/petgraph/fixedbitset ">fixedbitset</a></li>
                     <li><a href=" https://github.com/rust-lang/flate2-rs ">flate2</a></li>
                     <li><a href=" https://github.com/servo/rust-fnv ">fnv</a></li>
                     <li><a href=" https://github.com/servo/rust-url ">form_urlencoded</a></li>
                     <li><a href=" https://github.com/dnsl48/fraction.git ">fraction</a></li>
                     <li><a href=" https://github.com/sagiegurari/fsio.git ">fsio</a></li>
                     <li><a href=" https://github.com/smol-rs/futures-lite ">futures-lite</a></li>
-                    <li><a href=" https://github.com/smol-rs/futures-lite ">futures-lite</a></li>
                     <li><a href=" https://github.com/gimli-rs/gimli ">gimli</a></li>
                     <li><a href=" https://github.com/rust-lang/git2-rs ">git2</a></li>
                     <li><a href=" https://github.com/zkcrypto/group ">group</a></li>
                     <li><a href=" https://github.com/rust-lang/hashbrown ">hashbrown</a></li>
                     <li><a href=" https://github.com/rust-lang/hashbrown ">hashbrown</a></li>
@@ -8483,11 +8268,10 @@ limitations under the License.</pre>
                     <li><a href=" https://github.com/servo/rust-url/ ">idna</a></li>
                     <li><a href=" https://github.com/lambda-fairy/if_chain ">if_chain</a></li>
                     <li><a href=" https://github.com/bluss/indexmap ">indexmap</a></li>
                     <li><a href=" https://github.com/indexmap-rs/indexmap ">indexmap</a></li>
                     <li><a href=" https://github.com/dtolnay/inventory ">inventory</a></li>
-                    <li><a href=" https://github.com/sunfishcode/io-lifetimes ">io-lifetimes</a></li>
                     <li><a href=" https://github.com/liranringel/ipconfig ">ipconfig</a></li>
                     <li><a href=" https://github.com/rust-itertools/itertools ">itertools</a></li>
                     <li><a href=" https://github.com/rust-itertools/itertools ">itertools</a></li>
                     <li><a href=" https://github.com/rust-itertools/itertools ">itertools</a></li>
                     <li><a href=" https://github.com/alexcrichton/jobserver-rs ">jobserver</a></li>
@@ -8497,11 +8281,10 @@ limitations under the License.</pre>
                     <li><a href=" https://github.com/rust-lang/git2-rs ">libgit2-sys</a></li>
                     <li><a href=" https://github.com/rust-lang/libm ">libm</a></li>
                     <li><a href=" https://github.com/rust-lang/libz-sys ">libz-ng-sys</a></li>
                     <li><a href=" https://github.com/rust-lang/libz-sys ">libz-sys</a></li>
                     <li><a href=" https://github.com/sunfishcode/linux-raw-sys ">linux-raw-sys</a></li>
-                    <li><a href=" https://github.com/sunfishcode/linux-raw-sys ">linux-raw-sys</a></li>
                     <li><a href=" https://github.com/Amanieu/parking_lot ">lock_api</a></li>
                     <li><a href=" https://github.com/rust-lang/log ">log</a></li>
                     <li><a href=" https://github.com/bluss/maplit ">maplit</a></li>
                     <li><a href=" https://github.com/gnzlbg/match_cfg ">match_cfg</a></li>
                     <li><a href=" https://github.com/hyperium/mime ">mime</a></li>
@@ -8529,14 +8312,12 @@ limitations under the License.</pre>
                     <li><a href=" https://github.com/pest-parser/pest ">pest</a></li>
                     <li><a href=" https://github.com/pest-parser/pest ">pest_derive</a></li>
                     <li><a href=" https://github.com/pest-parser/pest ">pest_generator</a></li>
                     <li><a href=" https://github.com/pest-parser/pest ">pest_meta</a></li>
                     <li><a href=" https://github.com/petgraph/petgraph ">petgraph</a></li>
-                    <li><a href=" https://github.com/notgull/piper ">piper</a></li>
                     <li><a href=" https://github.com/rust-lang/pkg-config-rs ">pkg-config</a></li>
                     <li><a href=" https://github.com/rustsec/rustsec/tree/main/platforms ">platforms</a></li>
-                    <li><a href=" https://github.com/smol-rs/polling ">polling</a></li>
                     <li><a href=" https://github.com/alexcrichton/proc-macro2 ">proc-macro2</a></li>
                     <li><a href=" https://github.com/tokio-rs/prost ">prost</a></li>
                     <li><a href=" https://github.com/tokio-rs/prost ">prost</a></li>
                     <li><a href=" https://github.com/tokio-rs/prost ">prost-build</a></li>
                     <li><a href=" https://github.com/tokio-rs/prost ">prost-derive</a></li>
@@ -8554,11 +8335,10 @@ limitations under the License.</pre>
                     <li><a href=" https://github.com/alexcrichton/rustc-demangle ">rustc-demangle</a></li>
                     <li><a href=" https://github.com/rust-lang-nursery/rustc-hash ">rustc-hash</a></li>
                     <li><a href=" https://github.com/Kimundi/rustc-version-rs ">rustc_version</a></li>
                     <li><a href=" https://github.com/Kimundi/rustc-version-rs ">rustc_version</a></li>
                     <li><a href=" https://github.com/bytecodealliance/rustix ">rustix</a></li>
-                    <li><a href=" https://github.com/bytecodealliance/rustix ">rustix</a></li>
                     <li><a href=" https://github.com/rustls/rustls ">rustls</a></li>
                     <li><a href=" https://github.com/ctz/rustls-native-certs ">rustls-native-certs</a></li>
                     <li><a href=" https://github.com/rustls/pemfile ">rustls-pemfile</a></li>
                     <li><a href=" https://github.com/bluss/scopeguard ">scopeguard</a></li>
                     <li><a href=" https://github.com/ctz/sct.rs ">sct</a></li>
@@ -8572,11 +8352,10 @@ limitations under the License.</pre>
                     <li><a href=" https://gitlab.com/ijackson/rust-shellexpand ">shellexpand</a></li>
                     <li><a href=" https://github.com/vorner/signal-hook ">signal-hook-registry</a></li>
                     <li><a href=" https://github.com/mitsuhiko/similar ">similar</a></li>
                     <li><a href=" https://github.com/servo/rust-smallvec ">smallvec</a></li>
                     <li><a href=" https://github.com/rust-lang/socket2 ">socket2</a></li>
-                    <li><a href=" https://github.com/rust-lang/socket2 ">socket2</a></li>
                     <li><a href=" https://github.com/storyyeller/stable_deref_trait ">stable_deref_trait</a></li>
                     <li><a href=" https://github.com/dtolnay/syn ">syn</a></li>
                     <li><a href=" https://github.com/dtolnay/syn ">syn</a></li>
                     <li><a href=" https://github.com/Stebalien/tempfile ">tempfile</a></li>
                     <li><a href=" https://github.com/Amanieu/thread_local-rs ">thread_local</a></li>
@@ -8597,11 +8376,10 @@ limitations under the License.</pre>
                     <li><a href=" https://github.com/unicode-rs/unicode-normalization ">unicode-normalization</a></li>
                     <li><a href=" https://github.com/unicode-rs/unicode-width ">unicode-width</a></li>
                     <li><a href=" https://github.com/unicode-rs/unicode-xid ">unicode-xid</a></li>
                     <li><a href=" https://github.com/servo/rust-url ">url</a></li>
                     <li><a href=" https://github.com/uuid-rs/uuid ">uuid</a></li>
-                    <li><a href=" https://github.com/sval-rs/value-bag ">value-bag</a></li>
                     <li><a href=" https://github.com/SergioBenitez/version_check ">version_check</a></li>
                     <li><a href=" https://github.com/stjepang/waker-fn ">waker-fn</a></li>
                     <li><a href=" https://github.com/bytecodealliance/wasi ">wasi</a></li>
                     <li><a href=" https://github.com/bytecodealliance/wasi ">wasi</a></li>
                     <li><a href=" https://github.com/rustwasm/wasm-bindgen ">wasm-bindgen</a></li>
@@ -11103,11 +10881,10 @@ limitations under the License.</pre>
                 <h3 id="Apache-2.0">Apache License 2.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
                     <li><a href=" https://github.com/yaahc/displaydoc ">displaydoc</a></li>
                     <li><a href=" https://github.com/async-rs/futures-timer ">futures-timer</a></li>
-                    <li><a href=" https://github.com/smol-rs/polling ">polling</a></li>
                     <li><a href=" https://github.com/rust-analyzer/text-size ">text-size</a></li>
                 </ul>
                 <pre class="license-text">                              Apache License
                         Version 2.0, January 2004
                      http://www.apache.org/licenses/
@@ -12415,11 +12192,10 @@ limitations under the License.
                     <li><a href=" https://github.com/dalek-cryptography/curve25519-dalek ">curve25519-dalek-derive</a></li>
                     <li><a href=" https://github.com/bikeshedder/deadpool ">deadpool-runtime</a></li>
                     <li><a href=" https://github.com/nrc/proc-macro-rules ">deno-proc-macro-rules</a></li>
                     <li><a href=" https://github.com/nrc/proc-macro-rules ">deno-proc-macro-rules-macros</a></li>
                     <li><a href=" https://gitlab.com/kornelski/dunce ">dunce</a></li>
-                    <li><a href=" https://github.com/rustwasm/gloo/tree/master/crates/timers ">gloo-timers</a></li>
                     <li><a href=" https://github.com/graphql-rust/graphql-client ">graphql-introspection-query</a></li>
                     <li><a href=" https://github.com/graphql-rust/graphql-client ">graphql_client</a></li>
                     <li><a href=" https://github.com/graphql-rust/graphql-client ">graphql_client_codegen</a></li>
                     <li><a href=" https://github.com/graphql-rust/graphql-client ">graphql_query_derive</a></li>
                     <li><a href=" https://gitlab.com/kornelski/http-serde ">http-serde</a></li>
diff --git a/scripts/install.sh b/scripts/install.sh
index 8f5c6c2fa..e938a1fc4 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -9,11 +9,11 @@ set -u
 
 BINARY_DOWNLOAD_PREFIX="https://github.com/apollographql/router/releases/download"
 
 # Router version defined in apollo-router's Cargo.toml
 # Note: Change this line manually during the release steps.
-PACKAGE_VERSION="v1.45.0"
+PACKAGE_VERSION="v1.45.1"
 
 download_binary() {
     downloader --check
     need_cmd mktemp
     need_cmd chmod

Vulnerable code:       xcode: 14.2
      xcode: 14.2
            TARGET_BRANCH=$(git rev-parse --abbrev-ref origin/HEAD)    
                  docker save -o built-containers/router_${VERSION}.tar ${ROUTER_TAG}:${VERSION}  
                 
          # Toggle off to prevent any CI failures OR 
          # contact Apollo's Security team to adjust what violates the 
  
version = "1.45.0"
version = "1.45.0"
version = "1.45.0"
version = "1.45.0"
version = "1.45.0"
apollo-router = "1.45.0"
apollo-router-scaffold = { git = "https://github.com/apollographql/router.git", tag = "v1.45.0" }
version = "1.45.0"
          "schemaAwareHash": "9358047754b11522aac502a3c6a668cd4286c07d489680834e63d6e033db4eb5",
              "schemaAwareHash": "8f445761c0bcdda90b8da35ccd13fd98e474514f3efc071bd2c39495b5af94e5",
                "schemaAwareHash": "9a1feab7ee8c57c8a4ab4db29712412a9cfe94009bfcb40dc0d22ea54c410865",
              "schemaAwareHash": "34be619a78867ab9d0670048f4c93574e38cd9253e9cc032f567078355b25086",
                "schemaAwareHash": "f1582d942020b23347d84f6ae46c018492ae7c59c9b1472e0b442121ddf16368",
                    "schemaAwareHash": "6fa5a74c5af2b18f343e9e69bbcbc9335e9faaa46c3d8964d199002dfeb0026f",
                    "schemaAwareHash": "6fa5a74c5af2b18f343e9e69bbcbc9335e9faaa46c3d8964d199002dfeb0026f",
              "schemaAwareHash": "34be619a78867ab9d0670048f4c93574e38cd9253e9cc032f567078355b25086",
                "schemaAwareHash": "f1582d942020b23347d84f6ae46c018492ae7c59c9b1472e0b442121ddf16368",
                    "schemaAwareHash": "6fa5a74c5af2b18f343e9e69bbcbc9335e9faaa46c3d8964d199002dfeb0026f",
                    "schemaAwareHash": "6fa5a74c5af2b18f343e9e69bbcbc9335e9faaa46c3d8964d199002dfeb0026f",

#[cfg(not(windows))] // git checkout converts \n to \r\n, making == below fail
#[test]
fn check_reports_proto_is_up_to_date() {
    let proto_url = "https://usage-reporting.api.apollographql.com/proto/reports.proto";
    let response = reqwest::blocking::get(proto_url).unwrap();
    let content = response.text().unwrap();
    // Not using assert_eq! as printing the entire file would be too verbose
    assert!(
        content == include_str!("proto/reports.proto"),
        "Protobuf file is out of date. Run this command to update it:\n\n    \
            curl -f {proto_url} > apollo-router/src/plugins/telemetry/proto/reports.proto\n\n"
    );
}
        map.insert("subgraph", "apollo.subgraph.name");
                plan.data.query_plan.hash_subqueries(&self.subgraph_schemas);
            let schema = &this.schema.api_schema().definitions;
            match add_defer_labels(schema, &doc.ast) {
                        .to_executable_validate(schema)
                        schema,
    fn hash_subqueries(&mut self, schemas: &HashMap<String, Arc<Valid<apollo_compiler::Schema>>>) {
            node.hash_subqueries(schemas);
    pub(crate) fn hash_subquery(&mut self, schema: &Valid<apollo_compiler::Schema>) {
        if let Ok(hash) = QueryHashVisitor::hash_query(schema, &doc, self.operation_name.as_deref())
        {
                    fetch_node.hash_subquery(schema);
                    node.hash_subqueries(schemas);
                    node.hash_subqueries(schemas);
            PlanNode::Flatten(flatten) => flatten.node.hash_subqueries(schemas),
                    node.hash_subqueries(schemas);
                        new_node.hash_subqueries(schemas);
                    node.hash_subqueries(schemas);
                    node.hash_subqueries(schemas);
                    node.hash_subqueries(schemas);
            "68a86d7602ea2876e77b84d7942f585ef6b6101887bb2979d1f0af3b28c9a0ed",
        let schema = &schema.api_schema().definitions;
        let executable_document = match ast.to_executable_validate(schema) {
        let hash = QueryHashVisitor::hash_query(schema, &executable_document, operation_name)
            .map_err(|e| SpecError::QueryHashing(e.to_string()))?;
        let mut visitor = QueryHashVisitor::new(&schema.definitions, document);
        let mut visitor = QueryHashVisitor::new(schema, executable);
    fn hash(schema: &str, query: &str) -> String {
        let schema = Schema::parse(schema, "schema.graphql")
        let mut visitor = QueryHashVisitor::new(&schema, &exec);
        hex::encode(visitor.finish())
    fn hash_subgraph_query(schema: &str, query: &str) -> String {
        let schema = Valid::assume_valid(Schema::parse(schema, "schema.graphql").unwrap());
        let mut visitor = QueryHashVisitor::new(&schema, &exec);
        assert_eq!(hash(schema1, query), hash(schema2, query));
        assert_ne!(hash(schema1, query), hash(schema2, query));
        assert_eq!(hash(schema1, query), hash(schema2, query));
        assert_ne!(
            hash(schema1, "query { me { id name } }"),
            hash(schema1, "query { me { name id } }")
        );
        assert_eq!(hash(schema1, query), hash(schema2, query));
        assert_ne!(hash(schema1, query), hash(schema2, query));
        assert_ne!(hash(schema1, query), hash(schema2, query));
        assert_eq!(hash(schema1, query), hash(schema2, query));
        assert_ne!(hash(schema1, query), hash(schema2, query));
        assert_ne!(hash(schema1, query), hash(schema2, query));
        assert_ne!(hash(schema1, query), hash(schema2, query));
        assert_ne!(hash(schema1, query), hash(schema2, query));
        assert_ne!(hash(schema1, query), hash(schema2, query));
        assert_ne!(hash(schema1, query), hash(schema2, query));
        assert_ne!(hash(schema1, query), hash(schema2, query));
        assert_ne!(hash(schema1, query), hash(schema2, query));
        assert_ne!(hash(schema1, query), hash(schema2, query));
        assert_ne!(hash(schema1, query), hash(schema2, query));
        assert_ne!(hash(schema1, query), hash(schema2, query));
        let known_cache_key = "plan:v2.7.2:af1ee357bc75cfbbcc6adda41089a56e7d1d52f6d44c049739dde2c259314f58:3973e022e93220f9212c18d0d0c543ae7c309e46640da93a4a0314de999f5112:2bf7810d3a47b31d8a77ebb09cdc784a3f77306827dc55b06770030a858167c7";
        let config = RedisConfig::from_url("redis://127.0.0.1:6379")?;
        client.wait_for_connect().await?;
            }))?
            .await?;
            .build()?;
        let _ = supergraph.oneshot(request).await?.next_response().await;
            }))?
            .await?;
            .build()?;
        let _ = supergraph.oneshot(request).await?.next_response().await;
        client.quit().await?;
        let config = RedisConfig::from_url("redis://127.0.0.1:6379")?;
        client.wait_for_connect().await?;
            .configuration_json(config.clone())?
            .await?;
            .build()?
            .await?
            .unwrap()?;
            .build()?
            .await?
            .unwrap()?;
            .configuration_json(config.clone())?
            .await?;
            .build()?
            .await?
            .unwrap()?;
        client.quit().await?;
        let config = RedisConfig::from_url("redis://127.0.0.1:6379")?;
        client.wait_for_connect().await?;
            }))?
            .build()?;
            .await?
          .get("subgraph:products:Query:07bd08ba4eb8b85451edd3b3aae3c3ad3dc0892d86deedde6e6d53f6415f807f:d9d84a3c7ffc27b0190a671212f3740e5b8478e84e23825830e97822e25cf05c")
        let s: String = client.get("subgraph:reviews:Product:4911f7a9dbad8a47b8900d65547503a2f3c0359f65c0bc5652ad9b9843281f66:826d5cf03645266e30655c7475530e2d40e0d5978595b0ab16318b1ce87c0fe1:d9d84a3c7ffc27b0190a671212f3740e5b8478e84e23825830e97822e25cf05c").await.unwrap();
            }))?
            .build()?;
            .await?
        .get("subgraph:reviews:Product:d9a4cd73308dd13ca136390c10340823f94c335b9da198d2339c886c738abf0d:826d5cf03645266e30655c7475530e2d40e0d5978595b0ab16318b1ce87c0fe1:d9d84a3c7ffc27b0190a671212f3740e5b8478e84e23825830e97822e25cf05c")
        client.quit().await?;
        let config = RedisConfig::from_url("redis://127.0.0.1:6379")?;
        client.wait_for_connect().await?;
            }))?
            .build()?;
            .await?
          .get("subgraph:products:Query:07bd08ba4eb8b85451edd3b3aae3c3ad3dc0892d86deedde6e6d53f6415f807f:d9d84a3c7ffc27b0190a671212f3740e5b8478e84e23825830e97822e25cf05c")
        .get("subgraph:reviews:Product:4911f7a9dbad8a47b8900d65547503a2f3c0359f65c0bc5652ad9b9843281f66:826d5cf03645266e30655c7475530e2d40e0d5978595b0ab16318b1ce87c0fe1:d9d84a3c7ffc27b0190a671212f3740e5b8478e84e23825830e97822e25cf05c")
            .build()?;
            .await?
          .get("subgraph:reviews:Product:4911f7a9dbad8a47b8900d65547503a2f3c0359f65c0bc5652ad9b9843281f66:c75297b98da101021e30020db99a3a11c2f9ac2008de94ce410c47940162e304:d9d84a3c7ffc27b0190a671212f3740e5b8478e84e23825830e97822e25cf05c")
            .build()?;
            .await?
        client.quit().await?;
  "schemaAwareHash": "af1ee357bc75cfbbcc6adda41089a56e7d1d52f6d44c049739dde2c259314f58",
    image: ghcr.io/apollographql/router:v1.45.0
    image: ghcr.io/apollographql/router:v1.45.0
    image: ghcr.io/apollographql/router:v1.45.0
version: 1.45.0
appVersion: "v1.45.0"
![Version: 1.45.0](https://img.shields.io/badge/Version-1.45.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.45.0](https://img.shields.io/badge/AppVersion-v1.45.0-informational?style=flat-square)
helm pull oci://ghcr.io/apollographql/helm-charts/router --version 1.45.0
helm upgrade --install [RELEASE_NAME] oci://ghcr.io/apollographql/helm-charts/router --version 1.45.0 --values my-values.yaml
            <li><a href="#Apache-2.0">Apache License 2.0</a> (508)</li>
</pre>
            </li>
            <li class="license">
                <h3 id="Apache-2.0">Apache License 2.0</h3>
                <h4>Used by:</h4>
                <ul class="license-used-by">
                    <li><a href=" https://github.com/yoshuawuyts/kv-log-macro ">kv-log-macro</a></li>
                </ul>
                <pre class="license-text">                                 Apache License
                           Version 2.0, January 2004
                        http://www.apache.org/licenses/

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

   1. Definitions.

      &quot;License&quot; shall mean the terms and conditions for use, reproduction,
      and distribution as defined by Sections 1 through 9 of this document.

      &quot;Licensor&quot; shall mean the copyright owner or entity authorized by
      the copyright owner that is granting the License.

      &quot;Legal Entity&quot; shall mean the union of the acting entity and all
      other entities that control, are controlled by, or are under common
      control with that entity. For the purposes of this definition,
      &quot;control&quot; means (i) the power, direct or indirect, to cause the
      direction or management of such entity, whether by contract or
      otherwise, or (ii) ownership of fifty percent (50%) or more of the
      outstanding shares, or (iii) beneficial ownership of such entity.

      &quot;You&quot; (or &quot;Your&quot;) shall mean an individual or Legal Entity
      exercising permissions granted by this License.

      &quot;Source&quot; form shall mean the preferred form for making modifications,
      including but not limited to software source code, documentation
      source, and configuration files.

      &quot;Object&quot; form shall mean any form resulting from mechanical
      transformation or translation of a Source form, including but
      not limited to compiled object code, generated documentation,
      and conversions to other media types.

      &quot;Work&quot; shall mean the work of authorship, whether in Source or
      Object form, made available under the License, as indicated by a
      copyright notice that is included in or attached to the work
      (an example is provided in the Appendix below).

      &quot;Derivative Works&quot; shall mean any work, whether in Source or Object
      form, that is based on (or derived from) the Work and for which the
      editorial revisions, annotations, elaborations, or other modifications
      represent, as a whole, an original work of authorship. For the purposes
      of this License, Derivative Works shall not include works that remain
      separable from, or merely link (or bind by name) to the interfaces of,
      the Work and Derivative Works thereof.

      &quot;Contribution&quot; shall mean any work of authorship, including
      the original version of the Work and any modifications or additions
      to that Work or Derivative Works thereof, that is intentionally
      submitted to Licensor for inclusion in the Work by the copyright owner
      or by an individual or Legal Entity authorized to submit on behalf of
      the copyright owner. For the purposes of this definition, &quot;submitted&quot;
      means any form of electronic, verbal, or written communication sent
      to the Licensor or its representatives, including but not limited to
      communication on electronic mailing lists, source code control systems,
      and issue tracking systems that are managed by, or on behalf of, the
      Licensor for the purpose of discussing and improving the Work, but
      excluding communication that is conspicuously marked or otherwise
      designated in writing by the copyright owner as &quot;Not a Contribution.&quot;

      &quot;Contributor&quot; shall mean Licensor and any individual or Legal Entity
      on behalf of whom a Contribution has been received by Licensor and
      subsequently incorporated within the Work.

   2. Grant of Copyright License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      copyright license to reproduce, prepare Derivative Works of,
      publicly display, publicly perform, sublicense, and distribute the
      Work and such Derivative Works in Source or Object form.

   3. Grant of Patent License. Subject to the terms and conditions of
      this License, each Contributor hereby grants to You a perpetual,
      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
      (except as stated in this section) patent license to make, have made,
      use, offer to sell, sell, import, and otherwise transfer the Work,
      where such license applies only to those patent claims licensable
      by such Contributor that are necessarily infringed by their
      Contribution(s) alone or by combination of their Contribution(s)
      with the Work to which such Contribution(s) was submitted. If You
      institute patent litigation against any entity (including a
      cross-claim or counterclaim in a lawsuit) alleging that the Work
      or a Contribution incorporated within the Work constitutes direct
      or contributory patent infringement, then any patent licenses
      granted to You under this License for that Work shall terminate
      as of the date such litigation is filed.

   4. Redistribution. You may reproduce and distribute copies of the
      Work or Derivative Works thereof in any medium, with or without
      modifications, and in Source or Object form, provided that You
      meet the following conditions:

      (a) You must give any other recipients of the Work or
          Derivative Works a copy of this License; and

      (b) You must cause any modified files to carry prominent notices
          stating that You changed the files; and

      (c) You must retain, in the Source form of any Derivative Works
          that You distribute, all copyright, patent, trademark, and
          attribution notices from the Source form of the Work,
          excluding those notices that do not pertain to any part of
          the Derivative Works; and

      (d) If the Work includes a &quot;NOTICE&quot; text file as part of its
          distribution, then any Derivative Works that You distribute must
          include a readable copy of the attribution notices contained
          within such NOTICE file, excluding those notices that do not
          pertain to any part of the Derivative Works, in at least one
          of the following places: within a NOTICE text file distributed
          as part of the Derivative Works; within the Source form or
          documentation, if provided along with the Derivative Works; or,
          within a display generated by the Derivative Works, if and
          wherever such third-party notices normally appear. The contents
          of the NOTICE file are for informational purposes only and
          do not modify the License. You may add Your own attribution
          notices within Derivative Works that You distribute, alongside
          or as an addendum to the NOTICE text from the Work, provided
          that such additional attribution notices cannot be construed
          as modifying the License.

      You may add Your own copyright statement to Your modifications and
      may provide additional or different license terms and conditions
      for use, reproduction, or distribution of Your modifications, or
      for any such Derivative Works as a whole, provided Your use,
      reproduction, and distribution of the Work otherwise complies with
      the conditions stated in this License.

   5. Submission of Contributions. Unless You explicitly state otherwise,
      any Contribution intentionally submitted for inclusion in the Work
      by You to the Licensor shall be under the terms and conditions of
      this License, without any additional terms or conditions.
      Notwithstanding the above, nothing herein shall supersede or modify
      the terms of any separate license agreement you may have executed
      with Licensor regarding such Contributions.

   6. Trademarks. This License does not grant permission to use the trade
      names, trademarks, service marks, or product names of the Licensor,
      except as required for reasonable and customary use in describing the
      origin of the Work and reproducing the content of the NOTICE file.

   7. Disclaimer of Warranty. Unless required by applicable law or
      agreed to in writing, Licensor provides the Work (and each
      Contributor provides its Contributions) on an &quot;AS IS&quot; BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
      implied, including, without limitation, any warranties or conditions
      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
      PARTICULAR PURPOSE. You are solely responsible for determining the
      appropriateness of using or redistributing the Work and assume any
      risks associated with Your exercise of permissions under this License.

   8. Limitation of Liability. In no event and under no legal theory,
      whether in tort (including negligence), contract, or otherwise,
      unless required by applicable law (such as deliberate and grossly
      negligent acts) or agreed to in writing, shall any Contributor be
      liable to You for damages, including any direct, indirect, special,
      incidental, or consequential damages of any character arising as a
      result of this License or out of the use or inability to use the
      Work (including but not limited to damages for loss of goodwill,
      work stoppage, computer failure or malfunction, or any and all
      other commercial damages or losses), even if such Contributor
      has been advised of the possibility of such damages.

   9. Accepting Warranty or Additional Liability. While redistributing
      the Work or Derivative Works thereof, You may choose to offer,
      and charge a fee for, acceptance of support, warranty, indemnity,
      or other liability obligations and/or rights consistent with this
      License. However, in accepting such obligations, You may act only
      on Your own behalf and on Your sole responsibility, not on behalf
      of any other Contributor, and only if You agree to indemnify,
      defend, and hold each Contributor harmless for any liability
      incurred by, or claims asserted against, such Contributor by reason
      of your accepting any such warranty or additional liability.

   END OF TERMS AND CONDITIONS

   Copyright 2019 Yoshua Wuyts

   Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

       http://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
                    <li><a href=" https://github.com/smol-rs/async-channel ">async-channel</a></li>
                    <li><a href=" https://github.com/smol-rs/async-executor ">async-executor</a></li>
                    <li><a href=" https://github.com/Keruspe/async-global-executor ">async-global-executor</a></li>
                    <li><a href=" https://github.com/smol-rs/async-io ">async-io</a></li>
                    <li><a href=" https://github.com/smol-rs/async-io ">async-io</a></li>
                    <li><a href=" https://github.com/smol-rs/async-lock ">async-lock</a></li>
                    <li><a href=" https://github.com/smol-rs/async-lock ">async-lock</a></li>
                    <li><a href=" https://github.com/smol-rs/async-process ">async-process</a></li>
                    <li><a href=" https://github.com/smol-rs/async-signal ">async-signal</a></li>
                    <li><a href=" https://github.com/async-rs/async-std ">async-std</a></li>
                    <li><a href=" https://github.com/smol-rs/async-task ">async-task</a></li>
                    <li><a href=" https://github.com/smol-rs/atomic-waker ">atomic-waker</a></li>
                    <li><a href=" https://github.com/smol-rs/blocking ">blocking</a></li>
                    <li><a href=" https://github.com/smol-rs/event-listener ">event-listener</a></li>
                    <li><a href=" https://github.com/smol-rs/event-listener ">event-listener</a></li>
                    <li><a href=" https://github.com/smol-rs/event-listener ">event-listener-strategy</a></li>
                    <li><a href=" https://github.com/smol-rs/futures-lite ">futures-lite</a></li>
                    <li><a href=" https://github.com/sunfishcode/io-lifetimes ">io-lifetimes</a></li>
                    <li><a href=" https://github.com/sunfishcode/linux-raw-sys ">linux-raw-sys</a></li>
                    <li><a href=" https://github.com/notgull/piper ">piper</a></li>
                    <li><a href=" https://github.com/smol-rs/polling ">polling</a></li>
                    <li><a href=" https://github.com/bytecodealliance/rustix ">rustix</a></li>
                    <li><a href=" https://github.com/rust-lang/socket2 ">socket2</a></li>
                    <li><a href=" https://github.com/sval-rs/value-bag ">value-bag</a></li>
                    <li><a href=" https://github.com/smol-rs/polling ">polling</a></li>
                    <li><a href=" https://github.com/rustwasm/gloo/tree/master/crates/timers ">gloo-timers</a></li>
PACKAGE_VERSION="v1.45.0"
Fixed code:       xcode: "14.2.0"
      xcode: "14.2.0"
            TARGET_BRANCH=$(git rev-parse --abbrev-ref origin/HEAD)
                  docker save -o built-containers/router_${VERSION}.tar ${ROUTER_TAG}:${VERSION}

          # Toggle off to prevent any CI failures OR
          # contact Apollo's Security team to adjust what violates the

# [1.45.1] - 2024-04-26

## 🐛 Fixes

### Correct v1.44.0 regression in query plan cache ([PR #5028](https://github.com/apollographql/router/pull/5028))

Correct a critical regression that was introduced in [v1.44.0](https://github.com/apollographql/router/pull/4883) which could lead to execution of an incorrect query plan.

By [@o0Ignition0o](https://github.com/o0Ignition0o) in https://github.com/apollographql/router/pull/5028

### Use entire schema when hashing an introspection query ([Issue #5006](https://github.com/apollographql/router/issues/5006))

Correct a _different_ hashing bug which impacted introspection queries which was also introduced in [v1.44.0](https://github.com/apollographql/router/pull/4883).  This other hashing bug failed to account for introspection queries, resulting in introspection results being misaligned to the current schema. 

This release fixes the hashing mechanism by adding the schema string to hashed data if an introspection field is encountered. As a result, the entire schema is taken into account and the correct introspection result is returned.

By [@Geal](https://github.com/Geal) in https://github.com/apollographql/router/pull/5007

### Fix subgraph name mapping of Datadog exporter ([PR #5012](https://github.com/apollographql/router/pull/5012))

Previously in the router v1.45.0, subgraph name mapping didn't work correctly in the router's Datadog exporter. The exporter used the incorrect value `apollo.subgraph.name` for mapping attributes when it should have used the value `subgraph.name`. This issue has been fixed in this release.

By [@garypen](https://github.com/garypen) in https://github.com/apollographql/router/pull/5012


> **Warning**
>
> **This version has a critical bug impacting all users.  See the _Fixes_ in [v1.45.1](https://github.com/apollographql/router/releases/tag/v1.45.1) for details.  We highly recommend using v1.45.1 or v1.43.2 over v1.45.0.**

> **Warning**
>
> **This version has a critical bug impacting all users.  See the _Fixes_ in [v1.45.1](https://github.com/apollographql/router/releases/tag/v1.45.1) for details.  We highly recommend using v1.45.1 or v1.43.2 over v1.44.0.**


version = "1.45.1"
version = "1.45.1"
version = "1.45.1"
version = "1.45.1"
version = "1.45.1"
apollo-router = "1.45.1"
apollo-router-scaffold = { git = "https://github.com/apollographql/router.git", tag = "v1.45.1" }
version = "1.45.1"
          "schemaAwareHash": "12dda6193654ae4fe6e38bc09d4f81cc73d0c9e098692096f72d2158eef4776f",
              "schemaAwareHash": "00ad582ea45fc1bce436b36b21512f3d2c47b74fdbdc61e4b349289722c9ecf2",
                "schemaAwareHash": "a8ebdc2151a2e5207882e43c6906c0c64167fd9a8e0c7c4becc47736a5105096",
              "schemaAwareHash": "7245d488e97c3b2ac9f5fa4dd4660940b94ad81af070013305b2c0f76337b2f9",
                "schemaAwareHash": "6e0b4156706ea0cf924500cfdc99dd44b9f0ed07e2d3f888d4aff156e6a33238",
                    "schemaAwareHash": "ff649f3d70241d5a8cd5f5d03ff4c41ecff72b0e4129a480207b05ac92318042",
                    "schemaAwareHash": "bf9f3beda78a7a565e47c862157bad4ec871d724d752218da1168455dddca074",
              "schemaAwareHash": "7245d488e97c3b2ac9f5fa4dd4660940b94ad81af070013305b2c0f76337b2f9",
                "schemaAwareHash": "6e0b4156706ea0cf924500cfdc99dd44b9f0ed07e2d3f888d4aff156e6a33238",
                    "schemaAwareHash": "ff649f3d70241d5a8cd5f5d03ff4c41ecff72b0e4129a480207b05ac92318042",
                    "schemaAwareHash": "bf9f3beda78a7a565e47c862157bad4ec871d724d752218da1168455dddca074",
        map.insert("subgraph", "subgraph.name");
                plan.data
                    .query_plan
                    .hash_subqueries(&self.subgraph_schemas, &self.schema.raw_sdl);
            let api_schema = this.schema.api_schema();
            let api_schema_definitions = &api_schema.definitions;
            match add_defer_labels(api_schema_definitions, &doc.ast) {
                        .to_executable_validate(api_schema_definitions)
                        // Assume transformation creates a valid document: ignore conversion errors
                        api_schema_definitions,
                        &api_schema.raw_sdl,
                &self.schema.raw_sdl,
    fn hash_subqueries(
        &mut self,
        schemas: &HashMap<String, Arc<Valid<apollo_compiler::Schema>>>,
        supergraph_schema_hash: &str,
    ) {
            node.hash_subqueries(schemas, supergraph_schema_hash);
                            ..
                sdl: Arc::clone(&self.schema.raw_sdl),
            sdl: Arc::clone(&self.schema.raw_sdl),
    pub(crate) sdl: Arc<String>,
        hasher.update(&serde_json::to_vec(&self.sdl).expect("serialization should not fail"));
    pub(crate) fn hash_subquery(
        &mut self,
        schema: &Valid<apollo_compiler::Schema>,
        supergraph_schema_hash: &str,
    ) {
        if let Ok(hash) = QueryHashVisitor::hash_query(
            schema,
            supergraph_schema_hash,
            &doc,
            self.operation_name.as_deref(),
        ) {
        supergraph_schema_hash: &str,
                    fetch_node.hash_subquery(schema, supergraph_schema_hash);
                    node.hash_subqueries(schemas, supergraph_schema_hash);
                    node.hash_subqueries(schemas, supergraph_schema_hash);
            PlanNode::Flatten(flatten) => flatten
                .node
                .hash_subqueries(schemas, supergraph_schema_hash),
                    node.hash_subqueries(schemas, supergraph_schema_hash);
                        new_node.hash_subqueries(schemas, supergraph_schema_hash);
                    node.hash_subqueries(schemas, supergraph_schema_hash);
                    node.hash_subqueries(schemas, supergraph_schema_hash);
                    node.hash_subqueries(schemas, supergraph_schema_hash);
            "a4ab3ffe0fd7863aea8cd1e85d019d2c64ec0351d62f9759bed3c9dc707ea315",
        let api_schema = schema.api_schema();
        let api_schema_definitions = &api_schema.definitions;
        let executable_document = match ast.to_executable_validate(api_schema_definitions) {
        let hash = QueryHashVisitor::hash_query(
            api_schema_definitions,
            &api_schema.raw_sdl,
            &executable_document,
            operation_name,
        )
        .map_err(|e| SpecError::QueryHashing(e.to_string()))?;

        let mut visitor = QueryHashVisitor::new(&schema.definitions, &schema.raw_sdl, document);
    // TODO: remove once introspection has been moved out of query planning
    // For now, introspection is stiull handled by the planner, so when an
    // introspection query is hashed, it should take the whole schema into account
    schema_str: &'a str,
    seen_introspection: bool,
        schema_str: &'a str,
            schema_str,
            seen_introspection: false,
        schema_str: &'a str,
        let mut visitor = QueryHashVisitor::new(schema, schema_str, executable);
        executable.to_string().hash(&mut visitor);
        if !self.seen_introspection && (field_def.name == "__schema" || field_def.name == "__type")
        {
            self.seen_introspection = true;
            self.schema_str.hash(self);
        }

    #[derive(Debug)]
    struct HashComparator {
        from_visitor: String,
        from_hash_query: String,
    }

    impl From<(String, String)> for HashComparator {
        fn from(value: (String, String)) -> Self {
            Self {
                from_visitor: value.0,
                from_hash_query: value.1,
            }
        }
    }

    // The non equality check is not the same
    // as one would expect from PartialEq.
    // This is why HashComparator doesn't implement it.
    impl HashComparator {
        fn equals(&self, other: &Self) -> bool {
            self.from_visitor == other.from_visitor && self.from_hash_query == other.from_hash_query
        }
        fn doesnt_match(&self, other: &Self) -> bool {
            // This is intentional, we check to prevent BOTH hashes from being equal
            self.from_visitor != other.from_visitor && self.from_hash_query != other.from_hash_query
        }
    }

    fn hash(schema_str: &str, query: &str) -> HashComparator {
        let schema = Schema::parse(schema_str, "schema.graphql")
        let mut visitor = QueryHashVisitor::new(&schema, schema_str, &exec);
        (
            hex::encode(visitor.finish()),
            hex::encode(QueryHashVisitor::hash_query(&schema, schema_str, &exec, None).unwrap()),
        )
            .into()
    fn hash_subgraph_query(schema_str: &str, query: &str) -> String {
        let schema = Valid::assume_valid(Schema::parse(schema_str, "schema.graphql").unwrap());
        let mut visitor = QueryHashVisitor::new(&schema, schema_str, &exec);
        assert!(hash(schema1, query).equals(&hash(schema2, query)));
        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
        assert!(hash(schema1, query).equals(&hash(schema2, query)));
        assert!(hash(schema1, "query { me { id name } }")
            .doesnt_match(&hash(schema1, "query { me { name id } }")));
        assert!(hash(schema1, query).equals(&hash(schema2, query)));
        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
        assert!(hash(schema1, query).equals(&hash(schema2, query)));
        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
    }

    #[test]
    fn introspection() {
        let schema1: &str = r#"
        schema {
          query: Query
        }
    
        type Query {
          me: User
          customer: User
        }
    
        type User {
          id: ID
          name: String
        }
        "#;

        let schema2: &str = r#"
        schema {
            query: Query
        }
    
        type Query {
          me: NotUser
        }
    
    
        type NotUser {
          id: ID!
          name: String
        }
        "#;

        let query = "{ __schema { types { name } } }";

        assert!(hash(schema1, query).doesnt_match(&hash(schema2, query)));
    }

    #[test]
    fn fields_with_different_arguments_have_different_hashes() {
        let schema: &str = r#"
        schema {
          query: Query
        }
    
        type Query {
          test(arg: Int): String
        }
        "#;

        let query_one = "query { a: test(arg: 1) b: test(arg: 2) }";
        let query_two = "query { a: test(arg: 1) b: test(arg: 3) }";

        // This assertion tests an internal hash function that isn't directly
        // used for the query hash, and we'll need to make it pass to rely
        // solely on the internal function again.
        //
        // assert!(hash(schema, query_one).doesnt_match(&hash(schema,
        // query_two)));
        assert!(hash(schema, query_one).from_hash_query != hash(schema, query_two).from_hash_query);
    }

    #[test]
    fn fields_with_different_aliases_have_different_hashes() {
        let schema: &str = r#"
        schema {
          query: Query
        }
    
        type Query {
          test(arg: Int): String
        }
        "#;

        let query_one = "query { a: test }";
        let query_two = "query { b: test }";

        // This assertion tests an internal hash function that isn't directly
        // used for the query hash, and we'll need to make it pass to rely
        // solely on the internal function again.
        //
        // assert!(hash(schema, query_one).doesnt_match(&hash(schema, query_two)));
        assert!(hash(schema, query_one).from_hash_query != hash(schema, query_two).from_hash_query);
        let known_cache_key = "plan:v2.7.2:121b9859eba2d8fa6dde0a54b6e3781274cf69f7ffb0af912e92c01c6bfff6ca:3973e022e93220f9212c18d0d0c543ae7c309e46640da93a4a0314de999f5112:5c7a72fa35639949328548d77b56dba2e77d0dfa90c19b69978da119e996bb92";
        let config = RedisConfig::from_url("redis://127.0.0.1:6379").unwrap();
        client.wait_for_connect().await.unwrap();
            }))
            .unwrap()
            .await
            .unwrap();
            .build()
            .unwrap();
        let _ = supergraph
            .oneshot(request)
            .await
            .unwrap()
            .next_response()
            .await;
            }))
            .unwrap()
            .await
            .unwrap();
            .build()
            .unwrap();
        let _ = supergraph
            .oneshot(request)
            .await
            .unwrap()
            .next_response()
            .await;
        client.quit().await.unwrap();
        let config = RedisConfig::from_url("redis://127.0.0.1:6379").unwrap();
        client.wait_for_connect().await.unwrap();
            .configuration_json(config.clone())
            .unwrap()
            .await
            .unwrap();
            .build()
            .unwrap()
            .await
            .unwrap()
            .unwrap()
            .unwrap();
            .build()
            .unwrap()
            .await
            .unwrap()
            .unwrap()
            .unwrap();
            .configuration_json(config.clone())
            .unwrap()
            .await
            .unwrap();
            .build()
            .unwrap()
            .await
            .unwrap()
            .unwrap()
            .unwrap();
        client.quit().await.unwrap();
        let config = RedisConfig::from_url("redis://127.0.0.1:6379").unwrap();
        client.wait_for_connect().await.unwrap();
            }))
            .unwrap()
            .build()
            .unwrap();
            .await
            .unwrap()
          .get("subgraph:products:Query:0df945dc1bc08f7fc02e8905b4c72aa9112f29bb7a214e4a38d199f0aa635b48:d9d84a3c7ffc27b0190a671212f3740e5b8478e84e23825830e97822e25cf05c")
        let s: String = client.get("subgraph:reviews:Product:4911f7a9dbad8a47b8900d65547503a2f3c0359f65c0bc5652ad9b9843281f66:1de543dab57fde0f00247922ccc4f76d4c916ae26a89dd83cd1a62300d0cda20:d9d84a3c7ffc27b0190a671212f3740e5b8478e84e23825830e97822e25cf05c").await.unwrap();
            }))
            .unwrap()
            .build()
            .unwrap();
            .await
            .unwrap()
        .get("subgraph:reviews:Product:d9a4cd73308dd13ca136390c10340823f94c335b9da198d2339c886c738abf0d:1de543dab57fde0f00247922ccc4f76d4c916ae26a89dd83cd1a62300d0cda20:d9d84a3c7ffc27b0190a671212f3740e5b8478e84e23825830e97822e25cf05c")
        client.quit().await.unwrap();
        let config = RedisConfig::from_url("redis://127.0.0.1:6379").unwrap();
        client.wait_for_connect().await.unwrap();
            }))
            .unwrap()
            .build()
            .unwrap();
            .await
            .unwrap()
          .get("subgraph:products:Query:0df945dc1bc08f7fc02e8905b4c72aa9112f29bb7a214e4a38d199f0aa635b48:d9d84a3c7ffc27b0190a671212f3740e5b8478e84e23825830e97822e25cf05c")
        .get("subgraph:reviews:Product:4911f7a9dbad8a47b8900d65547503a2f3c0359f65c0bc5652ad9b9843281f66:1de543dab57fde0f00247922ccc4f76d4c916ae26a89dd83cd1a62300d0cda20:d9d84a3c7ffc27b0190a671212f3740e5b8478e84e23825830e97822e25cf05c")
            .build()
            .unwrap();
            .await
            .unwrap()
          .get("subgraph:reviews:Product:4911f7a9dbad8a47b8900d65547503a2f3c0359f65c0bc5652ad9b9843281f66:3b6ef3c8fd34c469d59f513942c5f4c8f91135e828712de2024e2cd4613c50ae:d9d84a3c7ffc27b0190a671212f3740e5b8478e84e23825830e97822e25cf05c")
            .build()
            .unwrap();
            .await
            .unwrap()
        client.quit().await.unwrap();
  "schemaAwareHash": "121b9859eba2d8fa6dde0a54b6e3781274cf69f7ffb0af912e92c01c6bfff6ca",
    image: ghcr.io/apollographql/router:v1.45.1
    image: ghcr.io/apollographql/router:v1.45.1
    image: ghcr.io/apollographql/router:v1.45.1
version: 1.45.1
appVersion: "v1.45.1"
![Version: 1.45.1](https://img.shields.io/badge/Version-1.45.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.45.1](https://img.shields.io/badge/AppVersion-v1.45.1-informational?style=flat-square)
helm pull oci://ghcr.io/apollographql/helm-charts/router --version 1.45.1
helm upgrade --install [RELEASE_NAME] oci://ghcr.io/apollographql/helm-charts/router --version 1.45.1 --values my-values.yaml
            <li><a href="#Apache-2.0">Apache License 2.0</a> (481)</li>
PACKAGE_VERSION="v1.45.1"