From 0a7e30886be9f2469342f6f8ec13dfcb23b5b1d0 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 23 Apr 2025 12:56:52 +0300 Subject: [PATCH 1/3] Start v2.2.0 PR From 2b1accc0cf7376b19e5bc34548230e8040815d8c Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 23 Apr 2025 13:00:27 +0300 Subject: [PATCH 2/3] prep release: v2.2.0-rc.0 --- Cargo.lock | 6 +- apollo-federation/Cargo.toml | 2 +- apollo-router-benchmarks/Cargo.toml | 2 +- apollo-router/Cargo.toml | 4 +- .../tracing/docker-compose.datadog.yml | 2 +- dockerfiles/tracing/docker-compose.zipkin.yml | 2 +- helm/chart/router/Chart.yaml | 4 +- helm/chart/router/README.md | 6 +- licenses.html | 903 +++++++++--------- scripts/install.sh | 2 +- 10 files changed, 485 insertions(+), 448 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e4474ccede..75bd05fbcb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -191,7 +191,7 @@ dependencies = [ [[package]] name = "apollo-federation" -version = "2.1.3" +version = "2.2.0-rc.0" dependencies = [ "apollo-compiler", "apollo-federation", @@ -255,7 +255,7 @@ dependencies = [ [[package]] name = "apollo-router" -version = "2.1.3" +version = "2.2.0-rc.0" dependencies = [ "ahash", "anyhow", @@ -424,7 +424,7 @@ dependencies = [ [[package]] name = "apollo-router-benchmarks" -version = "2.1.3" +version = "2.2.0-rc.0" dependencies = [ "apollo-parser", "apollo-router", diff --git a/apollo-federation/Cargo.toml b/apollo-federation/Cargo.toml index d079761b77..fc8311b7af 100644 --- a/apollo-federation/Cargo.toml +++ b/apollo-federation/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "apollo-federation" -version = "2.1.3" +version = "2.2.0-rc.0" authors = ["The Apollo GraphQL Contributors"] edition = "2024" description = "Apollo Federation" diff --git a/apollo-router-benchmarks/Cargo.toml b/apollo-router-benchmarks/Cargo.toml index c4d0dd96e5..7e49f6a44e 100644 --- a/apollo-router-benchmarks/Cargo.toml +++ b/apollo-router-benchmarks/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "apollo-router-benchmarks" -version = "2.1.3" +version = "2.2.0-rc.0" authors = ["Apollo Graph, Inc. "] edition = "2021" license = "Elastic-2.0" diff --git a/apollo-router/Cargo.toml b/apollo-router/Cargo.toml index c980a2df9a..8f68c2a770 100644 --- a/apollo-router/Cargo.toml +++ b/apollo-router/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "apollo-router" -version = "2.1.3" +version = "2.2.0-rc.0" authors = ["Apollo Graph, Inc. "] repository = "https://github.com/apollographql/router/" documentation = "https://docs.rs/apollo-router" @@ -58,7 +58,7 @@ snapshot = ["axum-server", "serde_regex"] [dependencies] anyhow = "1.0.86" apollo-compiler.workspace = true -apollo-federation = { path = "../apollo-federation", version = "=2.1.3", features = ["connect_v0.2"] } +apollo-federation = { path = "../apollo-federation", version = "=2.2.0-rc.0", features = ["connect_v0.2"] } async-compression = { version = "0.4.6", features = [ "tokio", "brotli", diff --git a/dockerfiles/tracing/docker-compose.datadog.yml b/dockerfiles/tracing/docker-compose.datadog.yml index 9c158377a3..6a9f8b03d4 100644 --- a/dockerfiles/tracing/docker-compose.datadog.yml +++ b/dockerfiles/tracing/docker-compose.datadog.yml @@ -2,7 +2,7 @@ version: "3.9" services: apollo-router: container_name: apollo-router - image: ghcr.io/apollographql/router:v2.1.3 + image: ghcr.io/apollographql/router:v2.2.0-rc.0 volumes: - ./supergraph.graphql:/etc/config/supergraph.graphql - ./router/datadog.router.yaml:/etc/config/configuration.yaml diff --git a/dockerfiles/tracing/docker-compose.zipkin.yml b/dockerfiles/tracing/docker-compose.zipkin.yml index af8546435a..268a7e8de0 100644 --- a/dockerfiles/tracing/docker-compose.zipkin.yml +++ b/dockerfiles/tracing/docker-compose.zipkin.yml @@ -3,7 +3,7 @@ services: apollo-router: container_name: apollo-router build: ./router - image: ghcr.io/apollographql/router:v2.1.3 + image: ghcr.io/apollographql/router:v2.2.0-rc.0 volumes: - ./supergraph.graphql:/etc/config/supergraph.graphql - ./router/zipkin.router.yaml:/etc/config/configuration.yaml diff --git a/helm/chart/router/Chart.yaml b/helm/chart/router/Chart.yaml index 7600f18e45..5682551b6b 100644 --- a/helm/chart/router/Chart.yaml +++ b/helm/chart/router/Chart.yaml @@ -20,10 +20,10 @@ type: application # 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: 2.1.3 +version: 2.2.0-rc.0 # 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: "v2.1.3" +appVersion: "v2.2.0-rc.0" diff --git a/helm/chart/router/README.md b/helm/chart/router/README.md index 0746d5b3f5..54e0756835 100644 --- a/helm/chart/router/README.md +++ b/helm/chart/router/README.md @@ -2,7 +2,7 @@ [router](https://github.com/apollographql/router) Rust Graph Routing runtime for Apollo Federation -![Version: 2.1.3](https://img.shields.io/badge/Version-2.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.1.3](https://img.shields.io/badge/AppVersion-v2.1.3-informational?style=flat-square) +![Version: 2.2.0-rc.0](https://img.shields.io/badge/Version-2.2.0--rc.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.2.0-rc.0](https://img.shields.io/badge/AppVersion-v2.2.0--rc.0-informational?style=flat-square) ## Prerequisites @@ -11,7 +11,7 @@ ## Get Repo Info ```console -helm pull oci://ghcr.io/apollographql/helm-charts/router --version 2.1.3 +helm pull oci://ghcr.io/apollographql/helm-charts/router --version 2.2.0-rc.0 ``` ## Install Chart @@ -19,7 +19,7 @@ helm pull oci://ghcr.io/apollographql/helm-charts/router --version 2.1.3 **Important:** only helm3 is supported ```console -helm upgrade --install [RELEASE_NAME] oci://ghcr.io/apollographql/helm-charts/router --version 2.1.3 --values my-values.yaml +helm upgrade --install [RELEASE_NAME] oci://ghcr.io/apollographql/helm-charts/router --version 2.2.0-rc.0 --values my-values.yaml ``` _See [configuration](#configuration) below._ diff --git a/licenses.html b/licenses.html index 17daae2dfc..7d5abc4da4 100644 --- a/licenses.html +++ b/licenses.html @@ -44,8 +44,8 @@

Third Party Licenses

Overview of licenses:

@@ -63,11 +64,13 @@

All license text:

Apache License 2.0

Used by:

                                  Apache License
@@ -257,6 +260,9 @@ 
Used by:

                     
  • portable-atomic
    • 
                     
  • sync_wrapper
    • 
                     
  • sync_wrapper
    • 
+                    
  • time-core
    • 
+                    
  • time-macros
    • 
+                    
  • time
    • 
                     
  • zstd-safe
    • 
                     
  • zstd-sys
    • 
                 
@@ -653,7 +659,7 @@ 
    Used by:
    
                 
    Apache License 2.0
    
                 
    Used by:
    
                 
                 
                                      Apache License
@@ -844,7 +850,7 @@ 
    Used by:
    
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2022 Jacob Pratt et al.
+   Copyright 2023 Jacob Pratt
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -863,7 +869,7 @@ 
    Used by:
    
                 
    Apache License 2.0
    
                 
    Used by:
    
                 
                 
                                      Apache License
@@ -1054,7 +1060,7 @@ 
    Used by:
    
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2023 Jacob Pratt
+   Copyright 2023 Jacob Pratt et al.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -1073,7 +1079,7 @@ 
    Used by:
    
                 
    Apache License 2.0
    
                 
    Used by:
    
                 
                 
                                      Apache License
@@ -1264,7 +1270,7 @@ 
    Used by:
    
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2023 Jacob Pratt et al.
+   Copyright 2024 Jacob Pratt et al.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -1504,8 +1510,10 @@ 
    Used by:
    
                 
    Apache License 2.0
    
                 
    Used by:
    
                 
    
-            
-            
  • 
-                
    Apache License 2.0
    
-                
    Used by:
    
-                
-                
                                 Apache License
-                       Version 2.0, January 2004
-                    http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-  "License" shall mean the terms and conditions for use, reproduction,
-  and distribution as defined by Sections 1 through 9 of this document.
-
-  "Licensor" shall mean the copyright owner or entity authorized by
-  the copyright owner that is granting the License.
-
-  "Legal Entity" 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,
-  "control" 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.
-
-  "You" (or "Your") shall mean an individual or Legal Entity
-  exercising permissions granted by this License.
-
-  "Source" form shall mean the preferred form for making modifications,
-  including but not limited to software source code, documentation
-  source, and configuration files.
-
-  "Object" 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.
-
-  "Work" 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).
-
-  "Derivative Works" 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.
-
-  "Contribution" 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, "submitted"
-  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 "Not a Contribution."
-
-  "Contributor" 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 "NOTICE" 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 "AS IS" 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
-
-APPENDIX: How to apply the Apache License to your work.
-
-  To apply the Apache License to your work, attach the following
-  boilerplate notice, with the fields enclosed by brackets "[]"
-  replaced with your own identifying information. (Don't include
-  the brackets!)  The text should be enclosed in the appropriate
-  comment syntax for the file format. We also recommend that a
-  file or class name and description of purpose be included on the
-  same "printed page" as the copyright notice for easier
-  identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-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 "AS IS" 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.
 
    
             
    • 
             
  • 
@@ -10744,6 +10563,15 @@ 
    Used by:
    
 additional terms or conditions.
 
    • 
             
+            
  • 
+                
    Apache License 2.0
    
+                
    Used by:
    
+                
+                
    ../../LICENSE-APACHE
    
+            
    • 
             
  • 
                 
    Apache License 2.0
    
                 
    Used by:
    
@@ -11176,6 +11004,215 @@ 
    Used by:
    
    See the License for the specific language governing permissions and
    limitations under the License.
 
+
    • 
+            
+            
  • 
+                
    Apache License 2.0
    
+                
    Used by:
    
+                
+                
    Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" 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,
+   "control" 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.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" 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.
+
+   "Work" 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).
+
+   "Derivative Works" 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.
+
+   "Contribution" 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, "submitted"
+   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 "Not a Contribution."
+
+   "Contributor" 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 "NOTICE" 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 "AS IS" 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
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright 2019 Josh Mcguigan
+
+Licensed under the Apache License, Version 2.0 (the "License");
+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 "AS IS" 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.
 
    
             
    • 
             
  • 
@@ -11391,25 +11428,18 @@ 
    Used by:
    
                 
    Apache License 2.0
    
                 
    Used by:
    
                 
      
-                    
    • anyhow
      • 
                     
    • apollo-compiler
      • 
-                    
    • apollo-parser
      • 
-                    
    • apollo-smith
      • 
-                    
    • async-trait
      • 
                     
    • aws-config
      • 
                     
    • aws-credential-types
      • 
                     
    • aws-runtime
      • 
-                    
    • aws-smithy-async
      • 
-                    
    • aws-smithy-http
      • 
-                    
    • aws-smithy-json
      • 
-                    
    • aws-smithy-query
      • 
+                    
    • aws-smithy-http-client
      • 
+                    
    • aws-smithy-observability
      • 
+                    
    • aws-smithy-runtime
      • 
+                    
    • aws-types
      • 
                     
    • basic-toml
      • 
                     
    • buildstructor
      • 
                     
    • chrono
      • 
                     
    • dunce
      • 
-                    
    • dyn-clone
      • 
-                    
    • erased-serde
      • 
-                    
    • ghost
      • 
                     
    • graphql-introspection-query
      • 
                     
    • graphql_client
      • 
                     
    • graphql_client_codegen
      • 
@@ -11426,9 +11456,6 @@ 
      Used by:
      
                     
    • system-configuration-sys
      • 
                     
    • system-configuration
      • 
                     
    • thiserror
      • 
-                    
    • time-core
      • 
-                    
    • time-macros
      • 
-                    
    • time
      • 
                     
    • try_match_inner
      • 
                     
    • widestring
      • 
                     
    • winapi-i686-pc-windows-gnu
      • 
@@ -12348,41 +12375,30 @@ 
      Used by:
      
                 
      ISC License
      
                 
      Used by:
      
                 
-                
      /* Copyright (c) 2018, Google Inc.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
-
-#include <openssl/crypto.h>
-
-#include <gtest/gtest.h>
-
-
-TEST(SelfTests, KAT) {
-#if !defined(_MSC_VER)
-  EXPECT_TRUE(BORINGSSL_self_test());
-#endif
-}
+                
      // Copyright 2015-2016 Brian Smith.
+//
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
      
             
             
    • 
                 
      ISC License
      
                 
      Used by:
      
                 
-                
      // Copyright 2015-2016 Brian Smith.
+                
      // Copyright 2021 Brian Smith.
 //
 // Permission to use, copy, modify, and/or distribute this software for any
 // purpose with or without fee is hereby granted, provided that the above
@@ -12395,6 +12411,16 @@ 
      Used by:
      
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+use pki_types::CertificateDer;
+
+#[test]
+fn cert_without_extensions_test() {
+    // Check the certificate is valid with
+    // `openssl x509 -in cert_without_extensions.der -inform DER -text -noout`
+    let ca = CertificateDer::from(&include_bytes!("cert_without_extensions.der")[..]);
+    assert!(webpki::EndEntityCert::try_from(&ca).is_ok());
+}
 
      
             
      • 
             
    • 
@@ -12505,9 +12531,9 @@ 
      ISC License
      
                 
      Used by:
      
                 
                 
      ISC License:
 
@@ -13141,7 +13167,6 @@ 
      MIT License
      
                 
      Used by:
      
                 
                 
      Copyright (c) 2019 Axum Contributors
 
@@ -13192,6 +13217,66 @@ 
      Used by:
      
 shall be included in all copies or substantial portions
 of the Software.
 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
      
+            
      • 
+            
    • 
+                
      MIT License
      
+                
      Used by:
      
+                
+                
      Copyright (c) 2019 Carl Lerche
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+Copyright (c) 2018 David Tolnay
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
 ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
 TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
@@ -13396,6 +13481,39 @@ 
      Used by:
      
 shall be included in all copies or substantial portions
 of the Software.
 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
      
+            
      • 
+            
    • 
+                
      MIT License
      
+                
      Used by:
      
+                
+                
      Copyright (c) 2019 axum Contributors
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
 ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
 TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
@@ -13608,10 +13726,24 @@ 
      MIT License
      
                 
      Used by:
      
                 
+                
      Copyright 2021 Axum Contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
      
+            
      • 
+            
    • 
+                
      MIT License
      
+                
      Used by:
      
+                
-                
      Copyright 2021 Axum Contributors
+                
      Copyright 2021 axum Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
@@ -14299,8 +14431,6 @@ 
      Used by:
      
                 
      MIT License
      
                 
      Used by:
      
                 
        
-                    
      • async-stream-impl
        • 
-                    
      • async-stream
        • 
                     
      • base64-simd
        • 
                     
      • convert_case
        • 
                     
      • crunchy
        • 
@@ -15159,6 +15289,8 @@ 
        MIT License
        
                 
        Used by:
        
                 
          
                     
        • aho-corasick
          • 
+                    
        • byteorder
          • 
+                    
        • globset
          • 
                     
        • memchr
          • 
                     
        • regex-automata
          • 
                     
        • same-file
          • 
@@ -15565,7 +15697,6 @@ 
          Used by:
          
                 
          Mozilla Public License 2.0
          
                 
          Used by:
          
                 
                 
          Mozilla Public License Version 2.0
@@ -15948,6 +16079,7 @@ 
          Used by:
          
                 
          Mozilla Public License 2.0
          
                 
          Used by:
          
                 
                 
          Mozilla Public License Version 2.0
@@ -16381,6 +16513,29 @@ 
          Used by:
          
 
 ***** END LICENSE BLOCK *****
 @(#) $RCSfile: certdata.txt,v $ $Revision: 1.80 $ $Date: 2011/11/03 15:11:58 $
+
          
+            
+            
        • 
+                
          University of Illinois/NCSA Open Source License
          
+                
          Used by:
          
+                
+                
          University of Illinois/NCSA Open Source License
+
+Copyright (c) <Year> <Owner Organization Name>. All rights reserved.
+
+Developed by: <Name of Development Group> <Name of Institution> <URL for Development Group/Institution>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal with the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+     * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimers.
+
+     * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimers in the documentation and/or other materials provided with the distribution.
+
+     * Neither the names of <Name of Development Group, Name of Institution>, nor the names of its contributors may be used to endorse or promote products derived from this Software without specific prior written permission.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
 
          
             
          • 
             
        • 
@@ -16389,172 +16544,54 @@ 
          Used by:
          
                 
-                
          /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2007 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <openssl/ssl.h>
-
-#if !defined(OPENSSL_WINDOWS) && !defined(OPENSSL_PNACL) && \
-    !defined(OPENSSL_NO_FILESYSTEM)
-
-#include <dirent.h>
-#include <errno.h>
-#include <string.h>
-
-#include <openssl/err.h>
-#include <openssl/mem.h>
-
-
-int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack,
-                                       const char *path) {
-  DIR *dir = opendir(path);
-  if (dir == NULL) {
-    OPENSSL_PUT_ERROR(SSL, ERR_R_SYS_LIB);
-    ERR_add_error_data(3, "opendir('", dir, "')");
-    return 0;
-  }
-
-  int ret = 0;
-  for (;;) {
-    // |readdir| may fail with or without setting |errno|.
-    errno = 0;
-    struct dirent *dirent = readdir(dir);
-    if (dirent == NULL) {
-      if (errno) {
-        OPENSSL_PUT_ERROR(SSL, ERR_R_SYS_LIB);
-        ERR_add_error_data(3, "readdir('", path, "')");
-      } else {
-        ret = 1;
-      }
-      break;
-    }
-
-    char buf[1024];
-    if (strlen(path) + strlen(dirent->d_name) + 2 > sizeof(buf)) {
-      OPENSSL_PUT_ERROR(SSL, SSL_R_PATH_TOO_LONG);
-      break;
-    }
-
-    int r = snprintf(buf, sizeof(buf), "%s/%s", path, dirent->d_name);
-    if (r <= 0 ||
-        r >= (int)sizeof(buf) ||
-        !SSL_add_file_cert_subjects_to_stack(stack, buf)) {
-      break;
-    }
-  }
-
-  closedir(dir);
-  return ret;
-}
+                
          OpenSSL License
+
+Copyright (c) 1998-2008 The OpenSSL Project. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. All advertising materials mentioning features or use of this software must display the following acknowledgment: "This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+
+4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact openssl-core@openssl.org.
+
+5. Products derived from this software may not be called "OpenSSL" nor may "OpenSSL" appear in their names without prior written permission of the OpenSSL Project.
+
+6. Redistributions of any form whatsoever must retain the following acknowledgment: "This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+
+THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+This product includes cryptographic software written by Eric Young (eay@cryptsoft.com). This product includes software written by Tim Hudson (tjh@cryptsoft.com).
+
+
+Original SSLeay License
+
+Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.
+
+This package is an SSL implementation written by Eric Young (eay@cryptsoft.com). The implementation was written so as to conform with Netscapes SSL.
+
+This library is free for commercial and non-commercial use as long as the following conditions are aheared to. The following conditions apply to all code found in this distribution, be it the RC4, RSA, lhash, DES, etc., code; not just the SSL code. The SSL documentation included with this distribution is covered by the same copyright terms except that the holder is Tim Hudson (tjh@cryptsoft.com).
+
+Copyright remains Eric Young's, and as such any Copyright notices in the code are not to be removed. If this package is used in a product, Eric Young should be given attribution as the author of the parts of the library used. This can be in the form of a textual message at program startup or in documentation (online or textual) provided with the package.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. All advertising materials mentioning features or use of this software must display the following acknowledgement:
+"This product includes cryptographic software written by Eric Young (eay@cryptsoft.com)"
+The word 'cryptographic' can be left out if the rouines from the library being used are not cryptographic related :-).
+
+4. If you include any Windows specific code (or a derivative thereof) from the apps directory (application code) you must include an acknowledgement: "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+
+THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#endif  // !WINDOWS && !PNACL && !OPENSSL_NO_FILESYSTEM
+The licence and distribution terms for any publically available version or derivative of this code cannot be changed. i.e. this code cannot simply be copied and put under another distribution licence [including the GNU Public Licence.]
 
          
             
          • 
             
        • 
diff --git a/scripts/install.sh b/scripts/install.sh
index bc6067a10e..a1d5e86138 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -11,7 +11,7 @@ BINARY_DOWNLOAD_PREFIX="${APOLLO_ROUTER_BINARY_DOWNLOAD_PREFIX:="https://github.
 
 # Router version defined in apollo-router's Cargo.toml
 # Note: Change this line manually during the release steps.
-PACKAGE_VERSION="v2.1.3"
+PACKAGE_VERSION="v2.2.0-rc.0"
 
 download_binary() {
     downloader --check

From 89fed544cc5119e566b86015e1c0944e31664b91 Mon Sep 17 00:00:00 2001
From: Jesse Rosenberger 
Date: Tue, 29 Apr 2025 15:13:58 +0300
Subject: [PATCH 3/3] prep release: v2.2.0

---
 .../bug_bryn_connection_metrics_rename.md     |   9 -
 ...fig_apollo_otlp_realtime_studio_metrics.md |   7 -
 .changesets/config_header_read_timeout.md     |  13 -
 ...raph_include_errors allow_and_deny_list.md |  29 --
 .../docs_pillow_snack_joke_corduroy.md        |   5 -
 .../docs_timbotnik_errors_preview_docs.md     |   5 -
 ...timbotnik_pulsr_1484_graphos_error_docs.md |   5 -
 .../docs_vulture_companion_residence_yarn.md  |   5 -
 .changesets/feat_6172_jwtmultipleissuers.md   |  30 --
 .../feat_bnjjj_config_auto_migration.md       |   6 -
 .changesets/feat_bryn_compute_job_spans.md    |  17 -
 ...eat_connectors_uri_expression_locations.md |  15 -
 .../feat_coprocessorhttprequestspan.md        |  15 -
 .changesets/feat_enhanced_client_awareness.md |   5 -
 .../feat_feature_connectorsyamlheaders.md     |  29 --
 .changesets/feat_persisted_query_reporting.md |   5 -
 .../fix_bnjjj_fix_log_with_subs_jwt.md        |   6 -
 ...ix_bryn_connection_shutdown_timeout_1_x.md |  30 --
 .../fix_caroline_compute_pool_metrics.md      |  19 -
 .changesets/fix_caroline_deadlock.md          |  20 -
 .../fix_connectors_percent_encoding.md        |   8 -
 .../fix_connectors_trailing_slashes.md        |   6 -
 .changesets/fix_curly_think_heap_glue.md      |   5 -
 .../fix_duckki_entity_cache_matching_key.md   |  15 -
 .../fix_error_apollo_operation_id_fix.md      |   6 -
 .changesets/fix_events_conditions.md          |  30 --
 .changesets/fix_fix_coprocessor_data_null.md  |  27 -
 .../fix_fix_docker_image_fix_for_cloudrun.md  |  11 -
 .changesets/fix_heap_tail_paper_bunk.md       |   5 -
 .changesets/fix_improve_jwt_errors.md         |  16 -
 .changesets/fix_meryl_pulsr_1429.md           |   5 -
 .../fix_renee_bail_invalid_query_plans.md     |   7 -
 .../fix_renee_increase_compute_job_queue.md   |  12 -
 ...uter-external-extensibility-deprecation.md |   5 -
 .changesets/fix_rreg_int_err_codes_fix.md     |   6 -
 .changesets/fix_simon_jwt_metrics.md          |   9 -
 .changesets/fix_simon_unwarn_resource_attr.md |  17 -
 .changesets/helm_targetport_configuration.md  |   5 -
 CHANGELOG.md                                  | 460 ++++++++++++++++++
 Cargo.lock                                    |   6 +-
 apollo-federation/Cargo.toml                  |   2 +-
 apollo-router-benchmarks/Cargo.toml           |   2 +-
 apollo-router/Cargo.toml                      |   4 +-
 .../tracing/docker-compose.datadog.yml        |   2 +-
 dockerfiles/tracing/docker-compose.zipkin.yml |   2 +-
 helm/chart/router/Chart.yaml                  |   4 +-
 helm/chart/router/README.md                   |   6 +-
 licenses.html                                 |  36 +-
 scripts/install.sh                            |   2 +-
 49 files changed, 478 insertions(+), 518 deletions(-)
 delete mode 100644 .changesets/bug_bryn_connection_metrics_rename.md
 delete mode 100644 .changesets/config_apollo_otlp_realtime_studio_metrics.md
 delete mode 100644 .changesets/config_header_read_timeout.md
 delete mode 100644 .changesets/config_subgraph_include_errors allow_and_deny_list.md
 delete mode 100644 .changesets/docs_pillow_snack_joke_corduroy.md
 delete mode 100644 .changesets/docs_timbotnik_errors_preview_docs.md
 delete mode 100644 .changesets/docs_timbotnik_pulsr_1484_graphos_error_docs.md
 delete mode 100644 .changesets/docs_vulture_companion_residence_yarn.md
 delete mode 100644 .changesets/feat_6172_jwtmultipleissuers.md
 delete mode 100644 .changesets/feat_bnjjj_config_auto_migration.md
 delete mode 100644 .changesets/feat_bryn_compute_job_spans.md
 delete mode 100644 .changesets/feat_connectors_uri_expression_locations.md
 delete mode 100644 .changesets/feat_coprocessorhttprequestspan.md
 delete mode 100644 .changesets/feat_enhanced_client_awareness.md
 delete mode 100644 .changesets/feat_feature_connectorsyamlheaders.md
 delete mode 100644 .changesets/feat_persisted_query_reporting.md
 delete mode 100644 .changesets/fix_bnjjj_fix_log_with_subs_jwt.md
 delete mode 100644 .changesets/fix_bryn_connection_shutdown_timeout_1_x.md
 delete mode 100644 .changesets/fix_caroline_compute_pool_metrics.md
 delete mode 100644 .changesets/fix_caroline_deadlock.md
 delete mode 100644 .changesets/fix_connectors_percent_encoding.md
 delete mode 100644 .changesets/fix_connectors_trailing_slashes.md
 delete mode 100644 .changesets/fix_curly_think_heap_glue.md
 delete mode 100644 .changesets/fix_duckki_entity_cache_matching_key.md
 delete mode 100644 .changesets/fix_error_apollo_operation_id_fix.md
 delete mode 100644 .changesets/fix_events_conditions.md
 delete mode 100644 .changesets/fix_fix_coprocessor_data_null.md
 delete mode 100644 .changesets/fix_fix_docker_image_fix_for_cloudrun.md
 delete mode 100644 .changesets/fix_heap_tail_paper_bunk.md
 delete mode 100644 .changesets/fix_improve_jwt_errors.md
 delete mode 100644 .changesets/fix_meryl_pulsr_1429.md
 delete mode 100644 .changesets/fix_renee_bail_invalid_query_plans.md
 delete mode 100644 .changesets/fix_renee_increase_compute_job_queue.md
 delete mode 100644 .changesets/fix_router-external-extensibility-deprecation.md
 delete mode 100644 .changesets/fix_rreg_int_err_codes_fix.md
 delete mode 100644 .changesets/fix_simon_jwt_metrics.md
 delete mode 100644 .changesets/fix_simon_unwarn_resource_attr.md
 delete mode 100644 .changesets/helm_targetport_configuration.md

diff --git a/.changesets/bug_bryn_connection_metrics_rename.md b/.changesets/bug_bryn_connection_metrics_rename.md
deleted file mode 100644
index dbf253273f..0000000000
--- a/.changesets/bug_bryn_connection_metrics_rename.md
+++ /dev/null
@@ -1,9 +0,0 @@
-### Add `apollo.router.open_connections` metric `state` attribute rename ([PR #7091](https://github.com/apollographql/router/pull/7091))
-
-The `state` attribute on `apollo.router.open_connections` has been renamed to `http.connection.state`.
-
-This enables us to use the [Otel convention] (https://opentelemetry.io/docs/specs/semconv/attributes-registry/http/#http-connection-state) and provide better consistency for users.
-
-Note that `idle` state is not yet supported.
-
-By [@bryncooke](https://github.com/bryncooke) in https://github.com/apollographql/router/pull/7091
\ No newline at end of file
diff --git a/.changesets/config_apollo_otlp_realtime_studio_metrics.md b/.changesets/config_apollo_otlp_realtime_studio_metrics.md
deleted file mode 100644
index 04cd6bff68..0000000000
--- a/.changesets/config_apollo_otlp_realtime_studio_metrics.md
+++ /dev/null
@@ -1,7 +0,0 @@
-### Add new configurable delivery pathway for high cardinality Apollo Studio metrics ([PR #7138](https://github.com/apollographql/router/pull/7138))
-
-This change provides a secondary pathway for new "realtime" Studio metrics whose delivery interval is configurable due to their higher cardinality. These metrics will respect `telemetry.apollo.batch_processor.scheduled_delay` as configured on the realtime path.
-
-All other Apollo metrics will maintain the previous hardcoded 60s send interval.
-
-By [@rregitsky](https://github.com/rregitsky) and [@timbotnik](https://github.com/timbotnik) in https://github.com/apollographql/router/pull/7138
diff --git a/.changesets/config_header_read_timeout.md b/.changesets/config_header_read_timeout.md
deleted file mode 100644
index fa006ae661..0000000000
--- a/.changesets/config_header_read_timeout.md
+++ /dev/null
@@ -1,13 +0,0 @@
-### Add configurable server header read timeout ([PR #7262](https://github.com/apollographql/router/pull/7262))
-
-This change exposes the server's header read timeout as the `server.http.header_read_timeout` configuration option.
-
-By default, the `server.http.header_read_timeout` is set to previously hard-coded 10 seconds. A longer timeout can be configured using the `server.http.header_read_timeout` option.
-
-```yaml title="router.yaml"
-server:
-  http:
-    header_read_timeout: 30s
-```
-
-By [@gwardwell ](https://github.com/gwardwell) in https://github.com/apollographql/router/pull/7262
diff --git a/.changesets/config_subgraph_include_errors allow_and_deny_list.md b/.changesets/config_subgraph_include_errors allow_and_deny_list.md
deleted file mode 100644
index 8ec9526158..0000000000
--- a/.changesets/config_subgraph_include_errors allow_and_deny_list.md	
+++ /dev/null
@@ -1,29 +0,0 @@
-### `include_subgraph_errors` fine grained control ([Issue #6402](https://github.com/apollographql/router/pull/6402)
-
-Update `include_subgraph_errors` with additional configuration options for both global and subgraph levels. This update provides finer control over error messages and extension keys for each subgraph. 
-For more details, please read [subgraph error inclusion](https://www.apollographql.com/docs/graphos/routing/observability/subgraph-error-inclusion).
-
-```yaml
-include_subgraph_errors:
-  all:
-    redact_message: true
-    allow_extensions_keys:
-      - code
-  subgraphs:
-    product:
-      redact_message: false  # Propagate original error messages
-      allow_extensions_keys: # Extend global allow list - `code` and `reason` will be propagated
-        - reason
-      exclude_global_keys:   # Exclude `code` from global allow list - only `reason` will be propagated.
-        - code
-    account:
-      deny_extensions_keys:  # Overrides global allow list
-        - classification
-    review: false            # Redact everything.
-
-    # Undefined subgraphs inherits default global settings from `all`
-``` 
-
-**Note:** Using a `deny_extensions_keys` approach carries security risks because any sensitive information not explicitly included in the deny list will be exposed to clients. For better security, subgraphs should prefer to redact everything or `allow_extensions_keys` when possible.
-
-By [@Samjin](https://github.com/Samjin) and [@bryncooke](https://github.com/bryncooke) in https://github.com/apollographql/router/pull/7164
diff --git a/.changesets/docs_pillow_snack_joke_corduroy.md b/.changesets/docs_pillow_snack_joke_corduroy.md
deleted file mode 100644
index a892d9e29f..0000000000
--- a/.changesets/docs_pillow_snack_joke_corduroy.md
+++ /dev/null
@@ -1,5 +0,0 @@
-### [docs] Add a note about the new dry run option ([PR #6973](https://github.com/apollographql/router/pull/6973))
-
-Linking to the other docs update: https://github.com/apollographql/federation/pull/3226/files
-
-By [@smyrick](https://github.com/smyrick) in https://github.com/apollographql/router/pull/6973
diff --git a/.changesets/docs_timbotnik_errors_preview_docs.md b/.changesets/docs_timbotnik_errors_preview_docs.md
deleted file mode 100644
index 28699e33e1..0000000000
--- a/.changesets/docs_timbotnik_errors_preview_docs.md
+++ /dev/null
@@ -1,5 +0,0 @@
-### Document extended errors preview configuration ([PR 7038](https://github.com/apollographql/router/pull/7038))
-
-Documentation added for extended errors on the GraphOS reporting page.
-
-By [@timbotnik](https://github.com/timbotnik) in https://github.com/apollographql/router/pull/7038
diff --git a/.changesets/docs_timbotnik_pulsr_1484_graphos_error_docs.md b/.changesets/docs_timbotnik_pulsr_1484_graphos_error_docs.md
deleted file mode 100644
index b6cd306753..0000000000
--- a/.changesets/docs_timbotnik_pulsr_1484_graphos_error_docs.md
+++ /dev/null
@@ -1,5 +0,0 @@
-### Added documentation for more GraphQL error codes that can occur during router execution. ([PR #7160](https://github.com/apollographql/router/issues/7160))
-
-Added documentation for more GraphQL error codes that can occur during router execution, including better differentiation between HTTP status codes and GraphQL error extensions codes.
-
-By [@timbotnik](https://github.com/timbotnik) in https://github.com/apollographql/router/pull/7160
diff --git a/.changesets/docs_vulture_companion_residence_yarn.md b/.changesets/docs_vulture_companion_residence_yarn.md
deleted file mode 100644
index 0e4b9b4df4..0000000000
--- a/.changesets/docs_vulture_companion_residence_yarn.md
+++ /dev/null
@@ -1,5 +0,0 @@
-### [docs] Update API Gateway tech note ([PR #7261](https://github.com/apollographql/router/pull/7261))
-
-Update the tech note with more details now that we have connectors
-
-By [@smyrick](https://github.com/smyrick) in https://github.com/apollographql/router/pull/7261
diff --git a/.changesets/feat_6172_jwtmultipleissuers.md b/.changesets/feat_6172_jwtmultipleissuers.md
deleted file mode 100644
index eb46dba2de..0000000000
--- a/.changesets/feat_6172_jwtmultipleissuers.md
+++ /dev/null
@@ -1,30 +0,0 @@
-### Allow JWT authorization options to support multiple issuers ([Issue #6172](https://github.com/apollographql/router/issues/6172))
-
-Allow JWT authorization options to support multiple issuers using the same JWKs.
-
-**Configuration change**: any `issuer` defined on currently existing `authentication.router.jwt.jwks` needs to be 
-migrated to an entry in the `issuers` list. For example:
-
-Before:
-```yaml
-authentication:
-  router:
-    jwt:
-      jwks:
-        - url: https://dev-zzp5enui.us.auth0.com/.well-known/jwks.json
-          issuer: https://issuer.one
-```
-
-After:
-```yaml
-authentication:
-  router:
-    jwt:
-      jwks:
-        - url: https://dev-zzp5enui.us.auth0.com/.well-known/jwks.json
-          issuers: 
-            - https://issuer.one
-            - https://issuer.two
-```
-
-By [@theJC](https://github.com/theJC) in https://github.com/apollographql/router/pull/7170
diff --git a/.changesets/feat_bnjjj_config_auto_migration.md b/.changesets/feat_bnjjj_config_auto_migration.md
deleted file mode 100644
index cdb462bd1a..0000000000
--- a/.changesets/feat_bnjjj_config_auto_migration.md
+++ /dev/null
@@ -1,6 +0,0 @@
-### Enable configuation auto migration for minor version bumps ([PR #7162](https://github.com/apollographql/router/pull/7162))
-
-Enable configuration auto migration when running the Router, only when it's migration written for the related version.
-Example: if you're running on Router 2.x, only migrations named `2xxx_*.yaml` will be automatically applied. Previous migrations will have to be applied using `router config upgrade` command. 
-
-By [@bnjjj](https://github.com/bnjjj) in https://github.com/apollographql/router/pull/7162
\ No newline at end of file
diff --git a/.changesets/feat_bryn_compute_job_spans.md b/.changesets/feat_bryn_compute_job_spans.md
deleted file mode 100644
index a92bd69959..0000000000
--- a/.changesets/feat_bryn_compute_job_spans.md
+++ /dev/null
@@ -1,17 +0,0 @@
-### Compute job spans ([PR #7236](https://github.com/apollographql/router/pull/7236))
-
-The router uses a separate thread pool called "compute jobs" to ensure that requests do not block tokio io worker threads.
-This PR adds spans to jobs that are on this pool to allow users to see when latency is introduced due to 
-resource contention within the compute job pool.
-
-* `compute_job`:
-  - `job.type`: (`QueryParsing`|`QueryParsing`|`Introspection`)
-* `compute_job.execution`
-  - `job.age`: `P1`-`P8`
-  - `job.type`: (`QueryParsing`|`QueryParsing`|`Introspection`)
-
-Jobs are executed highest priority (`P8`) first. Jobs that are low priority (`P1`) age over time, eventually executing 
-at highest priority. The age of a job is can be used to diagnose if a job was waiting in the queue due to other higher 
-priority jobs also in the queue.
-
-By [@bryncooke](https://github.com/bryncooke) in https://github.com/apollographql/router/pull/7236
diff --git a/.changesets/feat_connectors_uri_expression_locations.md b/.changesets/feat_connectors_uri_expression_locations.md
deleted file mode 100644
index 9b9609ce4f..0000000000
--- a/.changesets/feat_connectors_uri_expression_locations.md
+++ /dev/null
@@ -1,15 +0,0 @@
-### Allow expressions in more locations in Connectors URIs ([PR #7220](https://github.com/apollographql/router/pull/7220))
-
-Previously, we only allowed expressions in very specific locations in Connectors URIs:
-
-1. A path segment, like `/users/{$args.id}`
-2. A query parameter's _value_, like `/users?id={$args.id}`
-
-Expressions can now be used anywhere in or after the path of the URI.
-For example, you can do
-`@connect(http: {GET: "/users?{$args.filterName}={$args.filterValue}"})`.
-The result of any expression will _always_ be percent encoded.
-
-> Note: Parts of this feature are only available when composing with Apollo Federation v2.11 or above (currently in preview).
-
-By [@dylan-apollo](https://github.com/dylan-apollo) in https://github.com/apollographql/router/pull/7220
\ No newline at end of file
diff --git a/.changesets/feat_coprocessorhttprequestspan.md b/.changesets/feat_coprocessorhttprequestspan.md
deleted file mode 100644
index 1355b83bac..0000000000
--- a/.changesets/feat_coprocessorhttprequestspan.md
+++ /dev/null
@@ -1,15 +0,0 @@
-### Instrument coprocessor request with http_request span ([Issue #6739](https://github.com/apollographql/router/issues/6739))
-
-Coprocessor requests will now emit an `http_request` span. This span can help to gain
-insight into latency that may be introduced over the network stack when communicating with coprocessor. 
-
-Coprocessor span attributes are:
-* `otel.kind`: `CLIENT`
-* `http.request.method`: `POST`
-* `server.address`: ``
-* `server.port`: ``
-* `url.full`: ``
-* `otel.name`: ` `
-* `otel.original_name`: `http_request`
-
-By [Jon Christiansen](https://github.com/theJC) in https://github.com/apollographql/router/pull/6776
diff --git a/.changesets/feat_enhanced_client_awareness.md b/.changesets/feat_enhanced_client_awareness.md
deleted file mode 100644
index de666d4bce..0000000000
--- a/.changesets/feat_enhanced_client_awareness.md
+++ /dev/null
@@ -1,5 +0,0 @@
-### Enables reporting for client libraries that send the library name and version information in operation requests. ([PR #7264](https://github.com/apollographql/router/pull/7264))
-
-Apollo client libraries can send the library name and version information in the `extensions` key of an operation request. If those values are found in a request the router will include them in the telemetry operation report.
-
-By [@calvincestari](https://github.com/calvincestari) in https://github.com/apollographql/router/pull/7264
diff --git a/.changesets/feat_feature_connectorsyamlheaders.md b/.changesets/feat_feature_connectorsyamlheaders.md
deleted file mode 100644
index 77e7946014..0000000000
--- a/.changesets/feat_feature_connectorsyamlheaders.md
+++ /dev/null
@@ -1,29 +0,0 @@
-### Add support for connector header propagation via YAML config ([PR #7152](https://github.com/apollographql/router/pull/7152))
-
-Added support for connector header propagation via YAML config. All of the existing header propagation in the Router now works for connectors by using
-`headers.connector.all` to apply rules to all connectors or `headers.connector.sources.*` to apply rules to specific sources.
-
-Note that if one of these rules conflicts with a header set in your schema, either in `@connect` or `@source`, the value in your Router config will
-take priority and be treated as an override.
-
-```
-headers:
-  connector:
-    all: # configuration for all connectors across all subgraphs
-      request:
-        - insert:
-            name: "x-inserted-header"
-            value: "hello world!"
-        - propagate:
-            named: "x-client-header"
-    sources:
-      connector-graph.random_person_api:
-        request:
-          - insert:
-              name: "x-inserted-header"
-              value: "hello world!"
-          - propagate:
-              named: "x-client-header"
-```
-
-By [@andrewmcgivery](https://github.com/andrewmcgivery) in https://github.com/apollographql/router/pull/7152
diff --git a/.changesets/feat_persisted_query_reporting.md b/.changesets/feat_persisted_query_reporting.md
deleted file mode 100644
index 4aff985755..0000000000
--- a/.changesets/feat_persisted_query_reporting.md
+++ /dev/null
@@ -1,5 +0,0 @@
-### Enables reporting of persisted query usage by PQ ID to Apollo ([PR #7166](https://github.com/apollographql/router/pull/7166))
-
-This change allows the router to report usage metrics by persisted query ID to Apollo, so that we can show usage stats for PQs.
-
-By [@bonnici](https://github.com/bonnici) in https://github.com/apollographql/router/pull/7166
diff --git a/.changesets/fix_bnjjj_fix_log_with_subs_jwt.md b/.changesets/fix_bnjjj_fix_log_with_subs_jwt.md
deleted file mode 100644
index e94a7bbbbb..0000000000
--- a/.changesets/fix_bnjjj_fix_log_with_subs_jwt.md
+++ /dev/null
@@ -1,6 +0,0 @@
-### Check if jwt claims is part of the context before getting the jwt expiration with subscriptions ([PR #7069](https://github.com/apollographql/router/pull/7069))
-
-In https://github.com/apollographql/router/pull/6930 we introduced [logs](https://github.com/apollographql/router/pull/6930/files#diff-7597092ab9d509e0ffcb328691f1dded20f69d849f142628095f0455aa49880cR648) in `jwt_expires_in` function which causes a lot of logs when using subscriptions. 
-It also unveils a bug in the subscription implementation with JWT. Indeed if there was not JWT claims in the context, before we set a timeout set at `Duration::MAX`. Now it's always pending and there's no timeout anymore.
-
-By [@bnjjj](https://github.com/bnjjj) in https://github.com/apollographql/router/pull/7069
\ No newline at end of file
diff --git a/.changesets/fix_bryn_connection_shutdown_timeout_1_x.md b/.changesets/fix_bryn_connection_shutdown_timeout_1_x.md
deleted file mode 100644
index 8279053f7e..0000000000
--- a/.changesets/fix_bryn_connection_shutdown_timeout_1_x.md
+++ /dev/null
@@ -1,30 +0,0 @@
-### Connection shutdown timeout 1.x ([PR #7058](https://github.com/apollographql/router/pull/7058))
-
-When a connection is closed we call `graceful_shutdown` on hyper and then await for the connection to close.
-
-Hyper 0.x has various issues around shutdown that may result in us waiting for extended periods for the connection to eventually be closed.
-
-This PR introduces a configurable timeout from the termination signal to actual termination, defaulted to 60 seconds. The connection is forcibly terminated after the timeout is reached.
-
-To configure, set the option in router yaml. It accepts human time durations:
-```
-supergraph:
-  connection_shutdown_timeout: 60s
-```
-
-Note that even after connections have been terminated the router will still hang onto pipelines if `early_cancel` has not been configured to true. The router is trying to complete the request. 
-
-Users can either set `early_cancel` to `true` 
-```
-supergraph:
-  early_cancel: true
-```
-
-AND/OR use traffic shaping timeouts:
-```
-traffic_shaping:
-  router:
-    timeout: 60s
-```
-
-By [@BrynCooke](https://github.com/BrynCooke) in https://github.com/apollographql/router/pull/7058
diff --git a/.changesets/fix_caroline_compute_pool_metrics.md b/.changesets/fix_caroline_compute_pool_metrics.md
deleted file mode 100644
index ff3ba58321..0000000000
--- a/.changesets/fix_caroline_compute_pool_metrics.md
+++ /dev/null
@@ -1,19 +0,0 @@
-### Add compute pool metrics ([PR #7184](https://github.com/apollographql/router/pull/7184))
-
-The compute job pool is used within the router for compute intensive jobs that should not block the Tokio worker threads.
-When this pool becomes saturated it is difficult for users to see why so that they can take action.
-This change adds new metrics to help users understand how long jobs are waiting to be processed.  
-
-New metrics:
-- `apollo.router.compute_jobs.queue_is_full` - A counter of requests rejected because the queue was full.
-- `apollo.router.compute_jobs.duration` - A histogram of time spent in the compute pipeline by the job, including the queue and query planning.
-  - `job.type`: (`query_planning`, `query_parsing`, `introspection`)
-  - `job.outcome`: (`executed_ok`, `executed_error`, `channel_error`, `rejected_queue_full`, `abandoned`)
-- `apollo.router.compute_jobs.queue.wait.duration` - A histogram of time spent in the compute queue by the job.
-  - `job.type`: (`query_planning`, `query_parsing`, `introspection`)
-- `apollo.router.compute_jobs.execution.duration` - A histogram of time spent to execute job (excludes time spent in the queue).
-  - `job.type`: (`query_planning`, `query_parsing`, `introspection`)
-- `apollo.router.compute_jobs.active_jobs` - A gauge of the number of compute jobs being processed in parallel.
-  - `job.type`: (`query_planning`, `query_parsing`, `introspection`)
-
-By [@carodewig](https://github.com/carodewig) in https://github.com/apollographql/router/pull/7184
diff --git a/.changesets/fix_caroline_deadlock.md b/.changesets/fix_caroline_deadlock.md
deleted file mode 100644
index 1d170df887..0000000000
--- a/.changesets/fix_caroline_deadlock.md
+++ /dev/null
@@ -1,20 +0,0 @@
-### Fix potential telemetry deadlock ([PR #7142](https://github.com/apollographql/router/pull/7142))
-
-The `tracing_subscriber` crate uses `RwLock`s to manage access to a `Span`'s `Extensions`. Deadlocks are possible when
-multiple threads access this lock, including with reentrant locks:
-```
-// Thread 1              |  // Thread 2
-let _rg1 = lock.read();  |
-                         |  // will block
-                         |  let _wg = lock.write();
-// may deadlock          |
-let _rg2 = lock.read();  |
-```
-
-This fix removes an opportunity for reentrant locking while extracting a Datadog identifier.
-
-There is also a potential for deadlocks when the root and active spans' `Extensions` are acquired at the same time, if
-multiple threads are attempting to access those `Extensions` but in a different order. This fix removes a few cases
-where multiple spans' `Extensions` are acquired at the same time.
-
-By [@carodewig](https://github.com/carodewig) in https://github.com/apollographql/router/pull/7142
diff --git a/.changesets/fix_connectors_percent_encoding.md b/.changesets/fix_connectors_percent_encoding.md
deleted file mode 100644
index c44d11b742..0000000000
--- a/.changesets/fix_connectors_percent_encoding.md
+++ /dev/null
@@ -1,8 +0,0 @@
-### Relax percent encoding for Connectors ([PR #7220](https://github.com/apollographql/router/pull/7220))
-
-Characters outside of `{ }` expressions will no longer be percent encoded unless they are completely invalid for a
-URI. For example, in an expression like `@connect(http: {GET: "/products?filters[category]={$args.category}"})` the
-square
-braces `[ ]` will no longer be percent encoded. Any string from within a dynamic `{ }` will still be percent encoded.
-
-By [@dylan-apollo](https://github.com/dylan-apollo) in https://github.com/apollographql/router/pull/7220
diff --git a/.changesets/fix_connectors_trailing_slashes.md b/.changesets/fix_connectors_trailing_slashes.md
deleted file mode 100644
index 662cdfe39d..0000000000
--- a/.changesets/fix_connectors_trailing_slashes.md
+++ /dev/null
@@ -1,6 +0,0 @@
-### Preserve trailing slashes in Connectors URIs ([PR #7220](https://github.com/apollographql/router/pull/7220))
-
-Previously, a URI like `@connect(http: {GET: "/users/"})` could be normalized to `@connect(http: {GET: "/users"})`. This
-change preserves the trailing slash, which is significant to some web servers.
-
-By [@dylan-apollo](https://github.com/dylan-apollo) in https://github.com/apollographql/router/pull/7220
diff --git a/.changesets/fix_curly_think_heap_glue.md b/.changesets/fix_curly_think_heap_glue.md
deleted file mode 100644
index f147d2644c..0000000000
--- a/.changesets/fix_curly_think_heap_glue.md
+++ /dev/null
@@ -1,5 +0,0 @@
-### Helm: Correct default telemetry `resource` property in `ConfigMap` (copy #6105) ([Issue #6104](https://github.com/apollographql/router/issues/6104))
-
-The Helm chart was using an outdated value when emitting the `telemetry.exporters.metrics.common.resource.service.name` values.  This has been updated to use the correct (singular) version of `resource` (rather than the incorrect `resources` which was used earlier in 1.x's life-cycle).
-
-By [@vatsalpatel](https://github.com/vatsalpatel) in https://github.com/apollographql/router/pull/6105
\ No newline at end of file
diff --git a/.changesets/fix_duckki_entity_cache_matching_key.md b/.changesets/fix_duckki_entity_cache_matching_key.md
deleted file mode 100644
index 5e0731a861..0000000000
--- a/.changesets/fix_duckki_entity_cache_matching_key.md
+++ /dev/null
@@ -1,15 +0,0 @@
-### Entity-cache: handle multiple key directives ([PR #7228](https://github.com/apollographql/router/pull/7228))
-
-This PR fixes a bug in entity caching introduced by the fix in https://github.com/apollographql/router/pull/6888 for cases where several `@key` directives with different fields were declared on a type as documented [here](https://www.apollographql.com/docs/graphos/schema-design/federated-schemas/reference/directives#managing-types).
-
-For example if you have this kind of entity in your schema:
-
-```graphql
-type Product @key(fields: "upc") @key(fields: "sku") {
-  upc: ID!
-  sku: ID!
-  name: String
-}
-```
-
-By [@duckki](https://github.com/duckki) & [@bnjjj](https://github.com/bnjjj) in https://github.com/apollographql/router/pull/7228
diff --git a/.changesets/fix_error_apollo_operation_id_fix.md b/.changesets/fix_error_apollo_operation_id_fix.md
deleted file mode 100644
index 001c3ca3ca..0000000000
--- a/.changesets/fix_error_apollo_operation_id_fix.md
+++ /dev/null
@@ -1,6 +0,0 @@
-### Fix Apollo request metadata generation for errors ([PR #7021](https://github.com/apollographql/router/pull/7021))
-
-* Fixes the Apollo operation ID and name generated for requests that fail due to parse, validation, or invalid operation name errors.
-* Updates the error code generated for operations with an invalid operation name from GRAPHQL_VALIDATION_FAILED to GRAPHQL_UNKNOWN_OPERATION_NAME
-
-By [@bonnici](https://github.com/bonnici) in https://github.com/apollographql/router/pull/7021
\ No newline at end of file
diff --git a/.changesets/fix_events_conditions.md b/.changesets/fix_events_conditions.md
deleted file mode 100644
index 6637ebc41b..0000000000
--- a/.changesets/fix_events_conditions.md
+++ /dev/null
@@ -1,30 +0,0 @@
-### telemetry: correctly apply conditions on events ([PR #7325](https://github.com/apollographql/router/pull/7325))
-
-Fixed a issue where conditional telemetry events weren't being properly evaluated.
-This affected both standard events (`response`, `error`) and custom telemetry events.
-
-For example in config like this:
-```yaml
-telemetry:
-  instrumentation:
-    events:
-      supergraph:
-        request:
-          level: info
-          condition:
-            eq:
-            - request_header: apollo-router-log-request
-            - testing
-        response:
-          level: info
-          condition:
-            eq:
-            - request_header: apollo-router-log-request
-            - testing
-```
-
-The Router would emit the `request` event when the header matched, but never emit the `response` event - even with the same matching header.
-
-This fix ensures that all event conditions are properly evaluated, restoring expected telemetry behavior and making conditional logging work correctly throughout the entire request lifecycle.
-
-By [@IvanGoncharov](https://github.com/IvanGoncharov) in https://github.com/apollographql/router/pull/7325
\ No newline at end of file
diff --git a/.changesets/fix_fix_coprocessor_data_null.md b/.changesets/fix_fix_coprocessor_data_null.md
deleted file mode 100644
index 973c0f5826..0000000000
--- a/.changesets/fix_fix_coprocessor_data_null.md
+++ /dev/null
@@ -1,27 +0,0 @@
-### Fix Parsing of Coprocessor GraphQL Responses ([PR #7141](https://github.com/apollographql/router/pull/7141))
-
-Previously Router ignored `data: null` property inside GraphQL response returned by coprocessor.
-According to [GraphQL Spectification](https://spec.graphql.org/draft/#sel-FAPHLJCAACEBxlY):
-
-> If an error was raised during the execution that prevented a valid response, the "data" entry in the response should be null.
-
-That means if coprocessor returned valid execution error, for example:
-
-```json
-{
-  "data": null,
-  "errors": [{ "message": "Some execution error" }]
-}
-```
-
-Router violated above restriction from GraphQL Specification by returning following response to client:
-
-```json
-{
-  "errors": [{ "message": "Some execution error" }]
-}
-```
-
-This fix ensures full compliance with the GraphQL specification by preserving the complete structure of error responses from coprocessors.
-
-Contributed by [@IvanGoncharov](https://github.com/IvanGoncharov) in [#7141](https://github.com/apollographql/router/pull/7141)
diff --git a/.changesets/fix_fix_docker_image_fix_for_cloudrun.md b/.changesets/fix_fix_docker_image_fix_for_cloudrun.md
deleted file mode 100644
index fa74dbadbb..0000000000
--- a/.changesets/fix_fix_docker_image_fix_for_cloudrun.md
+++ /dev/null
@@ -1,11 +0,0 @@
-### Update Dockerfile exec script to use `#!/bin/bash` instead of `#!/usr/bin/env bash` ([Issue #3517](https://github.com/apollographql/router/issues/3517))
-
-For users of Google Cloud Platform (GCP) Cloud Run platform, using the router's default Docker image was not possible due to an error that would occur during startup: 
-
-```sh
-"/usr/bin/env: 'bash ': No such file or directory"
-```
-
-To avoid this issue, we've changed the script to use `#!/bin/bash` instead of `#!/usr/bin/env bash`, as we use a fixed Linux distribution in Docker which has the Bash binary located there. 
-
-By [@lleadbet](https://github.com/lleadbet) in https://github.com/apollographql/router/pull/7198
diff --git a/.changesets/fix_heap_tail_paper_bunk.md b/.changesets/fix_heap_tail_paper_bunk.md
deleted file mode 100644
index ab7f21e920..0000000000
--- a/.changesets/fix_heap_tail_paper_bunk.md
+++ /dev/null
@@ -1,5 +0,0 @@
-### Support @context/@fromContext when using Connectors ([PR #7132](https://github.com/apollographql/router/pull/7132))
-
-This fixes a bug that dropped the `@context` and `@fromContext` directives when introducing a connector.
-
-By [@lennyburdette](https://github.com/lennyburdette) in https://github.com/apollographql/router/pull/7132
\ No newline at end of file
diff --git a/.changesets/fix_improve_jwt_errors.md b/.changesets/fix_improve_jwt_errors.md
deleted file mode 100644
index 23b496220a..0000000000
--- a/.changesets/fix_improve_jwt_errors.md
+++ /dev/null
@@ -1,16 +0,0 @@
-### Improve Error Message for Invalid JWT Header Values ([PR #7121](https://github.com/apollographql/router/pull/7121))
-
-Enhanced parsing error messages for JWT Authorization header values now provide developers with clear, actionable feedback while ensuring that no sensitive data is exposed.
-
-Examples of the updated error messages:
-```diff
--         Header Value: '' is not correctly formatted. prefix should be 'Bearer'
-+         Value of 'authorization' JWT header should be prefixed with 'Bearer'
-```
-
-```diff
--         Header Value: 'Bearer' is not correctly formatted. Missing JWT
-+         Value of 'authorization' JWT header has only 'Bearer' prefix but no JWT token
-```
-
-By [@IvanGoncharov](https://github.com/IvanGoncharov) in https://github.com/apollographql/router/pull/7121
diff --git a/.changesets/fix_meryl_pulsr_1429.md b/.changesets/fix_meryl_pulsr_1429.md
deleted file mode 100644
index f0810f1558..0000000000
--- a/.changesets/fix_meryl_pulsr_1429.md
+++ /dev/null
@@ -1,5 +0,0 @@
-### Parse nested input types and report them ([PR #6900](https://github.com/apollographql/router/pull/6900))
-
-Fixes a bug where enums that were arguments to nested queries were not being reported. 
-
-By [@merylc](https://github.com/merylc) in https://github.com/apollographql/router/pull/6900
\ No newline at end of file
diff --git a/.changesets/fix_renee_bail_invalid_query_plans.md b/.changesets/fix_renee_bail_invalid_query_plans.md
deleted file mode 100644
index 100ed8a3d7..0000000000
--- a/.changesets/fix_renee_bail_invalid_query_plans.md
+++ /dev/null
@@ -1,7 +0,0 @@
-### Fix crash when an invalid query plan is generated ([PR #7214](https://github.com/apollographql/router/pull/7214))
-
-When an invalid query plan is generated, the router could panic and crash.
-This could happen if there are gaps in the GraphQL validation implementation.
-Now, even if there are unresolved gaps, the router will handle it gracefully and reject the request.
-
-By [@goto-bus-stop](https://github.com/goto-bus-stop) in https://github.com/apollographql/router/pull/7214
\ No newline at end of file
diff --git a/.changesets/fix_renee_increase_compute_job_queue.md b/.changesets/fix_renee_increase_compute_job_queue.md
deleted file mode 100644
index 49e932a02e..0000000000
--- a/.changesets/fix_renee_increase_compute_job_queue.md
+++ /dev/null
@@ -1,12 +0,0 @@
-### Increase compute job worker pool queue size ([PR #7205](https://github.com/apollographql/router/pull/7205))
-
-The compute job worker pool is used for CPU-bound tasks, like GraphQL parsing, validation, and query planning. When there are too many jobs to handle in parallel, jobs enter a queue.
-
-We previously set this queue size to 20 (per thread) somewhat arbitrarily. We got some signals that this may be too small.
-
-This patch increases the queue size to 1 000 jobs per thread. For reference, in older router versions before the introduction of the compute job worker pool, the equivalent queue size was *10 000*.
-
-The number is still a bit arbitrary, and subject to more changes in the future as we understand its effects better. Along with some other tweaks to job priorities we expect this to give better behaviour and reject fewer requests needlessly.
-
-
-By [@goto-bus-stop](https://github.com/goto-bus-stop) in https://github.com/apollographql/router/pull/7205
\ No newline at end of file
diff --git a/.changesets/fix_router-external-extensibility-deprecation.md b/.changesets/fix_router-external-extensibility-deprecation.md
deleted file mode 100644
index d3f6b0bfac..0000000000
--- a/.changesets/fix_router-external-extensibility-deprecation.md
+++ /dev/null
@@ -1,5 +0,0 @@
-###  Clarify tracing error messages in coprocessor's stages (PR #6791)
-
-Trace messages in coprocessors used `external extensibility` namespace. They now use `coprocessor` in the message instead for clarity.
-
-By [@briannafugate408](https://github.com/briannafugate408)
\ No newline at end of file
diff --git a/.changesets/fix_rreg_int_err_codes_fix.md b/.changesets/fix_rreg_int_err_codes_fix.md
deleted file mode 100644
index 1d2df59b96..0000000000
--- a/.changesets/fix_rreg_int_err_codes_fix.md
+++ /dev/null
@@ -1,6 +0,0 @@
-### Enable Integer Error Code Reporting ([PR #7226](https://github.com/apollographql/router/pull/7226))
-
-Fixes an issue where numeric error codes (e.g. 400, 500) were not properly parsed into a string and thus were not
-reported to Apollo error telemetry.
-
-By [@rregitsky](https://github.com/rregitsky) in https://github.com/apollographql/router/pull/7226
diff --git a/.changesets/fix_simon_jwt_metrics.md b/.changesets/fix_simon_jwt_metrics.md
deleted file mode 100644
index b4b6fb9c1a..0000000000
--- a/.changesets/fix_simon_jwt_metrics.md
+++ /dev/null
@@ -1,9 +0,0 @@
-### Fix JWT metrics discrepancy ([PR #7258](https://github.com/apollographql/router/pull/7258))
-
-This fixes the `apollo.router.operations.authentication.jwt` counter metric to behave [as documented](https://www.apollographql.com/docs/graphos/routing/security/jwt#observability): emitted for every request that uses JWT, with the `authentication.jwt.failed` attribute set to true or false for failed or successful authentication.
-
-Previously, it was only used for failed authentication.
-
-The attribute-less and accidentally-differently-named `apollo.router.operations.jwt` counter was and is only emitted for successful authentication, but is deprecated now.
-
-By [@SimonSapin](https://github.com/SimonSapin) in https://github.com/apollographql/router/pull/7258
\ No newline at end of file
diff --git a/.changesets/fix_simon_unwarn_resource_attr.md b/.changesets/fix_simon_unwarn_resource_attr.md
deleted file mode 100644
index 49de307bea..0000000000
--- a/.changesets/fix_simon_unwarn_resource_attr.md
+++ /dev/null
@@ -1,17 +0,0 @@
-### Remove "setting resource attributes is not allowed" warning ([PR #7272](https://github.com/apollographql/router/pull/7272))
-
-If Uplink is enabled, Router 2.1.x emits this warning at startup event though no user configuration or other choice is responsible for it:
-
-```
-WARN  setting resource attributes is not allowed for Apollo telemetry
-```
-
-This removes the warning entirely as it’s not particularly helpful.
-
-Reproduction:
-
-```
-APOLLO_KEY=secret APOLLO_GRAPH_REF=starstuff@current cargo run
-```
-
-By [@SimonSapin](https://github.com/SimonSapin) in https://github.com/apollographql/router/pull/7272
diff --git a/.changesets/helm_targetport_configuration.md b/.changesets/helm_targetport_configuration.md
deleted file mode 100644
index c95c7107dd..0000000000
--- a/.changesets/helm_targetport_configuration.md
+++ /dev/null
@@ -1,5 +0,0 @@
-### Add option to configure targetPort via Helm Chart ([PR #5672](https://github.com/apollographql/router/pull/5672))
-
-Allow the router service `targetPort` to be configured when doing a Helm deploy. The default is also provided.
-
-By [@daljitsumman](https://github.com/daljitsumman) in https://github.com/apollographql/router/pull/5672
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a5a63854f..97581dd50d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,466 @@
 
 This project adheres to [Semantic Versioning v2.0.0](https://semver.org/spec/v2.0.0.html).
 
+# [2.2.0] - 2025-04-28
+
+## πŸš€ Features
+
+### Add support for connector header propagation via YAML config ([PR #7152](https://github.com/apollographql/router/pull/7152))
+
+Added support for connector header propagation via YAML config. All of the existing header propagation in the Router now works for connectors by using
+`headers.connector.all` to apply rules to all connectors or `headers.connector.sources.*` to apply rules to specific sources.
+
+Note that if one of these rules conflicts with a header set in your schema, either in `@connect` or `@source`, the value in your Router config will
+take priority and be treated as an override.
+
+```yaml
+headers:
+  connector:
+    all: # configuration for all connectors across all subgraphs
+      request:
+        - insert:
+            name: "x-inserted-header"
+            value: "hello world!"
+        - propagate:
+            named: "x-client-header"
+    sources:
+      connector-graph.random_person_api:
+        request:
+          - insert:
+              name: "x-inserted-header"
+              value: "hello world!"
+          - propagate:
+              named: "x-client-header"
+```
+
+By [@andrewmcgivery](https://github.com/andrewmcgivery) in https://github.com/apollographql/router/pull/7152
+
+### Enable configuration auto-migration for minor version bumps ([PR #7162](https://github.com/apollographql/router/pull/7162))
+
+To facilitate configuration evolution within major versions of the router's lifecycles (e.g., within 2.x.x versions), YAML configuration migrations are applied automatically. To avoid configuration drift and facilitate maintenance, when upgrading to a new major version the migrations from the previous major (e.g., 1.x.x) will not be applied automatically. These will need to be applied with `router config upgrade` prior to the upgrade.  To facilitate major version upgrades, we recommend regularly applying the configuration changes using `router config upgrade` and committing those to your version control system.
+
+By [@bnjjj](https://github.com/bnjjj) in https://github.com/apollographql/router/pull/7162
+
+### Allow expressions in more locations in Connectors URIs ([PR #7220](https://github.com/apollographql/router/pull/7220))
+
+Previously, we only allowed expressions in very specific locations in Connectors URIs:
+
+1. A path segment, like `/users/{$args.id}`
+2. A query parameter's _value_, like `/users?id={$args.id}`
+
+Expressions can now be used anywhere in or after the path of the URI.
+For example, you can do
+`@connect(http: {GET: "/users?{$args.filterName}={$args.filterValue}"})`.
+The result of any expression will _always_ be percent encoded.
+
+> Note: Parts of this feature are only available when composing with Apollo Federation v2.11 or above (currently in preview).
+
+By [@dylan-apollo](https://github.com/dylan-apollo) in https://github.com/apollographql/router/pull/7220
+
+### Enables reporting of persisted query usage by PQ ID to Apollo ([PR #7166](https://github.com/apollographql/router/pull/7166))
+
+This change allows the router to report usage metrics by persisted query ID to Apollo, so that we can show usage stats for PQs.
+
+By [@bonnici](https://github.com/bonnici) in https://github.com/apollographql/router/pull/7166
+
+### Instrument coprocessor request with `http_request` span ([Issue #6739](https://github.com/apollographql/router/issues/6739))
+
+Coprocessor requests will now emit an `http_request` span. This span can help to gain
+insight into latency that may be introduced over the network stack when communicating with coprocessor.
+
+Coprocessor span attributes are:
+
+- `otel.kind`: `CLIENT`
+- `http.request.method`: `POST`
+- `server.address`: ``
+- `server.port`: ``
+- `url.full`: ``
+- `otel.name`: ` `
+- `otel.original_name`: `http_request`
+
+By [@theJC](https://github.com/theJC) in https://github.com/apollographql/router/pull/6776
+
+### Enables reporting for client libraries that send the library name and version information in operation requests. ([PR #7264](https://github.com/apollographql/router/pull/7264))
+
+Apollo client libraries can send the library name and version information in the `extensions` key of an operation request. If those values are found in a request the router will include them in the telemetry operation report sent to Apollo.
+
+By [@calvincestari](https://github.com/calvincestari) in https://github.com/apollographql/router/pull/7264
+
+### Add compute job pool spans ([PR #7236](https://github.com/apollographql/router/pull/7236))
+
+The compute job pool in the router is used to execute CPU intensive work outside of the main I/O worker threads, including GraphQL parsing, query planning, and introspection.
+This PR adds spans to jobs that are on this pool to allow users to see when latency is introduced due to
+resource contention within the compute job pool.
+
+* `compute_job`:
+  - `job.type`: (`query_parsing`|`query_planning`|`introspection`)
+* `compute_job.execution`
+  - `job.age`: `P1`-`P8`
+  - `job.type`: (`query_parsing`|`query_planning`|`introspection`)
+
+Jobs are executed highest priority (`P8`) first. Jobs that are low priority (`P1`) age over time, eventually executing
+at highest priority. The age of a job is can be used to diagnose if a job was waiting in the queue due to other higher
+priority jobs also in the queue.
+
+By [@bryncooke](https://github.com/bryncooke) in https://github.com/apollographql/router/pull/7236
+
+### JWT authorization supports multiple issuers ([Issue #6172](https://github.com/apollographql/router/issues/6172))
+
+Allow JWT authorization options to support multiple issuers using the same JWKS.
+
+**Configuration change**: any `issuer` defined on currently existing `authentication.router.jwt.jwks` needs to be
+migrated to an entry in the `issuers` list.  This configuration will happen automatically until the next major version of the router. This change can be committed using `./router config upgrade` prior to the next major release.
+
+For example, the following configuration:
+
+```yaml
+authentication:
+  router:
+    jwt:
+      jwks:
+        - url: https://dev-zzp5enui.us.auth0.com/.well-known/jwks.json
+          issuer: https://issuer.one
+```
+
+Will be changed to contain an array of `issuers` rather than a single `issuer`:
+
+```yaml
+authentication:
+  router:
+    jwt:
+      jwks:
+        - url: https://dev-zzp5enui.us.auth0.com/.well-known/jwks.json
+          issuers:
+            - https://issuer.one
+            - https://issuer.two
+```
+
+By [@theJC](https://github.com/theJC) in https://github.com/apollographql/router/pull/7170
+
+## πŸ› Fixes
+
+### Fix JWT metrics discrepancy ([PR #7258](https://github.com/apollographql/router/pull/7258))
+
+This fixes the `apollo.router.operations.authentication.jwt` counter metric to behave [as documented](https://www.apollographql.com/docs/graphos/routing/security/jwt#observability): emitted for every request that uses JWT, with the `authentication.jwt.failed` attribute set to true or false for failed or successful authentication.
+
+Previously, it was only used for failed authentication.
+
+The attribute-less and accidentally-differently-named `apollo.router.operations.jwt` counter was and is only emitted for successful authentication, but is deprecated now.
+
+By [@SimonSapin](https://github.com/SimonSapin) in https://github.com/apollographql/router/pull/7258
+
+### Fix potential telemetry deadlock ([PR #7142](https://github.com/apollographql/router/pull/7142))
+
+The `tracing_subscriber` crate uses `RwLock`s to manage access to a `Span`'s `Extensions`. Deadlocks are possible when
+multiple threads access this lock, including with reentrant locks:
+```
+// Thread 1              |  // Thread 2
+let _rg1 = lock.read();  |
+                         |  // will block
+                         |  let _wg = lock.write();
+// may deadlock          |
+let _rg2 = lock.read();  |
+```
+
+This fix removes an opportunity for reentrant locking while extracting a Datadog identifier.
+
+There is also a potential for deadlocks when the root and active spans' `Extensions` are acquired at the same time, if
+multiple threads are attempting to access those `Extensions` but in a different order. This fix removes a few cases
+where multiple spans' `Extensions` are acquired at the same time.
+
+By [@carodewig](https://github.com/carodewig) in https://github.com/apollographql/router/pull/7142
+
+### Check if JWT claim is part of the context before getting the JWT expiration with subscriptions ([PR #7069](https://github.com/apollographql/router/pull/7069))
+
+In v2.1.0 we introduced [logs](https://github.com/apollographql/router/pull/6930/files#diff-7597092ab9d509e0ffcb328691f1dded20f69d849f142628095f0455aa49880cR648) for the `jwt_expires_in` function which caused an unexpectedly chatty logging when using subscriptions.
+
+By [@bnjjj](https://github.com/bnjjj) in https://github.com/apollographql/router/pull/7069
+
+### Parse nested input types and report them ([PR #6900](https://github.com/apollographql/router/pull/6900))
+
+Fixes a bug where enums that were arguments to nested queries were not being reported.
+
+By [@merylc](https://github.com/merylc) in https://github.com/apollographql/router/pull/6900
+
+### Add compute job pool metrics ([PR #7184](https://github.com/apollographql/router/pull/7184))
+
+The compute job pool is used within the router for compute intensive jobs that should not block the Tokio worker threads.
+When this pool becomes saturated it is difficult for users to see why so that they can take action.
+This change adds new metrics to help users understand how long jobs are waiting to be processed.
+
+New metrics:
+- `apollo.router.compute_jobs.queue_is_full` - A counter of requests rejected because the queue was full.
+- `apollo.router.compute_jobs.duration` - A histogram of time spent in the compute pipeline by the job, including the queue and query planning.
+  - `job.type`: (`query_planning`, `query_parsing`, `introspection`)
+  - `job.outcome`: (`executed_ok`, `executed_error`, `channel_error`, `rejected_queue_full`, `abandoned`)
+- `apollo.router.compute_jobs.queue.wait.duration` - A histogram of time spent in the compute queue by the job.
+  - `job.type`: (`query_planning`, `query_parsing`, `introspection`)
+- `apollo.router.compute_jobs.execution.duration` - A histogram of time spent to execute job (excludes time spent in the queue).
+  - `job.type`: (`query_planning`, `query_parsing`, `introspection`)
+- `apollo.router.compute_jobs.active_jobs` - A gauge of the number of compute jobs being processed in parallel.
+  - `job.type`: (`query_planning`, `query_parsing`, `introspection`)
+
+By [@carodewig](https://github.com/carodewig) in https://github.com/apollographql/router/pull/7184
+
+### Preserve trailing slashes in Connectors URIs ([PR #7220](https://github.com/apollographql/router/pull/7220))
+
+Previously, a URI like `@connect(http: {GET: "/users/"})` could be normalized to `@connect(http: {GET: "/users"})`. This
+change preserves the trailing slash, which is significant to some web servers.
+
+By [@dylan-apollo](https://github.com/dylan-apollo) in https://github.com/apollographql/router/pull/7220
+
+### Support @context/@fromContext when using Connectors ([PR #7132](https://github.com/apollographql/router/pull/7132))
+
+This fixes a bug that dropped the `@context` and `@fromContext` directives when introducing a connector.
+
+By [@lennyburdette](https://github.com/lennyburdette) in https://github.com/apollographql/router/pull/7132
+
+### telemetry: correctly apply conditions on events ([PR #7325](https://github.com/apollographql/router/pull/7325))
+
+Fixed a issue where conditional telemetry events weren't being properly evaluated.
+This affected both standard events (`response`, `error`) and custom telemetry events.
+
+For example in config like this:
+```yaml
+telemetry:
+  instrumentation:
+    events:
+      supergraph:
+        request:
+          level: info
+          condition:
+            eq:
+            - request_header: apollo-router-log-request
+            - testing
+        response:
+          level: info
+          condition:
+            eq:
+            - request_header: apollo-router-log-request
+            - testing
+```
+
+The Router would emit the `request` event when the header matched, but never emit the `response` event - even with the same matching header.
+
+This fix ensures that all event conditions are properly evaluated, restoring expected telemetry behavior and making conditional logging work correctly throughout the entire request lifecycle.
+
+By [@IvanGoncharov](https://github.com/IvanGoncharov) in https://github.com/apollographql/router/pull/7325
+
+### Connection shutdown timeout 1.x ([PR #7058](https://github.com/apollographql/router/pull/7058))
+
+When a connection is closed we call `graceful_shutdown` on hyper and then await for the connection to close.
+
+Hyper 0.x has various issues around shutdown that may result in us waiting for extended periods for the connection to eventually be closed.
+
+This PR introduces a configurable timeout from the termination signal to actual termination, defaulted to 60 seconds. The connection is forcibly terminated after the timeout is reached.
+
+To configure, set the option in router yaml. It accepts human time durations:
+```
+supergraph:
+  connection_shutdown_timeout: 60s
+```
+
+Note that even after connections have been terminated the router will still hang onto pipelines if `early_cancel` has not been configured to true. The router is trying to complete the request.
+
+Users can either set `early_cancel` to `true`
+```
+supergraph:
+  early_cancel: true
+```
+
+AND/OR use traffic shaping timeouts:
+```
+traffic_shaping:
+  router:
+    timeout: 60s
+```
+
+By [@BrynCooke](https://github.com/BrynCooke) in https://github.com/apollographql/router/pull/7058
+
+###  Clarify tracing error messages in coprocessor's stages (PR #6791)
+
+Trace messages in coprocessors used `external extensibility` namespace. They now use `coprocessor` in the message instead for clarity.
+
+By [@briannafugate408](https://github.com/briannafugate408)
+
+### Fix crash when an invalid query plan is generated ([PR #7214](https://github.com/apollographql/router/pull/7214))
+
+When an invalid query plan is generated, the router could panic and crash.
+This could happen if there are gaps in the GraphQL validation implementation.
+Now, even if there are unresolved gaps, the router will handle it gracefully and reject the request.
+
+By [@goto-bus-stop](https://github.com/goto-bus-stop) in https://github.com/apollographql/router/pull/7214
+
+### Fix Apollo request metadata generation for errors ([PR #7021](https://github.com/apollographql/router/pull/7021))
+
+* Fixes the Apollo operation ID and name generated for requests that fail due to parse, validation, or invalid operation name errors.
+* Updates the error code generated for operations with an invalid operation name from GRAPHQL_VALIDATION_FAILED to GRAPHQL_UNKNOWN_OPERATION_NAME
+
+By [@bonnici](https://github.com/bonnici) in https://github.com/apollographql/router/pull/7021
+
+### Enable Integer Error Code Reporting ([PR #7226](https://github.com/apollographql/router/pull/7226))
+
+Fixes an issue where numeric error codes (e.g. 400, 500) were not properly parsed into a string and thus were not
+reported to Apollo error telemetry.
+
+By [@rregitsky](https://github.com/rregitsky) in https://github.com/apollographql/router/pull/7226
+
+### Increase compute job pool queue size ([PR #7205](https://github.com/apollographql/router/pull/7205))
+
+The compute job pool in the router is used to execute CPU intensive work outside of the main I/O worker threads, including GraphQL parsing, query planning, and introspection. When the pool is busy, jobs enter a queue.
+
+We previously set this queue size to 20 (per thread). However, this may be too small on resource constrained environments.
+
+This patch increases the queue size to 1,000 jobs per thread. For reference, in older router versions before the introduction of the compute job worker pool, the equivalent queue size was *1,000*.
+
+By [@goto-bus-stop](https://github.com/goto-bus-stop) in https://github.com/apollographql/router/pull/7205
+
+### Relax percent encoding for Connectors ([PR #7220](https://github.com/apollographql/router/pull/7220))
+
+Characters outside of `{ }` expressions will no longer be percent encoded unless they are completely invalid for a
+URI. For example, in an expression like `@connect(http: {GET: "/products?filters[category]={$args.category}"})` the
+square
+braces `[ ]` will no longer be percent encoded. Any string from within a dynamic `{ }` will still be percent encoded.
+
+By [@dylan-apollo](https://github.com/dylan-apollo) in https://github.com/apollographql/router/pull/7220
+
+### Preserve `data: null` when handling coprocessor GraphQL responses which included `errors` ([PR #7141](https://github.com/apollographql/router/pull/7141))
+
+Previously, Router incorrectly swallowed `data: null` conditions on GraphQL responses returned from a coprocessor.
+
+According to [GraphQL Spectification](https://spec.graphql.org/draft/#sel-FAPHLJCAACEBxlY):
+
+> If an error was raised during the execution that prevented a valid response, the "data" entry in the response **should be null**.
+
+That means if coprocessor returned a valid execution error, for example:
+
+```json
+{
+  "data": null,
+  "errors": [{ "message": "Some execution error" }]
+}
+```
+
+It was incorrect (and inadvertent) to return the following response to the client:
+
+```json
+{
+  "errors": [{ "message": "Some execution error" }]
+}
+```
+
+This fix ensures compliance with the GraphQL specification in this regard by preserving the complete structure of the response returned from coprocessors.
+
+Contributed by [@IvanGoncharov](https://github.com/IvanGoncharov) in [#7141](https://github.com/apollographql/router/pull/7141)
+
+### Helm: Correct default telemetry `resource` property in `ConfigMap` ([Issue #6104](https://github.com/apollographql/router/issues/6104))
+
+The Helm chart was using an outdated value when emitting the `telemetry.exporters.metrics.common.resource.service.name` values.  This has been updated to use the correct (singular) version of `resource` (rather than the incorrect `resources` which was used earlier in 1.x's life-cycle).
+
+By [@vatsalpatel](https://github.com/vatsalpatel) in https://github.com/apollographql/router/pull/6105
+
+### Update Dockerfile exec script to use `#!/bin/bash` instead of `#!/usr/bin/env bash` ([Issue #3517](https://github.com/apollographql/router/issues/3517))
+
+For users of Google Cloud Platform (GCP) Cloud Run platform, using the router's default Docker image was not possible due to an error that would occur during startup:
+
+```sh
+"/usr/bin/env: 'bash ': No such file or directory"
+```
+
+To avoid this issue, we've changed the script to use `#!/bin/bash` instead of `#!/usr/bin/env bash`, as we use a fixed Linux distribution in Docker which has the Bash binary located in a fixed location.
+
+By [@lleadbet](https://github.com/lleadbet) in https://github.com/apollographql/router/pull/7198
+
+### Remove "setting resource attributes is not allowed" warning ([PR #7272](https://github.com/apollographql/router/pull/7272))
+
+If Uplink was enabled, Router 2.1.x emitted this warning at startup even when there was no user configuration responsible for the condition:
+
+```
+WARN  setting resource attributes is not allowed for Apollo telemetry
+```
+
+The warning is removed entirely.
+
+By [@SimonSapin](https://github.com/SimonSapin) in https://github.com/apollographql/router/pull/7272
+
+## πŸ“ƒ Configuration
+
+### Customization of "header read timeout" ([PR #7262](https://github.com/apollographql/router/pull/7262))
+
+This change exposes the server's header read timeout as the `server.http.header_read_timeout` configuration option.
+
+By default, the `server.http.header_read_timeout` is set to previously hard-coded 10 seconds. A longer timeout can be configured using the `server.http.header_read_timeout` option.
+
+```yaml title="router.yaml"
+server:
+  http:
+    header_read_timeout: 30s
+```
+
+By [@gwardwell ](https://github.com/gwardwell) in https://github.com/apollographql/router/pull/7262
+
+### Fine-grained control over `include_subgraph_errors` ([Issue #6402](https://github.com/apollographql/router/pull/6402)
+
+Update `include_subgraph_errors` with additional configuration options for both global and subgraph levels. This update provides finer control over error messages and extension keys for each subgraph.
+For more details, please read [subgraph error inclusion](https://www.apollographql.com/docs/graphos/routing/observability/subgraph-error-inclusion).
+
+```yaml
+include_subgraph_errors:
+  all:
+    redact_message: true
+    allow_extensions_keys:
+      - code
+  subgraphs:
+    product:
+      redact_message: false  # Propagate original error messages
+      allow_extensions_keys: # Extend global allow list - `code` and `reason` will be propagated
+        - reason
+      exclude_global_keys:   # Exclude `code` from global allow list - only `reason` will be propagated.
+        - code
+    account:
+      deny_extensions_keys:  # Overrides global allow list
+        - classification
+    review: false            # Redact everything.
+
+    # Undefined subgraphs inherits default global settings from `all`
+```
+
+**Note:** Using a `deny_extensions_keys` approach carries security risks because any sensitive information not explicitly included in the deny list will be exposed to clients. For better security, subgraphs should prefer to redact everything or `allow_extensions_keys` when possible.
+
+By [@Samjin](https://github.com/Samjin) and [@bryncooke](https://github.com/bryncooke) in https://github.com/apollographql/router/pull/7164
+
+### Add new configurable delivery pathway for high cardinality GraphOS Studio metrics ([PR #7138](https://github.com/apollographql/router/pull/7138))
+
+This change provides a secondary pathway for new "realtime" GraphOS Studio metrics whose delivery interval is configurable due to their higher cardinality. These metrics will respect `telemetry.apollo.batch_processor.scheduled_delay` as configured on the realtime path.  All other Apollo metrics will maintain the previous hardcoded 60s send interval.
+
+By [@rregitsky](https://github.com/rregitsky) and [@timbotnik](https://github.com/timbotnik) in https://github.com/apollographql/router/pull/7138
+
+## πŸ“š Documentation
+
+### GraphQL error codes that can occur during router execution ([PR #7160](https://github.com/apollographql/router/issues/7160))
+
+Added documentation for more GraphQL error codes that can occur during router execution, including better differentiation between HTTP status codes and GraphQL error extensions codes.
+
+By [@timbotnik](https://github.com/timbotnik) in https://github.com/apollographql/router/pull/7160
+
+### Update API Gateway tech note ([PR #7261](https://github.com/apollographql/router/pull/7261))
+
+Update the [Router vs Gateway Tech Note](https://www.apollographql.com/docs/graphos/routing/router-api-gateway-comparison) with more details now that we have connectors
+
+By [@smyrick](https://github.com/smyrick) in https://github.com/apollographql/router/pull/7261
+
+### Extended errors preview configuration ([PR 7038](https://github.com/apollographql/router/pull/7038))
+
+We've introduced documentation for [GraphOS extended error reporting](https://www.apollographql.com/docs/graphos/routing/configuration#extended-error-reporting).
+
+By [@timbotnik](https://github.com/timbotnik) in https://github.com/apollographql/router/pull/7038
+
+### Add tip about `Apollo-Expose-Query-Plan: dry-run` to Cache warm-up ([PR #6973](https://github.com/apollographql/router/pull/6973))
+
+The [Cache warm-up documentation](https://www.apollographql.com/docs/graphos/routing/performance/caching/in-memory#cache-warm-up) now flags the availability of the `Apollo-Expose-Query-Plan: dry-run` header.
+
+By [@smyrick](https://github.com/smyrick) in https://github.com/apollographql/router/pull/6973
+
 # [2.1.3] - 2025-04-16
 
 ## πŸ› Fixes
diff --git a/Cargo.lock b/Cargo.lock
index 75bd05fbcb..97bcdbdf62 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -191,7 +191,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-federation"
-version = "2.2.0-rc.0"
+version = "2.2.0"
 dependencies = [
  "apollo-compiler",
  "apollo-federation",
@@ -255,7 +255,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-router"
-version = "2.2.0-rc.0"
+version = "2.2.0"
 dependencies = [
  "ahash",
  "anyhow",
@@ -424,7 +424,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-router-benchmarks"
-version = "2.2.0-rc.0"
+version = "2.2.0"
 dependencies = [
  "apollo-parser",
  "apollo-router",
diff --git a/apollo-federation/Cargo.toml b/apollo-federation/Cargo.toml
index fc8311b7af..90346f8dfc 100644
--- a/apollo-federation/Cargo.toml
+++ b/apollo-federation/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "apollo-federation"
-version = "2.2.0-rc.0"
+version = "2.2.0"
 authors = ["The Apollo GraphQL Contributors"]
 edition = "2024"
 description = "Apollo Federation"
diff --git a/apollo-router-benchmarks/Cargo.toml b/apollo-router-benchmarks/Cargo.toml
index 7e49f6a44e..fb819760b9 100644
--- a/apollo-router-benchmarks/Cargo.toml
+++ b/apollo-router-benchmarks/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "apollo-router-benchmarks"
-version = "2.2.0-rc.0"
+version = "2.2.0"
 authors = ["Apollo Graph, Inc. "]
 edition = "2021"
 license = "Elastic-2.0"
diff --git a/apollo-router/Cargo.toml b/apollo-router/Cargo.toml
index 8f68c2a770..02bb4b7453 100644
--- a/apollo-router/Cargo.toml
+++ b/apollo-router/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "apollo-router"
-version = "2.2.0-rc.0"
+version = "2.2.0"
 authors = ["Apollo Graph, Inc. "]
 repository = "https://github.com/apollographql/router/"
 documentation = "https://docs.rs/apollo-router"
@@ -58,7 +58,7 @@ snapshot = ["axum-server", "serde_regex"]
 [dependencies]
 anyhow = "1.0.86"
 apollo-compiler.workspace = true
-apollo-federation = { path = "../apollo-federation", version = "=2.2.0-rc.0", features = ["connect_v0.2"] }
+apollo-federation = { path = "../apollo-federation", version = "=2.2.0", features = ["connect_v0.2"] }
 async-compression = { version = "0.4.6", features = [
     "tokio",
     "brotli",
diff --git a/dockerfiles/tracing/docker-compose.datadog.yml b/dockerfiles/tracing/docker-compose.datadog.yml
index 6a9f8b03d4..de78fdedb3 100644
--- a/dockerfiles/tracing/docker-compose.datadog.yml
+++ b/dockerfiles/tracing/docker-compose.datadog.yml
@@ -2,7 +2,7 @@ version: "3.9"
 services:
   apollo-router:
     container_name: apollo-router
-    image: ghcr.io/apollographql/router:v2.2.0-rc.0
+    image: ghcr.io/apollographql/router:v2.2.0
     volumes:
       - ./supergraph.graphql:/etc/config/supergraph.graphql
       - ./router/datadog.router.yaml:/etc/config/configuration.yaml
diff --git a/dockerfiles/tracing/docker-compose.zipkin.yml b/dockerfiles/tracing/docker-compose.zipkin.yml
index 268a7e8de0..2375f9233d 100644
--- a/dockerfiles/tracing/docker-compose.zipkin.yml
+++ b/dockerfiles/tracing/docker-compose.zipkin.yml
@@ -3,7 +3,7 @@ services:
   apollo-router:
     container_name: apollo-router
     build: ./router
-    image: ghcr.io/apollographql/router:v2.2.0-rc.0
+    image: ghcr.io/apollographql/router:v2.2.0
     volumes:
       - ./supergraph.graphql:/etc/config/supergraph.graphql
       - ./router/zipkin.router.yaml:/etc/config/configuration.yaml
diff --git a/helm/chart/router/Chart.yaml b/helm/chart/router/Chart.yaml
index 5682551b6b..890bb6197c 100644
--- a/helm/chart/router/Chart.yaml
+++ b/helm/chart/router/Chart.yaml
@@ -20,10 +20,10 @@ type: application
 # 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: 2.2.0-rc.0
+version: 2.2.0
 
 # 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: "v2.2.0-rc.0"
+appVersion: "v2.2.0"
diff --git a/helm/chart/router/README.md b/helm/chart/router/README.md
index 54e0756835..3e654c0ebe 100644
--- a/helm/chart/router/README.md
+++ b/helm/chart/router/README.md
@@ -2,7 +2,7 @@
 
 [router](https://github.com/apollographql/router) Rust Graph Routing runtime for Apollo Federation
 
-![Version: 2.2.0-rc.0](https://img.shields.io/badge/Version-2.2.0--rc.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.2.0-rc.0](https://img.shields.io/badge/AppVersion-v2.2.0--rc.0-informational?style=flat-square)
+![Version: 2.2.0](https://img.shields.io/badge/Version-2.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.2.0](https://img.shields.io/badge/AppVersion-v2.2.0-informational?style=flat-square)
 
 ## Prerequisites
 
@@ -11,7 +11,7 @@
 ## Get Repo Info
 
 ```console
-helm pull oci://ghcr.io/apollographql/helm-charts/router --version 2.2.0-rc.0
+helm pull oci://ghcr.io/apollographql/helm-charts/router --version 2.2.0
 ```
 
 ## Install Chart
@@ -19,7 +19,7 @@ helm pull oci://ghcr.io/apollographql/helm-charts/router --version 2.2.0-rc.0
 **Important:** only helm3 is supported
 
 ```console
-helm upgrade --install [RELEASE_NAME] oci://ghcr.io/apollographql/helm-charts/router --version 2.2.0-rc.0 --values my-values.yaml
+helm upgrade --install [RELEASE_NAME] oci://ghcr.io/apollographql/helm-charts/router --version 2.2.0 --values my-values.yaml
 ```
 
 _See [configuration](#configuration) below._
diff --git a/licenses.html b/licenses.html
index 7d5abc4da4..a3c53a3734 100644
--- a/licenses.html
+++ b/licenses.html
@@ -64,7 +64,9 @@ 
          All license text:
          
                 
          Apache License 2.0
          
                 
          Used by:
          
                 
          • 
-            
-            
        • 
-                
          ISC License
          
-                
          Used by:
          
-                
-                
          // Copyright 2021 Brian Smith.
-//
-// Permission to use, copy, modify, and/or distribute this software for any
-// purpose with or without fee is hereby granted, provided that the above
-// copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
-// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
-// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-use pki_types::CertificateDer;
-
-#[test]
-fn cert_without_extensions_test() {
-    // Check the certificate is valid with
-    // `openssl x509 -in cert_without_extensions.der -inform DER -text -noout`
-    let ca = CertificateDer::from(&include_bytes!("cert_without_extensions.der")[..]);
-    assert!(webpki::EndEntityCert::try_from(&ca).is_ok());
-}
 
          
             
          • 
             
        • 
@@ -12534,6 +12503,7 @@ 
          Used by:
          
                     
        • aws-lc-sys
          • 
                     
        • bloomfilter
          • 
                     
        • rustls-webpki
          • 
+                    
        • rustls-webpki
          • 
                 
        
                 
        ISC License:
 
diff --git a/scripts/install.sh b/scripts/install.sh
index a1d5e86138..3bd56acf07 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -11,7 +11,7 @@ BINARY_DOWNLOAD_PREFIX="${APOLLO_ROUTER_BINARY_DOWNLOAD_PREFIX:="https://github.
 
 # Router version defined in apollo-router's Cargo.toml
 # Note: Change this line manually during the release steps.
-PACKAGE_VERSION="v2.2.0-rc.0"
+PACKAGE_VERSION="v2.2.0"
 
 download_binary() {
     downloader --check