From 8aef54798102ede03a5a3ce001a0c82be5d93b61 Mon Sep 17 00:00:00 2001
From: Coenen Benjamin <benjamin.coenen@hotmail.com>
Date: Thu, 13 Jul 2023 16:34:16 +0200
Subject: [PATCH] prep release: v1.24.0 (#3431)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

> **Note**
>
> When approved, this PR will merge into **the `1.24.0` branch** which
will — upon being approved itself — merge into `main`.
>
> **Things to review in this PR**:
> - Changelog correctness (There is a preview below, but it is not
necessarily the most up to date. See the _Files Changed_ for the true
reality.)
>  - Version bumps
>  - That it targets the right release branch (`1.24.0` in this case!).
>
---
## 🚀 Features

### Add support for delta aggregation to otlp metrics ([PR
#3412](https://github.com/apollographql/router/pull/3412))

Add a new configuration option (Temporality) to the otlp metrics
configuration.

This may be useful to fix problems with metrics when being processed by
datadog which tends to expect Delta, rather than Cumulative,
aggregations.

See:
-
https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/6129
 - https://github.com/DataDog/documentation/pull/15840

for more details.

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

## 🐛 Fixes

### Fix error handling for subgraphs ([Issue
#3141](https://github.com/apollographql/router/issues/3141))

The GraphQL spec is rather light on what should happen when we process
responses from subgraphs. The current behaviour within the Router was
inconsistently short circuiting response processing and this producing
confusing errors.
> #### Processing the response
>
> If the response uses a non-200 status code and the media type of the
response payload is application/json then the client MUST NOT rely on
the body to be a well-formed GraphQL response since the source of the
response may not be the server but instead some intermediary such as API
gateways, proxies, firewalls, etc.

The logic has been simplified and made consistent using the following
rules:
1. If the content type of the response is not `application/json` or
`application/graphql-response+json` then we won't try to parse.
2. If an HTTP status is not 2xx it will always be attached as a graphql
error.
3. If the response type is `application/json` and status is not 2xx and
the body is not valid grapqhql the entire subgraph response will be
attached as an error.

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

## 🛠 Maintenance

### chore: router-bridge 0.3.0+v2.4.8 -> =0.3.1+2.4.9 ([PR
#3407](https://github.com/apollographql/router/pull/3407))

Updates `router-bridge` from ` = "0.3.0+v2.4.8"` to ` = "0.3.1+v2.4.9"`,
note that with this PR, this dependency is now pinned to an exact
version. This version update started failing tests because of a minor
ordering change and it was not immediately clear why the test was
failing. Pinning this dependency (that we own) allows us to only bring
in the update at the proper time and will make test failures caused by
the update to be more easily identified.

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

### remove the compiler from Query ([Issue
#3373](https://github.com/apollographql/router/issues/3373))

The `Query` object caches information extracted from the query that is
used to format responses. It was carrying an `ApolloCompiler` instance,
but now we don't really need it anymore, since it is now cached at the
query analysis layer. We also should not carry it in the supergraph
request and execution request, because that makes the builders hard to
manipulate for plugin authors. Since we are not exposing the compiler in
the public API yet, we move it inside the context's private entries,
where it will be easily accessible from internal code.

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

### move AllowOnlyHttpPostMutationsLayer at the supergraph service level
([PR #3374](https://github.com/apollographql/router/pull/3374), [PR
#3410](https://github.com/apollographql/router/pull/3410))

Now that we have access to a compiler in supergraph requests, we don't
need to look into the query plan to know if a request contains mutations

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

### update opentelemetry to 0.19.0 ([Issue
#2878](https://github.com/apollographql/router/issues/2878))


We've updated the following opentelemetry related crates:

```
opentelemetry 0.18.0 -> 0.19.0
opentelemetry-datadog 0.6.0 -> 0.7.0
opentelemetry-http 0.7.0 -> 0.8.0
opentelemetry-jaeger 0.17.0 -> 0.18.0
opentelemetry-otlp 0.11.0 -> 0.12.0
opentelemetry-semantic-conventions 0.10.0 -> 0.11.0
opentelemetry-zipkin 0.16.0 -> 0.17.0
opentelemetry-prometheus 0.11.0 -> 0.12.0
tracing-opentelemetry 0.18.0 -> 0.19.0
```

This allows us to close a number of opentelemetry related issues.

Note:

The prometheus specification mandates naming format and, unfortunately,
the router had two metrics which weren't compliant. The otel upgrade
enforces the specification, so the affected metrics are now renamed (see
below).

The two affected metrics in the router were:

apollo_router_cache_hit_count -> apollo_router_cache_hit_count_total
apollo_router_cache_miss_count -> apollo_router_cache_miss_count_total

If you are monitoring these metrics via prometheus, please update your
dashboards with this name change.

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

### Synthesize defer labels without RNG or collisions ([PR
#3381](https://github.com/apollographql/router/pull/3381) and [PR
#3423](https://github.com/apollographql/router/pull/3423))

The `@defer` directive accepts a `label` argument, but it is optional.
To more accurately handle deferred responses, the Router internally
rewrites queries to add labels on the `@defer` directive where they are
missing. Responses eventually receive the reverse treatment to look as
expected by client.

This was done be generating random strings, handling collision with
existing labels, and maintaining a `HashSet` of which labels had been
synthesized. Instead, we now add a prefix to pre-existing labels and
generate new labels without it. When processing a response, the absence
of that prefix indicates a synthetic label.

By [@SimonSapin](https://github.com/SimonSapin) and
[@o0Ignition0o](https://github.com/o0Ignition0o) in
https://github.com/apollographql/router/pull/3381 and
https://github.com/apollographql/router/pull/3423

### Move subscription event execution at the execution service level
([PR #3395](https://github.com/apollographql/router/pull/3395))

In order to prepare some future integration I moved the execution loop
for subscription events at the execution_service level.

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

## 📚 Documentation

### Document claim augmentation via coprocessors ([Issue
#3102](https://github.com/apollographql/router/issues/3102))

Claims augmentation is a common use case where user information from the
JWT claims is used to look up more context like roles from databases,
before sending it to subgraphs. This can be done with subgraphs, but it
was not documented yet, and there was confusion on the order in which
the plugins were called. This clears the confusion and provides an
example configuration.

By [@Geal](https://github.com/Geal) in
https://github.com/apollographql/router/pull/3386
---
 .../docs_geal_document_claim_augmentation.md  |   5 -
 .changesets/feat_garypen_metrics_as_delta.md  |  13 ---
 .changesets/fix_taffy_crank_flier_seaweed.md  |  13 ---
 .../maint_avery_update_and_pin_bridge.md      |   5 -
 .../maint_bnjjj_move_subs_to_exec_service.md  |   5 -
 .changesets/maint_garypen_2878_otel_0_19_0.md |  31 -----
 .../maint_geal_move_post_mutation_layer.md    |   5 -
 .../maint_geal_remove_compiler_from_query.md  |   5 -
 .../maint_simon_uncolliding_relabel.md        |   7 --
 CHANGELOG.md                                  | 110 ++++++++++++++++++
 Cargo.lock                                    |   6 +-
 apollo-router-benchmarks/Cargo.toml           |   2 +-
 apollo-router-scaffold/Cargo.toml             |   2 +-
 .../templates/base/Cargo.toml                 |   2 +-
 .../templates/base/xtask/Cargo.toml           |   2 +-
 apollo-router/Cargo.toml                      |   2 +-
 .../tracing/docker-compose.datadog.yml        |   2 +-
 dockerfiles/tracing/docker-compose.jaeger.yml |   2 +-
 dockerfiles/tracing/docker-compose.zipkin.yml |   2 +-
 docs/source/containerization/docker.mdx       |   2 +-
 docs/source/containerization/kubernetes.mdx   |  28 ++---
 docs/source/federation-version-support.mdx    |   8 ++
 helm/chart/router/Chart.yaml                  |   4 +-
 helm/chart/router/README.md                   |   6 +-
 licenses.html                                 |  12 +-
 scripts/install.sh                            |   2 +-
 26 files changed, 158 insertions(+), 125 deletions(-)
 delete mode 100644 .changesets/docs_geal_document_claim_augmentation.md
 delete mode 100644 .changesets/feat_garypen_metrics_as_delta.md
 delete mode 100644 .changesets/fix_taffy_crank_flier_seaweed.md
 delete mode 100644 .changesets/maint_avery_update_and_pin_bridge.md
 delete mode 100644 .changesets/maint_bnjjj_move_subs_to_exec_service.md
 delete mode 100644 .changesets/maint_garypen_2878_otel_0_19_0.md
 delete mode 100644 .changesets/maint_geal_move_post_mutation_layer.md
 delete mode 100644 .changesets/maint_geal_remove_compiler_from_query.md
 delete mode 100644 .changesets/maint_simon_uncolliding_relabel.md

diff --git a/.changesets/docs_geal_document_claim_augmentation.md b/.changesets/docs_geal_document_claim_augmentation.md
deleted file mode 100644
index 88c0479f0b..0000000000
--- a/.changesets/docs_geal_document_claim_augmentation.md
+++ /dev/null
@@ -1,5 +0,0 @@
-### Document claim augmentation via coprocessors ([Issue #3102](https://github.com/apollographql/router/issues/3102))
-
-Claims augmentation is a common use case where user information from the JWT claims is used to look up more context like roles from databases, before sending it to subgraphs. This can be done with subgraphs, but it was not documented yet, and there was confusion on the order in which the plugins were called. This clears the confusion and provides an example configuration.
-
-By [@Geal](https://github.com/Geal) in https://github.com/apollographql/router/pull/3386
\ No newline at end of file
diff --git a/.changesets/feat_garypen_metrics_as_delta.md b/.changesets/feat_garypen_metrics_as_delta.md
deleted file mode 100644
index 54ca1d95a3..0000000000
--- a/.changesets/feat_garypen_metrics_as_delta.md
+++ /dev/null
@@ -1,13 +0,0 @@
-### Add support for delta aggregation to otlp metrics ([PR #3412](https://github.com/apollographql/router/pull/3412))
-
-Add a new configuration option (Temporality) to the otlp metrics configuration.
-
-This may be useful to fix problems with metrics when being processed by datadog which tends to expect Delta, rather than Cumulative, aggregations.
-
-See:
- - https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/6129
- - https://github.com/DataDog/documentation/pull/15840
-
-for more details.
-
-By [@garypen](https://github.com/garypen) in https://github.com/apollographql/router/pull/3412
\ No newline at end of file
diff --git a/.changesets/fix_taffy_crank_flier_seaweed.md b/.changesets/fix_taffy_crank_flier_seaweed.md
deleted file mode 100644
index 97bed9b2a5..0000000000
--- a/.changesets/fix_taffy_crank_flier_seaweed.md
+++ /dev/null
@@ -1,13 +0,0 @@
-### Fix error handling for subgraphs ([Issue #3141](https://github.com/apollographql/router/issues/3141))
-
-The GraphQL spec is rather light on what should happen when we process responses from subgraphs. The current behaviour within the Router was inconsistently short circuiting response processing and this producing confusing errors.
-> #### Processing the response
-> 
-> If the response uses a non-200 status code and the media type of the response payload is application/json then the client MUST NOT rely on the body to be a well-formed GraphQL response since the source of the response may not be the server but instead some intermediary such as API gateways, proxies, firewalls, etc.
-
-The logic has been simplified and made consistent using the following rules:
-1. If the content type of the response is not `application/json` or `application/graphql-response+json` then we won't try to parse.
-2. If an HTTP status is not 2xx it will always be attached as a graphql error.
-3. If the response type is `application/json` and status is not 2xx and the body is not valid grapqhql the entire subgraph response will be attached as an error.
-
-By [@BrynCooke](https://github.com/BrynCooke) in https://github.com/apollographql/router/pull/3328
diff --git a/.changesets/maint_avery_update_and_pin_bridge.md b/.changesets/maint_avery_update_and_pin_bridge.md
deleted file mode 100644
index 707c5346be..0000000000
--- a/.changesets/maint_avery_update_and_pin_bridge.md
+++ /dev/null
@@ -1,5 +0,0 @@
-### chore: router-bridge 0.3.0+v2.4.8 -> =0.3.1+2.4.9 ([PR #3407](https://github.com/apollographql/router/pull/3407))
-
-Updates `router-bridge` from ` = "0.3.0+v2.4.8"` to ` = "0.3.1+v2.4.9"`, note that with this PR, this dependency is now pinned to an exact version. This version update started failing tests because of a minor ordering change and it was not immediately clear why the test was failing. Pinning this dependency (that we own) allows us to only bring in the update at the proper time and will make test failures caused by the update to be more easily identified.
-
-By [@EverlastingBugstopper](https://github.com/EverlastingBugstopper) in https://github.com/apollographql/router/pull/3407
diff --git a/.changesets/maint_bnjjj_move_subs_to_exec_service.md b/.changesets/maint_bnjjj_move_subs_to_exec_service.md
deleted file mode 100644
index f726e75439..0000000000
--- a/.changesets/maint_bnjjj_move_subs_to_exec_service.md
+++ /dev/null
@@ -1,5 +0,0 @@
-### Move subscription event execution at the execution service level ([PR #3395](https://github.com/apollographql/router/pull/3395))
-
-In order to prepare some future integration I moved the execution loop for subscription events at the execution_service level.
-
-By [@bnjjj](https://github.com/bnjjj) in https://github.com/apollographql/router/pull/3395
\ No newline at end of file
diff --git a/.changesets/maint_garypen_2878_otel_0_19_0.md b/.changesets/maint_garypen_2878_otel_0_19_0.md
deleted file mode 100644
index 7271edbe17..0000000000
--- a/.changesets/maint_garypen_2878_otel_0_19_0.md
+++ /dev/null
@@ -1,31 +0,0 @@
-### update opentelemetry to 0.19.0 ([Issue #2878](https://github.com/apollographql/router/issues/2878))
-
-
-We've updated the following opentelemetry related crates:
-
-```
-opentelemetry 0.18.0 -> 0.19.0
-opentelemetry-datadog 0.6.0 -> 0.7.0
-opentelemetry-http 0.7.0 -> 0.8.0
-opentelemetry-jaeger 0.17.0 -> 0.18.0
-opentelemetry-otlp 0.11.0 -> 0.12.0
-opentelemetry-semantic-conventions 0.10.0 -> 0.11.0
-opentelemetry-zipkin 0.16.0 -> 0.17.0
-opentelemetry-prometheus 0.11.0 -> 0.12.0
-tracing-opentelemetry 0.18.0 -> 0.19.0
-```
-
-This allows us to close a number of opentelemetry related issues.
-
-Note:
-
-The prometheus specification mandates naming format and, unfortunately, the router had two metrics which weren't compliant. The otel upgrade enforces the specification, so the affected metrics are now renamed (see below).
-
-The two affected metrics in the router were:
-
-apollo_router_cache_hit_count -> apollo_router_cache_hit_count_total
-apollo_router_cache_miss_count -> apollo_router_cache_miss_count_total
-
-If you are monitoring these metrics via prometheus, please update your dashboards with this name change.
-
-By [@garypen](https://github.com/garypen) in https://github.com/apollographql/router/pull/3421
diff --git a/.changesets/maint_geal_move_post_mutation_layer.md b/.changesets/maint_geal_move_post_mutation_layer.md
deleted file mode 100644
index 52d25ae604..0000000000
--- a/.changesets/maint_geal_move_post_mutation_layer.md
+++ /dev/null
@@ -1,5 +0,0 @@
-### move AllowOnlyHttpPostMutationsLayer at the supergraph service level ([PR #3374](https://github.com/apollographql/router/pull/3374), [PR #3410](https://github.com/apollographql/router/pull/3410))
-
-Now that we have access to a compiler in supergraph requests, we don't need to look into the query plan to know if a request contains mutations
-
-By [@Geal](https://github.com/Geal) in https://github.com/apollographql/router/pull/3374 & https://github.com/apollographql/router/pull/3410
\ No newline at end of file
diff --git a/.changesets/maint_geal_remove_compiler_from_query.md b/.changesets/maint_geal_remove_compiler_from_query.md
deleted file mode 100644
index f4cbd1af42..0000000000
--- a/.changesets/maint_geal_remove_compiler_from_query.md
+++ /dev/null
@@ -1,5 +0,0 @@
-### remove the compiler from Query ([Issue #3373](https://github.com/apollographql/router/issues/3373))
-
-The `Query` object caches information extracted from the query that is used to format responses. It was carrying an `ApolloCompiler` instance, but now we don't really need it anymore, since it is now cached at the query analysis layer. We also should not carry it in the supergraph request and execution request, because that makes the builders hard to manipulate for plugin authors. Since we are not exposing the compiler in the public API yet, we move it inside the context's private entries, where it will be easily accessible from internal code.
-
-By [@Geal](https://github.com/Geal) in https://github.com/apollographql/router/pull/3367
\ No newline at end of file
diff --git a/.changesets/maint_simon_uncolliding_relabel.md b/.changesets/maint_simon_uncolliding_relabel.md
deleted file mode 100644
index 2b2fe9db2a..0000000000
--- a/.changesets/maint_simon_uncolliding_relabel.md
+++ /dev/null
@@ -1,7 +0,0 @@
-### Synthesize defer labels without RNG or collisions ([PR #3381](https://github.com/apollographql/router/pull/3381) and [PR #3423](https://github.com/apollographql/router/pull/3423))
-
-The `@defer` directive accepts a `label` argument, but it is optional. To more accurately handle deferred responses, the Router internally rewrites queries to add labels on the `@defer` directive where they are missing. Responses eventually receive the reverse treatment to look as expected by client.
-
-This was done be generating random strings, handling collision with existing labels, and maintaining a `HashSet` of which labels had been synthesized. Instead, we now add a prefix to pre-existing labels and generate new labels without it. When processing a response, the absence of that prefix indicates a synthetic label.
-
-By [@SimonSapin](https://github.com/SimonSapin) and [@o0Ignition0o](https://github.com/o0Ignition0o) in https://github.com/apollographql/router/pull/3381 and https://github.com/apollographql/router/pull/3423
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a1197f019..b14ec479d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,116 @@ All notable changes to Router will be documented in this file.
 
 This project adheres to [Semantic Versioning v2.0.0](https://semver.org/spec/v2.0.0.html).
 
+# [1.24.0] - 2023-07-13
+
+## 🚀 Features
+
+### Add support for delta aggregation to otlp metrics ([PR #3412](https://github.com/apollographql/router/pull/3412))
+
+Add a new configuration option (Temporality) to the otlp metrics configuration.
+
+This may be useful to fix problems with metrics when being processed by datadog which tends to expect Delta, rather than Cumulative, aggregations.
+
+See:
+ - https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/6129
+ - https://github.com/DataDog/documentation/pull/15840
+
+for more details.
+
+By [@garypen](https://github.com/garypen) in https://github.com/apollographql/router/pull/3412
+
+## 🐛 Fixes
+
+### Fix error handling for subgraphs ([Issue #3141](https://github.com/apollographql/router/issues/3141))
+
+The GraphQL spec is rather light on what should happen when we process responses from subgraphs. The current behaviour within the Router was inconsistently short circuiting response processing and this producing confusing errors.
+> #### Processing the response
+> 
+> If the response uses a non-200 status code and the media type of the response payload is application/json then the client MUST NOT rely on the body to be a well-formed GraphQL response since the source of the response may not be the server but instead some intermediary such as API gateways, proxies, firewalls, etc.
+
+The logic has been simplified and made consistent using the following rules:
+1. If the content type of the response is not `application/json` or `application/graphql-response+json` then we won't try to parse.
+2. If an HTTP status is not 2xx it will always be attached as a graphql error.
+3. If the response type is `application/json` and status is not 2xx and the body is not valid grapqhql the entire subgraph response will be attached as an error.
+
+By [@BrynCooke](https://github.com/BrynCooke) in https://github.com/apollographql/router/pull/3328
+
+## 🛠 Maintenance
+
+### chore: router-bridge 0.3.0+v2.4.8 -> =0.3.1+2.4.9 ([PR #3407](https://github.com/apollographql/router/pull/3407))
+
+Updates `router-bridge` from ` = "0.3.0+v2.4.8"` to ` = "0.3.1+v2.4.9"`, note that with this PR, this dependency is now pinned to an exact version. This version update started failing tests because of a minor ordering change and it was not immediately clear why the test was failing. Pinning this dependency (that we own) allows us to only bring in the update at the proper time and will make test failures caused by the update to be more easily identified.
+
+By [@EverlastingBugstopper](https://github.com/EverlastingBugstopper) in https://github.com/apollographql/router/pull/3407
+
+### remove the compiler from Query ([Issue #3373](https://github.com/apollographql/router/issues/3373))
+
+The `Query` object caches information extracted from the query that is used to format responses. It was carrying an `ApolloCompiler` instance, but now we don't really need it anymore, since it is now cached at the query analysis layer. We also should not carry it in the supergraph request and execution request, because that makes the builders hard to manipulate for plugin authors. Since we are not exposing the compiler in the public API yet, we move it inside the context's private entries, where it will be easily accessible from internal code.
+
+By [@Geal](https://github.com/Geal) in https://github.com/apollographql/router/pull/3367
+
+### move AllowOnlyHttpPostMutationsLayer at the supergraph service level ([PR #3374](https://github.com/apollographql/router/pull/3374), [PR #3410](https://github.com/apollographql/router/pull/3410))
+
+Now that we have access to a compiler in supergraph requests, we don't need to look into the query plan to know if a request contains mutations
+
+By [@Geal](https://github.com/Geal) in https://github.com/apollographql/router/pull/3374 & https://github.com/apollographql/router/pull/3410
+
+### update opentelemetry to 0.19.0 ([Issue #2878](https://github.com/apollographql/router/issues/2878))
+
+
+We've updated the following opentelemetry related crates:
+
+```
+opentelemetry 0.18.0 -> 0.19.0
+opentelemetry-datadog 0.6.0 -> 0.7.0
+opentelemetry-http 0.7.0 -> 0.8.0
+opentelemetry-jaeger 0.17.0 -> 0.18.0
+opentelemetry-otlp 0.11.0 -> 0.12.0
+opentelemetry-semantic-conventions 0.10.0 -> 0.11.0
+opentelemetry-zipkin 0.16.0 -> 0.17.0
+opentelemetry-prometheus 0.11.0 -> 0.12.0
+tracing-opentelemetry 0.18.0 -> 0.19.0
+```
+
+This allows us to close a number of opentelemetry related issues.
+
+Note:
+
+The prometheus specification mandates naming format and, unfortunately, the router had two metrics which weren't compliant. The otel upgrade enforces the specification, so the affected metrics are now renamed (see below).
+
+The two affected metrics in the router were:
+
+apollo_router_cache_hit_count -> apollo_router_cache_hit_count_total
+apollo_router_cache_miss_count -> apollo_router_cache_miss_count_total
+
+If you are monitoring these metrics via prometheus, please update your dashboards with this name change.
+
+By [@garypen](https://github.com/garypen) in https://github.com/apollographql/router/pull/3421
+
+### Synthesize defer labels without RNG or collisions ([PR #3381](https://github.com/apollographql/router/pull/3381) and [PR #3423](https://github.com/apollographql/router/pull/3423))
+
+The `@defer` directive accepts a `label` argument, but it is optional. To more accurately handle deferred responses, the Router internally rewrites queries to add labels on the `@defer` directive where they are missing. Responses eventually receive the reverse treatment to look as expected by client.
+
+This was done be generating random strings, handling collision with existing labels, and maintaining a `HashSet` of which labels had been synthesized. Instead, we now add a prefix to pre-existing labels and generate new labels without it. When processing a response, the absence of that prefix indicates a synthetic label.
+
+By [@SimonSapin](https://github.com/SimonSapin) and [@o0Ignition0o](https://github.com/o0Ignition0o) in https://github.com/apollographql/router/pull/3381 and https://github.com/apollographql/router/pull/3423
+
+### Move subscription event execution at the execution service level ([PR #3395](https://github.com/apollographql/router/pull/3395))
+
+In order to prepare some future integration I moved the execution loop for subscription events at the execution_service level.
+
+By [@bnjjj](https://github.com/bnjjj) in https://github.com/apollographql/router/pull/3395
+
+## 📚 Documentation
+
+### Document claim augmentation via coprocessors ([Issue #3102](https://github.com/apollographql/router/issues/3102))
+
+Claims augmentation is a common use case where user information from the JWT claims is used to look up more context like roles from databases, before sending it to subgraphs. This can be done with subgraphs, but it was not documented yet, and there was confusion on the order in which the plugins were called. This clears the confusion and provides an example configuration.
+
+By [@Geal](https://github.com/Geal) in https://github.com/apollographql/router/pull/3386
+
+
+
 # [1.23.0] - 2023-07-07
 
 ## 🚀 Features
diff --git a/Cargo.lock b/Cargo.lock
index 8bd713f827..546b798597 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -271,7 +271,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-router"
-version = "1.23.0"
+version = "1.24.0"
 dependencies = [
  "access-json",
  "anyhow",
@@ -412,7 +412,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-router-benchmarks"
-version = "1.23.0"
+version = "1.24.0"
 dependencies = [
  "apollo-parser 0.4.1",
  "apollo-router",
@@ -428,7 +428,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-router-scaffold"
-version = "1.23.0"
+version = "1.24.0"
 dependencies = [
  "anyhow",
  "cargo-scaffold",
diff --git a/apollo-router-benchmarks/Cargo.toml b/apollo-router-benchmarks/Cargo.toml
index b2322584b1..e87238b014 100644
--- a/apollo-router-benchmarks/Cargo.toml
+++ b/apollo-router-benchmarks/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "apollo-router-benchmarks"
-version = "1.23.0"
+version = "1.24.0"
 authors = ["Apollo Graph, Inc. <packages@apollographql.com>"]
 edition = "2021"
 license = "Elastic-2.0"
diff --git a/apollo-router-scaffold/Cargo.toml b/apollo-router-scaffold/Cargo.toml
index ed8681649e..795d3a0ca2 100644
--- a/apollo-router-scaffold/Cargo.toml
+++ b/apollo-router-scaffold/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "apollo-router-scaffold"
-version = "1.23.0"
+version = "1.24.0"
 authors = ["Apollo Graph, Inc. <packages@apollographql.com>"]
 edition = "2021"
 license = "Elastic-2.0"
diff --git a/apollo-router-scaffold/templates/base/Cargo.toml b/apollo-router-scaffold/templates/base/Cargo.toml
index 41cf828cb7..088959a0d5 100644
--- a/apollo-router-scaffold/templates/base/Cargo.toml
+++ b/apollo-router-scaffold/templates/base/Cargo.toml
@@ -22,7 +22,7 @@ apollo-router = { path ="{{integration_test}}apollo-router" }
 apollo-router = { git="https://github.com/apollographql/router.git", branch="{{branch}}" }
 {{else}}
 # Note if you update these dependencies then also update xtask/Cargo.toml
-apollo-router = "1.23.0"
+apollo-router = "1.24.0"
 {{/if}}
 {{/if}}
 async-trait = "0.1.52"
diff --git a/apollo-router-scaffold/templates/base/xtask/Cargo.toml b/apollo-router-scaffold/templates/base/xtask/Cargo.toml
index c83a32989f..ec79bceec5 100644
--- a/apollo-router-scaffold/templates/base/xtask/Cargo.toml
+++ b/apollo-router-scaffold/templates/base/xtask/Cargo.toml
@@ -13,7 +13,7 @@ apollo-router-scaffold = { path ="{{integration_test}}apollo-router-scaffold" }
 {{#if branch}}
 apollo-router-scaffold = { git="https://github.com/apollographql/router.git", branch="{{branch}}" }
 {{else}}
-apollo-router-scaffold = { git = "https://github.com/apollographql/router.git", tag = "v1.23.0" }
+apollo-router-scaffold = { git = "https://github.com/apollographql/router.git", tag = "v1.24.0" }
 {{/if}}
 {{/if}}
 anyhow = "1.0.58"
diff --git a/apollo-router/Cargo.toml b/apollo-router/Cargo.toml
index 10e90b133b..512e8f3e26 100644
--- a/apollo-router/Cargo.toml
+++ b/apollo-router/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "apollo-router"
-version = "1.23.0"
+version = "1.24.0"
 authors = ["Apollo Graph, Inc. <packages@apollographql.com>"]
 repository = "https://github.com/apollographql/router/"
 documentation = "https://docs.rs/apollo-router"
diff --git a/dockerfiles/tracing/docker-compose.datadog.yml b/dockerfiles/tracing/docker-compose.datadog.yml
index 01cd46cf9a..28da6a0abb 100644
--- a/dockerfiles/tracing/docker-compose.datadog.yml
+++ b/dockerfiles/tracing/docker-compose.datadog.yml
@@ -3,7 +3,7 @@ services:
 
   apollo-router:
     container_name: apollo-router
-    image: ghcr.io/apollographql/router:v1.23.0
+    image: ghcr.io/apollographql/router:v1.24.0
     volumes:
       - ./supergraph.graphql:/etc/config/supergraph.graphql
       - ./router/datadog.router.yaml:/etc/config/configuration.yaml
diff --git a/dockerfiles/tracing/docker-compose.jaeger.yml b/dockerfiles/tracing/docker-compose.jaeger.yml
index 3a4fb7cbb4..da373d0b03 100644
--- a/dockerfiles/tracing/docker-compose.jaeger.yml
+++ b/dockerfiles/tracing/docker-compose.jaeger.yml
@@ -4,7 +4,7 @@ services:
   apollo-router:
     container_name: apollo-router
     #build: ./router
-    image: ghcr.io/apollographql/router:v1.23.0
+    image: ghcr.io/apollographql/router:v1.24.0
     volumes:
       - ./supergraph.graphql:/etc/config/supergraph.graphql
       - ./router/jaeger.router.yaml:/etc/config/configuration.yaml
diff --git a/dockerfiles/tracing/docker-compose.zipkin.yml b/dockerfiles/tracing/docker-compose.zipkin.yml
index d4a4ab714b..75ed94dc5d 100644
--- a/dockerfiles/tracing/docker-compose.zipkin.yml
+++ b/dockerfiles/tracing/docker-compose.zipkin.yml
@@ -4,7 +4,7 @@ services:
   apollo-router:
     container_name: apollo-router
     build: ./router
-    image: ghcr.io/apollographql/router:v1.23.0
+    image: ghcr.io/apollographql/router:v1.24.0
     volumes:
       - ./supergraph.graphql:/etc/config/supergraph.graphql
       - ./router/zipkin.router.yaml:/etc/config/configuration.yaml
diff --git a/docs/source/containerization/docker.mdx b/docs/source/containerization/docker.mdx
index 130811167a..1774fcb591 100644
--- a/docs/source/containerization/docker.mdx
+++ b/docs/source/containerization/docker.mdx
@@ -11,7 +11,7 @@ The default behaviour of the router images is suitable for a quickstart or devel
 
 Note: The [docker documentation](https://docs.docker.com/engine/reference/run/) for the run command may be helpful when reading through the examples.
 
-Note: The exact image version to use is your choice depending on which release you wish to use. In the following examples, replace `<image version>` with your chosen version. e.g.: `v1.23.0`
+Note: The exact image version to use is your choice depending on which release you wish to use. In the following examples, replace `<image version>` with your chosen version. e.g.: `v1.24.0`
 
 ## Override the configuration
 
diff --git a/docs/source/containerization/kubernetes.mdx b/docs/source/containerization/kubernetes.mdx
index 29bbd2fb88..a4b7ff1ba6 100644
--- a/docs/source/containerization/kubernetes.mdx
+++ b/docs/source/containerization/kubernetes.mdx
@@ -13,7 +13,7 @@ import { Link } from 'gatsby';
 
 [Helm](https://helm.sh) is the package manager for kubernetes.
 
-There is a complete [helm chart definition](https://github.com/apollographql/router/tree/v1.23.0/helm/chart/router) in the repo which illustrates how to use helm to deploy the router in kubernetes.
+There is a complete [helm chart definition](https://github.com/apollographql/router/tree/v1.24.0/helm/chart/router) in the repo which illustrates how to use helm to deploy the router in kubernetes.
 
 In both the following examples, we are using helm to install the router:
  - into namespace "router-deploy" (create namespace if it doesn't exist)
@@ -64,10 +64,10 @@ kind: ServiceAccount
 metadata:
   name: release-name-router
   labels:
-    helm.sh/chart: router-1.23.0
+    helm.sh/chart: router-1.24.0
     app.kubernetes.io/name: router
     app.kubernetes.io/instance: release-name
-    app.kubernetes.io/version: "v1.23.0"
+    app.kubernetes.io/version: "v1.24.0"
     app.kubernetes.io/managed-by: Helm
 ---
 # Source: router/templates/secret.yaml
@@ -76,10 +76,10 @@ kind: Secret
 metadata:
   name: "release-name-router"
   labels:
-    helm.sh/chart: router-1.23.0
+    helm.sh/chart: router-1.24.0
     app.kubernetes.io/name: router
     app.kubernetes.io/instance: release-name
-    app.kubernetes.io/version: "v1.23.0"
+    app.kubernetes.io/version: "v1.24.0"
     app.kubernetes.io/managed-by: Helm
 data:
   managedFederationApiKey: "UkVEQUNURUQ="
@@ -90,10 +90,10 @@ kind: ConfigMap
 metadata:
   name: release-name-router
   labels:
-    helm.sh/chart: router-1.23.0
+    helm.sh/chart: router-1.24.0
     app.kubernetes.io/name: router
     app.kubernetes.io/instance: release-name
-    app.kubernetes.io/version: "v1.23.0"
+    app.kubernetes.io/version: "v1.24.0"
     app.kubernetes.io/managed-by: Helm
 data:
   configuration.yaml: |
@@ -117,10 +117,10 @@ kind: Service
 metadata:
   name: release-name-router
   labels:
-    helm.sh/chart: router-1.23.0
+    helm.sh/chart: router-1.24.0
     app.kubernetes.io/name: router
     app.kubernetes.io/instance: release-name
-    app.kubernetes.io/version: "v1.23.0"
+    app.kubernetes.io/version: "v1.24.0"
     app.kubernetes.io/managed-by: Helm
 spec:
   type: ClusterIP
@@ -143,10 +143,10 @@ kind: Deployment
 metadata:
   name: release-name-router
   labels:
-    helm.sh/chart: router-1.23.0
+    helm.sh/chart: router-1.24.0
     app.kubernetes.io/name: router
     app.kubernetes.io/instance: release-name
-    app.kubernetes.io/version: "v1.23.0"
+    app.kubernetes.io/version: "v1.24.0"
     app.kubernetes.io/managed-by: Helm
   
   annotations:
@@ -172,7 +172,7 @@ spec:
         - name: router
           securityContext:
             {}
-          image: "ghcr.io/apollographql/router:v1.23.0"
+          image: "ghcr.io/apollographql/router:v1.24.0"
           imagePullPolicy: IfNotPresent
           args:
             - --hot-reload
@@ -223,10 +223,10 @@ kind: Pod
 metadata:
   name: "release-name-router-test-connection"
   labels:
-    helm.sh/chart: router-1.23.0
+    helm.sh/chart: router-1.24.0
     app.kubernetes.io/name: router
     app.kubernetes.io/instance: release-name
-    app.kubernetes.io/version: "v1.23.0"
+    app.kubernetes.io/version: "v1.24.0"
     app.kubernetes.io/managed-by: Helm
   annotations:
     "helm.sh/hook": test
diff --git a/docs/source/federation-version-support.mdx b/docs/source/federation-version-support.mdx
index 2e02b1b755..5dc15857ef 100644
--- a/docs/source/federation-version-support.mdx
+++ b/docs/source/federation-version-support.mdx
@@ -25,6 +25,14 @@ The table below shows which version of federation each router release is compile
     </tr>
     </thead>
     <tbody>
+    <tr>
+        <td>
+            v1.24.0 and later (<a href="https://github.com/apollographql/router/releases">see latest releases</a>)
+        </td>
+        <td>
+            2.4.9
+        </td>
+    </tr>
     <tr>
         <td>
             v1.21.0 and later (<a href="https://github.com/apollographql/router/releases">see latest releases</a>)
diff --git a/helm/chart/router/Chart.yaml b/helm/chart/router/Chart.yaml
index d2eb81cb5d..011001ba3b 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: 1.23.0
+version: 1.24.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: "v1.23.0"
+appVersion: "v1.24.0"
diff --git a/helm/chart/router/README.md b/helm/chart/router/README.md
index 5880db6124..7e61f24709 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: 1.23.0](https://img.shields.io/badge/Version-1.23.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.23.0](https://img.shields.io/badge/AppVersion-v1.23.0-informational?style=flat-square)
+![Version: 1.24.0](https://img.shields.io/badge/Version-1.24.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.24.0](https://img.shields.io/badge/AppVersion-v1.24.0-informational?style=flat-square)
 
 ## Prerequisites
 
@@ -11,7 +11,7 @@
 ## Get Repo Info
 
 ```console
-helm pull oci://ghcr.io/apollographql/helm-charts/router --version 1.23.0
+helm pull oci://ghcr.io/apollographql/helm-charts/router --version 1.24.0
 ```
 
 ## Install Chart
@@ -19,7 +19,7 @@ helm pull oci://ghcr.io/apollographql/helm-charts/router --version 1.23.0
 **Important:** only helm3 is supported
 
 ```console
-helm upgrade --install [RELEASE_NAME] oci://ghcr.io/apollographql/helm-charts/router --version 1.23.0 --values my-values.yaml
+helm upgrade --install [RELEASE_NAME] oci://ghcr.io/apollographql/helm-charts/router --version 1.24.0 --values my-values.yaml
 ```
 
 _See [configuration](#configuration) below._
diff --git a/licenses.html b/licenses.html
index d7627cf980..f7d5485896 100644
--- a/licenses.html
+++ b/licenses.html
@@ -6340,6 +6340,7 @@ <h4>Used by:</h4>
                     <li><a href=" https://github.com/vorner/bytes-utils ">bytes-utils</a></li>
                     <li><a href=" https://github.com/rust-lang/cc-rs ">cc</a></li>
                     <li><a href=" https://github.com/alexcrichton/cfg-if ">cfg-if</a></li>
+                    <li><a href=" https://github.com/sagiegurari/ci_info.git ">ci_info</a></li>
                     <li><a href=" https://github.com/smol-rs/concurrent-queue ">concurrent-queue</a></li>
                     <li><a href=" https://github.com/tkaitchuck/constrandom ">const-random</a></li>
                     <li><a href=" https://github.com/tkaitchuck/constrandom ">const-random-macro</a></li>
@@ -6435,8 +6436,9 @@ <h4>Used by:</h4>
                     <li><a href=" https://github.com/tokio-rs/prost ">prost-types</a></li>
                     <li><a href=" https://github.com/rust-playground/proteus ">proteus</a></li>
                     <li><a href=" https://github.com/rust-lang/regex ">regex</a></li>
+                    <li><a href=" https://github.com/rust-lang/regex/tree/master/regex-automata ">regex-automata</a></li>
                     <li><a href=" https://github.com/rust-lang/regex ">regex-syntax</a></li>
-                    <li><a href=" https://github.com/rust-lang/regex ">regex-syntax</a></li>
+                    <li><a href=" https://github.com/rust-lang/regex/tree/master/regex-syntax ">regex-syntax</a></li>
                     <li><a href=" https://github.com/rust-analyzer/rowan ">rowan</a></li>
                     <li><a href=" https://github.com/alexcrichton/rustc-demangle ">rustc-demangle</a></li>
                     <li><a href=" https://github.com/rust-lang-nursery/rustc-hash ">rustc-hash</a></li>
@@ -6458,6 +6460,7 @@ <h4>Used by:</h4>
                     <li><a href=" https://github.com/serde-rs/serde ">serde_derive_internals</a></li>
                     <li><a href=" https://github.com/apollographql/serde_json_bytes ">serde_json_bytes</a></li>
                     <li><a href=" https://github.com/dtolnay/serde-repr ">serde_repr</a></li>
+                    <li><a href=" https://github.com/toml-rs/toml ">serde_spanned</a></li>
                     <li><a href=" https://github.com/dtolnay/serde-yaml ">serde_yaml</a></li>
                     <li><a href=" https://gitlab.com/ijackson/rust-shellexpand ">shellexpand</a></li>
                     <li><a href=" https://github.com/vorner/signal-hook ">signal-hook-registry</a></li>
@@ -9662,6 +9665,7 @@ <h4>Used by:</h4>
                 <h3 id="Apache-2.0">Apache License 2.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
+                    <li><a href=" https://github.com/apollographql/apollo-rs ">apollo-compiler</a></li>
                     <li><a href=" https://github.com/apollographql/apollo-rs ">apollo-encoder</a></li>
                     <li><a href=" https://github.com/apollographql/apollo-rs ">apollo-encoder</a></li>
                     <li><a href=" https://github.com/apollographql/apollo-rs ">apollo-parser</a></li>
@@ -10317,10 +10321,8 @@ <h4>Used by:</h4>
                 <h3 id="Apache-2.0">Apache License 2.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/apollographql/apollo-rs ">apollo-compiler</a></li>
                     <li><a href=" https://github.com/djc/askama ">askama_shared</a></li>
                     <li><a href=" https://crates.io/crates/block-modes ">block-modes</a></li>
-                    <li><a href=" https://github.com/BrynCooke/buildstructor ">buildstructor</a></li>
                     <li><a href=" https://gitlab.com/kornelski/dunce ">dunce</a></li>
                     <li><a href=" https://github.com/graphql-rust/graphql-client ">graphql-introspection-query</a></li>
                     <li><a href=" https://github.com/graphql-rust/graphql-client ">graphql_client</a></li>
@@ -10424,6 +10426,7 @@ <h3 id="Apache-2.0">Apache License 2.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
                     <li><a href=" https://github.com/BrynCooke/buildstructor ">buildstructor</a></li>
+                    <li><a href=" https://github.com/BrynCooke/buildstructor ">buildstructor</a></li>
                 </ul>
                 <pre class="license-text">Copyright [2022] [Bryn Cooke]
 
@@ -12415,7 +12418,7 @@ <h4>Used by:</h4>
                     <li><a href=" https://github.com/tokio-rs/tracing ">tracing-core</a></li>
                     <li><a href=" https://github.com/tokio-rs/tracing ">tracing-futures</a></li>
                     <li><a href=" https://github.com/tokio-rs/tracing ">tracing-log</a></li>
-                    <li><a href=" https://github.com/tokio-rs/tracing ">tracing-opentelemetry</a></li>
+                    <li><a href=" https://github.com/tokio-rs/tracing-opentelemetry ">tracing-opentelemetry</a></li>
                     <li><a href=" https://github.com/tokio-rs/tracing ">tracing-serde</a></li>
                     <li><a href=" https://github.com/tokio-rs/tracing ">tracing-subscriber</a></li>
                 </ul>
@@ -14141,6 +14144,7 @@ <h4>Used by:</h4>
                     <li><a href=" https://github.com/BurntSushi/memchr ">memchr</a></li>
                     <li><a href=" https://github.com/BurntSushi/regex-automata ">regex-automata</a></li>
                     <li><a href=" https://github.com/BurntSushi/same-file ">same-file</a></li>
+                    <li><a href=" https://github.com/BurntSushi/termcolor ">termcolor</a></li>
                     <li><a href=" https://github.com/BurntSushi/walkdir ">walkdir</a></li>
                     <li><a href=" https://github.com/BurntSushi/winapi-util ">winapi-util</a></li>
                 </ul>
diff --git a/scripts/install.sh b/scripts/install.sh
index ee168d2ea6..f9cb420072 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -11,7 +11,7 @@ BINARY_DOWNLOAD_PREFIX="https://github.com/apollographql/router/releases/downloa
 
 # Router version defined in apollo-router's Cargo.toml
 # Note: Change this line manually during the release steps.
-PACKAGE_VERSION="v1.23.0"
+PACKAGE_VERSION="v1.24.0"
 
 download_binary() {
     downloader --check