diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6d0b8def12..87acd53d8c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -51,7 +51,7 @@ parameters:
   cache_version:
     type: string
     # increment this to invalidate all the caches
-    default: v11.{{ arch}}-{{ checksum "rust-toolchain.toml" }}
+    default: v12.{{ arch}}-{{ checksum "rust-toolchain.toml" }}
   jaeger_version:
     type: string
     # update this as new versions of jaeger become available
@@ -228,9 +228,19 @@ commands:
       - restore_cache:
           name: Restore .cargo
           keys:
-            - rust-cargo-<< pipeline.parameters.cache_version >>-build-<< parameters.os >>-{{ checksum "Cargo.lock" }}
-            - rust-cargo-<< pipeline.parameters.cache_version >>-build-<< parameters.os >>
-      - run: cargo xtask lint
+            - rust-cargo-<< pipeline.parameters.cache_version >>-xtask-<< parameters.os >>-{{ checksum "Cargo.lock" }}-{{ checksum "xtask/Cargo.lock" }}
+            - rust-cargo-<< pipeline.parameters.cache_version >>-xtask-<< parameters.os >>
+      - run:
+          name: Install xtask
+          command: |
+              set -e -o pipefail
+              xtask help || { cd xtask && cargo install --path . && cd ..; }
+      - run: xtask lint
+      - save_cache:
+          name: Save .cargo
+          key: rust-cargo-<< pipeline.parameters.cache_version >>-xtask-<< parameters.os >>-{{ checksum "Cargo.lock" }}-{{ checksum "xtask/Cargo.lock" }}
+          paths:
+            - ~/.cargo
 
   xtask_check_compliance:
     parameters:
@@ -240,8 +250,8 @@ commands:
       - restore_cache:
           name: Restore .cargo
           keys:
-            - rust-cargo-<< pipeline.parameters.cache_version >>-build-<< parameters.os >>-{{ checksum "Cargo.lock" }}
-            - rust-cargo-<< pipeline.parameters.cache_version >>-build-<< parameters.os >>
+            - rust-cargo-<< pipeline.parameters.cache_version >>-xtask-<< parameters.os >>-{{ checksum "Cargo.lock" }}-{{ checksum "xtask/Cargo.lock" }}
+            - rust-cargo-<< pipeline.parameters.cache_version >>-xtask-<< parameters.os >>
       - install_extra_tools:
           os: << parameters.os >>
       # cargo-deny fetches a rustsec advisory DB, which has to happen on github.com over https
@@ -273,6 +283,10 @@ commands:
       cargo_test_args:
         type: string
         default: "--"
+      # additional cache key to have a cache for test_updated
+      cache_key:
+        type: string
+        default: ""
     steps:
       - run:
           name: Start jaeger
@@ -281,8 +295,8 @@ commands:
       - restore_cache:
           name: Restore .cargo
           keys:
-            - rust-cargo-<< pipeline.parameters.cache_version >>-test-<< parameters.os >>-{{ checksum "Cargo.lock" }}
-            - rust-cargo-<< pipeline.parameters.cache_version >>-test-<< parameters.os >>
+            - rust-cargo-<< pipeline.parameters.cache_version >>-test-<< parameters.os >><<parameters.cache_key>>-{{ checksum "Cargo.lock" }}
+            - rust-cargo-<< pipeline.parameters.cache_version >>-test-<< parameters.os >><<parameters.cache_key>>
 
       # As of rustc 1.61.0, must limit the number of linux jobs or we run out of memory (large executor/8GB)
       - when:
@@ -386,10 +400,8 @@ jobs:
       - checkout
       - linux_amd_install_baseline
       - run:
-          name: Use latest Rust Nightly and update all Rust dependencies
+          name: Update all Rust dependencies
           command: |
-            sed -i '/channel/d' rust-toolchain.toml
-            echo 'channel = "nightly"' >> rust-toolchain.toml
             rm Cargo.lock
             cargo fetch
       - test_workspace:
@@ -397,6 +409,7 @@ jobs:
           # schema_generation test skipped because schemars changed its representation of enums:
           # https://github.com/GREsau/schemars/blob/master/CHANGELOG.md#086---2021-09-26
           cargo_test_args: --no-fail-fast -- --skip schema_generation
+          cache_key: .test_updated
 
   build_release:
     parameters:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa4cb307ee..38c7b61088 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,225 @@ 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.7.0] - 2022-12-22
+
+## 🚀 Features
+
+### Newly scaffolded projects now include a `Dockerfile` ([Issue #2295](https://github.com/apollographql/router/issues/2295))
+
+Custom Router binary projects created using our [scaffolding tooling](https://www.apollographql.com/docs/router/customizations/custom-binary/) will now have a `Dockerfile` emitted to facilitate building custom Docker containers.
+
+By [@o0Ignition0o](https://github.com/o0Ignition0o) in https://github.com/apollographql/router/pull/2307
+
+### Apollo Uplink communication timeout is configurable ([PR #2271](https://github.com/apollographql/router/pull/2271))
+
+The amount of time which can elapse before timing out when communicating with Apollo Uplink is now configurable via the `APOLLO_UPLINK_TIMEOUT` environment variable and the `--apollo-uplink-timeout` CLI flag, in a similar fashion to how the interval can be configured.  It still defaults to 30 seconds.
+
+By [@o0Ignition0o](https://github.com/o0Ignition0o) in https://github.com/apollographql/router/pull/2271
+
+### Query plan cache is pre-warmed using existing operations when the supergraph changes ([Issue #2302](https://github.com/apollographql/router/issues/2302), [Issue #2308](https://github.com/apollographql/router/issues/2308))
+
+A new `warmed_up_queries` configuration option has been introduced to pre-warm the query plan cache when the supergraph changes.
+
+Under normal operation, query plans are cached to avoid the recomputation cost.  However, when the supergraph changes, previously-planned queries must be re-planned to account for implementation changes in the supergraph, even though the query itself may not have changed.  Under load, this re-planning can cause performance variations due to the extra computation work.  To reduce the impact, it is now possible to pre-warm the query plan cache for the incoming supergraph, prior to changing over to the new supergraph.  Pre-warming slightly delays the roll-over to the incoming supergraph, but allows the most-requested operations to not be impacted by the additional computation work.
+
+To enable pre-warming, the following configuration can be introduced which sets `warmed_up_queries`:
+
+```yaml
+supergraph:
+  query_planning:
+    # Pre-plan the 100 most used operations when the supergraph changes.  (Default is "0", disabled.)
+    warmed_up_queries: 100
+    experimental_cache:
+      in_memory:
+        # Sets the limit of entries in the query plan cache
+        limit: 512
+```
+
+Query planning was also updated to finish executing and setting up the cache, even if the response couldn't be returned to the client which is important to avoid throwing away computationally-expensive work.
+
+By [@Geal](https://github.com/geal) in https://github.com/apollographql/router/pull/2309
+
+## 🐛 Fixes
+
+### Propagate errors across inline fragments ([PR #2304](https://github.com/apollographql/router/pull/2304))
+
+GraphQL errors are now correctly propagated across inline fragments.
+
+By [@o0Ignition0o](https://github.com/o0Ignition0o) in https://github.com/apollographql/router/pull/2304
+
+### Only rebuild `protos` if `reports.proto` source changes
+
+Apollo Studio accepts traces and metrics from Apollo Router via the Protobuf specification which lives in the `reports.proto` file in the repository.  With this contribution, we only re-build from the `reports.proto` file when the file has actually changed, as opposed to doing it on every build which was occurring previously.  This change saves build time for developers.
+
+By [@scottdouglas1989](https://github.com/scottdouglas1989) in https://github.com/apollographql/router/pull/2283
+
+### Return an error on duplicate keys in configuration ([Issue #1428](https://github.com/apollographql/router/issues/1428))
+
+Repeat usage of the same keys in Router YAML can be hard to notice but indicate a misconfiguration which can cause unexpected behavior since only one of the values can be in effect.  With this improvement, the following YAML configuration will raise an error at Router startup to alert the user of the misconfiguration:
+
+```yaml
+telemetry:
+  tracing:
+    propagation:
+      jaeger: true
+  tracing:
+    propagation:
+      jaeger: false
+```
+
+In this particular example, the error produced would be:
+
+```
+ERROR duplicated keys detected in your yaml configuration: 'telemetry.tracing'
+```
+
+By [@bnjjj](https://github.com/bnjjj) in https://github.com/apollographql/router/pull/2270
+
+### Return requested `__typename` in initial chunk of a deferred response ([Issue #1922](https://github.com/apollographql/router/issues/1922))
+
+The special-case `__typename` field is no longer being treated incorrectly when requested at the root level on an operation which used `@defer`.  For example, the following query:
+
+```graphql
+{
+  __typename
+  ...deferedFragment @defer
+}
+
+fragment deferedFragment on Query {
+  slow
+}
+```
+
+The Router now exhibits the correct behavior for this query with `__typename` being returned as soon as possible in the initial chunk, as follows: 
+
+```json
+{"data":{"__typename": "Query"},"hasNext":true}
+```
+
+By [@bnjjj](https://github.com/bnjjj) in https://github.com/apollographql/router/pull/2274
+
+### Log retriable Apollo Uplink failures at the `debug` level ([Issue #2004](https://github.com/apollographql/router/issues/2004))
+
+The log levels for messages pertaining to Apollo Uplink schema fetch failures are now emitted at `debug` level to reduce noise since such failures do not indicate an actual error since they can be and are retried immediately. 
+
+By [@bnjjj](https://github.com/bnjjj) in https://github.com/apollographql/router/pull/2215
+
+### Traces won't cause missing field-stats ([Issue #2267](https://github.com/apollographql/router/issues/2267))
+
+Metrics are now correctly measured comprehensively and traces will obey the trace sampling configuration.  Previously, if a request was sampled out of tracing it would not always contribute to metrics correctly.  This was particularly problematic for users which had configured high sampling rates for their traces.
+
+By [@bryncooke](https://github.com/bryncooke) in https://github.com/apollographql/router/pull/2277 and https://github.com/apollographql/router/pull/2286
+
+### Replace default `notify` watcher mechanism with `PollWatcher` ([Issue #2245](https://github.com/apollographql/router/issues/2245))
+
+We have replaced the default mechanism used by our underlying file-system notification library, [`notify`](https://crates.io/crates/notify), to use [`PollWatcher`](https://docs.rs/notify/4.0.17/notify/poll/struct.PollWatcher.html).  This more aggressive change has been taken on account of continued reports of failed hot-reloading and follows up our previous replacement of [`hotwatch`](https://crates.io/crates/hotwatch).  We don't have very demanding file watching requirements, so while `PollWatcher` offers less sophisticated functionality and _slightly_ slower reactivity, it is at least consistent on all platforms and should provide the best developer experience.
+
+By [@garypen](https://github.com/garypen) in https://github.com/apollographql/router/pull/2276
+
+### Preserve subgraph error's `path` property when redacting subgraph errors ([Issue #1818](https://github.com/apollographql/router/issues/1818))
+
+The `path` property in errors is now preserved.  Previously, error redaction was removing the error's `path` property, which made debugging difficult but also made it impossible to correctly match errors from deferred responses to the appropriate fields in the requested operation.  Since the response shape for the primary and deferred responses are defined from the client-facing "API schema", rather than the supergraph, this change will not result in leaking internal supergraph implementation details to clients and the result will be consistent, even if the subgraph which provides a particular field changes over time.
+
+By [@Geal](https://github.com/geal) in https://github.com/apollographql/router/pull/2273
+
+### Use correct URL decoding for `variables` in HTTP `GET` requests ([Issue #2248](https://github.com/apollographql/router/issues/2248))
+
+The correct URL decoding will now be applied when making a `GET` request that passes in the `variables` query string parameter.  Previously, _all_ '+' characters were being replaced with spaces which broke cases where the `+` symbol was not merely an encoding symbol (e.g., ISO8601 date time values with timezone information).
+
+By [@neominik](https://github.com/neominik) in https://github.com/apollographql/router/pull/2249
+
+## 🛠 Maintenance
+
+### Return additional details to client for invalid GraphQL requests ([Issue #2301](https://github.com/apollographql/router/issues/2301))
+
+Additional context will be returned to clients in the error indicating the source of the error when an invalid GraphQL request is made.  For example, passing a string instead of an object for the `variables` property will now inform the client of the mistake, providing a better developer experience:
+
+```json
+{
+  "errors": [
+    {
+      "message": "Invalid GraphQL request",
+      "extensions": {
+        "details": "failed to deserialize the request body into JSON: invalid type: string \"null\", expected a map at line 1 column 100",
+        "code": "INVALID_GRAPHQL_REQUEST"
+      }
+    }
+  ]
+}
+```
+
+By [@bnjjj](https://github.com/bnjjj) in https://github.com/apollographql/router/pull/2306
+
+### OpenTelemetry spans to subgraphs now include the request URL ([Issue #2280](https://github.com/apollographql/router/issues/2280))
+
+A new `http.url` attribute has been attached to `subgraph_request` OpenTelemetry trace spans which specifies the URL which the particular request was made to.
+
+By [@bnjjj](https://github.com/bnjjj) in https://github.com/apollographql/router/pull/2292
+
+### Errors returned to clients are now more consistently formed ([Issue #2101](https://github.com/apollographql/router/issues/2101))
+
+We now return errors in a more consistent shape to those which were returned by Apollo Gateway and Apollo Server, and seen in the [documentation](https://www.apollographql.com/docs/apollo-server/data/errors/).  In particular, when available, a stable `code` field will be included in the error's `extensions`.
+
+By [@bnjjj](https://github.com/bnjjj) in https://github.com/apollographql/router/pull/2178
+
+## 🧪 Experimental
+
+> **Note**
+>
+> These features are subject to change slightly (usually, in terms of naming or interfaces) before graduating to general availability.
+>
+> [Read more about how we treat experimental features](https://www.apollographql.com/docs/resources/product-launch-stages/#experimental-features).
+
+### Introduce a `router_service` layer ([Issue #1496](https://github.com/apollographql/router/issues/1496))
+
+A `router_service` layer is now part of our service stack and allows plugin developers to process raw HTTP requests and responses from clients prior to those requests reaching the GraphQL processing within the `supergraph_service` layer.  This will become a stable part of our API as we receive feedback from its early adopters.  Please open a discussion with any feedback you might have!
+
+By [@o0Ignition0o](https://github.com/o0Ignition0o) in https://github.com/apollographql/router/pull/2170
+
+### Request pipeline customization via HTTP ([Issue #1916](https://github.com/apollographql/router/issues/1916))
+
+We now offer the ability to configure some aspects of the Router via the response to an HTTP `POST` request to an external endpoint.  Initially, we are only offering this option to customize the newly introduced `router_service` (above, in these release notes), but our intention is to introduce customization of [existing service layers](https://www.apollographql.com/docs/router/customizations/overview/#how-customizations-work) as well (e.g., `supergraph_service, `subgraph_service`, etc.).  Conceptually, this addition allows similar customizations that are possible with Rhai or Rust plugin by sending the operation's context as of a particular phase of the request pipeline "over the wire" as of a particular to an external HTTP service which has the ability to process its properties and return a (potentially) modified response to the Router.  This will become a stable part of our API as we receive feedback from its early adopters.  Please open a discussion with any feedback you might have!
+
+When this experimental option is enabled, contextual data will be transmitted as a JSON payload to an HTTP endpoint as a `POST` request.  The response to such a request will be processed by the Router and any changes made by the external service will effect the remaining layers in the request pipeline.  This allows external services to customize the  Router behavior, but requires intentionally blocking Router's normal request pipeline.  Therefore, any latency of a configured external service will have a direct impact on the performance of the Router and external services should be as performant as possible. 
+
+To experiement with this behavior, consider adopting a configuration similar to the following which communicates with a service running on `http://127.0.0.1:8081` for the `router` service layer:
+
+```yaml
+plugins:
+  experimental.external:
+    # A URL which will be called for each request for any configured stage.
+    url: http://127.0.0.1:8081
+
+    # A human-readable interval specifying the maximum allowed time. (Defaults to "1s", or one second)
+    timeout: 2s
+
+    # A "stage" represents a phase of the request pipeline in which the external service will be invoked.
+    # They sit request pipeline as our Service Layers for Rust/Rhai, seen in our docs:
+    #   https://www.apollographql.com/docs/router/customizations/overview/#how-customizations-work
+    stages:
+    
+      # Currently, the only supported value is "router".
+      router:
+      
+        # Define which properties of the request should be transmitted in the payload.
+	# Choosing the least amount of data will reduce the size of the payload.
+	# By default, all values are false and, when false, their presence in this map is optional.
+        request: 
+          headers: true
+          context: true
+          body: true
+          sdl: true
+	
+	# Similar to "request", but which properties of the response should be sent.
+	# Again, all values are false by default and only must be specified if they are enabled.
+        response:
+          headers: true
+          context: true
+```
+
+By [@garypen](https://github.com/garypen) in https://github.com/apollographql/router/pull/2229
+
 # [1.6.0] - 2022-12-13
 
 ## ❗ BREAKING ❗
diff --git a/Cargo.lock b/Cargo.lock
index ae122caa4e..f2572fd016 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -69,9 +69,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.19"
+version = "0.7.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
+checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
 dependencies = [
  "memchr",
 ]
@@ -91,6 +91,12 @@ dependencies = [
  "alloc-no-stdlib",
 ]
 
+[[package]]
+name = "anes"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
+
 [[package]]
 name = "ansi_term"
 version = "0.12.1"
@@ -102,17 +108,17 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.66"
+version = "1.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
+checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
 
 [[package]]
 name = "apollo-compiler"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4e8b67b10b590ac58e555af24b7cc7863deacb4c7bc6ae2efd60b0256a2b654"
+checksum = "f1466d86c8bec27cd5c28c80538a298729cf57ab3127389741336ac586634ec8"
 dependencies = [
- "apollo-parser 0.4.0",
+ "apollo-parser 0.4.1",
  "miette 4.7.1",
  "ordered-float 2.10.0",
  "rowan",
@@ -127,7 +133,7 @@ version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b17d38f06e92256e9b0b271b878e20309822a587b2acfa234a60d36d92b6b43"
 dependencies = [
- "apollo-parser 0.3.1",
+ "apollo-parser 0.3.2",
  "thiserror",
 ]
 
@@ -137,24 +143,24 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "555c85cfb5672ee5d5925db34c15b8bc53e97bf5c67eb0a75d54ee9fe51ec8f0"
 dependencies = [
- "apollo-parser 0.4.0",
+ "apollo-parser 0.4.1",
  "thiserror",
 ]
 
 [[package]]
 name = "apollo-parser"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a8f6cc3fa1313e045538ed2ce72ba916d52b501cd81e636a0bd5cdc703a0c73"
+checksum = "d640c8fb7f9ab98a78a8086bb413d8ecf3ee44849976e1636e27265f09e9e544"
 dependencies = [
  "rowan",
 ]
 
 [[package]]
 name = "apollo-parser"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bceda0395fd9cf784b4c6bb4adbaee52706ed7cbe7d2403e77e62cdc760145d2"
+checksum = "8efddeb45af3f03212f39365abbeb0572fabc87a619efaedac38d40a9d604a9e"
 dependencies = [
  "rowan",
  "thiserror",
@@ -162,13 +168,13 @@ dependencies = [
 
 [[package]]
 name = "apollo-router"
-version = "1.6.0"
+version = "1.7.0"
 dependencies = [
  "access-json",
  "ansi_term",
  "anyhow",
  "apollo-encoder 0.4.0",
- "apollo-parser 0.4.0",
+ "apollo-parser 0.4.1",
  "arc-swap",
  "askama",
  "async-compression",
@@ -176,10 +182,10 @@ dependencies = [
  "atty",
  "axum",
  "backtrace",
- "base64 0.13.1",
+ "base64 0.20.0",
  "buildstructor 0.5.1",
  "bytes",
- "clap 3.2.23",
+ "clap 4.0.29",
  "console-subscriber",
  "dashmap",
  "derivative",
@@ -191,6 +197,7 @@ dependencies = [
  "flate2",
  "futures",
  "graphql_client",
+ "heck 0.4.0",
  "hex",
  "http",
  "http-body",
@@ -214,6 +221,7 @@ dependencies = [
  "miette 5.5.0",
  "mime",
  "mockall",
+ "multer",
  "multimap",
  "notify",
  "once_cell",
@@ -248,6 +256,7 @@ dependencies = [
  "sha2",
  "shellexpand",
  "static_assertions",
+ "strum_macros",
  "sys-info",
  "tempfile",
  "test-log",
@@ -278,7 +287,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-router-benchmarks"
-version = "1.6.0"
+version = "1.7.0"
 dependencies = [
  "apollo-router",
  "async-trait",
@@ -294,11 +303,11 @@ dependencies = [
 
 [[package]]
 name = "apollo-router-scaffold"
-version = "1.6.0"
+version = "1.7.0"
 dependencies = [
  "anyhow",
  "cargo-scaffold",
- "clap 3.2.23",
+ "clap 4.0.29",
  "copy_dir",
  "regex",
  "str_inflector",
@@ -313,7 +322,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e9c717390e188a27cbbe09c76042332bf6cc3bb6a83a73d71c0bceb6f2d73cb9"
 dependencies = [
  "apollo-encoder 0.4.0",
- "apollo-parser 0.4.0",
+ "apollo-parser 0.4.1",
  "arbitrary",
  "once_cell",
  "thiserror",
@@ -407,9 +416,9 @@ dependencies = [
 
 [[package]]
 name = "async-channel"
-version = "1.7.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28"
+checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833"
 dependencies = [
  "concurrent-queue",
  "event-listener",
@@ -468,7 +477,7 @@ version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.1.19",
  "libc",
  "winapi 0.3.9",
 ]
@@ -494,7 +503,7 @@ dependencies = [
  "http",
  "http-body",
  "hyper",
- "itoa 1.0.4",
+ "itoa",
  "matchit",
  "memchr",
  "mime",
@@ -571,6 +580,12 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
+[[package]]
+name = "base64"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5"
+
 [[package]]
 name = "base64ct"
 version = "1.5.3"
@@ -640,10 +655,7 @@ version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
 dependencies = [
- "lazy_static",
  "memchr",
- "regex-automata",
- "serde",
 ]
 
 [[package]]
@@ -700,17 +712,11 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
 
-[[package]]
-name = "cache-padded"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
-
 [[package]]
 name = "cargo-scaffold"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29870394429099fd98f0a518aff593310b5c9fe25178a17949219a15ae3882eb"
+checksum = "a14e2a7adeaf890958568da541ab7b52fefb784937d8ea7f18a03218b1701fe9"
 dependencies = [
  "anyhow",
  "buildstructor 0.3.2",
@@ -737,9 +743,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.0.76"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f"
+checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
 dependencies = [
  "jobserver",
 ]
@@ -750,6 +756,33 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "ciborium"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f"
+dependencies = [
+ "ciborium-io",
+ "ciborium-ll",
+ "serde",
+]
+
+[[package]]
+name = "ciborium-io"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369"
+
+[[package]]
+name = "ciborium-ll"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b"
+dependencies = [
+ "ciborium-io",
+ "half",
+]
+
 [[package]]
 name = "clap"
 version = "2.34.0"
@@ -771,22 +804,32 @@ version = "3.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5"
 dependencies = [
- "atty",
  "bitflags",
- "clap_derive",
- "clap_lex",
+ "clap_lex 0.2.4",
  "indexmap",
+ "textwrap 0.16.0",
+]
+
+[[package]]
+name = "clap"
+version = "4.0.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d"
+dependencies = [
+ "bitflags",
+ "clap_derive",
+ "clap_lex 0.3.0",
+ "is-terminal",
  "once_cell",
  "strsim 0.10.0",
  "termcolor",
- "textwrap 0.16.0",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "3.2.18"
+version = "4.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
+checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014"
 dependencies = [
  "heck 0.4.0",
  "proc-macro-error",
@@ -804,6 +847,15 @@ dependencies = [
  "os_str_bytes",
 ]
 
+[[package]]
+name = "clap_lex"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8"
+dependencies = [
+ "os_str_bytes",
+]
+
 [[package]]
 name = "coarsetime"
 version = "0.1.22"
@@ -857,11 +909,11 @@ dependencies = [
 
 [[package]]
 name = "concurrent-queue"
-version = "1.2.4"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c"
+checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b"
 dependencies = [
- "cache-padded",
+ "crossbeam-utils",
 ]
 
 [[package]]
@@ -950,9 +1002,9 @@ dependencies = [
 
 [[package]]
 name = "const-oid"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "722e23542a15cea1f65d4a1419c4cfd7a26706c70871a13a04238ca3f40f1661"
+checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b"
 
 [[package]]
 name = "const-random"
@@ -1065,15 +1117,16 @@ dependencies = [
 
 [[package]]
 name = "criterion"
-version = "0.3.6"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f"
+checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb"
 dependencies = [
+ "anes",
  "atty",
  "cast",
- "clap 2.34.0",
+ "ciborium",
+ "clap 3.2.23",
  "criterion-plot",
- "csv",
  "futures",
  "itertools",
  "lazy_static",
@@ -1083,7 +1136,6 @@ dependencies = [
  "rayon",
  "regex",
  "serde",
- "serde_cbor",
  "serde_derive",
  "serde_json",
  "tinytemplate",
@@ -1093,9 +1145,9 @@ dependencies = [
 
 [[package]]
 name = "criterion-plot"
-version = "0.4.5"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876"
+checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
 dependencies = [
  "cast",
  "itertools",
@@ -1124,22 +1176,22 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.11"
+version = "0.9.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348"
+checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a"
 dependencies = [
  "autocfg",
  "cfg-if",
  "crossbeam-utils",
- "memoffset",
+ "memoffset 0.7.1",
  "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.12"
+version = "0.8.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac"
+checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
 dependencies = [
  "cfg-if",
 ]
@@ -1172,28 +1224,6 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "csv"
-version = "1.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
-dependencies = [
- "bstr",
- "csv-core",
- "itoa 0.4.8",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "csv-core"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "ct-codecs"
 version = "1.1.1"
@@ -1230,7 +1260,7 @@ dependencies = [
  "hashbrown",
  "lock_api",
  "once_cell",
- "parking_lot_core 0.9.4",
+ "parking_lot_core 0.9.5",
  "serde",
 ]
 
@@ -1273,9 +1303,9 @@ dependencies = [
 
 [[package]]
 name = "der"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dd2ae565c0a381dde7fade45fce95984c568bdcb4700a4fdbe3175e0380b2f"
+checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
 dependencies = [
  "const-oid",
  "pem-rfc7468",
@@ -1295,9 +1325,9 @@ dependencies = [
 
 [[package]]
 name = "derive_arbitrary"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4903dff04948f22033ca30232ab8eca2c3fc4c913a8b6a34ee5199699814817f"
+checksum = "f8a16495aeb28047bb1185fca837baf755e7d71ed3aeed7f8504654ffa927208"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1358,9 +1388,9 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
 
 [[package]]
 name = "digest"
-version = "0.10.5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c"
+checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
 dependencies = [
  "block-buffer",
  "const-oid",
@@ -1434,9 +1464,9 @@ dependencies = [
 
 [[package]]
 name = "ed25519-compact"
-version = "2.0.2"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f2d21333b679bbbac680b3eb45c86937e42f69277028f4e97b599b80b86c253"
+checksum = "6a3d382e8464107391c8706b4c14b087808ecb909f6c15c34114bc42e53a9e4c"
 dependencies = [
  "ct-codecs",
  "getrandom",
@@ -1487,12 +1517,12 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.9.3"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
+checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
 dependencies = [
- "atty",
  "humantime",
+ "is-terminal",
  "log",
  "regex",
  "termcolor",
@@ -1507,6 +1537,27 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "errno"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+dependencies = [
+ "errno-dragonfly",
+ "libc",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "errno-dragonfly"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+dependencies = [
+ "cc",
+ "libc",
+]
+
 [[package]]
 name = "event-listener"
 version = "2.5.3"
@@ -1544,9 +1595,9 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3"
+checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9"
 dependencies = [
  "cfg-if",
  "libc",
@@ -1639,9 +1690,9 @@ dependencies = [
 
 [[package]]
 name = "fraction"
-version = "0.12.1"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99df8100674344d1cee346c764684f7ad688a4dcaa1a3efb2fdb45daf9acf4f9"
+checksum = "7aa5de57a62c2440ece64342ea59efb7171aa7d016faf8dfcb8795066a17146b"
 dependencies = [
  "lazy_static",
  "num",
@@ -2016,6 +2067,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "hermit-abi"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -2042,24 +2102,24 @@ dependencies = [
 
 [[package]]
 name = "hmac-sha1-compact"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a76968b14b68737b664da5f9a31eb00af72f69a618a8ef2e2c8d30c494d28dae"
+checksum = "05e2440a0078e20c3b68ca01234cea4219f23e64b0c0bdb1200c5550d54239bb"
 
 [[package]]
 name = "hmac-sha256"
-version = "1.1.5"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43ecbd4fb98b97457d10a29f8bdfee1fad612b6ce879b39d7b8dd6ce510875af"
+checksum = "fc736091aacb31ddaa4cd5f6988b3c21e99913ac846b41f32538c5fae5d71bfe"
 dependencies = [
  "digest",
 ]
 
 [[package]]
 name = "hmac-sha512"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4d6b820c3093490ef1fb8253caa34feb83b0ab894c06c8c16c3c02cfaebc1eb"
+checksum = "520c9c3f6040661669bc5c91e551b605a520c8e0a63a766a91a65adef734d151"
 dependencies = [
  "digest",
 ]
@@ -2072,7 +2132,7 @@ checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
 dependencies = [
  "bytes",
  "fnv",
- "itoa 1.0.4",
+ "itoa",
 ]
 
 [[package]]
@@ -2141,7 +2201,7 @@ dependencies = [
  "http-body",
  "httparse",
  "httpdate",
- "itoa 1.0.4",
+ "itoa",
  "pin-project-lite",
  "socket2",
  "tokio",
@@ -2282,17 +2342,15 @@ checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02"
 
 [[package]]
 name = "introspector-gadget"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a6a5345dd15741225868a205140b730de97b4f00b7d22a8520ae9d3e6266518"
+checksum = "b9360a9dd04f347bf40cbb128bf622d4ef524fb89aee8cff836b88471d4f14dd"
 dependencies = [
  "apollo-encoder 0.3.4",
  "backoff",
  "graphql_client",
- "humantime",
  "hyper",
  "reqwest",
- "semver 1.0.14",
  "serde",
  "serde_json",
  "thiserror",
@@ -2309,11 +2367,33 @@ dependencies = [
  "ghost",
 ]
 
+[[package]]
+name = "io-lifetimes"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
+dependencies = [
+ "libc",
+ "windows-sys 0.42.0",
+]
+
 [[package]]
 name = "ipnet"
-version = "2.5.1"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e"
+
+[[package]]
+name = "is-terminal"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745"
+checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330"
+dependencies = [
+ "hermit-abi 0.2.6",
+ "io-lifetimes",
+ "rustix",
+ "windows-sys 0.42.0",
+]
 
 [[package]]
 name = "is_ci"
@@ -2339,12 +2419,6 @@ dependencies = [
  "either",
 ]
 
-[[package]]
-name = "itoa"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
-
 [[package]]
 name = "itoa"
 version = "1.0.4"
@@ -2393,7 +2467,7 @@ dependencies = [
  "fancy-regex",
  "fraction",
  "iso8601",
- "itoa 1.0.4",
+ "itoa",
  "lazy_static",
  "memchr",
  "num-cmp",
@@ -2501,7 +2575,7 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 dependencies = [
- "spin",
+ "spin 0.5.2",
 ]
 
 [[package]]
@@ -2596,6 +2670,12 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f"
+
 [[package]]
 name = "lock_api"
 version = "0.4.9"
@@ -2617,9 +2697,9 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.7.8"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a"
+checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909"
 dependencies = [
  "hashbrown",
 ]
@@ -2672,6 +2752,15 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "memoffset"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "miette"
 version = "4.7.1"
@@ -2823,6 +2912,24 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "multer"
+version = "2.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed4198ce7a4cbd2a57af78d28c6fbb57d81ac5f1d6ad79ac6c5587419cbdf22"
+dependencies = [
+ "bytes",
+ "encoding_rs",
+ "futures-util",
+ "http",
+ "httparse",
+ "log",
+ "memchr",
+ "mime",
+ "spin 0.9.4",
+ "version_check",
+]
+
 [[package]]
 name = "multimap"
 version = "0.8.3"
@@ -2919,9 +3026,9 @@ dependencies = [
 
 [[package]]
 name = "num-bigint-dig"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "566d173b2f9406afbc5510a90925d5a2cd80cae4605631f1212303df265de011"
+checksum = "2399c9463abc5f909349d8aa9ba080e0b88b3ce2885389b60b993f39b1a56905"
 dependencies = [
  "byteorder",
  "lazy_static",
@@ -2998,7 +3105,7 @@ version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.1.19",
  "libc",
 ]
 
@@ -3044,9 +3151,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.42"
+version = "0.10.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13"
+checksum = "29d971fd5722fec23977260f6e81aa67d2f22cadbdc2aa049f1022d9a3be1566"
 dependencies = [
  "bitflags",
  "cfg-if",
@@ -3076,9 +3183,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.77"
+version = "0.9.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a"
+checksum = "5454462c0eced1e97f2ec09036abc8da362e66802f66fd20f86854d9d8cbcbc4"
 dependencies = [
  "autocfg",
  "cc",
@@ -3284,9 +3391,9 @@ dependencies = [
 
 [[package]]
 name = "os_str_bytes"
-version = "6.3.1"
+version = "6.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3baf96e39c5359d2eb0dd6ccb42c62b91d9678aa68160d261b9e0ccbf9e9dea9"
+checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
 
 [[package]]
 name = "overload"
@@ -3330,7 +3437,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
 dependencies = [
  "instant",
  "lock_api",
- "parking_lot_core 0.8.5",
+ "parking_lot_core 0.8.6",
 ]
 
 [[package]]
@@ -3340,14 +3447,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.4",
+ "parking_lot_core 0.9.5",
 ]
 
 [[package]]
 name = "parking_lot_core"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
 dependencies = [
  "cfg-if",
  "instant",
@@ -3359,9 +3466,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0"
+checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba"
 dependencies = [
  "cfg-if",
  "libc",
@@ -3372,9 +3479,9 @@ dependencies = [
 
 [[package]]
 name = "paste"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1c2c742266c2f1041c914ba65355a83ae8747b05f208319784083583494b4b"
+checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
 
 [[package]]
 name = "pem-rfc7468"
@@ -3393,9 +3500,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
 
 [[package]]
 name = "pest"
-version = "2.4.1"
+version = "2.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a528564cc62c19a7acac4d81e01f39e53e25e17b934878f4c6d25cc2836e62f8"
+checksum = "cc8bed3549e0f9b0a2a78bf7c0018237a2cdf085eecbbc048e52612438e4e9d0"
 dependencies = [
  "thiserror",
  "ucd-trie",
@@ -3403,9 +3510,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.4.1"
+version = "2.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5fd9bc6500181952d34bd0b2b0163a54d794227b498be0b7afa7698d0a7b18f"
+checksum = "cdc078600d06ff90d4ed238f0119d84ab5d43dbaad278b0e33a8820293b32344"
 dependencies = [
  "pest",
  "pest_generator",
@@ -3413,9 +3520,9 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.4.1"
+version = "2.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2610d5ac5156217b4ff8e46ddcef7cdf44b273da2ac5bca2ecbfa86a330e7c4"
+checksum = "28a1af60b1c4148bb269006a750cff8e2ea36aff34d2d96cf7be0b14d1bed23c"
 dependencies = [
  "pest",
  "pest_meta",
@@ -3426,9 +3533,9 @@ dependencies = [
 
 [[package]]
 name = "pest_meta"
-version = "2.4.1"
+version = "2.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "824749bf7e21dd66b36fbe26b3f45c713879cccd4a009a917ab8e045ca8246fe"
+checksum = "fec8605d59fc2ae0c6c1aefc0c7c7a9769732017c0ce07f7a9cfffa7b4404f20"
 dependencies = [
  "once_cell",
  "pest",
@@ -3543,9 +3650,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "predicates"
-version = "2.1.2"
+version = "2.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab68289ded120dcbf9d571afcf70163233229052aec9b08ab09532f698d0e1e6"
+checksum = "f54fc5dc63ed3bbf19494623db4f3af16842c0d975818e469022d09e53f0aa05"
 dependencies = [
  "difflib",
  "float-cmp",
@@ -3557,15 +3664,15 @@ dependencies = [
 
 [[package]]
 name = "predicates-core"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6e7125585d872860e9955ca571650b27a4979c5823084168c5ed5bbfb016b56"
+checksum = "72f883590242d3c6fc5bf50299011695fa6590c2c70eac95ee1bdb9a733ad1a2"
 
 [[package]]
 name = "predicates-tree"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad3f7fa8d61e139cbc7c3edfebf3b6678883a53f5ffac65d1259329a93ee43a5"
+checksum = "54ff541861505aabf6ea722d2131ee980b8276e10a1297b94e896dd8b621850d"
 dependencies = [
  "predicates-core",
  "termtree",
@@ -3664,9 +3771,9 @@ dependencies = [
 
 [[package]]
 name = "prost"
-version = "0.11.2"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0841812012b2d4a6145fae9a6af1534873c32aa67fff26bd09f8fa42c83f95a"
+checksum = "c0b18e655c21ff5ac2084a5ad0611e827b3f92badf79f4910b5a5c58f4d87ff0"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -3674,9 +3781,9 @@ dependencies = [
 
 [[package]]
 name = "prost-build"
-version = "0.11.3"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e330bf1316db56b12c2bcfa399e8edddd4821965ea25ddb2c134b610b1c1c604"
+checksum = "276470f7f281b0ed53d2ae42dd52b4a8d08853a3c70e7fe95882acbb98a6ae94"
 dependencies = [
  "bytes",
  "heck 0.4.0",
@@ -3778,21 +3885,19 @@ dependencies = [
 
 [[package]]
 name = "rayon"
-version = "1.5.3"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d"
+checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7"
 dependencies = [
- "autocfg",
- "crossbeam-deque",
  "either",
  "rayon-core",
 ]
 
 [[package]]
 name = "rayon-core"
-version = "1.9.3"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f"
+checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-deque",
@@ -3802,16 +3907,16 @@ dependencies = [
 
 [[package]]
 name = "redis"
-version = "0.21.6"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "571c252c68d09a2ad3e49edd14e9ee48932f3e0f27b06b4ea4c9b2a706d31103"
+checksum = "152f3863635cbb76b73bc247845781098302c6c9ad2060e1a9a7de56840346b6"
 dependencies = [
  "async-trait",
  "bytes",
  "combine 4.6.6",
  "crc16",
  "futures-util",
- "itoa 1.0.4",
+ "itoa",
  "percent-encoding",
  "pin-project-lite",
  "rand",
@@ -4030,9 +4135,9 @@ dependencies = [
 
 [[package]]
 name = "rhai_codegen"
-version = "1.4.2"
+version = "1.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36791b0b801159db25130fd46ac726d2751c070260bba3a4a0a3eeb6231bb82a"
+checksum = "c087528477f486dd71d6dc98a922d92403f0cfdaf317d670542caffb0a770164"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4048,7 +4153,7 @@ dependencies = [
  "cc",
  "libc",
  "once_cell",
- "spin",
+ "spin 0.5.2",
  "untrusted",
  "web-sys",
  "winapi 0.3.9",
@@ -4088,7 +4193,7 @@ dependencies = [
 name = "router-fuzz"
 version = "0.0.0"
 dependencies = [
- "apollo-parser 0.4.0",
+ "apollo-parser 0.4.1",
  "apollo-smith",
  "env_logger",
  "libfuzzer-sys",
@@ -4105,16 +4210,16 @@ checksum = "5811547e7ba31e903fe48c8ceab10d40d70a101f3d15523c847cce91aa71f332"
 dependencies = [
  "countme",
  "hashbrown",
- "memoffset",
+ "memoffset 0.6.5",
  "rustc-hash",
  "text-size",
 ]
 
 [[package]]
 name = "rsa"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0ecc3307be66bfb3574577895555bacfb9a37a8d5cd959444b72ff02495c618"
+checksum = "094052d5470cbcef561cb848a7209968c9f12dfa6d668f4bca048ac5de51099c"
 dependencies = [
  "byteorder",
  "digest",
@@ -4195,6 +4300,20 @@ dependencies = [
  "semver 1.0.14",
 ]
 
+[[package]]
+name = "rustix"
+version = "0.36.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588"
+dependencies = [
+ "bitflags",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.42.0",
+]
+
 [[package]]
 name = "rustls"
 version = "0.20.7"
@@ -4389,28 +4508,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.150"
+version = "1.0.151"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91"
+checksum = "97fed41fc1a24994d044e6db6935e69511a1153b52c15eb42493b26fa87feba0"
 dependencies = [
  "serde_derive",
 ]
 
-[[package]]
-name = "serde_cbor"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
-dependencies = [
- "half",
- "serde",
-]
-
 [[package]]
 name = "serde_derive"
-version = "1.0.150"
+version = "1.0.151"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e"
+checksum = "255abe9a125a985c05190d687b320c12f9b1f0b99445e608c21ba0782c719ad8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4430,12 +4539,12 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.89"
+version = "1.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
+checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883"
 dependencies = [
  "indexmap",
- "itoa 1.0.4",
+ "itoa",
  "ryu",
  "serde",
 ]
@@ -4459,7 +4568,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
 dependencies = [
  "form_urlencoded",
- "itoa 1.0.4",
+ "itoa",
  "ryu",
  "serde",
 ]
@@ -4543,9 +4652,9 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
 
 [[package]]
 name = "shellexpand"
-version = "2.1.2"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4"
+checksum = "dd1c7ddea665294d484c39fd0c0d2b7e35bbfe10035c5fe1854741a57f6880e1"
 dependencies = [
  "dirs",
 ]
@@ -4571,9 +4680,9 @@ dependencies = [
 
 [[package]]
 name = "similar"
-version = "2.2.0"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62ac7f900db32bf3fd12e0117dd3dc4da74bc52ebaac97f39668446d89694803"
+checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf"
 
 [[package]]
 name = "slab"
@@ -4643,6 +4752,12 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
+[[package]]
+name = "spin"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09"
+
 [[package]]
 name = "spki"
 version = "0.6.0"
@@ -4739,7 +4854,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "apollo-compiler",
- "apollo-parser 0.4.0",
+ "apollo-parser 0.4.1",
  "apollo-router",
  "async-trait",
  "futures",
@@ -4929,18 +5044,18 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
 [[package]]
 name = "thiserror"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
+checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
+checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5077,9 +5192,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "1.8.0"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
+checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5166,6 +5281,7 @@ dependencies = [
  "axum",
  "base64 0.13.1",
  "bytes",
+ "flate2",
  "futures-core",
  "futures-util",
  "h2",
@@ -5438,9 +5554,9 @@ dependencies = [
 
 [[package]]
 name = "typenum"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
+checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 
 [[package]]
 name = "typetag"
@@ -5745,9 +5861,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.22.5"
+version = "0.22.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be"
+checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
 dependencies = [
  "webpki",
 ]
diff --git a/README.md b/README.md
index 5a15025f1f..de30166296 100644
--- a/README.md
+++ b/README.md
@@ -6,9 +6,9 @@
 
 The **Apollo Router** is a configurable, high-performance **graph router** written in Rust to run a [federated supergraph](https://www.apollographql.com/docs/federation/) that uses [Apollo Federation 2](https://www.apollographql.com/docs/federation/v2/federation-2/new-in-federation-2).
 
-Apollo Router is well-tested, regularly benchmarked, includes most major features of Apollo Gateway and is able to serve production-scale workloads.  Please note that the (pre-1.0) version is not yet "semver stable" and we may still make breaking changes.  Generally speaking, we expect most breaking changes to be on the plugin API and the configuration file format.  We will clearly convey such changes in the release notes.
+Apollo Router is well-tested, regularly benchmarked, includes most major features of Apollo Gateway and is able to serve production-scale workloads. Please note that the (pre-1.0) version is not yet "semver stable" and we may still make breaking changes. Generally speaking, we expect most breaking changes to be on the plugin API and the configuration file format. We will clearly convey such changes in the release notes.
 
-New releases and their release notes (along with notes about any breaking changes) can be found on the [Releases](https://github.com/apollographql/router/releases) page, and the latest release can always be found [on the latest page](https://github.com/apollographql/router/releases/latest).  The `CHANGELOG.md` at the root of this repository also contains _unreleased_ changes in addition to the full history of changes.
+New releases and their release notes (along with notes about any breaking changes) can be found on the [Releases](https://github.com/apollographql/router/releases) page, and the latest release can always be found [on the latest page](https://github.com/apollographql/router/releases/latest). The `CHANGELOG.md` at the root of this repository also contains _unreleased_ changes in addition to the full history of changes.
 
 Currently, we're publishing new releases every 1-2 weeks.
 
@@ -38,6 +38,10 @@ OPTIONS:
             The time between polls to Apollo uplink. Minimum 10s [env: APOLLO_UPLINK_POLL_INTERVAL=]
             [default: 10s]
 
+        --apollo-uplink-timeout <APOLLO_UPLINK_TIMEOUT>
+            The timeout for each of the polls to Apollo Uplink. [env: APOLLO_UPLINK_TIMEOUT=]
+            [default: 30s]
+
     -c, --config <CONFIG_PATH>
             Configuration location relative to the project directory [env:
             APOLLO_ROUTER_CONFIG_PATH=]
@@ -67,7 +71,7 @@ SUBCOMMANDS:
 [Apollo](https://apollographql.com/) is building software and a graph platform to unify GraphQL across your apps and services. We help you ship faster with:
 
 * [Apollo Studio](https://www.apollographql.com/studio/develop/) – A free, end-to-end platform for managing your GraphQL lifecycle. Track your GraphQL schemas in a hosted registry to create a source of truth for everything in your graph. Studio provides an IDE (Apollo Explorer) so you can explore data, collaborate on queries, observe usage, and safely make schema changes.
-* [Apollo Federation](https://www.apollographql.com/apollo-federation) – The industry-standard open architecture for building a distributed graph.  Compose and manage your graphs using [Rover](https://www.apollographql.com/rover/) and then use Apollo Router to query plan and route requests across multiple subgraphs.
+* [Apollo Federation](https://www.apollographql.com/apollo-federation) – The industry-standard open architecture for building a distributed graph. Compose and manage your graphs using [Rover](https://www.apollographql.com/rover/) and then use Apollo Router to query plan and route requests across multiple subgraphs.
 * [Apollo Client](https://www.apollographql.com/apollo-client/) – The most popular GraphQL client for the web. Apollo also builds and maintains [Apollo iOS](https://github.com/apollographql/apollo-ios) and [Apollo Android](https://github.com/apollographql/apollo-android).
 * [Apollo Server](https://www.apollographql.com/docs/apollo-server/) – A production-ready JavaScript GraphQL server that connects to any microservice, API, or database. Compatible with all popular JavaScript frameworks and deployable in serverless environments.
 
@@ -111,4 +115,4 @@ Apollo Graph, Inc.
 Source code in this repository is covered by the Elastic License 2.0. The
 default throughout the repository is a license under the Elastic License 2.0,
 unless a file header or a license file in a subdirectory specifies another
-license.  [See the LICENSE](./LICENSE) for the full license text.
+license. [See the LICENSE](./LICENSE) for the full license text.
diff --git a/apollo-router-benchmarks/Cargo.toml b/apollo-router-benchmarks/Cargo.toml
index d5f0c841e0..60e7aca339 100644
--- a/apollo-router-benchmarks/Cargo.toml
+++ b/apollo-router-benchmarks/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "apollo-router-benchmarks"
-version = "1.6.0"
+version = "1.7.0"
 authors = ["Apollo Graph, Inc. <packages@apollographql.com>"]
 edition = "2021"
 license = "Elastic-2.0"
@@ -10,7 +10,7 @@ publish = false
 
 [dev-dependencies]
 apollo-router = { path = "../apollo-router" }
-criterion = { version = "0.3", features = ["async_tokio", "async_futures"] }
+criterion = { version = "0.4", features = ["async_tokio", "async_futures"] }
 futures = "0.3"
 once_cell = "1"
 serde_json = { version = "1", features = ["preserve_order"] }
diff --git a/apollo-router-benchmarks/benches/basic_composition.rs b/apollo-router-benchmarks/benches/basic_composition.rs
index ea21f45a11..63b0886e6a 100644
--- a/apollo-router-benchmarks/benches/basic_composition.rs
+++ b/apollo-router-benchmarks/benches/basic_composition.rs
@@ -10,7 +10,7 @@ fn from_elem(c: &mut Criterion) {
 
         let builder = setup();
 
-        let router = runtime.block_on(builder.build()).unwrap();
+        let router = runtime.block_on(builder.build_router()).unwrap();
         b.to_async(runtime)
             .iter(|| basic_composition_benchmark(router.clone()));
     });
diff --git a/apollo-router-benchmarks/src/lib.rs b/apollo-router-benchmarks/src/lib.rs
index b36a324134..fa78c1ef5b 100644
--- a/apollo-router-benchmarks/src/lib.rs
+++ b/apollo-router-benchmarks/src/lib.rs
@@ -7,7 +7,7 @@ pub mod tests {
         let runtime = tokio::runtime::Runtime::new().unwrap();
 
         let builder = setup();
-        let router = runtime.block_on(builder.build()).unwrap();
+        let router = runtime.block_on(builder.build_router()).unwrap();
         runtime.block_on(async move { basic_composition_benchmark(router).await });
     }
 }
diff --git a/apollo-router-benchmarks/src/shared.rs b/apollo-router-benchmarks/src/shared.rs
index 81c43bf0c2..15f0f67ed1 100644
--- a/apollo-router-benchmarks/src/shared.rs
+++ b/apollo-router-benchmarks/src/shared.rs
@@ -3,6 +3,7 @@
 // in dev mode
 use apollo_router::graphql::Response;
 use apollo_router::plugin::test::MockSubgraph;
+use apollo_router::services::router;
 use apollo_router::services::supergraph;
 use apollo_router::MockedSubgraphs;
 use apollo_router::TestHarness;
@@ -17,24 +18,30 @@ static EXPECTED_RESPONSE: Lazy<Response> = Lazy::new(|| {
 
 static QUERY: &str = r#"query TopProducts($first: Int) { topProducts(first: $first) { upc name reviews { id product { name } author { id name } } } }"#;
 
-pub async fn basic_composition_benchmark(mut supergraph_service: supergraph::BoxCloneService) {
+pub async fn basic_composition_benchmark(mut router_service: router::BoxCloneService) {
     let request = supergraph::Request::fake_builder()
         .query(QUERY.to_string())
         .variable("first", 2usize)
         .build()
-        .expect("expecting valid request");
-
-    let response = supergraph_service
-        .ready()
-        .await
-        .unwrap()
-        .call(request)
-        .await
-        .unwrap()
-        .next_response()
-        .await
+        .expect("expecting valid request")
+        .try_into()
         .unwrap();
 
+    let response: Response = serde_json::from_slice(
+        &router_service
+            .ready()
+            .await
+            .unwrap()
+            .call(request)
+            .await
+            .unwrap()
+            .next_response()
+            .await
+            .unwrap()
+            .unwrap(),
+    )
+    .unwrap();
+
     assert_eq!(response, *EXPECTED_RESPONSE);
 }
 
diff --git a/apollo-router-scaffold/Cargo.toml b/apollo-router-scaffold/Cargo.toml
index 960bed71e4..a70a8b2d59 100644
--- a/apollo-router-scaffold/Cargo.toml
+++ b/apollo-router-scaffold/Cargo.toml
@@ -1,15 +1,15 @@
 [package]
 name = "apollo-router-scaffold"
-version = "1.6.0"
+version = "1.7.0"
 authors = ["Apollo Graph, Inc. <packages@apollographql.com>"]
 edition = "2021"
 license = "Elastic-2.0"
 publish = false
 
 [dependencies]
-anyhow = "1.0.66"
-clap = { version = "3.2.23", features = ["derive"] }
-cargo-scaffold = { version = "0.8.6", default-features = false }
+anyhow = "1.0.68"
+clap = { version = "4.0.29", features = ["derive"] }
+cargo-scaffold = { version = "0.8.7", default-features = false }
 regex = "1"
 str_inflector = "0.12.0"
 toml = "0.5.9"
diff --git a/apollo-router-scaffold/templates/base/.dockerignore b/apollo-router-scaffold/templates/base/.dockerignore
new file mode 100644
index 0000000000..c2c4a5aa95
--- /dev/null
+++ b/apollo-router-scaffold/templates/base/.dockerignore
@@ -0,0 +1 @@
+target/**
\ No newline at end of file
diff --git a/apollo-router-scaffold/templates/base/Cargo.toml b/apollo-router-scaffold/templates/base/Cargo.toml
index dc76d8ca05..0c941c27f2 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.6.0"
+apollo-router = "1.7.0"
 {{/if}}
 {{/if}}
 async-trait = "0.1.52"
diff --git a/apollo-router-scaffold/templates/base/Dockerfile b/apollo-router-scaffold/templates/base/Dockerfile
new file mode 100644
index 0000000000..35572787d4
--- /dev/null
+++ b/apollo-router-scaffold/templates/base/Dockerfile
@@ -0,0 +1,49 @@
+# Use the rust build image from docker as our base
+# renovate-automation: rustc version
+FROM rust:1.65.0 as build
+
+# Set our working directory for the build
+WORKDIR /usr/src/router
+
+# Update our build image and install required packages
+RUN apt-get update
+RUN apt-get -y install \
+    npm \
+    protobuf-compiler
+
+# Add rustfmt since build requires it
+RUN rustup component add rustfmt
+
+# Copy the router source to our build environment
+COPY . .
+
+# Build and install the custom binary
+RUN cargo build --release
+
+# Make directories for config and schema
+RUN mkdir -p /dist/config && \
+    mkdir /dist/schema && \
+    mv target/release/router /dist
+
+# Copy configuration for docker image
+COPY router.yaml /dist/config.yaml
+
+FROM debian:bullseye-slim
+
+RUN apt-get update
+RUN apt-get -y install \
+    ca-certificates 
+
+# Set labels for our image
+LABEL org.opencontainers.image.authors="Apollo Graph, Inc. https://github.com/apollographql/router"
+LABEL org.opencontainers.image.source="https://github.com/apollographql/router"
+
+# Copy in the required files from our build image
+COPY --from=build --chown=root:root /dist /dist
+
+WORKDIR /dist
+
+ENV APOLLO_ROUTER_CONFIG_PATH="/dist/config.yaml"
+
+# Default executable is the router
+ENTRYPOINT ["/dist/router"]
diff --git a/apollo-router-scaffold/templates/base/README.md b/apollo-router-scaffold/templates/base/README.md
index 5fa2c3326e..98ec70eb24 100644
--- a/apollo-router-scaffold/templates/base/README.md
+++ b/apollo-router-scaffold/templates/base/README.md
@@ -81,3 +81,40 @@ Your release binary is now located in `target/release/router`
    cargo router plugin remove hello_world
    ```
 
+# Docker
+
+You can use the provided Dockerfile to build a release container.
+
+Make sure your router is configured to listen to `0.0.0.0` so you can query it from outside the container:
+
+```yml
+ supergraph:
+   listen: 0.0.0.0:4000
+```
+
+Use your `APOLLO_KEY` and `APOLLO_GRAPH_REF` environment variables to run the router in managed federation.
+
+   ```bash
+      docker build -t my_custom_router .
+      docker run -e APOLLO_KEY="your apollo key" -e APOLLO_GRAPH_REF="your apollo graph ref" -p 4000:4000 my_custom_router
+   ```
+
+Otherwise add a `COPY` step to the Dockerfile, and edit the entrypoint:
+
+```Dockerfile
+# Copy configuration for docker image
+COPY router.yaml /dist/config.yaml
+# Copy supergraph for docker image
+COPY my_supergraph.graphql /dist/supergraph.graphql
+
+# [...] and change the entrypoint
+
+# Default executable is the router
+ENTRYPOINT ["/dist/router", "-s", "/dist/supergraph.graphql"]
+```
+
+You can now build and run your custom router:
+   ```bash
+      docker build -t my_custom_router .
+      docker run -p 4000:4000 my_custom_router
+   ```
diff --git a/apollo-router-scaffold/templates/base/router.yaml b/apollo-router-scaffold/templates/base/router.yaml
index a4c05293c8..8411f80a8b 100644
--- a/apollo-router-scaffold/templates/base/router.yaml
+++ b/apollo-router-scaffold/templates/base/router.yaml
@@ -1,2 +1,5 @@
+# uncomment this section if you plan to use the Dockerfile
+# supergraph:
+#   listen: 0.0.0.0:4000
 plugins:
   # Add plugin configuration here
diff --git a/apollo-router-scaffold/templates/base/xtask/Cargo.toml b/apollo-router-scaffold/templates/base/xtask/Cargo.toml
index e175f61e76..bb0feddddf 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.6.0" }
+apollo-router-scaffold = { git="https://github.com/apollographql/router.git", tag = "v1.7.0" }
 {{/if}}
 {{/if}}
 anyhow = "1.0.58"
diff --git a/apollo-router-scaffold/templates/plugin/src/plugins/{{snake_name}}.rs b/apollo-router-scaffold/templates/plugin/src/plugins/{{snake_name}}.rs
index e6e97129c8..fa994f23c5 100644
--- a/apollo-router-scaffold/templates/plugin/src/plugins/{{snake_name}}.rs
+++ b/apollo-router-scaffold/templates/plugin/src/plugins/{{snake_name}}.rs
@@ -3,6 +3,7 @@ use apollo_router::plugin::PluginInit;
 use apollo_router::register_plugin;
 use apollo_router::services::supergraph;
 {{#if type_basic}}
+use apollo_router::services::router;
 use apollo_router::services::execution;
 use apollo_router::services::subgraph;
 {{/if}}
@@ -45,6 +46,22 @@ impl Plugin for {{pascal_name}} {
         Ok({{pascal_name}} { configuration: init.config })
     }
 
+    // Delete this function if you are not customizing it.
+    fn router_service(
+        &self,
+        service: router::BoxService,
+    ) -> router::BoxService {
+        // Always use service builder to compose your plugins.
+        // It provides off the shelf building blocks for your plugin.
+        //
+        // ServiceBuilder::new()
+        //             .service(service)
+        //             .boxed()
+
+        // Returning the original service means that we didn't add any extra functionality at this point in the lifecycle.
+        service
+    }
+
     // Delete this function if you are not customizing it.
     fn supergraph_service(
         &self,
@@ -147,6 +164,7 @@ register_plugin!("{{project_name}}", "{{snake_name}}", {{pascal_name}});
 mod tests {
     use apollo_router::TestHarness;
     use apollo_router::services::supergraph;
+    use apollo_router::graphql;
     use tower::BoxError;
     use tower::ServiceExt;
 
@@ -161,16 +179,17 @@ mod tests {
                 }
             }))
             .unwrap()
-            .build()
+            .build_router()
             .await
             .unwrap();
         let request = supergraph::Request::canned_builder().build().unwrap();
-        let mut streamed_response = test_harness.oneshot(request).await?;
+        let mut streamed_response = test_harness.oneshot(request.try_into()?).await?;
 
-        let first_response = streamed_response
-            .next_response()
-            .await
-            .expect("couldn't get primary response");
+        let first_response: graphql::Response =
+            serde_json::from_slice(streamed_response
+                .next_response()
+                .await
+                .expect("couldn't get primary response")?.to_vec().as_slice()).unwrap();
 
         assert!(first_response.data.is_some());
 
diff --git a/apollo-router/Cargo.toml b/apollo-router/Cargo.toml
index 30c2f59cc0..afd0f59091 100644
--- a/apollo-router/Cargo.toml
+++ b/apollo-router/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "apollo-router"
-version = "1.6.0"
+version = "1.7.0"
 authors = ["Apollo Graph, Inc. <packages@apollographql.com>"]
 repository = "https://github.com/apollographql/router/"
 documentation = "https://www.apollographql.com/docs/router/"
@@ -39,7 +39,7 @@ features = ["docs_rs"]
 
 [dependencies]
 access-json = "0.1.0"
-anyhow = "1.0.66"
+anyhow = "1.0.68"
 ansi_term = "0.12"
 apollo-parser = "0.4.0"
 arc-swap = "1.5.1"
@@ -53,13 +53,14 @@ async-trait = "0.1.59"
 atty = "0.2.14"
 axum = { version = "0.5.17", features = ["headers", "json", "original-uri"] }
 backtrace = "0.3.66"
-base64 = "0.13.1"
+base64 = "0.20.0"
 buildstructor = "0.5.1"
 bytes = "1.3.0"
-clap = { version = "3.2.23", default-features = false, features = [
+clap = { version = "4.0.29", default-features = false, features = [
     "env",
     "derive",
     "std",
+    "help",
 ] }
 console-subscriber = { version = "0.1.8", optional = true }
 dashmap = { version = "5.4.0", features = ["serde"] }
@@ -89,11 +90,12 @@ jsonschema = { version = "0.16.1", default-features = false }
 lazy_static = "1.4.0"
 libc = "0.2.138"
 linkme = "0.3.6"
-lru = "0.7.8"
+lru = "0.8.1"
 mediatype = "0.19.11"
 mockall = "0.11.3"
 miette = { version = "5.5.0", features = ["fancy"] }
 mime = "0.3.16"
+multer = "2.0.4"
 multimap = "0.8.3"
 # To avoid tokio issues
 notify = { version = "5.0.0", default-features = false, features=["macos_kqueue"] }
@@ -135,15 +137,15 @@ opentelemetry-zipkin = { version = "0.16.0", default-features = false, features
     "reqwest-rustls",
 ] }
 opentelemetry-prometheus = "0.11.0"
-paste = "1.0.10"
+paste = "1.0.11"
 pin-project-lite = "0.2.9"
 prometheus = "0.13"
-prost = "0.11.0"
+prost = "0.11.3"
 prost-types = "0.11.0"
 proteus = "0.5.0"
 rand = "0.8.5"
 rhai = { version = "1.11.0", features = ["sync", "serde", "internals"] }
-redis = { version = "0.21.6", optional = true, features = ["cluster", "tokio-comp"] }
+redis = { version = "0.21.7", optional = true, features = ["cluster", "tokio-comp"] }
 redis_cluster_async =  { version = "0.7.0", optional = true }
 regex = "1.7.0"
 reqwest = { version = "0.11.13", default-features = false, features = [
@@ -154,22 +156,24 @@ reqwest = { version = "0.11.13", default-features = false, features = [
 router-bridge = "0.1.12"
 rust-embed="6.4.2"
 schemars = { version = "0.8.11", features = ["url"] }
-shellexpand = "2.1.2"
+shellexpand = "3.0.0"
 sha2 = "0.10.6"
-serde = { version = "1.0.150", features = ["derive", "rc"] }
+serde = { version = "1.0.151", features = ["derive", "rc"] }
 serde_json_bytes = { version = "0.2.0", features = ["preserve_order"] }
-serde_json = { version = "1.0.89", features = ["preserve_order"] }
+serde_json = { version = "1.0.91", features = ["preserve_order"] }
 serde_urlencoded = "0.7.1"
 serde_yaml = "0.8.26"
 static_assertions = "1.1.0"
+strum_macros = "0.24.3"
 sys-info = "0.9.1"
-thiserror = "1.0.37"
+thiserror = "1.0.38"
 tokio = { version = "1.23.0", features = ["full"] }
 tokio-stream = { version = "0.1.11", features = ["sync", "net"] }
 tokio-util = { version = "0.7.4", features = ["net", "codec"] }
-tonic = { version = "0.8.2", features = ["transport", "tls", "tls-roots"] }
+tonic = { version = "0.8.2", features = ["transport", "tls", "tls-roots", "gzip"] }
 tower = { version = "0.4.13", features = ["full"] }
 tower-http = { version = "0.3.5", features = [
+    "add-extension",
     "trace",
     "cors",
     "compression-br",
@@ -191,6 +195,7 @@ urlencoding = "2.1.2"
 uuid = { version = "1.2.2", features = ["serde", "v4"] }
 yaml-rust = "0.4.5"
 askama = "0.11.1"
+heck = "0.4.0"
 apollo-encoder = "0.4.0"
 
 [target.'cfg(macos)'.dependencies]
@@ -201,7 +206,7 @@ uname = "0.1.1"
 
 [dev-dependencies]
 insta = { version = "1.23.0", features = ["json", "redactions", "yaml"] }
-introspector-gadget = "0.1.0"
+introspector-gadget = "0.2.0"
 maplit = "1.0.2"
 memchr = { version = "2.5.0", default-features = false }
 mockall = "0.11.3"
diff --git a/apollo-router/build/studio.rs b/apollo-router/build/studio.rs
index 6c4024b2c3..afeabdb0c6 100644
--- a/apollo-router/build/studio.rs
+++ b/apollo-router/build/studio.rs
@@ -8,8 +8,6 @@ pub fn main() -> Result<(), Box<dyn Error>> {
     let reports_src = proto_dir.join("reports.proto");
     let reports_out = out_dir.join("reports.proto");
 
-    println!("cargo:rerun-if-changed={}", reports_src.to_str().unwrap());
-
     // Process the retrieved content to:
     //  - Insert a package Report; line after the import lines (currently only one) and before the first message definition
     //  - Remove the Apollo TS extensions [(js_use_toArray)=true] and [(js_preEncoded)=true] from the file
@@ -19,13 +17,15 @@ pub fn main() -> Result<(), Box<dyn Error>> {
     let mut content = std::fs::read_to_string(&reports_src)?;
     let message = "\nmessage";
     let msg_index = content.find(message).ok_or("cannot find message string")?;
-    content.insert_str(msg_index, "\npackage Report;\n");
+    content.insert_str(msg_index, "\npackage Reports;\n");
     content = content.replace("[(js_use_toArray)=true]", "");
     content = content.replace("[(js_preEncoded)=true]", "");
     std::fs::write(&reports_out, &content)?;
 
+    println!("cargo:rerun-if-changed={}", reports_src.to_str().unwrap());
+
     // Process the proto files
-    let proto_files = [reports_out];
+
     tonic_build::configure()
         .field_attribute(
             "Trace.start_time",
@@ -49,7 +49,8 @@ pub fn main() -> Result<(), Box<dyn Error>> {
         )
         .type_attribute(".", "#[derive(serde::Serialize)]")
         .type_attribute("StatsContext", "#[derive(Eq, Hash)]")
-        .compile(&proto_files, &[&out_dir, &proto_dir])?;
+        .emit_rerun_if_changed(false)
+        .compile(&[reports_out],  &[&out_dir])?;
 
     Ok(())
 }
diff --git a/apollo-router/src/axum_factory/axum_http_server_factory.rs b/apollo-router/src/axum_factory/axum_http_server_factory.rs
index e6a370b81c..ebdfdd4c6f 100644
--- a/apollo-router/src/axum_factory/axum_http_server_factory.rs
+++ b/apollo-router/src/axum_factory/axum_http_server_factory.rs
@@ -1,13 +1,8 @@
 //! Axum http server factory. Axum provides routing capability on top of Hyper HTTP.
 use std::pin::Pin;
 use std::sync::Arc;
-use std::time::Duration;
 
-use axum::extract::rejection::JsonRejection;
 use axum::extract::Extension;
-use axum::extract::Host;
-use axum::extract::OriginalUri;
-use axum::http::header::HeaderMap;
 use axum::http::StatusCode;
 use axum::middleware;
 use axum::response::*;
@@ -33,37 +28,27 @@ use tower_http::compression::CompressionLayer;
 use tower_http::compression::DefaultPredicate;
 use tower_http::compression::Predicate;
 use tower_http::trace::TraceLayer;
-use tracing::Span;
 
-use super::handlers::handle_get;
-use super::handlers::handle_get_with_static;
-use super::handlers::handle_post;
 use super::listeners::ensure_endpoints_consistency;
 use super::listeners::ensure_listenaddrs_consistency;
 use super::listeners::extra_endpoints;
 use super::listeners::ListenersAndRouters;
-use super::utils::check_accept_header;
 use super::utils::decompress_request_body;
 use super::utils::PropagatingMakeSpan;
 use super::ListenAddrAndRouter;
 use crate::axum_factory::listeners::get_extra_listeners;
 use crate::axum_factory::listeners::serve_router_on_listen_addr;
-use crate::cache::DeduplicatingCache;
 use crate::configuration::Configuration;
-use crate::configuration::Homepage;
 use crate::configuration::ListenAddr;
-use crate::configuration::Sandbox;
-use crate::graphql;
 use crate::http_server_factory::HttpServerFactory;
 use crate::http_server_factory::HttpServerHandle;
 use crate::http_server_factory::Listener;
-use crate::plugins::telemetry::formatters::TRACE_ID_FIELD_NAME;
+use crate::plugins::traffic_shaping::Elapsed;
+use crate::plugins::traffic_shaping::RateLimited;
 use crate::router::ApolloRouterError;
 use crate::router_factory::Endpoint;
-use crate::router_factory::SupergraphServiceFactory;
-use crate::services::layers::apq::APQLayer;
-use crate::services::transport;
-use crate::tracer::TraceId;
+use crate::router_factory::RouterFactory;
+use crate::services::router;
 
 /// A basic http server using Axum.
 /// Uses streaming as primary method of response.
@@ -93,10 +78,9 @@ pub(crate) fn make_axum_router<RF>(
     service_factory: RF,
     configuration: &Configuration,
     mut endpoints: MultiMap<ListenAddr, Endpoint>,
-    apq: APQLayer,
 ) -> Result<ListenersAndRouters, ApolloRouterError>
 where
-    RF: SupergraphServiceFactory,
+    RF: RouterFactory,
 {
     ensure_listenaddrs_consistency(configuration, &endpoints)?;
 
@@ -107,16 +91,19 @@ where
         );
         endpoints.insert(
             configuration.health_check.listen.clone(),
-            Endpoint::new(
+            Endpoint::from_router_service(
                 "/health".to_string(),
-                service_fn(move |_req: transport::Request| {
+                service_fn(move |req: router::Request| {
                     let health = Health {
                         status: HealthStatus::Up,
                     };
-
                     async move {
-                        Ok(http::Response::builder()
-                            .body(serde_json::to_vec(&health).map_err(BoxError::from)?.into())?)
+                        Ok(router::Response {
+                            response: http::Response::builder().body::<hyper::Body>(
+                                serde_json::to_vec(&health).map_err(BoxError::from)?.into(),
+                            )?,
+                            context: req.context,
+                        })
                     }
                 })
                 .boxed(),
@@ -132,7 +119,6 @@ where
         endpoints
             .remove(&configuration.supergraph.listen)
             .unwrap_or_default(),
-        apq,
     )?;
     let mut extra_endpoints = extra_endpoints(endpoints);
 
@@ -161,19 +147,10 @@ impl HttpServerFactory for AxumHttpServerFactory {
         extra_endpoints: MultiMap<ListenAddr, Endpoint>,
     ) -> Self::Future
     where
-        RF: SupergraphServiceFactory,
+        RF: RouterFactory,
     {
         Box::pin(async move {
-            let apq = APQLayer::with_cache(
-                DeduplicatingCache::from_configuration(
-                    &configuration.supergraph.apq.experimental_cache,
-                    "APQ",
-                )
-                .await,
-            );
-
-            let all_routers =
-                make_axum_router(service_factory, &configuration, extra_endpoints, apq)?;
+            let all_routers = make_axum_router(service_factory, &configuration, extra_endpoints)?;
 
             // serve main router
 
@@ -296,38 +273,17 @@ fn main_endpoint<RF>(
     service_factory: RF,
     configuration: &Configuration,
     endpoints_on_main_listener: Vec<Endpoint>,
-    apq: APQLayer,
 ) -> Result<ListenAddrAndRouter, ApolloRouterError>
 where
-    RF: SupergraphServiceFactory,
+    RF: RouterFactory,
 {
     let cors = configuration.cors.clone().into_layer().map_err(|e| {
         ApolloRouterError::ServiceCreationError(format!("CORS configuration error: {e}").into())
     })?;
 
-    let main_route = main_router::<RF>(configuration, apq)
+    let main_route = main_router::<RF>(configuration)
         .layer(middleware::from_fn(decompress_request_body))
-        .layer(
-            TraceLayer::new_for_http()
-                .make_span_with(PropagatingMakeSpan::new())
-                .on_request(|_: &Request<_>, span: &Span| {
-                    let trace_id = TraceId::maybe_new()
-                        .map(|t| t.to_string())
-                        .unwrap_or_default();
-
-                    span.record(TRACE_ID_FIELD_NAME, trace_id.as_str());
-                })
-                .on_response(|resp: &Response<_>, duration: Duration, span: &Span| {
-                    // Duration here is instant based
-                    span.record("apollo_private.duration_ns", duration.as_nanos() as i64);
-                    // otel.status_code now has to be a string rather than enum. See opentelemetry_tracing::layer::str_to_status
-                    if resp.status() >= StatusCode::BAD_REQUEST {
-                        span.record("otel.status_code", "error");
-                    } else {
-                        span.record("otel.status_code", "ok");
-                    }
-                }),
-        )
+        .layer(TraceLayer::new_for_http().make_span_with(PropagatingMakeSpan::default()))
         .layer(Extension(service_factory))
         .layer(cors)
         // Compress the response body, except for multipart responses such as with `@defer`.
@@ -344,9 +300,9 @@ where
     Ok(ListenAddrAndRouter(listener, route))
 }
 
-pub(super) fn main_router<RF>(configuration: &Configuration, apq: APQLayer) -> axum::Router
+pub(super) fn main_router<RF>(configuration: &Configuration) -> axum::Router
 where
-    RF: SupergraphServiceFactory,
+    RF: RouterFactory,
 {
     let mut graphql_configuration = configuration.supergraph.clone();
     if graphql_configuration.path.ends_with("/*") {
@@ -354,60 +310,42 @@ where
         graphql_configuration.path = format!("{}router_extra_path", graphql_configuration.path);
     }
 
-    let apq2 = apq.clone();
-    let get_handler = if configuration.sandbox.enabled {
-        get({
-            move |host: Host, Extension(service): Extension<RF>, http_request: Request<Body>| {
-                handle_get_with_static(
-                    Sandbox::display_page(),
-                    host,
-                    apq2,
-                    service.new_service().boxed(),
-                    http_request,
-                )
-            }
-        })
-    } else if configuration.homepage.enabled {
+    Router::<hyper::Body>::new().route(
+        &graphql_configuration.path,
         get({
-            move |host: Host, Extension(service): Extension<RF>, http_request: Request<Body>| {
-                handle_get_with_static(
-                    Homepage::display_page(),
-                    host,
-                    apq2,
-                    service.new_service().boxed(),
-                    http_request,
-                )
+            move |Extension(service): Extension<RF>, request: Request<Body>| {
+                handle_graphql(service.create().boxed(), request)
             }
         })
-    } else {
-        get({
-            move |host: Host, Extension(service): Extension<RF>, http_request: Request<Body>| {
-                handle_get(host, apq2, service.new_service().boxed(), http_request)
+        .post({
+            move |Extension(service): Extension<RF>, request: Request<Body>| {
+                handle_graphql(service.create().boxed(), request)
             }
-        })
-    };
+        }),
+    )
+}
 
-    Router::<hyper::Body>::new().route(
-        &graphql_configuration.path,
-        get_handler
-            .post({
-                move |host: Host,
-                      uri: OriginalUri,
-                      request: Result<Json<graphql::Request>, JsonRejection>,
-                      Extension(service): Extension<RF>,
-                      header_map: HeaderMap| {
-                    {
-                        handle_post(
-                            host,
-                            uri,
-                            request,
-                            apq,
-                            service.new_service().boxed(),
-                            header_map,
-                        )
-                    }
+async fn handle_graphql(
+    service: router::BoxService,
+    http_request: Request<Body>,
+) -> impl IntoResponse {
+    match service.oneshot(http_request.into()).await {
+        Err(e) => {
+            if let Some(source_err) = e.source() {
+                if source_err.is::<RateLimited>() {
+                    return RateLimited::new().into_response();
                 }
-            })
-            .layer(middleware::from_fn(check_accept_header)),
-    )
+                if source_err.is::<Elapsed>() {
+                    return Elapsed::new().into_response();
+                }
+            }
+            tracing::error!("router service call failed: {}", e);
+            (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                "router service call failed",
+            )
+                .into_response()
+        }
+        Ok(response) => response.response.into_response(),
+    }
 }
diff --git a/apollo-router/src/axum_factory/handlers.rs b/apollo-router/src/axum_factory/handlers.rs
deleted file mode 100644
index 8e48480b01..0000000000
--- a/apollo-router/src/axum_factory/handlers.rs
+++ /dev/null
@@ -1,293 +0,0 @@
-//! Http handlers
-use std::str::FromStr;
-
-use axum::body::StreamBody;
-use axum::extract::rejection::JsonRejection;
-use axum::extract::Host;
-use axum::extract::OriginalUri;
-use axum::http::header::HeaderMap;
-use axum::http::StatusCode;
-use axum::response::*;
-use bytes::Bytes;
-use futures::future::ready;
-use futures::stream::once;
-use futures::StreamExt;
-use http::header::CONTENT_TYPE;
-use http::HeaderValue;
-use http::Request;
-use http::Uri;
-use hyper::Body;
-use tower::util::BoxService;
-use tower::BoxError;
-use tower::ServiceExt;
-use tower_service::Service;
-
-use super::utils::accepts_json;
-use super::utils::accepts_multipart;
-use super::utils::accepts_wildcard;
-use super::utils::prefers_html;
-use super::utils::process_vary_header;
-use super::utils::APPLICATION_JSON_HEADER_VALUE;
-use super::utils::GRAPHQL_JSON_RESPONSE_HEADER_VALUE;
-use crate::graphql;
-use crate::http_ext;
-use crate::plugins::traffic_shaping::Elapsed;
-use crate::plugins::traffic_shaping::RateLimited;
-use crate::services::layers::apq::APQLayer;
-use crate::services::MULTIPART_DEFER_CONTENT_TYPE;
-use crate::SupergraphRequest;
-use crate::SupergraphResponse;
-
-pub(super) async fn handle_get_with_static(
-    static_page: Bytes,
-    Host(host): Host,
-    apq: APQLayer,
-    service: BoxService<SupergraphRequest, SupergraphResponse, BoxError>,
-    http_request: Request<Body>,
-) -> impl IntoResponse {
-    if prefers_html(http_request.headers()) {
-        return Html(static_page).into_response();
-    }
-
-    if let Some(request) = http_request
-        .uri()
-        .query()
-        .and_then(|q| graphql::Request::from_urlencoded_query(q.to_string()).ok())
-    {
-        let mut http_request = http_request.map(|_| request);
-        *http_request.uri_mut() = Uri::from_str(&format!("http://{}{}", host, http_request.uri()))
-            .expect("the URL is already valid because it comes from axum; qed");
-        return run_graphql_request(service, apq, http_request)
-            .await
-            .into_response();
-    }
-
-    (StatusCode::BAD_REQUEST, "Invalid GraphQL request").into_response()
-}
-
-pub(super) async fn handle_get(
-    Host(host): Host,
-    apq: APQLayer,
-    service: BoxService<SupergraphRequest, SupergraphResponse, BoxError>,
-    http_request: Request<Body>,
-) -> impl IntoResponse {
-    if let Some(request) = http_request
-        .uri()
-        .query()
-        .and_then(|q| graphql::Request::from_urlencoded_query(q.to_string()).ok())
-    {
-        let mut http_request = http_request.map(|_| request);
-        *http_request.uri_mut() = Uri::from_str(&format!("http://{}{}", host, http_request.uri()))
-            .expect("the URL is already valid because it comes from axum; qed");
-        return run_graphql_request(service, apq, http_request)
-            .await
-            .into_response();
-    }
-
-    ::tracing::error!(
-        monotonic_counter.apollo_router_http_requests_total = 1u64,
-        status = %400,
-        error = "missing query string",
-        "missing query string"
-    );
-    (StatusCode::BAD_REQUEST, "Invalid Graphql request").into_response()
-}
-
-pub(super) async fn handle_post(
-    Host(host): Host,
-    OriginalUri(uri): OriginalUri,
-    request_json: Result<Json<graphql::Request>, JsonRejection>,
-    apq: APQLayer,
-    service: BoxService<SupergraphRequest, SupergraphResponse, BoxError>,
-    header_map: HeaderMap,
-) -> impl IntoResponse {
-    let request = match request_json {
-        Ok(Json(req)) => req,
-        Err(json_err) => {
-            let json_err = json_err.into_response();
-            ::tracing::error!(
-                monotonic_counter.apollo_router_http_requests_total = 1u64,
-                status = %json_err.status().as_u16(),
-                error = "failed to parse the request body as JSON",
-                "failed to parse the request body as JSON"
-            );
-
-            return json_err;
-        }
-    };
-
-    let mut http_request = Request::post(
-        Uri::from_str(&format!("http://{}{}", host, uri))
-            .expect("the URL is already valid because it comes from axum; qed"),
-    )
-    .body(request)
-    .expect("body has already been parsed; qed");
-    *http_request.headers_mut() = header_map;
-
-    run_graphql_request(service, apq, http_request)
-        .await
-        .into_response()
-}
-
-async fn run_graphql_request<RS>(
-    service: RS,
-    apq: APQLayer,
-    http_request: Request<graphql::Request>,
-) -> impl IntoResponse
-where
-    RS: Service<SupergraphRequest, Response = SupergraphResponse, Error = BoxError> + Send,
-{
-    let (head, body) = http_request.into_parts();
-    let mut req: SupergraphRequest = Request::from_parts(head, body).into();
-    req = match apq.apq_request(req).await {
-        Ok(req) => req,
-        Err(res) => {
-            let (parts, mut stream) = res.response.into_parts();
-
-            return match stream.next().await {
-                None => {
-                    tracing::error!(
-                        monotonic_counter.apollo_router_http_requests_total = 1u64,
-                        status = %StatusCode::SERVICE_UNAVAILABLE.as_u16(),
-                        "router service is not available to process request"
-                    );
-                    (
-                        StatusCode::SERVICE_UNAVAILABLE,
-                        "router service is not available to process request",
-                    )
-                        .into_response()
-                }
-                Some(body) => {
-                    tracing::info!(monotonic_counter.apollo_router_http_requests_total = 1u64);
-                    http_ext::Response::from(http::Response::from_parts(parts, body))
-                        .into_response()
-                }
-            };
-        }
-    };
-
-    match service.ready_oneshot().await {
-        Ok(mut service) => {
-            let accepts_multipart = accepts_multipart(req.supergraph_request.headers());
-            let accepts_json = accepts_json(req.supergraph_request.headers());
-            let accepts_wildcard = accepts_wildcard(req.supergraph_request.headers());
-
-            match service.call(req).await {
-                Err(e) => {
-                    if let Some(source_err) = e.source() {
-                        if source_err.is::<RateLimited>() {
-                            return RateLimited::new().into_response();
-                        }
-                        if source_err.is::<Elapsed>() {
-                            return Elapsed::new().into_response();
-                        }
-                    }
-                    tracing::error!("router service call failed: {}", e);
-                    (
-                        StatusCode::INTERNAL_SERVER_ERROR,
-                        "router service call failed",
-                    )
-                        .into_response()
-                }
-                Ok(response) => {
-                    let (mut parts, mut stream) = response.response.into_parts();
-
-                    process_vary_header(&mut parts.headers);
-
-                    match stream.next().await {
-                        None => {
-                            tracing::error!("router service is not available to process request",);
-                            (
-                                StatusCode::SERVICE_UNAVAILABLE,
-                                "router service is not available to process request",
-                            )
-                                .into_response()
-                        }
-                        Some(response) => {
-                            if !response.has_next.unwrap_or(false)
-                                && (accepts_json || accepts_wildcard)
-                            {
-                                parts.headers.insert(
-                                    CONTENT_TYPE,
-                                    HeaderValue::from_static("application/json"),
-                                );
-                                tracing::trace_span!("serialize_response").in_scope(|| {
-                                    http_ext::Response::from(http::Response::from_parts(
-                                        parts, response,
-                                    ))
-                                    .into_response()
-                                })
-                            } else if accepts_multipart {
-                                parts.headers.insert(
-                                    CONTENT_TYPE,
-                                    HeaderValue::from_static(MULTIPART_DEFER_CONTENT_TYPE),
-                                );
-
-                                // each chunk contains a response and the next delimiter, to let client parsers
-                                // know that they can process the response right away
-                                let mut first_buf = Vec::from(
-                                    &b"\r\n--graphql\r\ncontent-type: application/json\r\n\r\n"[..],
-                                );
-                                serde_json::to_writer(&mut first_buf, &response).unwrap();
-                                if response.has_next.unwrap_or(false) {
-                                    first_buf.extend_from_slice(b"\r\n--graphql\r\n");
-                                } else {
-                                    first_buf.extend_from_slice(b"\r\n--graphql--\r\n");
-                                }
-
-                                let body = once(ready(Ok(Bytes::from(first_buf)))).chain(
-                                    stream.map(|res| {
-                                        let mut buf = Vec::from(
-                                            &b"content-type: application/json\r\n\r\n"[..],
-                                        );
-                                        serde_json::to_writer(&mut buf, &res).unwrap();
-
-                                        // the last chunk has a different end delimiter
-                                        if res.has_next.unwrap_or(false) {
-                                            buf.extend_from_slice(b"\r\n--graphql\r\n");
-                                        } else {
-                                            buf.extend_from_slice(b"\r\n--graphql--\r\n");
-                                        }
-
-                                        Ok::<_, BoxError>(buf.into())
-                                    }),
-                                );
-
-                                (parts, StreamBody::new(body)).into_response()
-                            } else {
-                                // this should be unreachable due to a previous check, but just to be sure...
-                                (
-                                    StatusCode::NOT_ACCEPTABLE,
-                                    format!(
-                                        r#"'accept' header can't be different than \"*/*\", {:?}, {:?} or {:?}"#,
-                                        APPLICATION_JSON_HEADER_VALUE,
-                                        GRAPHQL_JSON_RESPONSE_HEADER_VALUE,
-                                        MULTIPART_DEFER_CONTENT_TYPE
-                                    ),
-                                )
-                                    .into_response()
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        Err(e) => {
-            tracing::error!("router service is not available to process request: {}", e);
-            if let Some(source_err) = e.source() {
-                if source_err.is::<RateLimited>() {
-                    return RateLimited::new().into_response();
-                }
-                if source_err.is::<Elapsed>() {
-                    return Elapsed::new().into_response();
-                }
-            }
-
-            (
-                StatusCode::SERVICE_UNAVAILABLE,
-                "router service is not available to process request",
-            )
-                .into_response()
-        }
-    }
-}
diff --git a/apollo-router/src/axum_factory/listeners.rs b/apollo-router/src/axum_factory/listeners.rs
index 5e664e5bdc..726d6bec9d 100644
--- a/apollo-router/src/axum_factory/listeners.rs
+++ b/apollo-router/src/axum_factory/listeners.rs
@@ -367,18 +367,22 @@ mod tests {
 
     use super::*;
     use crate::axum_factory::tests::init_with_config;
-    use crate::axum_factory::tests::MockSupergraphService;
     use crate::configuration::Sandbox;
     use crate::configuration::Supergraph;
-    use crate::services::transport;
+    use crate::services::router;
+    use crate::services::router_service;
 
     #[tokio::test]
     async fn it_makes_sure_same_listenaddrs_are_accepted() {
         let configuration = Configuration::fake_builder().build().unwrap();
 
-        init_with_config(MockSupergraphService::new(), configuration, MultiMap::new())
-            .await
-            .unwrap();
+        init_with_config(
+            router_service::empty().await,
+            Arc::new(configuration),
+            MultiMap::new(),
+        )
+        .await
+        .unwrap();
     }
 
     #[tokio::test]
@@ -393,24 +397,29 @@ mod tests {
             .build()
             .unwrap();
 
-        let endpoint = service_fn(|_req: transport::Request| async move {
-            Ok::<_, BoxError>(
-                http::Response::builder()
-                    .body("this is a test".to_string().into())
+        let endpoint = service_fn(|req: router::Request| async move {
+            Ok::<_, BoxError>(router::Response {
+                response: http::Response::builder()
+                    .body::<hyper::Body>("this is a test".to_string().into())
                     .unwrap(),
-            )
+                context: req.context,
+            })
         })
         .boxed();
 
         let mut web_endpoints = MultiMap::new();
         web_endpoints.insert(
             SocketAddr::from_str("0.0.0.0:4010").unwrap().into(),
-            Endpoint::new("/".to_string(), endpoint),
+            Endpoint::from_router_service("/".to_string(), endpoint),
         );
 
-        let error = init_with_config(MockSupergraphService::new(), configuration, web_endpoints)
-            .await
-            .unwrap_err();
+        let error = init_with_config(
+            router_service::empty().await,
+            Arc::new(configuration),
+            web_endpoints,
+        )
+        .await
+        .unwrap_err();
         assert_eq!(
             "tried to bind 127.0.0.1 and 0.0.0.0 on port 4010",
             error.to_string()
@@ -427,22 +436,23 @@ mod tests {
             )
             .build()
             .unwrap();
-        let endpoint = service_fn(|_req: transport::Request| async move {
-            Ok::<_, BoxError>(
-                http::Response::builder()
-                    .body("this is a test".to_string().into())
+        let endpoint = service_fn(|req: router::Request| async move {
+            Ok::<_, BoxError>(router::Response {
+                response: http::Response::builder()
+                    .body::<hyper::Body>("this is a test".to_string().into())
                     .unwrap(),
-            )
+                context: req.context,
+            })
         })
         .boxed();
 
         let mut mm = MultiMap::new();
         mm.insert(
             SocketAddr::from_str("127.0.0.1:4010").unwrap().into(),
-            Endpoint::new("/".to_string(), endpoint),
+            Endpoint::from_router_service("/".to_string(), endpoint),
         );
 
-        let error = init_with_config(MockSupergraphService::new(), configuration, mm)
+        let error = init_with_config(router_service::empty().await, Arc::new(configuration), mm)
             .await
             .unwrap_err();
 
diff --git a/apollo-router/src/axum_factory/mod.rs b/apollo-router/src/axum_factory/mod.rs
index 158bd34a7b..5f6668794d 100644
--- a/apollo-router/src/axum_factory/mod.rs
+++ b/apollo-router/src/axum_factory/mod.rs
@@ -1,9 +1,8 @@
 //! axum factory is useful to create an [`AxumHttpServerFactory`] which implements [`crate::http_server_factory::HttpServerFactory`]
 mod axum_http_server_factory;
-mod handlers;
 mod listeners;
 #[cfg(test)]
-mod tests;
+pub(crate) mod tests;
 pub(crate) mod utils;
 
 pub(crate) use axum_http_server_factory::make_axum_router;
diff --git a/apollo-router/src/axum_factory/snapshots/apollo_router__axum_factory__tests__defer_is_not_buffered.snap b/apollo-router/src/axum_factory/snapshots/apollo_router__axum_factory__tests__defer_is_not_buffered.snap
index 166a799aa1..b1ed456e61 100644
--- a/apollo-router/src/axum_factory/snapshots/apollo_router__axum_factory__tests__defer_is_not_buffered.snap
+++ b/apollo-router/src/axum_factory/snapshots/apollo_router__axum_factory__tests__defer_is_not_buffered.snap
@@ -1,6 +1,6 @@
 ---
 source: apollo-router/src/axum_factory/tests.rs
-expression: "json!([{\n        \"data\" :\n        {\n            \"topProducts\" :\n            [{ \"upc\" : \"1\", \"name\" : \"Table\", \"reviews\" : null },\n            { \"upc\" : \"2\", \"name\" : \"Couch\", \"reviews\" : null }]\n        }, \"errors\" :\n        [{\n            \"message\" :\n            \"couldn't find mock for query {\\\"query\\\":\\\"query TopProducts__reviews__1($representations:[_Any!]!){_entities(representations:$representations){...on Product{reviews{__typename id product{__typename upc}}}}}\\\",\\\"operationName\\\":\\\"TopProducts__reviews__1\\\",\\\"variables\\\":{\\\"representations\\\":[{\\\"__typename\\\":\\\"Product\\\",\\\"upc\\\":\\\"1\\\"},{\\\"__typename\\\":\\\"Product\\\",\\\"upc\\\":\\\"2\\\"}]}}\"\n        },\n        {\n            \"message\" :\n            \"Subgraph response from 'reviews' was missing key `_entities`\",\n            \"path\" : [\"topProducts\", \"@\"]\n        }], \"hasNext\" : true,\n    }, { \"hasNext\" : false }])"
+expression: parts
 ---
 [
   {
@@ -20,14 +20,20 @@ expression: "json!([{\n        \"data\" :\n        {\n            \"topProducts\
     },
     "errors": [
       {
-        "message": "couldn't find mock for query {\"query\":\"query TopProducts__reviews__1($representations:[_Any!]!){_entities(representations:$representations){...on Product{reviews{__typename id product{__typename upc}}}}}\",\"operationName\":\"TopProducts__reviews__1\",\"variables\":{\"representations\":[{\"__typename\":\"Product\",\"upc\":\"1\"},{\"__typename\":\"Product\",\"upc\":\"2\"}]}}"
+        "message": "couldn't find mock for query {\"query\":\"query TopProducts__reviews__1($representations:[_Any!]!){_entities(representations:$representations){...on Product{reviews{__typename id product{__typename upc}}}}}\",\"operationName\":\"TopProducts__reviews__1\",\"variables\":{\"representations\":[{\"__typename\":\"Product\",\"upc\":\"1\"},{\"__typename\":\"Product\",\"upc\":\"2\"}]}}",
+        "extensions": {
+          "code": "FETCH_ERROR"
+        }
       },
       {
         "message": "Subgraph response from 'reviews' was missing key `_entities`",
         "path": [
           "topProducts",
           "@"
-        ]
+        ],
+        "extensions": {
+          "code": "PARSE_ERROR"
+        }
       }
     ],
     "hasNext": true
diff --git a/apollo-router/src/axum_factory/tests.rs b/apollo-router/src/axum_factory/tests.rs
index d2cbed288c..1509051e1a 100644
--- a/apollo-router/src/axum_factory/tests.rs
+++ b/apollo-router/src/axum_factory/tests.rs
@@ -9,8 +9,10 @@ use std::sync::Arc;
 use async_compression::tokio::write::GzipDecoder;
 use async_compression::tokio::write::GzipEncoder;
 use axum::body::BoxBody;
+use futures::future::BoxFuture;
 use futures::stream;
 use futures::stream::poll_fn;
+use futures::Future;
 use futures::StreamExt;
 use http::header::ACCEPT_ENCODING;
 use http::header::CONTENT_ENCODING;
@@ -19,6 +21,7 @@ use http::header::{self};
 use http::HeaderMap;
 use http::HeaderValue;
 use http_body::Body;
+use mime::APPLICATION_JSON;
 use mockall::mock;
 use multimap::MultiMap;
 use reqwest::header::ACCEPT;
@@ -45,6 +48,7 @@ use tower::BoxError;
 use tower::Service;
 use tower::ServiceExt;
 
+pub(crate) use super::axum_http_server_factory::make_axum_router;
 use super::*;
 use crate::configuration::cors::Cors;
 use crate::configuration::HealthCheck;
@@ -52,15 +56,18 @@ use crate::configuration::Homepage;
 use crate::configuration::Sandbox;
 use crate::configuration::Supergraph;
 use crate::graphql;
-use crate::http_ext;
 use crate::http_server_factory::HttpServerFactory;
 use crate::http_server_factory::HttpServerHandle;
 use crate::json_ext::Path;
 use crate::router_factory::Endpoint;
-use crate::router_factory::SupergraphServiceFactory;
-use crate::services::new_service::NewService;
-use crate::services::transport;
-use crate::services::SupergraphRequest;
+use crate::router_factory::RouterFactory;
+use crate::services::layers::static_page::home_page_content;
+use crate::services::layers::static_page::sandbox_page_content;
+use crate::services::new_service::ServiceFactory;
+use crate::services::router;
+use crate::services::router_service;
+use crate::services::RouterRequest;
+use crate::services::RouterResponse;
 use crate::services::SupergraphResponse;
 use crate::services::MULTIPART_DEFER_CONTENT_TYPE;
 use crate::test_harness::http_client;
@@ -112,47 +119,54 @@ macro_rules! assert_header_contains {
 
 mock! {
     #[derive(Debug)]
-    pub(super) SupergraphService {
-        fn service_call(&mut self, req: SupergraphRequest) -> Result<SupergraphResponse, BoxError>;
+    pub(super) RouterService {
+        fn service_call(&mut self, req: RouterRequest) -> impl Future<Output = Result<RouterResponse, BoxError>> + Send + 'static;
     }
 }
 
-type MockSupergraphServiceType = tower_test::mock::Mock<SupergraphRequest, SupergraphResponse>;
+type MockRouterServiceType = tower_test::mock::Mock<RouterRequest, RouterResponse>;
 
 #[derive(Clone)]
-struct TestSupergraphServiceFactory {
-    inner: MockSupergraphServiceType,
+struct TestRouterFactory {
+    inner: MockRouterServiceType,
 }
 
-impl NewService<SupergraphRequest> for TestSupergraphServiceFactory {
-    type Service = MockSupergraphServiceType;
+impl ServiceFactory<router::Request> for TestRouterFactory {
+    type Service = MockRouterServiceType;
 
-    fn new_service(&self) -> Self::Service {
+    fn create(&self) -> Self::Service {
         self.inner.clone()
     }
 }
 
-impl SupergraphServiceFactory for TestSupergraphServiceFactory {
-    type SupergraphService = MockSupergraphServiceType;
+impl RouterFactory for TestRouterFactory {
+    type RouterService = MockRouterServiceType;
 
-    type Future =
-        <<TestSupergraphServiceFactory as NewService<SupergraphRequest>>::Service as Service<
-            SupergraphRequest,
-        >>::Future;
+    type Future = <<TestRouterFactory as ServiceFactory<router::Request>>::Service as Service<
+        router::Request,
+    >>::Future;
 
     fn web_endpoints(&self) -> MultiMap<ListenAddr, Endpoint> {
         MultiMap::new()
     }
 }
 
-async fn init(mut mock: MockSupergraphService) -> (HttpServerHandle, Client) {
+async fn init(
+    mut mock: impl Service<
+            router::Request,
+            Response = router::Response,
+            Error = BoxError,
+            Future = BoxFuture<'static, router::ServiceResult>,
+        > + Send
+        + 'static,
+) -> (HttpServerHandle, Client) {
     let server_factory = AxumHttpServerFactory::new();
     let (service, mut handle) = tower_test::mock::spawn();
 
     tokio::spawn(async move {
         loop {
             while let Some((request, responder)) = handle.next_request().await {
-                match mock.service_call(request) {
+                match mock.ready().await.unwrap().call(request).await {
                     Ok(response) => responder.send_response(response),
                     Err(err) => responder.send_error(err),
                 }
@@ -161,7 +175,7 @@ async fn init(mut mock: MockSupergraphService) -> (HttpServerHandle, Client) {
     });
     let server = server_factory
         .create(
-            TestSupergraphServiceFactory {
+            TestRouterFactory {
                 inner: service.into_inner(),
             },
             Arc::new(
@@ -191,8 +205,14 @@ async fn init(mut mock: MockSupergraphService) -> (HttpServerHandle, Client) {
         .await
         .expect("Failed to create server factory");
     let mut default_headers = HeaderMap::new();
-    default_headers.insert(CONTENT_TYPE, HeaderValue::from_static("application/json"));
-    default_headers.insert(ACCEPT, HeaderValue::from_static("application/json"));
+    default_headers.insert(
+        CONTENT_TYPE,
+        HeaderValue::from_static(APPLICATION_JSON.essence_str()),
+    );
+    default_headers.insert(
+        ACCEPT,
+        HeaderValue::from_static(APPLICATION_JSON.essence_str()),
+    );
 
     let client = reqwest::Client::builder()
         .default_headers(default_headers)
@@ -203,8 +223,14 @@ async fn init(mut mock: MockSupergraphService) -> (HttpServerHandle, Client) {
 }
 
 pub(super) async fn init_with_config(
-    mut mock: MockSupergraphService,
-    conf: Configuration,
+    mut router_service: impl Service<
+            router::Request,
+            Response = router::Response,
+            Error = BoxError,
+            Future = BoxFuture<'static, router::ServiceResult>,
+        > + Send
+        + 'static,
+    conf: Arc<Configuration>,
     web_endpoints: MultiMap<ListenAddr, Endpoint>,
 ) -> Result<(HttpServerHandle, Client), ApolloRouterError> {
     let server_factory = AxumHttpServerFactory::new();
@@ -213,7 +239,7 @@ pub(super) async fn init_with_config(
     tokio::spawn(async move {
         loop {
             while let Some((request, responder)) = handle.next_request().await {
-                match mock.service_call(request) {
+                match router_service.ready().await.unwrap().call(request).await {
                     Ok(response) => responder.send_response(response),
                     Err(err) => responder.send_error(err),
                 }
@@ -222,18 +248,24 @@ pub(super) async fn init_with_config(
     });
     let server = server_factory
         .create(
-            TestSupergraphServiceFactory {
+            TestRouterFactory {
                 inner: service.into_inner(),
             },
-            Arc::new(conf),
+            conf,
             None,
             vec![],
             web_endpoints,
         )
         .await?;
     let mut default_headers = HeaderMap::new();
-    default_headers.insert(CONTENT_TYPE, HeaderValue::from_static("application/json"));
-    default_headers.insert(ACCEPT, HeaderValue::from_static("application/json"));
+    default_headers.insert(
+        CONTENT_TYPE,
+        HeaderValue::from_static(APPLICATION_JSON.essence_str()),
+    );
+    default_headers.insert(
+        ACCEPT,
+        HeaderValue::from_static(APPLICATION_JSON.essence_str()),
+    );
 
     let client = reqwest::Client::builder()
         .default_headers(default_headers)
@@ -245,7 +277,13 @@ pub(super) async fn init_with_config(
 
 #[cfg(unix)]
 async fn init_unix(
-    mut mock: MockSupergraphService,
+    mut mock: impl Service<
+            router::Request,
+            Response = router::Response,
+            Error = BoxError,
+            Future = BoxFuture<'static, router::ServiceResult>,
+        > + Send
+        + 'static,
     temp_dir: &tempfile::TempDir,
 ) -> HttpServerHandle {
     let server_factory = AxumHttpServerFactory::new();
@@ -254,7 +292,7 @@ async fn init_unix(
     tokio::spawn(async move {
         loop {
             while let Some((request, responder)) = handle.next_request().await {
-                match mock.service_call(request) {
+                match mock.ready().await.unwrap().call(request).await {
                     Ok(response) => responder.send_response(response),
                     Err(err) => responder.send_error(err),
                 }
@@ -264,7 +302,7 @@ async fn init_unix(
 
     server_factory
         .create(
-            TestSupergraphServiceFactory {
+            TestRouterFactory {
                 inner: service.into_inner(),
             },
             Arc::new(
@@ -286,17 +324,27 @@ async fn init_unix(
 }
 
 #[tokio::test]
-async fn it_displays_sandbox() -> Result<(), ApolloRouterError> {
-    let expectations = MockSupergraphService::new();
+async fn it_displays_sandbox() {
+    let conf = Arc::new(
+        Configuration::fake_builder()
+            .sandbox(Sandbox::fake_builder().enabled(true).build())
+            .homepage(Homepage::fake_builder().enabled(false).build())
+            .supergraph(Supergraph::fake_builder().introspection(true).build())
+            .build()
+            .unwrap(),
+    );
 
-    let conf = Configuration::fake_builder()
-        .sandbox(Sandbox::fake_builder().enabled(true).build())
-        .homepage(Homepage::fake_builder().enabled(false).build())
-        .supergraph(Supergraph::fake_builder().introspection(true).build())
-        .build()
-        .unwrap();
+    let router_service = router_service::from_supergraph_mock_callback_and_configuration(
+        move |_| {
+            panic!("this should never be called");
+        },
+        conf.clone(),
+    )
+    .await;
 
-    let (server, client) = init_with_config(expectations, conf, MultiMap::new()).await?;
+    let (server, client) = init_with_config(router_service, conf, MultiMap::new())
+        .await
+        .unwrap();
 
     // Regular studio redirect
     let response = client
@@ -314,29 +362,36 @@ async fn it_displays_sandbox() -> Result<(), ApolloRouterError> {
         "{}",
         response.text().await.unwrap()
     );
-    assert_eq!(response.bytes().await.unwrap(), Sandbox::display_page());
-
-    Ok(())
+    assert_eq!(response.text().await.unwrap(), sandbox_page_content());
 }
 
 #[tokio::test]
-async fn it_displays_sandbox_with_different_supergraph_path() -> Result<(), ApolloRouterError> {
-    let expectations = MockSupergraphService::new();
+async fn it_displays_sandbox_with_different_supergraph_path() {
+    let conf = Arc::new(
+        Configuration::fake_builder()
+            .sandbox(Sandbox::fake_builder().enabled(true).build())
+            .homepage(Homepage::fake_builder().enabled(false).build())
+            .supergraph(
+                Supergraph::fake_builder()
+                    .introspection(true)
+                    .path("/custom")
+                    .build(),
+            )
+            .build()
+            .unwrap(),
+    );
 
-    let conf = Configuration::fake_builder()
-        .sandbox(Sandbox::fake_builder().enabled(true).build())
-        .homepage(Homepage::fake_builder().enabled(false).build())
-        .supergraph(
-            Supergraph::fake_builder()
-                .introspection(true)
-                .path("/custom")
-                .build(),
-        )
-        .build()
+    let router_service = router_service::from_supergraph_mock_callback_and_configuration(
+        move |_| {
+            panic!("this should never be called");
+        },
+        conf.clone(),
+    )
+    .await;
+    let (server, client) = init_with_config(router_service, conf, MultiMap::new())
+        .await
         .unwrap();
 
-    let (server, client) = init_with_config(expectations, conf, MultiMap::new()).await?;
-
     // Regular studio redirect
     let response = client
         .get(&format!(
@@ -353,9 +408,7 @@ async fn it_displays_sandbox_with_different_supergraph_path() -> Result<(), Apol
         "{}",
         response.text().await.unwrap()
     );
-    assert_eq!(response.bytes().await.unwrap(), Sandbox::display_page());
-
-    Ok(())
+    assert_eq!(response.text().await.unwrap(), sandbox_page_content());
 }
 
 #[tokio::test]
@@ -364,18 +417,16 @@ async fn it_compress_response_body() -> Result<(), ApolloRouterError> {
         .data(json!({"response": "yayyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy"})) // Body must be bigger than 32 to be compressed
         .build();
     let example_response = expected_response.clone();
-    let mut expectations = MockSupergraphService::new();
-    expectations
-        .expect_service_call()
-        .times(2)
-        .returning(move |_req| {
-            let example_response = example_response.clone();
-            Ok(SupergraphResponse::new_from_graphql_response(
-                example_response,
-                Context::new(),
-            ))
-        });
-    let (server, client) = init(expectations).await;
+    let router_service = router_service::from_supergraph_mock_callback(move |req| {
+        let example_response = example_response.clone();
+
+        Ok(SupergraphResponse::new_from_graphql_response(
+            example_response,
+            req.context,
+        ))
+    })
+    .await;
+    let (server, client) = init(router_service).await;
     let url = format!("{}/", server.graphql_listen_address().as_ref().unwrap());
 
     // Post query
@@ -415,7 +466,7 @@ async fn it_compress_response_body() -> Result<(), ApolloRouterError> {
 
     assert_eq!(
         response.headers().get(header::CONTENT_TYPE),
-        Some(&HeaderValue::from_static("application/json"))
+        Some(&HeaderValue::from_static(APPLICATION_JSON.essence_str()))
     );
     assert_eq!(
         response.headers().get(&CONTENT_ENCODING),
@@ -449,25 +500,16 @@ async fn it_decompress_request_body() -> Result<(), ApolloRouterError> {
         .data(json!({"response": "yayyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy"})) // Body must be bigger than 32 to be compressed
         .build();
     let example_response = expected_response.clone();
-    let mut expectations = MockSupergraphService::new();
-    expectations
-        .expect_service_call()
-        .times(1)
-        .withf(move |req| {
-            assert_eq!(
-                req.supergraph_request.body().query.as_ref().unwrap(),
-                "query"
-            );
-            true
-        })
-        .returning(move |_req| {
-            let example_response = example_response.clone();
-            Ok(SupergraphResponse::new_from_graphql_response(
-                example_response,
-                Context::new(),
-            ))
-        });
-    let (server, client) = init(expectations).await;
+    let router_service = router_service::from_supergraph_mock_callback(move |req| {
+        let example_response = example_response.clone();
+        assert_eq!(req.supergraph_request.into_body().query.unwrap(), "query");
+        Ok(SupergraphResponse::new_from_graphql_response(
+            example_response,
+            req.context,
+        ))
+    })
+    .await;
+    let (server, client) = init(router_service).await;
     let url = format!("{}/", server.graphql_listen_address().as_ref().unwrap());
 
     // Post query
@@ -492,8 +534,7 @@ async fn it_decompress_request_body() -> Result<(), ApolloRouterError> {
 
 #[tokio::test]
 async fn malformed_request() -> Result<(), ApolloRouterError> {
-    let expectations = MockSupergraphService::new();
-    let (server, client) = init(expectations).await;
+    let (server, client) = init(router_service::empty().await).await;
 
     let response = client
         .post(format!(
@@ -514,18 +555,16 @@ async fn response() -> Result<(), ApolloRouterError> {
         .data(json!({"response": "yay"}))
         .build();
     let example_response = expected_response.clone();
-    let mut expectations = MockSupergraphService::new();
-    expectations
-        .expect_service_call()
-        .times(2)
-        .returning(move |_| {
-            let example_response = example_response.clone();
-            Ok(SupergraphResponse::new_from_graphql_response(
-                example_response,
-                Context::new(),
-            ))
-        });
-    let (server, client) = init(expectations).await;
+    let router_service = router_service::from_supergraph_mock_callback(move |req| {
+        let example_response = example_response.clone();
+
+        Ok(SupergraphResponse::new_from_graphql_response(
+            example_response,
+            req.context,
+        ))
+    })
+    .await;
+    let (server, client) = init(router_service).await;
     let url = format!("{}/", server.graphql_listen_address().as_ref().unwrap());
 
     // Post query
@@ -555,7 +594,7 @@ async fn response() -> Result<(), ApolloRouterError> {
 
     assert_eq!(
         response.headers().get(header::CONTENT_TYPE),
-        Some(&HeaderValue::from_static("application/json"))
+        Some(&HeaderValue::from_static(APPLICATION_JSON.essence_str()))
     );
 
     assert_eq!(
@@ -569,8 +608,7 @@ async fn response() -> Result<(), ApolloRouterError> {
 
 #[tokio::test]
 async fn bad_response() -> Result<(), ApolloRouterError> {
-    let expectations = MockSupergraphService::new();
-    let (server, client) = init(expectations).await;
+    let (server, client) = init(router_service::empty().await).await;
     let url = format!("{}/test", server.graphql_listen_address().as_ref().unwrap());
 
     // Post query
@@ -609,17 +647,16 @@ async fn response_with_custom_endpoint() -> Result<(), ApolloRouterError> {
         .data(json!({"response": "yay"}))
         .build();
     let example_response = expected_response.clone();
-    let mut expectations = MockSupergraphService::new();
-    expectations
-        .expect_service_call()
-        .times(2)
-        .returning(move |_| {
-            let example_response = example_response.clone();
-            Ok(SupergraphResponse::new_from_graphql_response(
-                example_response,
-                Context::new(),
-            ))
-        });
+
+    let router_service = router_service::from_supergraph_mock_callback(move |req| {
+        let example_response = example_response.clone();
+        Ok(SupergraphResponse::new_from_graphql_response(
+            example_response,
+            req.context,
+        ))
+    })
+    .await;
+
     let conf = Configuration::fake_builder()
         .supergraph(
             crate::configuration::Supergraph::fake_builder()
@@ -628,7 +665,8 @@ async fn response_with_custom_endpoint() -> Result<(), ApolloRouterError> {
         )
         .build()
         .unwrap();
-    let (server, client) = init_with_config(expectations, conf, MultiMap::new()).await?;
+    let (server, client) =
+        init_with_config(router_service, Arc::new(conf), MultiMap::new()).await?;
     let url = format!(
         "{}/graphql",
         server.graphql_listen_address().as_ref().unwrap()
@@ -674,17 +712,15 @@ async fn response_with_custom_prefix_endpoint() -> Result<(), ApolloRouterError>
         .data(json!({"response": "yay"}))
         .build();
     let example_response = expected_response.clone();
-    let mut expectations = MockSupergraphService::new();
-    expectations
-        .expect_service_call()
-        .times(2)
-        .returning(move |_| {
-            let example_response = example_response.clone();
-            Ok(SupergraphResponse::new_from_graphql_response(
-                example_response,
-                Context::new(),
-            ))
-        });
+    let router_service = router_service::from_supergraph_mock_callback(move |req| {
+        let example_response = example_response.clone();
+        Ok(SupergraphResponse::new_from_graphql_response(
+            example_response,
+            req.context,
+        ))
+    })
+    .await;
+
     let conf = Configuration::fake_builder()
         .supergraph(
             crate::configuration::Supergraph::fake_builder()
@@ -693,7 +729,8 @@ async fn response_with_custom_prefix_endpoint() -> Result<(), ApolloRouterError>
         )
         .build()
         .unwrap();
-    let (server, client) = init_with_config(expectations, conf, MultiMap::new()).await?;
+    let (server, client) =
+        init_with_config(router_service, Arc::new(conf), MultiMap::new()).await?;
     let url = format!(
         "{}/prefix/graphql",
         server.graphql_listen_address().as_ref().unwrap()
@@ -739,17 +776,16 @@ async fn response_with_custom_endpoint_wildcard() -> Result<(), ApolloRouterErro
         .data(json!({"response": "yay"}))
         .build();
     let example_response = expected_response.clone();
-    let mut expectations = MockSupergraphService::new();
-    expectations
-        .expect_service_call()
-        .times(4)
-        .returning(move |_| {
-            let example_response = example_response.clone();
-            Ok(SupergraphResponse::new_from_graphql_response(
-                example_response,
-                Context::new(),
-            ))
-        });
+
+    let router_service = router_service::from_supergraph_mock_callback(move |req| {
+        let example_response = example_response.clone();
+        Ok(SupergraphResponse::new_from_graphql_response(
+            example_response,
+            req.context,
+        ))
+    })
+    .await;
+
     let conf = Configuration::fake_builder()
         .supergraph(
             crate::configuration::Supergraph::fake_builder()
@@ -758,7 +794,8 @@ async fn response_with_custom_endpoint_wildcard() -> Result<(), ApolloRouterErro
         )
         .build()
         .unwrap();
-    let (server, client) = init_with_config(expectations, conf, MultiMap::new()).await?;
+    let (server, client) =
+        init_with_config(router_service, Arc::new(conf), MultiMap::new()).await?;
     for url in &[
         format!(
             "{}/graphql/test",
@@ -804,141 +841,22 @@ async fn response_with_custom_endpoint_wildcard() -> Result<(), ApolloRouterErro
     Ok(())
 }
 
-#[tokio::test]
-async fn it_extracts_query_and_operation_name_on_get_requests() -> Result<(), ApolloRouterError> {
-    let query = "query";
-    let expected_query = query;
-    let operation_name = "operationName";
-    let expected_operation_name = operation_name;
-
-    let expected_response = graphql::Response::builder()
-        .data(json!({"response": "yay"}))
-        .build();
-    let example_response = expected_response.clone();
-
-    let mut expectations = MockSupergraphService::new();
-    expectations
-        .expect_service_call()
-        .times(1)
-        .withf(move |req| {
-            assert_eq!(
-                req.supergraph_request.body().query.as_deref().unwrap(),
-                expected_query
-            );
-            assert_eq!(
-                req.supergraph_request
-                    .body()
-                    .operation_name
-                    .as_deref()
-                    .unwrap(),
-                expected_operation_name
-            );
-            true
-        })
-        .returning(move |_| {
-            let example_response = example_response.clone();
-            Ok(SupergraphResponse::new_from_graphql_response(
-                example_response,
-                Context::new(),
-            ))
-        });
-    let (server, client) = init(expectations).await;
-    let url = format!("{}/", server.graphql_listen_address().as_ref().unwrap());
-
-    let response = client
-        .get(url.as_str())
-        .query(&[("query", query), ("operationName", operation_name)])
-        .send()
-        .await
-        .unwrap()
-        .error_for_status()
-        .unwrap();
-
-    assert_eq!(
-        response.json::<graphql::Response>().await.unwrap(),
-        expected_response,
-    );
-
-    server.shutdown().await?;
-    Ok(())
-}
-
-#[tokio::test]
-async fn it_extracts_query_and_operation_name_on_post_requests() -> Result<(), ApolloRouterError> {
-    let query = "query";
-    let expected_query = query;
-    let operation_name = "operationName";
-    let expected_operation_name = operation_name;
-
-    let expected_response = graphql::Response::builder()
-        .data(json!({"response": "yay"}))
-        .build();
-    let example_response = expected_response.clone();
-
-    let mut expectations = MockSupergraphService::new();
-    expectations
-        .expect_service_call()
-        .times(1)
-        .withf(move |req| {
-            assert_eq!(
-                req.supergraph_request.body().query.as_deref().unwrap(),
-                expected_query
-            );
-            assert_eq!(
-                req.supergraph_request
-                    .body()
-                    .operation_name
-                    .as_deref()
-                    .unwrap(),
-                expected_operation_name
-            );
-            true
-        })
-        .returning(move |_| {
-            let example_response = example_response.clone();
-            Ok(SupergraphResponse::new_from_graphql_response(
-                example_response,
-                Context::new(),
-            ))
-        });
-    let (server, client) = init(expectations).await;
-    let url = format!("{}/", server.graphql_listen_address().as_ref().unwrap());
-
-    let response = client
-        .post(url.as_str())
-        .body(json!({ "query": query, "operationName": operation_name }).to_string())
-        .send()
-        .await
-        .unwrap()
-        .error_for_status()
-        .unwrap();
-
-    assert_eq!(
-        response.json::<graphql::Response>().await.unwrap(),
-        expected_response,
-    );
-
-    server.shutdown().await
-}
-
 #[tokio::test]
 async fn response_failure() -> Result<(), ApolloRouterError> {
-    let mut expectations = MockSupergraphService::new();
-    expectations
-        .expect_service_call()
-        .times(1)
-        .returning(move |_| {
-            let example_response = crate::error::FetchError::SubrequestHttpError {
-                service: "Mock service".to_string(),
-                reason: "Mock error".to_string(),
-            }
-            .to_response();
-            Ok(SupergraphResponse::new_from_graphql_response(
-                example_response,
-                Context::new(),
-            ))
-        });
-    let (server, client) = init(expectations).await;
+    let router_service = router_service::from_supergraph_mock_callback(move |req| {
+        let example_response = crate::error::FetchError::SubrequestHttpError {
+            service: "Mock service".to_string(),
+            reason: "Mock error".to_string(),
+        }
+        .to_response();
+
+        Ok(SupergraphResponse::new_from_graphql_response(
+            example_response,
+            req.context,
+        ))
+    })
+    .await;
+    let (server, client) = init(router_service).await;
 
     let response = client
         .post(format!(
@@ -972,7 +890,6 @@ async fn response_failure() -> Result<(), ApolloRouterError> {
 
 #[tokio::test]
 async fn cors_preflight() -> Result<(), ApolloRouterError> {
-    let expectations = MockSupergraphService::new();
     let conf = Configuration::fake_builder()
         .cors(Cors::builder().build())
         .supergraph(
@@ -982,7 +899,12 @@ async fn cors_preflight() -> Result<(), ApolloRouterError> {
         )
         .build()
         .unwrap();
-    let (server, client) = init_with_config(expectations, conf, MultiMap::new()).await?;
+    let (server, client) = init_with_config(
+        router_service::empty().await,
+        Arc::new(conf),
+        MultiMap::new(),
+    )
+    .await?;
 
     let response = client
         .request(
@@ -1030,8 +952,7 @@ async fn cors_preflight() -> Result<(), ApolloRouterError> {
 
 #[tokio::test]
 async fn test_previous_health_check_returns_four_oh_four() {
-    let expectations = MockSupergraphService::new();
-    let (server, client) = init(expectations).await;
+    let (server, client) = init(router_service::empty().await).await;
     let url = format!(
         "{}/.well-known/apollo/server-health",
         server.graphql_listen_address().as_ref().unwrap()
@@ -1046,8 +967,17 @@ async fn it_send_bad_content_type() -> Result<(), ApolloRouterError> {
     let query = "query";
     let operation_name = "operationName";
 
-    let expectations = MockSupergraphService::new();
-    let (server, client) = init(expectations).await;
+    let router_service = router_service::from_supergraph_mock_callback(|req| {
+        Ok(SupergraphResponse::new_from_graphql_response(
+            graphql::Response::builder()
+                .data(json!({"response": "hey"}))
+                .build(),
+            req.context,
+        ))
+    })
+    .await;
+
+    let (server, client) = init(router_service).await;
     let url = format!("{}", server.graphql_listen_address().as_ref().unwrap());
     let response = client
         .post(url.as_str())
@@ -1067,36 +997,52 @@ async fn it_sends_bad_accept_header() -> Result<(), ApolloRouterError> {
     let query = "query";
     let operation_name = "operationName";
 
-    let expectations = MockSupergraphService::new();
-    let (server, client) = init(expectations).await;
+    let router_service = router_service::from_supergraph_mock_callback(|req| {
+        Ok(SupergraphResponse::new_from_graphql_response(
+            graphql::Response::builder()
+                .data(json!({"response": "hey"}))
+                .build(),
+            req.context,
+        ))
+    })
+    .await;
+
+    let (server, client) = init(router_service).await;
     let url = format!("{}", server.graphql_listen_address().as_ref().unwrap());
     let response = client
         .post(url.as_str())
         .header(ACCEPT, "foo/bar")
-        .header(CONTENT_TYPE, "application/json")
+        .header(CONTENT_TYPE, APPLICATION_JSON.essence_str())
         .body(json!({ "query": query, "operationName": operation_name }).to_string())
         .send()
         .await
         .unwrap();
 
-    assert_eq!(response.status(), StatusCode::NOT_ACCEPTABLE,);
+    assert_eq!(response.status(), StatusCode::NOT_ACCEPTABLE);
 
     server.shutdown().await
 }
 
 #[test(tokio::test)]
-async fn it_doesnt_display_disabled_sandbox() -> Result<(), ApolloRouterError> {
-    let expectations = MockSupergraphService::new();
-    let conf = Configuration::fake_builder()
-        // sandbox is disabled by default, but homepage will take over if we dont disable it
-        .homepage(
-            crate::configuration::Homepage::fake_builder()
-                .enabled(false)
-                .build(),
-        )
-        .build()
+async fn it_displays_homepage() {
+    let conf = Arc::new(Configuration::fake_builder().build().unwrap());
+
+    let router_service = router_service::from_supergraph_mock_callback_and_configuration(
+        |req| {
+            Ok(SupergraphResponse::new_from_graphql_response(
+                graphql::Response::builder()
+                    .data(json!({"response": "test"}))
+                    .build(),
+                req.context,
+            ))
+        },
+        conf.clone(),
+    )
+    .await;
+
+    let (server, client) = init_with_config(router_service, conf, MultiMap::new())
+        .await
         .unwrap();
-    let (server, client) = init_with_config(expectations, conf, MultiMap::new()).await?;
     let response = client
         .get(&format!(
             "{}/",
@@ -1107,29 +1053,47 @@ async fn it_doesnt_display_disabled_sandbox() -> Result<(), ApolloRouterError> {
         .await
         .unwrap();
 
-    assert_eq!(response.status(), StatusCode::BAD_REQUEST);
-
-    server.shutdown().await
+    assert_eq!(response.status(), StatusCode::OK);
+    assert_eq!(response.text().await.unwrap(), home_page_content());
+    server.shutdown().await.unwrap();
 }
 
 #[test(tokio::test)]
-async fn it_doesnt_display_disabled_homepage() -> Result<(), ApolloRouterError> {
-    let expectations = MockSupergraphService::new();
-    let conf = Configuration::fake_builder()
-        .homepage(
-            crate::configuration::Homepage::fake_builder()
-                .enabled(false)
-                .build(),
-        )
-        .build()
+async fn it_doesnt_display_disabled_homepage() {
+    let conf = Arc::new(
+        Configuration::fake_builder()
+            .homepage(
+                crate::configuration::Homepage::fake_builder()
+                    .enabled(false)
+                    .build(),
+            )
+            .build()
+            .unwrap(),
+    );
+
+    let router_service = router_service::from_supergraph_mock_callback_and_configuration(
+        |req| {
+            Ok(SupergraphResponse::new_from_graphql_response(
+                graphql::Response::builder()
+                    .data(json!({"response": "test"}))
+                    .build(),
+                req.context,
+            ))
+        },
+        conf.clone(),
+    )
+    .await;
+
+    let (server, client) = init_with_config(router_service, conf, MultiMap::new())
+        .await
         .unwrap();
-    let (server, client) = init_with_config(expectations, conf, MultiMap::new()).await?;
     let response = client
         .get(&format!(
             "{}/",
             server.graphql_listen_address().as_ref().unwrap()
         ))
         .header(ACCEPT, "text/html")
+        .header(ACCEPT, "*/*")
         .send()
         .await
         .unwrap();
@@ -1141,33 +1105,41 @@ async fn it_doesnt_display_disabled_homepage() -> Result<(), ApolloRouterError>
         response.text().await
     );
 
-    server.shutdown().await
+    server.shutdown().await.unwrap();
 }
 
 #[test(tokio::test)]
 async fn it_answers_to_custom_endpoint() -> Result<(), ApolloRouterError> {
-    let expectations = MockSupergraphService::new();
-    let endpoint = service_fn(|req: transport::Request| async move {
+    let endpoint = service_fn(|req: router::Request| async move {
         Ok::<_, BoxError>(
             http::Response::builder()
                 .status(StatusCode::OK)
-                .body(format!("{} + {}", req.method(), req.uri().path()).into())
-                .unwrap(),
+                .body(
+                    format!(
+                        "{} + {}",
+                        req.router_request.method(),
+                        req.router_request.uri().path()
+                    )
+                    .into(),
+                )
+                .unwrap()
+                .into(),
         )
     })
     .boxed_clone();
     let mut web_endpoints = MultiMap::new();
     web_endpoints.insert(
         ListenAddr::SocketAddr("127.0.0.1:0".parse().unwrap()),
-        Endpoint::new("/a-custom-path".to_string(), endpoint.clone().boxed()),
+        Endpoint::from_router_service("/a-custom-path".to_string(), endpoint.clone().boxed()),
     );
     web_endpoints.insert(
         ListenAddr::SocketAddr("127.0.0.1:0".parse().unwrap()),
-        Endpoint::new("/an-other-custom-path".to_string(), endpoint.boxed()),
+        Endpoint::from_router_service("/an-other-custom-path".to_string(), endpoint.boxed()),
     );
 
     let conf = Configuration::fake_builder().build().unwrap();
-    let (server, client) = init_with_config(expectations, conf, web_endpoints).await?;
+    let (server, client) =
+        init_with_config(router_service::empty().await, Arc::new(conf), web_endpoints).await?;
 
     for path in &["/a-custom-path", "/an-other-custom-path"] {
         let response = client
@@ -1244,12 +1216,20 @@ async fn it_refuses_to_start_if_sandbox_is_enabled_and_introspection_is_not() {
 
 #[test(tokio::test)]
 async fn it_refuses_to_bind_two_extra_endpoints_on_the_same_path() {
-    let endpoint = service_fn(|req: transport::Request| async move {
+    let endpoint = service_fn(|req: router::Request| async move {
         Ok::<_, BoxError>(
             http::Response::builder()
                 .status(StatusCode::OK)
-                .body(format!("{} + {}", req.method(), req.uri().path()).into())
-                .unwrap(),
+                .body(
+                    format!(
+                        "{} + {}",
+                        req.router_request.method(),
+                        req.router_request.uri().path()
+                    )
+                    .into(),
+                )
+                .unwrap()
+                .into(),
         )
     })
     .boxed_clone();
@@ -1257,15 +1237,15 @@ async fn it_refuses_to_bind_two_extra_endpoints_on_the_same_path() {
     let mut web_endpoints = MultiMap::new();
     web_endpoints.insert(
         ListenAddr::SocketAddr("127.0.0.1:0".parse().unwrap()),
-        Endpoint::new("/a-custom-path".to_string(), endpoint.clone().boxed()),
+        Endpoint::from_router_service("/a-custom-path".to_string(), endpoint.clone().boxed()),
     );
     web_endpoints.insert(
         ListenAddr::SocketAddr("127.0.0.1:0".parse().unwrap()),
-        Endpoint::new("/a-custom-path".to_string(), endpoint.boxed()),
+        Endpoint::from_router_service("/a-custom-path".to_string(), endpoint.boxed()),
     );
 
     let conf = Configuration::fake_builder().build().unwrap();
-    let error = init_with_config(MockSupergraphService::new(), conf, web_endpoints)
+    let error = init_with_config(router_service::empty().await, Arc::new(conf), web_endpoints)
         .await
         .unwrap_err();
 
@@ -1275,72 +1255,9 @@ async fn it_refuses_to_bind_two_extra_endpoints_on_the_same_path() {
     )
 }
 
-#[test(tokio::test)]
-async fn it_checks_the_shape_of_router_request() -> Result<(), ApolloRouterError> {
-    let mut expectations = MockSupergraphService::new();
-    expectations
-        .expect_service_call()
-        .times(2)
-        .returning(move |req| {
-            Ok(SupergraphResponse::new_from_graphql_response(
-                graphql::Response::builder()
-                    .data(json!(format!(
-                        "{} + {} + {:?}",
-                        req.supergraph_request.method(),
-                        req.supergraph_request.uri(),
-                        serde_json::to_string(req.supergraph_request.body()).unwrap()
-                    )))
-                    .build(),
-                Context::new(),
-            ))
-        });
-    let (server, client) = init(expectations).await;
-    let query = json!(
-    {
-      "query": "query",
-    });
-    let url = format!("{}/", server.graphql_listen_address().as_ref().unwrap());
-    let response = client.get(&url).query(&query).send().await.unwrap();
-
-    assert_eq!(response.status(), StatusCode::OK);
-    assert_eq!(
-        response.text().await.unwrap(),
-        serde_json::to_string(&json!({
-            "data":
-                format!(
-                    "GET + {}?query=query + {:?}",
-                    url,
-                    serde_json::to_string(&query).unwrap()
-                )
-        }))
-        .unwrap()
-    );
-    let response = client
-        .post(&url)
-        .body(query.to_string())
-        .send()
-        .await
-        .unwrap();
-
-    assert_eq!(response.status(), StatusCode::OK);
-    assert_eq!(
-        response.text().await.unwrap(),
-        serde_json::to_string(&json!({
-            "data":
-                format!(
-                    "POST + {} + {:?}",
-                    url,
-                    serde_json::to_string(&query).unwrap()
-                )
-        }))
-        .unwrap()
-    );
-    server.shutdown().await
-}
-
 #[tokio::test]
 async fn cors_origin_default() -> Result<(), ApolloRouterError> {
-    let (server, client) = init(MockSupergraphService::new()).await;
+    let (server, client) = init(router_service::empty().await).await;
     let url = format!("{}/", server.graphql_listen_address().as_ref().unwrap());
 
     let response =
@@ -1359,8 +1276,12 @@ async fn cors_allow_any_origin() -> Result<(), ApolloRouterError> {
         .cors(Cors::builder().allow_any_origin(true).build())
         .build()
         .unwrap();
-    let (server, client) =
-        init_with_config(MockSupergraphService::new(), conf, MultiMap::new()).await?;
+    let (server, client) = init_with_config(
+        router_service::empty().await,
+        Arc::new(conf),
+        MultiMap::new(),
+    )
+    .await?;
     let url = format!("{}/", server.graphql_listen_address().as_ref().unwrap());
 
     let response = request_cors_with_origin(&client, url.as_str(), "https://thisisatest.com").await;
@@ -1381,8 +1302,12 @@ async fn cors_origin_list() -> Result<(), ApolloRouterError> {
         )
         .build()
         .unwrap();
-    let (server, client) =
-        init_with_config(MockSupergraphService::new(), conf, MultiMap::new()).await?;
+    let (server, client) = init_with_config(
+        router_service::empty().await,
+        Arc::new(conf),
+        MultiMap::new(),
+    )
+    .await?;
     let url = format!("{}/", server.graphql_listen_address().as_ref().unwrap());
 
     let response = request_cors_with_origin(&client, url.as_str(), valid_origin).await;
@@ -1408,8 +1333,12 @@ async fn cors_origin_regex() -> Result<(), ApolloRouterError> {
         )
         .build()
         .unwrap();
-    let (server, client) =
-        init_with_config(MockSupergraphService::new(), conf, MultiMap::new()).await?;
+    let (server, client) = init_with_config(
+        router_service::empty().await,
+        Arc::new(conf),
+        MultiMap::new(),
+    )
+    .await?;
     let url = format!("{}/", server.graphql_listen_address().as_ref().unwrap());
 
     // regex tests
@@ -1474,21 +1403,18 @@ fn origin_valid(headers: &HeaderMap, origin: &str) -> bool {
 
 #[test(tokio::test)]
 async fn response_shape() -> Result<(), ApolloRouterError> {
-    let mut expectations = MockSupergraphService::new();
-    expectations
-        .expect_service_call()
-        .times(1)
-        .returning(move |_| {
-            Ok(SupergraphResponse::new_from_graphql_response(
-                graphql::Response::builder()
-                    .data(json!({
-                        "test": "hello"
-                    }))
-                    .build(),
-                Context::new(),
-            ))
-        });
-    let (server, client) = init(expectations).await;
+    let router_service = router_service::from_supergraph_mock_callback(move |req| {
+        Ok(SupergraphResponse::new_from_graphql_response(
+            graphql::Response::builder()
+                .data(json!({
+                    "test": "hello"
+                }))
+                .build(),
+            req.context,
+        ))
+    })
+    .await;
+    let (server, client) = init(router_service).await;
     let query = json!(
     {
       "query": "query { test }",
@@ -1505,7 +1431,7 @@ async fn response_shape() -> Result<(), ApolloRouterError> {
     assert_eq!(response.status(), StatusCode::OK);
     assert_eq!(
         response.headers().get(CONTENT_TYPE),
-        Some(&HeaderValue::from_static("application/json"))
+        Some(&HeaderValue::from_static(APPLICATION_JSON.essence_str()))
     );
 
     assert_eq!(
@@ -1523,36 +1449,33 @@ async fn response_shape() -> Result<(), ApolloRouterError> {
 
 #[test(tokio::test)]
 async fn deferred_response_shape() -> Result<(), ApolloRouterError> {
-    let mut expectations = MockSupergraphService::new();
-    expectations
-        .expect_service_call()
-        .times(1)
-        .returning(move |_| {
-            let body = stream::iter(vec![
-                graphql::Response::builder()
+    let router_service = router_service::from_supergraph_mock_callback(|req| {
+        let body = stream::iter(vec![
+            graphql::Response::builder()
+                .data(json!({
+                    "test": "hello",
+                }))
+                .has_next(true)
+                .build(),
+            graphql::Response::builder()
+                .incremental(vec![graphql::IncrementalResponse::builder()
                     .data(json!({
-                        "test": "hello",
+                        "other": "world"
                     }))
-                    .has_next(true)
-                    .build(),
-                graphql::Response::builder()
-                    .incremental(vec![graphql::IncrementalResponse::builder()
-                        .data(json!({
-                            "other": "world"
-                        }))
-                        .path(Path::default())
-                        .build()])
-                    .has_next(true)
-                    .build(),
-                graphql::Response::builder().has_next(false).build(),
-            ])
-            .boxed();
-            Ok(SupergraphResponse::new_from_response(
-                http::Response::builder().status(200).body(body).unwrap(),
-                Context::new(),
-            ))
-        });
-    let (server, client) = init(expectations).await;
+                    .path(Path::default())
+                    .build()])
+                .has_next(true)
+                .build(),
+            graphql::Response::builder().has_next(false).build(),
+        ])
+        .boxed();
+        Ok(SupergraphResponse::new_from_response(
+            http::Response::builder().status(200).body(body).unwrap(),
+            req.context,
+        ))
+    })
+    .await;
+    let (server, client) = init(router_service).await;
     let query = json!(
     {
       "query": "query { test ... @defer { other } }",
@@ -1598,24 +1521,22 @@ async fn deferred_response_shape() -> Result<(), ApolloRouterError> {
 
 #[test(tokio::test)]
 async fn multipart_response_shape_with_one_chunk() -> Result<(), ApolloRouterError> {
-    let mut expectations = MockSupergraphService::new();
-    expectations
-        .expect_service_call()
-        .times(1)
-        .returning(move |_| {
-            let body = stream::iter(vec![graphql::Response::builder()
-                .data(json!({
-                    "test": "hello",
-                }))
-                .has_next(false)
-                .build()])
-            .boxed();
-            Ok(SupergraphResponse::new_from_response(
-                http::Response::builder().status(200).body(body).unwrap(),
-                Context::new(),
-            ))
-        });
-    let (server, client) = init(expectations).await;
+    let router_service = router_service::from_supergraph_mock_callback(move |req| {
+        let body = stream::iter(vec![graphql::Response::builder()
+            .data(json!({
+                "test": "hello",
+            }))
+            .has_next(false)
+            .build()])
+        .boxed();
+
+        Ok(SupergraphResponse::new_from_response(
+            http::Response::builder().status(200).body(body).unwrap(),
+            req.context,
+        ))
+    })
+    .await;
+    let (server, client) = init(router_service).await;
     let query = json!(
     {
       "query": "query { test }",
@@ -1663,7 +1584,7 @@ async fn it_supports_server_restart() {
     let server_factory = AxumHttpServerFactory::new();
     let (service, _) = tower_test::mock::spawn();
 
-    let supergraph_service_factory = TestSupergraphServiceFactory {
+    let supergraph_service_factory = TestRouterFactory {
         inner: service.into_inner(),
     };
 
@@ -1766,8 +1687,10 @@ async fn http_compressed_service() -> impl Service<
 
     let service = http_client::response_decompression(service)
         .map_request(|mut req: http::Request<hyper::Body>| {
-            req.headers_mut()
-                .append(ACCEPT, HeaderValue::from_static("application/json"));
+            req.headers_mut().append(
+                ACCEPT,
+                HeaderValue::from_static(APPLICATION_JSON.essence_str()),
+            );
             req
         })
         .map_future(|future| async {
@@ -1946,19 +1869,15 @@ async fn listening_to_unix_socket() {
         .build();
     let example_response = expected_response.clone();
 
-    let mut expectations = MockSupergraphService::new();
-    expectations
-        .expect_service_call()
-        .times(2)
-        .returning(move |_| {
-            let example_response = example_response.clone();
-
-            Ok(SupergraphResponse::new_from_graphql_response(
-                example_response,
-                Context::new(),
-            ))
-        });
-    let server = init_unix(expectations, &temp_dir).await;
+    let router_service = router_service::from_supergraph_mock_callback(move |req| {
+        let example_response = example_response.clone();
+        Ok(SupergraphResponse::new_from_graphql_response(
+            example_response,
+            req.context,
+        ))
+    })
+    .await;
+    let server = init_unix(router_service, &temp_dir).await;
 
     let output = send_to_unix_socket(
         server.graphql_listen_address().as_ref().unwrap(),
@@ -2054,24 +1973,16 @@ Accept: application/json\r
 
 #[tokio::test]
 async fn test_health_check() {
-    let mut expectations = MockSupergraphService::new();
-    expectations.expect_service_call().once().returning(|_| {
-        Ok(SupergraphResponse::new_from_response(
-            http_ext::from_response_to_stream(
-                http::Response::builder()
-                    .status(200)
-                    .body(
-                        graphql::Response::builder()
-                            .data(json!({ "__typename": "Query"}))
-                            .build(),
-                    )
-                    .unwrap(),
-            ),
-            Context::new(),
-        ))
-    });
+    let router_service = router_service::from_supergraph_mock_callback(|_| {
+        Ok(crate::supergraph::Response::builder()
+            .data(json!({ "__typename": "Query"}))
+            .context(Context::new())
+            .build()
+            .unwrap())
+    })
+    .await;
 
-    let (server, client) = init(expectations).await;
+    let (server, client) = init(router_service).await;
     let url = format!(
         "{}/health",
         server.graphql_listen_address().as_ref().unwrap()
@@ -2097,12 +2008,14 @@ async fn test_health_check_custom_listener() {
         .build()
         .unwrap();
 
-    let expectations = MockSupergraphService::new();
-
     // keep the server handle around otherwise it will immediately shutdown
-    let (_server, client) = init_with_config(expectations, conf, MultiMap::new())
-        .await
-        .unwrap();
+    let (_server, client) = init_with_config(
+        router_service::empty().await,
+        Arc::new(conf),
+        MultiMap::new(),
+    )
+    .await
+    .unwrap();
     let url = "http://localhost:4012/health";
 
     let response = client.get(url).send().await.unwrap();
@@ -2125,10 +2038,13 @@ async fn test_sneaky_supergraph_and_health_check_configuration() {
         .supergraph(Supergraph::fake_builder().path("/health").build()) // here be dragons
         .build()
         .unwrap();
-    let expectations = MockSupergraphService::new();
-    let error = init_with_config(expectations, conf, MultiMap::new())
-        .await
-        .unwrap_err();
+    let error = init_with_config(
+        router_service::empty().await,
+        Arc::new(conf),
+        MultiMap::new(),
+    )
+    .await
+    .unwrap_err();
 
     assert_eq!(
         "tried to register two endpoints on `127.0.0.1:0/health`",
@@ -2148,10 +2064,13 @@ async fn test_sneaky_supergraph_and_disabled_health_check_configuration() {
         .supergraph(Supergraph::fake_builder().path("/health").build())
         .build()
         .unwrap();
-    let expectations = MockSupergraphService::new();
-    let _ = init_with_config(expectations, conf, MultiMap::new())
-        .await
-        .unwrap();
+    let _ = init_with_config(
+        router_service::empty().await,
+        Arc::new(conf),
+        MultiMap::new(),
+    )
+    .await
+    .unwrap();
 }
 
 #[tokio::test]
@@ -2170,10 +2089,13 @@ async fn test_supergraph_and_health_check_same_port_different_listener() {
         )
         .build()
         .unwrap();
-    let expectations = MockSupergraphService::new();
-    let error = init_with_config(expectations, conf, MultiMap::new())
-        .await
-        .unwrap_err();
+    let error = init_with_config(
+        router_service::empty().await,
+        Arc::new(conf),
+        MultiMap::new(),
+    )
+    .await
+    .unwrap_err();
 
     assert_eq!(
         "tried to bind 0.0.0.0 and 127.0.0.1 on port 4013",
diff --git a/apollo-router/src/axum_factory/utils.rs b/apollo-router/src/axum_factory/utils.rs
index 3c457d12dc..815617d9a4 100644
--- a/apollo-router/src/axum_factory/utils.rs
+++ b/apollo-router/src/axum_factory/utils.rs
@@ -3,27 +3,13 @@
 use async_compression::tokio::write::BrotliDecoder;
 use async_compression::tokio::write::GzipDecoder;
 use async_compression::tokio::write::ZlibDecoder;
-use axum::http::header::HeaderMap;
 use axum::http::StatusCode;
 use axum::middleware::Next;
 use axum::response::*;
 use futures::prelude::*;
-use http::header::ACCEPT;
 use http::header::CONTENT_ENCODING;
-use http::header::VARY;
-use http::HeaderValue;
-use http::Method;
 use http::Request;
 use hyper::Body;
-use mediatype::names::APPLICATION;
-use mediatype::names::HTML;
-use mediatype::names::JSON;
-use mediatype::names::MIXED;
-use mediatype::names::MULTIPART;
-use mediatype::names::TEXT;
-use mediatype::MediaType;
-use mediatype::MediaTypeList;
-use mediatype::ReadParams;
 use opentelemetry::global;
 use opentelemetry::trace::TraceContextExt;
 use tokio::io::AsyncWriteExt;
@@ -31,28 +17,7 @@ use tower_http::trace::MakeSpan;
 use tracing::Level;
 use tracing::Span;
 
-use crate::services::MULTIPART_DEFER_CONTENT_TYPE;
-use crate::services::MULTIPART_DEFER_SPEC_PARAMETER;
-use crate::services::MULTIPART_DEFER_SPEC_VALUE;
-
 pub(crate) const REQUEST_SPAN_NAME: &str = "request";
-pub(crate) const APPLICATION_JSON_HEADER_VALUE: &str = "application/json";
-pub(crate) const GRAPHQL_JSON_RESPONSE_HEADER_VALUE: &str = "application/graphql-response+json";
-
-pub(super) fn prefers_html(headers: &HeaderMap) -> bool {
-    let text_html = MediaType::new(TEXT, HTML);
-
-    headers.get_all(&http::header::ACCEPT).iter().any(|value| {
-        value
-            .to_str()
-            .map(|accept_str| {
-                let mut list = MediaTypeList::new(accept_str);
-
-                list.any(|mime| mime.as_ref() == Ok(&text_html))
-            })
-            .unwrap_or(false)
-    })
-}
 
 pub(super) async fn decompress_request_body(
     req: Request<Body>,
@@ -127,117 +92,8 @@ pub(super) async fn decompress_request_body(
     }
 }
 
-pub(super) async fn check_accept_header(
-    req: Request<Body>,
-    next: Next<Body>,
-) -> Result<Response, Response> {
-    let ask_for_html = req.method() == Method::GET && prefers_html(req.headers());
-
-    if accepts_wildcard(req.headers())
-        || ask_for_html
-        || accepts_multipart(req.headers())
-        || accepts_json(req.headers())
-    {
-        Ok(next.run(req).await)
-    } else {
-        ::tracing::error!(
-            monotonic_counter.apollo_router_http_requests_total = 1u64,
-            status = %406u16,
-            error = "accept header is wrong",
-        );
-
-        Err((
-            StatusCode::NOT_ACCEPTABLE,
-            format!(
-                r#"'accept' header can't be different than \"*/*\", {:?}, {:?} or {:?}"#,
-                APPLICATION_JSON_HEADER_VALUE,
-                GRAPHQL_JSON_RESPONSE_HEADER_VALUE,
-                MULTIPART_DEFER_CONTENT_TYPE
-            ),
-        )
-            .into_response())
-    }
-}
-
-/// Returns true if the headers contain header `accept: */*`
-pub(crate) fn accepts_wildcard(headers: &HeaderMap) -> bool {
-    headers.get_all(ACCEPT).iter().any(|value| {
-        value
-            .to_str()
-            .map(|accept_str| accept_str == "*/*")
-            .unwrap_or(false)
-    })
-}
-
-/// Returns true if the headers contain `accept: application/json` or `accept: application/graphql-response+json`,
-/// or if there is no `accept` header
-pub(crate) fn accepts_json(headers: &HeaderMap) -> bool {
-    !headers.contains_key(ACCEPT)
-        || headers.get_all(ACCEPT).iter().any(|value| {
-            value
-                .to_str()
-                .map(|accept_str| {
-                    let mut list = MediaTypeList::new(accept_str);
-
-                    list.any(|mime| {
-                        mime.as_ref()
-                            .map(|mime| {
-                                (mime.ty == APPLICATION && mime.subty == JSON)
-                                    || (mime.ty == APPLICATION
-                                        && mime.subty.as_str() == "graphql-response"
-                                        && mime.suffix == Some(JSON))
-                            })
-                            .unwrap_or(false)
-                    })
-                })
-                .unwrap_or(false)
-        })
-}
-
-/// Returns true if the headers contain accept header to enable defer
-pub(crate) fn accepts_multipart(headers: &HeaderMap) -> bool {
-    headers.get_all(ACCEPT).iter().any(|value| {
-        value
-            .to_str()
-            .map(|accept_str| {
-                let mut list = MediaTypeList::new(accept_str);
-
-                list.any(|mime| {
-                    mime.as_ref()
-                        .map(|mime| {
-                            mime.ty == MULTIPART
-                                && mime.subty == MIXED
-                                && mime.get_param(
-                                    mediatype::Name::new(MULTIPART_DEFER_SPEC_PARAMETER)
-                                        .expect("valid name"),
-                                ) == Some(
-                                    mediatype::Value::new(MULTIPART_DEFER_SPEC_VALUE)
-                                        .expect("valid value"),
-                                )
-                        })
-                        .unwrap_or(false)
-                })
-            })
-            .unwrap_or(false)
-    })
-}
-
-// Process the headers to make sure that `VARY` is set correctly
-pub(super) fn process_vary_header(headers: &mut HeaderMap<HeaderValue>) {
-    if headers.get(VARY).is_none() {
-        // We don't have a VARY header, add one with value "origin"
-        headers.insert(VARY, HeaderValue::from_static("origin"));
-    }
-}
-
-#[derive(Clone)]
-pub(super) struct PropagatingMakeSpan;
-
-impl PropagatingMakeSpan {
-    pub(super) fn new() -> Self {
-        Self {}
-    }
-}
+#[derive(Clone, Default)]
+pub(crate) struct PropagatingMakeSpan;
 
 impl<B> MakeSpan<B> for PropagatingMakeSpan {
     fn make_span(&mut self, request: &http::Request<B>) -> Span {
@@ -262,9 +118,7 @@ impl<B> MakeSpan<B> for PropagatingMakeSpan {
                 "http.route" = %request.uri(),
                 "http.flavor" = ?request.version(),
                 "otel.kind" = "SERVER",
-                "otel.status_code" = tracing::field::Empty,
-                "apollo_private.duration_ns" = tracing::field::Empty,
-                "trace_id" = tracing::field::Empty
+
             )
         } else {
             // No remote span, we can go ahead and create the span without context.
@@ -275,83 +129,7 @@ impl<B> MakeSpan<B> for PropagatingMakeSpan {
                 "http.route" = %request.uri(),
                 "http.flavor" = ?request.version(),
                 "otel.kind" = "SERVER",
-                "otel.status_code" = tracing::field::Empty,
-                "apollo_private.duration_ns" = tracing::field::Empty,
-                "trace_id" = tracing::field::Empty
             )
         }
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    // Test Vary processing
-
-    #[test]
-    fn it_adds_default_with_value_origin_if_no_vary_header() {
-        let mut default_headers = HeaderMap::new();
-        process_vary_header(&mut default_headers);
-        let vary_opt = default_headers.get(VARY);
-        assert!(vary_opt.is_some());
-        let vary = vary_opt.expect("has a value");
-        assert_eq!(vary, "origin");
-    }
-
-    #[test]
-    fn it_leaves_vary_alone_if_set() {
-        let mut default_headers = HeaderMap::new();
-        default_headers.insert(VARY, HeaderValue::from_static("*"));
-        process_vary_header(&mut default_headers);
-        let vary_opt = default_headers.get(VARY);
-        assert!(vary_opt.is_some());
-        let vary = vary_opt.expect("has a value");
-        assert_eq!(vary, "*");
-    }
-
-    #[test]
-    fn it_leaves_varys_alone_if_there_are_more_than_one() {
-        let mut default_headers = HeaderMap::new();
-        default_headers.insert(VARY, HeaderValue::from_static("one"));
-        default_headers.append(VARY, HeaderValue::from_static("two"));
-        process_vary_header(&mut default_headers);
-        let vary = default_headers.get_all(VARY);
-        assert_eq!(vary.iter().count(), 2);
-        for value in vary {
-            assert!(value == "one" || value == "two");
-        }
-    }
-
-    #[test]
-    fn it_checks_accept_header() {
-        let mut default_headers = HeaderMap::new();
-        default_headers.insert(ACCEPT, HeaderValue::from_static("application/json"));
-        default_headers.append(ACCEPT, HeaderValue::from_static("foo/bar"));
-        assert!(accepts_json(&default_headers));
-
-        let mut default_headers = HeaderMap::new();
-        default_headers.insert(ACCEPT, HeaderValue::from_static("*/*"));
-        default_headers.append(ACCEPT, HeaderValue::from_static("foo/bar"));
-        assert!(accepts_wildcard(&default_headers));
-
-        let mut default_headers = HeaderMap::new();
-        default_headers.insert(
-            ACCEPT,
-            HeaderValue::from_static(GRAPHQL_JSON_RESPONSE_HEADER_VALUE),
-        );
-        default_headers.append(ACCEPT, HeaderValue::from_static("foo/bar"));
-        assert!(accepts_json(&default_headers));
-
-        let mut default_headers = HeaderMap::new();
-        default_headers.insert(
-            ACCEPT,
-            HeaderValue::from_static(GRAPHQL_JSON_RESPONSE_HEADER_VALUE),
-        );
-        default_headers.append(
-            ACCEPT,
-            HeaderValue::from_static(MULTIPART_DEFER_CONTENT_TYPE),
-        );
-        assert!(accepts_multipart(&default_headers));
-    }
-}
diff --git a/apollo-router/src/cache/mod.rs b/apollo-router/src/cache/mod.rs
index 5ade794dc3..421e688819 100644
--- a/apollo-router/src/cache/mod.rs
+++ b/apollo-router/src/cache/mod.rs
@@ -1,4 +1,5 @@
 use std::collections::HashMap;
+use std::num::NonZeroUsize;
 use std::sync::Arc;
 
 use tokio::sync::broadcast;
@@ -14,7 +15,10 @@ mod redis;
 pub(crate) mod storage;
 
 type WaitMap<K, V> = Arc<Mutex<HashMap<K, broadcast::Sender<V>>>>;
-pub(crate) const DEFAULT_CACHE_CAPACITY: usize = 512;
+pub(crate) const DEFAULT_CACHE_CAPACITY: NonZeroUsize = match NonZeroUsize::new(512) {
+    Some(v) => v,
+    None => unreachable!(),
+};
 
 /// Cache implementation with query deduplication
 #[derive(Clone)]
@@ -34,7 +38,7 @@ where
     }
 
     pub(crate) async fn with_capacity(
-        capacity: usize,
+        capacity: NonZeroUsize,
         redis_urls: Option<Vec<String>>,
         caller: &str,
     ) -> Self {
@@ -128,6 +132,10 @@ where
         let _ = locked_wait_map.remove(key);
         let _ = sender.send(value);
     }
+
+    pub(crate) async fn in_memory_keys(&self) -> Vec<K> {
+        self.storage.in_memory_keys().await
+    }
 }
 
 pub(crate) struct Entry<K: KeyType, V: ValueType> {
@@ -199,6 +207,8 @@ where
 
 #[cfg(test)]
 mod tests {
+    use std::num::NonZeroUsize;
+
     use futures::stream::FuturesUnordered;
     use futures::stream::StreamExt;
     use mockall::mock;
@@ -209,7 +219,8 @@ mod tests {
     #[tokio::test]
     async fn example_cache_usage() {
         let k = "key".to_string();
-        let cache = DeduplicatingCache::with_capacity(1, None, "test").await;
+        let cache =
+            DeduplicatingCache::with_capacity(NonZeroUsize::new(1).unwrap(), None, "test").await;
 
         let entry = cache.get(&k).await;
 
@@ -226,7 +237,7 @@ mod tests {
     #[test(tokio::test)]
     async fn it_should_enforce_cache_limits() {
         let cache: DeduplicatingCache<usize, usize> =
-            DeduplicatingCache::with_capacity(13, None, "test").await;
+            DeduplicatingCache::with_capacity(NonZeroUsize::new(13).unwrap(), None, "test").await;
 
         for i in 0..14 {
             let entry = cache.get(&i).await;
@@ -249,7 +260,7 @@ mod tests {
         mock.expect_retrieve().times(1).return_const(1usize);
 
         let cache: DeduplicatingCache<usize, usize> =
-            DeduplicatingCache::with_capacity(10, None, "test").await;
+            DeduplicatingCache::with_capacity(NonZeroUsize::new(10).unwrap(), None, "test").await;
 
         // Let's trigger 100 concurrent gets of the same value and ensure only
         // one delegated retrieve is made
diff --git a/apollo-router/src/cache/storage.rs b/apollo-router/src/cache/storage.rs
index b719c1988b..d9994851ea 100644
--- a/apollo-router/src/cache/storage.rs
+++ b/apollo-router/src/cache/storage.rs
@@ -2,6 +2,7 @@
 
 use std::fmt;
 use std::hash::Hash;
+use std::num::NonZeroUsize;
 use std::sync::Arc;
 
 use lru::LruCache;
@@ -56,7 +57,7 @@ where
     V: ValueType,
 {
     pub(crate) async fn new(
-        max_capacity: usize,
+        max_capacity: NonZeroUsize,
         _redis_urls: Option<Vec<String>>,
         _caller: &str,
     ) -> Self {
@@ -114,6 +115,15 @@ where
         }
     }
 
+    pub(crate) async fn in_memory_keys(&self) -> Vec<K> {
+        self.inner
+            .lock()
+            .await
+            .iter()
+            .map(|(k, _)| k.clone())
+            .collect()
+    }
+
     #[cfg(test)]
     pub(crate) async fn len(&self) -> usize {
         self.inner.lock().await.len()
diff --git a/apollo-router/src/configuration/mod.rs b/apollo-router/src/configuration/mod.rs
index 43a7f5948a..058d5deac6 100644
--- a/apollo-router/src/configuration/mod.rs
+++ b/apollo-router/src/configuration/mod.rs
@@ -12,10 +12,9 @@ mod yaml;
 use std::fmt;
 use std::net::IpAddr;
 use std::net::SocketAddr;
+use std::num::NonZeroUsize;
 use std::str::FromStr;
 
-use askama::Template;
-use bytes::Bytes;
 use cors::*;
 use derivative::Derivative;
 use displaydoc::Display;
@@ -561,6 +560,11 @@ pub(crate) struct Apq {
 #[serde(deny_unknown_fields)]
 pub(crate) struct QueryPlanning {
     pub(crate) experimental_cache: Cache,
+    /// Warm up the cache on reloads by running the query plan over
+    /// a list of the most used queries
+    /// Defaults to 0 (do not warm up the cache)
+    #[serde(default)]
+    pub(crate) warmed_up_queries: usize,
 }
 
 #[derive(Debug, Clone, Default, Deserialize, Serialize, JsonSchema)]
@@ -579,7 +583,7 @@ pub(crate) struct Cache {
 /// In memory cache configuration
 pub(crate) struct InMemoryCache {
     /// Number of entries in the Least Recently Used cache
-    pub(crate) limit: usize,
+    pub(crate) limit: NonZeroUsize,
 }
 
 impl Default for InMemoryCache {
@@ -638,17 +642,6 @@ impl Default for Sandbox {
     }
 }
 
-#[derive(Template)]
-#[template(path = "sandbox_index.html")]
-struct SandboxTemplate {}
-
-impl Sandbox {
-    pub(crate) fn display_page() -> Bytes {
-        let template = SandboxTemplate {};
-        template.render().unwrap().into()
-    }
-}
-
 /// Configuration options pertaining to the home page.
 #[derive(Debug, Clone, Deserialize, Serialize, JsonSchema)]
 #[serde(deny_unknown_fields)]
@@ -688,17 +681,6 @@ impl Default for Homepage {
     }
 }
 
-#[derive(Template)]
-#[template(path = "homepage_index.html")]
-struct HomepageTemplate {}
-
-impl Homepage {
-    pub(crate) fn display_page() -> Bytes {
-        let template = HomepageTemplate {};
-        template.render().unwrap().into()
-    }
-}
-
 /// Configuration options pertaining to the http server component.
 #[derive(Debug, Clone, Deserialize, Serialize, JsonSchema)]
 #[serde(deny_unknown_fields)]
diff --git a/apollo-router/src/configuration/schema.rs b/apollo-router/src/configuration/schema.rs
index 27a92cbfe5..9d610bbe0e 100644
--- a/apollo-router/src/configuration/schema.rs
+++ b/apollo-router/src/configuration/schema.rs
@@ -105,125 +105,113 @@ pub(crate) fn validate_yaml_configuration(
     }
     log_used_experimental_conf(&yaml);
     let expanded_yaml = expand_env_variables(&yaml, &expansion)?;
-
+    let parsed_yaml = super::yaml::parse(raw_yaml)?;
     if let Err(errors) = schema.validate(&expanded_yaml) {
         // Validation failed, translate the errors into something nice for the user
         // We have to reparse the yaml to get the line number information for each error.
-        match super::yaml::parse(raw_yaml) {
-            Ok(yaml) => {
-                let yaml_split_by_lines = raw_yaml.split('\n').collect::<Vec<_>>();
-
-                let errors = errors
-                    .enumerate()
-                    .filter_map(|(idx, mut e)| {
-                        if let Some(element) = yaml.get_element(&e.instance_path) {
-                            const NUMBER_OF_PREVIOUS_LINES_TO_DISPLAY: usize = 5;
-                            match element {
-                                yaml::Value::String(value, marker) => {
-                                    let lines = yaml_split_by_lines[0.max(
-                                        marker
-                                            .line()
-                                            .saturating_sub(NUMBER_OF_PREVIOUS_LINES_TO_DISPLAY),
-                                    )
-                                        ..marker.line()]
-                                        .iter()
-                                        .join("\n");
-
-                                    // Replace the value in the error message with the one from the raw config.
-                                    // This guarantees that if the env variable contained a secret it won't be leaked.
-                                    e.instance = Cow::Owned(coerce(value));
-
-                                    Some(format!(
-                                        "{}. {}\n\n{}\n{}^----- {}",
-                                        idx + 1,
-                                        e.instance_path,
-                                        lines,
-                                        " ".repeat(0.max(marker.col())),
-                                        e
-                                    ))
-                                }
-                                seq_element @ yaml::Value::Sequence(_, m) => {
-                                    let (start_marker, end_marker) = (m, seq_element.end_marker());
-
-                                    let offset = 0.max(
-                                        start_marker
-                                            .line()
-                                            .saturating_sub(NUMBER_OF_PREVIOUS_LINES_TO_DISPLAY),
-                                    );
-                                    let lines = yaml_split_by_lines[offset..end_marker.line()]
-                                        .iter()
-                                        .enumerate()
-                                        .map(|(idx, line)| {
-                                            let real_line = idx + offset;
-                                            match real_line.cmp(&start_marker.line()) {
-                                                Ordering::Equal => format!("┌ {line}"),
-                                                Ordering::Greater => format!("| {line}"),
-                                                Ordering::Less => line.to_string(),
-                                            }
-                                        })
-                                        .join("\n");
-
-                                    Some(format!(
-                                        "{}. {}\n\n{}\n└-----> {}",
-                                        idx + 1,
-                                        e.instance_path,
-                                        lines,
-                                        e
-                                    ))
-                                }
-                                map_value
-                                @ yaml::Value::Mapping(current_label, _value, _marker) => {
-                                    let (start_marker, end_marker) = (
-                                        current_label.as_ref()?.marker.as_ref()?,
-                                        map_value.end_marker(),
-                                    );
-                                    let offset = 0.max(
-                                        start_marker
-                                            .line()
-                                            .saturating_sub(NUMBER_OF_PREVIOUS_LINES_TO_DISPLAY),
-                                    );
-                                    let lines = yaml_split_by_lines[offset..end_marker.line()]
-                                        .iter()
-                                        .enumerate()
-                                        .map(|(idx, line)| {
-                                            let real_line = idx + offset;
-                                            match real_line.cmp(&start_marker.line()) {
-                                                Ordering::Equal => format!("┌ {line}"),
-                                                Ordering::Greater => format!("| {line}"),
-                                                Ordering::Less => line.to_string(),
-                                            }
-                                        })
-                                        .join("\n");
-
-                                    Some(format!(
-                                        "{}. {}\n\n{}\n└-----> {}",
-                                        idx + 1,
-                                        e.instance_path,
-                                        lines,
-                                        e
-                                    ))
-                                }
-                            }
-                        } else {
-                            None
+        let yaml_split_by_lines = raw_yaml.split('\n').collect::<Vec<_>>();
+
+        let errors = errors
+            .enumerate()
+            .filter_map(|(idx, mut e)| {
+                if let Some(element) = parsed_yaml.get_element(&e.instance_path) {
+                    const NUMBER_OF_PREVIOUS_LINES_TO_DISPLAY: usize = 5;
+                    match element {
+                        yaml::Value::String(value, marker) => {
+                            let lines = yaml_split_by_lines[0.max(
+                                marker
+                                    .line()
+                                    .saturating_sub(NUMBER_OF_PREVIOUS_LINES_TO_DISPLAY),
+                            )
+                                ..marker.line()]
+                                .iter()
+                                .join("\n");
+
+                            // Replace the value in the error message with the one from the raw config.
+                            // This guarantees that if the env variable contained a secret it won't be leaked.
+                            e.instance = Cow::Owned(coerce(value));
+
+                            Some(format!(
+                                "{}. {}\n\n{}\n{}^----- {}",
+                                idx + 1,
+                                e.instance_path,
+                                lines,
+                                " ".repeat(0.max(marker.col())),
+                                e
+                            ))
                         }
-                    })
-                    .join("\n\n");
-
-                if !errors.is_empty() {
-                    return Err(ConfigurationError::InvalidConfiguration {
-                        message: "configuration had errors",
-                        error: format!("\n{}", errors),
-                    });
+                        seq_element @ yaml::Value::Sequence(_, m) => {
+                            let (start_marker, end_marker) = (m, seq_element.end_marker());
+
+                            let offset = 0.max(
+                                start_marker
+                                    .line()
+                                    .saturating_sub(NUMBER_OF_PREVIOUS_LINES_TO_DISPLAY),
+                            );
+                            let lines = yaml_split_by_lines[offset..end_marker.line()]
+                                .iter()
+                                .enumerate()
+                                .map(|(idx, line)| {
+                                    let real_line = idx + offset;
+                                    match real_line.cmp(&start_marker.line()) {
+                                        Ordering::Equal => format!("┌ {line}"),
+                                        Ordering::Greater => format!("| {line}"),
+                                        Ordering::Less => line.to_string(),
+                                    }
+                                })
+                                .join("\n");
+
+                            Some(format!(
+                                "{}. {}\n\n{}\n└-----> {}",
+                                idx + 1,
+                                e.instance_path,
+                                lines,
+                                e
+                            ))
+                        }
+                        map_value @ yaml::Value::Mapping(current_label, _value, _marker) => {
+                            let (start_marker, end_marker) = (
+                                current_label.as_ref()?.marker.as_ref()?,
+                                map_value.end_marker(),
+                            );
+                            let offset = 0.max(
+                                start_marker
+                                    .line()
+                                    .saturating_sub(NUMBER_OF_PREVIOUS_LINES_TO_DISPLAY),
+                            );
+                            let lines = yaml_split_by_lines[offset..end_marker.line()]
+                                .iter()
+                                .enumerate()
+                                .map(|(idx, line)| {
+                                    let real_line = idx + offset;
+                                    match real_line.cmp(&start_marker.line()) {
+                                        Ordering::Equal => format!("┌ {line}"),
+                                        Ordering::Greater => format!("| {line}"),
+                                        Ordering::Less => line.to_string(),
+                                    }
+                                })
+                                .join("\n");
+
+                            Some(format!(
+                                "{}. {}\n\n{}\n└-----> {}",
+                                idx + 1,
+                                e.instance_path,
+                                lines,
+                                e
+                            ))
+                        }
+                    }
+                } else {
+                    None
                 }
-            }
-            Err(e) => {
-                // the yaml failed to parse. Just let serde do it's thing.
-                tracing::warn!(
-                    "failed to parse yaml using marked parser: {}. Falling back to serde validation",
-                    e
-                );
-            }
+            })
+            .join("\n\n");
+
+        if !errors.is_empty() {
+            return Err(ConfigurationError::InvalidConfiguration {
+                message: "configuration had errors",
+                error: format!("\n{}", errors),
+            });
         }
     }
 
diff --git a/apollo-router/src/configuration/snapshots/apollo_router__configuration__tests__schema_generation.snap b/apollo-router/src/configuration/snapshots/apollo_router__configuration__tests__schema_generation.snap
index 6669243858..e542cf3b20 100644
--- a/apollo-router/src/configuration/snapshots/apollo_router__configuration__tests__schema_generation.snap
+++ b/apollo-router/src/configuration/snapshots/apollo_router__configuration__tests__schema_generation.snap
@@ -549,6 +549,81 @@ expression: "&schema"
       "properties": {
         "experimental.expose_query_plan": {
           "type": "boolean"
+        },
+        "experimental.external": {
+          "type": "object",
+          "required": [
+            "url"
+          ],
+          "properties": {
+            "stages": {
+              "default": null,
+              "type": "object",
+              "properties": {
+                "router": {
+                  "default": null,
+                  "type": "object",
+                  "properties": {
+                    "request": {
+                      "default": null,
+                      "type": "object",
+                      "properties": {
+                        "body": {
+                          "default": false,
+                          "type": "boolean"
+                        },
+                        "context": {
+                          "default": false,
+                          "type": "boolean"
+                        },
+                        "headers": {
+                          "default": false,
+                          "type": "boolean"
+                        },
+                        "sdl": {
+                          "default": false,
+                          "type": "boolean"
+                        }
+                      },
+                      "nullable": true
+                    },
+                    "response": {
+                      "default": null,
+                      "type": "object",
+                      "properties": {
+                        "body": {
+                          "default": false,
+                          "type": "boolean"
+                        },
+                        "context": {
+                          "default": false,
+                          "type": "boolean"
+                        },
+                        "headers": {
+                          "default": false,
+                          "type": "boolean"
+                        },
+                        "sdl": {
+                          "default": false,
+                          "type": "boolean"
+                        }
+                      },
+                      "nullable": true
+                    }
+                  },
+                  "nullable": true
+                }
+              },
+              "nullable": true
+            },
+            "timeout": {
+              "default": null,
+              "type": "string"
+            },
+            "url": {
+              "type": "string"
+            }
+          }
         }
       },
       "additionalProperties": false
@@ -618,7 +693,8 @@ expression: "&schema"
             "in_memory": {
               "limit": 512
             }
-          }
+          },
+          "warmed_up_queries": 0
         }
       },
       "type": "object",
@@ -654,7 +730,7 @@ expression: "&schema"
                       "description": "Number of entries in the Least Recently Used cache",
                       "type": "integer",
                       "format": "uint",
-                      "minimum": 0.0
+                      "minimum": 1.0
                     }
                   },
                   "additionalProperties": false
@@ -700,7 +776,8 @@ expression: "&schema"
               "in_memory": {
                 "limit": 512
               }
-            }
+            },
+            "warmed_up_queries": 0
           },
           "type": "object",
           "required": [
@@ -724,13 +801,20 @@ expression: "&schema"
                       "description": "Number of entries in the Least Recently Used cache",
                       "type": "integer",
                       "format": "uint",
-                      "minimum": 0.0
+                      "minimum": 1.0
                     }
                   },
                   "additionalProperties": false
                 }
               },
               "additionalProperties": false
+            },
+            "warmed_up_queries": {
+              "description": "Warm up the cache on reloads by running the query plan over a list of the most used queries Defaults to 0 (do not warm up the cache)",
+              "default": 0,
+              "type": "integer",
+              "format": "uint",
+              "minimum": 0.0
             }
           },
           "additionalProperties": false
@@ -745,51 +829,67 @@ expression: "&schema"
           "type": "object",
           "properties": {
             "batch_processor": {
+              "description": "Configuration for batch processing.",
+              "default": {
+                "scheduled_delay": {
+                  "secs": 5,
+                  "nanos": 0
+                },
+                "max_queue_size": 2048,
+                "max_export_batch_size": 512,
+                "max_export_timeout": {
+                  "secs": 30,
+                  "nanos": 0
+                },
+                "max_concurrent_exports": 1
+              },
               "type": "object",
               "properties": {
                 "max_concurrent_exports": {
-                  "description": "Maximum number of concurrent exports\n\nLimits the number of spawned tasks for exports and thus memory consumed by an exporter. A value of 1 will cause exports to be performed synchronously on the BatchSpanProcessor task.",
-                  "default": null,
+                  "description": "Maximum number of concurrent exports\n\nLimits the number of spawned tasks for exports and thus memory consumed by an exporter. A value of 1 will cause exports to be performed synchronously on the BatchSpanProcessor task. The default is 1.",
+                  "default": 1,
                   "type": "integer",
                   "format": "uint",
-                  "minimum": 0.0,
-                  "nullable": true
+                  "minimum": 0.0
                 },
                 "max_export_batch_size": {
                   "description": "The maximum number of spans to process in a single batch. If there are more than one batch worth of spans then it processes multiple batches of spans one batch after the other without any delay. The default value is 512.",
-                  "default": null,
+                  "default": 512,
                   "type": "integer",
                   "format": "uint",
-                  "minimum": 0.0,
-                  "nullable": true
+                  "minimum": 0.0
                 },
                 "max_export_timeout": {
-                  "description": "The maximum duration to export a batch of data.",
-                  "default": null,
+                  "description": "The maximum duration to export a batch of data. The default value is 30 seconds.",
+                  "default": {
+                    "secs": 30,
+                    "nanos": 0
+                  },
                   "type": "string"
                 },
                 "max_queue_size": {
                   "description": "The maximum queue size to buffer spans for delayed processing. If the queue gets full it drops the spans. The default value of is 2048.",
-                  "default": null,
+                  "default": 2048,
                   "type": "integer",
                   "format": "uint",
-                  "minimum": 0.0,
-                  "nullable": true
+                  "minimum": 0.0
                 },
                 "scheduled_delay": {
                   "description": "The delay interval in milliseconds between two consecutive processing of batches. The default value is 5 seconds.",
-                  "default": null,
+                  "default": {
+                    "secs": 5,
+                    "nanos": 0
+                  },
                   "type": "string"
                 }
-              },
-              "nullable": true
+              }
             },
             "buffer_size": {
               "description": "The buffer size for sending traces to Apollo. Increase this if you are experiencing lost traces.",
               "default": 10000,
               "type": "integer",
               "format": "uint",
-              "minimum": 0.0
+              "minimum": 1.0
             },
             "client_name_header": {
               "description": "The name of the header to extract from requests when populating 'client nane' for traces and metrics in Apollo Studio.",
@@ -834,8 +934,7 @@ expression: "&schema"
                     }
                   ]
                 }
-              ],
-              "nullable": true
+              ]
             },
             "send_headers": {
               "description": "To configure which request header names and values are included in trace data that's sent to Apollo Studio.",
@@ -1830,44 +1929,59 @@ expression: "&schema"
               ],
               "properties": {
                 "batch_processor": {
+                  "default": {
+                    "scheduled_delay": {
+                      "secs": 5,
+                      "nanos": 0
+                    },
+                    "max_queue_size": 2048,
+                    "max_export_batch_size": 512,
+                    "max_export_timeout": {
+                      "secs": 30,
+                      "nanos": 0
+                    },
+                    "max_concurrent_exports": 1
+                  },
                   "type": "object",
                   "properties": {
                     "max_concurrent_exports": {
-                      "description": "Maximum number of concurrent exports\n\nLimits the number of spawned tasks for exports and thus memory consumed by an exporter. A value of 1 will cause exports to be performed synchronously on the BatchSpanProcessor task.",
-                      "default": null,
+                      "description": "Maximum number of concurrent exports\n\nLimits the number of spawned tasks for exports and thus memory consumed by an exporter. A value of 1 will cause exports to be performed synchronously on the BatchSpanProcessor task. The default is 1.",
+                      "default": 1,
                       "type": "integer",
                       "format": "uint",
-                      "minimum": 0.0,
-                      "nullable": true
+                      "minimum": 0.0
                     },
                     "max_export_batch_size": {
                       "description": "The maximum number of spans to process in a single batch. If there are more than one batch worth of spans then it processes multiple batches of spans one batch after the other without any delay. The default value is 512.",
-                      "default": null,
+                      "default": 512,
                       "type": "integer",
                       "format": "uint",
-                      "minimum": 0.0,
-                      "nullable": true
+                      "minimum": 0.0
                     },
                     "max_export_timeout": {
-                      "description": "The maximum duration to export a batch of data.",
-                      "default": null,
+                      "description": "The maximum duration to export a batch of data. The default value is 30 seconds.",
+                      "default": {
+                        "secs": 30,
+                        "nanos": 0
+                      },
                       "type": "string"
                     },
                     "max_queue_size": {
                       "description": "The maximum queue size to buffer spans for delayed processing. If the queue gets full it drops the spans. The default value of is 2048.",
-                      "default": null,
+                      "default": 2048,
                       "type": "integer",
                       "format": "uint",
-                      "minimum": 0.0,
-                      "nullable": true
+                      "minimum": 0.0
                     },
                     "scheduled_delay": {
                       "description": "The delay interval in milliseconds between two consecutive processing of batches. The default value is 5 seconds.",
-                      "default": null,
+                      "default": {
+                        "secs": 5,
+                        "nanos": 0
+                      },
                       "type": "string"
                     }
-                  },
-                  "nullable": true
+                  }
                 },
                 "endpoint": {
                   "type": "string"
@@ -1973,44 +2087,59 @@ expression: "&schema"
               "type": "object",
               "properties": {
                 "batch_processor": {
+                  "default": {
+                    "scheduled_delay": {
+                      "secs": 5,
+                      "nanos": 0
+                    },
+                    "max_queue_size": 2048,
+                    "max_export_batch_size": 512,
+                    "max_export_timeout": {
+                      "secs": 30,
+                      "nanos": 0
+                    },
+                    "max_concurrent_exports": 1
+                  },
                   "type": "object",
                   "properties": {
                     "max_concurrent_exports": {
-                      "description": "Maximum number of concurrent exports\n\nLimits the number of spawned tasks for exports and thus memory consumed by an exporter. A value of 1 will cause exports to be performed synchronously on the BatchSpanProcessor task.",
-                      "default": null,
+                      "description": "Maximum number of concurrent exports\n\nLimits the number of spawned tasks for exports and thus memory consumed by an exporter. A value of 1 will cause exports to be performed synchronously on the BatchSpanProcessor task. The default is 1.",
+                      "default": 1,
                       "type": "integer",
                       "format": "uint",
-                      "minimum": 0.0,
-                      "nullable": true
+                      "minimum": 0.0
                     },
                     "max_export_batch_size": {
                       "description": "The maximum number of spans to process in a single batch. If there are more than one batch worth of spans then it processes multiple batches of spans one batch after the other without any delay. The default value is 512.",
-                      "default": null,
+                      "default": 512,
                       "type": "integer",
                       "format": "uint",
-                      "minimum": 0.0,
-                      "nullable": true
+                      "minimum": 0.0
                     },
                     "max_export_timeout": {
-                      "description": "The maximum duration to export a batch of data.",
-                      "default": null,
+                      "description": "The maximum duration to export a batch of data. The default value is 30 seconds.",
+                      "default": {
+                        "secs": 30,
+                        "nanos": 0
+                      },
                       "type": "string"
                     },
                     "max_queue_size": {
                       "description": "The maximum queue size to buffer spans for delayed processing. If the queue gets full it drops the spans. The default value of is 2048.",
-                      "default": null,
+                      "default": 2048,
                       "type": "integer",
                       "format": "uint",
-                      "minimum": 0.0,
-                      "nullable": true
+                      "minimum": 0.0
                     },
                     "scheduled_delay": {
                       "description": "The delay interval in milliseconds between two consecutive processing of batches. The default value is 5 seconds.",
-                      "default": null,
+                      "default": {
+                        "secs": 5,
+                        "nanos": 0
+                      },
                       "type": "string"
                     }
-                  },
-                  "nullable": true
+                  }
                 },
                 "endpoint": {
                   "default": "default",
@@ -2062,37 +2191,40 @@ expression: "&schema"
                       "type": "object",
                       "properties": {
                         "max_concurrent_exports": {
-                          "description": "Maximum number of concurrent exports\n\nLimits the number of spawned tasks for exports and thus memory consumed by an exporter. A value of 1 will cause exports to be performed synchronously on the BatchSpanProcessor task.",
-                          "default": null,
+                          "description": "Maximum number of concurrent exports\n\nLimits the number of spawned tasks for exports and thus memory consumed by an exporter. A value of 1 will cause exports to be performed synchronously on the BatchSpanProcessor task. The default is 1.",
+                          "default": 1,
                           "type": "integer",
                           "format": "uint",
-                          "minimum": 0.0,
-                          "nullable": true
+                          "minimum": 0.0
                         },
                         "max_export_batch_size": {
                           "description": "The maximum number of spans to process in a single batch. If there are more than one batch worth of spans then it processes multiple batches of spans one batch after the other without any delay. The default value is 512.",
-                          "default": null,
+                          "default": 512,
                           "type": "integer",
                           "format": "uint",
-                          "minimum": 0.0,
-                          "nullable": true
+                          "minimum": 0.0
                         },
                         "max_export_timeout": {
-                          "description": "The maximum duration to export a batch of data.",
-                          "default": null,
+                          "description": "The maximum duration to export a batch of data. The default value is 30 seconds.",
+                          "default": {
+                            "secs": 30,
+                            "nanos": 0
+                          },
                           "type": "string"
                         },
                         "max_queue_size": {
                           "description": "The maximum queue size to buffer spans for delayed processing. If the queue gets full it drops the spans. The default value of is 2048.",
-                          "default": null,
+                          "default": 2048,
                           "type": "integer",
                           "format": "uint",
-                          "minimum": 0.0,
-                          "nullable": true
+                          "minimum": 0.0
                         },
                         "scheduled_delay": {
                           "description": "The delay interval in milliseconds between two consecutive processing of batches. The default value is 5 seconds.",
-                          "default": null,
+                          "default": {
+                            "secs": 5,
+                            "nanos": 0
+                          },
                           "type": "string"
                         }
                       }
@@ -2110,37 +2242,40 @@ expression: "&schema"
                       "type": "object",
                       "properties": {
                         "max_concurrent_exports": {
-                          "description": "Maximum number of concurrent exports\n\nLimits the number of spawned tasks for exports and thus memory consumed by an exporter. A value of 1 will cause exports to be performed synchronously on the BatchSpanProcessor task.",
-                          "default": null,
+                          "description": "Maximum number of concurrent exports\n\nLimits the number of spawned tasks for exports and thus memory consumed by an exporter. A value of 1 will cause exports to be performed synchronously on the BatchSpanProcessor task. The default is 1.",
+                          "default": 1,
                           "type": "integer",
                           "format": "uint",
-                          "minimum": 0.0,
-                          "nullable": true
+                          "minimum": 0.0
                         },
                         "max_export_batch_size": {
                           "description": "The maximum number of spans to process in a single batch. If there are more than one batch worth of spans then it processes multiple batches of spans one batch after the other without any delay. The default value is 512.",
-                          "default": null,
+                          "default": 512,
                           "type": "integer",
                           "format": "uint",
-                          "minimum": 0.0,
-                          "nullable": true
+                          "minimum": 0.0
                         },
                         "max_export_timeout": {
-                          "description": "The maximum duration to export a batch of data.",
-                          "default": null,
+                          "description": "The maximum duration to export a batch of data. The default value is 30 seconds.",
+                          "default": {
+                            "secs": 30,
+                            "nanos": 0
+                          },
                           "type": "string"
                         },
                         "max_queue_size": {
                           "description": "The maximum queue size to buffer spans for delayed processing. If the queue gets full it drops the spans. The default value of is 2048.",
-                          "default": null,
+                          "default": 2048,
                           "type": "integer",
                           "format": "uint",
-                          "minimum": 0.0,
-                          "nullable": true
+                          "minimum": 0.0
                         },
                         "scheduled_delay": {
                           "description": "The delay interval in milliseconds between two consecutive processing of batches. The default value is 5 seconds.",
-                          "default": null,
+                          "default": {
+                            "secs": 5,
+                            "nanos": 0
+                          },
                           "type": "string"
                         }
                       }
@@ -2171,45 +2306,59 @@ expression: "&schema"
               ],
               "properties": {
                 "batch_processor": {
-                  "default": null,
+                  "default": {
+                    "scheduled_delay": {
+                      "secs": 5,
+                      "nanos": 0
+                    },
+                    "max_queue_size": 2048,
+                    "max_export_batch_size": 512,
+                    "max_export_timeout": {
+                      "secs": 30,
+                      "nanos": 0
+                    },
+                    "max_concurrent_exports": 1
+                  },
                   "type": "object",
                   "properties": {
                     "max_concurrent_exports": {
-                      "description": "Maximum number of concurrent exports\n\nLimits the number of spawned tasks for exports and thus memory consumed by an exporter. A value of 1 will cause exports to be performed synchronously on the BatchSpanProcessor task.",
-                      "default": null,
+                      "description": "Maximum number of concurrent exports\n\nLimits the number of spawned tasks for exports and thus memory consumed by an exporter. A value of 1 will cause exports to be performed synchronously on the BatchSpanProcessor task. The default is 1.",
+                      "default": 1,
                       "type": "integer",
                       "format": "uint",
-                      "minimum": 0.0,
-                      "nullable": true
+                      "minimum": 0.0
                     },
                     "max_export_batch_size": {
                       "description": "The maximum number of spans to process in a single batch. If there are more than one batch worth of spans then it processes multiple batches of spans one batch after the other without any delay. The default value is 512.",
-                      "default": null,
+                      "default": 512,
                       "type": "integer",
                       "format": "uint",
-                      "minimum": 0.0,
-                      "nullable": true
+                      "minimum": 0.0
                     },
                     "max_export_timeout": {
-                      "description": "The maximum duration to export a batch of data.",
-                      "default": null,
+                      "description": "The maximum duration to export a batch of data. The default value is 30 seconds.",
+                      "default": {
+                        "secs": 30,
+                        "nanos": 0
+                      },
                       "type": "string"
                     },
                     "max_queue_size": {
                       "description": "The maximum queue size to buffer spans for delayed processing. If the queue gets full it drops the spans. The default value of is 2048.",
-                      "default": null,
+                      "default": 2048,
                       "type": "integer",
                       "format": "uint",
-                      "minimum": 0.0,
-                      "nullable": true
+                      "minimum": 0.0
                     },
                     "scheduled_delay": {
                       "description": "The delay interval in milliseconds between two consecutive processing of batches. The default value is 5 seconds.",
-                      "default": null,
+                      "default": {
+                        "secs": 5,
+                        "nanos": 0
+                      },
                       "type": "string"
                     }
-                  },
-                  "nullable": true
+                  }
                 }
               },
               "nullable": true
@@ -2221,44 +2370,59 @@ expression: "&schema"
               ],
               "properties": {
                 "batch_processor": {
+                  "default": {
+                    "scheduled_delay": {
+                      "secs": 5,
+                      "nanos": 0
+                    },
+                    "max_queue_size": 2048,
+                    "max_export_batch_size": 512,
+                    "max_export_timeout": {
+                      "secs": 30,
+                      "nanos": 0
+                    },
+                    "max_concurrent_exports": 1
+                  },
                   "type": "object",
                   "properties": {
                     "max_concurrent_exports": {
-                      "description": "Maximum number of concurrent exports\n\nLimits the number of spawned tasks for exports and thus memory consumed by an exporter. A value of 1 will cause exports to be performed synchronously on the BatchSpanProcessor task.",
-                      "default": null,
+                      "description": "Maximum number of concurrent exports\n\nLimits the number of spawned tasks for exports and thus memory consumed by an exporter. A value of 1 will cause exports to be performed synchronously on the BatchSpanProcessor task. The default is 1.",
+                      "default": 1,
                       "type": "integer",
                       "format": "uint",
-                      "minimum": 0.0,
-                      "nullable": true
+                      "minimum": 0.0
                     },
                     "max_export_batch_size": {
                       "description": "The maximum number of spans to process in a single batch. If there are more than one batch worth of spans then it processes multiple batches of spans one batch after the other without any delay. The default value is 512.",
-                      "default": null,
+                      "default": 512,
                       "type": "integer",
                       "format": "uint",
-                      "minimum": 0.0,
-                      "nullable": true
+                      "minimum": 0.0
                     },
                     "max_export_timeout": {
-                      "description": "The maximum duration to export a batch of data.",
-                      "default": null,
+                      "description": "The maximum duration to export a batch of data. The default value is 30 seconds.",
+                      "default": {
+                        "secs": 30,
+                        "nanos": 0
+                      },
                       "type": "string"
                     },
                     "max_queue_size": {
                       "description": "The maximum queue size to buffer spans for delayed processing. If the queue gets full it drops the spans. The default value of is 2048.",
-                      "default": null,
+                      "default": 2048,
                       "type": "integer",
                       "format": "uint",
-                      "minimum": 0.0,
-                      "nullable": true
+                      "minimum": 0.0
                     },
                     "scheduled_delay": {
                       "description": "The delay interval in milliseconds between two consecutive processing of batches. The default value is 5 seconds.",
-                      "default": null,
+                      "default": {
+                        "secs": 5,
+                        "nanos": 0
+                      },
                       "type": "string"
                     }
-                  },
-                  "nullable": true
+                  }
                 },
                 "endpoint": {
                   "type": "string"
@@ -2425,8 +2589,7 @@ expression: "&schema"
                         ]
                       }
                     ]
-                  },
-                  "nullable": true
+                  }
                 },
                 "max_attributes_per_event": {
                   "type": "integer",
@@ -2459,8 +2622,8 @@ expression: "&schema"
                   "nullable": true
                 },
                 "parent_based_sampler": {
-                  "type": "boolean",
-                  "nullable": true
+                  "default": true,
+                  "type": "boolean"
                 },
                 "sampler": {
                   "anyOf": [
@@ -2487,8 +2650,7 @@ expression: "&schema"
                         }
                       ]
                     }
-                  ],
-                  "nullable": true
+                  ]
                 },
                 "service_name": {
                   "type": "string",
@@ -2506,44 +2668,59 @@ expression: "&schema"
               "type": "object",
               "properties": {
                 "batch_processor": {
+                  "default": {
+                    "scheduled_delay": {
+                      "secs": 5,
+                      "nanos": 0
+                    },
+                    "max_queue_size": 2048,
+                    "max_export_batch_size": 512,
+                    "max_export_timeout": {
+                      "secs": 30,
+                      "nanos": 0
+                    },
+                    "max_concurrent_exports": 1
+                  },
                   "type": "object",
                   "properties": {
                     "max_concurrent_exports": {
-                      "description": "Maximum number of concurrent exports\n\nLimits the number of spawned tasks for exports and thus memory consumed by an exporter. A value of 1 will cause exports to be performed synchronously on the BatchSpanProcessor task.",
-                      "default": null,
+                      "description": "Maximum number of concurrent exports\n\nLimits the number of spawned tasks for exports and thus memory consumed by an exporter. A value of 1 will cause exports to be performed synchronously on the BatchSpanProcessor task. The default is 1.",
+                      "default": 1,
                       "type": "integer",
                       "format": "uint",
-                      "minimum": 0.0,
-                      "nullable": true
+                      "minimum": 0.0
                     },
                     "max_export_batch_size": {
                       "description": "The maximum number of spans to process in a single batch. If there are more than one batch worth of spans then it processes multiple batches of spans one batch after the other without any delay. The default value is 512.",
-                      "default": null,
+                      "default": 512,
                       "type": "integer",
                       "format": "uint",
-                      "minimum": 0.0,
-                      "nullable": true
+                      "minimum": 0.0
                     },
                     "max_export_timeout": {
-                      "description": "The maximum duration to export a batch of data.",
-                      "default": null,
+                      "description": "The maximum duration to export a batch of data. The default value is 30 seconds.",
+                      "default": {
+                        "secs": 30,
+                        "nanos": 0
+                      },
                       "type": "string"
                     },
                     "max_queue_size": {
                       "description": "The maximum queue size to buffer spans for delayed processing. If the queue gets full it drops the spans. The default value of is 2048.",
-                      "default": null,
+                      "default": 2048,
                       "type": "integer",
                       "format": "uint",
-                      "minimum": 0.0,
-                      "nullable": true
+                      "minimum": 0.0
                     },
                     "scheduled_delay": {
                       "description": "The delay interval in milliseconds between two consecutive processing of batches. The default value is 5 seconds.",
-                      "default": null,
+                      "default": {
+                        "secs": 5,
+                        "nanos": 0
+                      },
                       "type": "string"
                     }
-                  },
-                  "nullable": true
+                  }
                 },
                 "endpoint": {
                   "default": "default",
diff --git a/apollo-router/src/configuration/snapshots/apollo_router__configuration__yaml__test__duplicate_keys.snap b/apollo-router/src/configuration/snapshots/apollo_router__configuration__yaml__test__duplicate_keys.snap
new file mode 100644
index 0000000000..6a891be5df
--- /dev/null
+++ b/apollo-router/src/configuration/snapshots/apollo_router__configuration__yaml__test__duplicate_keys.snap
@@ -0,0 +1,8 @@
+---
+source: apollo-router/src/configuration/yaml.rs
+expression: "format!(\"{:#?}\", parse(yaml).unwrap_err())"
+---
+InvalidConfiguration {
+    message: "duplicated keys detected in your yaml configuration",
+    error: "'test.a', 'c.dup', 'test'",
+}
diff --git a/apollo-router/src/configuration/yaml.rs b/apollo-router/src/configuration/yaml.rs
index b891a2b17f..cc1a37f560 100644
--- a/apollo-router/src/configuration/yaml.rs
+++ b/apollo-router/src/configuration/yaml.rs
@@ -1,4 +1,5 @@
 use std::collections::HashMap;
+use std::collections::HashSet;
 
 use derivative::Derivative;
 use indexmap::IndexMap;
@@ -64,6 +65,7 @@ pub(crate) struct MarkedYaml {
     current_label: Option<Label>,
     object_stack: Vec<(Option<Label>, Value, usize)>,
     root: Option<Value>,
+    duplicated_fields: HashSet<(Option<Label>, Label)>,
 }
 
 impl MarkedYaml {
@@ -89,8 +91,11 @@ impl MarkedYaml {
         let (label, v, id) = self.object_stack.pop().expect("imbalanced parse events");
         self.anchors.insert(id, v.clone());
         match (label, self.object_stack.last_mut()) {
-            (Some(label), Some((_, Value::Mapping(_current_label, mapping, _), _))) => {
-                mapping.insert(label, v);
+            (Some(label), Some((_, Value::Mapping(current_label, mapping, _), _))) => {
+                if let Some(_previous) = mapping.insert(label.clone(), v) {
+                    self.duplicated_fields
+                        .insert((current_label.clone(), label));
+                }
                 None
             }
             (None, Some((_, Value::Sequence(sequence, _), _))) => {
@@ -103,10 +108,13 @@ impl MarkedYaml {
 
     fn add_value(&mut self, marker: Marker, v: String, id: usize) {
         match (self.current_label.take(), self.object_stack.last_mut()) {
-            (Some(label), Some((_, Value::Mapping(_current_label, mapping, _), _))) => {
+            (Some(label), Some((_, Value::Mapping(current_label, mapping, _), _))) => {
                 let v = Value::String(v, marker);
                 self.anchors.insert(id, v.clone());
-                mapping.insert(label, v);
+                if let Some(_previous) = mapping.insert(label.clone(), v) {
+                    self.duplicated_fields
+                        .insert((current_label.clone(), label));
+                }
             }
             (None, Some((_, Value::Sequence(sequence, _), _))) => {
                 let v = Value::String(v, marker);
@@ -149,6 +157,26 @@ pub(crate) fn parse(source: &str) -> Result<MarkedYaml, ConfigurationError> {
             error: e.to_string(),
         })?;
 
+    // Detect duplicated keys in configuration file
+    if !loader.duplicated_fields.is_empty() {
+        let error = loader
+            .duplicated_fields
+            .iter()
+            .map(|(parent_label, dup_label)| {
+                let prefix = parent_label
+                    .as_ref()
+                    .map(|l| format!("{}.", l.name))
+                    .unwrap_or_default();
+                format!("'{prefix}{}'", dup_label.name)
+            })
+            .collect::<Vec<String>>()
+            .join(", ");
+        return Err(ConfigurationError::InvalidConfiguration {
+            message: "duplicated keys detected in your yaml configuration",
+            error,
+        });
+    }
+
     Ok(loader)
 }
 
@@ -218,4 +246,36 @@ mod test {
         let root = parsed.root().unwrap();
         assert_snapshot!(format!("{:#?}", root));
     }
+
+    #[test]
+    fn test_duplicate_keys() {
+        // DON'T reformat this. It'll change the test results
+        let yaml = r#"test:
+  a: 4
+  b: 3
+  a: 5
+  c:
+    dup: 5
+    other: 3
+    dup: 8
+test:
+  foo: bar
+"#;
+        let err = parse(yaml).unwrap_err();
+        match err {
+            crate::configuration::ConfigurationError::InvalidConfiguration { message, error } => {
+                assert_eq!(
+                    message,
+                    "duplicated keys detected in your yaml configuration"
+                );
+                // Can't do an assert on error because under the hood it uses an hashset then the order is not guaranteed
+                let error_splitted: Vec<&str> = error.split(", ").collect();
+                assert_eq!(error_splitted.len(), 3);
+                assert!(error_splitted.contains(&"'test.a'"));
+                assert!(error_splitted.contains(&"'test'"));
+                assert!(error_splitted.contains(&"'c.dup'"));
+            }
+            _ => panic!("this error must be InvalidConfiguration variant"),
+        }
+    }
 }
diff --git a/apollo-router/src/context.rs b/apollo-router/src/context.rs
index d726c4d4fa..eedc4e42d3 100644
--- a/apollo-router/src/context.rs
+++ b/apollo-router/src/context.rs
@@ -9,6 +9,7 @@ use std::time::Instant;
 use dashmap::mapref::multiple::RefMulti;
 use dashmap::mapref::multiple::RefMutMulti;
 use dashmap::DashMap;
+use serde::Deserialize;
 use serde::Serialize;
 use tower::BoxError;
 
@@ -27,12 +28,14 @@ pub(crate) type Entries = Arc<DashMap<String, Value>>;
 /// provide [`crate::SubgraphRequest`] or [`crate::SubgraphResponse`] processing. At such times,
 /// plugins should restrict themselves to the [`Context::get`] and [`Context::upsert`]
 /// functions to minimise the possibility of mis-sequenced updates.
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct Context {
     // Allows adding custom entries to the context.
     entries: Entries,
 
     /// Creation time
+    #[serde(skip)]
+    #[serde(default = "Instant::now")]
     pub(crate) created_at: Instant,
 }
 
diff --git a/apollo-router/src/error.rs b/apollo-router/src/error.rs
index 69a98c631c..8495b93fdc 100644
--- a/apollo-router/src/error.rs
+++ b/apollo-router/src/error.rs
@@ -18,6 +18,7 @@ use tracing::level_filters::LevelFilter;
 
 pub(crate) use crate::configuration::ConfigurationError;
 pub(crate) use crate::graphql::Error;
+use crate::graphql::ErrorExtension;
 use crate::graphql::IntoGraphQLErrors;
 use crate::graphql::Response;
 use crate::json_ext::Path;
@@ -28,18 +29,12 @@ use crate::spec::SpecError;
 ///
 /// Note that these are not actually returned to the client, but are instead converted to JSON for
 /// [`struct@Error`].
-#[derive(Error, Display, Debug, Clone, Serialize, Deserialize)]
-#[serde(tag = "type")]
+#[derive(Error, Display, Debug, Clone, Serialize)]
+#[serde(untagged)]
 #[ignore_extra_doc_attributes]
 #[non_exhaustive]
 #[allow(missing_docs)] // FIXME
 pub(crate) enum FetchError {
-    /// query references unknown service '{service}'
-    ValidationUnknownServiceError {
-        /// The service that was unknown.
-        service: String,
-    },
-
     /// invalid type for variable: '{name}'
     ValidationInvalidTypeVariable {
         /// Name of the variable.
@@ -52,18 +47,6 @@ pub(crate) enum FetchError {
         reason: String,
     },
 
-    /// response was malformed: {reason}
-    MalformedResponse {
-        /// The reason the serialization failed.
-        reason: String,
-    },
-
-    /// service '{service}' returned no response.
-    SubrequestNoResponse {
-        /// The service that returned no response.
-        service: String,
-    },
-
     /// service '{service}' response was malformed: {reason}
     SubrequestMalformedResponse {
         /// The service that responded with the malformed response.
@@ -96,6 +79,7 @@ pub(crate) enum FetchError {
         field: String,
     },
 
+    #[cfg(test)]
     /// invalid content: {reason}
     ExecutionInvalidContent { reason: String },
 
@@ -113,7 +97,34 @@ pub(crate) enum FetchError {
 impl FetchError {
     /// Convert the fetch error to a GraphQL error.
     pub(crate) fn to_graphql_error(&self, path: Option<Path>) -> Error {
-        let value: Value = serde_json::to_value(self).unwrap().into();
+        let mut value: Value = serde_json::to_value(self).unwrap_or_default().into();
+        if let Some(extensions) = value.as_object_mut() {
+            extensions
+                .entry("code")
+                .or_insert_with(|| self.extension_code().into());
+            // Following these specs https://www.apollographql.com/docs/apollo-server/data/errors/#including-custom-error-details
+            match self {
+                FetchError::SubrequestMalformedResponse { service, .. }
+                | FetchError::SubrequestUnexpectedPatchResponse { service }
+                | FetchError::SubrequestHttpError { service, .. }
+                | FetchError::CompressionError { service, .. } => {
+                    extensions
+                        .entry("service")
+                        .or_insert_with(|| service.clone().into());
+                }
+                FetchError::ExecutionFieldNotFound { field, .. } => {
+                    extensions
+                        .entry("field")
+                        .or_insert_with(|| field.clone().into());
+                }
+                FetchError::ValidationInvalidTypeVariable { name } => {
+                    extensions
+                        .entry("name")
+                        .or_insert_with(|| name.clone().into());
+                }
+                _ => (),
+            }
+        }
 
         Error {
             message: self.to_string(),
@@ -132,6 +143,26 @@ impl FetchError {
     }
 }
 
+impl ErrorExtension for FetchError {
+    fn extension_code(&self) -> String {
+        match self {
+            FetchError::ValidationInvalidTypeVariable { .. } => "VALIDATION_INVALID_TYPE_VARIABLE",
+            FetchError::ValidationPlanningError { .. } => "VALIDATION_PLANNING_ERROR",
+            FetchError::SubrequestMalformedResponse { .. } => "SUBREQUEST_MALFORMED_RESPONSE",
+            FetchError::SubrequestUnexpectedPatchResponse { .. } => {
+                "SUBREQUEST_UNEXPECTED_PATCH_RESPONSE"
+            }
+            FetchError::SubrequestHttpError { .. } => "SUBREQUEST_HTTP_ERROR",
+            FetchError::ExecutionFieldNotFound { .. } => "EXECUTION_FIELD_NOT_FOUND",
+            FetchError::ExecutionPathNotFound { .. } => "EXECUTION_PATH_NOT_FOUND",
+            FetchError::CompressionError { .. } => "COMPRESSION_ERROR",
+            #[cfg(test)]
+            FetchError::ExecutionInvalidContent { .. } => "EXECUTION_INVALID_CONTENT",
+        }
+        .to_string()
+    }
+}
+
 impl From<QueryPlannerError> for FetchError {
     fn from(err: QueryPlannerError) -> Self {
         FetchError::ValidationPlanningError {
@@ -205,10 +236,21 @@ pub(crate) enum QueryPlannerError {
 impl IntoGraphQLErrors for QueryPlannerError {
     fn into_graphql_errors(self) -> Result<Vec<Error>, Self> {
         match self {
-            QueryPlannerError::SpecError(err) => Ok(vec![Error {
-                message: err.to_string(),
-                ..Default::default()
-            }]),
+            QueryPlannerError::SpecError(err) => {
+                let gql_err = match err.custom_extension_details() {
+                    Some(extension_details) => Error::builder()
+                        .message(err.to_string())
+                        .extension_code(err.extension_code())
+                        .extensions(extension_details)
+                        .build(),
+                    None => Error::builder()
+                        .message(err.to_string())
+                        .extension_code(err.extension_code())
+                        .build(),
+                };
+
+                Ok(vec![gql_err])
+            }
             QueryPlannerError::SchemaValidationErrors(errs) => errs
                 .into_graphql_errors()
                 .map_err(QueryPlannerError::SchemaValidationErrors),
@@ -222,6 +264,23 @@ impl IntoGraphQLErrors for QueryPlannerError {
     }
 }
 
+impl ErrorExtension for QueryPlannerError {
+    fn extension_code(&self) -> String {
+        match self {
+            QueryPlannerError::SchemaValidationErrors(_) => "SCHEMA_VALIDATION_ERRORS",
+            QueryPlannerError::PlanningErrors(_) => "PLANNING_ERRORS",
+            QueryPlannerError::JoinError(_) => "JOIN_ERROR",
+            QueryPlannerError::CacheResolverError(_) => "CACHE_RESOLVER_ERROR",
+            QueryPlannerError::EmptyPlan(_) => "EMPTY_PLAN",
+            QueryPlannerError::UnhandledPlannerResult => "UNHANDLED_PLANNER_RESULT",
+            QueryPlannerError::RouterBridgeError(_) => "ROUTER_BRIDGE_ERROR",
+            QueryPlannerError::SpecError(_) => "SPEC_ERROR",
+            QueryPlannerError::Introspection(_) => "INTROSPECTION",
+        }
+        .to_string()
+    }
+}
+
 #[derive(Clone, Debug, Error, Serialize, Deserialize)]
 /// Container for planner setup errors
 pub(crate) struct PlannerErrors(Arc<Vec<PlannerError>>);
@@ -384,3 +443,12 @@ impl ParseErrors {
         };
     }
 }
+
+/// Error types for licensing.
+#[derive(Error, Display, Debug, Clone, Serialize, Deserialize)]
+pub(crate) enum LicenseError {
+    /// Apollo graph reference is missing
+    MissingGraphReference,
+    /// Apollo key is missing
+    MissingKey,
+}
diff --git a/apollo-router/src/executable.rs b/apollo-router/src/executable.rs
index b7384222a9..9ecd35bde2 100644
--- a/apollo-router/src/executable.rs
+++ b/apollo-router/src/executable.rs
@@ -10,7 +10,6 @@ use std::time::Duration;
 use anyhow::anyhow;
 use anyhow::Context;
 use anyhow::Result;
-use clap::AppSettings;
 use clap::ArgAction;
 use clap::Args;
 use clap::CommandFactory;
@@ -121,11 +120,11 @@ enum ConfigSubcommand {
     /// Print upgraded configuration.
     Upgrade {
         /// The location of the config to upgrade.
-        #[clap(parse(from_os_str), env = "APOLLO_ROUTER_CONFIG_PATH")]
+        #[clap(value_parser, env = "APOLLO_ROUTER_CONFIG_PATH")]
         config_path: PathBuf,
 
         /// Print a diff.
-        #[clap(parse(from_flag), long)]
+        #[clap(action = ArgAction::SetTrue, long)]
         diff: bool,
     },
     /// List all the available experimental configurations with related GitHub discussion
@@ -134,11 +133,8 @@ enum ConfigSubcommand {
 
 /// Options for the router
 #[derive(Parser, Debug)]
-#[clap(
-    name = "router",
-    about = "Apollo federation router",
-    global_setting(AppSettings::NoAutoVersion)
-)]
+#[clap(name = "router", about = "Apollo federation router")]
+#[command(disable_version_flag(true))]
 pub(crate) struct Opt {
     /// Log level (off|error|warn|info|debug|trace).
     #[clap(
@@ -162,7 +158,7 @@ pub(crate) struct Opt {
     #[clap(
         short,
         long = "config",
-        parse(from_os_str),
+        value_parser,
         env = "APOLLO_ROUTER_CONFIG_PATH"
     )]
     config_path: Option<PathBuf>,
@@ -180,7 +176,7 @@ pub(crate) struct Opt {
     #[clap(
         short,
         long = "supergraph",
-        parse(from_os_str),
+        value_parser,
         env = "APOLLO_ROUTER_SUPERGRAPH_PATH"
     )]
     supergraph_path: Option<PathBuf>,
@@ -202,16 +198,20 @@ pub(crate) struct Opt {
     apollo_graph_ref: Option<String>,
 
     /// The endpoints (comma separated) polled to fetch the latest supergraph schema.
-    #[clap(long, env, multiple_occurrences(true))]
+    #[clap(long, env, action = ArgAction::Append)]
     // Should be a Vec<Url> when https://github.com/clap-rs/clap/discussions/3796 is solved
     apollo_uplink_endpoints: Option<String>,
 
     /// The time between polls to Apollo uplink. Minimum 10s.
-    #[clap(long, default_value = "10s", parse(try_from_str = humantime::parse_duration), env)]
+    #[clap(long, default_value = "10s", value_parser = humantime::parse_duration, env)]
     apollo_uplink_poll_interval: Duration,
 
+    /// The timeout for an http call to Apollo uplink. Defaults to 30s.
+    #[clap(long, default_value = "30s", value_parser = humantime::parse_duration, env)]
+    apollo_uplink_timeout: Duration,
+
     /// Display version and exit.
-    #[clap(parse(from_flag), long, short = 'V')]
+    #[clap(action = ArgAction::SetTrue, long, short = 'V')]
     pub(crate) version: bool,
 }
 
@@ -493,6 +493,7 @@ impl Executable {
                     apollo_graph_ref,
                     urls: uplink_endpoints,
                     poll_interval: opt.apollo_uplink_poll_interval,
+                    timeout: opt.apollo_uplink_timeout
                 }
             }
             _ => {
@@ -574,16 +575,14 @@ fn copy_args_to_env() {
     let matches = Opt::command().get_matches();
     Opt::command().get_arguments().for_each(|a| {
         if let Some(env) = a.get_env() {
-            if a.is_allow_invalid_utf8_set() {
-                if let Some(value) = matches.get_one::<OsString>(a.get_id()) {
-                    env::set_var(env, value);
-                }
-            } else if let Ok(Some(value)) = matches.try_get_one::<PathBuf>(a.get_id()) {
+            if let Ok(Some(value)) = matches.try_get_one::<PathBuf>(a.get_id().as_str()) {
                 env::set_var(env, value);
-            } else if let Ok(Some(value)) = matches.try_get_one::<String>(a.get_id()) {
+            } else if let Ok(Some(value)) = matches.try_get_one::<String>(a.get_id().as_str()) {
                 env::set_var(env, value);
-            } else if let Ok(Some(value)) = matches.try_get_one::<bool>(a.get_id()) {
+            } else if let Ok(Some(value)) = matches.try_get_one::<bool>(a.get_id().as_str()) {
                 env::set_var(env, value.to_string());
+            } else if let Ok(Some(value)) = matches.try_get_one::<OsString>(a.get_id().as_str()) {
+                env::set_var(env, value);
             }
         }
     });
diff --git a/apollo-router/src/files.rs b/apollo-router/src/files.rs
index abfbc8b71b..62331585c1 100644
--- a/apollo-router/src/files.rs
+++ b/apollo-router/src/files.rs
@@ -1,11 +1,24 @@
 use std::path::Path;
+use std::path::PathBuf;
 use std::time::Duration;
 
 use futures::channel::mpsc;
 use futures::prelude::*;
+use notify::event::DataChange;
+use notify::event::MetadataKind;
+use notify::event::ModifyKind;
+use notify::Config;
+use notify::EventKind;
+use notify::PollWatcher;
 use notify::RecursiveMode;
 use notify::Watcher;
 
+#[cfg(not(test))]
+const DEFAULT_WATCH_DURATION: Duration = Duration::from_secs(3);
+
+#[cfg(test)]
+const DEFAULT_WATCH_DURATION: Duration = Duration::from_millis(100);
+
 /// Creates a stream events whenever the file at the path has changes. The stream never terminates
 /// and must be dropped to finish watching.
 ///
@@ -16,17 +29,35 @@ use notify::Watcher;
 /// returns: impl Stream<Item=()>
 ///
 pub(crate) fn watch(path: &Path) -> impl Stream<Item = ()> {
+    watch_with_duration(path, DEFAULT_WATCH_DURATION)
+}
+
+fn watch_with_duration(path: &Path, duration: Duration) -> impl Stream<Item = ()> {
+    // Due to the vagaries of file watching across multiple platforms, instead of watching the
+    // supplied path (file), we are going to watch the parent (directory) of the path.
+    let config_file_path = PathBuf::from(path);
+    let watched_path = config_file_path.clone();
+
     let (mut watch_sender, watch_receiver) = mpsc::channel(1);
-    let mut watcher =
-        notify::recommended_watcher(move |res: Result<notify::Event, notify::Error>| match res {
+    // We can't use the recommended watcher, because there's just too much variation across
+    // platforms and file systems. We use the Poll Watcher, which is implemented consistently
+    // across all platforms. Less reactive than other mechanisms, but at least it's predictable
+    // across all environments. We compare contents as well, which reduces false positives with
+    // some additional processing burden.
+    let config = Config::default()
+        .with_poll_interval(duration)
+        .with_compare_contents(true);
+    let mut watcher = PollWatcher::new(
+        move |res: Result<notify::Event, notify::Error>| match res {
             Ok(event) => {
-                // We are only interested in  modify events.
-                // We don't want to lose events and a slow consumer could make us
-                // miss an event notification without a re-send strategy.
-                // If we can't send the event because the channel is full, wait
-                // for a short while and try again. Otherwise, we will panic
-                // because it's a non-recoverable error.
-                if let notify::event::EventKind::Modify(_) = event.kind {
+                // The two kinds of events of interest to use are writes to the metadata of a
+                // watched file and changes to the data of a watched file
+                if matches!(
+                    event.kind,
+                    EventKind::Modify(ModifyKind::Metadata(MetadataKind::WriteTime))
+                        | EventKind::Modify(ModifyKind::Data(DataChange::Any))
+                ) && event.paths.contains(&watched_path)
+                {
                     loop {
                         match watch_sender.try_send(()) {
                             Ok(_) => break,
@@ -45,12 +76,14 @@ pub(crate) fn watch(path: &Path) -> impl Stream<Item = ()> {
                     }
                 }
             }
-            Err(e) => eprintln!("event error: {:?}", e),
-        })
-        .unwrap_or_else(|_| panic!("could not create watch on: {:?}", path));
+            Err(e) => tracing::error!("event error: {:?}", e),
+        },
+        config,
+    )
+    .unwrap_or_else(|_| panic!("could not create watch on: {:?}", config_file_path));
     watcher
-        .watch(path, RecursiveMode::NonRecursive)
-        .unwrap_or_else(|_| panic!("could not watch: {:?}", path));
+        .watch(&config_file_path, RecursiveMode::NonRecursive)
+        .unwrap_or_else(|_| panic!("could not watch: {:?}", config_file_path));
     // Tell watchers once they should read the file once,
     // then listen to fs events.
     stream::once(future::ready(()))
@@ -59,7 +92,7 @@ pub(crate) fn watch(path: &Path) -> impl Stream<Item = ()> {
             // This exists to give the stream ownership of the hotwatcher.
             // Without it hotwatch will get dropped and the stream will terminate.
             // This code never actually gets run.
-            //The ideal would be that hotwatch implements a stream and
+            // The ideal would be that hotwatch implements a stream and
             // therefore we don't need this hackery.
             drop(watcher);
         }))
@@ -82,26 +115,24 @@ pub(crate) mod tests {
     #[test(tokio::test)]
     async fn basic_watch() {
         let (path, mut file) = create_temp_file();
-        let mut watch = watch(&path);
+        let mut watch = watch_with_duration(&path, Duration::from_millis(100));
         // This test can be very racy. Without synchronisation, all
         // we can hope is that if we wait long enough between each
         // write/flush then the future will become ready.
         // Signal telling us we are ready
         assert!(futures::poll!(watch.next()).is_ready());
-        write_and_flush(&mut file, "Some data").await;
+        write_and_flush(&mut file, "Some data 1").await;
         assert!(futures::poll!(watch.next()).is_ready());
-        write_and_flush(&mut file, "Some data").await;
+        write_and_flush(&mut file, "Some data 2").await;
         assert!(futures::poll!(watch.next()).is_ready())
     }
 
-    #[cfg(test)]
     pub(crate) fn create_temp_file() -> (PathBuf, File) {
         let path = temp_dir().join(format!("{}", uuid::Uuid::new_v4()));
         let file = std::fs::File::create(&path).unwrap();
         (path, file)
     }
 
-    #[cfg(test)]
     pub(crate) async fn write_and_flush(file: &mut File, contents: &str) {
         file.seek(SeekFrom::Start(0)).unwrap();
         file.set_len(0).unwrap();
diff --git a/apollo-router/src/graphql.rs b/apollo-router/src/graphql.rs
index 38e0a8d1f4..fd51a97b0f 100644
--- a/apollo-router/src/graphql.rs
+++ b/apollo-router/src/graphql.rs
@@ -4,6 +4,7 @@ use std::fmt;
 use std::pin::Pin;
 
 use futures::Stream;
+use heck::ToShoutySnakeCase;
 pub use router_bridge::planner::Location;
 use router_bridge::planner::PlanError;
 use router_bridge::planner::PlanErrorExtensions;
@@ -59,6 +60,7 @@ pub struct Error {
     #[serde(default, skip_serializing_if = "Object::is_empty")]
     pub extensions: Object,
 }
+// Implement getter and getter_mut to not use pub field directly
 
 #[buildstructor::buildstructor]
 impl Error {
@@ -93,13 +95,17 @@ impl Error {
     /// * `.build()`
     ///   Finishes the builder and returns a GraphQL [`Error`].
     #[builder(visibility = "pub")]
-    fn new(
+    fn new<T: Into<String>>(
         message: String,
         locations: Vec<Location>,
         path: Option<Path>,
+        extension_code: T,
         // Skip the `Object` type alias in order to use buildstructor’s map special-casing
-        extensions: JsonMap<ByteString, Value>,
+        mut extensions: JsonMap<ByteString, Value>,
     ) -> Self {
+        extensions
+            .entry("code")
+            .or_insert_with(|| extension_code.into().into());
         Self {
             message,
             locations,
@@ -169,19 +175,58 @@ where
     fn into_graphql_errors(self) -> Result<Vec<Error>, Self>;
 }
 
+/// Trait used to get extension type from an error
+pub(crate) trait ErrorExtension
+where
+    Self: Sized,
+{
+    fn extension_code(&self) -> String {
+        std::any::type_name::<Self>().to_shouty_snake_case()
+    }
+
+    fn custom_extension_details(&self) -> Option<Object> {
+        None
+    }
+}
+
+impl ErrorExtension for PlanError {}
+
 impl From<PlanError> for Error {
     fn from(err: PlanError) -> Self {
+        let extension_code = err.extension_code();
+        let extensions = err
+            .extensions
+            .map(convert_extensions_to_map)
+            .unwrap_or_else(move || {
+                let mut object = Object::new();
+                object.insert("code", extension_code.into());
+                object
+            });
         Self {
             message: err.message.unwrap_or_else(|| String::from("plan error")),
-            extensions: err
-                .extensions
-                .map(convert_extensions_to_map)
-                .unwrap_or_default(),
+            extensions,
             ..Default::default()
         }
     }
 }
 
+impl ErrorExtension for PlannerError {
+    fn extension_code(&self) -> String {
+        match self {
+            PlannerError::WorkerGraphQLError(worker_graphql_error) => worker_graphql_error
+                .extensions
+                .as_ref()
+                .map(|ext| ext.code.clone())
+                .unwrap_or_else(|| worker_graphql_error.extension_code()),
+            PlannerError::WorkerError(worker_error) => worker_error
+                .extensions
+                .as_ref()
+                .map(|ext| ext.code.clone())
+                .unwrap_or_else(|| worker_error.extension_code()),
+        }
+    }
+}
+
 impl From<PlannerError> for Error {
     fn from(err: PlannerError) -> Self {
         match err {
@@ -191,29 +236,40 @@ impl From<PlannerError> for Error {
     }
 }
 
+impl ErrorExtension for WorkerError {}
+
 impl From<WorkerError> for Error {
     fn from(err: WorkerError) -> Self {
+        let extension_code = err.extension_code();
+        let mut extensions = err
+            .extensions
+            .map(convert_extensions_to_map)
+            .unwrap_or_default();
+        extensions.insert("code", extension_code.into());
+
         Self {
             message: err.message.unwrap_or_else(|| String::from("worker error")),
             locations: err.locations.into_iter().map(Location::from).collect(),
-            extensions: err
-                .extensions
-                .map(convert_extensions_to_map)
-                .unwrap_or_default(),
+            extensions,
             ..Default::default()
         }
     }
 }
 
+impl ErrorExtension for WorkerGraphQLError {}
+
 impl From<WorkerGraphQLError> for Error {
     fn from(err: WorkerGraphQLError) -> Self {
+        let extension_code = err.extension_code();
+        let mut extensions = err
+            .extensions
+            .map(convert_extensions_to_map)
+            .unwrap_or_default();
+        extensions.insert("code", extension_code.into());
         Self {
             message: err.message,
             locations: err.locations.into_iter().map(Location::from).collect(),
-            extensions: err
-                .extensions
-                .map(convert_extensions_to_map)
-                .unwrap_or_default(),
+            extensions,
             ..Default::default()
         }
     }
diff --git a/apollo-router/src/http_ext.rs b/apollo-router/src/http_ext.rs
index 0f531898c7..be1b4554ae 100644
--- a/apollo-router/src/http_ext.rs
+++ b/apollo-router/src/http_ext.rs
@@ -13,6 +13,7 @@ use bytes::Bytes;
 use http::header;
 use http::header::HeaderName;
 use http::HeaderValue;
+use mime::APPLICATION_JSON;
 use multimap::MultiMap;
 
 use crate::graphql;
@@ -392,17 +393,6 @@ pub(crate) struct Response<T> {
     pub(crate) inner: http::Response<T>,
 }
 
-#[cfg(test)]
-pub(crate) fn from_response_to_stream(
-    http: http::response::Response<graphql::Response>,
-) -> http::Response<graphql::ResponseStream> {
-    use futures::future::ready;
-    use futures::stream::once;
-    use futures::StreamExt;
-
-    http.map(|body| once(ready(body)).boxed())
-}
-
 impl<T> Deref for Response<T> {
     type Target = http::Response<T>;
 
@@ -453,7 +443,7 @@ impl IntoResponse for Response<graphql::Response> {
             Bytes::from(serde_json::to_vec(&body).expect("body should be serializable; qed"));
         parts.headers.insert(
             header::CONTENT_TYPE,
-            HeaderValue::from_static("application/json"),
+            HeaderValue::from_static(APPLICATION_JSON.essence_str()),
         );
 
         axum::response::Response::from_parts(parts, boxed(http_body::Full::new(json_body_bytes)))
diff --git a/apollo-router/src/http_server_factory.rs b/apollo-router/src/http_server_factory.rs
index 8f185d8d96..0a4c4664fb 100644
--- a/apollo-router/src/http_server_factory.rs
+++ b/apollo-router/src/http_server_factory.rs
@@ -11,7 +11,7 @@ use super::router::ApolloRouterError;
 use crate::configuration::Configuration;
 use crate::configuration::ListenAddr;
 use crate::router_factory::Endpoint;
-use crate::router_factory::SupergraphServiceFactory;
+use crate::router_factory::RouterFactory;
 
 /// Factory for creating the http server component.
 ///
@@ -29,7 +29,7 @@ pub(crate) trait HttpServerFactory {
         extra_endpoints: MultiMap<ListenAddr, Endpoint>,
     ) -> Self::Future
     where
-        RF: SupergraphServiceFactory;
+        RF: RouterFactory;
 }
 
 type MainAndExtraListeners = (Listener, Vec<(ListenAddr, Listener)>);
@@ -99,7 +99,7 @@ impl HttpServerHandle {
     ) -> Result<Self, ApolloRouterError>
     where
         SF: HttpServerFactory,
-        RF: SupergraphServiceFactory,
+        RF: RouterFactory,
     {
         // we tell the currently running server to stop
         if let Err(_err) = self.shutdown_sender.send(()) {
diff --git a/apollo-router/src/introspection.rs b/apollo-router/src/introspection.rs
index 90b00a03d0..7b661d9f8c 100644
--- a/apollo-router/src/introspection.rs
+++ b/apollo-router/src/introspection.rs
@@ -1,5 +1,6 @@
 #[cfg(test)]
 use std::collections::HashMap;
+use std::num::NonZeroUsize;
 
 use router_bridge::introspect;
 use router_bridge::introspect::IntrospectionError;
@@ -10,7 +11,8 @@ use crate::cache::storage::CacheStorage;
 use crate::graphql::Response;
 use crate::Configuration;
 
-const DEFAULT_INTROSPECTION_CACHE_CAPACITY: usize = 5;
+const DEFAULT_INTROSPECTION_CACHE_CAPACITY: NonZeroUsize =
+    unsafe { NonZeroUsize::new_unchecked(5) };
 
 /// A cache containing our well known introspection queries.
 pub(crate) struct Introspection {
@@ -19,7 +21,10 @@ pub(crate) struct Introspection {
 }
 
 impl Introspection {
-    pub(crate) async fn with_capacity(configuration: &Configuration, capacity: usize) -> Self {
+    pub(crate) async fn with_capacity(
+        configuration: &Configuration,
+        capacity: NonZeroUsize,
+    ) -> Self {
         Self {
             cache: CacheStorage::new(capacity, None, "introspection").await,
             defer_support: configuration.supergraph.preview_defer_support,
@@ -35,7 +40,7 @@ impl Introspection {
         configuration: &Configuration,
         cache: HashMap<String, Response>,
     ) -> Self {
-        let this = Self::with_capacity(configuration, cache.len()).await;
+        let this = Self::with_capacity(configuration, cache.len().try_into().unwrap()).await;
 
         for (query, response) in cache.into_iter() {
             this.cache.insert(query, response).await;
diff --git a/apollo-router/src/layers/async_checkpoint.rs b/apollo-router/src/layers/async_checkpoint.rs
index 3495483580..12d6ebe092 100644
--- a/apollo-router/src/layers/async_checkpoint.rs
+++ b/apollo-router/src/layers/async_checkpoint.rs
@@ -158,9 +158,10 @@ mod async_checkpoint_tests {
         execution_service.expect_clone().return_once(move || {
             let mut execution_service = MockExecutionService::new();
             execution_service.expect_call().times(1).returning(
-                move |_req: crate::ExecutionRequest| {
+                move |req: crate::ExecutionRequest| {
                     Ok(ExecutionResponse::fake_builder()
                         .label(expected_label.to_string())
+                        .context(req.context)
                         .build()
                         .unwrap())
                 },
diff --git a/apollo-router/src/layers/map_first_graphql_response.rs b/apollo-router/src/layers/map_first_graphql_response.rs
index 224ab79dd2..1f3328c6b4 100644
--- a/apollo-router/src/layers/map_first_graphql_response.rs
+++ b/apollo-router/src/layers/map_first_graphql_response.rs
@@ -98,14 +98,17 @@ mod tests {
                 .execution_hook(|service| {
                     service
                         .map_first_graphql_response(|_context, http_parts, mut graphql_response| {
-                            graphql_response
-                                .errors
-                                .push(graphql::Error::builder().message("oh no!").build());
+                            graphql_response.errors.push(
+                                graphql::Error::builder()
+                                    .message("oh no!")
+                                    .extension_code("FOO".to_string())
+                                    .build(),
+                            );
                             (http_parts, graphql_response)
                         })
                         .boxed()
                 })
-                .build()
+                .build_supergraph()
                 .await
                 .unwrap()
                 .oneshot(supergraph::Request::canned_builder().build().unwrap())
diff --git a/apollo-router/src/layers/sync_checkpoint.rs b/apollo-router/src/layers/sync_checkpoint.rs
index ba977cd820..aedfca4bbb 100644
--- a/apollo-router/src/layers/sync_checkpoint.rs
+++ b/apollo-router/src/layers/sync_checkpoint.rs
@@ -188,9 +188,10 @@ mod checkpoint_tests {
         execution_service
             .expect_call()
             .times(1)
-            .returning(move |_req: crate::ExecutionRequest| {
+            .returning(move |req: crate::ExecutionRequest| {
                 Ok(ExecutionResponse::fake_builder()
                     .label(expected_label.to_string())
+                    .context(req.context)
                     .build()
                     .unwrap())
             });
diff --git a/apollo-router/src/lib.rs b/apollo-router/src/lib.rs
index 11688cd0d8..43e26b0d82 100644
--- a/apollo-router/src/lib.rs
+++ b/apollo-router/src/lib.rs
@@ -47,7 +47,7 @@ mod json_ext;
 #[macro_use]
 pub mod plugin;
 
-mod axum_factory;
+pub(crate) mod axum_factory;
 mod cache;
 mod configuration;
 mod context;
diff --git a/apollo-router/src/plugin/mod.rs b/apollo-router/src/plugin/mod.rs
index ac52473fb7..d502cde801 100644
--- a/apollo-router/src/plugin/mod.rs
+++ b/apollo-router/src/plugin/mod.rs
@@ -40,9 +40,9 @@ use tower::ServiceBuilder;
 use crate::layers::ServiceBuilderExt;
 use crate::router_factory::Endpoint;
 use crate::services::execution;
+use crate::services::router;
 use crate::services::subgraph;
 use crate::services::supergraph;
-use crate::transport;
 use crate::ListenAddr;
 
 type InstanceFactory =
@@ -182,9 +182,19 @@ pub trait Plugin: Send + Sync + 'static {
     where
         Self: Sized;
 
+    /// This function is EXPERIMENTAL and its signature is subject to change.
+    ///
     /// This service runs at the very beginning and very end of the request lifecycle.
+    /// It's the entrypoint of every requests and also the last hook before sending the response.
     /// Define supergraph_service if your customization needs to interact at the earliest or latest point possible.
     /// For example, this is a good opportunity to perform JWT verification before allowing a request to proceed further.
+    fn router_service(&self, service: router::BoxService) -> router::BoxService {
+        service
+    }
+
+    /// This service runs after the HTTP request payload has been deserialized into a GraphQL request,
+    /// and before the GraphQL response payload is serialized into a raw HTTP response.
+    /// Define supergraph_service if your customization needs to interact at the earliest or latest point possible, yet operates on GraphQL payloads.
     fn supergraph_service(&self, service: supergraph::BoxService) -> supergraph::BoxService {
         service
     }
@@ -246,6 +256,11 @@ pub(crate) trait DynPlugin: Send + Sync + 'static {
     /// It's the entrypoint of every requests and also the last hook before sending the response.
     /// Define supergraph_service if your customization needs to interact at the earliest or latest point possible.
     /// For example, this is a good opportunity to perform JWT verification before allowing a request to proceed further.
+    fn router_service(&self, service: router::BoxService) -> router::BoxService;
+
+    /// This service runs after the HTTP request payload has been deserialized into a GraphQL request,
+    /// and before the GraphQL response payload is serialized into a raw HTTP response.
+    /// Define supergraph_service if your customization needs to interact at the earliest or latest point possible, yet operates on GraphQL payloads.
     fn supergraph_service(&self, service: supergraph::BoxService) -> supergraph::BoxService;
 
     /// This service handles initiating the execution of a query plan after it's been generated.
@@ -276,6 +291,10 @@ where
     T: Plugin,
     for<'de> <T as Plugin>::Config: Deserialize<'de>,
 {
+    fn router_service(&self, service: router::BoxService) -> router::BoxService {
+        self.router_service(service)
+    }
+
     fn supergraph_service(&self, service: supergraph::BoxService) -> supergraph::BoxService {
         self.supergraph_service(service)
     }
@@ -325,19 +344,19 @@ macro_rules! register_plugin {
 /// Handler represents a [`Plugin`] endpoint.
 #[derive(Clone)]
 pub(crate) struct Handler {
-    service: Buffer<transport::BoxService, transport::Request>,
+    service: Buffer<router::BoxService, router::Request>,
 }
 
 impl Handler {
-    pub(crate) fn new(service: transport::BoxService) -> Self {
+    pub(crate) fn new(service: router::BoxService) -> Self {
         Self {
             service: ServiceBuilder::new().buffered().service(service),
         }
     }
 }
 
-impl Service<transport::Request> for Handler {
-    type Response = transport::Response;
+impl Service<router::Request> for Handler {
+    type Response = router::Response;
     type Error = BoxError;
     type Future = ResponseFuture<BoxFuture<'static, Result<Self::Response, Self::Error>>>;
 
@@ -345,13 +364,13 @@ impl Service<transport::Request> for Handler {
         self.service.poll_ready(cx)
     }
 
-    fn call(&mut self, req: transport::Request) -> Self::Future {
+    fn call(&mut self, req: router::Request) -> Self::Future {
         self.service.call(req)
     }
 }
 
-impl From<transport::BoxService> for Handler {
-    fn from(original: transport::BoxService) -> Self {
+impl From<router::BoxService> for Handler {
+    fn from(original: router::BoxService) -> Self {
         Self::new(original)
     }
 }
diff --git a/apollo-router/src/plugin/test/mock/subgraph.rs b/apollo-router/src/plugin/test/mock/subgraph.rs
index 528e351d60..435ad56543 100644
--- a/apollo-router/src/plugin/test/mock/subgraph.rs
+++ b/apollo-router/src/plugin/test/mock/subgraph.rs
@@ -101,6 +101,7 @@ impl Service<SubgraphRequest> for MockSubgraph {
                     "couldn't find mock for query {}",
                     serde_json::to_string(&req.subgraph_request.body()).unwrap()
                 ))
+                .extension_code("FETCH_ERROR".to_string())
                 .extensions(self.extensions.clone().unwrap_or_default())
                 .build();
             SubgraphResponse::fake_builder()
diff --git a/apollo-router/src/plugin/test/mod.rs b/apollo-router/src/plugin/test/mod.rs
index 7957078a2a..50a4e40218 100644
--- a/apollo-router/src/plugin/test/mod.rs
+++ b/apollo-router/src/plugin/test/mod.rs
@@ -35,7 +35,7 @@ impl SubgraphServiceFactory for MockSubgraphFactory {
             SubgraphRequest,
         >>::Future;
 
-    fn new_service(&self, name: &str) -> Option<Self::SubgraphService> {
+    fn create(&self, name: &str) -> Option<Self::SubgraphService> {
         self.subgraphs.get(name).map(|service| {
             self.plugins
                 .iter()
diff --git a/apollo-router/src/plugins/csrf.rs b/apollo-router/src/plugins/csrf.rs
index f31b7ef1c0..bd9df27837 100644
--- a/apollo-router/src/plugins/csrf.rs
+++ b/apollo-router/src/plugins/csrf.rs
@@ -15,7 +15,6 @@ use crate::plugin::Plugin;
 use crate::plugin::PluginInit;
 use crate::register_plugin;
 use crate::services::supergraph;
-use crate::SupergraphRequest;
 use crate::SupergraphResponse;
 
 /// CSRF Configuration.
@@ -105,7 +104,7 @@ impl Plugin for Csrf {
         if !self.config.unsafe_disabled {
             let required_headers = self.config.required_headers.clone();
             ServiceBuilder::new()
-                .checkpoint(move |req: SupergraphRequest| {
+                .checkpoint(move |req: supergraph::Request| {
                     if is_preflighted(&req, required_headers.as_slice()) {
                         tracing::trace!("request is preflighted");
                         Ok(ControlFlow::Continue(req))
@@ -118,7 +117,9 @@ impl Plugin for Csrf {
                                 or provide one of the following headers: {}", 
                                 NON_PREFLIGHTED_CONTENT_TYPES.join(", "),
                                 required_headers.join(", ")
-                            )).build();
+                            ))
+                            .extension_code("CSRF_ERROR")
+                            .build();
                         let res = SupergraphResponse::builder()
                             .error(error)
                             .status_code(StatusCode::BAD_REQUEST)
@@ -143,7 +144,7 @@ impl Plugin for Csrf {
 // - The only headers added by javascript code are part of the cors safelisted request headers (Accept,Accept-Language,Content-Language,Content-Type, and simple Range
 //
 // Given the first step is covered in our web browser, we'll take care of the two other steps below:
-fn is_preflighted(req: &SupergraphRequest, required_headers: &[String]) -> bool {
+fn is_preflighted(req: &supergraph::Request, required_headers: &[String]) -> bool {
     let headers = req.supergraph_request.headers();
     content_type_requires_preflight(headers)
         || recommended_header_is_provided(headers, required_headers)
@@ -228,6 +229,7 @@ mod csrf_tests {
     }
 
     use http::header::CONTENT_TYPE;
+    use mime::APPLICATION_JSON;
     use serde_json_bytes::json;
     use tower::ServiceExt;
 
@@ -237,13 +239,13 @@ mod csrf_tests {
     #[tokio::test]
     async fn it_lets_preflighted_request_pass_through() {
         let config = CSRFConfig::default();
-        let with_preflight_content_type = SupergraphRequest::fake_builder()
-            .header(CONTENT_TYPE, "application/json")
+        let with_preflight_content_type = supergraph::Request::fake_builder()
+            .header(CONTENT_TYPE, APPLICATION_JSON.essence_str())
             .build()
             .unwrap();
         assert_accepted(config.clone(), with_preflight_content_type).await;
 
-        let with_preflight_header = SupergraphRequest::fake_builder()
+        let with_preflight_header = supergraph::Request::fake_builder()
             .header("apollo-require-preflight", "this-is-a-test")
             .build()
             .unwrap();
@@ -253,7 +255,7 @@ mod csrf_tests {
     #[tokio::test]
     async fn it_rejects_non_preflighted_headers_request() {
         let config = CSRFConfig::default();
-        let mut non_preflighted_request = SupergraphRequest::fake_builder().build().unwrap();
+        let mut non_preflighted_request = supergraph::Request::fake_builder().build().unwrap();
         // fake_builder defaults to `Content-Type: application/json`,
         // specifically to avoid the case we’re testing here.
         non_preflighted_request
@@ -266,13 +268,13 @@ mod csrf_tests {
     #[tokio::test]
     async fn it_rejects_non_preflighted_content_type_request() {
         let config = CSRFConfig::default();
-        let non_preflighted_request = SupergraphRequest::fake_builder()
+        let non_preflighted_request = supergraph::Request::fake_builder()
             .header(CONTENT_TYPE, "text/plain")
             .build()
             .unwrap();
         assert_rejected(config.clone(), non_preflighted_request).await;
 
-        let non_preflighted_request = SupergraphRequest::fake_builder()
+        let non_preflighted_request = supergraph::Request::fake_builder()
             .header(CONTENT_TYPE, "text/plain; charset=utf8")
             .build()
             .unwrap();
@@ -285,11 +287,11 @@ mod csrf_tests {
             unsafe_disabled: true,
             ..Default::default()
         };
-        let non_preflighted_request = SupergraphRequest::fake_builder().build().unwrap();
+        let non_preflighted_request = supergraph::Request::fake_builder().build().unwrap();
         assert_accepted(config, non_preflighted_request).await
     }
 
-    async fn assert_accepted(config: CSRFConfig, request: SupergraphRequest) {
+    async fn assert_accepted(config: CSRFConfig, request: supergraph::Request) {
         let mut mock_service = MockSupergraphService::new();
         mock_service.expect_call().times(1).returning(move |_| {
             Ok(SupergraphResponse::fake_builder()
@@ -314,7 +316,7 @@ mod csrf_tests {
         assert_eq!(res.data.unwrap(), json!({ "test": 1234_u32 }));
     }
 
-    async fn assert_rejected(config: CSRFConfig, request: SupergraphRequest) {
+    async fn assert_rejected(config: CSRFConfig, request: supergraph::Request) {
         let service_stack = Csrf::new(PluginInit::new(config, Default::default()))
             .await
             .unwrap()
diff --git a/apollo-router/src/plugins/expose_query_plan.rs b/apollo-router/src/plugins/expose_query_plan.rs
index e74fdd3591..058ec68678 100644
--- a/apollo-router/src/plugins/expose_query_plan.rs
+++ b/apollo-router/src/plugins/expose_query_plan.rs
@@ -141,7 +141,7 @@ mod tests {
 
     static VALID_QUERY: &str = r#"query TopProducts($first: Int) { topProducts(first: $first) { upc name reviews { id product { name } author { id name } } } }"#;
 
-    async fn build_mock_supergraph(plugin: Box<dyn DynPlugin>) -> supergraph::BoxCloneService {
+    async fn build_mock_supergraph(plugin: Box<dyn DynPlugin>) -> supergraph::BoxService {
         let mut extensions = Object::new();
         extensions.insert("test", Value::String(ByteString::from("value")));
 
@@ -185,7 +185,7 @@ mod tests {
             .with_subgraph_service("reviews", review_service.clone())
             .with_subgraph_service("products", product_service.clone());
 
-        builder.build().await.expect("should build").test_service()
+        builder.build().await.expect("should build").make().boxed()
     }
 
     async fn get_plugin(config: &jValue) -> Box<dyn DynPlugin> {
@@ -200,7 +200,7 @@ mod tests {
     async fn execute_supergraph_test(
         query: &str,
         body: &Response,
-        mut supergraph_service: supergraph::BoxCloneService,
+        mut supergraph_service: supergraph::BoxService,
     ) {
         let request = supergraph::Request::fake_builder()
             .query(query.to_string())
@@ -226,15 +226,20 @@ mod tests {
     #[tokio::test]
     async fn it_expose_query_plan() {
         let plugin = get_plugin(&serde_json::json!(true)).await;
-        let supergraph = build_mock_supergraph(plugin).await;
         execute_supergraph_test(
             VALID_QUERY,
             &EXPECTED_RESPONSE_WITH_QUERY_PLAN,
-            supergraph.clone(),
+            build_mock_supergraph(plugin).await,
         )
         .await;
         // let's try that again
-        execute_supergraph_test(VALID_QUERY, &EXPECTED_RESPONSE_WITH_QUERY_PLAN, supergraph).await;
+        let plugin = get_plugin(&serde_json::json!(true)).await;
+        execute_supergraph_test(
+            VALID_QUERY,
+            &EXPECTED_RESPONSE_WITH_QUERY_PLAN,
+            build_mock_supergraph(plugin).await,
+        )
+        .await;
     }
 
     #[tokio::test]
diff --git a/apollo-router/src/plugins/external.rs b/apollo-router/src/plugins/external.rs
new file mode 100644
index 0000000000..661182c742
--- /dev/null
+++ b/apollo-router/src/plugins/external.rs
@@ -0,0 +1,505 @@
+//! Externalization plugin
+// With regards to ELv2 licensing, this entire file is license key functionality
+
+use std::collections::HashMap;
+use std::fmt;
+use std::ops::ControlFlow;
+use std::str::FromStr;
+use std::sync::Arc;
+use std::time::Duration;
+
+use bytes::Bytes;
+use http::header::HeaderName;
+use http::HeaderMap;
+use http::HeaderValue;
+use hyper::body;
+use hyper::Body;
+use schemars::JsonSchema;
+use serde::de::DeserializeOwned;
+use serde::Deserialize;
+use serde::Serialize;
+use tower::util::MapFutureLayer;
+use tower::BoxError;
+use tower::ServiceBuilder;
+use tower::ServiceExt;
+
+use crate::error::Error;
+use crate::external::Externalizable;
+use crate::external::PipelineStep;
+use crate::layers::async_checkpoint::AsyncCheckpointLayer;
+use crate::layers::ServiceBuilderExt;
+use crate::plugin::Plugin;
+use crate::plugin::PluginInit;
+use crate::register_plugin;
+use crate::services::external::Control;
+use crate::services::router;
+use crate::Context;
+
+pub(crate) const EXTERNAL_SPAN_NAME: &str = "external plugin";
+
+#[derive(Debug)]
+struct ExternalPlugin {
+    configuration: Conf,
+    sdl: Arc<String>,
+}
+
+#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize, JsonSchema)]
+struct BaseConf {
+    #[serde(default)]
+    headers: bool,
+    #[serde(default)]
+    context: bool,
+    #[serde(default)]
+    body: bool,
+    #[serde(default)]
+    sdl: bool,
+}
+
+#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize, JsonSchema)]
+struct RouterStage {
+    #[serde(default)]
+    request: Option<BaseConf>,
+    #[serde(default)]
+    response: Option<BaseConf>,
+}
+
+#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize, JsonSchema)]
+struct Stages {
+    #[serde(default)]
+    router: Option<RouterStage>,
+}
+
+#[derive(Clone, Debug, Default, Deserialize, JsonSchema)]
+struct Conf {
+    // The url you'd like to offload processing to
+    url: String,
+    // The timeout for external requests
+    #[serde(deserialize_with = "humantime_serde::deserialize", default)]
+    #[schemars(with = "String", default)]
+    timeout: Option<Duration>,
+    // The stages request/response configuration
+    #[serde(default)]
+    stages: Option<Stages>,
+}
+
+#[async_trait::async_trait]
+impl Plugin for ExternalPlugin {
+    type Config = Conf;
+
+    async fn new(init: PluginInit<Self::Config>) -> Result<Self, BoxError> {
+        Ok(ExternalPlugin {
+            configuration: init.config,
+            sdl: init.supergraph_sdl,
+        })
+    }
+
+    fn router_service(&self, service: router::BoxService) -> router::BoxService {
+        let request_sdl = self.sdl.clone();
+        let response_sdl = self.sdl.clone();
+
+        let request_full_config = self.configuration.clone();
+        let response_full_config = self.configuration.clone();
+
+        let request_layer = if self
+            .configuration
+            .stages
+            .as_ref()
+            .and_then(|x| x.router.as_ref())
+            .and_then(|x| x.request.as_ref())
+            .is_some()
+        {
+            // Safe to unwrap here because we just confirmed that all optional elements are present
+            let request_config = request_full_config
+                .stages
+                .unwrap()
+                .router
+                .unwrap()
+                .request
+                .unwrap();
+            Some(AsyncCheckpointLayer::new(
+                move |mut request: router::Request| {
+                    let my_sdl = request_sdl.to_string();
+                    let proto_url = request_full_config.url.clone();
+                    let timeout = request_full_config.timeout;
+                    let request_config = request_config.clone();
+                    async move {
+                        // Call into our out of process processor with a body of our body
+                        // First, extract the data we need from our request and prepare our
+                        // external call. Use our configuration to figure out which data to send.
+
+                        let (parts, body) = request.router_request.into_parts();
+                        let b_bytes = body::to_bytes(body).await?;
+
+                        let (headers, payload, context, sdl) = prepare_external_params(
+                            &request_config,
+                            &parts.headers,
+                            &b_bytes,
+                            &request.context,
+                            my_sdl,
+                        )?;
+
+                        // Second, call our co-processor and get a reply.
+                        let co_processor_output = call_external(
+                            proto_url,
+                            timeout,
+                            PipelineStep::RouterRequest,
+                            headers,
+                            payload,
+                            context,
+                            sdl,
+                        )
+                        .await?;
+
+                        tracing::debug!(?co_processor_output, "co-processor returned");
+
+                        // Thirdly, we need to interpret the control flow which may have been
+                        // updated by our co-processor and decide if we should proceed or stop.
+
+                        if matches!(co_processor_output.control, Control::Break(_)) {
+                            // Ensure the code is a valid http status code
+                            let code = co_processor_output.control.get_http_status()?;
+
+                            let res = if !code.is_success() {
+                                router::Response::error_builder()
+                                    .errors(vec![Error {
+                                        message: co_processor_output
+                                            .body
+                                            .unwrap_or(serde_json::Value::Null)
+                                            .to_string(),
+                                        ..Default::default()
+                                    }])
+                                    .status_code(code)
+                                    .context(request.context)
+                                    .build()?
+                            } else {
+                                router::Response::builder()
+                                    .data(
+                                        co_processor_output
+                                            .body
+                                            .unwrap_or(serde_json::Value::Null)
+                                            .to_string(),
+                                    )
+                                    .status_code(code)
+                                    .context(request.context)
+                                    .build()?
+                            };
+                            return Ok(ControlFlow::Break(res));
+                        }
+
+                        // Finally, process our reply and act on the contents. Our processing logic is
+                        // that we replace "bits" of our incoming request with the updated bits if they
+                        // are present in our co_processor_output.
+
+                        let new_body = match co_processor_output.body {
+                            Some(bytes) => Body::from(serde_json::to_vec(&bytes)?),
+                            None => Body::from(b_bytes),
+                        };
+
+                        request.router_request = http::Request::from_parts(parts, new_body);
+
+                        if let Some(context) = co_processor_output.context {
+                            request.context = context;
+                        }
+
+                        if let Some(headers) = co_processor_output.headers {
+                            *request.router_request.headers_mut() =
+                                internalize_header_map(headers)?;
+                        }
+
+                        Ok(ControlFlow::Continue(request))
+                    }
+                },
+            ))
+        } else {
+            None
+        };
+
+        let response_layer = if self
+            .configuration
+            .stages
+            .as_ref()
+            .and_then(|x| x.router.as_ref())
+            .and_then(|x| x.response.as_ref())
+            .is_some()
+        {
+            // Safe to unwrap here because we just confirmed that all optional elements are present
+            let response_config = response_full_config
+                .stages
+                .unwrap()
+                .router
+                .unwrap()
+                .response
+                .unwrap();
+            Some(MapFutureLayer::new(move |fut| {
+                let my_sdl = response_sdl.to_string();
+                let proto_url = response_full_config.url.clone();
+                let timeout = response_full_config.timeout;
+                let response_config = response_config.clone();
+                async move {
+                    let mut response: router::Response = fut.await?;
+
+                    // Call into our out of process processor with a body of our body
+                    // First, extract the data we need from our response and prepare our
+                    // external call. Use our configuration to figure out which data to send.
+
+                    let (parts, body) = response.response.into_parts();
+                    let b_bytes = body::to_bytes(body).await?;
+
+                    let (headers, payload, context, sdl) = prepare_external_params(
+                        &response_config,
+                        &parts.headers,
+                        &b_bytes,
+                        &response.context,
+                        my_sdl,
+                    )?;
+
+                    // Second, call our co-processor and get a reply.
+                    let co_processor_output = call_external(
+                        proto_url,
+                        timeout,
+                        PipelineStep::RouterResponse,
+                        headers,
+                        payload,
+                        context,
+                        sdl,
+                    )
+                    .await?;
+
+                    tracing::debug!(?co_processor_output, "co-processor returned");
+
+                    // Third, process our reply and act on the contents. Our processing logic is
+                    // that we replace "bits" of our incoming response with the updated bits if they
+                    // are present in our co_processor_output. If they aren't present, just use the
+                    // bits that we sent to the co_processor.
+
+                    let new_body = match co_processor_output.body {
+                        Some(bytes) => Body::from(serde_json::to_vec(&bytes)?),
+                        None => Body::from(b_bytes),
+                    };
+
+                    response.response = http::Response::from_parts(parts, new_body);
+
+                    if let Some(context) = co_processor_output.context {
+                        response.context = context;
+                    }
+
+                    if let Some(headers) = co_processor_output.headers {
+                        *response.response.headers_mut() = internalize_header_map(headers)?;
+                    }
+
+                    Ok::<router::Response, BoxError>(response)
+                }
+            }))
+        } else {
+            None
+        };
+
+        fn external_service_span() -> impl Fn(&router::Request) -> tracing::Span + Clone {
+            move |_request: &router::Request| {
+                tracing::info_span!(
+                    EXTERNAL_SPAN_NAME,
+                    "external service" = stringify!(router::Request),
+                    "otel.kind" = "INTERNAL"
+                )
+            }
+        }
+
+        ServiceBuilder::new()
+            .instrument(external_service_span())
+            .option_layer(request_layer)
+            .option_layer(response_layer)
+            .buffer(20_000)
+            .service(service)
+            .boxed()
+    }
+}
+
+type ExternalParams<'a> = (
+    Option<&'a HeaderMap<HeaderValue>>,
+    Option<serde_json::Value>,
+    Option<Context>,
+    Option<String>,
+);
+
+fn prepare_external_params<'a>(
+    config: &'a BaseConf,
+    headers: &'a HeaderMap<HeaderValue>,
+    bytes: &'a Bytes,
+    context: &'a Context,
+    sdl: String,
+) -> Result<ExternalParams<'a>, BoxError> {
+    let mut headers_opt = None;
+    // Note: We have to specify the json type or it won't deserialize correctly...
+    // let mut payload_opt: Option<serde_json::Value> = None;
+    let mut payload_opt: Option<serde_json::Value> = None;
+    let mut context_opt = None;
+    let mut sdl_opt = None;
+
+    if config.body || config.headers {
+        if config.body {
+            payload_opt = Some(serde_json::from_slice(bytes)?);
+        }
+        if config.headers {
+            headers_opt = Some(headers);
+        }
+    }
+    if config.context {
+        context_opt = Some(context.clone());
+    }
+    if config.sdl {
+        sdl_opt = Some(sdl);
+    }
+    Ok((headers_opt, payload_opt, context_opt, sdl_opt))
+}
+
+async fn call_external<T>(
+    url: String,
+    timeout: Option<Duration>,
+    stage: PipelineStep,
+    headers: Option<&HeaderMap<HeaderValue>>,
+    payload: Option<T>,
+    context: Option<Context>,
+    sdl: Option<String>,
+) -> Result<Externalizable<T>, BoxError>
+where
+    T: fmt::Debug + DeserializeOwned + Serialize + Send + Sync + 'static,
+{
+    let mut converted_headers = None;
+    if let Some(hdrs) = headers {
+        converted_headers = Some(externalize_header_map(hdrs)?);
+    };
+    let output = Externalizable::new(stage, converted_headers, payload, context, sdl);
+    tracing::debug!(?output, "externalized output");
+    output.call(&url, timeout).await
+}
+
+/// Convert a HeaderMap into a HashMap
+fn externalize_header_map(
+    input: &HeaderMap<HeaderValue>,
+) -> Result<HashMap<String, Vec<String>>, BoxError> {
+    let mut output = HashMap::new();
+    for (k, v) in input {
+        let k = k.as_str().to_owned();
+        let v = String::from_utf8(v.as_bytes().to_vec()).map_err(|e| e.to_string())?;
+        output.entry(k).or_insert_with(Vec::new).push(v)
+    }
+    Ok(output)
+}
+
+/// Convert a HashMap into a HeaderMap
+fn internalize_header_map(
+    input: HashMap<String, Vec<String>>,
+) -> Result<HeaderMap<HeaderValue>, BoxError> {
+    let mut output = HeaderMap::new();
+    for (k, values) in input {
+        for v in values {
+            let key = HeaderName::from_str(k.as_ref())?;
+            let value = HeaderValue::from_str(v.as_ref())?;
+            output.append(key, value);
+        }
+    }
+    Ok(output)
+}
+
+// This macro allows us to use it in our plugin registry!
+// register_plugin takes a group name, and a plugin name.
+//
+// In order to keep the plugin names consistent,
+// we use using the `Reverse domain name notation`
+register_plugin!("experimental", "external", ExternalPlugin);
+
+#[cfg(test)]
+mod tests {
+    use http::header::ACCEPT;
+    use http::header::CONTENT_TYPE;
+    use http::HeaderMap;
+    use http::HeaderValue;
+    use mime::APPLICATION_JSON;
+    use mime::TEXT_HTML;
+
+    use super::*;
+
+    #[tokio::test]
+    async fn load_plugin() {
+        let config = serde_json::json!({
+            "plugins": {
+                "experimental.external": {
+                    "url": "http://127.0.0.1:8081"
+                }
+            }
+        });
+        // Build a test harness. Usually we'd use this and send requests to
+        // it, but in this case it's enough to build the harness to see our
+        // output when our service registers.
+        let _test_harness = crate::TestHarness::builder()
+            .configuration_json(config)
+            .unwrap()
+            .build_router()
+            .await
+            .unwrap();
+    }
+
+    #[test]
+    fn it_externalizes_headers() {
+        // Build our expected HashMap
+        let mut expected = HashMap::new();
+
+        expected.insert(
+            "content-type".to_string(),
+            vec![APPLICATION_JSON.essence_str().to_string()],
+        );
+
+        expected.insert(
+            "accept".to_string(),
+            vec![
+                APPLICATION_JSON.essence_str().to_string(),
+                TEXT_HTML.essence_str().to_string(),
+            ],
+        );
+
+        let mut external_form = HeaderMap::new();
+
+        external_form.insert(
+            CONTENT_TYPE,
+            HeaderValue::from_static(APPLICATION_JSON.essence_str()),
+        );
+
+        external_form.insert(
+            ACCEPT,
+            HeaderValue::from_static(APPLICATION_JSON.essence_str()),
+        );
+
+        external_form.append(ACCEPT, HeaderValue::from_static(TEXT_HTML.essence_str()));
+
+        let actual = externalize_header_map(&external_form).expect("externalized header map");
+
+        assert_eq!(expected, actual);
+    }
+
+    #[test]
+    fn it_internalizes_headers() {
+        // Build our expected HeaderMap
+        let mut expected = HeaderMap::new();
+
+        expected.insert(
+            ACCEPT,
+            HeaderValue::from_static(APPLICATION_JSON.essence_str()),
+        );
+
+        expected.append(ACCEPT, HeaderValue::from_static(TEXT_HTML.essence_str()));
+
+        let mut external_form = HashMap::new();
+
+        external_form.insert(
+            "accept".to_string(),
+            vec![
+                APPLICATION_JSON.essence_str().to_string(),
+                TEXT_HTML.essence_str().to_string(),
+            ],
+        );
+
+        let actual = internalize_header_map(external_form).expect("internalized header map");
+
+        assert_eq!(expected, actual);
+    }
+}
diff --git a/apollo-router/src/plugins/forbid_mutations.rs b/apollo-router/src/plugins/forbid_mutations.rs
index a266504406..978b2e8e2e 100644
--- a/apollo-router/src/plugins/forbid_mutations.rs
+++ b/apollo-router/src/plugins/forbid_mutations.rs
@@ -34,12 +34,10 @@ impl Plugin for ForbidMutations {
             ServiceBuilder::new()
                 .checkpoint(|req: ExecutionRequest| {
                     if req.query_plan.contains_mutations() {
-                        let error = Error {
-                            message: "Mutations are forbidden".to_string(),
-                            locations: Default::default(),
-                            path: Default::default(),
-                            extensions: Default::default(),
-                        };
+                        let error = Error::builder()
+                            .message("Mutations are forbidden".to_string())
+                            .extension_code("MUTATION_FORBIDDEN")
+                            .build();
                         let res = ExecutionResponse::builder()
                             .error(error)
                             .status_code(StatusCode::BAD_REQUEST)
@@ -102,12 +100,10 @@ mod forbid_http_get_mutations_tests {
 
     #[tokio::test]
     async fn it_doesnt_let_mutations_pass_through() {
-        let expected_error = Error {
-            message: "Mutations are forbidden".to_string(),
-            locations: Default::default(),
-            path: Default::default(),
-            extensions: Default::default(),
-        };
+        let expected_error = Error::builder()
+            .message("Mutations are forbidden".to_string())
+            .extension_code("MUTATION_FORBIDDEN")
+            .build();
         let expected_status = StatusCode::BAD_REQUEST;
 
         let service_stack = ForbidMutations::new(PluginInit::new(true, Default::default()))
diff --git a/apollo-router/src/plugins/include_subgraph_errors.rs b/apollo-router/src/plugins/include_subgraph_errors.rs
index e17cfff077..f3d08b232a 100644
--- a/apollo-router/src/plugins/include_subgraph_errors.rs
+++ b/apollo-router/src/plugins/include_subgraph_errors.rs
@@ -1,26 +1,18 @@
 use std::collections::HashMap;
 
-use once_cell::sync::Lazy;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use tower::BoxError;
 use tower::ServiceExt;
 
-use crate::error::Error as SubgraphError;
+use crate::json_ext::Object;
 use crate::plugin::Plugin;
 use crate::plugin::PluginInit;
 use crate::register_plugin;
 use crate::services::subgraph;
 use crate::SubgraphResponse;
 
-#[allow(clippy::field_reassign_with_default)]
-static REDACTED_ERROR_MESSAGE: Lazy<Vec<SubgraphError>> = Lazy::new(|| {
-    let mut error: SubgraphError = Default::default();
-
-    error.message = "Subgraph errors redacted".to_string();
-
-    vec![error]
-});
+static REDACTED_ERROR_MESSAGE: &str = "Subgraph errors redacted";
 
 register_plugin!("apollo", "include_subgraph_errors", IncludeSubgraphErrors);
 
@@ -57,7 +49,10 @@ impl Plugin for IncludeSubgraphErrors {
                 .map_response(move |mut response: SubgraphResponse| {
                     if !response.response.body().errors.is_empty() {
                         tracing::info!("redacted subgraph({sub_name_response}) errors");
-                        response.response.body_mut().errors = REDACTED_ERROR_MESSAGE.clone();
+                        for error in response.response.body_mut().errors.iter_mut() {
+                            error.message = REDACTED_ERROR_MESSAGE.to_string();
+                            error.extensions = Object::default();
+                        }
                     }
                     response
                 })
@@ -82,42 +77,43 @@ mod test {
     use std::sync::Arc;
 
     use bytes::Bytes;
+    use once_cell::sync::Lazy;
     use serde_json::Value as jValue;
     use serde_json_bytes::ByteString;
     use serde_json_bytes::Value;
-    use tower::util::BoxCloneService;
     use tower::Service;
 
     use super::*;
-    use crate::graphql::Response;
     use crate::json_ext::Object;
     use crate::plugin::test::MockSubgraph;
     use crate::plugin::DynPlugin;
+    use crate::router_factory::create_plugins;
+    use crate::services::router;
+    use crate::services::router_service::RouterCreator;
+    use crate::Configuration;
     use crate::PluggableSupergraphServiceBuilder;
     use crate::Schema;
     use crate::SupergraphRequest;
-    use crate::SupergraphResponse;
 
-    static UNREDACTED_PRODUCT_RESPONSE: Lazy<Response> = Lazy::new(|| {
-        serde_json::from_str(r#"{"data": {"topProducts":null},
-        "errors":[{"message":
-        "couldn't find mock for query {\"query\":\"query ErrorTopProducts__products__0($first:Int){topProducts(first:$first){__typename upc name}}\",\"operationName\":\"ErrorTopProducts__products__0\",\"variables\":{\"first\":2}}",
-        "locations": [], "path": null, "extensions": { "test": "value" }}]}"#).unwrap()
+    static UNREDACTED_PRODUCT_RESPONSE: Lazy<Bytes> = Lazy::new(|| {
+        Bytes::from_static(r#"{"data":{"topProducts":null},"errors":[{"message":"couldn't find mock for query {\"query\":\"query ErrorTopProducts__products__0($first:Int){topProducts(first:$first){__typename upc name}}\",\"operationName\":\"ErrorTopProducts__products__0\",\"variables\":{\"first\":2}}","extensions":{"test":"value","code":"FETCH_ERROR"}}]}"#.as_bytes())
     });
 
-    static REDACTED_PRODUCT_RESPONSE: Lazy<Response> = Lazy::new(|| {
-        serde_json::from_str(r#"{"data": {"topProducts":null}, "errors":[{"message": "Subgraph errors redacted", "locations": [], "path": null, "extensions": {}}]}"#).unwrap()
+    static REDACTED_PRODUCT_RESPONSE: Lazy<Bytes> = Lazy::new(|| {
+        Bytes::from_static(
+            r#"{"data":{"topProducts":null},"errors":[{"message":"Subgraph errors redacted"}]}"#
+                .as_bytes(),
+        )
     });
 
-    static REDACTED_ACCOUNT_RESPONSE: Lazy<Response> = Lazy::new(|| {
-        Response::from_bytes("account", Bytes::from_static(r#"{
-                "data": null,
-                "errors":[{"message": "Subgraph errors redacted", "locations": [], "path": null, "extensions": {}}]}"#.as_bytes())
-    ).unwrap()
+    static REDACTED_ACCOUNT_RESPONSE: Lazy<Bytes> = Lazy::new(|| {
+        Bytes::from_static(
+            r#"{"data":null,"errors":[{"message":"Subgraph errors redacted"}]}"#.as_bytes(),
+        )
     });
 
-    static EXPECTED_RESPONSE: Lazy<Response> = Lazy::new(|| {
-        serde_json::from_str(r#"{"data":{"topProducts":[{"upc":"1","name":"Table","reviews":[{"id":"1","product":{"name":"Table"},"author":{"id":"1","name":"Ada Lovelace"}},{"id":"4","product":{"name":"Table"},"author":{"id":"2","name":"Alan Turing"}}]},{"upc":"2","name":"Couch","reviews":[{"id":"2","product":{"name":"Couch"},"author":{"id":"1","name":"Ada Lovelace"}}]}]}}"#).unwrap()
+    static EXPECTED_RESPONSE: Lazy<Bytes> = Lazy::new(|| {
+        Bytes::from_static(r#"{"data":{"topProducts":[{"upc":"1","name":"Table","reviews":[{"id":"1","product":{"name":"Table"},"author":{"id":"1","name":"Ada Lovelace"}},{"id":"4","product":{"name":"Table"},"author":{"id":"2","name":"Alan Turing"}}]},{"upc":"2","name":"Couch","reviews":[{"id":"2","product":{"name":"Couch"},"author":{"id":"1","name":"Ada Lovelace"}}]}]}}"#.as_bytes())
     });
 
     static VALID_QUERY: &str = r#"query TopProducts($first: Int) { topProducts(first: $first) { upc name reviews { id product { name } author { id name } } } }"#;
@@ -128,14 +124,16 @@ mod test {
 
     async fn execute_router_test(
         query: &str,
-        body: &Response,
-        mut router_service: BoxCloneService<SupergraphRequest, SupergraphResponse, BoxError>,
+        body: &Bytes,
+        mut router_service: router::BoxService,
     ) {
         let request = SupergraphRequest::fake_builder()
             .query(query.to_string())
             .variable("first", 2usize)
             .build()
-            .expect("expecting valid request");
+            .expect("expecting valid request")
+            .try_into()
+            .unwrap();
 
         let response = router_service
             .ready()
@@ -146,13 +144,12 @@ mod test {
             .unwrap()
             .next_response()
             .await
+            .unwrap()
             .unwrap();
-        assert_eq!(response, *body);
+        assert_eq!(*body, response);
     }
 
-    async fn build_mock_router(
-        plugin: Box<dyn DynPlugin>,
-    ) -> BoxCloneService<SupergraphRequest, SupergraphResponse, BoxError> {
+    async fn build_mock_router(plugin: Box<dyn DynPlugin>) -> router::BoxService {
         let mut extensions = Object::new();
         extensions.insert("test", Value::String(ByteString::from("value")));
 
@@ -189,14 +186,28 @@ mod test {
             include_str!("../../../apollo-router-benchmarks/benches/fixtures/supergraph.graphql");
         let schema = Arc::new(Schema::parse(schema, &Default::default()).unwrap());
 
-        let builder = PluggableSupergraphServiceBuilder::new(schema.clone());
+        let mut builder = PluggableSupergraphServiceBuilder::new(schema.clone());
+
+        let plugins = create_plugins(&Configuration::default(), &schema, None)
+            .await
+            .unwrap();
+
+        for (name, plugin) in plugins.into_iter() {
+            builder = builder.with_dyn_plugin(name, plugin);
+        }
+
         let builder = builder
             .with_dyn_plugin("apollo.include_subgraph_errors".to_string(), plugin)
             .with_subgraph_service("accounts", account_service.clone())
             .with_subgraph_service("reviews", review_service.clone())
             .with_subgraph_service("products", product_service.clone());
 
-        builder.build().await.expect("should build").test_service()
+        RouterCreator::new(
+            Arc::new(builder.build().await.expect("should build")),
+            &Configuration::default(),
+        )
+        .make()
+        .boxed()
     }
 
     async fn get_redacting_plugin(config: &jValue) -> Box<dyn DynPlugin> {
diff --git a/apollo-router/src/plugins/mod.rs b/apollo-router/src/plugins/mod.rs
index 7c4401d275..a5cb444c8f 100644
--- a/apollo-router/src/plugins/mod.rs
+++ b/apollo-router/src/plugins/mod.rs
@@ -4,6 +4,7 @@
 
 pub(crate) mod csrf;
 mod expose_query_plan;
+mod external;
 mod forbid_mutations;
 mod headers;
 mod include_subgraph_errors;
diff --git a/apollo-router/src/plugins/rhai.rs b/apollo-router/src/plugins/rhai.rs
index 340a4d26db..bd4b81749c 100644
--- a/apollo-router/src/plugins/rhai.rs
+++ b/apollo-router/src/plugins/rhai.rs
@@ -8,6 +8,7 @@ use std::sync::atomic::AtomicBool;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
 use std::sync::Mutex;
+use std::time::Duration;
 
 use arc_swap::ArcSwap;
 use futures::future::ready;
@@ -22,8 +23,12 @@ use http::uri::PathAndQuery;
 use http::HeaderMap;
 use http::StatusCode;
 use http::Uri;
+use notify::event::DataChange;
+use notify::event::MetadataKind;
 use notify::event::ModifyKind;
+use notify::Config;
 use notify::EventKind;
+use notify::PollWatcher;
 use notify::RecursiveMode;
 use notify::Watcher;
 use rhai::module_resolvers::FileModuleResolver;
@@ -445,8 +450,11 @@ impl Plugin for Rhai {
 
         let watcher_handle = std::thread::spawn(move || {
             let watching_path = watched_path.clone();
-            let mut watcher =
-                notify::recommended_watcher(move |res: Result<notify::Event, notify::Error>| {
+            let config = Config::default()
+                .with_poll_interval(Duration::from_secs(3))
+                .with_compare_contents(true);
+            let mut watcher = PollWatcher::new(
+                move |res: Result<notify::Event, notify::Error>| {
                     match res {
                         Ok(event) => {
                             // Let's limit the events we are interested in to:
@@ -455,7 +463,8 @@ impl Plugin for Rhai {
                             //  - with suffix "rhai"
                             if matches!(
                                 event.kind,
-                                EventKind::Modify(ModifyKind::Data(_))
+                                EventKind::Modify(ModifyKind::Metadata(MetadataKind::WriteTime))
+                                    | EventKind::Modify(ModifyKind::Data(DataChange::Any))
                                     | EventKind::Create(_)
                                     | EventKind::Remove(_)
                             ) {
@@ -489,8 +498,10 @@ impl Plugin for Rhai {
                         }
                         Err(e) => tracing::error!("rhai watching event error: {:?}", e),
                     }
-                })
-                .unwrap_or_else(|_| panic!("could not create watch on: {:?}", watched_path));
+                },
+                config,
+            )
+            .unwrap_or_else(|_| panic!("could not create watch on: {:?}", watched_path));
             watcher
                 .watch(&watched_path, RecursiveMode::Recursive)
                 .unwrap_or_else(|_| panic!("could not watch: {:?}", watched_path));
@@ -1070,6 +1081,7 @@ struct ErrorDetails {
     status: StatusCode,
     message: String,
     position: Option<Position>,
+    // Add support for extension_code ?
 }
 
 impl fmt::Display for ErrorDetails {
diff --git a/apollo-router/src/plugins/telemetry/apollo.rs b/apollo-router/src/plugins/telemetry/apollo.rs
index 12af73f488..7138c56a6b 100644
--- a/apollo-router/src/plugins/telemetry/apollo.rs
+++ b/apollo-router/src/plugins/telemetry/apollo.rs
@@ -1,6 +1,7 @@
 //! Configuration for apollo telemetry.
 // This entire file is license key functionality
 use std::collections::HashMap;
+use std::num::NonZeroUsize;
 use std::ops::AddAssign;
 use std::time::SystemTime;
 
@@ -12,19 +13,20 @@ use serde::Deserialize;
 use serde::Serialize;
 use url::Url;
 
-use super::config::ExposeTraceId;
 use super::metrics::apollo::studio::ContextualizedStats;
 use super::metrics::apollo::studio::SingleStats;
 use super::metrics::apollo::studio::SingleStatsReport;
 use super::tracing::apollo::TracesReport;
 use crate::plugin::serde::deserialize_header_name;
 use crate::plugin::serde::deserialize_vec_header_name;
-use crate::plugins::telemetry::apollo_exporter::proto::ReferencedFieldsForType;
-use crate::plugins::telemetry::apollo_exporter::proto::ReportHeader;
-use crate::plugins::telemetry::apollo_exporter::proto::StatsContext;
-use crate::plugins::telemetry::apollo_exporter::proto::Trace;
+use crate::plugins::telemetry::apollo_exporter::proto::reports::ReferencedFieldsForType;
+use crate::plugins::telemetry::apollo_exporter::proto::reports::ReportHeader;
+use crate::plugins::telemetry::apollo_exporter::proto::reports::StatsContext;
+use crate::plugins::telemetry::apollo_exporter::proto::reports::Trace;
 use crate::plugins::telemetry::config::SamplerOption;
 use crate::plugins::telemetry::tracing::BatchProcessorConfig;
+use crate::services::apollo_graph_reference;
+use crate::services::apollo_key;
 
 pub(crate) const ENDPOINT_DEFAULT: &str =
     "https://usage-reporting.api.apollographql.com/api/ingress/traces";
@@ -67,12 +69,13 @@ pub(crate) struct Config {
 
     /// The buffer size for sending traces to Apollo. Increase this if you are experiencing lost traces.
     #[serde(default = "default_buffer_size")]
-    pub(crate) buffer_size: usize,
+    pub(crate) buffer_size: NonZeroUsize,
 
     /// Enable field level instrumentation for subgraphs via ftv1. ftv1 tracing can cause performance issues as it is transmitted in band with subgraph responses.
     /// 0.0 will result in no field level instrumentation. 1.0 will result in always instrumentation.
     /// Value MUST be less than global sampling rate
-    pub(crate) field_level_instrumentation_sampler: Option<SamplerOption>,
+    #[serde(default = "default_field_level_instrumentation_sampler")]
+    pub(crate) field_level_instrumentation_sampler: SamplerOption,
 
     /// To configure which request header names and values are included in trace data that's sent to Apollo Studio.
     #[serde(default)]
@@ -86,34 +89,13 @@ pub(crate) struct Config {
     #[schemars(skip)]
     pub(crate) schema_id: String,
 
-    // Skipped because only useful at runtime, it's a copy of the configuration in tracing config
-    #[schemars(skip)]
-    #[serde(skip)]
-    pub(crate) expose_trace_id: ExposeTraceId,
-
-    pub(crate) batch_processor: Option<BatchProcessorConfig>,
-}
-
-#[cfg(test)]
-fn apollo_key() -> Option<String> {
-    // During tests we don't want env variables to affect defaults
-    None
-}
-
-#[cfg(not(test))]
-fn apollo_key() -> Option<String> {
-    std::env::var("APOLLO_KEY").ok()
-}
-
-#[cfg(test)]
-fn apollo_graph_reference() -> Option<String> {
-    // During tests we don't want env variables to affect defaults
-    None
+    /// Configuration for batch processing.
+    #[serde(default)]
+    pub(crate) batch_processor: BatchProcessorConfig,
 }
 
-#[cfg(not(test))]
-fn apollo_graph_reference() -> Option<String> {
-    std::env::var("APOLLO_GRAPH_REF").ok()
+fn default_field_level_instrumentation_sampler() -> SamplerOption {
+    SamplerOption::TraceIdRatioBased(0.01)
 }
 
 fn endpoint_default() -> Url {
@@ -136,8 +118,8 @@ const fn client_version_header_default() -> HeaderName {
     HeaderName::from_static(client_version_header_default_str())
 }
 
-pub(crate) const fn default_buffer_size() -> usize {
-    10000
+pub(crate) const fn default_buffer_size() -> NonZeroUsize {
+    unsafe { NonZeroUsize::new_unchecked(10000) }
 }
 
 impl Default for Config {
@@ -150,11 +132,10 @@ impl Default for Config {
             client_version_header: client_version_header_default(),
             schema_id: "<no_schema_id>".to_string(),
             buffer_size: default_buffer_size(),
-            field_level_instrumentation_sampler: Some(SamplerOption::TraceIdRatioBased(0.01)),
+            field_level_instrumentation_sampler: default_field_level_instrumentation_sampler(),
             send_headers: ForwardHeaders::None,
             send_variable_values: ForwardValues::None,
-            expose_trace_id: ExposeTraceId::default(),
-            batch_processor: Some(BatchProcessorConfig::default()),
+            batch_processor: BatchProcessorConfig::default(),
         }
     }
 }
@@ -218,11 +199,12 @@ impl Report {
     pub(crate) fn into_report(
         self,
         header: ReportHeader,
-    ) -> crate::plugins::telemetry::apollo_exporter::proto::Report {
-        let mut report = crate::plugins::telemetry::apollo_exporter::proto::Report {
+    ) -> crate::plugins::telemetry::apollo_exporter::proto::reports::Report {
+        let mut report = crate::plugins::telemetry::apollo_exporter::proto::reports::Report {
             header: Some(header),
             end_time: Some(SystemTime::now().into()),
             operation_count: self.operation_count,
+            traces_pre_aggregated: true,
             ..Default::default()
         };
 
@@ -244,7 +226,7 @@ impl AddAssign<SingleReport> for Report {
 
 impl AddAssign<TracesReport> for Report {
     fn add_assign(&mut self, report: TracesReport) {
-        self.operation_count += report.traces.len() as u64;
+        // Note that operation count is dealt with in metrics so we don't increment this.
         for (operation_signature, trace) in report.traces {
             self.traces_per_query
                 .entry(operation_signature)
@@ -273,7 +255,9 @@ pub(crate) struct TracesAndStats {
     pub(crate) referenced_fields_by_type: HashMap<String, ReferencedFieldsForType>,
 }
 
-impl From<TracesAndStats> for crate::plugins::telemetry::apollo_exporter::proto::TracesAndStats {
+impl From<TracesAndStats>
+    for crate::plugins::telemetry::apollo_exporter::proto::reports::TracesAndStats
+{
     fn from(stats: TracesAndStats) -> Self {
         Self {
             stats_with_context: stats.stats_with_context.into_values().map_into().collect(),
diff --git a/apollo-router/src/plugins/telemetry/apollo_exporter.rs b/apollo-router/src/plugins/telemetry/apollo_exporter.rs
index ebd90be67f..bdfef0dd41 100644
--- a/apollo-router/src/plugins/telemetry/apollo_exporter.rs
+++ b/apollo-router/src/plugins/telemetry/apollo_exporter.rs
@@ -30,11 +30,8 @@ use url::Url;
 
 use super::apollo::Report;
 use super::apollo::SingleReport;
+use crate::plugins::telemetry::tracing::BatchProcessorConfig;
 
-const DEFAULT_QUEUE_SIZE: usize = 65_536;
-// Do not set to 5 secs because it's also the default value for the BatchSpanProcesser of tracing.
-// It's less error prone to set a different value to let us compute traces and metrics
-pub(crate) const EXPORTER_TIMEOUT_DURATION: Duration = Duration::from_secs(6);
 const BACKOFF_INCREMENT: Duration = Duration::from_millis(50);
 
 #[derive(thiserror::Error, Debug)]
@@ -88,9 +85,10 @@ impl Default for Sender {
 /// Sending periodically (in the case of metrics).
 #[derive(Clone)]
 pub(crate) struct ApolloExporter {
+    batch_config: BatchProcessorConfig,
     endpoint: Url,
     apollo_key: String,
-    header: crate::plugins::telemetry::apollo_exporter::proto::ReportHeader,
+    header: proto::reports::ReportHeader,
     client: Client,
     strip_traces: Arc<Mutex<bool>>,
 }
@@ -98,11 +96,12 @@ pub(crate) struct ApolloExporter {
 impl ApolloExporter {
     pub(crate) fn new(
         endpoint: &Url,
+        batch_config: &BatchProcessorConfig,
         apollo_key: &str,
         apollo_graph_ref: &str,
         schema_id: &str,
     ) -> Result<ApolloExporter, BoxError> {
-        let header = crate::plugins::telemetry::apollo_exporter::proto::ReportHeader {
+        let header = proto::reports::ReportHeader {
             graph_ref: apollo_graph_ref.to_string(),
             hostname: hostname()?,
             agent_version: format!(
@@ -117,21 +116,23 @@ impl ApolloExporter {
         };
 
         tracing::debug!("creating apollo exporter {}", endpoint);
-
         Ok(ApolloExporter {
             endpoint: endpoint.clone(),
+            batch_config: batch_config.clone(),
             apollo_key: apollo_key.to_string(),
-            client: reqwest::Client::default(),
+            client: reqwest::Client::builder()
+                .timeout(batch_config.max_export_timeout)
+                .build()
+                .map_err(BoxError::from)?,
             header,
             strip_traces: Default::default(),
         })
     }
 
     pub(crate) fn start(self) -> Sender {
-        let (tx, mut rx) = mpsc::channel::<SingleReport>(DEFAULT_QUEUE_SIZE);
-        // This is the task that actually sends metrics
+        let (tx, mut rx) = mpsc::channel::<SingleReport>(self.batch_config.max_queue_size);
         tokio::spawn(async move {
-            let timeout = tokio::time::interval(EXPORTER_TIMEOUT_DURATION);
+            let timeout = tokio::time::interval(self.batch_config.scheduled_delay);
             let mut report = Report::default();
 
             tokio::pin!(timeout);
@@ -162,7 +163,8 @@ impl ApolloExporter {
     }
 
     pub(crate) async fn submit_report(&self, report: Report) -> Result<(), ApolloExportError> {
-        if report.operation_count == 0 {
+        // We may be sending traces but with no operation count
+        if report.operation_count == 0 && report.traces_per_query.is_empty() {
             return Ok(());
         }
         tracing::debug!("submitting report: {:?}", report);
@@ -182,7 +184,6 @@ impl ApolloExporter {
             .finish()
             .map_err(|e| ApolloExportError::ClientError(e.to_string()))?;
         let mut backoff = Duration::from_millis(0);
-
         let req = self
             .client
             .post(self.endpoint.clone())
@@ -256,6 +257,7 @@ impl ApolloExporter {
                     }
                 }
                 Err(e) => {
+                    println!("Got {}", e);
                     // TODO: Ultimately need more sophisticated handling here. For example
                     // a redirect should not be treated the same way as a connect or a
                     // type builder error...
@@ -295,8 +297,10 @@ pub(crate) fn get_uname() -> Result<String, std::io::Error> {
 
 #[allow(unreachable_pub)]
 pub(crate) mod proto {
-    #![allow(clippy::derive_partial_eq_without_eq)]
-    tonic::include_proto!("report");
+    pub(crate) mod reports {
+        #![allow(clippy::derive_partial_eq_without_eq)]
+        tonic::include_proto!("reports");
+    }
 }
 
 /// Reporting Error type
diff --git a/apollo-router/src/plugins/telemetry/config.rs b/apollo-router/src/plugins/telemetry/config.rs
index bc6a40a014..d159af5f96 100644
--- a/apollo-router/src/plugins/telemetry/config.rs
+++ b/apollo-router/src/plugins/telemetry/config.rs
@@ -285,20 +285,48 @@ pub(crate) struct PropagationRequestTraceId {
     pub(crate) header_name: HeaderName,
 }
 
-#[derive(Default, Debug, Clone, Deserialize, JsonSchema)]
+#[derive(Debug, Clone, Deserialize, JsonSchema)]
 #[serde(deny_unknown_fields)]
 #[non_exhaustive]
 pub(crate) struct Trace {
     pub(crate) service_name: Option<String>,
     pub(crate) service_namespace: Option<String>,
-    pub(crate) sampler: Option<SamplerOption>,
-    pub(crate) parent_based_sampler: Option<bool>,
+    #[serde(default = "default_sampler")]
+    pub(crate) sampler: SamplerOption,
+    #[serde(default = "default_parent_based_sampler")]
+    pub(crate) parent_based_sampler: bool,
     pub(crate) max_events_per_span: Option<u32>,
     pub(crate) max_attributes_per_span: Option<u32>,
     pub(crate) max_links_per_span: Option<u32>,
     pub(crate) max_attributes_per_event: Option<u32>,
     pub(crate) max_attributes_per_link: Option<u32>,
-    pub(crate) attributes: Option<BTreeMap<String, AttributeValue>>,
+    #[serde(default)]
+    pub(crate) attributes: BTreeMap<String, AttributeValue>,
+}
+
+fn default_parent_based_sampler() -> bool {
+    true
+}
+
+fn default_sampler() -> SamplerOption {
+    SamplerOption::Always(Sampler::AlwaysOn)
+}
+
+impl Default for Trace {
+    fn default() -> Self {
+        Self {
+            service_name: None,
+            service_namespace: None,
+            sampler: default_sampler(),
+            parent_based_sampler: default_parent_based_sampler(),
+            max_events_per_span: None,
+            max_attributes_per_span: None,
+            max_links_per_span: None,
+            max_attributes_per_event: None,
+            max_attributes_per_link: None,
+            attributes: Default::default(),
+        }
+    }
 }
 
 #[derive(Debug, Clone, Deserialize, JsonSchema)]
@@ -369,34 +397,36 @@ pub(crate) enum Sampler {
     AlwaysOff,
 }
 
+impl From<Sampler> for opentelemetry::sdk::trace::Sampler {
+    fn from(s: Sampler) -> Self {
+        match s {
+            Sampler::AlwaysOn => opentelemetry::sdk::trace::Sampler::AlwaysOn,
+            Sampler::AlwaysOff => opentelemetry::sdk::trace::Sampler::AlwaysOff,
+        }
+    }
+}
+
+impl From<SamplerOption> for opentelemetry::sdk::trace::Sampler {
+    fn from(s: SamplerOption) -> Self {
+        match s {
+            SamplerOption::Always(s) => s.into(),
+            SamplerOption::TraceIdRatioBased(ratio) => {
+                opentelemetry::sdk::trace::Sampler::TraceIdRatioBased(ratio)
+            }
+        }
+    }
+}
+
 impl From<&Trace> for opentelemetry::sdk::trace::Config {
     fn from(config: &Trace) -> Self {
         let mut trace_config = opentelemetry::sdk::trace::config();
 
-        let sampler = match (&config.sampler, &config.parent_based_sampler) {
-            (Some(SamplerOption::Always(Sampler::AlwaysOn)), Some(true)) => {
-                Some(parent_based(opentelemetry::sdk::trace::Sampler::AlwaysOn))
-            }
-            (Some(SamplerOption::Always(Sampler::AlwaysOff)), Some(true)) => {
-                Some(parent_based(opentelemetry::sdk::trace::Sampler::AlwaysOff))
-            }
-            (Some(SamplerOption::TraceIdRatioBased(ratio)), Some(true)) => Some(parent_based(
-                opentelemetry::sdk::trace::Sampler::TraceIdRatioBased(*ratio),
-            )),
-            (Some(SamplerOption::Always(Sampler::AlwaysOn)), _) => {
-                Some(opentelemetry::sdk::trace::Sampler::AlwaysOn)
-            }
-            (Some(SamplerOption::Always(Sampler::AlwaysOff)), _) => {
-                Some(opentelemetry::sdk::trace::Sampler::AlwaysOff)
-            }
-            (Some(SamplerOption::TraceIdRatioBased(ratio)), _) => Some(
-                opentelemetry::sdk::trace::Sampler::TraceIdRatioBased(*ratio),
-            ),
-            (_, _) => None,
-        };
-        if let Some(sampler) = sampler {
-            trace_config = trace_config.with_sampler(sampler);
+        let mut sampler: opentelemetry::sdk::trace::Sampler = config.sampler.clone().into();
+        if config.parent_based_sampler {
+            sampler = parent_based(sampler);
         }
+
+        trace_config = trace_config.with_sampler(sampler);
         if let Some(n) = config.max_events_per_span {
             trace_config = trace_config.with_max_events_per_span(n);
         }
@@ -449,8 +479,6 @@ impl From<&Trace> for opentelemetry::sdk::trace::Config {
         let resource = Resource::new(resource_defaults).merge(&mut Resource::new(
             config
                 .attributes
-                .clone()
-                .unwrap_or_default()
                 .iter()
                 .map(|(k, v)| {
                     KeyValue::new(
@@ -487,35 +515,35 @@ impl Conf {
             ) {
                 // Error conditions
                 (
-                    Some(SamplerOption::TraceIdRatioBased(global_ratio)),
-                    Some(SamplerOption::TraceIdRatioBased(field_ratio)),
+                    SamplerOption::TraceIdRatioBased(global_ratio),
+                    SamplerOption::TraceIdRatioBased(field_ratio),
                 ) if field_ratio > global_ratio => {
                     Err(Error::InvalidFieldLevelInstrumentationSampler)?
                 }
                 (
-                    Some(SamplerOption::Always(Sampler::AlwaysOff)),
-                    Some(SamplerOption::Always(Sampler::AlwaysOn)),
+                    SamplerOption::Always(Sampler::AlwaysOff),
+                    SamplerOption::Always(Sampler::AlwaysOn),
                 ) => Err(Error::InvalidFieldLevelInstrumentationSampler)?,
                 (
-                    Some(SamplerOption::Always(Sampler::AlwaysOff)),
-                    Some(SamplerOption::TraceIdRatioBased(ratio)),
+                    SamplerOption::Always(Sampler::AlwaysOff),
+                    SamplerOption::TraceIdRatioBased(ratio),
                 ) if ratio != 0.0 => Err(Error::InvalidFieldLevelInstrumentationSampler)?,
                 (
-                    Some(SamplerOption::TraceIdRatioBased(ratio)),
-                    Some(SamplerOption::Always(Sampler::AlwaysOn)),
+                    SamplerOption::TraceIdRatioBased(ratio),
+                    SamplerOption::Always(Sampler::AlwaysOn),
                 ) if ratio != 1.0 => Err(Error::InvalidFieldLevelInstrumentationSampler)?,
 
                 // Happy paths
-                (_, Some(SamplerOption::TraceIdRatioBased(ratio))) if ratio == 0.0 => 0.0,
-                (Some(SamplerOption::TraceIdRatioBased(ratio)), _) if ratio == 0.0 => 0.0,
-                (_, Some(SamplerOption::Always(Sampler::AlwaysOn))) => 1.0,
+                (_, SamplerOption::TraceIdRatioBased(ratio)) if ratio == 0.0 => 0.0,
+                (SamplerOption::TraceIdRatioBased(ratio), _) if ratio == 0.0 => 0.0,
+                (_, SamplerOption::Always(Sampler::AlwaysOn)) => 1.0,
                 (
-                    Some(SamplerOption::TraceIdRatioBased(global_ratio)),
-                    Some(SamplerOption::TraceIdRatioBased(field_ratio)),
+                    SamplerOption::TraceIdRatioBased(global_ratio),
+                    SamplerOption::TraceIdRatioBased(field_ratio),
                 ) => field_ratio / global_ratio,
                 (
-                    Some(SamplerOption::Always(Sampler::AlwaysOn)),
-                    Some(SamplerOption::TraceIdRatioBased(field_ratio)),
+                    SamplerOption::Always(Sampler::AlwaysOn),
+                    SamplerOption::TraceIdRatioBased(field_ratio),
                 ) => field_ratio,
                 (_, _) => 0.0,
             },
diff --git a/apollo-router/src/plugins/telemetry/formatters/json.rs b/apollo-router/src/plugins/telemetry/formatters/json.rs
index cd9a9cf34b..62e3082bb3 100644
--- a/apollo-router/src/plugins/telemetry/formatters/json.rs
+++ b/apollo-router/src/plugins/telemetry/formatters/json.rs
@@ -18,23 +18,9 @@ use super::TRACE_ID_FIELD_NAME;
 
 /// The JSON [`FormatFields`] implementation.
 ///
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub(crate) struct JsonFields;
 
-impl JsonFields {
-    /// Returns a new JSON [`FormatFields`] implementation.
-    ///
-    pub(crate) fn new() -> Self {
-        Self {}
-    }
-}
-
-impl Default for JsonFields {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
 impl<'a> FormatFields<'a> for JsonFields {
     /// Format the provided `fields` to the provided `writer`, returning a result.
     fn format_fields<R: field::RecordFields>(
diff --git a/apollo-router/src/plugins/telemetry/metrics/apollo.rs b/apollo-router/src/plugins/telemetry/metrics/apollo.rs
index 45dd2af220..d0717edfdd 100644
--- a/apollo-router/src/plugins/telemetry/metrics/apollo.rs
+++ b/apollo-router/src/plugins/telemetry/metrics/apollo.rs
@@ -28,13 +28,21 @@ impl MetricsConfigurator for Config {
                 apollo_key: Some(key),
                 apollo_graph_ref: Some(reference),
                 schema_id,
+                batch_processor,
                 ..
             } => {
                 if !ENABLED.swap(true, Ordering::Relaxed) {
                     tracing::info!("Apollo Studio usage reporting is enabled. See https://go.apollo.dev/o/data for details");
                 }
+                let batch_processor_config = batch_processor;
                 tracing::debug!("creating metrics exporter");
-                let exporter = ApolloExporter::new(endpoint, key, reference, schema_id)?;
+                let exporter = ApolloExporter::new(
+                    endpoint,
+                    batch_processor_config,
+                    key,
+                    reference,
+                    schema_id,
+                )?;
 
                 builder.with_apollo_metrics_collector(exporter.start())
             }
@@ -187,7 +195,7 @@ mod test {
         plugin.apollo_metrics_sender = Sender::Apollo(tx);
         TestHarness::builder()
             .extra_plugin(plugin)
-            .build()
+            .build_router()
             .await?
             .oneshot(
                 SupergraphRequest::fake_builder()
@@ -196,12 +204,15 @@ mod test {
                     .query(query)
                     .and_operation_name(operation_name)
                     .and_context(context)
-                    .build()?,
+                    .build()?
+                    .try_into()
+                    .unwrap(),
             )
             .await
             .unwrap()
             .next_response()
             .await
+            .unwrap()
             .unwrap();
 
         let default_latency = Duration::from_millis(100);
diff --git a/apollo-router/src/plugins/telemetry/metrics/apollo/studio.rs b/apollo-router/src/plugins/telemetry/metrics/apollo/studio.rs
index 046c086d70..5208991a70 100644
--- a/apollo-router/src/plugins/telemetry/metrics/apollo/studio.rs
+++ b/apollo-router/src/plugins/telemetry/metrics/apollo/studio.rs
@@ -7,8 +7,8 @@ use serde::Serialize;
 use uuid::Uuid;
 
 use super::duration_histogram::DurationHistogram;
-use crate::plugins::telemetry::apollo_exporter::proto::ReferencedFieldsForType;
-use crate::plugins::telemetry::apollo_exporter::proto::StatsContext;
+use crate::plugins::telemetry::apollo_exporter::proto::reports::ReferencedFieldsForType;
+use crate::plugins::telemetry::apollo_exporter::proto::reports::StatsContext;
 
 #[derive(Default, Debug, Serialize)]
 pub(crate) struct SingleStatsReport {
@@ -212,7 +212,7 @@ impl AddAssign<SingleFieldStat> for FieldStat {
 }
 
 impl From<ContextualizedStats>
-    for crate::plugins::telemetry::apollo_exporter::proto::ContextualizedStats
+    for crate::plugins::telemetry::apollo_exporter::proto::reports::ContextualizedStats
 {
     fn from(stats: ContextualizedStats) -> Self {
         Self {
@@ -228,7 +228,7 @@ impl From<ContextualizedStats>
 }
 
 impl From<QueryLatencyStats>
-    for crate::plugins::telemetry::apollo_exporter::proto::QueryLatencyStats
+    for crate::plugins::telemetry::apollo_exporter::proto::reports::QueryLatencyStats
 {
     fn from(stats: QueryLatencyStats) -> Self {
         Self {
@@ -249,7 +249,9 @@ impl From<QueryLatencyStats>
     }
 }
 
-impl From<PathErrorStats> for crate::plugins::telemetry::apollo_exporter::proto::PathErrorStats {
+impl From<PathErrorStats>
+    for crate::plugins::telemetry::apollo_exporter::proto::reports::PathErrorStats
+{
     fn from(stats: PathErrorStats) -> Self {
         Self {
             children: stats
@@ -263,7 +265,7 @@ impl From<PathErrorStats> for crate::plugins::telemetry::apollo_exporter::proto:
     }
 }
 
-impl From<TypeStat> for crate::plugins::telemetry::apollo_exporter::proto::TypeStat {
+impl From<TypeStat> for crate::plugins::telemetry::apollo_exporter::proto::reports::TypeStat {
     fn from(stat: TypeStat) -> Self {
         Self {
             per_field_stat: stat
@@ -275,7 +277,7 @@ impl From<TypeStat> for crate::plugins::telemetry::apollo_exporter::proto::TypeS
     }
 }
 
-impl From<FieldStat> for crate::plugins::telemetry::apollo_exporter::proto::FieldStat {
+impl From<FieldStat> for crate::plugins::telemetry::apollo_exporter::proto::reports::FieldStat {
     fn from(stat: FieldStat) -> Self {
         Self {
             return_type: stat.return_type,
diff --git a/apollo-router/src/plugins/telemetry/metrics/prometheus.rs b/apollo-router/src/plugins/telemetry/metrics/prometheus.rs
index 0bc2dcce60..fc028f3fd4 100644
--- a/apollo-router/src/plugins/telemetry/metrics/prometheus.rs
+++ b/apollo-router/src/plugins/telemetry/metrics/prometheus.rs
@@ -22,7 +22,7 @@ use crate::plugins::telemetry::config::MetricsCommon;
 use crate::plugins::telemetry::metrics::MetricsBuilder;
 use crate::plugins::telemetry::metrics::MetricsConfigurator;
 use crate::router_factory::Endpoint;
-use crate::services::transport;
+use crate::services::router;
 use crate::ListenAddr;
 
 #[derive(Debug, Clone, Deserialize, JsonSchema)]
@@ -86,7 +86,7 @@ impl MetricsConfigurator for Config {
 
             builder = builder.with_custom_endpoint(
                 self.listen.clone(),
-                Endpoint::new(
+                Endpoint::from_router_service(
                     self.path.clone(),
                     PrometheusService {
                         registry: exporter.registry().clone(),
@@ -106,8 +106,8 @@ pub(crate) struct PrometheusService {
     registry: Registry,
 }
 
-impl Service<transport::Request> for PrometheusService {
-    type Response = transport::Response;
+impl Service<router::Request> for PrometheusService {
+    type Response = router::Response;
     type Error = BoxError;
     type Future = BoxFuture<'static, Result<Self::Response, Self::Error>>;
 
@@ -115,16 +115,19 @@ impl Service<transport::Request> for PrometheusService {
         Ok(()).into()
     }
 
-    fn call(&mut self, _req: transport::Request) -> Self::Future {
+    fn call(&mut self, req: router::Request) -> Self::Future {
         let metric_families = self.registry.gather();
         Box::pin(async move {
             let encoder = TextEncoder::new();
             let mut result = Vec::new();
             encoder.encode(&metric_families, &mut result)?;
-            http::Response::builder()
-                .status(StatusCode::OK)
-                .body(result.into())
-                .map_err(|err| BoxError::from(err.to_string()))
+            Ok(router::Response {
+                response: http::Response::builder()
+                    .status(StatusCode::OK)
+                    .body::<hyper::Body>(result.into())
+                    .map_err(BoxError::from)?,
+                context: req.context,
+            })
         })
     }
 }
diff --git a/apollo-router/src/plugins/telemetry/mod.rs b/apollo-router/src/plugins/telemetry/mod.rs
index 0f3e0be2c6..80a47d2f6c 100644
--- a/apollo-router/src/plugins/telemetry/mod.rs
+++ b/apollo-router/src/plugins/telemetry/mod.rs
@@ -25,6 +25,7 @@ use futures::StreamExt;
 use http::header;
 use http::HeaderMap;
 use http::HeaderValue;
+use http::StatusCode;
 use multimap::MultiMap;
 use once_cell::sync::OnceCell;
 use opentelemetry::propagation::text_map_propagator::FieldIter;
@@ -71,7 +72,7 @@ use crate::layers::ServiceBuilderExt;
 use crate::plugin::Plugin;
 use crate::plugin::PluginInit;
 use crate::plugins::telemetry::apollo::ForwardHeaders;
-use crate::plugins::telemetry::apollo_exporter::proto::StatsContext;
+use crate::plugins::telemetry::apollo_exporter::proto::reports::StatsContext;
 #[cfg(not(feature = "console"))]
 use crate::plugins::telemetry::config::default_display_filename;
 #[cfg(not(feature = "console"))]
@@ -99,6 +100,7 @@ use crate::query_planner::USAGE_REPORTING;
 use crate::register_plugin;
 use crate::router_factory::Endpoint;
 use crate::services::execution;
+use crate::services::router;
 use crate::services::subgraph;
 use crate::services::supergraph;
 use crate::subgraph::Request;
@@ -121,6 +123,7 @@ mod tracing;
 // Tracing consts
 pub(crate) const SUPERGRAPH_SPAN_NAME: &str = "supergraph";
 pub(crate) const SUBGRAPH_SPAN_NAME: &str = "subgraph";
+pub(crate) const ROUTER_SPAN_NAME: &str = "router";
 pub(crate) const EXECUTION_SPAN_NAME: &str = "execution";
 const CLIENT_NAME: &str = "apollo_telemetry::client_name";
 const CLIENT_VERSION: &str = "apollo_telemetry::client_version";
@@ -138,7 +141,7 @@ static TELEMETRY_REFCOUNT: AtomicU8 = AtomicU8::new(0);
 
 #[doc(hidden)] // Only public for integration tests
 pub struct Telemetry {
-    config: config::Conf,
+    config: Arc<config::Conf>,
     metrics: BasicMetrics,
     // Do not remove _metrics_exporters. Metrics will not be exported if it is removed.
     // Typically the handles are a PushController but may be something else. Dropping the handle will
@@ -222,10 +225,85 @@ impl Plugin for Telemetry {
         Self::new_common::<Registry>(init.config, None).await
     }
 
+    fn router_service(&self, service: router::BoxService) -> router::BoxService {
+        let config = self.config.clone();
+        let config_later = self.config.clone();
+
+        ServiceBuilder::new()
+            .instrument(move |request: &router::Request| {
+                let apollo = config.apollo.as_ref().cloned().unwrap_or_default();
+                let trace_id = TraceId::maybe_new()
+                    .map(|t| t.to_string())
+                    .unwrap_or_default();
+                let router_request = &request.router_request;
+                let headers = router_request.headers();
+                let client_name = headers
+                    .get(&apollo.client_name_header)
+                    .cloned()
+                    .unwrap_or_else(|| HeaderValue::from_static(""));
+                let client_version = headers
+                    .get(&apollo.client_version_header)
+                    .cloned()
+                    .unwrap_or_else(|| HeaderValue::from_static(""));
+                let span = ::tracing::info_span!(ROUTER_SPAN_NAME,
+                    "http.method" = %router_request.method(),
+                    "http.route" = %router_request.uri(),
+                    "http.flavor" = ?router_request.version(),
+                    "trace_id" = %trace_id,
+                    "client.name" = client_name.to_str().unwrap_or_default(),
+                    "client.version" = client_version.to_str().unwrap_or_default(),
+                    "otel.kind" = "INTERNAL",
+                    "otel.status_code" = ::tracing::field::Empty,
+                    "apollo_private.duration_ns" = ::tracing::field::Empty,
+                    "apollo_private.http.request_headers" = Self::filter_headers(request.router_request.headers(), &apollo.send_headers).as_str(),
+                    "apollo_private.http.response_headers" = field::Empty
+                );
+                span
+            })
+            .map_future(move |fut| {
+                let start = Instant::now();
+                let config = config_later.clone();
+                async move {
+                    let span = Span::current();
+                    let response: Result<router::Response, BoxError> = fut.await;
+
+                    span.record(
+                        "apollo_private.duration_ns",
+                        start.elapsed().as_nanos() as i64,
+                    );
+
+
+                    let expose_trace_id = config.tracing.as_ref().cloned().unwrap_or_default().response_trace_id;
+                    if let Ok(response) = &response {
+                        if expose_trace_id.enabled {
+                            if let Some(header_name) = &expose_trace_id.header_name {
+                                let mut headers: HashMap<String, Vec<String>> = HashMap::new();
+                                if let Some(value) = response.response.headers().get(header_name) {
+                                    headers.insert(header_name.to_string(), vec![value.to_str().unwrap_or_default().to_string()]);
+                                    let response_headers = serde_json::to_string(&headers).unwrap_or_default();
+                                    span.record("apollo_private.http.response_headers",&response_headers);
+                                }
+                            }
+                        }
+
+                        if response.response.status() >= StatusCode::BAD_REQUEST {
+                            span.record("otel.status_code", "Error");
+                        } else {
+                            span.record("otel.status_code", "Ok");
+                        }
+
+                    }
+                    response
+                }
+            })
+            .service(service)
+            .boxed()
+    }
+
     fn supergraph_service(&self, service: supergraph::BoxService) -> supergraph::BoxService {
         let metrics_sender = self.apollo_metrics_sender.clone();
         let metrics = self.metrics.clone();
-        let config = Arc::new(self.config.clone());
+        let config = self.config.clone();
         let config_map_res_first = config.clone();
         let config_map_res = config.clone();
         ServiceBuilder::new()
@@ -510,7 +588,7 @@ impl Telemetry {
                                         filter_metric_events,
                                     )
                                 })
-                                .map_fmt_fields(|_f| JsonFields::new())
+                                .map_fmt_fields(|_f| JsonFields::default())
                                 .finish()
                                 .with(telemetry)
                                 .with(otel_metrics);
@@ -534,7 +612,7 @@ impl Telemetry {
             metrics: BasicMetrics::default(),
             apollo_metrics_sender: builder.apollo_metrics_provider(),
             field_level_instrumentation_ratio,
-            config,
+            config: Arc::new(config),
         });
 
         let _ = TELEMETRY_REFCOUNT.fetch_add(1, Ordering::Relaxed);
@@ -640,56 +718,28 @@ impl Telemetry {
     ) -> impl Fn(&SupergraphRequest) -> Span + Clone {
         move |request: &SupergraphRequest| {
             let http_request = &request.supergraph_request;
-            let headers = http_request.headers();
             let query = http_request.body().query.clone().unwrap_or_default();
             let operation_name = http_request
                 .body()
                 .operation_name
                 .clone()
                 .unwrap_or_default();
-            let client_name = headers
-                .get(&config.client_name_header)
-                .cloned()
-                .unwrap_or_else(|| HeaderValue::from_static(""));
-            let client_version = headers
-                .get(&config.client_version_header)
-                .cloned()
-                .unwrap_or_else(|| HeaderValue::from_static(""));
 
             let span = info_span!(
                 SUPERGRAPH_SPAN_NAME,
                 graphql.document = query.as_str(),
                 // TODO add graphql.operation.type
                 graphql.operation.name = operation_name.as_str(),
-                client.name = client_name.to_str().unwrap_or_default(),
-                client.version = client_version.to_str().unwrap_or_default(),
                 otel.kind = "INTERNAL",
                 apollo_private.field_level_instrumentation_ratio =
                     field_level_instrumentation_ratio,
                 apollo_private.operation_signature = field::Empty,
-                apollo_private.graphql.variables = field::Empty,
-                apollo_private.http.request_headers = field::Empty
+                apollo_private.graphql.variables = Self::filter_variables_values(
+                    &request.supergraph_request.body().variables,
+                    &config.send_variable_values,
+                ),
             );
 
-            if is_span_sampled() {
-                span.record(
-                    "apollo_private.graphql.variables",
-                    Self::filter_variables_values(
-                        &request.supergraph_request.body().variables,
-                        &config.send_variable_values,
-                    )
-                    .as_str(),
-                );
-                span.record(
-                    "apollo_private.http.request_headers",
-                    Self::filter_headers(
-                        request.supergraph_request.headers(),
-                        &config.send_headers,
-                    )
-                    .as_str(),
-                );
-            }
-
             span
         }
     }
@@ -1166,10 +1216,6 @@ impl Telemetry {
         has_errors: bool,
         duration: Duration,
     ) {
-        if is_span_sampled() {
-            ::tracing::trace!("span is sampled then skip the apollo metrics");
-            return;
-        }
         let metrics = if let Some(usage_reporting) = context
             .get::<_, UsageReporting>(USAGE_REPORTING)
             .unwrap_or_default()
@@ -1253,8 +1299,8 @@ fn operation_count(stats_report_key: &str) -> u64 {
 
 fn convert(
     referenced_fields: router_bridge::planner::ReferencedFieldsForType,
-) -> crate::plugins::telemetry::apollo_exporter::proto::ReferencedFieldsForType {
-    crate::plugins::telemetry::apollo_exporter::proto::ReferencedFieldsForType {
+) -> crate::plugins::telemetry::apollo_exporter::proto::reports::ReferencedFieldsForType {
+    crate::plugins::telemetry::apollo_exporter::proto::reports::ReferencedFieldsForType {
         field_names: referenced_fields.field_names,
         is_interface: referenced_fields.is_interface,
     }
@@ -1277,11 +1323,6 @@ fn handle_error<T: Into<opentelemetry::global::Error>>(err: T) {
     }
 }
 
-#[inline]
-pub(crate) fn is_span_sampled() -> bool {
-    Span::current().context().span().span_context().is_sampled()
-}
-
 register_plugin!("apollo", "telemetry", Telemetry);
 
 /// This enum is a partial cleanup of the telemetry plugin logic.
@@ -1295,7 +1336,7 @@ enum ApolloFtv1Handler {
 impl ApolloFtv1Handler {
     fn request_ftv1(&self, mut req: SubgraphRequest) -> SubgraphRequest {
         if let ApolloFtv1Handler::Enabled = self {
-            if is_span_sampled() {
+            if Span::current().context().span().span_context().is_sampled() {
                 req.subgraph_request.headers_mut().insert(
                     "apollo-federation-include-trace",
                     HeaderValue::from_static("ftv1"),
@@ -1628,6 +1669,7 @@ mod tests {
                         Error::builder()
                             .message(String::from("an error occured"))
                             .extensions(extension)
+                            .extension_code("FETCH_ERROR")
                             .build(),
                     )
                     .build())
@@ -1694,8 +1736,8 @@ mod tests {
                                     "errors": {
                                         "include_messages": true,
                                         "extensions": [{
-                                            "name": "subgraph_error_extended_type",
-                                            "path": ".type"
+                                            "name": "subgraph_error_extended_code",
+                                            "path": ".code"
                                         }, {
                                             "name": "message",
                                             "path": ".reason"
diff --git a/apollo-router/src/plugins/telemetry/otlp.rs b/apollo-router/src/plugins/telemetry/otlp.rs
index a90c483e7b..b2ba38cd5b 100644
--- a/apollo-router/src/plugins/telemetry/otlp.rs
+++ b/apollo-router/src/plugins/telemetry/otlp.rs
@@ -35,7 +35,8 @@ pub(crate) struct Config {
     pub(crate) grpc: Option<GrpcExporter>,
     pub(crate) http: Option<HttpExporter>,
 
-    pub(crate) batch_processor: Option<BatchProcessorConfig>,
+    #[serde(default)]
+    pub(crate) batch_processor: BatchProcessorConfig,
 }
 
 impl Config {
diff --git a/apollo-router/src/plugins/telemetry/snapshots/apollo_router__plugins__telemetry__tests__it_test_prometheus_metrics.snap b/apollo-router/src/plugins/telemetry/snapshots/apollo_router__plugins__telemetry__tests__it_test_prometheus_metrics.snap
index 3f2c4713ba..ff6391a69f 100644
--- a/apollo-router/src/plugins/telemetry/snapshots/apollo_router__plugins__telemetry__tests__it_test_prometheus_metrics.snap
+++ b/apollo-router/src/plugins/telemetry/snapshots/apollo_router__plugins__telemetry__tests__it_test_prometheus_metrics.snap
@@ -5,4 +5,4 @@ expression: prom_metrics
 apollo_router_http_request_duration_seconds_count{another_test="my_default_value",error="400 Bad Request",myname="label_value",renamed_value="my_value_set",service_name="apollo-router",status="400"} 1
 apollo_router_http_request_duration_seconds_count{another_test="my_default_value",my_value="2",myname="label_value",renamed_value="my_value_set",service_name="apollo-router",status="200",x_custom="coming_from_header"} 1
 apollo_router_http_request_duration_seconds_count{error="INTERNAL_SERVER_ERROR",my_key="my_custom_attribute_from_context",query_from_request="query { test }",service_name="apollo-router",status="200",subgraph="my_subgraph_name",unknown_data="default_value"} 1
-apollo_router_http_request_duration_seconds_count{message="cannot contact the subgraph",service_name="apollo-router",subgraph="my_subgraph_name_error",subgraph_error_extended_type="SubrequestHttpError"} 1
+apollo_router_http_request_duration_seconds_count{message="cannot contact the subgraph",service_name="apollo-router",subgraph="my_subgraph_name_error",subgraph_error_extended_code="SUBREQUEST_HTTP_ERROR"} 1
diff --git a/apollo-router/src/plugins/telemetry/tracing/apollo.rs b/apollo-router/src/plugins/telemetry/tracing/apollo.rs
index 632542ef6b..8f7ad3a2b8 100644
--- a/apollo-router/src/plugins/telemetry/tracing/apollo.rs
+++ b/apollo-router/src/plugins/telemetry/tracing/apollo.rs
@@ -6,7 +6,7 @@ use serde::Serialize;
 use tower::BoxError;
 
 use crate::plugins::telemetry::apollo::Config;
-use crate::plugins::telemetry::apollo_exporter::proto::Trace;
+use crate::plugins::telemetry::apollo_exporter::proto::reports::Trace;
 use crate::plugins::telemetry::config;
 use crate::plugins::telemetry::tracing::apollo_telemetry;
 use crate::plugins::telemetry::tracing::TracingConfigurator;
@@ -22,29 +22,23 @@ impl TracingConfigurator for Config {
                 schema_id,
                 buffer_size,
                 field_level_instrumentation_sampler,
-                expose_trace_id,
+                batch_processor,
                 ..
             } => {
                 tracing::debug!("configuring exporter to Studio");
 
                 let exporter = apollo_telemetry::Exporter::builder()
-                    .expose_trace_id_config(expose_trace_id.clone())
                     .endpoint(endpoint.clone())
                     .apollo_key(key)
                     .apollo_graph_ref(reference)
                     .schema_id(schema_id)
                     .buffer_size(*buffer_size)
-                    .and_field_execution_sampler(field_level_instrumentation_sampler.clone())
+                    .field_execution_sampler(field_level_instrumentation_sampler.clone())
+                    .batch_config(batch_processor.clone())
                     .build()?;
                 builder.with_span_processor(
                     BatchSpanProcessor::builder(exporter, opentelemetry::runtime::Tokio)
-                        .with_batch_config(
-                            self.batch_processor
-                                .as_ref()
-                                .cloned()
-                                .unwrap_or_default()
-                                .into(),
-                        )
+                        .with_batch_config(batch_processor.clone().into())
                         .build(),
                 )
             }
diff --git a/apollo-router/src/plugins/telemetry/tracing/apollo_telemetry.rs b/apollo-router/src/plugins/telemetry/tracing/apollo_telemetry.rs
index b4ad1f1874..946daf617d 100644
--- a/apollo-router/src/plugins/telemetry/tracing/apollo_telemetry.rs
+++ b/apollo-router/src/plugins/telemetry/tracing/apollo_telemetry.rs
@@ -1,8 +1,7 @@
 use std::collections::HashMap;
 use std::io::Cursor;
+use std::num::NonZeroUsize;
 use std::sync::Arc;
-#[cfg(test)]
-use std::sync::Mutex;
 use std::time::SystemTimeError;
 
 use async_trait::async_trait;
@@ -27,32 +26,30 @@ use url::Url;
 
 use crate::axum_factory::utils::REQUEST_SPAN_NAME;
 use crate::plugins::telemetry;
-use crate::plugins::telemetry::apollo::Report;
 use crate::plugins::telemetry::apollo::SingleReport;
 use crate::plugins::telemetry::apollo_exporter::proto;
-use crate::plugins::telemetry::apollo_exporter::proto::trace::http::Values;
-use crate::plugins::telemetry::apollo_exporter::proto::trace::query_plan_node::ConditionNode;
-use crate::plugins::telemetry::apollo_exporter::proto::trace::query_plan_node::DeferNode;
-use crate::plugins::telemetry::apollo_exporter::proto::trace::query_plan_node::DeferNodePrimary;
-use crate::plugins::telemetry::apollo_exporter::proto::trace::query_plan_node::DeferredNode;
-use crate::plugins::telemetry::apollo_exporter::proto::trace::query_plan_node::DeferredNodeDepends;
-use crate::plugins::telemetry::apollo_exporter::proto::trace::query_plan_node::FetchNode;
-use crate::plugins::telemetry::apollo_exporter::proto::trace::query_plan_node::FlattenNode;
-use crate::plugins::telemetry::apollo_exporter::proto::trace::query_plan_node::Node;
-use crate::plugins::telemetry::apollo_exporter::proto::trace::query_plan_node::ParallelNode;
-use crate::plugins::telemetry::apollo_exporter::proto::trace::query_plan_node::ResponsePathElement;
-use crate::plugins::telemetry::apollo_exporter::proto::trace::query_plan_node::SequenceNode;
-use crate::plugins::telemetry::apollo_exporter::proto::trace::Details;
-use crate::plugins::telemetry::apollo_exporter::proto::trace::Http;
-use crate::plugins::telemetry::apollo_exporter::proto::trace::QueryPlanNode;
-use crate::plugins::telemetry::apollo_exporter::ApolloExportError;
+use crate::plugins::telemetry::apollo_exporter::proto::reports::trace::http::Values;
+use crate::plugins::telemetry::apollo_exporter::proto::reports::trace::query_plan_node::ConditionNode;
+use crate::plugins::telemetry::apollo_exporter::proto::reports::trace::query_plan_node::DeferNode;
+use crate::plugins::telemetry::apollo_exporter::proto::reports::trace::query_plan_node::DeferNodePrimary;
+use crate::plugins::telemetry::apollo_exporter::proto::reports::trace::query_plan_node::DeferredNode;
+use crate::plugins::telemetry::apollo_exporter::proto::reports::trace::query_plan_node::DeferredNodeDepends;
+use crate::plugins::telemetry::apollo_exporter::proto::reports::trace::query_plan_node::FetchNode;
+use crate::plugins::telemetry::apollo_exporter::proto::reports::trace::query_plan_node::FlattenNode;
+use crate::plugins::telemetry::apollo_exporter::proto::reports::trace::query_plan_node::Node;
+use crate::plugins::telemetry::apollo_exporter::proto::reports::trace::query_plan_node::ParallelNode;
+use crate::plugins::telemetry::apollo_exporter::proto::reports::trace::query_plan_node::ResponsePathElement;
+use crate::plugins::telemetry::apollo_exporter::proto::reports::trace::query_plan_node::SequenceNode;
+use crate::plugins::telemetry::apollo_exporter::proto::reports::trace::Details;
+use crate::plugins::telemetry::apollo_exporter::proto::reports::trace::Http;
+use crate::plugins::telemetry::apollo_exporter::proto::reports::trace::QueryPlanNode;
 use crate::plugins::telemetry::apollo_exporter::ApolloExporter;
-use crate::plugins::telemetry::config;
-use crate::plugins::telemetry::config::ExposeTraceId;
 use crate::plugins::telemetry::config::Sampler;
 use crate::plugins::telemetry::config::SamplerOption;
 use crate::plugins::telemetry::tracing::apollo::TracesReport;
+use crate::plugins::telemetry::tracing::BatchProcessorConfig;
 use crate::plugins::telemetry::BoxError;
+use crate::plugins::telemetry::ROUTER_SPAN_NAME;
 use crate::plugins::telemetry::SUBGRAPH_SPAN_NAME;
 use crate::plugins::telemetry::SUPERGRAPH_SPAN_NAME;
 use crate::query_planner::CONDITION_ELSE_SPAN_NAME;
@@ -73,6 +70,8 @@ const APOLLO_PRIVATE_GRAPHQL_VARIABLES: Key =
     Key::from_static_str("apollo_private.graphql.variables");
 const APOLLO_PRIVATE_HTTP_REQUEST_HEADERS: Key =
     Key::from_static_str("apollo_private.http.request_headers");
+const APOLLO_PRIVATE_HTTP_RESPONSE_HEADERS: Key =
+    Key::from_static_str("apollo_private.http.response_headers");
 pub(crate) const APOLLO_PRIVATE_OPERATION_SIGNATURE: Key =
     Key::from_static_str("apollo_private.operation_signature");
 const APOLLO_PRIVATE_FTV1: Key = Key::from_static_str("apollo_private.ftv1");
@@ -84,7 +83,6 @@ const DEPENDS: Key = Key::from_static_str("graphql.depends");
 const LABEL: Key = Key::from_static_str("graphql.label");
 const CONDITION: Key = Key::from_static_str("graphql.condition");
 const OPERATION_NAME: Key = Key::from_static_str("graphql.operation.name");
-pub(crate) const DEFAULT_TRACE_ID_HEADER_NAME: &str = "apollo-trace-id";
 
 #[derive(Error, Debug)]
 pub(crate) enum Error {
@@ -111,19 +109,21 @@ pub(crate) enum Error {
 #[derive(Derivative)]
 #[derivative(Debug)]
 pub(crate) struct Exporter {
-    expose_trace_id_config: config::ExposeTraceId,
     spans_by_parent_id: LruCache<SpanId, Vec<SpanData>>,
     #[derivative(Debug = "ignore")]
-    report_exporter: ReportExporter,
+    report_exporter: Arc<ApolloExporter>,
     field_execution_weight: f64,
 }
 
 enum TreeData {
-    Request(Result<Box<proto::Trace>, Error>),
-    Supergraph {
+    Request(Result<Box<proto::reports::Trace>, Error>),
+    Router {
         http: Box<Http>,
         client_name: Option<String>,
         client_version: Option<String>,
+        duration_ns: u64,
+    },
+    Supergraph {
         operation_signature: String,
         operation_name: String,
         variables_json: HashMap<String, String>,
@@ -133,36 +133,35 @@ enum TreeData {
     DeferDeferred(DeferredNode),
     ConditionIf(Option<QueryPlanNode>),
     ConditionElse(Option<QueryPlanNode>),
-    Trace(Option<Result<Box<proto::Trace>, Error>>),
+    Trace(Option<Result<Box<proto::reports::Trace>, Error>>),
 }
 
 #[buildstructor::buildstructor]
 impl Exporter {
     #[builder]
     pub(crate) fn new(
-        expose_trace_id_config: config::ExposeTraceId,
         endpoint: Url,
         apollo_key: String,
         apollo_graph_ref: String,
         schema_id: String,
-        buffer_size: usize,
-        field_execution_sampler: Option<SamplerOption>,
+        buffer_size: NonZeroUsize,
+        field_execution_sampler: SamplerOption,
+        batch_config: BatchProcessorConfig,
     ) -> Result<Self, BoxError> {
         tracing::debug!("creating studio exporter");
         Ok(Self {
-            expose_trace_id_config,
             spans_by_parent_id: LruCache::new(buffer_size),
-            report_exporter: ReportExporter::Apollo(Arc::new(ApolloExporter::new(
+            report_exporter: Arc::new(ApolloExporter::new(
                 &endpoint,
+                &batch_config,
                 &apollo_key,
                 &apollo_graph_ref,
                 &schema_id,
-            )?)),
+            )?),
             field_execution_weight: match field_execution_sampler {
-                Some(SamplerOption::Always(Sampler::AlwaysOn)) => 1.0,
-                Some(SamplerOption::Always(Sampler::AlwaysOff)) => 0.0,
-                Some(SamplerOption::TraceIdRatioBased(ratio)) => 1.0 / ratio,
-                None => 0.0,
+                SamplerOption::Always(Sampler::AlwaysOn) => 1.0,
+                SamplerOption::Always(Sampler::AlwaysOff) => 0.0,
+                SamplerOption::TraceIdRatioBased(ratio) => 1.0 / ratio,
             },
         })
     }
@@ -171,17 +170,12 @@ impl Exporter {
         &mut self,
         span: &SpanData,
         child_nodes: Vec<TreeData>,
-    ) -> Result<Box<proto::Trace>, Error> {
-        let http = extract_http_data(span, &self.expose_trace_id_config);
-        let mut root_trace = proto::Trace {
+    ) -> Result<Box<proto::reports::Trace>, Error> {
+        let http = extract_http_data(span);
+        let mut root_trace = proto::reports::Trace {
             start_time: Some(span.start_time.into()),
             end_time: Some(span.end_time.into()),
-            duration_ns: span
-                .attributes
-                .get(&APOLLO_PRIVATE_DURATION_NS)
-                .and_then(extract_i64)
-                .map(|e| e as u64)
-                .unwrap_or_default(),
+            duration_ns: 0,
             root: None,
             details: None,
             http: Some(http),
@@ -193,21 +187,27 @@ impl Exporter {
                 TreeData::QueryPlanNode(query_plan) => {
                     root_trace.query_plan = Some(Box::new(query_plan))
                 }
-                TreeData::Supergraph {
+                TreeData::Router {
                     http,
                     client_name,
                     client_version,
-                    operation_signature,
-                    operation_name,
-                    variables_json,
+                    duration_ns,
                 } => {
-                    root_trace
+                    let root_http = root_trace
                         .http
                         .as_mut()
-                        .expect("http was extracted earlier, qed")
-                        .request_headers = http.request_headers;
+                        .expect("http was extracted earlier, qed");
+                    root_http.request_headers = http.request_headers;
+                    root_http.response_headers = http.response_headers;
                     root_trace.client_name = client_name.unwrap_or_default();
                     root_trace.client_version = client_version.unwrap_or_default();
+                    root_trace.duration_ns = duration_ns;
+                }
+                TreeData::Supergraph {
+                    operation_signature,
+                    operation_name,
+                    variables_json,
+                } => {
                     root_trace.field_execution_weight = self.field_execution_weight;
                     root_trace.signature = operation_signature;
                     root_trace.details = Some(Details {
@@ -222,7 +222,7 @@ impl Exporter {
         Ok(Box::new(root_trace))
     }
 
-    fn extract_trace(&mut self, span: SpanData) -> Result<Box<proto::Trace>, Error> {
+    fn extract_trace(&mut self, span: SpanData) -> Result<Box<proto::reports::Trace>, Error> {
         self.extract_data_from_spans(&span)?
             .pop()
             .and_then(|node| {
@@ -256,14 +256,14 @@ impl Exporter {
 
         Ok(match span.name.as_ref() {
             PARALLEL_SPAN_NAME => vec![TreeData::QueryPlanNode(QueryPlanNode {
-                node: Some(proto::trace::query_plan_node::Node::Parallel(
+                node: Some(proto::reports::trace::query_plan_node::Node::Parallel(
                     ParallelNode {
                         nodes: child_nodes.remove_query_plan_nodes(),
                     },
                 )),
             })],
             SEQUENCE_SPAN_NAME => vec![TreeData::QueryPlanNode(QueryPlanNode {
-                node: Some(proto::trace::query_plan_node::Node::Sequence(
+                node: Some(proto::reports::trace::query_plan_node::Node::Sequence(
                     SequenceNode {
                         nodes: child_nodes.remove_query_plan_nodes(),
                     },
@@ -283,8 +283,8 @@ impl Exporter {
                     .as_str())
                 .to_string();
                 vec![TreeData::QueryPlanNode(QueryPlanNode {
-                    node: Some(proto::trace::query_plan_node::Node::Fetch(Box::new(
-                        FetchNode {
+                    node: Some(proto::reports::trace::query_plan_node::Node::Fetch(
+                        Box::new(FetchNode {
                             service_name,
                             trace_parsing_failed,
                             trace,
@@ -296,22 +296,22 @@ impl Exporter {
                                 .unwrap_or_default(),
                             sent_time: Some(span.start_time.into()),
                             received_time: Some(span.end_time.into()),
-                        },
-                    ))),
+                        }),
+                    )),
                 })]
             }
             FLATTEN_SPAN_NAME => {
                 vec![TreeData::QueryPlanNode(QueryPlanNode {
-                    node: Some(proto::trace::query_plan_node::Node::Flatten(Box::new(
-                        FlattenNode {
+                    node: Some(proto::reports::trace::query_plan_node::Node::Flatten(
+                        Box::new(FlattenNode {
                             response_path: span
                                 .attributes
                                 .get(&PATH)
                                 .map(extract_path)
                                 .unwrap_or_default(),
                             node: child_nodes.remove_first_query_plan_node().map(Box::new),
-                        },
-                    ))),
+                        }),
+                    )),
                 })]
             }
             SUBGRAPH_SPAN_NAME => {
@@ -324,12 +324,6 @@ impl Exporter {
             SUPERGRAPH_SPAN_NAME => {
                 //Currently some data is in the supergraph span as we don't have the a request hook in plugin.
                 child_nodes.push(TreeData::Supergraph {
-                    http: Box::new(extract_http_data(span, &self.expose_trace_id_config)),
-                    client_name: span.attributes.get(&CLIENT_NAME).and_then(extract_string),
-                    client_version: span
-                        .attributes
-                        .get(&CLIENT_VERSION)
-                        .and_then(extract_string),
                     operation_signature: span
                         .attributes
                         .get(&APOLLO_PRIVATE_OPERATION_SIGNATURE)
@@ -353,6 +347,23 @@ impl Exporter {
                     self.extract_root_trace(span, child_nodes),
                 )]
             }
+            ROUTER_SPAN_NAME => {
+                child_nodes.push(TreeData::Router {
+                    http: Box::new(extract_http_data(span)),
+                    client_name: span.attributes.get(&CLIENT_NAME).and_then(extract_string),
+                    client_version: span
+                        .attributes
+                        .get(&CLIENT_VERSION)
+                        .and_then(extract_string),
+                    duration_ns: span
+                        .attributes
+                        .get(&APOLLO_PRIVATE_DURATION_NS)
+                        .and_then(extract_i64)
+                        .map(|e| e as u64)
+                        .unwrap_or_default(),
+                });
+                child_nodes
+            }
             DEFER_SPAN_NAME => {
                 vec![TreeData::QueryPlanNode(QueryPlanNode {
                     node: Some(Node::Defer(Box::new(DeferNode {
@@ -446,7 +457,7 @@ fn extract_path(v: &Value) -> Vec<ResponsePathElement> {
                     if let Ok(index) = v.parse::<u32>() {
                         ResponsePathElement {
                             id: Some(
-                                proto::trace::query_plan_node::response_path_element::Id::Index(
+                                proto::reports::trace::query_plan_node::response_path_element::Id::Index(
                                     index,
                                 ),
                             ),
@@ -454,7 +465,7 @@ fn extract_path(v: &Value) -> Vec<ResponsePathElement> {
                     } else {
                         ResponsePathElement {
                             id: Some(
-                                proto::trace::query_plan_node::response_path_element::Id::FieldName(
+                                proto::reports::trace::query_plan_node::response_path_element::Id::FieldName(
                                     v.to_string(),
                                 ),
                             ),
@@ -474,10 +485,10 @@ fn extract_i64(v: &Value) -> Option<i64> {
     }
 }
 
-fn extract_ftv1_trace(v: &Value) -> Option<Result<Box<proto::Trace>, Error>> {
+fn extract_ftv1_trace(v: &Value) -> Option<Result<Box<proto::reports::Trace>, Error>> {
     if let Some(v) = extract_string(v) {
         if let Ok(v) = base64::decode(v) {
-            if let Ok(t) = proto::Trace::decode(Cursor::new(v)) {
+            if let Ok(t) = proto::reports::Trace::decode(Cursor::new(v)) {
                 return Some(Ok(Box::new(t)));
             }
         }
@@ -487,7 +498,7 @@ fn extract_ftv1_trace(v: &Value) -> Option<Result<Box<proto::Trace>, Error>> {
     None
 }
 
-fn extract_http_data(span: &SpanData, expose_trace_id_config: &ExposeTraceId) -> Http {
+fn extract_http_data(span: &SpanData) -> Http {
     let method = match span
         .attributes
         .get(&HTTP_METHOD)
@@ -495,16 +506,16 @@ fn extract_http_data(span: &SpanData, expose_trace_id_config: &ExposeTraceId) ->
         .unwrap_or_default()
         .as_ref()
     {
-        "OPTIONS" => proto::trace::http::Method::Options,
-        "GET" => proto::trace::http::Method::Get,
-        "HEAD" => proto::trace::http::Method::Head,
-        "POST" => proto::trace::http::Method::Post,
-        "PUT" => proto::trace::http::Method::Put,
-        "DELETE" => proto::trace::http::Method::Delete,
-        "TRACE" => proto::trace::http::Method::Trace,
-        "CONNECT" => proto::trace::http::Method::Connect,
-        "PATCH" => proto::trace::http::Method::Patch,
-        _ => proto::trace::http::Method::Unknown,
+        "OPTIONS" => proto::reports::trace::http::Method::Options,
+        "GET" => proto::reports::trace::http::Method::Get,
+        "HEAD" => proto::reports::trace::http::Method::Head,
+        "POST" => proto::reports::trace::http::Method::Post,
+        "PUT" => proto::reports::trace::http::Method::Put,
+        "DELETE" => proto::reports::trace::http::Method::Delete,
+        "TRACE" => proto::reports::trace::http::Method::Trace,
+        "CONNECT" => proto::reports::trace::http::Method::Connect,
+        "PATCH" => proto::reports::trace::http::Method::Patch,
+        _ => proto::reports::trace::http::Method::Unknown,
     };
     let request_headers = span
         .attributes
@@ -514,24 +525,14 @@ fn extract_http_data(span: &SpanData, expose_trace_id_config: &ExposeTraceId) ->
         .into_iter()
         .map(|(header_name, value)| (header_name.to_lowercase(), Values { value }))
         .collect();
-    // For now, only trace_id
-    let response_headers = if expose_trace_id_config.enabled {
-        let mut res = HashMap::with_capacity(1);
-        res.insert(
-            expose_trace_id_config
-                .header_name
-                .as_ref()
-                .map(|h| h.to_string())
-                .unwrap_or_else(|| DEFAULT_TRACE_ID_HEADER_NAME.to_string()),
-            Values {
-                value: vec![span.span_context.trace_id().to_string()],
-            },
-        );
-
-        res
-    } else {
-        HashMap::new()
-    };
+    let response_headers = span
+        .attributes
+        .get(&APOLLO_PRIVATE_HTTP_RESPONSE_HEADERS)
+        .and_then(extract_json::<HashMap<String, Vec<String>>>)
+        .unwrap_or_default()
+        .into_iter()
+        .map(|(header_name, value)| (header_name.to_lowercase(), Values { value }))
+        .collect();
 
     Http {
         method: method.into(),
@@ -548,22 +549,9 @@ impl SpanExporter for Exporter {
         // Exporting to apollo means that we must have complete trace as the entire trace must be built.
         // We do what we can, and if there are any traces that are not complete then we keep them for the next export event.
         // We may get spans that simply don't complete. These need to be cleaned up after a period. It's the price of using ftv1.
-
-        // Note that apollo-tracing won't really work with defer/stream/live queries. In this situation it's difficult to know when a request has actually finished.
-        let mut traces: Vec<(String, proto::Trace)> = Vec::new();
+        let mut traces: Vec<(String, proto::reports::Trace)> = Vec::new();
         for span in batch {
             if span.name == REQUEST_SPAN_NAME {
-                // Write spans for testing
-                // You can obtain new span data by uncommenting the following code and executing a query.
-                // In general this isn't something we'll want to do often, we are just verifying that the exporter constructs a correct report.
-                // let mut c = self
-                //     .spans_by_parent_id
-                //     .iter()
-                //     .flat_map(|(_, s)| s.iter())
-                //     .collect::<Vec<_>>();
-                // c.push(&span);
-                // std::fs::write("spandata.yaml", serde_yaml::to_string(&c).unwrap()).unwrap();
-
                 match self.extract_trace(span) {
                     Ok(mut trace) => {
                         let mut operation_signature = Default::default();
@@ -695,239 +683,16 @@ impl ChildNodes for Vec<TreeData> {
     }
 }
 
-#[derive(Clone)]
-enum ReportExporter {
-    Apollo(Arc<ApolloExporter>),
-    #[cfg(test)]
-    InMemory(Arc<Mutex<Vec<Report>>>),
-}
-
-impl ReportExporter {
-    async fn submit_report(self, report: Report) -> Result<(), ApolloExportError> {
-        match self {
-            ReportExporter::Apollo(apollo) => apollo.submit_report(report).await,
-            #[cfg(test)]
-            ReportExporter::InMemory(store) => {
-                store.lock().expect("poisoned").push(report);
-                Ok(())
-            }
-        }
-    }
-}
-
-#[buildstructor::buildstructor]
-#[cfg(test)]
-impl Exporter {
-    #[builder]
-    pub(crate) fn test_new(expose_trace_id_config: Option<config::ExposeTraceId>) -> Self {
-        Exporter {
-            expose_trace_id_config: expose_trace_id_config.unwrap_or_default(),
-            spans_by_parent_id: LruCache::unbounded(),
-            report_exporter: ReportExporter::InMemory(Default::default()),
-            field_execution_weight: 1.0,
-        }
-    }
-}
-
 #[cfg(test)]
 mod test {
-    use http::header::HeaderName;
-    use opentelemetry::sdk::export::trace::{SpanData, SpanExporter};
-    use opentelemetry::sdk::trace::{EvictedHashMap, EvictedQueue};
-    use opentelemetry::trace::{SpanContext, SpanId, SpanKind, TraceId};
-    use opentelemetry::{Key, KeyValue, Value};
+    use opentelemetry::Value;
     use prost::Message;
     use serde_json::json;
-    use std::str::FromStr;
-    use std::time::SystemTime;
-
-    use crate::plugins::telemetry::apollo::{Report};
-    use crate::plugins::telemetry::apollo_exporter::proto::Trace;
-    use crate::plugins::telemetry::apollo_exporter::proto::trace::query_plan_node::{DeferNodePrimary, DeferredNode, ResponsePathElement};
-    use crate::plugins::telemetry::apollo_exporter::proto::trace::QueryPlanNode;
-    use crate::plugins::telemetry::config::ExposeTraceId;
-    use crate::plugins::telemetry::tracing::apollo_telemetry::proto::trace::query_plan_node::response_path_element::Id;
-    use crate::plugins::telemetry::tracing::apollo_telemetry::{ChildNodes, Exporter, extract_ftv1_trace, extract_i64, extract_json, extract_path, extract_string, ReportExporter, TreeData};
-
-    fn load_span_data(spandata: &str) -> Vec<SpanData> {
-        // Serde support was removed from otel 0.18
-        let value: Vec<serde_yaml::Value> =
-            serde_yaml::from_str(spandata).expect("test spans must be parsable");
-        value
-            .iter()
-            .map(|v| {
-                let span_data = v.as_mapping().expect("expected mapping");
-                let span_context = span_data
-                    .get(&serde_yaml::Value::String("span_context".into()))
-                    .expect("expected span_context")
-                    .as_mapping()
-                    .expect("expected mapping");
-                let mut attributes = EvictedHashMap::new(256, 256);
-                for (key, value) in span_data
-                    .get(&serde_yaml::Value::String("attributes".into()))
-                    .expect("expected attributes")
-                    .as_mapping()
-                    .expect("expected mapping")
-                    .get(&serde_yaml::Value::String("map".into()))
-                    .expect("expected map")
-                    .as_mapping()
-                    .expect("expected mapping")
-                {
-                    let value: Value = match value
-                        .as_mapping()
-                        .expect("expected mapping")
-                        .iter()
-                        .map(|(k, v)| (k.as_str().expect("expected str"), v))
-                        .next()
-                        .expect("expected value")
-                    {
-                        ("Bool", serde_yaml::Value::Bool(b)) => Value::Bool(*b),
-                        ("I64", serde_yaml::Value::Number(n)) if n.is_i64() => {
-                            Value::I64(n.as_i64().expect("qed"))
-                        }
-                        ("F64", serde_yaml::Value::Number(n)) if n.is_f64() => {
-                            Value::F64(n.as_f64().expect("qed"))
-                        }
-                        ("String", serde_yaml::Value::String(s)) => s.clone().into(),
-                        _ => panic!("unexpected value type {:?}", value),
-                    };
-                    attributes.insert(KeyValue::new(
-                        Key::from(key.as_str().expect("expected str").to_string()),
-                        value,
-                    ));
-                }
-                SpanData {
-                    span_context: SpanContext::new(
-                        TraceId::from_bytes(
-                            u128::from_str(
-                                span_context
-                                    .get(&serde_yaml::Value::String("trace_id".into()))
-                                    .expect("expected trace_id")
-                                    .as_str()
-                                    .expect("expected str"),
-                            )
-                            .expect("expected u128 parse")
-                            .to_be_bytes(),
-                        ),
-                        SpanId::from_bytes(
-                            span_context
-                                .get(&serde_yaml::Value::String("span_id".into()))
-                                .expect("expected span_id")
-                                .as_u64()
-                                .expect("expected u64")
-                                .to_be_bytes(),
-                        ),
-                        Default::default(),
-                        false,
-                        Default::default(),
-                    ),
-                    parent_span_id: SpanId::from_bytes(
-                        span_data
-                            .get(&serde_yaml::Value::String("parent_span_id".into()))
-                            .cloned()
-                            .unwrap_or_else(|| serde_yaml::Value::Number(0.into()))
-                            .as_u64()
-                            .expect("expected u64")
-                            .to_be_bytes(),
-                    ),
-                    span_kind: SpanKind::Client,
-                    name: span_data
-                        .get(&serde_yaml::Value::String("name".into()))
-                        .expect("name")
-                        .as_str()
-                        .expect("expected str")
-                        .to_string()
-                        .into(),
-                    start_time: SystemTime::now(),
-                    end_time: SystemTime::now(),
-                    attributes,
-                    events: EvictedQueue::new(100),
-                    links: EvictedQueue::new(100),
-                    status: Default::default(),
-                    resource: Default::default(),
-                    instrumentation_lib: Default::default(),
-                }
-            })
-            .collect()
-    }
-
-    async fn report(mut exporter: Exporter, spandata: &str) -> Report {
-        let spandata = load_span_data(spandata);
-
-        exporter
-            .export(spandata)
-            .await
-            .expect("span export must succeed");
-        assert!(matches!(
-            exporter.report_exporter,
-            ReportExporter::InMemory(_)
-        ));
-        if let ReportExporter::InMemory(storage) = exporter.report_exporter {
-            return storage
-                .lock()
-                .expect("lock poisoned")
-                .pop()
-                .expect("must have a report");
-        }
-        panic!("cannot happen");
-    }
-
-    macro_rules! assert_report {
-        ($report: expr)=> {
-            insta::with_settings!({sort_maps => true}, {
-                    insta::assert_yaml_snapshot!($report, {
-                        ".**.seconds" => "[seconds]",
-                        ".**.nanos" => "[nanos]",
-                        ".**.duration_ns" => "[duration_ns]",
-                        ".**.child[].start_time" => "[start_time]",
-                        ".**.child[].end_time" => "[end_time]",
-                        ".**.trace_id.value[]" => "[trace_id]",
-                        ".**.sent_time_offset" => "[sent_time_offset]"
-                    });
-                });
-        }
-    }
-
-    #[tokio::test]
-    async fn test_condition_if() {
-        // The following curl request was used to generate this span data
-        // curl --request POST \
-        //     --header 'content-type: application/json' \
-        //     --header 'accept: multipart/mixed; deferSpec=20220824, application/json' \
-        //     --url http://localhost:4000/ \
-        //     --data '{"query":"query($if: Boolean!) {\n  topProducts {\n    name\n      ... @defer(if: $if) {\n    reviews {\n      author {\n        name\n      }\n    }\n    reviews {\n      author {\n        name\n      }\n    }\n      }\n  }\n}","variables":{"if":true}}'
-        let spandata = include_str!("testdata/condition_if_spandata.yaml");
-        let exporter = Exporter::test_builder().build();
-        let report = report(exporter, spandata).await;
-        assert_report!(report);
-    }
-
-    #[tokio::test]
-    async fn test_condition_else() {
-        // The following curl request was used to generate this span data
-        // curl --request POST \
-        //     --header 'content-type: application/json' \
-        //     --header 'accept: multipart/mixed; deferSpec=20220824, application/json' \
-        //     --url http://localhost:4000/ \
-        //     --data '{"query":"query($if: Boolean!) {\n  topProducts {\n    name\n      ... @defer(if: $if) {\n    reviews {\n      author {\n        name\n      }\n    }\n    reviews {\n      author {\n        name\n      }\n    }\n      }\n  }\n}","variables":{"if":false}}'
-        let spandata = include_str!("testdata/condition_else_spandata.yaml");
-        let exporter = Exporter::test_builder().build();
-        let report = report(exporter, spandata).await;
-        assert_report!(report);
-    }
-
-    #[tokio::test]
-    async fn test_trace_id() {
-        let spandata = include_str!("testdata/condition_if_spandata.yaml");
-        let exporter = Exporter::test_builder()
-            .expose_trace_id_config(ExposeTraceId {
-                enabled: true,
-                header_name: Some(HeaderName::from_static("trace_id")),
-            })
-            .build();
-        let report = report(exporter, spandata).await;
-        assert_report!(report);
-    }
+    use crate::plugins::telemetry::apollo_exporter::proto::reports::Trace;
+    use crate::plugins::telemetry::apollo_exporter::proto::reports::trace::query_plan_node::{DeferNodePrimary, DeferredNode, ResponsePathElement};
+    use crate::plugins::telemetry::apollo_exporter::proto::reports::trace::QueryPlanNode;
+    use crate::plugins::telemetry::apollo_exporter::proto::reports::trace::query_plan_node::response_path_element::Id;
+    use crate::plugins::telemetry::tracing::apollo_telemetry::{ChildNodes, extract_ftv1_trace, extract_i64, extract_json, extract_path, extract_string, TreeData};
 
     fn elements(tree_data: Vec<TreeData>) -> Vec<&'static str> {
         let mut elements = Vec::new();
@@ -941,6 +706,7 @@ mod test {
                 TreeData::ConditionIf(_) => elements.push("condition_if"),
                 TreeData::ConditionElse(_) => elements.push("condition_else"),
                 TreeData::Trace(_) => elements.push("trace"),
+                TreeData::Router { .. } => elements.push("router"),
             }
         }
         elements
diff --git a/apollo-router/src/plugins/telemetry/tracing/datadog.rs b/apollo-router/src/plugins/telemetry/tracing/datadog.rs
index 466dcdbe51..f63b591982 100644
--- a/apollo-router/src/plugins/telemetry/tracing/datadog.rs
+++ b/apollo-router/src/plugins/telemetry/tracing/datadog.rs
@@ -21,7 +21,8 @@ pub(crate) struct Config {
     #[schemars(with = "String", default = "default_agent_endpoint")]
     pub(crate) endpoint: AgentEndpoint,
 
-    pub(crate) batch_processor: Option<BatchProcessorConfig>,
+    #[serde(default)]
+    pub(crate) batch_processor: BatchProcessorConfig,
 }
 const fn default_agent_endpoint() -> &'static str {
     "default"
@@ -29,10 +30,7 @@ const fn default_agent_endpoint() -> &'static str {
 
 impl TracingConfigurator for Config {
     fn apply(&self, builder: Builder, trace_config: &Trace) -> Result<Builder, BoxError> {
-        tracing::info!(
-            "configuring Datadog tracing: {}",
-            self.batch_processor.as_ref().cloned().unwrap_or_default()
-        );
+        tracing::info!("configuring Datadog tracing: {}", self.batch_processor);
         let url = match &self.endpoint {
             AgentEndpoint::Default(_) => None,
             AgentEndpoint::Url(s) => Some(s),
@@ -46,13 +44,7 @@ impl TracingConfigurator for Config {
             .build_exporter()?;
         Ok(builder.with_span_processor(
             BatchSpanProcessor::builder(exporter, opentelemetry::runtime::Tokio)
-                .with_batch_config(
-                    self.batch_processor
-                        .as_ref()
-                        .cloned()
-                        .unwrap_or_default()
-                        .into(),
-                )
+                .with_batch_config(self.batch_processor.clone().into())
                 .build()
                 .filtered(),
         ))
diff --git a/apollo-router/src/plugins/telemetry/tracing/jaeger.rs b/apollo-router/src/plugins/telemetry/tracing/jaeger.rs
index 1e24563ce3..062a34b4a0 100644
--- a/apollo-router/src/plugins/telemetry/tracing/jaeger.rs
+++ b/apollo-router/src/plugins/telemetry/tracing/jaeger.rs
@@ -34,8 +34,7 @@ pub(crate) struct Config {
     pub(crate) endpoint: Endpoint,
 
     #[serde(default)]
-    #[schemars(default)]
-    pub(crate) batch_processor: Option<BatchProcessorConfig>,
+    pub(crate) batch_processor: BatchProcessorConfig,
 }
 
 // This is needed because of the use of flatten.
@@ -83,10 +82,7 @@ fn default_agent_endpoint() -> &'static str {
 
 impl TracingConfigurator for Config {
     fn apply(&self, builder: Builder, trace_config: &Trace) -> Result<Builder, BoxError> {
-        tracing::info!(
-            "configuring Jaeger tracing: {}",
-            self.batch_processor.as_ref().cloned().unwrap_or_default()
-        );
+        tracing::info!("configuring Jaeger tracing: {}", self.batch_processor);
         match &self.endpoint {
             Endpoint::Agent { endpoint } => {
                 let socket = match endpoint {
@@ -105,13 +101,7 @@ impl TracingConfigurator for Config {
                     .build_async_agent_exporter(opentelemetry::runtime::Tokio)?;
                 Ok(builder.with_span_processor(
                     BatchSpanProcessor::builder(exporter, opentelemetry::runtime::Tokio)
-                        .with_batch_config(
-                            self.batch_processor
-                                .as_ref()
-                                .cloned()
-                                .unwrap_or_default()
-                                .into(),
-                        )
+                        .with_batch_config(self.batch_processor.clone().into())
                         .build()
                         .filtered(),
                 ))
@@ -131,13 +121,7 @@ impl TracingConfigurator for Config {
                     .with(password, |b, p| b.with_password(p))
                     .with_endpoint(&endpoint.to_string())
                     .with_reqwest()
-                    .with_batch_processor_config(
-                        self.batch_processor
-                            .as_ref()
-                            .cloned()
-                            .unwrap_or_default()
-                            .into(),
-                    )
+                    .with_batch_processor_config(self.batch_processor.clone().into())
                     .build_batch(opentelemetry::runtime::Tokio)?;
                 Ok(builder.with_span_processor(DelegateSpanProcessor { tracer_provider }))
             }
diff --git a/apollo-router/src/plugins/telemetry/tracing/mod.rs b/apollo-router/src/plugins/telemetry/tracing/mod.rs
index cd80d6b883..305968209c 100644
--- a/apollo-router/src/plugins/telemetry/tracing/mod.rs
+++ b/apollo-router/src/plugins/telemetry/tracing/mod.rs
@@ -148,70 +148,99 @@ where
     }
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize, JsonSchema, Default)]
+#[derive(Debug, Clone, Deserialize, Serialize, JsonSchema)]
 pub(crate) struct BatchProcessorConfig {
-    #[serde(deserialize_with = "humantime_serde::deserialize", default)]
-    #[schemars(with = "String", default)]
+    #[serde(
+        deserialize_with = "humantime_serde::deserialize",
+        default = "scheduled_delay_default"
+    )]
+    #[schemars(with = "String")]
     /// The delay interval in milliseconds between two consecutive processing
     /// of batches. The default value is 5 seconds.
-    scheduled_delay: Option<Duration>,
+    pub(crate) scheduled_delay: Duration,
 
     /// The maximum queue size to buffer spans for delayed processing. If the
     /// queue gets full it drops the spans. The default value of is 2048.
-    #[schemars(default)]
-    #[serde(default)]
-    max_queue_size: Option<usize>,
+    #[serde(default = "max_queue_size_default")]
+    pub(crate) max_queue_size: usize,
 
     /// The maximum number of spans to process in a single batch. If there are
     /// more than one batch worth of spans then it processes multiple batches
     /// of spans one batch after the other without any delay. The default value
     /// is 512.
-    #[schemars(default)]
-    #[serde(default)]
-    max_export_batch_size: Option<usize>,
-
-    #[serde(deserialize_with = "humantime_serde::deserialize", default)]
-    #[schemars(with = "String", default)]
+    #[serde(default = "max_export_batch_size_default")]
+    pub(crate) max_export_batch_size: usize,
+
+    #[serde(
+        deserialize_with = "humantime_serde::deserialize",
+        default = "max_export_timeout_default"
+    )]
+    #[schemars(with = "String")]
     /// The maximum duration to export a batch of data.
-    max_export_timeout: Option<Duration>,
+    /// The default value is 30 seconds.
+    pub(crate) max_export_timeout: Duration,
 
     /// Maximum number of concurrent exports
     ///
     /// Limits the number of spawned tasks for exports and thus memory consumed
     /// by an exporter. A value of 1 will cause exports to be performed
     /// synchronously on the BatchSpanProcessor task.
-    #[schemars(default)]
-    #[serde(default)]
-    max_concurrent_exports: Option<usize>,
+    /// The default is 1.
+    #[serde(default = "max_concurrent_exports_default")]
+    pub(crate) max_concurrent_exports: usize,
+}
+
+fn scheduled_delay_default() -> Duration {
+    Duration::from_secs(5)
+}
+
+fn max_queue_size_default() -> usize {
+    2048
+}
+
+fn max_export_batch_size_default() -> usize {
+    512
+}
+
+fn max_export_timeout_default() -> Duration {
+    Duration::from_secs(30)
+}
+
+fn max_concurrent_exports_default() -> usize {
+    1
 }
 
 impl From<BatchProcessorConfig> for BatchConfig {
     fn from(config: BatchProcessorConfig) -> Self {
         let mut default = BatchConfig::default();
-        if let Some(scheduled_delay) = config.scheduled_delay {
-            default = default.with_scheduled_delay(scheduled_delay);
-        }
-        if let Some(max_queue_size) = config.max_queue_size {
-            default = default.with_max_queue_size(max_queue_size);
-        }
-        if let Some(max_export_batch_size) = config.max_export_batch_size {
-            default = default.with_max_export_batch_size(max_export_batch_size);
-        }
-        if let Some(max_export_timeout) = config.max_export_timeout {
-            default = default.with_max_export_timeout(max_export_timeout);
-        }
-        if let Some(max_concurrent_exports) = config.max_concurrent_exports {
-            default = default.with_max_concurrent_exports(max_concurrent_exports);
-        }
+        default = default.with_scheduled_delay(config.scheduled_delay);
+        default = default.with_max_queue_size(config.max_queue_size);
+        default = default.with_max_export_batch_size(config.max_export_batch_size);
+        default = default.with_max_export_timeout(config.max_export_timeout);
+        default = default.with_max_concurrent_exports(config.max_concurrent_exports);
         default
     }
 }
 
 impl Display for BatchProcessorConfig {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        let batch_config: BatchConfig = self.clone().into();
-        let debug_str = format!("{:?}", batch_config);
-        // Yes horrible, but there is no other way to get at the actual configured values.
-        f.write_str(&debug_str["BatchConfig { ".len()..debug_str.len() - 1])
+        f.write_str(&format!("BatchConfig {{ scheduled_delay={}, max_queue_size={}, max_export_batch_size={}, max_export_timeout={}, max_concurrent_exports={} }}",
+                             humantime::format_duration(self.scheduled_delay),
+                             self.max_queue_size,
+                             self.max_export_batch_size,
+                             humantime::format_duration(self.max_export_timeout),
+                             self.max_concurrent_exports))
+    }
+}
+
+impl Default for BatchProcessorConfig {
+    fn default() -> Self {
+        BatchProcessorConfig {
+            scheduled_delay: scheduled_delay_default(),
+            max_queue_size: max_queue_size_default(),
+            max_export_batch_size: max_export_batch_size_default(),
+            max_export_timeout: max_export_timeout_default(),
+            max_concurrent_exports: max_concurrent_exports_default(),
+        }
     }
 }
diff --git a/apollo-router/src/plugins/telemetry/tracing/otlp.rs b/apollo-router/src/plugins/telemetry/tracing/otlp.rs
index 7c6ad4f945..2e2f2eb041 100644
--- a/apollo-router/src/plugins/telemetry/tracing/otlp.rs
+++ b/apollo-router/src/plugins/telemetry/tracing/otlp.rs
@@ -12,23 +12,14 @@ use crate::plugins::telemetry::tracing::TracingConfigurator;
 
 impl TracingConfigurator for super::super::otlp::Config {
     fn apply(&self, builder: Builder, _trace_config: &Trace) -> Result<Builder, BoxError> {
-        tracing::info!(
-            "configuring Otlp tracing: {}",
-            self.batch_processor.as_ref().cloned().unwrap_or_default()
-        );
+        tracing::info!("configuring Otlp tracing: {}", self.batch_processor);
         let exporter: SpanExporterBuilder = self.exporter()?;
         Ok(builder.with_span_processor(
             BatchSpanProcessor::builder(
                 exporter.build_span_exporter()?,
                 opentelemetry::runtime::Tokio,
             )
-            .with_batch_config(
-                self.batch_processor
-                    .as_ref()
-                    .cloned()
-                    .unwrap_or_default()
-                    .into(),
-            )
+            .with_batch_config(self.batch_processor.clone().into())
             .build()
             .filtered(),
         ))
diff --git a/apollo-router/src/plugins/telemetry/tracing/snapshots/apollo_router__plugins__telemetry__tracing__apollo_telemetry__test__condition_if.snap b/apollo-router/src/plugins/telemetry/tracing/snapshots/apollo_router__plugins__telemetry__tracing__apollo_telemetry__test__condition_if.snap
deleted file mode 100644
index f20b561f4a..0000000000
--- a/apollo-router/src/plugins/telemetry/tracing/snapshots/apollo_router__plugins__telemetry__tracing__apollo_telemetry__test__condition_if.snap
+++ /dev/null
@@ -1,609 +0,0 @@
----
-source: apollo-router/src/plugins/telemetry/tracing/apollo_telemetry.rs
-expression: report
----
-traces_per_query:
-  "# -\nquery($if:Boolean!){topProducts{name...@defer(if:$if){reviews{author{name}}reviews{author{name}}}}}":
-    traces:
-      - start_time:
-          seconds: "[seconds]"
-          nanos: "[nanos]"
-        end_time:
-          seconds: "[seconds]"
-          nanos: "[nanos]"
-        duration_ns: "[duration_ns]"
-        root: ~
-        is_incomplete: false
-        signature: ""
-        unexecuted_operation_body: ""
-        unexecuted_operation_name: ""
-        details:
-          variables_json:
-            if: "true"
-          operation_name: ""
-        client_name: ""
-        client_version: ""
-        http:
-          method: 4
-          request_headers:
-            accept:
-              value:
-                - ""
-            content-length:
-              value:
-                - ""
-            content-type:
-              value:
-                - ""
-            host:
-              value:
-                - ""
-            user-agent:
-              value:
-                - ""
-          response_headers: {}
-          status_code: 0
-        cache_policy: ~
-        query_plan:
-          node:
-            Condition:
-              condition: if
-              if_clause:
-                node:
-                  Defer:
-                    primary:
-                      node:
-                        node:
-                          Fetch:
-                            service_name: products
-                            trace_parsing_failed: false
-                            trace:
-                              start_time:
-                                seconds: "[seconds]"
-                                nanos: "[nanos]"
-                              end_time:
-                                seconds: "[seconds]"
-                                nanos: "[nanos]"
-                              duration_ns: "[duration_ns]"
-                              root:
-                                original_field_name: ""
-                                type: ""
-                                parent_type: ""
-                                cache_policy: ~
-                                start_time: 0
-                                end_time: 0
-                                error: []
-                                child:
-                                  - original_field_name: ""
-                                    type: "[Product]"
-                                    parent_type: Query
-                                    cache_policy: ~
-                                    start_time: "[start_time]"
-                                    end_time: "[end_time]"
-                                    error: []
-                                    child:
-                                      - original_field_name: ""
-                                        type: ""
-                                        parent_type: ""
-                                        cache_policy: ~
-                                        start_time: "[start_time]"
-                                        end_time: "[end_time]"
-                                        error: []
-                                        child:
-                                          - original_field_name: ""
-                                            type: String
-                                            parent_type: Product
-                                            cache_policy: ~
-                                            start_time: "[start_time]"
-                                            end_time: "[end_time]"
-                                            error: []
-                                            child: []
-                                            id:
-                                              ResponseName: name
-                                          - original_field_name: ""
-                                            type: String!
-                                            parent_type: Product
-                                            cache_policy: ~
-                                            start_time: "[start_time]"
-                                            end_time: "[end_time]"
-                                            error: []
-                                            child: []
-                                            id:
-                                              ResponseName: upc
-                                        id:
-                                          Index: 0
-                                      - original_field_name: ""
-                                        type: ""
-                                        parent_type: ""
-                                        cache_policy: ~
-                                        start_time: "[start_time]"
-                                        end_time: "[end_time]"
-                                        error: []
-                                        child:
-                                          - original_field_name: ""
-                                            type: String
-                                            parent_type: Product
-                                            cache_policy: ~
-                                            start_time: "[start_time]"
-                                            end_time: "[end_time]"
-                                            error: []
-                                            child: []
-                                            id:
-                                              ResponseName: name
-                                          - original_field_name: ""
-                                            type: String!
-                                            parent_type: Product
-                                            cache_policy: ~
-                                            start_time: "[start_time]"
-                                            end_time: "[end_time]"
-                                            error: []
-                                            child: []
-                                            id:
-                                              ResponseName: upc
-                                        id:
-                                          Index: 1
-                                      - original_field_name: ""
-                                        type: ""
-                                        parent_type: ""
-                                        cache_policy: ~
-                                        start_time: "[start_time]"
-                                        end_time: "[end_time]"
-                                        error: []
-                                        child:
-                                          - original_field_name: ""
-                                            type: String
-                                            parent_type: Product
-                                            cache_policy: ~
-                                            start_time: "[start_time]"
-                                            end_time: "[end_time]"
-                                            error: []
-                                            child: []
-                                            id:
-                                              ResponseName: name
-                                          - original_field_name: ""
-                                            type: String!
-                                            parent_type: Product
-                                            cache_policy: ~
-                                            start_time: "[start_time]"
-                                            end_time: "[end_time]"
-                                            error: []
-                                            child: []
-                                            id:
-                                              ResponseName: upc
-                                        id:
-                                          Index: 2
-                                    id:
-                                      ResponseName: topProducts
-                                id: ~
-                              is_incomplete: false
-                              signature: ""
-                              unexecuted_operation_body: ""
-                              unexecuted_operation_name: ""
-                              details: ~
-                              client_name: ""
-                              client_version: ""
-                              http: ~
-                              cache_policy: ~
-                              query_plan: ~
-                              full_query_cache_hit: false
-                              persisted_query_hit: false
-                              persisted_query_register: false
-                              registered_operation: false
-                              forbidden_operation: false
-                              field_execution_weight: 1
-                            sent_time_offset: "[sent_time_offset]"
-                            sent_time:
-                              seconds: "[seconds]"
-                              nanos: "[nanos]"
-                            received_time:
-                              seconds: "[seconds]"
-                              nanos: "[nanos]"
-                    deferred:
-                      - depends:
-                          - id: "0"
-                            defer_label: ""
-                        label: ""
-                        path:
-                          - id:
-                              FieldName: topProducts
-                        node:
-                          node:
-                            Sequence:
-                              nodes:
-                                - node:
-                                    Flatten:
-                                      response_path:
-                                        - id:
-                                            FieldName: topProducts
-                                      node:
-                                        node:
-                                          Fetch:
-                                            service_name: reviews
-                                            trace_parsing_failed: false
-                                            trace:
-                                              start_time:
-                                                seconds: "[seconds]"
-                                                nanos: "[nanos]"
-                                              end_time:
-                                                seconds: "[seconds]"
-                                                nanos: "[nanos]"
-                                              duration_ns: "[duration_ns]"
-                                              root:
-                                                original_field_name: ""
-                                                type: ""
-                                                parent_type: ""
-                                                cache_policy: ~
-                                                start_time: 0
-                                                end_time: 0
-                                                error: []
-                                                child:
-                                                  - original_field_name: ""
-                                                    type: "[_Entity]!"
-                                                    parent_type: Query
-                                                    cache_policy: ~
-                                                    start_time: "[start_time]"
-                                                    end_time: "[end_time]"
-                                                    error: []
-                                                    child:
-                                                      - original_field_name: ""
-                                                        type: ""
-                                                        parent_type: ""
-                                                        cache_policy: ~
-                                                        start_time: "[start_time]"
-                                                        end_time: "[end_time]"
-                                                        error: []
-                                                        child:
-                                                          - original_field_name: ""
-                                                            type: "[Review]"
-                                                            parent_type: Product
-                                                            cache_policy: ~
-                                                            start_time: "[start_time]"
-                                                            end_time: "[end_time]"
-                                                            error: []
-                                                            child:
-                                                              - original_field_name: ""
-                                                                type: ""
-                                                                parent_type: ""
-                                                                cache_policy: ~
-                                                                start_time: "[start_time]"
-                                                                end_time: "[end_time]"
-                                                                error: []
-                                                                child:
-                                                                  - original_field_name: ""
-                                                                    type: User
-                                                                    parent_type: Review
-                                                                    cache_policy: ~
-                                                                    start_time: "[start_time]"
-                                                                    end_time: "[end_time]"
-                                                                    error: []
-                                                                    child:
-                                                                      - original_field_name: ""
-                                                                        type: ID!
-                                                                        parent_type: User
-                                                                        cache_policy: ~
-                                                                        start_time: "[start_time]"
-                                                                        end_time: "[end_time]"
-                                                                        error: []
-                                                                        child: []
-                                                                        id:
-                                                                          ResponseName: id
-                                                                    id:
-                                                                      ResponseName: author
-                                                                id:
-                                                                  Index: 0
-                                                              - original_field_name: ""
-                                                                type: ""
-                                                                parent_type: ""
-                                                                cache_policy: ~
-                                                                start_time: "[start_time]"
-                                                                end_time: "[end_time]"
-                                                                error: []
-                                                                child:
-                                                                  - original_field_name: ""
-                                                                    type: User
-                                                                    parent_type: Review
-                                                                    cache_policy: ~
-                                                                    start_time: "[start_time]"
-                                                                    end_time: "[end_time]"
-                                                                    error: []
-                                                                    child:
-                                                                      - original_field_name: ""
-                                                                        type: ID!
-                                                                        parent_type: User
-                                                                        cache_policy: ~
-                                                                        start_time: "[start_time]"
-                                                                        end_time: "[end_time]"
-                                                                        error: []
-                                                                        child: []
-                                                                        id:
-                                                                          ResponseName: id
-                                                                    id:
-                                                                      ResponseName: author
-                                                                id:
-                                                                  Index: 1
-                                                            id:
-                                                              ResponseName: reviews
-                                                        id:
-                                                          Index: 0
-                                                      - original_field_name: ""
-                                                        type: ""
-                                                        parent_type: ""
-                                                        cache_policy: ~
-                                                        start_time: "[start_time]"
-                                                        end_time: "[end_time]"
-                                                        error: []
-                                                        child:
-                                                          - original_field_name: ""
-                                                            type: "[Review]"
-                                                            parent_type: Product
-                                                            cache_policy: ~
-                                                            start_time: "[start_time]"
-                                                            end_time: "[end_time]"
-                                                            error: []
-                                                            child:
-                                                              - original_field_name: ""
-                                                                type: ""
-                                                                parent_type: ""
-                                                                cache_policy: ~
-                                                                start_time: "[start_time]"
-                                                                end_time: "[end_time]"
-                                                                error: []
-                                                                child:
-                                                                  - original_field_name: ""
-                                                                    type: User
-                                                                    parent_type: Review
-                                                                    cache_policy: ~
-                                                                    start_time: "[start_time]"
-                                                                    end_time: "[end_time]"
-                                                                    error: []
-                                                                    child:
-                                                                      - original_field_name: ""
-                                                                        type: ID!
-                                                                        parent_type: User
-                                                                        cache_policy: ~
-                                                                        start_time: "[start_time]"
-                                                                        end_time: "[end_time]"
-                                                                        error: []
-                                                                        child: []
-                                                                        id:
-                                                                          ResponseName: id
-                                                                    id:
-                                                                      ResponseName: author
-                                                                id:
-                                                                  Index: 0
-                                                            id:
-                                                              ResponseName: reviews
-                                                        id:
-                                                          Index: 1
-                                                      - original_field_name: ""
-                                                        type: ""
-                                                        parent_type: ""
-                                                        cache_policy: ~
-                                                        start_time: "[start_time]"
-                                                        end_time: "[end_time]"
-                                                        error: []
-                                                        child:
-                                                          - original_field_name: ""
-                                                            type: "[Review]"
-                                                            parent_type: Product
-                                                            cache_policy: ~
-                                                            start_time: "[start_time]"
-                                                            end_time: "[end_time]"
-                                                            error: []
-                                                            child:
-                                                              - original_field_name: ""
-                                                                type: ""
-                                                                parent_type: ""
-                                                                cache_policy: ~
-                                                                start_time: "[start_time]"
-                                                                end_time: "[end_time]"
-                                                                error: []
-                                                                child:
-                                                                  - original_field_name: ""
-                                                                    type: User
-                                                                    parent_type: Review
-                                                                    cache_policy: ~
-                                                                    start_time: "[start_time]"
-                                                                    end_time: "[end_time]"
-                                                                    error: []
-                                                                    child:
-                                                                      - original_field_name: ""
-                                                                        type: ID!
-                                                                        parent_type: User
-                                                                        cache_policy: ~
-                                                                        start_time: "[start_time]"
-                                                                        end_time: "[end_time]"
-                                                                        error: []
-                                                                        child: []
-                                                                        id:
-                                                                          ResponseName: id
-                                                                    id:
-                                                                      ResponseName: author
-                                                                id:
-                                                                  Index: 0
-                                                            id:
-                                                              ResponseName: reviews
-                                                        id:
-                                                          Index: 2
-                                                    id:
-                                                      ResponseName: _entities
-                                                id: ~
-                                              is_incomplete: false
-                                              signature: ""
-                                              unexecuted_operation_body: ""
-                                              unexecuted_operation_name: ""
-                                              details: ~
-                                              client_name: ""
-                                              client_version: ""
-                                              http: ~
-                                              cache_policy: ~
-                                              query_plan: ~
-                                              full_query_cache_hit: false
-                                              persisted_query_hit: false
-                                              persisted_query_register: false
-                                              registered_operation: false
-                                              forbidden_operation: false
-                                              field_execution_weight: 1
-                                            sent_time_offset: "[sent_time_offset]"
-                                            sent_time:
-                                              seconds: "[seconds]"
-                                              nanos: "[nanos]"
-                                            received_time:
-                                              seconds: "[seconds]"
-                                              nanos: "[nanos]"
-                                - node:
-                                    Flatten:
-                                      response_path:
-                                        - id:
-                                            FieldName: topProducts
-                                        - id:
-                                            FieldName: reviews
-                                        - id:
-                                            FieldName: author
-                                      node:
-                                        node:
-                                          Fetch:
-                                            service_name: accounts
-                                            trace_parsing_failed: false
-                                            trace:
-                                              start_time:
-                                                seconds: "[seconds]"
-                                                nanos: "[nanos]"
-                                              end_time:
-                                                seconds: "[seconds]"
-                                                nanos: "[nanos]"
-                                              duration_ns: "[duration_ns]"
-                                              root:
-                                                original_field_name: ""
-                                                type: ""
-                                                parent_type: ""
-                                                cache_policy: ~
-                                                start_time: 0
-                                                end_time: 0
-                                                error: []
-                                                child:
-                                                  - original_field_name: ""
-                                                    type: "[_Entity]!"
-                                                    parent_type: Query
-                                                    cache_policy: ~
-                                                    start_time: "[start_time]"
-                                                    end_time: "[end_time]"
-                                                    error: []
-                                                    child:
-                                                      - original_field_name: ""
-                                                        type: ""
-                                                        parent_type: ""
-                                                        cache_policy: ~
-                                                        start_time: "[start_time]"
-                                                        end_time: "[end_time]"
-                                                        error: []
-                                                        child:
-                                                          - original_field_name: ""
-                                                            type: String
-                                                            parent_type: User
-                                                            cache_policy: ~
-                                                            start_time: "[start_time]"
-                                                            end_time: "[end_time]"
-                                                            error: []
-                                                            child: []
-                                                            id:
-                                                              ResponseName: name
-                                                        id:
-                                                          Index: 0
-                                                      - original_field_name: ""
-                                                        type: ""
-                                                        parent_type: ""
-                                                        cache_policy: ~
-                                                        start_time: "[start_time]"
-                                                        end_time: "[end_time]"
-                                                        error: []
-                                                        child:
-                                                          - original_field_name: ""
-                                                            type: String
-                                                            parent_type: User
-                                                            cache_policy: ~
-                                                            start_time: "[start_time]"
-                                                            end_time: "[end_time]"
-                                                            error: []
-                                                            child: []
-                                                            id:
-                                                              ResponseName: name
-                                                        id:
-                                                          Index: 1
-                                                      - original_field_name: ""
-                                                        type: ""
-                                                        parent_type: ""
-                                                        cache_policy: ~
-                                                        start_time: "[start_time]"
-                                                        end_time: "[end_time]"
-                                                        error: []
-                                                        child:
-                                                          - original_field_name: ""
-                                                            type: String
-                                                            parent_type: User
-                                                            cache_policy: ~
-                                                            start_time: "[start_time]"
-                                                            end_time: "[end_time]"
-                                                            error: []
-                                                            child: []
-                                                            id:
-                                                              ResponseName: name
-                                                        id:
-                                                          Index: 2
-                                                      - original_field_name: ""
-                                                        type: ""
-                                                        parent_type: ""
-                                                        cache_policy: ~
-                                                        start_time: "[start_time]"
-                                                        end_time: "[end_time]"
-                                                        error: []
-                                                        child:
-                                                          - original_field_name: ""
-                                                            type: String
-                                                            parent_type: User
-                                                            cache_policy: ~
-                                                            start_time: "[start_time]"
-                                                            end_time: "[end_time]"
-                                                            error: []
-                                                            child: []
-                                                            id:
-                                                              ResponseName: name
-                                                        id:
-                                                          Index: 3
-                                                    id:
-                                                      ResponseName: _entities
-                                                id: ~
-                                              is_incomplete: false
-                                              signature: ""
-                                              unexecuted_operation_body: ""
-                                              unexecuted_operation_name: ""
-                                              details: ~
-                                              client_name: ""
-                                              client_version: ""
-                                              http: ~
-                                              cache_policy: ~
-                                              query_plan: ~
-                                              full_query_cache_hit: false
-                                              persisted_query_hit: false
-                                              persisted_query_register: false
-                                              registered_operation: false
-                                              forbidden_operation: false
-                                              field_execution_weight: 1
-                                            sent_time_offset: "[sent_time_offset]"
-                                            sent_time:
-                                              seconds: "[seconds]"
-                                              nanos: "[nanos]"
-                                            received_time:
-                                              seconds: "[seconds]"
-                                              nanos: "[nanos]"
-              else_clause: ~
-        full_query_cache_hit: false
-        persisted_query_hit: false
-        persisted_query_register: false
-        registered_operation: false
-        forbidden_operation: false
-        field_execution_weight: 1
-    stats_with_context: []
-    referenced_fields_by_type: {}
-operation_count: 1
-
diff --git a/apollo-router/src/plugins/telemetry/tracing/testdata/condition_else_spandata.yaml b/apollo-router/src/plugins/telemetry/tracing/testdata/condition_else_spandata.yaml
deleted file mode 100644
index 6d5cfd5e32..0000000000
--- a/apollo-router/src/plugins/telemetry/tracing/testdata/condition_else_spandata.yaml
+++ /dev/null
@@ -1,1252 +0,0 @@
----
-- span_context:
-    trace_id: "122960190946202642409915189222685399094"
-    span_id: 14287822546131581520
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 17691584597033290046
-  span_kind: Internal
-  name: supergraph
-  start_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 867241222
-  end_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 996401974
-  attributes:
-    map:
-      code.filepath:
-        String: apollo-router/src/plugins/telemetry/mod.rs
-      code.lineno:
-        I64: 673
-      graphql.operation.name:
-        String: ""
-      apollo_private.http.request_headers:
-        String: "{\"accept\":[\"\"],\"content-length\":[\"\"],\"content-type\":[\"\"],\"host\":[\"\"],\"user-agent\":[\"\"]}"
-      client.version:
-        String: ""
-      graphql.document:
-        String: "query($if: Boolean!) {\n  topProducts {\n    name\n      ... @defer(if: $if) {\n    reviews {\n      author {\n        name\n      }\n    }\n    reviews {\n      author {\n        name\n      }\n    }\n      }\n  }\n}"
-      apollo_private.graphql.variables:
-        String: "{\"if\":\"false\"}"
-      thread.name:
-        String: tokio-runtime-worker
-      busy_ns:
-        I64: 8691539
-      code.namespace:
-        String: "apollo_router::plugins::telemetry"
-      client.name:
-        String: ""
-      idle_ns:
-        I64: 120357048
-      thread.id:
-        I64: 16
-      apollo_private.field_level_instrumentation_ratio:
-        F64: 1.0
-      apollo_private.operation_signature:
-        String: "# -\nquery($if:Boolean!){topProducts{name...@defer(if:$if){reviews{author{name}}reviews{author{name}}}}}"
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - apollo_private.operation_signature
-      - apollo_private.http.request_headers
-      - apollo_private.graphql.variables
-      - apollo_private.field_level_instrumentation_ratio
-      - client.version
-      - client.name
-      - graphql.operation.name
-      - graphql.document
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "122960190946202642409915189222685399094"
-    span_id: 15237674702119070751
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 14287822546131581520
-  span_kind: Internal
-  name: query_planning
-  start_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 867688559
-  end_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 867984269
-  attributes:
-    map:
-      thread.name:
-        String: tokio-runtime-worker
-      code.namespace:
-        String: "apollo_router::services::supergraph_service"
-      busy_ns:
-        I64: 202332
-      thread.id:
-        I64: 16
-      code.filepath:
-        String: apollo-router/src/services/supergraph_service.rs
-      idle_ns:
-        I64: 89188
-      code.lineno:
-        I64: 247
-      graphql.document:
-        String: "query($if: Boolean!) {\n  topProducts {\n    name\n      ... @defer(if: $if) {\n    reviews {\n      author {\n        name\n      }\n    }\n    reviews {\n      author {\n        name\n      }\n    }\n      }\n  }\n}"
-      graphql.operation.name:
-        String: ""
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - graphql.operation.name
-      - graphql.document
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "122960190946202642409915189222685399094"
-    span_id: 13865784024556574003
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 14287822546131581520
-  span_kind: Internal
-  name: execution
-  start_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 868258608
-  end_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 995684698
-  attributes:
-    map:
-      code.namespace:
-        String: "apollo_router::plugins::telemetry"
-      thread.name:
-        String: tokio-runtime-worker
-      thread.id:
-        I64: 16
-      idle_ns:
-        I64: 119214086
-      busy_ns:
-        I64: 8228208
-      code.filepath:
-        String: apollo-router/src/plugins/telemetry/mod.rs
-      code.lineno:
-        I64: 283
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "122960190946202642409915189222685399094"
-    span_id: 6782401025275156233
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 13865784024556574003
-  span_kind: Internal
-  name: condition
-  start_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 868378386
-  end_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 995541872
-  attributes:
-    map:
-      thread.name:
-        String: tokio-runtime-worker
-      code.lineno:
-        I64: 327
-      thread.id:
-        I64: 16
-      code.namespace:
-        String: "apollo_router::query_planner::execution"
-      busy_ns:
-        I64: 7912453
-      code.filepath:
-        String: apollo-router/src/query_planner/execution.rs
-      graphql.condition:
-        String: if
-      idle_ns:
-        I64: 119255502
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - graphql.condition
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "122960190946202642409915189222685399094"
-    span_id: 8824695332656836540
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 6782401025275156233
-  span_kind: Internal
-  name: condition_else
-  start_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 868436285
-  end_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 995438855
-  attributes:
-    map:
-      thread.name:
-        String: tokio-runtime-worker
-      code.lineno:
-        I64: 320
-      code.namespace:
-        String: "apollo_router::query_planner::execution"
-      thread.id:
-        I64: 16
-      code.filepath:
-        String: apollo-router/src/query_planner/execution.rs
-      idle_ns:
-        I64: 119291958
-      busy_ns:
-        I64: 7712497
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "122960190946202642409915189222685399094"
-    span_id: 16743763821444799861
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 8824695332656836540
-  span_kind: Internal
-  name: sequence
-  start_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 868481682
-  end_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 995362238
-  attributes:
-    map:
-      idle_ns:
-        I64: 119470686
-      code.filepath:
-        String: apollo-router/src/query_planner/execution.rs
-      code.lineno:
-        I64: 133
-      thread.name:
-        String: tokio-runtime-worker
-      busy_ns:
-        I64: 7408892
-      code.namespace:
-        String: "apollo_router::query_planner::execution"
-      thread.id:
-        I64: 16
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "122960190946202642409915189222685399094"
-    span_id: 17407667985756513925
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 16743763821444799861
-  span_kind: Internal
-  name: fetch
-  start_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 868543283
-  end_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 917023578
-  attributes:
-    map:
-      busy_ns:
-        I64: 1986511
-      thread.id:
-        I64: 16
-      apollo_private.sent_time_offset:
-        I64: 1459136
-      idle_ns:
-        I64: 46482889
-      code.namespace:
-        String: "apollo_router::query_planner::execution"
-      code.lineno:
-        I64: 188
-      apollo.subgraph.name:
-        String: products
-      thread.name:
-        String: tokio-runtime-worker
-      code.filepath:
-        String: apollo-router/src/query_planner/execution.rs
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - apollo_private.sent_time_offset
-      - apollo.subgraph.name
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "122960190946202642409915189222685399094"
-    span_id: 7936167443054682587
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 16743763821444799861
-  span_kind: Internal
-  name: flatten
-  start_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 917215783
-  end_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 955428350
-  attributes:
-    map:
-      code.filepath:
-        String: apollo-router/src/query_planner/execution.rs
-      code.lineno:
-        I64: 176
-      code.namespace:
-        String: "apollo_router::query_planner::execution"
-      graphql.path:
-        String: /topProducts/@
-      idle_ns:
-        I64: 35904853
-      busy_ns:
-        I64: 2314489
-      thread.name:
-        String: tokio-runtime-worker
-      thread.id:
-        I64: 14
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - graphql.path
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "122960190946202642409915189222685399094"
-    span_id: 16253144712595734830
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 16743763821444799861
-  span_kind: Internal
-  name: flatten
-  start_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 955665393
-  end_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 995190497
-  attributes:
-    map:
-      code.lineno:
-        I64: 176
-      code.namespace:
-        String: "apollo_router::query_planner::execution"
-      thread.id:
-        I64: 16
-      busy_ns:
-        I64: 2347943
-      idle_ns:
-        I64: 37184285
-      code.filepath:
-        String: apollo-router/src/query_planner/execution.rs
-      thread.name:
-        String: tokio-runtime-worker
-      graphql.path:
-        String: /topProducts/@/reviews/@/author
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - graphql.path
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "122960190946202642409915189222685399094"
-    span_id: 15278772753518055685
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 16253144712595734830
-  span_kind: Internal
-  name: fetch
-  start_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 955768549
-  end_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 995068484
-  attributes:
-    map:
-      apollo_private.sent_time_offset:
-        I64: 88681888
-      code.filepath:
-        String: apollo-router/src/query_planner/execution.rs
-      code.namespace:
-        String: "apollo_router::query_planner::execution"
-      idle_ns:
-        I64: 37140006
-      busy_ns:
-        I64: 2141909
-      code.lineno:
-        I64: 188
-      thread.id:
-        I64: 16
-      thread.name:
-        String: tokio-runtime-worker
-      apollo.subgraph.name:
-        String: accounts
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - apollo_private.sent_time_offset
-      - apollo.subgraph.name
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "122960190946202642409915189222685399094"
-    span_id: 11170049527526553842
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 15278772753518055685
-  span_kind: Internal
-  name: subgraph
-  start_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 956111054
-  end_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 994769700
-  attributes:
-    map:
-      busy_ns:
-        I64: 1390132
-      thread.name:
-        String: tokio-runtime-worker
-      code.filepath:
-        String: apollo-router/src/plugins/telemetry/mod.rs
-      graphql.operation.name:
-        String: ""
-      code.namespace:
-        String: "apollo_router::plugins::telemetry"
-      graphql.document:
-        String: "query($representations:[_Any!]!){_entities(representations:$representations){...on User{name}}}"
-      apollo.subgraph.name:
-        String: accounts
-      apollo_private.ftv1:
-        String: GgwIw7WnnAYQgLGs0gMiDAjDtaecBhCAsazSA1isvR5ysQFirgEKCV9lbnRpdGllcxoKW19FbnRpdHldIUDn0BFI35cXYiAQAGIcCgRuYW1lGgZTdHJpbmdA8+4YSKOvGWoEVXNlcmIgEAFiHAoEbmFtZRoGU3RyaW5nQKuIGkiFsRpqBFVzZXJiIBACYhwKBG5hbWUaBlN0cmluZ0Dz3hpIofYaagRVc2VyYiAQA2IcCgRuYW1lGgZTdHJpbmdAxasbSJvDG2oEVXNlcmoFUXVlcnn5AQAAAAAAAPA/
-      idle_ns:
-        I64: 37270820
-      thread.id:
-        I64: 16
-      code.lineno:
-        I64: 313
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - apollo_private.ftv1
-      - graphql.operation.name
-      - graphql.document
-      - apollo.subgraph.name
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "122960190946202642409915189222685399094"
-    span_id: 12193731640433132388
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 11170049527526553842
-  span_kind: Client
-  name: subgraph_request
-  start_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 956430440
-  end_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 993872582
-  attributes:
-    map:
-      thread.id:
-        I64: 16
-      code.filepath:
-        String: apollo-router/src/services/subgraph_service.rs
-      code.namespace:
-        String: "apollo_router::services::subgraph_service"
-      code.lineno:
-        I64: 173
-      thread.name:
-        String: tokio-runtime-worker
-      net.peer.port:
-        String: "80"
-      net.transport:
-        String: ip_tcp
-      idle_ns:
-        I64: 37174926
-      net.peer.name:
-        String: accounts.demo.starstuff.dev
-      http.route:
-        String: /graphql
-      apollo.subgraph.name:
-        String: accounts
-      busy_ns:
-        I64: 251431
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - apollo.subgraph.name
-      - net.transport
-      - http.route
-      - net.peer.port
-      - net.peer.name
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "122960190946202642409915189222685399094"
-    span_id: 17716600377366594972
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 7936167443054682587
-  span_kind: Internal
-  name: fetch
-  start_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 917323270
-  end_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 955316673
-  attributes:
-    map:
-      apollo.subgraph.name:
-        String: reviews
-      code.filepath:
-        String: apollo-router/src/query_planner/execution.rs
-      thread.name:
-        String: tokio-runtime-worker
-      code.namespace:
-        String: "apollo_router::query_planner::execution"
-      thread.id:
-        I64: 14
-      busy_ns:
-        I64: 2122145
-      idle_ns:
-        I64: 35855963
-      apollo_private.sent_time_offset:
-        I64: 50235421
-      code.lineno:
-        I64: 188
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - apollo_private.sent_time_offset
-      - apollo.subgraph.name
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "122960190946202642409915189222685399094"
-    span_id: 12581790234036960487
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 17716600377366594972
-  span_kind: Internal
-  name: subgraph
-  start_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 917638675
-  end_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 955031718
-  attributes:
-    map:
-      code.namespace:
-        String: "apollo_router::plugins::telemetry"
-      graphql.operation.name:
-        String: ""
-      thread.name:
-        String: tokio-runtime-worker
-      busy_ns:
-        I64: 1432596
-      code.filepath:
-        String: apollo-router/src/plugins/telemetry/mod.rs
-      code.lineno:
-        I64: 313
-      apollo.subgraph.name:
-        String: reviews
-      thread.id:
-        I64: 14
-      graphql.document:
-        String: "query($representations:[_Any!]!){_entities(representations:$representations){...on Product{reviews{author{__typename id}}}}}"
-      idle_ns:
-        I64: 35964358
-      apollo_private.ftv1:
-        String: GgwIw7WnnAYQgIadwAMiDAjDtaecBhDAgeC/A1iptVRynQNimgMKCV9lbnRpdGllcxoKW19FbnRpdHldIUCGqxRI7OwbYqMBEABingEKB3Jldmlld3MaCFtSZXZpZXddQOzKHki+hzBiOxAAYjcKBmF1dGhvchoEVXNlckDSmjJIxe1GYhcKAmlkGgNJRCFA6dZISJHFSWoEVXNlcmoGUmV2aWV3YjsQAWI3CgZhdXRob3IaBFVzZXJAlcs3SNH5SWIXCgJpZBoDSUQhQO/YSkidoktqBFVzZXJqBlJldmlld2oHUHJvZHVjdGJlEAFiYQoHcmV2aWV3cxoIW1Jldmlld11AmJgkSLmVO2I7EABiNwoGYXV0aG9yGgRVc2VyQMu0PEjrxEtiFwoCaWQaA0lEIUDRoExIieBMagRVc2VyagZSZXZpZXdqB1Byb2R1Y3RiZRACYmEKB3Jldmlld3MaCFtSZXZpZXddQJSRKUiz6j9iOxAAYjcKBmF1dGhvchoEVXNlckC9j0FI/YFNYhcKAmlkGgNJRCFAg/1NSM+oTmoEVXNlcmoGUmV2aWV3agdQcm9kdWN0agVRdWVyefkBAAAAAAAA8D8=
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - apollo_private.ftv1
-      - graphql.operation.name
-      - graphql.document
-      - apollo.subgraph.name
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "122960190946202642409915189222685399094"
-    span_id: 13059514760148115210
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 12581790234036960487
-  span_kind: Client
-  name: subgraph_request
-  start_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 917936271
-  end_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 954080612
-  attributes:
-    map:
-      thread.id:
-        I64: 14
-      net.transport:
-        String: ip_tcp
-      http.route:
-        String: /graphql
-      code.filepath:
-        String: apollo-router/src/services/subgraph_service.rs
-      thread.name:
-        String: tokio-runtime-worker
-      code.lineno:
-        I64: 173
-      busy_ns:
-        I64: 238580
-      net.peer.port:
-        String: "80"
-      idle_ns:
-        I64: 35889487
-      net.peer.name:
-        String: reviews.demo.starstuff.dev
-      apollo.subgraph.name:
-        String: reviews
-      code.namespace:
-        String: "apollo_router::services::subgraph_service"
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - apollo.subgraph.name
-      - net.transport
-      - http.route
-      - net.peer.port
-      - net.peer.name
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "122960190946202642409915189222685399094"
-    span_id: 12520246751970884479
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 17407667985756513925
-  span_kind: Internal
-  name: subgraph
-  start_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 868753996
-  end_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 916852605
-  attributes:
-    map:
-      code.namespace:
-        String: "apollo_router::plugins::telemetry"
-      code.filepath:
-        String: apollo-router/src/plugins/telemetry/mod.rs
-      apollo.subgraph.name:
-        String: products
-      graphql.operation.name:
-        String: ""
-      graphql.document:
-        String: "{topProducts{__typename upc name}}"
-      idle_ns:
-        I64: 46604902
-      apollo_private.ftv1:
-        String: GgwIw7WnnAYQwM3WrAMiDAjDtaecBhCAyZmsA1iQ8DJy/AFi+QEKC3RvcFByb2R1Y3RzGglbUHJvZHVjdF1AufwXSJb9ImJEEABiHwoDdXBjGgdTdHJpbmchQOHGJkjU7SdqB1Byb2R1Y3RiHwoEbmFtZRoGU3RyaW5nQNfIKEj3gSlqB1Byb2R1Y3RiRBABYh8KA3VwYxoHU3RyaW5nIUDOzCpInIEragdQcm9kdWN0Yh8KBG5hbWUaBlN0cmluZ0CGyitI6/MragdQcm9kdWN0YkQQAmIfCgN1cGMaB1N0cmluZyFAg5AtSIS9LWoHUHJvZHVjdGIfCgRuYW1lGgZTdHJpbmdAluMtSLqgLmoHUHJvZHVjdGoFUXVlcnn5AQAAAAAAAPA/
-      busy_ns:
-        I64: 1496082
-      code.lineno:
-        I64: 313
-      thread.id:
-        I64: 16
-      thread.name:
-        String: tokio-runtime-worker
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - apollo_private.ftv1
-      - graphql.operation.name
-      - graphql.document
-      - apollo.subgraph.name
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "122960190946202642409915189222685399094"
-    span_id: 3398738514204614748
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 12520246751970884479
-  span_kind: Client
-  name: subgraph_request
-  start_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 869023655
-  end_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 915894445
-  attributes:
-    map:
-      net.peer.name:
-        String: products.demo.starstuff.dev
-      code.namespace:
-        String: "apollo_router::services::subgraph_service"
-      idle_ns:
-        I64: 46547911
-      http.route:
-        String: /graphql
-      net.peer.port:
-        String: "80"
-      net.transport:
-        String: ip_tcp
-      thread.id:
-        I64: 16
-      busy_ns:
-        I64: 304371
-      apollo.subgraph.name:
-        String: products
-      code.filepath:
-        String: apollo-router/src/services/subgraph_service.rs
-      code.lineno:
-        I64: 173
-      thread.name:
-        String: tokio-runtime-worker
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - apollo.subgraph.name
-      - net.transport
-      - http.route
-      - net.peer.port
-      - net.peer.name
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "122960190946202642409915189222685399094"
-    span_id: 17691584597033290046
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 0
-  span_kind: Server
-  name: request
-  start_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 866508162
-  end_time:
-    secs_since_epoch: 1669978819
-    nanos_since_epoch: 996777793
-  attributes:
-    map:
-      trace_id:
-        String: 5c8145789355263a300c728c5e71d836
-      http.flavor:
-        String: HTTP/1.1
-      http.method:
-        String: POST
-      code.namespace:
-        String: "apollo_router::axum_factory::utils"
-      code.filepath:
-        String: apollo-router/src/axum_factory/utils.rs
-      apollo_private.duration_ns:
-        I64: 130300920
-      http.route:
-        String: /
-      code.lineno:
-        I64: 259
-      busy_ns:
-        I64: 11197815
-      thread.id:
-        I64: 16
-      idle_ns:
-        I64: 119064623
-      thread.name:
-        String: tokio-runtime-worker
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - apollo_private.duration_ns
-      - trace_id
-      - http.flavor
-      - http.route
-      - http.method
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Ok
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
diff --git a/apollo-router/src/plugins/telemetry/tracing/testdata/condition_if_spandata.yaml b/apollo-router/src/plugins/telemetry/tracing/testdata/condition_if_spandata.yaml
deleted file mode 100644
index 0dd3f4b1cd..0000000000
--- a/apollo-router/src/plugins/telemetry/tracing/testdata/condition_if_spandata.yaml
+++ /dev/null
@@ -1,1441 +0,0 @@
----
-- span_context:
-    trace_id: "48179106241482103848812575548686436429"
-    span_id: 2226108203856432052
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 6681943477281517192
-  span_kind: Internal
-  name: supergraph
-  start_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 694878120
-  end_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 831374780
-  attributes:
-    map:
-      graphql.document:
-        String: "query($if: Boolean!) {\n  topProducts {\n    name\n      ... @defer(if: $if) {\n    reviews {\n      author {\n        name\n      }\n    }\n    reviews {\n      author {\n        name\n      }\n    }\n      }\n  }\n}"
-      client.version:
-        String: ""
-      graphql.operation.name:
-        String: ""
-      apollo_private.http.request_headers:
-        String: "{\"accept\":[\"\"],\"content-length\":[\"\"],\"content-type\":[\"\"],\"host\":[\"\"],\"user-agent\":[\"\"]}"
-      apollo_private.field_level_instrumentation_ratio:
-        F64: 1.0
-      busy_ns:
-        I64: 3579254
-      code.filepath:
-        String: apollo-router/src/plugins/telemetry/mod.rs
-      apollo_private.operation_signature:
-        String: "# -\nquery($if:Boolean!){topProducts{name...@defer(if:$if){reviews{author{name}}reviews{author{name}}}}}"
-      apollo_private.graphql.variables:
-        String: "{\"if\":\"true\"}"
-      idle_ns:
-        I64: 132902529
-      code.lineno:
-        I64: 673
-      client.name:
-        String: ""
-      thread.name:
-        String: tokio-runtime-worker
-      thread.id:
-        I64: 15
-      code.namespace:
-        String: "apollo_router::plugins::telemetry"
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - apollo_private.operation_signature
-      - apollo_private.http.request_headers
-      - apollo_private.graphql.variables
-      - apollo_private.field_level_instrumentation_ratio
-      - client.version
-      - client.name
-      - graphql.operation.name
-      - graphql.document
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "48179106241482103848812575548686436429"
-    span_id: 7005602647906255377
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 2226108203856432052
-  span_kind: Internal
-  name: query_planning
-  start_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 695299406
-  end_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 695547275
-  attributes:
-    map:
-      thread.name:
-        String: tokio-runtime-worker
-      code.filepath:
-        String: apollo-router/src/services/supergraph_service.rs
-      code.lineno:
-        I64: 247
-      graphql.operation.name:
-        String: ""
-      thread.id:
-        I64: 15
-      graphql.document:
-        String: "query($if: Boolean!) {\n  topProducts {\n    name\n      ... @defer(if: $if) {\n    reviews {\n      author {\n        name\n      }\n    }\n    reviews {\n      author {\n        name\n      }\n    }\n      }\n  }\n}"
-      busy_ns:
-        I64: 194440
-      idle_ns:
-        I64: 70121
-      code.namespace:
-        String: "apollo_router::services::supergraph_service"
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - graphql.operation.name
-      - graphql.document
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "48179106241482103848812575548686436429"
-    span_id: 5496672787700345629
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 2226108203856432052
-  span_kind: Internal
-  name: execution
-  start_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 695807715
-  end_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 830738870
-  attributes:
-    map:
-      code.filepath:
-        String: apollo-router/src/plugins/telemetry/mod.rs
-      code.lineno:
-        I64: 283
-      busy_ns:
-        I64: 2888938
-      code.namespace:
-        String: "apollo_router::plugins::telemetry"
-      thread.id:
-        I64: 15
-      thread.name:
-        String: tokio-runtime-worker
-      idle_ns:
-        I64: 45262821
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "48179106241482103848812575548686436429"
-    span_id: 8052379820523592996
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 5496672787700345629
-  span_kind: Internal
-  name: condition
-  start_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 695918484
-  end_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 830671333
-  attributes:
-    map:
-      code.namespace:
-        String: "apollo_router::query_planner::execution"
-      idle_ns:
-        I64: 45284960
-      code.lineno:
-        I64: 327
-      thread.name:
-        String: tokio-runtime-worker
-      busy_ns:
-        I64: 2690658
-      thread.id:
-        I64: 15
-      code.filepath:
-        String: apollo-router/src/query_planner/execution.rs
-      graphql.condition:
-        String: if
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - graphql.condition
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "48179106241482103848812575548686436429"
-    span_id: 14511206469911177014
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 8052379820523592996
-  span_kind: Internal
-  name: condition_if
-  start_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 695977151
-  end_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 830608824
-  attributes:
-    map:
-      code.lineno:
-        I64: 306
-      thread.name:
-        String: tokio-runtime-worker
-      busy_ns:
-        I64: 2606848
-      code.namespace:
-        String: "apollo_router::query_planner::execution"
-      thread.id:
-        I64: 15
-      idle_ns:
-        I64: 45301861
-      code.filepath:
-        String: apollo-router/src/query_planner/execution.rs
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "48179106241482103848812575548686436429"
-    span_id: 12847835672039219100
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 14511206469911177014
-  span_kind: Internal
-  name: defer
-  start_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 696022339
-  end_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 830518170
-  attributes:
-    map:
-      thread.name:
-        String: tokio-runtime-worker
-      idle_ns:
-        I64: 126457525
-      busy_ns:
-        I64: 8029995
-      code.filepath:
-        String: apollo-router/src/query_planner/execution.rs
-      code.lineno:
-        I64: 271
-      thread.id:
-        I64: 15
-      code.namespace:
-        String: "apollo_router::query_planner::execution"
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "48179106241482103848812575548686436429"
-    span_id: 4412163015592220412
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 12847835672039219100
-  span_kind: Internal
-  name: defer_primary
-  start_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 696362399
-  end_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 743760914
-  attributes:
-    map:
-      code.namespace:
-        String: "apollo_router::query_planner::execution"
-      code.lineno:
-        I64: 259
-      thread.id:
-        I64: 15
-      thread.name:
-        String: tokio-runtime-worker
-      code.filepath:
-        String: apollo-router/src/query_planner/execution.rs
-      idle_ns:
-        I64: 45358226
-      busy_ns:
-        I64: 2046016
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "48179106241482103848812575548686436429"
-    span_id: 1343706171599318485
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 12847835672039219100
-  span_kind: Internal
-  name: defer_deferred
-  start_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 743955493
-  end_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 830061683
-  attributes:
-    map:
-      graphql.depends:
-        String: "[{\"id\":\"0\",\"deferLabel\":null}]"
-      code.filepath:
-        String: apollo-router/src/query_planner/execution.rs
-      idle_ns:
-        I64: 79860304
-      thread.name:
-        String: tokio-runtime-worker
-      graphql.path:
-        String: /topProducts/@
-      code.lineno:
-        I64: 429
-      code.namespace:
-        String: "apollo_router::query_planner::execution"
-      thread.id:
-        I64: 14
-      busy_ns:
-        I64: 6254826
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - graphql.path
-      - graphql.depends
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "48179106241482103848812575548686436429"
-    span_id: 1615094331109834215
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 1343706171599318485
-  span_kind: Internal
-  name: sequence
-  start_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 744057462
-  end_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 829959505
-  attributes:
-    map:
-      code.filepath:
-        String: apollo-router/src/query_planner/execution.rs
-      code.lineno:
-        I64: 133
-      thread.id:
-        I64: 14
-      busy_ns:
-        I64: 5920423
-      idle_ns:
-        I64: 79979594
-      thread.name:
-        String: tokio-runtime-worker
-      code.namespace:
-        String: "apollo_router::query_planner::execution"
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "48179106241482103848812575548686436429"
-    span_id: 9487579781210749637
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 1615094331109834215
-  span_kind: Internal
-  name: flatten
-  start_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 744129818
-  end_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 785840064
-  attributes:
-    map:
-      idle_ns:
-        I64: 39187070
-      code.namespace:
-        String: "apollo_router::query_planner::execution"
-      thread.name:
-        String: tokio-runtime-worker
-      code.filepath:
-        String: apollo-router/src/query_planner/execution.rs
-      code.lineno:
-        I64: 176
-      thread.id:
-        I64: 14
-      busy_ns:
-        I64: 2518567
-      graphql.path:
-        String: /topProducts/@
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - graphql.path
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "48179106241482103848812575548686436429"
-    span_id: 4988545802786443624
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 1615094331109834215
-  span_kind: Internal
-  name: flatten
-  start_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 786138149
-  end_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 829728538
-  attributes:
-    map:
-      thread.name:
-        String: tokio-runtime-worker
-      idle_ns:
-        I64: 40783864
-      graphql.path:
-        String: /topProducts/@/reviews/@/author
-      busy_ns:
-        I64: 2806594
-      code.namespace:
-        String: "apollo_router::query_planner::execution"
-      code.lineno:
-        I64: 176
-      code.filepath:
-        String: apollo-router/src/query_planner/execution.rs
-      thread.id:
-        I64: 10
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - graphql.path
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "48179106241482103848812575548686436429"
-    span_id: 4477074139770004131
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 4988545802786443624
-  span_kind: Internal
-  name: fetch
-  start_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 786225452
-  end_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 829575654
-  attributes:
-    map:
-      apollo_private.sent_time_offset:
-        I64: 91499517
-      thread.id:
-        I64: 10
-      code.namespace:
-        String: "apollo_router::query_planner::execution"
-      code.filepath:
-        String: apollo-router/src/query_planner/execution.rs
-      thread.name:
-        String: tokio-runtime-worker
-      code.lineno:
-        I64: 188
-      apollo.subgraph.name:
-        String: accounts
-      busy_ns:
-        I64: 2573183
-      idle_ns:
-        I64: 40767661
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - apollo_private.sent_time_offset
-      - apollo.subgraph.name
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "48179106241482103848812575548686436429"
-    span_id: 4307400006762176495
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 4477074139770004131
-  span_kind: Internal
-  name: subgraph
-  start_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 786630674
-  end_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 829172108
-  attributes:
-    map:
-      code.filepath:
-        String: apollo-router/src/plugins/telemetry/mod.rs
-      code.lineno:
-        I64: 313
-      thread.id:
-        I64: 10
-      graphql.document:
-        String: "query($representations:[_Any!]!){_entities(representations:$representations){...on User{name}}}"
-      busy_ns:
-        I64: 1669429
-      thread.name:
-        String: tokio-runtime-worker
-      idle_ns:
-        I64: 40867534
-      code.namespace:
-        String: "apollo_router::plugins::telemetry"
-      apollo_private.ftv1:
-        String: GgwI+LWnnAYQwMHbggMiDAj4taecBhCAvZ6CA1j2sDRysQFirgEKCV9lbnRpdGllcxoKW19FbnRpdHldIUD0/xtIsqwlYiAQAGIcCgRuYW1lGgZTdHJpbmdA5JEpSOaUKmoEVXNlcmIgEAFiHAoEbmFtZRoGU3RyaW5nQITYK0iQlSxqBFVzZXJiIBACYhwKBG5hbWUaBlN0cmluZ0Ckgy1IiLYtagRVc2VyYiAQA2IcCgRuYW1lGgZTdHJpbmdAlrUuSIiDL2oEVXNlcmoFUXVlcnn5AQAAAAAAAPA/
-      graphql.operation.name:
-        String: ""
-      apollo.subgraph.name:
-        String: accounts
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - apollo_private.ftv1
-      - graphql.operation.name
-      - graphql.document
-      - apollo.subgraph.name
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "48179106241482103848812575548686436429"
-    span_id: 15682297860951097268
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 4307400006762176495
-  span_kind: Client
-  name: subgraph_request
-  start_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 786922194
-  end_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 827988149
-  attributes:
-    map:
-      code.namespace:
-        String: "apollo_router::services::subgraph_service"
-      net.peer.port:
-        String: "80"
-      apollo.subgraph.name:
-        String: accounts
-      code.filepath:
-        String: apollo-router/src/services/subgraph_service.rs
-      thread.name:
-        String: tokio-runtime-worker
-      http.route:
-        String: /graphql
-      idle_ns:
-        I64: 40798740
-      code.lineno:
-        I64: 173
-      net.peer.name:
-        String: accounts.demo.starstuff.dev
-      net.transport:
-        String: ip_tcp
-      thread.id:
-        I64: 10
-      busy_ns:
-        I64: 244936
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - apollo.subgraph.name
-      - net.transport
-      - http.route
-      - net.peer.port
-      - net.peer.name
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "48179106241482103848812575548686436429"
-    span_id: 374273098096638287
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 9487579781210749637
-  span_kind: Internal
-  name: fetch
-  start_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 744222848
-  end_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 785694374
-  attributes:
-    map:
-      thread.id:
-        I64: 14
-      apollo.subgraph.name:
-        String: reviews
-      apollo_private.sent_time_offset:
-        I64: 49483643
-      code.filepath:
-        String: apollo-router/src/query_planner/execution.rs
-      idle_ns:
-        I64: 39184766
-      code.namespace:
-        String: "apollo_router::query_planner::execution"
-      code.lineno:
-        I64: 188
-      thread.name:
-        String: tokio-runtime-worker
-      busy_ns:
-        I64: 2283967
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - apollo_private.sent_time_offset
-      - apollo.subgraph.name
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "48179106241482103848812575548686436429"
-    span_id: 12633132268468348696
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 374273098096638287
-  span_kind: Internal
-  name: subgraph
-  start_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 744492507
-  end_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 785324771
-  attributes:
-    map:
-      code.filepath:
-        String: apollo-router/src/plugins/telemetry/mod.rs
-      apollo_private.ftv1:
-        String: GgwI+LWnnAYQgImV7wIiDAj4taecBhDA+93tAljn6poBcqgDYqUDCglfZW50aXRpZXMaCltfRW50aXR5XSFAqZQjSIKrL2KoARAAYqMBCgdyZXZpZXdzGghbUmV2aWV3XUC3/jNIzL9UYj0QAGI5CgZhdXRob3IaBFVzZXJApP1XSLPbfmIZCgJpZBoDSUQhQOflggFImIKEAWoEVXNlcmoGUmV2aWV3Yj4QAWI6CgZhdXRob3IaBFVzZXJA+eFgSNTHhAFiGQoCaWQaA0lEIUDyuYYBSNKmhwFqBFVzZXJqBlJldmlld2oHUHJvZHVjdGJoEAFiZAoHcmV2aWV3cxoIW1Jldmlld11A/IRCSIT0Z2I+EABiOgoGYXV0aG9yGgRVc2VyQJmBakjV0ocBYhkKAmlkGgNJRCFAp/eIAUiLsYkBagRVc2VyagZSZXZpZXdqB1Byb2R1Y3RiaBACYmQKB3Jldmlld3MaCFtSZXZpZXddQN6gSkjqnnJiPhAAYjoKBmF1dGhvchoEVXNlckDFsnVIt9WJAWIZCgJpZBoDSUQhQKvligFIj5yLAWoEVXNlcmoGUmV2aWV3agdQcm9kdWN0agVRdWVyefkBAAAAAAAA8D8=
-      thread.id:
-        I64: 14
-      thread.name:
-        String: tokio-runtime-worker
-      apollo.subgraph.name:
-        String: reviews
-      code.lineno:
-        I64: 313
-      graphql.operation.name:
-        String: ""
-      busy_ns:
-        I64: 1537429
-      code.namespace:
-        String: "apollo_router::plugins::telemetry"
-      graphql.document:
-        String: "query($representations:[_Any!]!){_entities(representations:$representations){...on Product{reviews{author{__typename id}}}}}"
-      idle_ns:
-        I64: 39296791
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - apollo_private.ftv1
-      - graphql.operation.name
-      - graphql.document
-      - apollo.subgraph.name
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "48179106241482103848812575548686436429"
-    span_id: 11564887256002176974
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 12633132268468348696
-  span_kind: Client
-  name: subgraph_request
-  start_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 744791989
-  end_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 784339792
-  attributes:
-    map:
-      apollo.subgraph.name:
-        String: reviews
-      idle_ns:
-        I64: 39220524
-      code.lineno:
-        I64: 173
-      http.route:
-        String: /graphql
-      thread.name:
-        String: tokio-runtime-worker
-      net.peer.name:
-        String: reviews.demo.starstuff.dev
-      code.namespace:
-        String: "apollo_router::services::subgraph_service"
-      code.filepath:
-        String: apollo-router/src/services/subgraph_service.rs
-      net.peer.port:
-        String: "80"
-      thread.id:
-        I64: 14
-      net.transport:
-        String: ip_tcp
-      busy_ns:
-        I64: 303323
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - apollo.subgraph.name
-      - net.transport
-      - http.route
-      - net.peer.port
-      - net.peer.name
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "48179106241482103848812575548686436429"
-    span_id: 13334624373206909001
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 4412163015592220412
-  span_kind: Internal
-  name: fetch
-  start_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 696431123
-  end_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 743652030
-  attributes:
-    map:
-      code.namespace:
-        String: "apollo_router::query_planner::execution"
-      thread.name:
-        String: tokio-runtime-worker
-      code.lineno:
-        I64: 188
-      thread.id:
-        I64: 15
-      busy_ns:
-        I64: 1848154
-      apollo.subgraph.name:
-        String: products
-      idle_ns:
-        I64: 45372963
-      code.filepath:
-        String: apollo-router/src/query_planner/execution.rs
-      apollo_private.sent_time_offset:
-        I64: 1705118
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - apollo_private.sent_time_offset
-      - apollo.subgraph.name
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "48179106241482103848812575548686436429"
-    span_id: 357853883512773358
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 13334624373206909001
-  span_kind: Internal
-  name: subgraph
-  start_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 696595810
-  end_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 743458778
-  attributes:
-    map:
-      apollo_private.ftv1:
-        String: GgwI+LWnnAYQgMyR2wIiDAj4taecBhDAvtrZAli8irwBcokCYoYCCgt0b3BQcm9kdWN0cxoJW1Byb2R1Y3RdQJWWE0jj/KQBYkgQAGIhCgRuYW1lGgZTdHJpbmdAuqerAUiEsqwBagdQcm9kdWN0YiEKA3VwYxoHU3RyaW5nIUDtkq4BSIXgrgFqB1Byb2R1Y3RiSBABYiEKBG5hbWUaBlN0cmluZ0CKoLABSMjOsAFqB1Byb2R1Y3RiIQoDdXBjGgdTdHJpbmchQKSDsQFIjfyzAWoHUHJvZHVjdGJIEAJiIQoEbmFtZRoGU3RyaW5nQPGPtQFIsOO1AWoHUHJvZHVjdGIhCgN1cGMaB1N0cmluZyFA7pm2AUjwvLYBagdQcm9kdWN0agVRdWVyefkBAAAAAAAA8D8=
-      busy_ns:
-        I64: 1359192
-      code.filepath:
-        String: apollo-router/src/plugins/telemetry/mod.rs
-      idle_ns:
-        I64: 45508525
-      code.lineno:
-        I64: 313
-      apollo.subgraph.name:
-        String: products
-      code.namespace:
-        String: "apollo_router::plugins::telemetry"
-      thread.id:
-        I64: 15
-      thread.name:
-        String: tokio-runtime-worker
-      graphql.document:
-        String: "{topProducts{__typename name upc}}"
-      graphql.operation.name:
-        String: ""
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - apollo_private.ftv1
-      - graphql.operation.name
-      - graphql.document
-      - apollo.subgraph.name
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "48179106241482103848812575548686436429"
-    span_id: 18275235823533906477
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 357853883512773358
-  span_kind: Client
-  name: subgraph_request
-  start_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 696871895
-  end_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 742639533
-  attributes:
-    map:
-      net.peer.name:
-        String: products.demo.starstuff.dev
-      http.route:
-        String: /graphql
-      code.lineno:
-        I64: 173
-      busy_ns:
-        I64: 304929
-      thread.id:
-        I64: 15
-      thread.name:
-        String: tokio-runtime-worker
-      apollo.subgraph.name:
-        String: products
-      code.namespace:
-        String: "apollo_router::services::subgraph_service"
-      net.peer.port:
-        String: "80"
-      code.filepath:
-        String: apollo-router/src/services/subgraph_service.rs
-      idle_ns:
-        I64: 45448321
-      net.transport:
-        String: ip_tcp
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - apollo.subgraph.name
-      - net.transport
-      - http.route
-      - net.peer.port
-      - net.peer.name
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Unset
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
-- span_context:
-    trace_id: "48179106241482103848812575548686436429"
-    span_id: 6681943477281517192
-    trace_flags: 1
-    is_remote: false
-    trace_state: ~
-  parent_span_id: 0
-  span_kind: Server
-  name: request
-  start_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 694077802
-  end_time:
-    secs_since_epoch: 1669978872
-    nanos_since_epoch: 831560350
-  attributes:
-    map:
-      idle_ns:
-        I64: 131480409
-      apollo_private.duration_ns:
-        I64: 50655519
-      code.namespace:
-        String: "apollo_router::axum_factory::utils"
-      code.filepath:
-        String: apollo-router/src/axum_factory/utils.rs
-      thread.name:
-        String: tokio-runtime-worker
-      http.method:
-        String: POST
-      http.flavor:
-        String: HTTP/1.1
-      busy_ns:
-        I64: 5802181
-      trace_id:
-        String: 243ef555cc5e90c7f03a859b1c3f884d
-      thread.id:
-        I64: 15
-      http.route:
-        String: /
-      code.lineno:
-        I64: 259
-    evict_list:
-      - idle_ns
-      - busy_ns
-      - apollo_private.duration_ns
-      - trace_id
-      - http.flavor
-      - http.route
-      - http.method
-      - thread.name
-      - thread.id
-      - code.lineno
-      - code.namespace
-      - code.filepath
-    max_len: 128
-    dropped_count: 0
-  events:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  links:
-    queue: ~
-    max_len: 128
-    dropped_count: 0
-  status_code: Ok
-  status_message: ""
-  resource:
-    attrs:
-      foo:
-        String: bar
-      process.executable.name:
-        String: router
-      service.name:
-        String: router
-      service.version:
-        String: 1.4.0
diff --git a/apollo-router/src/plugins/telemetry/tracing/zipkin.rs b/apollo-router/src/plugins/telemetry/tracing/zipkin.rs
index 7a0471b636..d765088eaa 100644
--- a/apollo-router/src/plugins/telemetry/tracing/zipkin.rs
+++ b/apollo-router/src/plugins/telemetry/tracing/zipkin.rs
@@ -23,7 +23,8 @@ pub(crate) struct Config {
     #[serde(deserialize_with = "deser_endpoint")]
     pub(crate) endpoint: AgentEndpoint,
 
-    pub(crate) batch_processor: Option<BatchProcessorConfig>,
+    #[serde(default)]
+    pub(crate) batch_processor: BatchProcessorConfig,
 }
 
 const fn default_agent_endpoint() -> &'static str {
@@ -52,10 +53,7 @@ where
 
 impl TracingConfigurator for Config {
     fn apply(&self, builder: Builder, trace_config: &Trace) -> Result<Builder, BoxError> {
-        tracing::info!(
-            "configuring Zipkin tracing: {}",
-            self.batch_processor.as_ref().cloned().unwrap_or_default()
-        );
+        tracing::info!("configuring Zipkin tracing: {}", self.batch_processor);
         let collector_endpoint = match &self.endpoint {
             AgentEndpoint::Default(_) => None,
             AgentEndpoint::Url(url) => Some(url),
@@ -71,13 +69,7 @@ impl TracingConfigurator for Config {
 
         Ok(builder.with_span_processor(
             BatchSpanProcessor::builder(exporter, opentelemetry::runtime::Tokio)
-                .with_batch_config(
-                    self.batch_processor
-                        .as_ref()
-                        .cloned()
-                        .unwrap_or_default()
-                        .into(),
-                )
+                .with_batch_config(self.batch_processor.clone().into())
                 .build()
                 .filtered(),
         ))
diff --git a/apollo-router/src/plugins/traffic_shaping/mod.rs b/apollo-router/src/plugins/traffic_shaping/mod.rs
index 8c58863f92..91a01c4614 100644
--- a/apollo-router/src/plugins/traffic_shaping/mod.rs
+++ b/apollo-router/src/plugins/traffic_shaping/mod.rs
@@ -373,41 +373,45 @@ register_plugin!("apollo", "traffic_shaping", TrafficShaping);
 mod test {
     use std::sync::Arc;
 
+    use bytes::Bytes;
     use once_cell::sync::Lazy;
     use serde_json_bytes::json;
     use serde_json_bytes::ByteString;
     use serde_json_bytes::Value;
-    use tower::util::BoxCloneService;
     use tower::Service;
 
     use super::*;
-    use crate::graphql::Response;
     use crate::json_ext::Object;
     use crate::plugin::test::MockSubgraph;
     use crate::plugin::test::MockSupergraphService;
     use crate::plugin::DynPlugin;
+    use crate::router_factory::create_plugins;
+    use crate::services::router;
+    use crate::services::router_service::RouterCreator;
     use crate::Configuration;
     use crate::PluggableSupergraphServiceBuilder;
     use crate::Schema;
     use crate::SupergraphRequest;
     use crate::SupergraphResponse;
 
-    static EXPECTED_RESPONSE: Lazy<Response> = Lazy::new(|| {
-        serde_json::from_str(r#"{"data":{"topProducts":[{"upc":"1","name":"Table","reviews":[{"id":"1","product":{"name":"Table"},"author":{"id":"1","name":"Ada Lovelace"}},{"id":"4","product":{"name":"Table"},"author":{"id":"2","name":"Alan Turing"}}]},{"upc":"2","name":"Couch","reviews":[{"id":"2","product":{"name":"Couch"},"author":{"id":"1","name":"Ada Lovelace"}}]}]}}"#).unwrap()
+    static EXPECTED_RESPONSE: Lazy<Bytes> = Lazy::new(|| {
+        Bytes::from_static(r#"{"data":{"topProducts":[{"upc":"1","name":"Table","reviews":[{"id":"1","product":{"name":"Table"},"author":{"id":"1","name":"Ada Lovelace"}},{"id":"4","product":{"name":"Table"},"author":{"id":"2","name":"Alan Turing"}}]},{"upc":"2","name":"Couch","reviews":[{"id":"2","product":{"name":"Couch"},"author":{"id":"1","name":"Ada Lovelace"}}]}]}}"#.as_bytes())
     });
 
     static VALID_QUERY: &str = r#"query TopProducts($first: Int) { topProducts(first: $first) { upc name reviews { id product { name } author { id name } } } }"#;
 
     async fn execute_router_test(
         query: &str,
-        body: &Response,
-        mut router_service: BoxCloneService<SupergraphRequest, SupergraphResponse, BoxError>,
+        body: &Bytes,
+        mut router_service: router::BoxService,
     ) {
         let request = SupergraphRequest::fake_builder()
             .query(query.to_string())
             .variable("first", 2usize)
             .build()
-            .expect("expecting valid request");
+            .expect("expecting valid request")
+            .try_into()
+            .unwrap();
 
         let response = router_service
             .ready()
@@ -418,13 +422,15 @@ mod test {
             .unwrap()
             .next_response()
             .await
+            .unwrap()
             .unwrap();
-        assert_eq!(response, *body);
+
+        assert_eq!(response, body);
     }
 
     async fn build_mock_router_with_variable_dedup_optimization(
         plugin: Box<dyn DynPlugin>,
-    ) -> BoxCloneService<SupergraphRequest, SupergraphResponse, BoxError> {
+    ) -> router::BoxService {
         let mut extensions = Object::new();
         extensions.insert("test", Value::String(ByteString::from("value")));
 
@@ -470,16 +476,34 @@ mod test {
         )
         .unwrap();
 
-        let builder = PluggableSupergraphServiceBuilder::new(schema.clone())
-            .with_configuration(Arc::new(config));
+        let config = Arc::new(config);
+
+        let mut builder = PluggableSupergraphServiceBuilder::new(schema.clone())
+            .with_configuration(config.clone());
+
+        for (name, plugin) in create_plugins(
+            &config,
+            &schema,
+            Some(vec![(APOLLO_TRAFFIC_SHAPING.to_string(), plugin)]),
+        )
+        .await
+        .expect("create plugins should work")
+        .into_iter()
+        {
+            builder = builder.with_dyn_plugin(name, plugin);
+        }
 
         let builder = builder
-            .with_dyn_plugin(APOLLO_TRAFFIC_SHAPING.to_string(), plugin)
             .with_subgraph_service("accounts", account_service.clone())
             .with_subgraph_service("reviews", review_service.clone())
             .with_subgraph_service("products", product_service.clone());
 
-        builder.build().await.expect("should build").test_service()
+        RouterCreator::new(
+            Arc::new(builder.build().await.expect("should build")),
+            &Configuration::default(),
+        )
+        .make()
+        .boxed()
     }
 
     async fn get_traffic_shaping_plugin(config: &serde_json::Value) -> Box<dyn DynPlugin> {
diff --git a/apollo-router/src/query_planner/caching_query_planner.rs b/apollo-router/src/query_planner/caching_query_planner.rs
index a2e263a8ed..31a41f7e4b 100644
--- a/apollo-router/src/query_planner/caching_query_planner.rs
+++ b/apollo-router/src/query_planner/caching_query_planner.rs
@@ -10,6 +10,7 @@ use router_bridge::planner::UsageReporting;
 use serde::Serialize;
 use serde_json_bytes::value::Serializer;
 use tower::ServiceExt;
+use tracing::Instrument;
 
 use super::USAGE_REPORTING;
 use crate::cache::DeduplicatingCache;
@@ -32,7 +33,11 @@ pub(crate) struct CachingQueryPlanner<T: Clone> {
 
 impl<T: Clone + 'static> CachingQueryPlanner<T>
 where
-    T: tower::Service<QueryPlannerRequest, Response = QueryPlannerResponse>,
+    T: tower::Service<
+        QueryPlannerRequest,
+        Response = QueryPlannerResponse,
+        Error = QueryPlannerError,
+    >,
 {
     /// Creates a new query planner that caches the results of another [`QueryPlanner`].
     pub(crate) async fn new(
@@ -50,6 +55,58 @@ where
             schema_id,
         }
     }
+
+    pub(crate) async fn cache_keys(&self, count: usize) -> Vec<(String, Option<String>)> {
+        let keys = self.cache.in_memory_keys().await;
+        keys.into_iter()
+            .take(count)
+            .map(|key| (key.query, key.operation))
+            .collect()
+    }
+
+    pub(crate) async fn warm_up(&mut self, cache_keys: Vec<(String, Option<String>)>) {
+        let schema_id = self.schema_id.clone();
+
+        let mut count = 0usize;
+        for (query, operation) in cache_keys {
+            let caching_key = CachingQueryKey {
+                schema_id: schema_id.clone(),
+                query: query.clone(),
+                operation: operation.to_owned(),
+            };
+            let context = Context::new();
+
+            let entry = self.cache.get(&caching_key).await;
+            if entry.is_first() {
+                let request = QueryPlannerRequest {
+                    query,
+                    operation_name: operation,
+                    context: context.clone(),
+                };
+
+                let res = match self.delegate.ready().await {
+                    Ok(service) => service.call(request).await,
+                    Err(_) => break,
+                };
+
+                match res {
+                    Ok(QueryPlannerResponse { content, .. }) => {
+                        if let Some(content) = &content {
+                            count += 1;
+                            entry.insert(Ok(content.clone())).await;
+                        }
+                    }
+                    Err(error) => {
+                        count += 1;
+                        let e = Arc::new(error);
+                        entry.insert(Err(e.clone())).await;
+                    }
+                }
+            }
+        }
+
+        tracing::debug!("warmed up the query planner cache with {count} queries");
+    }
 }
 
 impl<T: Clone + Send + 'static> tower::Service<QueryPlannerRequest> for CachingQueryPlanner<T>
@@ -82,42 +139,58 @@ where
             let context = request.context.clone();
             let entry = qp.cache.get(&caching_key).await;
             if entry.is_first() {
-                let res = qp.delegate.ready().await?.call(request).await;
-                match res {
-                    Ok(QueryPlannerResponse {
-                        content,
-                        context,
-                        errors,
-                    }) => {
-                        if let Some(content) = &content {
-                            entry.insert(Ok(content.clone())).await;
-                        }
-
-                        if let Some(QueryPlannerContent::Plan { plan, .. }) = &content {
-                            match (plan.usage_reporting).serialize(Serializer) {
-                                Ok(v) => {
-                                    context.insert_json_value(USAGE_REPORTING, v);
+                // some clients might timeout and cancel the request before query planning is finished,
+                // so we execute it in a task that can continue even after the request was canceled and
+                // the join handle was dropped. That way, the next similar query will use the cache instead
+                // of restarting the query planner until another timeout
+                tokio::task::spawn(
+                    async move {
+                        let res = qp.delegate.ready().await?.call(request).await;
+
+                        match res {
+                            Ok(QueryPlannerResponse {
+                                content,
+                                context,
+                                errors,
+                            }) => {
+                                if let Some(content) = &content {
+                                    entry.insert(Ok(content.clone())).await;
                                 }
-                                Err(e) => {
-                                    tracing::error!(
-                                        "usage reporting was not serializable to context, {}",
-                                        e
-                                    );
+
+                                if let Some(QueryPlannerContent::Plan { plan, .. }) = &content {
+                                    match (plan.usage_reporting).serialize(Serializer) {
+                                        Ok(v) => {
+                                            context.insert_json_value(USAGE_REPORTING, v);
+                                        }
+                                        Err(e) => {
+                                            tracing::error!(
+                                            "usage reporting was not serializable to context, {}",
+                                            e
+                                        );
+                                        }
+                                    }
                                 }
+                                Ok(QueryPlannerResponse {
+                                    content,
+                                    context,
+                                    errors,
+                                })
+                            }
+                            Err(error) => {
+                                let e = Arc::new(error);
+                                entry.insert(Err(e.clone())).await;
+                                Err(CacheResolverError::RetrievalError(e))
                             }
                         }
-                        Ok(QueryPlannerResponse {
-                            content,
-                            context,
-                            errors,
-                        })
                     }
-                    Err(error) => {
-                        let e = Arc::new(error);
-                        entry.insert(Err(e.clone())).await;
-                        Err(CacheResolverError::RetrievalError(e))
-                    }
-                }
+                    .in_current_span(),
+                )
+                .await
+                .map_err(|e| {
+                    CacheResolverError::RetrievalError(Arc::new(QueryPlannerError::JoinError(
+                        e.to_string(),
+                    )))
+                })?
             } else {
                 let res = entry
                     .get()
diff --git a/apollo-router/src/query_planner/fetch.rs b/apollo-router/src/query_planner/fetch.rs
index 4a95f2463b..e8248d69ab 100644
--- a/apollo-router/src/query_planner/fetch.rs
+++ b/apollo-router/src/query_planner/fetch.rs
@@ -253,7 +253,7 @@ impl FetchNode {
 
         let service = parameters
             .service_factory
-            .new_service(service_name)
+            .create(service_name)
             .expect("we already checked that the service exists during planning; qed");
 
         // TODO not sure if we need a RouterReponse here as we don't do anything with it
@@ -367,6 +367,7 @@ impl FetchNode {
                         "Subgraph response from '{}' was missing key `_entities`",
                         self.service_name
                     ))
+                    .extension_code("PARSE_ERROR")
                     .build(),
             );
 
diff --git a/apollo-router/src/request.rs b/apollo-router/src/request.rs
index cae8c44558..84a48240f7 100644
--- a/apollo-router/src/request.rs
+++ b/apollo-router/src/request.rs
@@ -134,20 +134,9 @@ impl Request {
     /// An error will be produced in the event that the query string parameters
     /// cannot be turned into a valid GraphQL `Request`.
     pub fn from_urlencoded_query(url_encoded_query: String) -> Result<Request, serde_json::Error> {
-        // As explained in the form content types specification https://www.w3.org/TR/html4/interact/forms.html#h-17.13.4.1
-        // `Forms submitted with this content type must be encoded as follows:`
-        //
-        // Space characters are replaced by `+', and then reserved characters are escaped as described in [RFC1738], section 2.2
-        // The real percent encoding uses `%20` while form data in URLs uses `+`.
-        // This can be seen empirically by running a CURL request with a --data-urlencoded that contains spaces.
-        // however, quoting the urlencoding docs https://docs.rs/urlencoding/latest/urlencoding/fn.decode_binary.html
-        // `Unencoded `+` is preserved literally, and _not_ changed to a space.`
-        //
-        // We will thus replace '+' by "%20" below so we comply with the percent encoding specification, before decoding the parameters.
-        let query = url_encoded_query.replace('+', "%20");
-        let decoded_string = urlencoding::decode_binary(query.as_bytes());
         let urldecoded: serde_json::Value =
-            serde_urlencoded::from_bytes(&decoded_string).map_err(serde_json::Error::custom)?;
+            serde_urlencoded::from_bytes(url_encoded_query.as_bytes())
+                .map_err(serde_json::Error::custom)?;
 
         let operation_name = if let Some(serde_json::Value::String(operation_name)) =
             urldecoded.get("operationName")
@@ -294,4 +283,29 @@ mod tests {
 
         assert_eq!(expected_result, req);
     }
+
+    #[test]
+    fn from_urlencoded_query_with_variables_works() {
+        let query_string = "query=%7B+topProducts+%7B+upc+name+reviews+%7B+id+product+%7B+name+%7D+author+%7B+id+name+%7D+%7D+%7D+%7D&variables=%7B%22date%22%3A%222022-01-01T00%3A00%3A00%2B00%3A00%22%7D&extensions=%7B+%22persistedQuery%22+%3A+%7B+%22version%22+%3A+1%2C+%22sha256Hash%22+%3A+%2220a101de18d4a9331bfc4ccdfef33cc735876a689490433570f17bdd4c0bad3f%22+%7D+%7D".to_string();
+
+        let expected_result = serde_json::from_str::<Request>(
+            json!(
+            {
+              "query": "{ topProducts { upc name reviews { id product { name } author { id name } } } }",
+              "variables": {"date": "2022-01-01T00:00:00+00:00"},
+              "extensions": {
+                  "persistedQuery": {
+                      "version": 1,
+                      "sha256Hash": "20a101de18d4a9331bfc4ccdfef33cc735876a689490433570f17bdd4c0bad3f"
+                  }
+                }
+            })
+            .to_string()
+            .as_str(),
+        ).unwrap();
+
+        let req = Request::from_urlencoded_query(query_string).unwrap();
+
+        assert_eq!(expected_result, req);
+    }
 }
diff --git a/apollo-router/src/router.rs b/apollo-router/src/router.rs
index 7a4a70438e..d519a3e3a5 100644
--- a/apollo-router/src/router.rs
+++ b/apollo-router/src/router.rs
@@ -36,49 +36,42 @@ use self::Event::UpdateSchema;
 use crate::axum_factory::make_axum_router;
 use crate::axum_factory::AxumHttpServerFactory;
 use crate::axum_factory::ListenAddrAndRouter;
-use crate::cache::DeduplicatingCache;
 use crate::configuration::Configuration;
 use crate::configuration::ListenAddr;
 use crate::plugin::DynPlugin;
-use crate::router_factory::SupergraphServiceConfigurator;
-use crate::router_factory::SupergraphServiceFactory;
-use crate::router_factory::YamlSupergraphServiceFactory;
-use crate::services::layers::apq::APQLayer;
-use crate::services::transport;
+use crate::router_factory::RouterFactory;
+use crate::router_factory::RouterSuperServiceFactory;
+use crate::router_factory::YamlRouterFactory;
+use crate::services::router;
 use crate::spec::Schema;
 use crate::state_machine::StateMachine;
 
 type SchemaStream = Pin<Box<dyn Stream<Item = String> + Send>>;
 
 // For now this is unused:
+// TODO: Check with simon once the refactor is complete
 #[allow(unused)]
 // Later we might add a public API for this (probably a builder similar to `test_harness.rs`),
 // see https://github.com/apollographql/router/issues/1496.
 // In the meantime keeping this function helps make sure it still compiles.
-async fn make_transport_service<RF>(
+async fn make_router_service<RF>(
     schema: &str,
     configuration: Arc<Configuration>,
     extra_plugins: Vec<(String, Box<dyn DynPlugin>)>,
-) -> Result<transport::BoxCloneService, BoxError> {
+) -> Result<router::BoxCloneService, BoxError> {
     let schema = Arc::new(Schema::parse(schema, &configuration)?);
-    let service_factory = YamlSupergraphServiceFactory
+    let service_factory = YamlRouterFactory
         .create(configuration.clone(), schema, None, Some(extra_plugins))
         .await?;
-
-    let apq = APQLayer::with_cache(
-        DeduplicatingCache::from_configuration(
-            &configuration.supergraph.apq.experimental_cache,
-            "APQ",
-        )
-        .await,
-    );
     let web_endpoints = service_factory.web_endpoints();
-    let routers = make_axum_router(service_factory, &configuration, web_endpoints, apq)?;
-    // FIXME: how should
+    let routers = make_axum_router(service_factory, &configuration, web_endpoints)?;
     let ListenAddrAndRouter(_listener, router) = routers.main;
+
     Ok(router
-        .map_response(|response| {
-            response.map(|body| {
+        .map_request(|req: router::Request| req.router_request)
+        .map_err(|error| match error {})
+        .map_response(|res| {
+            res.map(|body| {
                 // Axum makes this `body` have type:
                 // https://docs.rs/http-body/0.4.5/http_body/combinators/struct.UnsyncBoxBody.html
                 let mut body = Box::pin(body);
@@ -93,8 +86,8 @@ async fn make_transport_service<RF>(
                 // If we want to use trailers, we may need remove this convertion to `hyper::Body`
                 // and return `UnsyncBoxBody` (a.k.a. `axum::BoxBody`) as-is.
             })
+            .into()
         })
-        .map_err(|error| match error {})
         .boxed_clone())
 }
 
@@ -168,6 +161,9 @@ pub enum SchemaSource {
 
         /// The duration between polling
         poll_interval: Duration,
+
+        /// The HTTP client timeout for each poll
+        timeout: Duration,
     },
 }
 
@@ -227,20 +223,27 @@ impl SchemaSource {
                 apollo_graph_ref,
                 urls,
                 poll_interval,
+                timeout,
             } => {
                 // With regards to ELv2 licensing, the code inside this block
                 // is license key functionality
-                crate::uplink::stream_supergraph(apollo_key, apollo_graph_ref, urls, poll_interval)
-                    .filter_map(|res| {
-                        future::ready(match res {
-                            Ok(schema_result) => Some(UpdateSchema(schema_result.schema)),
-                            Err(e) => {
-                                tracing::error!("{}", e);
-                                None
-                            }
-                        })
+                crate::uplink::stream_supergraph(
+                    apollo_key,
+                    apollo_graph_ref,
+                    urls,
+                    poll_interval,
+                    timeout,
+                )
+                .filter_map(|res| {
+                    future::ready(match res {
+                        Ok(schema_result) => Some(UpdateSchema(schema_result.schema)),
+                        Err(e) => {
+                            tracing::error!("{}", e);
+                            None
+                        }
                     })
-                    .boxed()
+                })
+                .boxed()
             }
         }
         .chain(stream::iter(vec![NoMoreSchema]))
@@ -543,7 +546,7 @@ impl RouterHttpServer {
             shutdown_receiver,
         );
         let server_factory = AxumHttpServerFactory::new();
-        let router_factory = YamlSupergraphServiceFactory::default();
+        let router_factory = YamlRouterFactory::default();
         let state_machine = StateMachine::new(server_factory, router_factory);
         let extra_listen_adresses = state_machine.extra_listen_adresses.clone();
         let graphql_listen_address = state_machine.graphql_listen_address.clone();
@@ -734,8 +737,10 @@ mod tests {
             UpdateConfiguration(_)
         ));
 
+        // Need different contents, since we won't get an event if content is the same
+        let contents_datadog = include_str!("testdata/datadog.router.yaml");
         // Modify the file and try again
-        write_and_flush(&mut file, contents).await;
+        write_and_flush(&mut file, contents_datadog).await;
         assert!(matches!(
             stream.next().await.unwrap(),
             UpdateConfiguration(_)
@@ -843,15 +848,17 @@ mod tests {
         // First update is guaranteed
         assert!(matches!(stream.next().await.unwrap(), UpdateSchema(_)));
 
+        // Need different contents, since we won't get an event if content is the same
+        let schema_minimal = include_str!("testdata/minimal_supergraph.graphql");
         // Modify the file and try again
-        write_and_flush(&mut file, schema).await;
+        write_and_flush(&mut file, schema_minimal).await;
         assert!(matches!(stream.next().await.unwrap(), UpdateSchema(_)));
     }
 
     #[test(tokio::test)]
     async fn schema_by_file_missing() {
         let mut stream = SchemaSource::File {
-            path: temp_dir().join("does_not_exit"),
+            path: temp_dir().join("does_not_exist"),
             watch: true,
             delay: None,
         }
diff --git a/apollo-router/src/router_factory.rs b/apollo-router/src/router_factory.rs
index bfbf736085..f7a0affaf7 100644
--- a/apollo-router/src/router_factory.rs
+++ b/apollo-router/src/router_factory.rs
@@ -10,6 +10,7 @@ use serde_json::Value;
 use tower::service_fn;
 use tower::util::Either;
 use tower::BoxError;
+use tower::ServiceBuilder;
 use tower::ServiceExt;
 use tower_service::Service;
 
@@ -20,12 +21,12 @@ use crate::plugin::Handler;
 use crate::plugin::PluginFactory;
 use crate::plugins::traffic_shaping::TrafficShaping;
 use crate::plugins::traffic_shaping::APOLLO_TRAFFIC_SHAPING;
-use crate::services::new_service::NewService;
-use crate::services::RouterCreator;
+use crate::services::new_service::ServiceFactory;
+use crate::services::router;
+use crate::services::router_service::RouterCreator;
+use crate::services::transport;
 use crate::services::SubgraphService;
-use crate::services::SupergraphRequest;
-use crate::services::SupergraphResponse;
-use crate::transport;
+use crate::services::SupergraphCreator;
 use crate::ListenAddr;
 use crate::PluggableSupergraphServiceBuilder;
 use crate::Schema;
@@ -49,7 +50,22 @@ impl std::fmt::Debug for Endpoint {
 
 impl Endpoint {
     /// Creates an Endpoint given a path and a Boxed Service
+    #[deprecated = "use `from_router_service` instead"]
+    #[allow(deprecated)]
     pub fn new(path: String, handler: transport::BoxService) -> Self {
+        let router_service = ServiceBuilder::new()
+            .map_request(|request: router::Request| request.router_request)
+            .map_response(|response: transport::Response| response.into())
+            .service(handler)
+            .boxed();
+        Self {
+            path,
+            handler: Handler::new(router_service),
+        }
+    }
+
+    /// Creates an Endpoint given a path and a Boxed Service
+    pub fn from_router_service(path: String, handler: router::BoxService) -> Self {
         Self {
             path,
             handler: Handler::new(handler),
@@ -60,8 +76,9 @@ impl Endpoint {
             let endpoint = self.handler.clone();
             async move {
                 Ok(endpoint
-                    .oneshot(req)
+                    .oneshot(req.into())
                     .await
+                    .map(|res| res.response)
                     .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))
                     .into_response())
             }
@@ -69,16 +86,16 @@ impl Endpoint {
         axum::Router::new().route(self.path.as_str(), service_fn(handler))
     }
 }
-/// Factory for creating a SupergraphService
+/// Factory for creating a RouterService
 ///
 /// Instances of this traits are used by the HTTP server to generate a new
-/// SupergraphService on each request
-pub(crate) trait SupergraphServiceFactory:
-    NewService<SupergraphRequest, Service = Self::SupergraphService> + Clone + Send + Sync + 'static
+/// RouterService on each request
+pub(crate) trait RouterFactory:
+    ServiceFactory<router::Request, Service = Self::RouterService> + Clone + Send + Sync + 'static
 {
-    type SupergraphService: Service<
-            SupergraphRequest,
-            Response = SupergraphResponse,
+    type RouterService: Service<
+            router::Request,
+            Response = router::Response,
             Error = BoxError,
             Future = Self::Future,
         > + Send;
@@ -87,43 +104,43 @@ pub(crate) trait SupergraphServiceFactory:
     fn web_endpoints(&self) -> MultiMap<ListenAddr, Endpoint>;
 }
 
-/// Factory for creating a SupergraphServiceFactory
+/// Factory for creating a RouterFactory
 ///
 /// Instances of this traits are used by the StateMachine to generate a new
-/// SupergraphServiceFactory from configuration when it changes
+/// RouterFactory from configuration when it changes
 #[async_trait::async_trait]
-pub(crate) trait SupergraphServiceConfigurator: Send + Sync + 'static {
-    type SupergraphServiceFactory: SupergraphServiceFactory;
+pub(crate) trait RouterSuperServiceFactory: Send + Sync + 'static {
+    type RouterFactory: RouterFactory;
 
     async fn create<'a>(
         &'a mut self,
         configuration: Arc<Configuration>,
         schema: Arc<crate::Schema>,
-        previous_router: Option<&'a Self::SupergraphServiceFactory>,
+        previous_router: Option<&'a Self::RouterFactory>,
         extra_plugins: Option<Vec<(String, Box<dyn DynPlugin>)>>,
-    ) -> Result<Self::SupergraphServiceFactory, BoxError>;
+    ) -> Result<Self::RouterFactory, BoxError>;
 }
 
 /// Main implementation of the SupergraphService factory, supporting the extensions system
 #[derive(Default)]
-pub(crate) struct YamlSupergraphServiceFactory;
+pub(crate) struct YamlRouterFactory;
 
 #[async_trait::async_trait]
-impl SupergraphServiceConfigurator for YamlSupergraphServiceFactory {
-    type SupergraphServiceFactory = RouterCreator;
+impl RouterSuperServiceFactory for YamlRouterFactory {
+    type RouterFactory = RouterCreator<SupergraphCreator>;
 
     async fn create<'a>(
         &'a mut self,
         configuration: Arc<Configuration>,
         schema: Arc<Schema>,
-        _previous_router: Option<&'a Self::SupergraphServiceFactory>,
+        previous_router: Option<&'a Self::RouterFactory>,
         extra_plugins: Option<Vec<(String, Box<dyn DynPlugin>)>>,
-    ) -> Result<Self::SupergraphServiceFactory, BoxError> {
+    ) -> Result<Self::RouterFactory, BoxError> {
         // Process the plugins.
         let plugins = create_plugins(&configuration, &schema, extra_plugins).await?;
 
         let mut builder = PluggableSupergraphServiceBuilder::new(schema.clone());
-        builder = builder.with_configuration(configuration);
+        builder = builder.with_configuration(configuration.clone());
 
         for (name, _) in schema.subgraphs() {
             let subgraph_service = match plugins
@@ -144,9 +161,65 @@ impl SupergraphServiceConfigurator for YamlSupergraphServiceFactory {
         }
 
         // We're good to go with the new service.
-        let pluggable_router_service = builder.build().await?;
+        let mut supergraph_creator = builder.build().await?;
+
+        if let Some(router) = previous_router {
+            if configuration.supergraph.query_planning.warmed_up_queries > 0 {
+                let cache_keys = router
+                    .cache_keys(configuration.supergraph.query_planning.warmed_up_queries)
+                    .await;
+
+                if !cache_keys.is_empty() {
+                    tracing::info!(
+                        "warming up the query plan cache with {} queries, this might take a while",
+                        cache_keys.len()
+                    );
+
+                    supergraph_creator.warm_up_query_planner(cache_keys).await;
+                }
+            }
+        }
+
+        Ok(Self::RouterFactory::new(
+            Arc::new(supergraph_creator),
+            &configuration,
+        ))
+    }
+}
+
+impl YamlRouterFactory {
+    pub(crate) async fn create_supergraph<'a>(
+        &'a mut self,
+        configuration: Arc<Configuration>,
+        schema: Arc<Schema>,
+        _previous_router: Option<&'a SupergraphCreator>,
+        extra_plugins: Option<Vec<(String, Box<dyn DynPlugin>)>>,
+    ) -> Result<SupergraphCreator, BoxError> {
+        // Process the plugins.
+        let plugins = create_plugins(&configuration, &schema, extra_plugins).await?;
+
+        let mut builder = PluggableSupergraphServiceBuilder::new(schema.clone());
+        builder = builder.with_configuration(configuration);
+
+        for (name, _) in schema.subgraphs() {
+            let subgraph_service = match plugins
+                .iter()
+                .find(|i| i.0.as_str() == APOLLO_TRAFFIC_SHAPING)
+                .and_then(|plugin| (*plugin.1).as_any().downcast_ref::<TrafficShaping>())
+            {
+                Some(shaping) => {
+                    Either::A(shaping.subgraph_service_internal(name, SubgraphService::new(name)))
+                }
+                None => Either::B(SubgraphService::new(name)),
+            };
+            builder = builder.with_subgraph_service(name, subgraph_service);
+        }
+
+        for (plugin_name, plugin) in plugins {
+            builder = builder.with_dyn_plugin(plugin_name, plugin);
+        }
 
-        Ok(pluggable_router_service)
+        builder.build().await.map_err(BoxError::from)
     }
 }
 
@@ -158,7 +231,7 @@ pub async fn create_test_service_factory_from_yaml(schema: &str, configuration:
 
     let schema: Schema = Schema::parse(schema, &Default::default()).unwrap();
 
-    let service = YamlSupergraphServiceFactory::default()
+    let service = YamlRouterFactory::default()
         .create(Arc::new(config), Arc::new(schema), None, None)
         .await;
     assert_eq!(
@@ -173,7 +246,7 @@ caused by
     );
 }
 
-async fn create_plugins(
+pub(crate) async fn create_plugins(
     configuration: &Configuration,
     schema: &Schema,
     extra_plugins: Option<Vec<(String, Box<dyn DynPlugin>)>>,
@@ -262,8 +335,10 @@ async fn create_plugins(
                             .await
                         {
                             Ok(plugin) => {
-                                plugin_instances
-                                    .insert(desired_position, (name.to_string(), plugin));
+                                plugin_instances.insert(
+                                    desired_position.min(plugin_instances.len()),
+                                    (name.to_string(), plugin),
+                                );
                             }
                             Err(err) => errors.push(ConfigurationError::PluginConfiguration {
                                 plugin: name.to_string(),
@@ -338,8 +413,8 @@ mod test {
     use crate::plugin::PluginInit;
     use crate::register_plugin;
     use crate::router_factory::inject_schema_id;
-    use crate::router_factory::SupergraphServiceConfigurator;
-    use crate::router_factory::YamlSupergraphServiceFactory;
+    use crate::router_factory::RouterSuperServiceFactory;
+    use crate::router_factory::YamlRouterFactory;
     use crate::Schema;
 
     #[derive(Debug)]
@@ -455,7 +530,7 @@ mod test {
         let schema = include_str!("testdata/supergraph.graphql");
         let schema = Schema::parse(schema, &config).unwrap();
 
-        let service = YamlSupergraphServiceFactory::default()
+        let service = YamlRouterFactory::default()
             .create(Arc::new(config), Arc::new(schema), None, None)
             .await;
         service.map(|_| ())
diff --git a/apollo-router/src/services/execution_service.rs b/apollo-router/src/services/execution_service.rs
index 05088b5487..a3f45b2237 100644
--- a/apollo-router/src/services/execution_service.rs
+++ b/apollo-router/src/services/execution_service.rs
@@ -19,7 +19,7 @@ use tower_service::Service;
 use tracing::Instrument;
 
 use super::layers::allow_only_http_post_mutations::AllowOnlyHttpPostMutationsLayer;
-use super::new_service::NewService;
+use super::new_service::ServiceFactory;
 use super::subgraph_service::SubgraphServiceFactory;
 use super::Plugins;
 use crate::graphql::IncrementalResponse;
@@ -326,7 +326,7 @@ async fn consume_responses(
 }
 
 pub(crate) trait ExecutionServiceFactory:
-    NewService<ExecutionRequest, Service = Self::ExecutionService> + Clone + Send + 'static
+    ServiceFactory<ExecutionRequest, Service = Self::ExecutionService> + Clone + Send + 'static
 {
     type ExecutionService: Service<
             ExecutionRequest,
@@ -344,13 +344,13 @@ pub(crate) struct ExecutionCreator<SF: SubgraphServiceFactory> {
     pub(crate) subgraph_creator: Arc<SF>,
 }
 
-impl<SF> NewService<ExecutionRequest> for ExecutionCreator<SF>
+impl<SF> ServiceFactory<ExecutionRequest> for ExecutionCreator<SF>
 where
     SF: SubgraphServiceFactory,
 {
     type Service = execution::BoxService;
 
-    fn new_service(&self) -> Self::Service {
+    fn create(&self) -> Self::Service {
         ServiceBuilder::new()
             .layer(AllowOnlyHttpPostMutationsLayer::default())
             .service(
@@ -369,7 +369,8 @@ where
 
 impl<SF: SubgraphServiceFactory> ExecutionServiceFactory for ExecutionCreator<SF> {
     type ExecutionService = execution::BoxService;
-    type Future = <<ExecutionCreator<SF> as NewService<ExecutionRequest>>::Service as Service<
-        ExecutionRequest,
-    >>::Future;
+    type Future =
+        <<ExecutionCreator<SF> as ServiceFactory<ExecutionRequest>>::Service as Service<
+            ExecutionRequest,
+        >>::Future;
 }
diff --git a/apollo-router/src/services/external.rs b/apollo-router/src/services/external.rs
new file mode 100644
index 0000000000..d5a36f2d87
--- /dev/null
+++ b/apollo-router/src/services/external.rs
@@ -0,0 +1,140 @@
+// With regards to ELv2 licensing, this entire file is license key functionality
+#![allow(missing_docs)] // FIXME
+
+use std::collections::HashMap;
+use std::fmt::Debug;
+use std::string::ToString;
+use std::time::Duration;
+
+use http::header::ACCEPT;
+use http::header::CONTENT_TYPE;
+use http::StatusCode;
+use once_cell::sync::Lazy;
+use reqwest::Client;
+use schemars::JsonSchema;
+use serde::de::DeserializeOwned;
+use serde::Deserialize;
+use serde::Serialize;
+use strum_macros::Display;
+use tower::BoxError;
+
+use crate::error::LicenseError;
+use crate::services::apollo_graph_reference;
+use crate::services::apollo_key;
+use crate::tracer::TraceId;
+use crate::Context;
+
+const DEFAULT_EXTERNALIZATION_TIMEOUT: Duration = Duration::from_secs(1);
+
+static CLIENT: Lazy<Result<Client, BoxError>> = Lazy::new(|| {
+    apollo_graph_reference().ok_or(LicenseError::MissingGraphReference)?;
+    apollo_key().ok_or(LicenseError::MissingKey)?;
+    Ok(Client::new())
+});
+
+/// Version of our externalised data. Rev this if it changes
+const EXTERNALIZABLE_VERSION: u8 = 1;
+
+#[derive(Clone, Debug, Display, Deserialize, PartialEq, Serialize, JsonSchema)]
+pub(crate) enum PipelineStep {
+    RouterRequest,
+    RouterResponse,
+    SupergraphRequest,
+    SupergraphResponse,
+    ExecutionRequest,
+    ExecutionResponse,
+    SubgraphRequest,
+    SubgraphResponse,
+}
+
+#[derive(Clone, Debug, Display, Deserialize, PartialEq, Serialize, JsonSchema)]
+pub(crate) enum Control {
+    Continue,
+    Break(u16),
+}
+
+impl Default for Control {
+    fn default() -> Self {
+        Control::Continue
+    }
+}
+
+impl Control {
+    #[allow(dead_code)]
+    fn new(status: u16) -> Self {
+        Control::Break(status)
+    }
+
+    pub(crate) fn get_http_status(&self) -> Result<StatusCode, BoxError> {
+        match self {
+            Control::Continue => Ok(StatusCode::OK),
+            Control::Break(code) => StatusCode::from_u16(*code).map_err(|e| e.into()),
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub(crate) struct Externalizable<T> {
+    pub(crate) version: u8,
+    pub(crate) stage: String,
+    pub(crate) control: Control,
+    pub(crate) id: Option<String>,
+    pub(crate) headers: Option<HashMap<String, Vec<String>>>,
+    pub(crate) body: Option<T>,
+    pub(crate) context: Option<Context>,
+    pub(crate) sdl: Option<String>,
+}
+
+impl<T> Externalizable<T>
+where
+    T: Debug + DeserializeOwned + Serialize + Send + Sync,
+{
+    pub(crate) fn new(
+        stage: PipelineStep,
+        headers: Option<HashMap<String, Vec<String>>>,
+        body: Option<T>,
+        context: Option<Context>,
+        sdl: Option<String>,
+    ) -> Self {
+        Self {
+            version: EXTERNALIZABLE_VERSION,
+            stage: stage.to_string(),
+            control: Control::default(),
+            id: TraceId::maybe_new().map(|id| id.to_string()),
+            headers,
+            body,
+            context,
+            sdl,
+        }
+    }
+
+    pub(crate) async fn call(self, url: &str, timeout: Option<Duration>) -> Result<Self, BoxError> {
+        let my_client = CLIENT.as_ref().map_err(|e| e.to_string())?.clone();
+        let t = timeout.unwrap_or(DEFAULT_EXTERNALIZATION_TIMEOUT);
+
+        tracing::debug!("forwarding json: {}", serde_json::to_string(&self)?);
+        let response = my_client
+            .post(url)
+            .json(&self)
+            .header(ACCEPT, "application/json")
+            .header(CONTENT_TYPE, "application/json")
+            .timeout(t)
+            .send()
+            .await?;
+
+        // Let's process our response
+        let response: Self = response.json().await?;
+
+        Ok(response)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::CLIENT;
+
+    #[test]
+    fn it_will_not_externalize_without_environment() {
+        assert!(CLIENT.as_ref().is_err());
+    }
+}
diff --git a/apollo-router/src/services/layers/allow_only_http_post_mutations.rs b/apollo-router/src/services/layers/allow_only_http_post_mutations.rs
index 2973b9cd6b..ce79f251f6 100644
--- a/apollo-router/src/services/layers/allow_only_http_post_mutations.rs
+++ b/apollo-router/src/services/layers/allow_only_http_post_mutations.rs
@@ -34,12 +34,10 @@ where
                 if req.supergraph_request.method() != Method::POST
                     && req.query_plan.contains_mutations()
                 {
-                    let errors = vec![Error {
-                        message: "Mutations can only be sent over HTTP POST".to_string(),
-                        locations: Default::default(),
-                        path: Default::default(),
-                        extensions: Default::default(),
-                    }];
+                    let errors = vec![Error::builder()
+                        .message("Mutations can only be sent over HTTP POST".to_string())
+                        .extension_code("MUTATION_FORBIDDEN")
+                        .build()];
                     let mut res = ExecutionResponse::builder()
                         .errors(errors)
                         .extensions(Object::default())
@@ -150,7 +148,12 @@ mod forbid_http_get_mutations_tests {
             message: "Mutations can only be sent over HTTP POST".to_string(),
             locations: Default::default(),
             path: Default::default(),
-            extensions: Default::default(),
+            extensions: serde_json_bytes::json!({
+                "code": "MUTATION_FORBIDDEN"
+            })
+            .as_object()
+            .unwrap()
+            .to_owned(),
         };
         let expected_status = StatusCode::METHOD_NOT_ALLOWED;
         let expected_allow_header = "POST";
diff --git a/apollo-router/src/services/layers/apq.rs b/apollo-router/src/services/layers/apq.rs
index 18d82f5166..3e939cc729 100644
--- a/apollo-router/src/services/layers/apq.rs
+++ b/apollo-router/src/services/layers/apq.rs
@@ -43,13 +43,6 @@ impl APQLayer {
     pub(crate) fn with_cache(cache: DeduplicatingCache<String, String>) -> Self {
         Self { cache }
     }
-
-    pub(crate) async fn apq_request(
-        &self,
-        request: SupergraphRequest,
-    ) -> Result<SupergraphRequest, SupergraphResponse> {
-        apq_request(&self.cache, request).await
-    }
 }
 
 impl<S> Layer<S> for APQLayer
diff --git a/apollo-router/src/services/layers/content_negociation.rs b/apollo-router/src/services/layers/content_negociation.rs
new file mode 100644
index 0000000000..8cb27258cb
--- /dev/null
+++ b/apollo-router/src/services/layers/content_negociation.rs
@@ -0,0 +1,281 @@
+use std::ops::ControlFlow;
+
+use http::header::ACCEPT;
+use http::header::CONTENT_TYPE;
+use http::HeaderMap;
+use http::HeaderValue;
+use http::Method;
+use http::StatusCode;
+use mediatype::names::APPLICATION;
+use mediatype::names::JSON;
+use mediatype::names::MIXED;
+use mediatype::names::MULTIPART;
+use mediatype::names::_STAR;
+use mediatype::MediaTypeList;
+use mediatype::ReadParams;
+use mime::APPLICATION_JSON;
+use tower::BoxError;
+use tower::Layer;
+use tower::Service;
+use tower::ServiceExt;
+
+use crate::layers::sync_checkpoint::CheckpointService;
+use crate::layers::ServiceExt as _;
+use crate::services::router;
+use crate::services::supergraph;
+use crate::services::MULTIPART_DEFER_CONTENT_TYPE;
+use crate::services::MULTIPART_DEFER_SPEC_PARAMETER;
+use crate::services::MULTIPART_DEFER_SPEC_VALUE;
+
+pub(crate) const GRAPHQL_JSON_RESPONSE_HEADER_VALUE: &str = "application/graphql-response+json";
+pub(crate) const ACCEPTS_WILDCARD_CONTEXT_KEY: &str = "content-negociation:accepts-wildcard";
+pub(crate) const ACCEPTS_MULTIPART_CONTEXT_KEY: &str = "content-negociation:accepts-multipart";
+pub(crate) const ACCEPTS_JSON_CONTEXT_KEY: &str = "content-negociation:accepts-json";
+
+/// [`Layer`] for Content-Type checks implementation.
+#[derive(Clone, Default)]
+pub(crate) struct RouterLayer {}
+
+impl<S> Layer<S> for RouterLayer
+where
+    S: Service<router::Request, Response = router::Response, Error = BoxError> + Send + 'static,
+    <S as Service<router::Request>>::Future: Send + 'static,
+{
+    type Service = CheckpointService<S, router::Request>;
+
+    fn layer(&self, service: S) -> Self::Service {
+        CheckpointService::new(
+            move |req| {
+                if req.router_request.method() != Method::GET
+                    && !content_type_is_json(req.router_request.headers())
+                {
+                    let response: http::Response<hyper::Body> = http::Response::builder()
+                        .status(StatusCode::UNSUPPORTED_MEDIA_TYPE)
+                        .body(hyper::Body::from(format!(
+                            r#"'content-type' header can't be different from {:?} or {:?}"#,
+                            APPLICATION_JSON.essence_str(),
+                            GRAPHQL_JSON_RESPONSE_HEADER_VALUE,
+                        )))
+                        .expect("cannot fail");
+
+                    return Ok(ControlFlow::Break(response.into()));
+                }
+                let accepts_multipart = accepts_multipart(req.router_request.headers());
+                let accepts_json = accepts_json(req.router_request.headers());
+                let accepts_wildcard = accepts_wildcard(req.router_request.headers());
+
+                if accepts_wildcard || accepts_multipart || accepts_json {
+                    req.context
+                        .insert(ACCEPTS_WILDCARD_CONTEXT_KEY, accepts_wildcard)
+                        .unwrap();
+                    req.context
+                        .insert(ACCEPTS_MULTIPART_CONTEXT_KEY, accepts_multipart)
+                        .unwrap();
+                    req.context
+                        .insert(ACCEPTS_JSON_CONTEXT_KEY, accepts_json)
+                        .unwrap();
+
+                    Ok(ControlFlow::Continue(req))
+                } else {
+                    let response: http::Response<hyper::Body> = http::Response::builder().status(StatusCode::NOT_ACCEPTABLE).body(
+                            hyper::Body::from(
+                            format!(
+                                r#"'accept' header can't be different from \"*/*\", {:?}, {:?} or {:?}"#,
+                                APPLICATION_JSON.essence_str(),
+                                GRAPHQL_JSON_RESPONSE_HEADER_VALUE,
+                                MULTIPART_DEFER_CONTENT_TYPE
+                            )
+                        )).expect("cannot fail");
+
+                    Ok(ControlFlow::Break(response.into()))
+                }
+            },
+            service,
+        )
+    }
+}
+
+/// [`Layer`] for Content-Type checks implementation.
+#[derive(Clone, Default)]
+pub(crate) struct SupergraphLayer {}
+
+impl<S> Layer<S> for SupergraphLayer
+where
+    S: Service<supergraph::Request, Response = supergraph::Response, Error = BoxError>
+        + Send
+        + 'static,
+    <S as Service<supergraph::Request>>::Future: Send + 'static,
+{
+    type Service = supergraph::BoxService;
+
+    fn layer(&self, service: S) -> Self::Service {
+        service
+            .map_first_graphql_response(|context, mut parts, res| {
+                let accepts_wildcard: bool = context
+                    .get(ACCEPTS_WILDCARD_CONTEXT_KEY)
+                    .unwrap_or_default()
+                    .unwrap_or_default();
+                let accepts_json: bool = context
+                    .get(ACCEPTS_JSON_CONTEXT_KEY)
+                    .unwrap_or_default()
+                    .unwrap_or_default();
+                let accepts_multipart: bool = context
+                    .get(ACCEPTS_MULTIPART_CONTEXT_KEY)
+                    .unwrap_or_default()
+                    .unwrap_or_default();
+
+                if !res.has_next.unwrap_or_default() && (accepts_json || accepts_wildcard) {
+                    parts.headers.insert(
+                        CONTENT_TYPE,
+                        HeaderValue::from_static(APPLICATION_JSON.essence_str()),
+                    );
+                } else if accepts_multipart {
+                    parts.headers.insert(
+                        CONTENT_TYPE,
+                        HeaderValue::from_static(MULTIPART_DEFER_CONTENT_TYPE),
+                    );
+                }
+                (parts, res)
+            })
+            .boxed()
+    }
+}
+
+/// Returns true if the headers content type is `application/json` or `application/graphql-response+json`
+fn content_type_is_json(headers: &HeaderMap) -> bool {
+    headers.get_all(CONTENT_TYPE).iter().any(|value| {
+        value
+            .to_str()
+            .map(|accept_str| {
+                let mut list = MediaTypeList::new(accept_str);
+
+                list.any(|mime| {
+                    mime.as_ref()
+                        .map(|mime| {
+                            (mime.ty == APPLICATION && mime.subty == JSON)
+                                || (mime.ty == APPLICATION
+                                    && mime.subty.as_str() == "graphql-response"
+                                    && mime.suffix == Some(JSON))
+                        })
+                        .unwrap_or(false)
+                })
+            })
+            .unwrap_or(false)
+    })
+}
+
+/// Returns true if the headers contain `accept: application/json` or `accept: application/graphql-response+json`,
+/// or if there is no `accept` header
+fn accepts_json(headers: &HeaderMap) -> bool {
+    !headers.contains_key(ACCEPT)
+        || headers.get_all(ACCEPT).iter().any(|value| {
+            value
+                .to_str()
+                .map(|accept_str| {
+                    let mut list = MediaTypeList::new(accept_str);
+
+                    list.any(|mime| {
+                        mime.as_ref()
+                            .map(|mime| {
+                                (mime.ty == APPLICATION && mime.subty == JSON)
+                                    || (mime.ty == APPLICATION
+                                        && mime.subty.as_str() == "graphql-response"
+                                        && mime.suffix == Some(JSON))
+                            })
+                            .unwrap_or(false)
+                    })
+                })
+                .unwrap_or(false)
+        })
+}
+
+/// Returns true if the headers contain header `accept: */*`
+fn accepts_wildcard(headers: &HeaderMap) -> bool {
+    headers.get_all(ACCEPT).iter().any(|value| {
+        value
+            .to_str()
+            .map(|accept_str| {
+                let mut list = MediaTypeList::new(accept_str);
+
+                list.any(|mime| {
+                    mime.as_ref()
+                        .map(|mime| (mime.ty == _STAR && mime.subty == _STAR))
+                        .unwrap_or(false)
+                })
+            })
+            .unwrap_or(false)
+    })
+}
+
+/// Returns true if the headers contain accept header to enable defer
+fn accepts_multipart(headers: &HeaderMap) -> bool {
+    headers.get_all(ACCEPT).iter().any(|value| {
+        value
+            .to_str()
+            .map(|accept_str| {
+                let mut list = MediaTypeList::new(accept_str);
+
+                list.any(|mime| {
+                    mime.as_ref()
+                        .map(|mime| {
+                            mime.ty == MULTIPART
+                                && mime.subty == MIXED
+                                && mime.get_param(
+                                    mediatype::Name::new(MULTIPART_DEFER_SPEC_PARAMETER)
+                                        .expect("valid name"),
+                                ) == Some(
+                                    mediatype::Value::new(MULTIPART_DEFER_SPEC_VALUE)
+                                        .expect("valid value"),
+                                )
+                        })
+                        .unwrap_or(false)
+                })
+            })
+            .unwrap_or(false)
+    })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn it_checks_accept_header() {
+        let mut default_headers = HeaderMap::new();
+        default_headers.insert(
+            ACCEPT,
+            HeaderValue::from_static(APPLICATION_JSON.essence_str()),
+        );
+        default_headers.append(ACCEPT, HeaderValue::from_static("foo/bar"));
+        assert!(accepts_json(&default_headers));
+
+        let mut default_headers = HeaderMap::new();
+        default_headers.insert(ACCEPT, HeaderValue::from_static("*/*"));
+        default_headers.append(ACCEPT, HeaderValue::from_static("foo/bar"));
+        assert!(accepts_wildcard(&default_headers));
+
+        let mut default_headers = HeaderMap::new();
+        // real life browser example
+        default_headers.insert(ACCEPT, HeaderValue::from_static("text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8"));
+        assert!(accepts_wildcard(&default_headers));
+
+        let mut default_headers = HeaderMap::new();
+        default_headers.insert(
+            ACCEPT,
+            HeaderValue::from_static(GRAPHQL_JSON_RESPONSE_HEADER_VALUE),
+        );
+        default_headers.append(ACCEPT, HeaderValue::from_static("foo/bar"));
+        assert!(accepts_json(&default_headers));
+
+        let mut default_headers = HeaderMap::new();
+        default_headers.insert(
+            ACCEPT,
+            HeaderValue::from_static(GRAPHQL_JSON_RESPONSE_HEADER_VALUE),
+        );
+        default_headers.append(
+            ACCEPT,
+            HeaderValue::from_static(MULTIPART_DEFER_CONTENT_TYPE),
+        );
+        assert!(accepts_multipart(&default_headers));
+    }
+}
diff --git a/apollo-router/src/services/layers/ensure_query_presence.rs b/apollo-router/src/services/layers/ensure_query_presence.rs
index 5a8fb9e052..45d8e0515e 100644
--- a/apollo-router/src/services/layers/ensure_query_presence.rs
+++ b/apollo-router/src/services/layers/ensure_query_presence.rs
@@ -33,10 +33,10 @@ where
                 // A query must be available at this point
                 let query = req.supergraph_request.body().query.as_ref();
                 if query.is_none() || query.unwrap().trim().is_empty() {
-                    let errors = vec![crate::error::Error {
-                        message: "Must provide query string.".to_string(),
-                        ..Default::default()
-                    }];
+                    let errors = vec![crate::error::Error::builder()
+                        .message("Must provide query string.".to_string())
+                        .extension_code("MISSING_QUERY_STRING")
+                        .build()];
                     tracing::error!(
                         monotonic_counter.apollo_router_http_requests_total = 1u64,
                         status = %StatusCode::BAD_REQUEST.as_u16(),
@@ -109,6 +109,7 @@ mod ensure_query_presence_tests {
         let actual_error = response.errors[0].message.clone();
 
         assert_eq!(expected_error, actual_error);
+        assert!(response.errors[0].extensions.contains_key("code"));
     }
 
     #[tokio::test]
@@ -130,5 +131,6 @@ mod ensure_query_presence_tests {
             .unwrap();
         let actual_error = response.errors[0].message.clone();
         assert_eq!(expected_error, actual_error);
+        assert!(response.errors[0].extensions.contains_key("code"));
     }
 }
diff --git a/apollo-router/src/services/layers/mod.rs b/apollo-router/src/services/layers/mod.rs
index 2faee8c3cb..433b84bbfb 100644
--- a/apollo-router/src/services/layers/mod.rs
+++ b/apollo-router/src/services/layers/mod.rs
@@ -1,4 +1,6 @@
 //! Layers that are internal to the execution pipeline.
 pub(crate) mod allow_only_http_post_mutations;
 pub(crate) mod apq;
+pub(crate) mod content_negociation;
 pub(crate) mod ensure_query_presence;
+pub(crate) mod static_page;
diff --git a/apollo-router/src/services/layers/static_page.rs b/apollo-router/src/services/layers/static_page.rs
new file mode 100644
index 0000000000..eafd65ce39
--- /dev/null
+++ b/apollo-router/src/services/layers/static_page.rs
@@ -0,0 +1,153 @@
+//!  (A)utomatic (P)ersisted (Q)ueries cache.
+//!
+//!  For more information on APQ see:
+//!  <https://www.apollographql.com/docs/apollo-server/performance/apq/>
+
+// This entire file is license key functionality
+
+use std::borrow::Cow;
+use std::ops::ControlFlow;
+
+use askama::Template;
+use http::header::CONTENT_TYPE;
+use http::HeaderMap;
+use http::HeaderValue;
+use http::Method;
+use hyper::Body;
+use mediatype::names::HTML;
+use mediatype::names::TEXT;
+use mediatype::MediaType;
+use mediatype::MediaTypeList;
+use schemars::JsonSchema;
+use serde::Deserialize;
+use serde::Serialize;
+use tower::BoxError;
+use tower::Layer;
+use tower::Service;
+
+use crate::layers::sync_checkpoint::CheckpointService;
+use crate::services::router;
+use crate::Configuration;
+
+/// [`Layer`] That serves Static pages such as Homepage and Sandbox.
+#[derive(Clone)]
+pub(crate) struct StaticPageLayer {
+    static_page: Option<String>,
+}
+
+impl StaticPageLayer {
+    pub(crate) fn new(configuration: &Configuration) -> Self {
+        let static_page = if configuration.sandbox.enabled {
+            Some(sandbox_page_content())
+        } else if configuration.homepage.enabled {
+            Some(home_page_content())
+        } else {
+            None
+        };
+
+        Self { static_page }
+    }
+}
+
+impl<S> Layer<S> for StaticPageLayer
+where
+    S: Service<router::Request, Response = router::Response, Error = BoxError> + Send + 'static,
+    <S as Service<router::Request>>::Future: Send + 'static,
+{
+    type Service = CheckpointService<S, router::Request>;
+
+    fn layer(&self, service: S) -> Self::Service {
+        if let Some(page) = self.static_page.as_ref() {
+            let page = page.clone();
+            let cow = Cow::from(page);
+
+            CheckpointService::new(
+                move |req| {
+                    let res = if req.router_request.method() == Method::GET
+                        && prefers_html(req.router_request.headers())
+                    {
+                        let response = http::Response::builder()
+                            .header(
+                                CONTENT_TYPE,
+                                HeaderValue::from_static(mime::TEXT_HTML_UTF_8.as_ref()),
+                            )
+                            .body(Body::from(cow.clone()))
+                            .unwrap();
+                        ControlFlow::Break(router::Response {
+                            response,
+                            context: req.context,
+                        })
+                    } else {
+                        ControlFlow::Continue(req)
+                    };
+
+                    Ok(res)
+                },
+                service,
+            )
+        } else {
+            CheckpointService::new(move |req| Ok(ControlFlow::Continue(req)), service)
+        }
+    }
+}
+
+fn prefers_html(headers: &HeaderMap) -> bool {
+    let text_html = MediaType::new(TEXT, HTML);
+
+    headers.get_all(&http::header::ACCEPT).iter().any(|value| {
+        value
+            .to_str()
+            .map(|accept_str| {
+                let mut list = MediaTypeList::new(accept_str);
+
+                list.any(|mime| mime.as_ref() == Ok(&text_html))
+            })
+            .unwrap_or(false)
+    })
+}
+
+/// Configuration options pertaining to the sandbox page.
+#[derive(Debug, Clone, Deserialize, Serialize, JsonSchema)]
+#[serde(deny_unknown_fields)]
+pub(crate) struct Sandbox {
+    #[serde(default = "default_sandbox")]
+    pub(crate) enabled: bool,
+}
+
+fn default_sandbox() -> bool {
+    false
+}
+
+#[buildstructor::buildstructor]
+impl Sandbox {
+    #[builder]
+    pub(crate) fn new(enabled: Option<bool>) -> Self {
+        Self {
+            enabled: enabled.unwrap_or_else(default_sandbox),
+        }
+    }
+}
+
+impl Default for Sandbox {
+    fn default() -> Self {
+        Self::builder().build()
+    }
+}
+
+#[derive(Template)]
+#[template(path = "sandbox_index.html")]
+struct SandboxTemplate {}
+
+pub(crate) fn sandbox_page_content() -> String {
+    let template = SandboxTemplate {};
+    template.render().expect("cannot fail")
+}
+
+#[derive(Template)]
+#[template(path = "homepage_index.html")]
+struct HomepageTemplate {}
+
+pub(crate) fn home_page_content() -> String {
+    let template = HomepageTemplate {};
+    template.render().expect("cannot fail")
+}
diff --git a/apollo-router/src/services/mod.rs b/apollo-router/src/services/mod.rs
index 13502d2316..c99b245c60 100644
--- a/apollo-router/src/services/mod.rs
+++ b/apollo-router/src/services/mod.rs
@@ -14,16 +14,22 @@ pub(crate) use crate::services::execution::Request as ExecutionRequest;
 pub(crate) use crate::services::execution::Response as ExecutionResponse;
 pub(crate) use crate::services::query_planner::Request as QueryPlannerRequest;
 pub(crate) use crate::services::query_planner::Response as QueryPlannerResponse;
+pub(crate) use crate::services::router::Request as RouterRequest;
+pub(crate) use crate::services::router::Response as RouterResponse;
 pub(crate) use crate::services::subgraph::Request as SubgraphRequest;
 pub(crate) use crate::services::subgraph::Response as SubgraphResponse;
 pub(crate) use crate::services::supergraph::Request as SupergraphRequest;
 pub(crate) use crate::services::supergraph::Response as SupergraphResponse;
+pub(crate) use crate::services::supergraph_service::SupergraphCreator;
 
 pub mod execution;
 mod execution_service;
+pub(crate) mod external;
 pub(crate) mod layers;
 pub(crate) mod new_service;
 pub(crate) mod query_planner;
+pub mod router;
+pub(crate) mod router_service;
 pub mod subgraph;
 pub(crate) mod subgraph_service;
 pub mod supergraph;
@@ -42,6 +48,28 @@ impl AsRef<Request> for Arc<http_ext::Request<Request>> {
     }
 }
 
+#[cfg(test)]
+pub(crate) fn apollo_key() -> Option<String> {
+    // During tests we don't want env variables to affect defaults
+    None
+}
+
+#[cfg(not(test))]
+pub(crate) fn apollo_key() -> Option<String> {
+    std::env::var("APOLLO_KEY").ok()
+}
+
+#[cfg(test)]
+pub(crate) fn apollo_graph_reference() -> Option<String> {
+    // During tests we don't want env variables to affect defaults
+    None
+}
+
+#[cfg(not(test))]
+pub(crate) fn apollo_graph_reference() -> Option<String> {
+    std::env::var("APOLLO_GRAPH_REF").ok()
+}
+
 // set the supported `@defer` specification version to https://github.com/graphql/graphql-spec/pull/742/commits/01d7b98f04810c9a9db4c0e53d3c4d54dbf10b82
 pub(crate) const MULTIPART_DEFER_SPEC_PARAMETER: &str = "deferSpec";
 pub(crate) const MULTIPART_DEFER_SPEC_VALUE: &str = "20220824";
diff --git a/apollo-router/src/services/new_service.rs b/apollo-router/src/services/new_service.rs
index 7dab046937..33c9243021 100644
--- a/apollo-router/src/services/new_service.rs
+++ b/apollo-router/src/services/new_service.rs
@@ -2,8 +2,8 @@
 use tower::Service;
 
 /// Trait
-pub(crate) trait NewService<Request> {
+pub(crate) trait ServiceFactory<Request> {
     type Service: Service<Request>;
 
-    fn new_service(&self) -> Self::Service;
+    fn create(&self) -> Self::Service;
 }
diff --git a/apollo-router/src/services/router.rs b/apollo-router/src/services/router.rs
new file mode 100644
index 0000000000..e865e56d9c
--- /dev/null
+++ b/apollo-router/src/services/router.rs
@@ -0,0 +1,225 @@
+#![allow(missing_docs)] // FIXME
+
+use bytes::Bytes;
+use futures::Stream;
+use futures::StreamExt;
+use http::header::HeaderName;
+use http::HeaderValue;
+use http::Method;
+use http::StatusCode;
+use multer::Multipart;
+use multimap::MultiMap;
+use serde_json_bytes::ByteString;
+use serde_json_bytes::Map as JsonMap;
+use serde_json_bytes::Value;
+use static_assertions::assert_impl_all;
+use tower::BoxError;
+
+use super::supergraph;
+use crate::graphql;
+use crate::json_ext::Path;
+use crate::Context;
+use crate::TryIntoHeaderName;
+use crate::TryIntoHeaderValue;
+
+pub type BoxService = tower::util::BoxService<Request, Response, BoxError>;
+pub type BoxCloneService = tower::util::BoxCloneService<Request, Response, BoxError>;
+pub type ServiceResult = Result<Response, BoxError>;
+pub type Body = hyper::Body;
+pub type Error = hyper::Error;
+
+assert_impl_all!(Request: Send);
+/// Represents the router processing step of the processing pipeline.
+///
+/// This consists of the parsed graphql Request, HTTP headers and contextual data for extensions.
+#[non_exhaustive]
+pub struct Request {
+    /// Original request to the Router.
+    pub router_request: http::Request<Body>,
+
+    /// Context for extension
+    pub context: Context,
+}
+
+impl From<http::Request<Body>> for Request {
+    fn from(router_request: http::Request<Body>) -> Self {
+        Self {
+            router_request,
+            context: Context::new(),
+        }
+    }
+}
+
+use displaydoc::Display;
+use thiserror::Error;
+
+#[derive(Error, Display, Debug)]
+pub enum ParseError {
+    /// couldn't create a valid http GET uri '{0}'
+    InvalidUri(http::uri::InvalidUri),
+    /// couldn't urlencode the GraphQL request body '{0}'
+    UrlEncodeError(serde_urlencoded::ser::Error),
+    /// couldn't serialize the GraphQL request body '{0}'
+    SerializationError(serde_json::Error),
+}
+
+/// This is handy for tests.
+impl TryFrom<supergraph::Request> for Request {
+    type Error = ParseError;
+    fn try_from(request: supergraph::Request) -> Result<Self, Self::Error> {
+        let supergraph::Request {
+            context,
+            supergraph_request,
+        } = request;
+
+        let (mut parts, request) = supergraph_request.into_parts();
+
+        let router_request = if parts.method == Method::GET {
+            // get request
+            let get_path = serde_urlencoded::to_string(&[
+                ("query", request.query),
+                ("operationName", request.operation_name),
+                (
+                    "extensions",
+                    serde_json::to_string(&request.extensions).ok(),
+                ),
+                ("variables", serde_json::to_string(&request.variables).ok()),
+            ])
+            .map_err(ParseError::UrlEncodeError)?;
+
+            parts.uri = format!("{}?{}", parts.uri, get_path)
+                .parse()
+                .map_err(ParseError::InvalidUri)?;
+
+            http::Request::from_parts(parts, Body::empty())
+        } else {
+            http::Request::from_parts(
+                parts,
+                Body::from(serde_json::to_vec(&request).map_err(ParseError::SerializationError)?),
+            )
+        };
+        Ok(Self {
+            router_request,
+            context,
+        })
+    }
+}
+
+assert_impl_all!(Response: Send);
+#[non_exhaustive]
+#[derive(Debug)]
+pub struct Response {
+    pub response: http::Response<Body>,
+    pub context: Context,
+}
+
+impl From<http::Response<Body>> for Response {
+    fn from(response: http::Response<Body>) -> Self {
+        Self {
+            response,
+            context: Context::new(),
+        }
+    }
+}
+
+#[buildstructor::buildstructor]
+impl Response {
+    pub async fn next_response(&mut self) -> Option<Result<Bytes, Error>> {
+        self.response.body_mut().next().await
+    }
+
+    pub fn map<F>(self, f: F) -> Response
+    where
+        F: FnOnce(Body) -> Body,
+    {
+        Response {
+            context: self.context,
+            response: self.response.map(f),
+        }
+    }
+
+    /// This is the constructor (or builder) to use when constructing a real Response..
+    ///
+    /// Required parameters are required in non-testing code to create a Response..
+    #[allow(clippy::too_many_arguments)]
+    #[builder(visibility = "pub")]
+    fn new(
+        label: Option<String>,
+        data: Option<Value>,
+        path: Option<Path>,
+        errors: Vec<graphql::Error>,
+        // Skip the `Object` type alias in order to use buildstructor’s map special-casing
+        extensions: JsonMap<ByteString, Value>,
+        status_code: Option<StatusCode>,
+        headers: MultiMap<TryIntoHeaderName, TryIntoHeaderValue>,
+        context: Context,
+    ) -> Result<Self, BoxError> {
+        // Build a response
+        let b = graphql::Response::builder()
+            .and_label(label)
+            .and_path(path)
+            .errors(errors)
+            .extensions(extensions);
+        let res = match data {
+            Some(data) => b.data(data).build(),
+            None => b.build(),
+        };
+
+        // Build an http Response
+        let mut builder = http::Response::builder().status(status_code.unwrap_or(StatusCode::OK));
+        for (key, values) in headers {
+            let header_name: HeaderName = key.try_into()?;
+            for value in values {
+                let header_value: HeaderValue = value.try_into()?;
+                builder = builder.header(header_name.clone(), header_value);
+            }
+        }
+
+        // let response = builder.body(once(ready(res)).boxed())?;
+
+        let response = builder.body(hyper::Body::from(serde_json::to_vec(&res)?))?;
+
+        Ok(Self { response, context })
+    }
+
+    /// This is the constructor (or builder) to use when constructing a Response that represents a global error.
+    /// It has no path and no response data.
+    /// This is useful for things such as authentication errors.
+    #[builder(visibility = "pub")]
+    fn error_new(
+        errors: Vec<graphql::Error>,
+        status_code: Option<StatusCode>,
+        headers: MultiMap<TryIntoHeaderName, TryIntoHeaderValue>,
+        context: Context,
+    ) -> Result<Self, BoxError> {
+        Response::new(
+            Default::default(),
+            Default::default(),
+            None,
+            errors,
+            Default::default(),
+            status_code,
+            headers,
+            context,
+        )
+    }
+
+    /// EXPERIMENTAL: this is function is experimental and subject to potentially change.
+    pub async fn into_graphql_response_stream(
+        self,
+    ) -> impl Stream<Item = Result<crate::graphql::Response, serde_json::Error>> {
+        let multipart = Multipart::new(self.response.into_body(), "graphql");
+
+        Box::pin(futures::stream::unfold(multipart, |mut m| async {
+            if let Ok(Some(response)) = m.next_field().await {
+                if let Ok(bytes) = response.bytes().await {
+                    return Some((
+                        serde_json::from_slice::<crate::graphql::Response>(&bytes),
+                        m,
+                    ));
+                }
+            }
+            None
+        }))
+    }
+}
diff --git a/apollo-router/src/services/router_service.rs b/apollo-router/src/services/router_service.rs
new file mode 100644
index 0000000000..5183f69067
--- /dev/null
+++ b/apollo-router/src/services/router_service.rs
@@ -0,0 +1,584 @@
+//! Implements the router phase of the request lifecycle.
+
+use std::sync::Arc;
+use std::task::Poll;
+
+use axum::body::StreamBody;
+use axum::response::*;
+use bytes::Buf;
+use bytes::Bytes;
+use futures::future::ready;
+use futures::future::BoxFuture;
+use futures::stream;
+use futures::stream::once;
+use futures::stream::StreamExt;
+use http::header::CONTENT_TYPE;
+use http::header::VARY;
+use http::HeaderMap;
+use http::HeaderValue;
+use http::Method;
+use http::StatusCode;
+use http_body::Body as _;
+use hyper::Body;
+use mime::APPLICATION_JSON;
+use multimap::MultiMap;
+use tower::BoxError;
+use tower::Layer;
+use tower::ServiceBuilder;
+use tower::ServiceExt;
+use tower_service::Service;
+
+use super::layers::content_negociation;
+use super::layers::content_negociation::ACCEPTS_JSON_CONTEXT_KEY;
+use super::layers::content_negociation::ACCEPTS_MULTIPART_CONTEXT_KEY;
+use super::layers::content_negociation::ACCEPTS_WILDCARD_CONTEXT_KEY;
+use super::layers::static_page::StaticPageLayer;
+use super::new_service::ServiceFactory;
+use super::router;
+use super::supergraph;
+use super::HasPlugins;
+#[cfg(test)]
+use super::SupergraphCreator;
+use super::MULTIPART_DEFER_CONTENT_TYPE;
+use crate::graphql;
+#[cfg(test)]
+use crate::plugin::test::MockSupergraphService;
+use crate::router_factory::RouterFactory;
+use crate::services::layers::content_negociation::GRAPHQL_JSON_RESPONSE_HEADER_VALUE;
+use crate::Configuration;
+use crate::Endpoint;
+use crate::ListenAddr;
+use crate::RouterRequest;
+use crate::RouterResponse;
+use crate::SupergraphRequest;
+use crate::SupergraphResponse;
+
+/// Containing [`Service`] in the request lifecyle.
+#[derive(Clone)]
+pub(crate) struct RouterService<SF>
+where
+    SF: ServiceFactory<supergraph::Request> + Clone + Send + Sync + 'static,
+{
+    supergraph_creator: Arc<SF>,
+}
+
+impl<SF> RouterService<SF>
+where
+    SF: ServiceFactory<supergraph::Request> + Clone + Send + Sync + 'static,
+{
+    pub(crate) fn new(supergraph_creator: Arc<SF>) -> Self {
+        RouterService { supergraph_creator }
+    }
+}
+
+#[cfg(test)]
+pub(crate) async fn from_supergraph_mock_callback_and_configuration(
+    supergraph_callback: impl FnMut(supergraph::Request) -> supergraph::ServiceResult
+        + Send
+        + Sync
+        + 'static
+        + Clone,
+    configuration: Arc<Configuration>,
+) -> impl Service<
+    router::Request,
+    Response = router::Response,
+    Error = BoxError,
+    Future = BoxFuture<'static, router::ServiceResult>,
+> + Send {
+    let mut supergraph_service = MockSupergraphService::new();
+
+    supergraph_service.expect_clone().returning(move || {
+        let cloned_callback = supergraph_callback.clone();
+        let mut supergraph_service = MockSupergraphService::new();
+        supergraph_service.expect_call().returning(cloned_callback);
+        supergraph_service
+    });
+
+    RouterCreator::new(
+        Arc::new(SupergraphCreator::for_tests(supergraph_service).await),
+        &configuration,
+    )
+    .make()
+}
+
+#[cfg(test)]
+pub(crate) async fn from_supergraph_mock_callback(
+    supergraph_callback: impl FnMut(supergraph::Request) -> supergraph::ServiceResult
+        + Send
+        + Sync
+        + 'static
+        + Clone,
+) -> impl Service<
+    router::Request,
+    Response = router::Response,
+    Error = BoxError,
+    Future = BoxFuture<'static, router::ServiceResult>,
+> + Send {
+    from_supergraph_mock_callback_and_configuration(
+        supergraph_callback,
+        Arc::new(Configuration::default()),
+    )
+    .await
+}
+
+#[cfg(test)]
+pub(crate) async fn empty() -> impl Service<
+    router::Request,
+    Response = router::Response,
+    Error = BoxError,
+    Future = BoxFuture<'static, router::ServiceResult>,
+> + Send {
+    let mut supergraph_service = MockSupergraphService::new();
+    supergraph_service
+        .expect_clone()
+        .returning(MockSupergraphService::new);
+
+    RouterCreator::new(
+        Arc::new(SupergraphCreator::for_tests(supergraph_service).await),
+        &Configuration::default(),
+    )
+    .make()
+}
+
+impl<SF> Service<RouterRequest> for RouterService<SF>
+where
+    SF: ServiceFactory<supergraph::Request> + Clone + Send + Sync + 'static,
+    <SF as ServiceFactory<supergraph::Request>>::Service:
+        Service<supergraph::Request, Response = supergraph::Response, Error = BoxError> + Send,
+    <<SF as ServiceFactory<supergraph::Request>>::Service as Service<supergraph::Request>>::Future:
+        Send,
+{
+    type Response = RouterResponse;
+    type Error = BoxError;
+    type Future = BoxFuture<'static, Result<Self::Response, Self::Error>>;
+
+    fn poll_ready(&mut self, _cx: &mut std::task::Context<'_>) -> Poll<Result<(), Self::Error>> {
+        Poll::Ready(Ok(()))
+    }
+
+    fn call(&mut self, req: RouterRequest) -> Self::Future {
+        let RouterRequest {
+            router_request,
+            context,
+        } = req;
+
+        let (parts, body) = router_request.into_parts();
+
+        let supergraph_service = self.supergraph_creator.create();
+        let fut = async move {
+            let graphql_request: Result<graphql::Request, (&str, String)> = if parts.method
+                == Method::GET
+            {
+                parts
+                    .uri
+                    .query()
+                    .map(|q| {
+                        graphql::Request::from_urlencoded_query(q.to_string()).map_err(|e| {
+                            (
+                                "failed to decode a valid GraphQL request from path",
+                                format!("failed to decode a valid GraphQL request from path {}", e),
+                            )
+                        })
+                    })
+                    .unwrap_or_else(|| {
+                        Err(("missing query string", "missing query string".to_string()))
+                    })
+            } else {
+                hyper::body::to_bytes(body)
+                    .await
+                    .map_err(|e| {
+                        (
+                            "failed to get the request body",
+                            format!("failed to get the request body: {}", e),
+                        )
+                    })
+                    .and_then(|bytes| {
+                        serde_json::from_reader(bytes.reader()).map_err(|err| {
+                            (
+                                "failed to deserialize the request body into JSON",
+                                format!(
+                                    "failed to deserialize the request body into JSON: {}",
+                                    err
+                                ),
+                            )
+                        })
+                    })
+            };
+
+            match graphql_request {
+                Ok(graphql_request) => {
+                    let request = SupergraphRequest {
+                        supergraph_request: http::Request::from_parts(parts, graphql_request),
+                        context,
+                    };
+
+                    let SupergraphResponse { response, context } =
+                        supergraph_service.oneshot(request).await?;
+
+                    let accepts_wildcard: bool = context
+                        .get(ACCEPTS_WILDCARD_CONTEXT_KEY)
+                        .unwrap_or_default()
+                        .unwrap_or_default();
+                    let accepts_json: bool = context
+                        .get(ACCEPTS_JSON_CONTEXT_KEY)
+                        .unwrap_or_default()
+                        .unwrap_or_default();
+                    let accepts_multipart: bool = context
+                        .get(ACCEPTS_MULTIPART_CONTEXT_KEY)
+                        .unwrap_or_default()
+                        .unwrap_or_default();
+
+                    let (mut parts, mut body) = response.into_parts();
+                    process_vary_header(&mut parts.headers);
+
+                    match body.next().await {
+                        None => {
+                            tracing::error!("router service is not available to process request",);
+                            Ok(router::Response {
+                                response: http::Response::builder()
+                                    .status(StatusCode::SERVICE_UNAVAILABLE)
+                                    .body(Body::from(
+                                        "router service is not available to process request",
+                                    ))
+                                    .expect("cannot fail"),
+                                context,
+                            })
+                        }
+                        Some(response) => {
+                            if !response.has_next.unwrap_or(false)
+                                && (accepts_json || accepts_wildcard)
+                            {
+                                parts.headers.insert(
+                                    CONTENT_TYPE,
+                                    HeaderValue::from_static(APPLICATION_JSON.essence_str()),
+                                );
+                                tracing::trace_span!("serialize_response").in_scope(|| {
+                                    let body = serde_json::to_string(&response)?;
+                                    Ok(router::Response {
+                                        response: http::Response::from_parts(
+                                            parts,
+                                            Body::from(body),
+                                        ),
+                                        context,
+                                    })
+                                })
+                            } else if accepts_multipart {
+                                parts.headers.insert(
+                                    CONTENT_TYPE,
+                                    HeaderValue::from_static(MULTIPART_DEFER_CONTENT_TYPE),
+                                );
+
+                                // each chunk contains a response and the next delimiter, to let client parsers
+                                // know that they can process the response right away
+                                let mut first_buf = Vec::from(
+                                    &b"\r\n--graphql\r\ncontent-type: application/json\r\n\r\n"[..],
+                                );
+                                serde_json::to_writer(&mut first_buf, &response)?;
+                                if response.has_next.unwrap_or(false) {
+                                    first_buf.extend_from_slice(b"\r\n--graphql\r\n");
+                                } else {
+                                    first_buf.extend_from_slice(b"\r\n--graphql--\r\n");
+                                }
+
+                                let body = once(ready(Ok(Bytes::from(first_buf)))).chain(body.map(
+                                    |res| {
+                                        let mut buf = Vec::from(
+                                            &b"content-type: application/json\r\n\r\n"[..],
+                                        );
+                                        serde_json::to_writer(&mut buf, &res)?;
+
+                                        // the last chunk has a different end delimiter
+                                        if res.has_next.unwrap_or(false) {
+                                            buf.extend_from_slice(b"\r\n--graphql\r\n");
+                                        } else {
+                                            buf.extend_from_slice(b"\r\n--graphql--\r\n");
+                                        }
+
+                                        Ok::<_, BoxError>(buf.into())
+                                    },
+                                ));
+
+                                let response =
+                                    (parts, StreamBody::new(body)).into_response().map(|body| {
+                                        // Axum makes this `body` have type:
+                                        // https://docs.rs/http-body/0.4.5/http_body/combinators/struct.UnsyncBoxBody.html
+                                        let mut body = Box::pin(body);
+                                        // We make a stream based on its `poll_data` method
+                                        // in order to create a `hyper::Body`.
+                                        Body::wrap_stream(stream::poll_fn(move |ctx| {
+                                            body.as_mut().poll_data(ctx)
+                                        }))
+                                        // … but we ignore the `poll_trailers` method:
+                                        // https://docs.rs/http-body/0.4.5/http_body/trait.Body.html#tymethod.poll_trailers
+                                        // Apparently HTTP/2 trailers are like headers, except after the response body.
+                                        // I (Simon) believe nothing in the Apollo Router uses trailers as of this writing,
+                                        // so ignoring `poll_trailers` is fine.
+                                        // If we want to use trailers, we may need remove this convertion to `hyper::Body`
+                                        // and return `UnsyncBoxBody` (a.k.a. `axum::BoxBody`) as-is.
+                                    });
+
+                                Ok(RouterResponse { response, context })
+                            } else {
+                                // this should be unreachable due to a previous check, but just to be sure...
+                                Ok(router::Response {
+                                response: http::Response::builder()
+                                    .status(StatusCode::NOT_ACCEPTABLE)
+                                    .body(Body::from(
+                                        format!(
+                                            r#"'accept' header can't be different from \"*/*\", {:?}, {:?} or {:?}"#,
+                                            APPLICATION_JSON.essence_str(),
+                                            GRAPHQL_JSON_RESPONSE_HEADER_VALUE,
+                                            MULTIPART_DEFER_CONTENT_TYPE
+                                        )
+                                    ))
+                                    .expect("cannot fail"),
+                                context,
+                            })
+                            }
+                        }
+                    }
+                }
+                Err((error, extension_details)) => {
+                    // BAD REQUEST
+                    ::tracing::error!(
+                        monotonic_counter.apollo_router_http_requests_total = 1u64,
+                        status = %400,
+                        error = %error,
+                        %error
+                    );
+                    Ok(router::Response {
+                        response: http::Response::builder()
+                            .status(StatusCode::BAD_REQUEST)
+                            .body(Body::from(
+                                serde_json::to_string(
+                                    &graphql::Error::builder()
+                                        .message(String::from("Invalid GraphQL request"))
+                                        .extension_code("INVALID_GRAPHQL_REQUEST")
+                                        .extension("details", extension_details)
+                                        .build(),
+                                )
+                                .unwrap_or_else(|_| String::from("Invalid GraphQL request")),
+                            ))
+                            .expect("cannot fail"),
+                        context,
+                    })
+                }
+            }
+        };
+        Box::pin(fut)
+    }
+}
+
+// Process the headers to make sure that `VARY` is set correctly
+fn process_vary_header(headers: &mut HeaderMap<HeaderValue>) {
+    if headers.get(VARY).is_none() {
+        // We don't have a VARY header, add one with value "origin"
+        headers.insert(VARY, HeaderValue::from_static("origin"));
+    }
+}
+
+/// A collection of services and data which may be used to create a "router".
+#[derive(Clone)]
+pub(crate) struct RouterCreator<SF>
+where
+    SF: ServiceFactory<supergraph::Request> + Clone + Send + Sync + 'static,
+{
+    supergraph_creator: Arc<SF>,
+    static_page: StaticPageLayer,
+}
+
+impl<SF> ServiceFactory<router::Request> for RouterCreator<SF>
+where
+    SF: HasPlugins + ServiceFactory<supergraph::Request> + Clone + Send + Sync + 'static,
+    <SF as ServiceFactory<supergraph::Request>>::Service:
+        Service<supergraph::Request, Response = supergraph::Response, Error = BoxError> + Send,
+    <<SF as ServiceFactory<supergraph::Request>>::Service as Service<supergraph::Request>>::Future:
+        Send,
+{
+    type Service = router::BoxService;
+    fn create(&self) -> Self::Service {
+        self.make().boxed()
+    }
+}
+
+impl<SF> RouterFactory for RouterCreator<SF>
+where
+    SF: HasPlugins + ServiceFactory<supergraph::Request> + Clone + Send + Sync + 'static,
+    <SF as ServiceFactory<supergraph::Request>>::Service:
+        Service<supergraph::Request, Response = supergraph::Response, Error = BoxError> + Send,
+    <<SF as ServiceFactory<supergraph::Request>>::Service as Service<supergraph::Request>>::Future:
+        Send,
+{
+    type RouterService = router::BoxService;
+
+    type Future = <<RouterCreator<SF> as ServiceFactory<router::Request>>::Service as Service<
+        router::Request,
+    >>::Future;
+
+    fn web_endpoints(&self) -> MultiMap<ListenAddr, Endpoint> {
+        let mut mm = MultiMap::new();
+        self.supergraph_creator
+            .plugins()
+            .values()
+            .for_each(|p| mm.extend(p.web_endpoints()));
+        mm
+    }
+}
+
+impl<SF> RouterCreator<SF>
+where
+    SF: HasPlugins + ServiceFactory<supergraph::Request> + Clone + Send + Sync + 'static,
+    <SF as ServiceFactory<supergraph::Request>>::Service:
+        Service<supergraph::Request, Response = supergraph::Response, Error = BoxError> + Send,
+    <<SF as ServiceFactory<supergraph::Request>>::Service as Service<supergraph::Request>>::Future:
+        Send,
+{
+    pub(crate) fn new(supergraph_creator: Arc<SF>, configuration: &Configuration) -> Self {
+        let static_page = StaticPageLayer::new(configuration);
+        Self {
+            supergraph_creator,
+            static_page,
+        }
+    }
+
+    pub(crate) fn make(
+        &self,
+    ) -> impl Service<
+        router::Request,
+        Response = router::Response,
+        Error = BoxError,
+        Future = BoxFuture<'static, router::ServiceResult>,
+    > + Send {
+        let router_service = content_negociation::RouterLayer::default()
+            .layer(RouterService::new(self.supergraph_creator.clone()));
+
+        ServiceBuilder::new()
+            .layer(self.static_page.clone())
+            .service(
+                self.supergraph_creator
+                    .plugins()
+                    .iter()
+                    .rev()
+                    .fold(router_service.boxed(), |acc, (_, e)| e.router_service(acc)),
+            )
+    }
+}
+
+impl RouterCreator<crate::services::supergraph_service::SupergraphCreator> {
+    pub(crate) async fn cache_keys(&self, count: usize) -> Vec<(String, Option<String>)> {
+        self.supergraph_creator.cache_keys(count).await
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use http::Uri;
+    use mime::APPLICATION_JSON;
+    use serde_json_bytes::json;
+
+    use super::*;
+    use crate::services::supergraph;
+    use crate::Context;
+
+    // Test Vary processing
+
+    #[test]
+    fn it_adds_default_with_value_origin_if_no_vary_header() {
+        let mut default_headers = HeaderMap::new();
+        process_vary_header(&mut default_headers);
+        let vary_opt = default_headers.get(VARY);
+        assert!(vary_opt.is_some());
+        let vary = vary_opt.expect("has a value");
+        assert_eq!(vary, "origin");
+    }
+
+    #[test]
+    fn it_leaves_vary_alone_if_set() {
+        let mut default_headers = HeaderMap::new();
+        default_headers.insert(VARY, HeaderValue::from_static("*"));
+        process_vary_header(&mut default_headers);
+        let vary_opt = default_headers.get(VARY);
+        assert!(vary_opt.is_some());
+        let vary = vary_opt.expect("has a value");
+        assert_eq!(vary, "*");
+    }
+
+    #[test]
+    fn it_leaves_varys_alone_if_there_are_more_than_one() {
+        let mut default_headers = HeaderMap::new();
+        default_headers.insert(VARY, HeaderValue::from_static("one"));
+        default_headers.append(VARY, HeaderValue::from_static("two"));
+        process_vary_header(&mut default_headers);
+        let vary = default_headers.get_all(VARY);
+        assert_eq!(vary.iter().count(), 2);
+        for value in vary {
+            assert!(value == "one" || value == "two");
+        }
+    }
+
+    #[tokio::test]
+    async fn it_extracts_query_and_operation_name() {
+        let query = "query";
+        let expected_query = query;
+        let operation_name = "operationName";
+        let expected_operation_name = operation_name;
+
+        let expected_response = graphql::Response::builder()
+            .data(json!({"response": "yay"}))
+            .build();
+
+        let mut router_service = super::from_supergraph_mock_callback(move |req| {
+            let example_response = expected_response.clone();
+
+            assert_eq!(
+                req.supergraph_request.body().query.as_deref().unwrap(),
+                expected_query
+            );
+            assert_eq!(
+                req.supergraph_request
+                    .body()
+                    .operation_name
+                    .as_deref()
+                    .unwrap(),
+                expected_operation_name
+            );
+
+            Ok(SupergraphResponse::new_from_graphql_response(
+                example_response,
+                req.context,
+            ))
+        })
+        .await;
+
+        // get request
+        let get_request = supergraph::Request::builder()
+            .query(query)
+            .operation_name(operation_name)
+            .header(CONTENT_TYPE, APPLICATION_JSON.essence_str())
+            .uri(Uri::from_static("/"))
+            .method(Method::GET)
+            .context(Context::new())
+            .build()
+            .unwrap()
+            .try_into()
+            .unwrap();
+
+        router_service.call(get_request).await.unwrap();
+
+        // post request
+        let post_request = supergraph::Request::builder()
+            .query(query)
+            .operation_name(operation_name)
+            .header(CONTENT_TYPE, APPLICATION_JSON.essence_str())
+            .uri(Uri::from_static("/"))
+            .method(Method::POST)
+            .context(Context::new())
+            .build()
+            .unwrap();
+
+        router_service
+            .call(post_request.try_into().unwrap())
+            .await
+            .unwrap();
+    }
+}
diff --git a/apollo-router/src/services/snapshots/apollo_router__services__supergraph_service__tests__filter_nullified_deferred_responses-2.snap b/apollo-router/src/services/snapshots/apollo_router__services__supergraph_service__tests__filter_nullified_deferred_responses-2.snap
index ec73eb4353..9d6b95756e 100644
--- a/apollo-router/src/services/snapshots/apollo_router__services__supergraph_service__tests__filter_nullified_deferred_responses-2.snap
+++ b/apollo-router/src/services/snapshots/apollo_router__services__supergraph_service__tests__filter_nullified_deferred_responses-2.snap
@@ -1,5 +1,5 @@
 ---
-source: apollo-router/src/services/supergraph_service/tests.rs
+source: apollo-router/src/services/supergraph_service.rs
 expression: deferred
 ---
 {
diff --git a/apollo-router/src/services/snapshots/apollo_router__services__supergraph_service__tests__filter_nullified_deferred_responses.snap b/apollo-router/src/services/snapshots/apollo_router__services__supergraph_service__tests__filter_nullified_deferred_responses.snap
index db42a89b63..590de6f95c 100644
--- a/apollo-router/src/services/snapshots/apollo_router__services__supergraph_service__tests__filter_nullified_deferred_responses.snap
+++ b/apollo-router/src/services/snapshots/apollo_router__services__supergraph_service__tests__filter_nullified_deferred_responses.snap
@@ -1,5 +1,5 @@
 ---
-source: apollo-router/src/services/supergraph_service/tests.rs
+source: apollo-router/src/services/supergraph_service.rs
 expression: primary
 ---
 {
diff --git a/apollo-router/src/services/snapshots/apollo_router__services__supergraph_service__tests__query_reconstruction.snap b/apollo-router/src/services/snapshots/apollo_router__services__supergraph_service__tests__query_reconstruction.snap
index 6327709527..ff64cc1b5e 100644
--- a/apollo-router/src/services/snapshots/apollo_router__services__supergraph_service__tests__query_reconstruction.snap
+++ b/apollo-router/src/services/snapshots/apollo_router__services__supergraph_service__tests__query_reconstruction.snap
@@ -7,8 +7,8 @@ expression: stream.next_response().await.unwrap()
     {
       "message": "invalid type for variable: 'userId'",
       "extensions": {
-        "type": "ValidationInvalidTypeVariable",
-        "name": "userId"
+        "name": "userId",
+        "code": "VALIDATION_INVALID_TYPE_VARIABLE"
       }
     }
   ]
diff --git a/apollo-router/src/services/subgraph_service.rs b/apollo-router/src/services/subgraph_service.rs
index d2f8a98c89..ebf578dc0d 100644
--- a/apollo-router/src/services/subgraph_service.rs
+++ b/apollo-router/src/services/subgraph_service.rs
@@ -19,6 +19,7 @@ use http::HeaderMap;
 use http::HeaderValue;
 use hyper::client::HttpConnector;
 use hyper_rustls::HttpsConnector;
+use mime::APPLICATION_JSON;
 use opentelemetry::global;
 use schemars::JsonSchema;
 use tokio::io::AsyncWriteExt;
@@ -33,9 +34,8 @@ use tracing::Instrument;
 use tracing::Span;
 use tracing_opentelemetry::OpenTelemetrySpanExt;
 
+use super::layers::content_negociation::GRAPHQL_JSON_RESPONSE_HEADER_VALUE;
 use super::Plugins;
-use crate::axum_factory::utils::APPLICATION_JSON_HEADER_VALUE;
-use crate::axum_factory::utils::GRAPHQL_JSON_RESPONSE_HEADER_VALUE;
 use crate::error::FetchError;
 use crate::graphql;
 use crate::plugins::telemetry::LOGGING_DISPLAY_BODY;
@@ -65,6 +65,9 @@ impl Display for Compression {
 /// Client for interacting with subgraphs.
 #[derive(Clone)]
 pub(crate) struct SubgraphService {
+    // Note: We use hyper::Client here in preference to reqwest to avoid expensive URL translation
+    // in the hot path. We use reqwest elsewhere because it's convenient and some of the
+    // opentelemetry crate require reqwest clients to work correctly (at time of writing).
     client: Decompression<hyper::Client<HttpsConnector<HttpConnector>>>,
     service: Arc<String>,
 }
@@ -131,7 +134,7 @@ impl tower::Service<crate::SubgraphRequest> for SubgraphService {
                 })?;
 
             let mut request = http::request::Request::from_parts(parts, compressed_body.into());
-            let app_json: HeaderValue = HeaderValue::from_static(APPLICATION_JSON_HEADER_VALUE);
+            let app_json: HeaderValue = HeaderValue::from_static(APPLICATION_JSON.essence_str());
             let app_graphql_json: HeaderValue =
                 HeaderValue::from_static(GRAPHQL_JSON_RESPONSE_HEADER_VALUE);
             request.headers_mut().insert(CONTENT_TYPE, app_json.clone());
@@ -145,7 +148,7 @@ impl tower::Service<crate::SubgraphRequest> for SubgraphService {
                 );
             });
 
-            let schema_uri = request.uri();
+            let schema_uri = request.uri().clone();
             let host = schema_uri.host().map(String::from).unwrap_or_default();
             let port = schema_uri.port_u16().unwrap_or_else(|| {
                 let scheme = schema_uri.scheme_str();
@@ -174,6 +177,7 @@ impl tower::Service<crate::SubgraphRequest> for SubgraphService {
                     "net.peer.name" = &display(host),
                     "net.peer.port" = &display(port),
                     "http.route" = &display(path),
+                    "http.url" = &display(schema_uri),
                     "net.transport" = "ip_tcp",
                     "apollo.subgraph.name" = %service_name
                 ))
@@ -196,7 +200,7 @@ impl tower::Service<crate::SubgraphRequest> for SubgraphService {
             if let Some(content_type) = parts.headers.get(header::CONTENT_TYPE) {
                 if let Ok(content_type_str) = content_type.to_str() {
                     // Using .contains because sometimes we could have charset included (example: "application/json; charset=utf-8")
-                    if !content_type_str.contains(APPLICATION_JSON_HEADER_VALUE)
+                    if !content_type_str.contains(APPLICATION_JSON.essence_str())
                         && !content_type_str.contains(GRAPHQL_JSON_RESPONSE_HEADER_VALUE)
                     {
                         return if !parts.status.is_success() {
@@ -211,7 +215,7 @@ impl tower::Service<crate::SubgraphRequest> for SubgraphService {
                         } else {
                             Err(BoxError::from(FetchError::SubrequestHttpError {
                                 service: service_name.clone(),
-                                reason: format!("subgraph didn't return JSON (expected content-type: {APPLICATION_JSON_HEADER_VALUE} or content-type: {GRAPHQL_JSON_RESPONSE_HEADER_VALUE}; found content-type: {content_type:?})"),
+                                reason: format!("subgraph didn't return JSON (expected content-type: {} or content-type: {GRAPHQL_JSON_RESPONSE_HEADER_VALUE}; found content-type: {content_type:?})", APPLICATION_JSON.essence_str()),
                             }))
                         };
                     }
@@ -301,7 +305,7 @@ pub(crate) trait SubgraphServiceFactory: Clone + Send + Sync + 'static {
         + 'static;
     type Future: Send + 'static;
 
-    fn new_service(&self, name: &str) -> Option<Self::SubgraphService>;
+    fn create(&self, name: &str) -> Option<Self::SubgraphService>;
 }
 
 #[derive(Clone)]
@@ -351,7 +355,7 @@ impl SubgraphServiceFactory for SubgraphCreator {
             crate::SubgraphRequest,
         >>::Future;
 
-    fn new_service(&self, name: &str) -> Option<Self::SubgraphService> {
+    fn create(&self, name: &str) -> Option<Self::SubgraphService> {
         self.services.get(name).map(|service| {
             let service = service.make();
             self.plugins
@@ -391,11 +395,14 @@ mod tests {
     async fn emulate_subgraph_bad_request(socket_addr: SocketAddr) {
         async fn handle(_request: http::Request<Body>) -> Result<http::Response<Body>, Infallible> {
             Ok(http::Response::builder()
-                .header(CONTENT_TYPE, APPLICATION_JSON_HEADER_VALUE)
+                .header(CONTENT_TYPE, APPLICATION_JSON.essence_str())
                 .status(StatusCode::BAD_REQUEST)
                 .body(
                     serde_json::to_string(&Response {
-                        errors: vec![Error::builder().message("This went wrong").build()],
+                        errors: vec![Error::builder()
+                            .message("This went wrong")
+                            .extension_code("FETCH_ERROR")
+                            .build()],
                         ..Response::default()
                     })
                     .expect("always valid")
@@ -474,7 +481,7 @@ mod tests {
             let compressed_body = encoder.into_inner();
 
             Ok(http::Response::builder()
-                .header(CONTENT_TYPE, APPLICATION_JSON_HEADER_VALUE)
+                .header(CONTENT_TYPE, APPLICATION_JSON.essence_str())
                 .header(CONTENT_ENCODING, "gzip")
                 .status(StatusCode::OK)
                 .body(compressed_body.into())
@@ -498,13 +505,13 @@ mod tests {
                 supergraph_request: Arc::new(
                     http::Request::builder()
                         .header(HOST, "host")
-                        .header(CONTENT_TYPE, APPLICATION_JSON_HEADER_VALUE)
+                        .header(CONTENT_TYPE, APPLICATION_JSON.essence_str())
                         .body(Request::builder().query("query").build())
                         .expect("expecting valid request"),
                 ),
                 subgraph_request: http::Request::builder()
                     .header(HOST, "rhost")
-                    .header(CONTENT_TYPE, APPLICATION_JSON_HEADER_VALUE)
+                    .header(CONTENT_TYPE, APPLICATION_JSON.essence_str())
                     .uri(url)
                     .body(Request::builder().query("query").build())
                     .expect("expecting valid request"),
@@ -531,13 +538,13 @@ mod tests {
                 supergraph_request: Arc::new(
                     http::Request::builder()
                         .header(HOST, "host")
-                        .header(CONTENT_TYPE, APPLICATION_JSON_HEADER_VALUE)
+                        .header(CONTENT_TYPE, APPLICATION_JSON.essence_str())
                         .body(Request::builder().query("query").build())
                         .expect("expecting valid request"),
                 ),
                 subgraph_request: http::Request::builder()
                     .header(HOST, "rhost")
-                    .header(CONTENT_TYPE, APPLICATION_JSON_HEADER_VALUE)
+                    .header(CONTENT_TYPE, APPLICATION_JSON.essence_str())
                     .uri(url)
                     .body(Request::builder().query("query").build())
                     .expect("expecting valid request"),
@@ -564,13 +571,13 @@ mod tests {
                 supergraph_request: Arc::new(
                     http::Request::builder()
                         .header(HOST, "host")
-                        .header(CONTENT_TYPE, APPLICATION_JSON_HEADER_VALUE)
+                        .header(CONTENT_TYPE, APPLICATION_JSON.essence_str())
                         .body(Request::builder().query("query".to_string()).build())
                         .expect("expecting valid request"),
                 ),
                 subgraph_request: http::Request::builder()
                     .header(HOST, "rhost")
-                    .header(CONTENT_TYPE, APPLICATION_JSON_HEADER_VALUE)
+                    .header(CONTENT_TYPE, APPLICATION_JSON.essence_str())
                     .header(CONTENT_ENCODING, "gzip")
                     .uri(url)
                     .body(Request::builder().query("query".to_string()).build())
@@ -601,13 +608,13 @@ mod tests {
                 supergraph_request: Arc::new(
                     http::Request::builder()
                         .header(HOST, "host")
-                        .header(CONTENT_TYPE, APPLICATION_JSON_HEADER_VALUE)
+                        .header(CONTENT_TYPE, APPLICATION_JSON.essence_str())
                         .body(Request::builder().query("query").build())
                         .expect("expecting valid request"),
                 ),
                 subgraph_request: http::Request::builder()
                     .header(HOST, "rhost")
-                    .header(CONTENT_TYPE, APPLICATION_JSON_HEADER_VALUE)
+                    .header(CONTENT_TYPE, APPLICATION_JSON.essence_str())
                     .uri(url)
                     .body(Request::builder().query("query").build())
                     .expect("expecting valid request"),
diff --git a/apollo-router/src/services/supergraph.rs b/apollo-router/src/services/supergraph.rs
index de99c7ea9b..f28f5094a1 100644
--- a/apollo-router/src/services/supergraph.rs
+++ b/apollo-router/src/services/supergraph.rs
@@ -8,6 +8,7 @@ use http::method::Method;
 use http::HeaderValue;
 use http::StatusCode;
 use http::Uri;
+use mime::APPLICATION_JSON;
 use multimap::MultiMap;
 use serde_json_bytes::ByteString;
 use serde_json_bytes::Map as JsonMap;
@@ -49,6 +50,15 @@ impl From<http::Request<graphql::Request>> for Request {
     }
 }
 
+impl std::fmt::Debug for Request {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Request")
+            // .field("supergraph_request", &self.supergraph_request)
+            .field("context", &self.context)
+            .finish()
+    }
+}
+
 #[buildstructor::buildstructor]
 impl Request {
     /// This is the constructor (or builder) to use when constructing a real Request.
@@ -105,7 +115,7 @@ impl Request {
         // Avoid testing requests getting blocked by the CSRF-prevention plugin
         headers
             .entry(http::header::CONTENT_TYPE.into())
-            .or_insert(HeaderValue::from_static("application/json").into());
+            .or_insert(HeaderValue::from_static(APPLICATION_JSON.essence_str()).into());
         Request::new(
             query,
             operation_name,
@@ -114,7 +124,7 @@ impl Request {
             context.unwrap_or_default(),
             headers,
             Uri::from_static("http://default"),
-            method.unwrap_or(Method::GET),
+            method.unwrap_or(Method::POST),
         )
     }
 
diff --git a/apollo-router/src/services/supergraph_service.rs b/apollo-router/src/services/supergraph_service.rs
index 9c816ed9cd..53a1565c4e 100644
--- a/apollo-router/src/services/supergraph_service.rs
+++ b/apollo-router/src/services/supergraph_service.rs
@@ -9,7 +9,6 @@ use futures::TryFutureExt;
 use http::StatusCode;
 use indexmap::IndexMap;
 use multimap::MultiMap;
-use tower::util::BoxService;
 use tower::util::Either;
 use tower::BoxError;
 use tower::ServiceBuilder;
@@ -17,28 +16,33 @@ use tower::ServiceExt;
 use tower_service::Service;
 use tracing_futures::Instrument;
 
-use super::new_service::NewService;
+use super::layers::apq::APQLayer;
+use super::layers::content_negociation;
+use super::layers::content_negociation::ACCEPTS_MULTIPART_CONTEXT_KEY;
+use super::layers::ensure_query_presence::EnsureQueryPresence;
+use super::new_service::ServiceFactory;
 use super::subgraph_service::MakeSubgraphService;
 use super::subgraph_service::SubgraphCreator;
 use super::ExecutionCreator;
 use super::ExecutionServiceFactory;
 use super::QueryPlannerContent;
-use crate::axum_factory::utils::accepts_multipart;
+use crate::cache::DeduplicatingCache;
 use crate::error::CacheResolverError;
 use crate::error::ServiceBuildError;
 use crate::graphql;
 use crate::graphql::IntoGraphQLErrors;
 use crate::introspection::Introspection;
+#[cfg(test)]
+use crate::plugin::test::MockSupergraphService;
 use crate::plugin::DynPlugin;
 use crate::plugins::traffic_shaping::TrafficShaping;
 use crate::plugins::traffic_shaping::APOLLO_TRAFFIC_SHAPING;
 use crate::query_planner::BridgeQueryPlanner;
 use crate::query_planner::CachingQueryPlanner;
-use crate::router_factory::Endpoint;
-use crate::router_factory::SupergraphServiceFactory;
-use crate::services::layers::ensure_query_presence::EnsureQueryPresence;
+use crate::supergraph;
 use crate::Configuration;
 use crate::Context;
+use crate::Endpoint;
 use crate::ExecutionRequest;
 use crate::ExecutionResponse;
 use crate::ListenAddr;
@@ -96,7 +100,7 @@ where
         let clone = self.query_planner_service.clone();
 
         let planning = std::mem::replace(&mut self.query_planner_service, clone);
-        let execution = self.execution_service_factory.new_service();
+        let execution = self.execution_service_factory.create();
 
         let schema = self.schema.clone();
 
@@ -176,6 +180,7 @@ where
                 graphql::Response::builder()
                     .errors(vec![crate::error::Error::builder()
                         .message(String::from("introspection has been disabled"))
+                        .extension_code("INTROSPECTION_DISABLED")
                         .build()])
                     .build(),
                 context,
@@ -187,10 +192,17 @@ where
         Some(QueryPlannerContent::Plan { plan }) => {
             let operation_name = body.operation_name.clone();
             let is_deferred = plan.is_deferred(operation_name.as_deref(), &variables);
-            if is_deferred && !accepts_multipart(req.supergraph_request.headers()) {
+
+            let accepts_multipart: bool = context
+                .get(ACCEPTS_MULTIPART_CONTEXT_KEY)
+                .unwrap_or_default()
+                .unwrap_or_default();
+
+            if is_deferred && !accepts_multipart {
                 let mut response = SupergraphResponse::new_from_graphql_response(graphql::Response::builder()
                     .errors(vec![crate::error::Error::builder()
                         .message(String::from("the router received a query with the @defer directive but the client does not accept multipart/mixed HTTP responses. To enable @defer support, add the HTTP header 'Accept: multipart/mixed; deferSpec=20220824'"))
+                        .extension_code("DEFER_BAD_HEADER")
                         .build()])
                     .build(), context);
                 *response.response.status_mut() = StatusCode::NOT_ACCEPTABLE;
@@ -216,10 +228,7 @@ where
 
                 Ok(SupergraphResponse {
                     context,
-                    response: http::Response::from_parts(
-                        parts,
-                        response_stream.in_current_span().boxed(),
-                    ),
+                    response: http::Response::from_parts(parts, response_stream.boxed()),
                 })
             }
         }
@@ -311,7 +320,7 @@ impl PluggableSupergraphServiceBuilder {
         self
     }
 
-    pub(crate) async fn build(self) -> Result<RouterCreator, crate::error::ServiceBuildError> {
+    pub(crate) async fn build(self) -> Result<SupergraphCreator, crate::error::ServiceBuildError> {
         // Note: The plugins are always applied in reverse, so that the
         // fold is applied in the correct sequence. We could reverse
         // the list of plugins, but we want them back in the original
@@ -346,55 +355,81 @@ impl PluggableSupergraphServiceBuilder {
             plugins.clone(),
         ));
 
-        Ok(RouterCreator {
+        let apq_layer = APQLayer::with_cache(
+            DeduplicatingCache::from_configuration(
+                &configuration.supergraph.apq.experimental_cache,
+                "APQ",
+            )
+            .await,
+        );
+
+        Ok(SupergraphCreator {
             query_planner_service,
             subgraph_creator,
+            apq_layer,
             schema: self.schema,
             plugins,
         })
     }
 }
 
+/// Factory for creating a RouterService
+///
+/// Instances of this traits are used by the HTTP server to generate a new
+/// RouterService on each request
+pub(crate) trait SupergraphFactory:
+    ServiceFactory<supergraph::Request, Service = Self::SupergraphService>
+    + Clone
+    + Send
+    + Sync
+    + 'static
+{
+    type SupergraphService: Service<
+            supergraph::Request,
+            Response = supergraph::Response,
+            Error = BoxError,
+            Future = Self::Future,
+        > + Send;
+    type Future: Send;
+
+    fn web_endpoints(&self) -> MultiMap<ListenAddr, Endpoint>;
+}
+
 /// A collection of services and data which may be used to create a "router".
 #[derive(Clone)]
-pub(crate) struct RouterCreator {
+pub(crate) struct SupergraphCreator {
     query_planner_service: CachingQueryPlanner<BridgeQueryPlanner>,
     subgraph_creator: Arc<SubgraphCreator>,
+    apq_layer: APQLayer,
     schema: Arc<Schema>,
     plugins: Arc<Plugins>,
 }
 
-impl NewService<SupergraphRequest> for RouterCreator {
-    type Service = BoxService<SupergraphRequest, SupergraphResponse, BoxError>;
-    fn new_service(&self) -> Self::Service {
-        self.make().boxed()
-    }
+pub(crate) trait HasPlugins {
+    fn plugins(&self) -> Arc<Plugins>;
 }
 
-impl SupergraphServiceFactory for RouterCreator {
-    type SupergraphService = BoxService<SupergraphRequest, SupergraphResponse, BoxError>;
-
-    type Future = <<RouterCreator as NewService<SupergraphRequest>>::Service as Service<
-        SupergraphRequest,
-    >>::Future;
+impl HasPlugins for SupergraphCreator {
+    fn plugins(&self) -> Arc<Plugins> {
+        self.plugins.clone()
+    }
+}
 
-    fn web_endpoints(&self) -> MultiMap<ListenAddr, Endpoint> {
-        let mut mm = MultiMap::new();
-        self.plugins
-            .values()
-            .for_each(|p| mm.extend(p.web_endpoints()));
-        mm
+impl ServiceFactory<supergraph::Request> for SupergraphCreator {
+    type Service = supergraph::BoxService;
+    fn create(&self) -> Self::Service {
+        self.make().boxed()
     }
 }
 
-impl RouterCreator {
+impl SupergraphCreator {
     pub(crate) fn make(
         &self,
     ) -> impl Service<
-        SupergraphRequest,
-        Response = SupergraphResponse,
+        supergraph::Request,
+        Response = supergraph::Response,
         Error = BoxError,
-        Future = BoxFuture<'static, Result<SupergraphResponse, BoxError>>,
+        Future = BoxFuture<'static, supergraph::ServiceResult>,
     > + Send {
         let supergraph_service = SupergraphService::builder()
             .query_planner_service(self.query_planner_service.clone())
@@ -417,30 +452,87 @@ impl RouterCreator {
         };
 
         ServiceBuilder::new()
+            .layer(self.apq_layer.clone())
+            .layer(content_negociation::SupergraphLayer::default())
             .layer(EnsureQueryPresence::default())
             .service(
                 self.plugins
                     .iter()
                     .rev()
-                    .fold(BoxService::new(supergraph_service), |acc, (_, e)| {
+                    .fold(supergraph_service.boxed(), |acc, (_, e)| {
                         e.supergraph_service(acc)
                     }),
             )
     }
 
+    pub(crate) async fn cache_keys(&self, count: usize) -> Vec<(String, Option<String>)> {
+        self.query_planner_service.cache_keys(count).await
+    }
+    pub(crate) async fn warm_up_query_planner(
+        &mut self,
+        cache_keys: Vec<(String, Option<String>)>,
+    ) {
+        self.query_planner_service.warm_up(cache_keys).await
+    }
+
     /// Create a test service.
     #[cfg(test)]
-    pub(crate) fn test_service(
-        &self,
-    ) -> tower::util::BoxCloneService<SupergraphRequest, SupergraphResponse, BoxError> {
-        use tower::buffer::Buffer;
+    pub(crate) async fn for_tests(
+        supergraph_service: MockSupergraphService,
+    ) -> MockSupergraphCreator {
+        MockSupergraphCreator::new(supergraph_service).await
+    }
+}
+
+#[cfg(test)]
+#[derive(Clone)]
+pub(crate) struct MockSupergraphCreator {
+    supergraph_service: MockSupergraphService,
+    plugins: Arc<Plugins>,
+}
+
+#[cfg(test)]
+impl MockSupergraphCreator {
+    pub(crate) async fn new(supergraph_service: MockSupergraphService) -> Self {
+        let canned_schema = include_str!("../../testing_schema.graphql");
+        let configuration = Configuration::builder().build().unwrap();
+
+        use crate::router_factory::create_plugins;
+        let plugins = create_plugins(
+            &configuration,
+            &Schema::parse(canned_schema, &configuration).unwrap(),
+            None,
+        )
+        .await
+        .unwrap()
+        .into_iter()
+        .collect();
+
+        Self {
+            supergraph_service,
+            plugins: Arc::new(plugins),
+        }
+    }
+}
 
-        Buffer::new(self.make(), 512).boxed_clone()
+#[cfg(test)]
+impl HasPlugins for MockSupergraphCreator {
+    fn plugins(&self) -> Arc<Plugins> {
+        self.plugins.clone()
+    }
+}
+
+#[cfg(test)]
+impl ServiceFactory<supergraph::Request> for MockSupergraphCreator {
+    type Service = supergraph::BoxService;
+    fn create(&self) -> Self::Service {
+        self.supergraph_service.clone().boxed()
     }
 }
 
 #[cfg(test)]
 mod tests {
+
     use super::*;
     use crate::plugin::test::MockSubgraph;
     use crate::services::supergraph;
@@ -461,16 +553,13 @@ mod tests {
    directive @join__graph(name: String!, url: String!) on ENUM_VALUE
    directive @inaccessible on OBJECT | FIELD_DEFINITION | INTERFACE | UNION
    scalar join__FieldSet
-
    enum join__Graph {
        USER @join__graph(name: "user", url: "http://localhost:4001/graphql")
        ORGA @join__graph(name: "orga", url: "http://localhost:4002/graphql")
    }
-
    type Query {
        currentUser: User @join__field(graph: USER)
    }
-
    type User
    @join__owner(graph: USER)
    @join__type(graph: ORGA, key: "id")
@@ -479,7 +568,6 @@ mod tests {
        name: String
        activeOrganization: Organization
    }
-
    type Organization
    @join__owner(graph: ORGA)
    @join__type(graph: ORGA, key: "id")
@@ -506,12 +594,13 @@ mod tests {
             .unwrap()
             .schema(SCHEMA)
             .extra_plugin(subgraphs)
-            .build()
+            .build_supergraph()
             .await
             .unwrap();
 
         let request = supergraph::Request::fake_builder()
             .query("query { currentUser { activeOrganization { id creatorUser { name } } } }")
+            .context(defer_context())
             // Request building here
             .build()
             .unwrap();
@@ -541,11 +630,12 @@ mod tests {
             .unwrap()
             .schema(SCHEMA)
             .extra_plugin(subgraphs)
-            .build()
+            .build_supergraph()
             .await
             .unwrap();
 
         let request = supergraph::Request::fake_builder()
+            .context(defer_context())
             .query(
                 "query { currentUser { activeOrganization { nonNullId creatorUser { name } } } }",
             )
@@ -598,12 +688,12 @@ mod tests {
             .unwrap()
             .schema(SCHEMA)
             .extra_plugin(subgraphs)
-            .build()
+            .build_supergraph()
             .await
             .unwrap();
 
         let request = supergraph::Request::fake_builder()
-            .header("Accept", "multipart/mixed; deferSpec=20220824")
+            .context(defer_context())
             .query("query { currentUser { id  ...@defer { name } } }")
             .build()
             .unwrap();
@@ -694,12 +784,12 @@ mod tests {
             .unwrap()
             .schema(schema)
             .extra_plugin(subgraphs)
-            .build()
+            .build_supergraph()
             .await
             .unwrap();
 
         let request = supergraph::Request::fake_builder()
-            .header("Accept", "multipart/mixed; deferSpec=20220824")
+            .context(defer_context())
             .query(
                 r#"query { 
                 computer(id: "Computer1") {   
@@ -784,13 +874,13 @@ mod tests {
             .unwrap()
             .schema(SCHEMA)
             .extra_plugin(subgraphs)
-            .build()
+            .build_supergraph()
             .await
             .unwrap();
 
         let request = supergraph::Request::fake_builder()
-            .header("Accept", "multipart/mixed; deferSpec=20220824")
-            .query(
+        .context(defer_context())
+        .query(
                 "query { currentUser { activeOrganization { id  suborga { id ...@defer { nonNullId } } } } }",
             )
             .build()
@@ -866,13 +956,13 @@ mod tests {
             .unwrap()
             .schema(SCHEMA)
             .extra_plugin(subgraphs)
-            .build()
+            .build_supergraph()
             .await
             .unwrap();
 
         let request = supergraph::Request::fake_builder()
-            .header("Accept", "multipart/mixed; deferSpec=20220824")
-            .query(
+        .context(defer_context())
+        .query(
                 "query { currentUser { activeOrganization { id  suborga { id ...@defer { name } } } } }",
             )
             .build()
@@ -938,12 +1028,12 @@ mod tests {
             .unwrap()
             .schema(SCHEMA)
             .extra_plugin(subgraphs)
-            .build()
+            .build_supergraph()
             .await
             .unwrap();
 
         let request = supergraph::Request::fake_builder()
-            .header("Accept", "multipart/mixed; deferSpec=20220824")
+            .context(defer_context())
             .query(
                 "query { __typename currentUser { activeOrganization { id  suborga { id ...@defer { name } } } } }",
             )
@@ -961,6 +1051,82 @@ mod tests {
         insta::assert_json_snapshot!(stream.next_response().await.unwrap());
     }
 
+    #[tokio::test]
+    async fn root_typename_with_defer_and_empty_first_response() {
+        let subgraphs = MockedSubgraphs([
+        ("user", MockSubgraph::builder().with_json(
+                serde_json::json!{{"query":"{currentUser{activeOrganization{__typename id}}}"}},
+                serde_json::json!{{"data": {"currentUser": { "activeOrganization": { "__typename": "Organization", "id": "0" } }}}}
+            ).build()),
+        ("orga", MockSubgraph::builder().with_json(
+            serde_json::json!{{
+                "query":"query($representations:[_Any!]!){_entities(representations:$representations){...on Organization{suborga{__typename id}}}}",
+                "variables": {
+                    "representations":[{"__typename": "Organization", "id":"0"}]
+                }
+            }},
+            serde_json::json!{{
+                "data": {
+                    "_entities": [{ "suborga": [
+                    { "__typename": "Organization", "id": "1"},
+                    { "__typename": "Organization", "id": "2"},
+                    { "__typename": "Organization", "id": "3"},
+                    ] }]
+                },
+                }}
+        )
+        .with_json(
+            serde_json::json!{{
+                "query":"query($representations:[_Any!]!){_entities(representations:$representations){...on Organization{name}}}",
+                "variables": {
+                    "representations":[
+                        {"__typename": "Organization", "id":"1"},
+                        {"__typename": "Organization", "id":"2"},
+                        {"__typename": "Organization", "id":"3"}
+
+                        ]
+                }
+            }},
+            serde_json::json!{{
+                "data": {
+                    "_entities": [
+                    { "__typename": "Organization", "id": "1"},
+                    { "__typename": "Organization", "id": "2", "name": "A"},
+                    { "__typename": "Organization", "id": "3"},
+                    ]
+                }
+                }}
+        ).build())
+    ].into_iter().collect());
+
+        let service = TestHarness::builder()
+            .configuration_json(serde_json::json!({"include_subgraph_errors": { "all": true } }))
+            .unwrap()
+            .schema(SCHEMA)
+            .extra_plugin(subgraphs)
+            .build_supergraph()
+            .await
+            .unwrap();
+
+        let request = supergraph::Request::fake_builder()
+            .context(defer_context())
+            .query(
+                "query { __typename ... @defer { currentUser { activeOrganization { id  suborga { id name } } } } }",
+            )
+            .build()
+            .unwrap();
+
+        let mut stream = service.oneshot(request).await.unwrap();
+        let res = stream.next_response().await.unwrap();
+        assert_eq!(
+            res.data.as_ref().unwrap().get("__typename"),
+            Some(&serde_json_bytes::Value::String("Query".into()))
+        );
+
+        // Must have 2 chunks
+        let _ = stream.next_response().await.unwrap();
+    }
+
     #[tokio::test]
     async fn root_typename_with_defer_in_defer() {
         let subgraphs = MockedSubgraphs([
@@ -992,12 +1158,12 @@ mod tests {
             .unwrap()
             .schema(SCHEMA)
             .extra_plugin(subgraphs)
-            .build()
+            .build_supergraph()
             .await
             .unwrap();
 
         let request = supergraph::Request::fake_builder()
-            .header("Accept", "multipart/mixed; deferSpec=20220824")
+            .context(defer_context())
             .query(
                 "query { ...@defer { __typename currentUser { activeOrganization { id  suborga { id name } } } } }",
             )
@@ -1093,12 +1259,12 @@ mod tests {
             .configuration_json(serde_json::json!({"include_subgraph_errors": { "all": true } }))
             .unwrap()
             .schema(schema)
-            .build()
+            .build_supergraph()
             .await
             .unwrap();
 
         let request = supergraph::Request::fake_builder()
-            .header("Accept", "multipart/mixed; deferSpec=20220824")
+            .context(defer_context())
             .query(
                 r#"mutation ($userId: ID!) {
                     makePayment(userId: $userId) {
@@ -1206,7 +1372,7 @@ mod tests {
             .unwrap()
             .schema(SCHEMA)
             .extra_plugin(subgraphs)
-            .build()
+            .build_supergraph()
             .await
             .unwrap();
 
@@ -1229,7 +1395,7 @@ mod tests {
                 }
             }"#,
             )
-            .header("Accept", "multipart/mixed; deferSpec=20220824")
+            .context(defer_context())
             .build()
             .unwrap();
         let mut response = service.oneshot(request).await.unwrap();
@@ -1357,12 +1523,12 @@ mod tests {
             .unwrap()
             .schema(schema)
             .extra_plugin(subgraphs)
-            .build()
+            .build_supergraph()
             .await
             .unwrap();
 
         let request = supergraph::Request::fake_builder()
-            .header("Accept", "multipart/mixed; deferSpec=20220824")
+            .context(defer_context())
             .query(
                 r#"query {
                     me {
@@ -1389,4 +1555,10 @@ mod tests {
         insta::assert_json_snapshot!(stream.next_response().await.unwrap());
         insta::assert_json_snapshot!(stream.next_response().await.unwrap());
     }
+
+    fn defer_context() -> Context {
+        let context = Context::new();
+        context.insert(ACCEPTS_MULTIPART_CONTEXT_KEY, true).unwrap();
+        context
+    }
 }
diff --git a/apollo-router/src/services/transport.rs b/apollo-router/src/services/transport.rs
index 23292a6359..b1e1fbccb1 100644
--- a/apollo-router/src/services/transport.rs
+++ b/apollo-router/src/services/transport.rs
@@ -1,9 +1,15 @@
-#![allow(missing_docs)] // FIXME
+#![allow(deprecated)]
+#![allow(missing_docs)]
 
 use tower::BoxError;
 
+#[deprecated = "use `apollo_router::services::router::Request` instead"]
 pub type Request = http::Request<hyper::Body>;
+#[deprecated = "use `apollo_router::services::router::Response` instead"]
 pub type Response = http::Response<hyper::Body>;
+#[deprecated = "use `apollo_router::services::router::BoxService` instead"]
 pub type BoxService = tower::util::BoxService<Request, Response, BoxError>;
+#[deprecated = "use `apollo_router::services::router::BoxCloneService` instead"]
 pub type BoxCloneService = tower::util::BoxCloneService<Request, Response, BoxError>;
+#[deprecated = "use `apollo_router::services::router::ServiceResult` instead"]
 pub type ServiceResult = Result<Response, BoxError>;
diff --git a/apollo-router/src/spec/mod.rs b/apollo-router/src/spec/mod.rs
index a39ee32d5f..1811669469 100644
--- a/apollo-router/src/spec/mod.rs
+++ b/apollo-router/src/spec/mod.rs
@@ -19,6 +19,9 @@ use serde::Deserialize;
 use serde::Serialize;
 use thiserror::Error;
 
+use crate::graphql::ErrorExtension;
+use crate::json_ext::Object;
+
 /// GraphQL parsing errors.
 #[derive(Error, Debug, Display, Clone, Serialize, Deserialize)]
 #[non_exhaustive]
@@ -43,3 +46,32 @@ impl SpecError {
         }
     }
 }
+
+impl ErrorExtension for SpecError {
+    fn extension_code(&self) -> String {
+        match self {
+            SpecError::RecursionLimitExceeded => "RECURSION_LIMIT_EXCEEDED",
+            SpecError::InvalidType(_) => "INVALID_TYPE",
+            SpecError::InvalidField(_, _) => "INVALID_FIELD",
+            SpecError::ParsingError(_) => "PARSING_ERROR",
+            SpecError::SubscriptionNotSupported => "SUBSCRIPTION_NOT_SUPPORTED",
+        }
+        .to_string()
+    }
+
+    fn custom_extension_details(&self) -> Option<Object> {
+        let mut obj = Object::new();
+        match self {
+            SpecError::InvalidType(ty) => {
+                obj.insert("type", ty.clone().into());
+            }
+            SpecError::InvalidField(field, ty) => {
+                obj.insert("type", ty.clone().into());
+                obj.insert("field", field.clone().into());
+            }
+            _ => (),
+        }
+
+        (!obj.is_empty()).then_some(obj)
+    }
+}
diff --git a/apollo-router/src/spec/query.rs b/apollo-router/src/spec/query.rs
index 3d08e23ec0..ac62c26d6e 100644
--- a/apollo-router/src/spec/query.rs
+++ b/apollo-router/src/spec/query.rs
@@ -105,113 +105,141 @@ impl Query {
         schema: &Schema,
     ) -> Vec<Path> {
         let data = std::mem::take(&mut response.data);
-        if let Some(Value::Object(mut input)) = data {
-            let original_operation = self.operation(operation_name);
-            if is_deferred {
-                if let Some(subselection) = &response.subselection {
-                    // Get subselection from hashmap
-                    match self.subselections.get(&SubSelection {
-                        path: response.path.clone().unwrap_or_default(),
-                        subselection: subselection.clone(),
-                    }) {
-                        Some(subselection_query) => {
-                            let mut output = Object::default();
-                            let operation = &subselection_query.operations[0];
-                            let mut parameters = FormatParameters {
-                                variables: &variables,
-                                schema,
-                                errors: Vec::new(),
-                                nullified: Vec::new(),
-                            };
-                            // Detect if root __typename is asked in the original query (the qp doesn't put root __typename in subselections)
-                            // cf https://github.com/apollographql/router/issues/1677
-                            let operation_kind_if_root_typename =
-                                original_operation.and_then(|op| {
-                                    op.selection_set
-                                        .iter()
-                                        .any(|f| f.is_typename_field())
-                                        .then(|| *op.kind())
-                                });
-                            if let Some(operation_kind) = operation_kind_if_root_typename {
-                                output.insert(TYPENAME, operation_kind.as_str().into());
-                            }
 
-                            response.data = Some(
-                                match self.apply_root_selection_set(
-                                    operation,
-                                    &mut parameters,
-                                    &mut input,
-                                    &mut output,
-                                    &mut Path::default(),
-                                ) {
-                                    Ok(()) => output.into(),
-                                    Err(InvalidValue) => Value::Null,
-                                },
-                            );
+        let original_operation = self.operation(operation_name);
+        match data {
+            Some(Value::Object(mut input)) => {
+                if is_deferred {
+                    if let Some(subselection) = &response.subselection {
+                        // Get subselection from hashmap
+                        match self.subselections.get(&SubSelection {
+                            path: response.path.clone().unwrap_or_default(),
+                            subselection: subselection.clone(),
+                        }) {
+                            Some(subselection_query) => {
+                                let mut output = Object::default();
+                                let operation = &subselection_query.operations[0];
+                                let mut parameters = FormatParameters {
+                                    variables: &variables,
+                                    schema,
+                                    errors: Vec::new(),
+                                    nullified: Vec::new(),
+                                };
+                                // Detect if root __typename is asked in the original query (the qp doesn't put root __typename in subselections)
+                                // cf https://github.com/apollographql/router/issues/1677
+                                let operation_kind_if_root_typename =
+                                    original_operation.and_then(|op| {
+                                        op.selection_set
+                                            .iter()
+                                            .any(|f| f.is_typename_field())
+                                            .then(|| *op.kind())
+                                    });
+                                if let Some(operation_kind) = operation_kind_if_root_typename {
+                                    output.insert(TYPENAME, operation_kind.as_str().into());
+                                }
 
-                            if !parameters.errors.is_empty() {
-                                if let Ok(value) = serde_json_bytes::to_value(&parameters.errors) {
-                                    response.extensions.insert("valueCompletion", value);
+                                response.data = Some(
+                                    match self.apply_root_selection_set(
+                                        operation,
+                                        &mut parameters,
+                                        &mut input,
+                                        &mut output,
+                                        &mut Path::default(),
+                                    ) {
+                                        Ok(()) => output.into(),
+                                        Err(InvalidValue) => Value::Null,
+                                    },
+                                );
+
+                                if !parameters.errors.is_empty() {
+                                    if let Ok(value) =
+                                        serde_json_bytes::to_value(&parameters.errors)
+                                    {
+                                        response.extensions.insert("valueCompletion", value);
+                                    }
                                 }
-                            }
 
-                            return parameters.nullified;
+                                return parameters.nullified;
+                            }
+                            None => {
+                                failfast_debug!("can't find subselection for {:?}", subselection)
+                            }
                         }
-                        None => failfast_debug!("can't find subselection for {:?}", subselection),
+                    // the primary query was empty, we return an empty object
+                    } else {
+                        response.data = Some(Value::Object(Object::default()));
+                        return vec![];
                     }
-                // the primary query was empty, we return an empty object
-                } else {
-                    response.data = Some(Value::Object(Object::default()));
-                    return vec![];
-                }
-            } else if let Some(operation) = original_operation {
-                let mut output = Object::default();
+                } else if let Some(operation) = original_operation {
+                    let mut output = Object::default();
 
-                let all_variables = if operation.variables.is_empty() {
-                    variables
-                } else {
-                    operation
-                        .variables
-                        .iter()
-                        .filter_map(|(k, Variable { default_value, .. })| {
-                            default_value.as_ref().map(|v| (k, v))
-                        })
-                        .chain(variables.iter())
-                        .map(|(k, v)| (k.clone(), v.clone()))
-                        .collect()
-                };
+                    let all_variables = if operation.variables.is_empty() {
+                        variables
+                    } else {
+                        operation
+                            .variables
+                            .iter()
+                            .filter_map(|(k, Variable { default_value, .. })| {
+                                default_value.as_ref().map(|v| (k, v))
+                            })
+                            .chain(variables.iter())
+                            .map(|(k, v)| (k.clone(), v.clone()))
+                            .collect()
+                    };
 
-                let mut parameters = FormatParameters {
-                    variables: &all_variables,
-                    schema,
-                    errors: Vec::new(),
-                    nullified: Vec::new(),
-                };
+                    let mut parameters = FormatParameters {
+                        variables: &all_variables,
+                        schema,
+                        errors: Vec::new(),
+                        nullified: Vec::new(),
+                    };
 
-                response.data = Some(
-                    match self.apply_root_selection_set(
-                        operation,
-                        &mut parameters,
-                        &mut input,
-                        &mut output,
-                        &mut Path::default(),
-                    ) {
-                        Ok(()) => output.into(),
-                        Err(InvalidValue) => Value::Null,
-                    },
-                );
-                if !parameters.errors.is_empty() {
-                    if let Ok(value) = serde_json_bytes::to_value(&parameters.errors) {
-                        response.extensions.insert("valueCompletion", value);
+                    response.data = Some(
+                        match self.apply_root_selection_set(
+                            operation,
+                            &mut parameters,
+                            &mut input,
+                            &mut output,
+                            &mut Path::default(),
+                        ) {
+                            Ok(()) => output.into(),
+                            Err(InvalidValue) => Value::Null,
+                        },
+                    );
+                    if !parameters.errors.is_empty() {
+                        if let Ok(value) = serde_json_bytes::to_value(&parameters.errors) {
+                            response.extensions.insert("valueCompletion", value);
+                        }
                     }
+
+                    return parameters.nullified;
+                } else {
+                    failfast_debug!("can't find operation for {:?}", operation_name);
                 }
+            }
+            Some(Value::Null) => {
+                // Detect if root __typename is asked in the original query (the qp doesn't put root __typename in subselections)
+                // cf https://github.com/apollographql/router/issues/1677
+                let operation_kind_if_root_typename = original_operation.and_then(|op| {
+                    op.selection_set
+                        .iter()
+                        .any(|f| f.is_typename_field())
+                        .then(|| *op.kind())
+                });
+                response.data = match operation_kind_if_root_typename {
+                    Some(operation_kind) => {
+                        let mut output = Object::default();
+                        output.insert(TYPENAME, operation_kind.as_str().into());
+                        Some(output.into())
+                    }
+                    None => Some(Value::default()),
+                };
 
-                return parameters.nullified;
-            } else {
-                failfast_debug!("can't find operation for {:?}", operation_name);
+                return vec![];
+            }
+            _ => {
+                failfast_debug!("invalid type for data in response. data: {:#?}", data);
             }
-        } else {
-            failfast_debug!("invalid type for data in response. data: {:#?}", data);
         }
 
         response.data = Some(Value::default());
@@ -976,10 +1004,6 @@ impl Query {
         response_path: Option<&Path>,
         path: &Path,
     ) -> bool {
-        println!(
-            "Query::contains_error_path: path = {path}, query: {}",
-            self.string,
-        );
         let operation = if let Some(subselection) = subselection {
             // Get subselection from hashmap
             match self.subselections.get(&SubSelection {
diff --git a/apollo-router/src/spec/query/tests.rs b/apollo-router/src/spec/query/tests.rs
index d22ef4be8d..5d1347f4d7 100644
--- a/apollo-router/src/spec/query/tests.rs
+++ b/apollo-router/src/spec/query/tests.rs
@@ -5086,3 +5086,119 @@ fn query_operation_nullification() {
         .expected(Value::Null)
         .test();
 }
+
+#[test]
+fn test_error_path_works_across_inline_fragments() {
+    let schema = Schema::parse(
+        r#"
+    schema
+        @link(url: "https://specs.apollo.dev/link/v1.0")
+        @link(url: "https://specs.apollo.dev/join/v0.2", for: EXECUTION)
+    {
+        query: Query
+    }
+
+    directive @join__field(graph: join__Graph!, requires: join__FieldSet, provides: join__FieldSet, type: String, external: Boolean, override: String, usedOverridden: Boolean) repeatable on FIELD_DEFINITION | INPUT_FIELD_DEFINITION
+    directive @join__graph(name: String!, url: String!) on ENUM_VALUE
+    directive @join__implements(graph: join__Graph!, interface: String!) repeatable on OBJECT | INTERFACE
+    directive @join__type(graph: join__Graph!, key: join__FieldSet, extension: Boolean! = false, resolvable: Boolean! = true) repeatable on OBJECT | INTERFACE | UNION | ENUM | INPUT_OBJECT | SCALAR
+    directive @link(url: String, as: String, for: link__Purpose, import: [link__Import]) repeatable on SCHEMA
+
+    scalar link__Import
+    scalar join__FieldSet
+    enum link__Purpose {
+        SECURITY
+        EXECUTION
+    }
+    enum join__Graph {
+        TEST @join__graph(name: "test", url: "http://localhost:4001/graphql")
+    }
+
+    type Query {
+        rootType: RootType
+    }
+
+    union RootType
+    @join__type(graph: TEST)
+    = MyFragment
+
+    type MyFragment
+    @join__type(graph: TEST)
+    {
+        edges: [MyFragmentEdge]
+    }
+
+    type MyFragmentEdge
+    @join__type(graph: TEST)
+    {
+      node: MyType
+    }
+
+    type MyType
+    @join__type(graph: TEST)
+    {
+        id: ID!
+        subType: MySubtype
+    }
+
+
+    type MySubtype
+    @join__type(graph: TEST)
+    {
+        edges: [MySubtypeEdge]
+    }
+
+    type MySubtypeEdge
+    @join__type(graph: TEST)
+    {
+      node: MyLeafType
+    }
+
+    type MyLeafType
+    @join__type(graph: TEST)
+    {
+        id: ID!
+        myField: String!
+    }
+"#,
+        &Default::default(),
+    )
+    .unwrap();
+
+    let query = Query::parse(
+        r#"query MyQueryThatContainsFragments {
+                rootType {
+                  ... on MyFragment {
+                    edges {
+                      node {
+                        id
+                        subType {
+                          __typename
+                          edges {
+                            __typename
+                            node {
+                              __typename
+                              id
+                              myField
+                            }
+                          }
+                        }
+                      }
+                      __typename
+                    }
+                    __typename
+                  }
+                }
+              }"#,
+        &schema,
+        &Default::default(),
+    )
+    .unwrap();
+
+    assert!(query.contains_error_path(
+        None,
+        None,
+        None,
+        &Path::from("rootType/edges/0/node/subType/edges/0/node/myField")
+    ));
+}
diff --git a/apollo-router/src/spec/selection.rs b/apollo-router/src/spec/selection.rs
index ddc57ceba0..d54ac708fd 100644
--- a/apollo-router/src/spec/selection.rs
+++ b/apollo-router/src/spec/selection.rs
@@ -390,7 +390,7 @@ impl Selection {
             (Some(PathElement::Key(_)), Selection::InlineFragment { selection_set, .. }) => {
                 selection_set
                     .iter()
-                    .any(|selection| selection.contains_error_path(&path[1..], fragments))
+                    .any(|selection| selection.contains_error_path(path, fragments))
             }
             (Some(PathElement::Fragment(_)), Selection::Field { .. }) => false,
         }
diff --git a/apollo-router/src/state_machine.rs b/apollo-router/src/state_machine.rs
index 714fb0e623..e9910cf9b5 100644
--- a/apollo-router/src/state_machine.rs
+++ b/apollo-router/src/state_machine.rs
@@ -23,8 +23,8 @@ use super::state_machine::State::Startup;
 use super::state_machine::State::Stopped;
 use crate::configuration::Configuration;
 use crate::configuration::ListenAddr;
-use crate::router_factory::SupergraphServiceConfigurator;
-use crate::router_factory::SupergraphServiceFactory;
+use crate::router_factory::RouterFactory;
+use crate::router_factory::RouterSuperServiceFactory;
 use crate::Schema;
 
 /// This state maintains private information that is not exposed to the user via state listener.
@@ -67,7 +67,7 @@ impl<T> Display for State<T> {
 pub(crate) struct StateMachine<S, FA>
 where
     S: HttpServerFactory,
-    FA: SupergraphServiceConfigurator,
+    FA: RouterSuperServiceFactory,
 {
     http_server_factory: S,
     router_configurator: FA,
@@ -82,8 +82,8 @@ where
 impl<S, FA> StateMachine<S, FA>
 where
     S: HttpServerFactory,
-    FA: SupergraphServiceConfigurator + Send,
-    FA::SupergraphServiceFactory: SupergraphServiceFactory,
+    FA: RouterSuperServiceFactory + Send,
+    FA::RouterFactory: RouterFactory,
 {
     pub(crate) fn new(http_server_factory: S, router_factory: FA) -> Self {
         let graphql_ready = Arc::new(RwLock::new(None));
@@ -262,7 +262,7 @@ where
 
     async fn maybe_update_listen_addresses(
         &mut self,
-        state: &mut State<<FA as SupergraphServiceConfigurator>::SupergraphServiceFactory>,
+        state: &mut State<<FA as RouterSuperServiceFactory>::RouterFactory>,
     ) {
         let (graphql_listen_address, extra_listen_addresses) =
             if let Running { server_handle, .. } = &state {
@@ -288,10 +288,10 @@ where
 
     async fn maybe_transition_to_running(
         &mut self,
-        state: State<<FA as SupergraphServiceConfigurator>::SupergraphServiceFactory>,
+        state: State<<FA as RouterSuperServiceFactory>::RouterFactory>,
     ) -> Result<
-        State<<FA as SupergraphServiceConfigurator>::SupergraphServiceFactory>,
-        State<<FA as SupergraphServiceConfigurator>::SupergraphServiceFactory>,
+        State<<FA as RouterSuperServiceFactory>::RouterFactory>,
+        State<<FA as RouterSuperServiceFactory>::RouterFactory>,
     > {
         if let Startup {
             configuration: Some(configuration),
@@ -351,13 +351,13 @@ where
         &mut self,
         configuration: Arc<Configuration>,
         schema: Arc<Schema>,
-        router_service: <FA as SupergraphServiceConfigurator>::SupergraphServiceFactory,
+        router_service: <FA as RouterSuperServiceFactory>::RouterFactory,
         server_handle: HttpServerHandle,
         new_configuration: Option<Arc<Configuration>>,
         new_schema: Option<Arc<Schema>>,
     ) -> Result<
-        State<<FA as SupergraphServiceConfigurator>::SupergraphServiceFactory>,
-        State<<FA as SupergraphServiceConfigurator>::SupergraphServiceFactory>,
+        State<<FA as RouterSuperServiceFactory>::RouterFactory>,
+        State<<FA as RouterSuperServiceFactory>::RouterFactory>,
     > {
         let new_schema = new_schema.unwrap_or_else(|| schema.clone());
         let new_configuration = new_configuration.unwrap_or_else(|| configuration.clone());
@@ -446,11 +446,11 @@ mod tests {
     use crate::http_server_factory::Listener;
     use crate::plugin::DynPlugin;
     use crate::router_factory::Endpoint;
-    use crate::router_factory::SupergraphServiceConfigurator;
-    use crate::router_factory::SupergraphServiceFactory;
-    use crate::services::new_service::NewService;
-    use crate::services::SupergraphRequest;
-    use crate::services::SupergraphResponse;
+    use crate::router_factory::RouterFactory;
+    use crate::router_factory::RouterSuperServiceFactory;
+    use crate::services::new_service::ServiceFactory;
+    use crate::services::RouterRequest;
+    use crate::services::RouterResponse;
 
     fn example_schema() -> String {
         include_str!("testdata/supergraph.graphql").to_owned()
@@ -651,8 +651,8 @@ mod tests {
         MyRouterConfigurator {}
 
         #[async_trait::async_trait]
-        impl SupergraphServiceConfigurator for MyRouterConfigurator {
-            type SupergraphServiceFactory = MockMyRouterFactory;
+        impl RouterSuperServiceFactory for MyRouterConfigurator {
+            type RouterFactory = MockMyRouterFactory;
 
             async fn create<'a>(
                 &'a mut self,
@@ -668,14 +668,14 @@ mod tests {
         #[derive(Debug)]
         MyRouterFactory {}
 
-        impl SupergraphServiceFactory for MyRouterFactory {
-            type SupergraphService = MockMyRouter;
-            type Future = <Self::SupergraphService as Service<SupergraphRequest>>::Future;
+        impl RouterFactory for MyRouterFactory {
+            type RouterService = MockMyRouter;
+            type Future = <Self::RouterService as Service<RouterRequest>>::Future;
             fn web_endpoints(&self) -> MultiMap<ListenAddr, Endpoint>;
         }
-        impl  NewService<SupergraphRequest> for MyRouterFactory {
+        impl ServiceFactory<RouterRequest> for MyRouterFactory {
             type Service = MockMyRouter;
-            fn new_service(&self) -> MockMyRouter;
+            fn create(&self) -> MockMyRouter;
         }
 
         impl Clone for MyRouterFactory {
@@ -687,7 +687,7 @@ mod tests {
         #[derive(Debug)]
         MyRouter {
             fn poll_ready(&mut self) -> Poll<Result<(), BoxError>>;
-            fn service_call(&mut self, req: SupergraphRequest) -> <MockMyRouter as Service<SupergraphRequest>>::Future;
+            fn service_call(&mut self, req: RouterRequest) -> <MockMyRouter as Service<RouterRequest>>::Future;
         }
 
         impl Clone for MyRouter {
@@ -696,15 +696,15 @@ mod tests {
     }
 
     //mockall does not handle well the lifetime on Context
-    impl Service<SupergraphRequest> for MockMyRouter {
-        type Response = SupergraphResponse;
+    impl Service<RouterRequest> for MockMyRouter {
+        type Response = RouterResponse;
         type Error = BoxError;
         type Future = BoxFuture<'static, Result<Self::Response, Self::Error>>;
 
         fn poll_ready(&mut self, _cx: &mut Context<'_>) -> Poll<Result<(), BoxError>> {
             self.poll_ready()
         }
-        fn call(&mut self, req: SupergraphRequest) -> Self::Future {
+        fn call(&mut self, req: RouterRequest) -> Self::Future {
             self.service_call(req)
         }
     }
@@ -731,7 +731,7 @@ mod tests {
             _web_endpoints: MultiMap<ListenAddr, Endpoint>,
         ) -> Self::Future
         where
-            RF: SupergraphServiceFactory,
+            RF: RouterFactory,
         {
             let res = self.create_server(configuration, main_listener);
             Box::pin(async move { res })
diff --git a/apollo-router/src/test_harness.rs b/apollo-router/src/test_harness.rs
index bb64a452fa..790e7d5d8d 100644
--- a/apollo-router/src/test_harness.rs
+++ b/apollo-router/src/test_harness.rs
@@ -2,23 +2,25 @@ use std::collections::HashMap;
 use std::sync::Arc;
 
 use tower::BoxError;
-use tower::Layer;
+use tower::ServiceBuilder;
 use tower::ServiceExt;
+use tower_http::trace::MakeSpan;
+use tracing_futures::Instrument;
 
-use crate::cache::DeduplicatingCache;
+use crate::axum_factory::utils::PropagatingMakeSpan;
 use crate::configuration::Configuration;
 use crate::plugin::test::canned;
 use crate::plugin::test::MockSubgraph;
 use crate::plugin::DynPlugin;
 use crate::plugin::Plugin;
 use crate::plugin::PluginInit;
-use crate::router_factory::SupergraphServiceConfigurator;
-use crate::router_factory::YamlSupergraphServiceFactory;
+use crate::router_factory::YamlRouterFactory;
 use crate::services::execution;
-use crate::services::layers::apq::APQLayer;
+use crate::services::router;
+use crate::services::router_service::RouterCreator;
 use crate::services::subgraph;
 use crate::services::supergraph;
-use crate::services::RouterCreator;
+use crate::services::SupergraphCreator;
 use crate::Schema;
 
 #[cfg(test)]
@@ -56,9 +58,9 @@ pub(crate) mod http_client;
 ///     .unwrap();
 /// let response = TestHarness::builder()
 ///     .configuration_json(config)?
-///     .build()
+///     .build_router()
 ///     .await?
-///     .oneshot(request)
+///     .oneshot(request.try_into().unwrap())
 ///     .await?
 ///     .next_response()
 ///     .await
@@ -135,6 +137,14 @@ impl<'a> TestHarness<'a> {
         self
     }
 
+    /// Adds a callback-based hook similar to [`Plugin::router_service`]
+    pub fn router_hook(
+        self,
+        callback: impl Fn(router::BoxService) -> router::BoxService + Send + Sync + 'static,
+    ) -> Self {
+        self.extra_plugin(RouterServicePlugin(callback))
+    }
+
     /// Adds a callback-based hook similar to [`Plugin::supergraph_service`]
     pub fn supergraph_hook(
         self,
@@ -170,7 +180,7 @@ impl<'a> TestHarness<'a> {
         self
     }
 
-    async fn build_common(self) -> Result<(Arc<Configuration>, RouterCreator), BoxError> {
+    async fn build_common(self) -> Result<(Arc<Configuration>, SupergraphCreator), BoxError> {
         let builder = if self.schema.is_none() {
             self.subgraph_hook(|subgraph_name, default| match subgraph_name {
                 "products" => canned::products_subgraph().boxed(),
@@ -199,50 +209,55 @@ impl<'a> TestHarness<'a> {
         let canned_schema = include_str!("../testing_schema.graphql");
         let schema = builder.schema.unwrap_or(canned_schema);
         let schema = Arc::new(Schema::parse(schema, &config)?);
-        let router_creator = YamlSupergraphServiceFactory
-            .create(config.clone(), schema, None, Some(builder.extra_plugins))
+        let supergraph_creator = YamlRouterFactory
+            .create_supergraph(config.clone(), schema, None, Some(builder.extra_plugins))
             .await?;
 
-        Ok((config, router_creator))
+        Ok((config, supergraph_creator))
     }
 
-    /// Builds the GraphQL service
+    /// Builds the supergraph service
+    #[deprecated = "use build_supergraph instead"]
     pub async fn build(self) -> Result<supergraph::BoxCloneService, BoxError> {
-        let (configuration, router_creator) = self.build_common().await?;
-        let apq = APQLayer::with_cache(
-            DeduplicatingCache::from_configuration(
-                &configuration.supergraph.apq.experimental_cache,
-                "APQ",
-            )
-            .await,
-        );
+        self.build_supergraph().await
+    }
+
+    /// Builds the supergraph service
+    pub async fn build_supergraph(self) -> Result<supergraph::BoxCloneService, BoxError> {
+        let (_config, supergraph_creator) = self.build_common().await?;
 
         Ok(tower::service_fn(move |request| {
-            // APQ must be added here because it is implemented in the HTTP server
-            let service = apq.layer(router_creator.make()).boxed();
+            let router = supergraph_creator.make();
 
-            async move { service.oneshot(request).await }
+            async move { router.oneshot(request).await }
+        })
+        .boxed_clone())
+    }
+
+    /// Builds the router service
+    pub async fn build_router(self) -> Result<router::BoxCloneService, BoxError> {
+        let (config, supergraph_creator) = self.build_common().await?;
+        let router_creator = RouterCreator::new(Arc::new(supergraph_creator), &config);
+
+        Ok(tower::service_fn(move |request: router::Request| {
+            let router = ServiceBuilder::new().service(router_creator.make()).boxed();
+            let span = PropagatingMakeSpan::default().make_span(&request.router_request);
+            async move { router.oneshot(request).await }.instrument(span)
         })
         .boxed_clone())
     }
 
     #[cfg(test)]
     pub(crate) async fn build_http_service(self) -> Result<HttpService, BoxError> {
-        use crate::axum_factory::make_axum_router;
+        use crate::axum_factory::tests::make_axum_router;
         use crate::axum_factory::ListenAddrAndRouter;
-        use crate::router_factory::SupergraphServiceFactory;
+        use crate::router_factory::RouterFactory;
 
-        let (config, router_creator) = self.build_common().await?;
+        let (config, supergraph_creator) = self.build_common().await?;
+        let router_creator = RouterCreator::new(Arc::new(supergraph_creator), &config);
         let web_endpoints = router_creator.web_endpoints();
-        let apq = APQLayer::with_cache(
-            DeduplicatingCache::from_configuration(
-                &config.supergraph.apq.experimental_cache,
-                "APQ",
-            )
-            .await,
-        );
 
-        let routers = make_axum_router(router_creator, &config, web_endpoints, apq)?;
+        let routers = make_axum_router(router_creator, &config, web_endpoints)?;
         let ListenAddrAndRouter(_listener, router) = routers.main;
         Ok(router.boxed())
     }
@@ -256,10 +271,27 @@ pub(crate) type HttpService = tower::util::BoxService<
     std::convert::Infallible,
 >;
 
+struct RouterServicePlugin<F>(F);
 struct SupergraphServicePlugin<F>(F);
 struct ExecutionServicePlugin<F>(F);
 struct SubgraphServicePlugin<F>(F);
 
+#[async_trait::async_trait]
+impl<F> Plugin for RouterServicePlugin<F>
+where
+    F: 'static + Send + Sync + Fn(router::BoxService) -> router::BoxService,
+{
+    type Config = ();
+
+    async fn new(_: PluginInit<Self::Config>) -> Result<Self, BoxError> {
+        unreachable!()
+    }
+
+    fn router_service(&self, service: router::BoxService) -> router::BoxService {
+        (self.0)(service)
+    }
+}
+
 #[async_trait::async_trait]
 impl<F> Plugin for SupergraphServicePlugin<F>
 where
diff --git a/apollo-router/src/test_harness/http_client.rs b/apollo-router/src/test_harness/http_client.rs
index 079a4ab78c..f08ec13423 100644
--- a/apollo-router/src/test_harness/http_client.rs
+++ b/apollo-router/src/test_harness/http_client.rs
@@ -8,9 +8,11 @@ use futures::stream::poll_fn;
 use futures::Future;
 use futures::Stream;
 use futures::StreamExt;
+use http::HeaderValue;
 use http_body::Body;
 use mediatype::MediaType;
 use mediatype::ReadParams;
+use mime::APPLICATION_JSON;
 use tokio::io::AsyncRead;
 use tokio::io::AsyncReadExt;
 use tokio_util::io::StreamReader;
@@ -248,9 +250,10 @@ where
 {
     ServiceBuilder::new()
         .map_request(|mut request: http::Request<serde_json::Value>| {
-            request
-                .headers_mut()
-                .insert("content-type", "application/json".try_into().unwrap());
+            request.headers_mut().insert(
+                "content-type",
+                HeaderValue::from_static(APPLICATION_JSON.essence_str()),
+            );
             request.map(|body| serde_json::to_vec(&body).unwrap().into())
         })
         .map_response(|response: http::Response<MaybeMultipart<Vec<u8>>>| {
@@ -259,7 +262,7 @@ where
                 MaybeMultipart::NotMultipart(bytes) => {
                     assert_eq!(
                         parts.headers.get("content-type").unwrap(),
-                        "application/json"
+                        APPLICATION_JSON.essence_str()
                     );
                     MaybeMultipart::NotMultipart(serde_json::from_slice(&bytes).unwrap())
                 }
diff --git a/apollo-router/src/tracer.rs b/apollo-router/src/tracer.rs
index 59130f34c3..93758d892a 100644
--- a/apollo-router/src/tracer.rs
+++ b/apollo-router/src/tracer.rs
@@ -5,12 +5,13 @@ use std::fmt;
 
 use opentelemetry::trace::TraceContextExt;
 use opentelemetry::trace::TraceId as OtelTraceId;
+use serde::Deserialize;
 use serde::Serialize;
 use tracing::Span;
 use tracing_opentelemetry::OpenTelemetrySpanExt;
 
 /// Trace ID
-#[derive(Clone, Debug, PartialEq, Eq, Serialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
 pub struct TraceId([u8; 16]);
 
 impl TraceId {
diff --git a/apollo-router/src/uplink/mod.rs b/apollo-router/src/uplink/mod.rs
index 1c9f55b9e8..e9318bdacb 100644
--- a/apollo-router/src/uplink/mod.rs
+++ b/apollo-router/src/uplink/mod.rs
@@ -56,6 +56,7 @@ pub(crate) fn stream_supergraph(
     graph_ref: String,
     urls: Option<Vec<Url>>,
     mut interval: Duration,
+    timeout: Duration,
 ) -> impl Stream<Item = Result<Schema, String>> {
     let (sender, receiver) = channel(2);
     let _ = tokio::task::spawn(async move {
@@ -63,11 +64,14 @@ pub(crate) fn stream_supergraph(
         let mut current_url_idx = 0;
 
         loop {
+            let mut nb_errors = 0usize;
             match fetch_supergraph(
+                &mut nb_errors,
                 api_key.to_string(),
                 graph_ref.to_string(),
                 composition_id.clone(),
                 urls.as_ref().map(|u| &u[current_url_idx]),
+                timeout
             )
             .await
             {
@@ -120,7 +124,6 @@ pub(crate) fn stream_supergraph(
                     }
                 },
                 Err(err) => {
-                    tracing::error!("error fetching supergraph from Uplink: {:?}", err);
                     if let Some(urls) = &urls {
                         current_url_idx = (current_url_idx + 1) % urls.len();
                     }
@@ -137,10 +140,12 @@ pub(crate) fn stream_supergraph(
 }
 
 pub(crate) async fn fetch_supergraph(
+    nb_errors: &mut usize,
     api_key: String,
     graph_ref: String,
     composition_id: Option<String>,
     url: Option<&Url>,
+    timeout: Duration,
 ) -> Result<supergraph_sdl::ResponseData, Error> {
     let variables = supergraph_sdl::Variables {
         api_key,
@@ -150,12 +155,23 @@ pub(crate) async fn fetch_supergraph(
     let request_body = SupergraphSdl::build_query(variables);
 
     let response = match url {
-        Some(url) => http_request(url.as_str(), &request_body).await?,
-        None => match http_request(GCP_URL, &request_body).await {
-            Ok(response) => response,
+        Some(url) => http_request(url.as_str(), &request_body, timeout).await?,
+        None => match http_request(GCP_URL, &request_body, timeout).await {
+            Ok(response) => {
+                if *nb_errors > 0 {
+                    *nb_errors = 0;
+                    tracing::info!("successfully retrieved the schema from GCP");
+                }
+                response
+            }
             Err(e) => {
-                tracing::error!("could not get schema from GCP, trying AWS: {:?}", e);
-                http_request(AWS_URL, &request_body).await?
+                if *nb_errors == 3 {
+                    tracing::error!("could not get schema from GCP, trying AWS: {:?}", e);
+                } else {
+                    tracing::debug!("could not get schema from GCP, trying AWS: {:?}", e);
+                }
+                *nb_errors += 1;
+                http_request(AWS_URL, &request_body, timeout).await?
             }
         },
     };
@@ -169,8 +185,9 @@ pub(crate) async fn fetch_supergraph(
 async fn http_request(
     url: &str,
     request_body: &QueryBody<supergraph_sdl::Variables>,
+    timeout: Duration,
 ) -> Result<Response<supergraph_sdl::ResponseData>, reqwest::Error> {
-    let client = reqwest::Client::new();
+    let client = reqwest::Client::builder().timeout(timeout).build()?;
 
     let res = client.post(url).json(request_body).send().await?;
     let response_body: Response<supergraph_sdl::ResponseData> = res.json().await?;
@@ -189,8 +206,7 @@ fn test_uplink_schema_is_up_to_date() {
     let client = GraphQLClient::new(
         "https://uplink.api.apollographql.com/",
         reqwest::blocking::Client::new(),
-    )
-    .unwrap();
+    );
 
     let should_retry = true;
     let introspection_response = introspect::run(
diff --git a/apollo-router/tests/apollo_reports.rs b/apollo-router/tests/apollo_reports.rs
new file mode 100644
index 0000000000..ca9f83bc7e
--- /dev/null
+++ b/apollo-router/tests/apollo_reports.rs
@@ -0,0 +1,338 @@
+use std::io::Read;
+use std::sync::Arc;
+use std::time::Duration;
+
+use anyhow::anyhow;
+use apollo_router::services::router;
+use apollo_router::services::router::BoxCloneService;
+use apollo_router::services::supergraph;
+use apollo_router::TestHarness;
+use axum::routing::post;
+use axum::Extension;
+use axum::Json;
+use bytes::Bytes;
+use flate2::read::GzDecoder;
+use http::header::ACCEPT;
+use once_cell::sync::Lazy;
+use prost::Message;
+use tokio::sync::Mutex;
+use tower::Service;
+use tower::ServiceExt;
+use tower_http::decompression::DecompressionLayer;
+
+use crate::proto::reports::Report;
+
+static REPORTS: Lazy<Arc<Mutex<Vec<Report>>>> = Lazy::new(Default::default);
+static TEST: Lazy<Arc<Mutex<bool>>> = Lazy::new(Default::default);
+static ROUTER_SERVICE_RUNTIME: Lazy<Arc<tokio::runtime::Runtime>> = Lazy::new(|| {
+    Arc::new(tokio::runtime::Runtime::new().expect("must be able to create tokio runtime"))
+});
+static ROUTER_SERVICE: Lazy<Arc<Mutex<Option<BoxCloneService>>>> = Lazy::new(Default::default);
+
+async fn get_router_service() -> BoxCloneService {
+    let mut router_service = ROUTER_SERVICE.lock().await;
+    if router_service.is_none() {
+        let reports = &*REPORTS;
+        std::env::set_var("APOLLO_KEY", "test");
+        std::env::set_var("APOLLO_GRAPH_REF", "test");
+
+        let listener = std::net::TcpListener::bind("127.0.0.1:0").unwrap();
+        let addr = listener.local_addr().unwrap();
+        let app = axum::Router::new()
+            .route("/", post(report))
+            .layer(DecompressionLayer::new())
+            .layer(tower_http::add_extension::AddExtensionLayer::new(
+                reports.clone(),
+            ));
+
+        let mut config: serde_json::Value =
+            serde_yaml::from_str(include_str!("fixtures/apollo_reports.router.yaml"))
+                .expect("apollo_reports.router.yaml was invalid");
+        config = jsonpath_lib::replace_with(config, "$.telemetry.apollo.endpoint", &mut |_| {
+            Some(serde_json::Value::String(format!("http://{}", addr)))
+        })
+        .expect("Could not sub in endpoint");
+
+        let _ = ROUTER_SERVICE_RUNTIME.spawn(async move {
+            axum::Server::from_tcp(listener)
+                .expect("mut be able to crete report receiver")
+                .serve(app.into_make_service())
+                .await
+                .expect("could not start axum server")
+        });
+
+        *router_service = Some(
+            ROUTER_SERVICE_RUNTIME
+                .spawn(async {
+                    TestHarness::builder()
+                        .configuration_json(config)
+                        .expect("test harness had config errors")
+                        .schema(include_str!("fixtures/supergraph.graphql"))
+                        .with_subgraph_network_requests()
+                        .build_router()
+                        .await
+                        .expect("could create router test harness")
+                })
+                .await
+                .expect("must be able to create router"),
+        );
+    }
+    router_service
+        .clone()
+        .expect("router service must have got created")
+}
+
+macro_rules! assert_report {
+        ($report: expr)=> {
+            insta::with_settings!({sort_maps => true}, {
+                    insta::assert_yaml_snapshot!($report, {
+                        ".**.agent_version" => "[agent_version]",
+                        ".**.executable_schema_id" => "[executable_schema_id]",
+                        ".header.hostname" => "[hostname]",
+                        ".header.uname" => "[uname]",
+                        ".**.seconds" => "[seconds]",
+                        ".**.nanos" => "[nanos]",
+                        ".**.duration_ns" => "[duration_ns]",
+                        ".**.child[].start_time" => "[start_time]",
+                        ".**.child[].end_time" => "[end_time]",
+                        ".**.trace_id.value[]" => "[trace_id]",
+                        ".**.sent_time_offset" => "[sent_time_offset]",
+                        ".**.my_trace_id" => "[my_trace_id]",
+                        ".**.latency_count" => "[latency_count]",
+                        ".**.cache_latency_count" => "[cache_latency_count]",
+                        ".**.public_cache_ttl_count" => "[public_cache_ttl_count]",
+                        ".**.private_cache_ttl_count" => "[private_cache_ttl_count]",
+                    });
+                });
+        }
+    }
+
+pub(crate) mod plugins {
+    pub(crate) mod telemetry {
+        pub(crate) mod apollo_exporter {
+            use serde::ser::SerializeStruct;
+
+            pub(crate) fn serialize_timestamp<S>(
+                timestamp: &Option<prost_types::Timestamp>,
+                serializer: S,
+            ) -> Result<S::Ok, S::Error>
+            where
+                S: serde::Serializer,
+            {
+                match timestamp {
+                    Some(ts) => {
+                        let mut ts_strukt = serializer.serialize_struct("Timestamp", 2)?;
+                        ts_strukt.serialize_field("seconds", &ts.seconds)?;
+                        ts_strukt.serialize_field("nanos", &ts.nanos)?;
+                        ts_strukt.end()
+                    }
+                    None => serializer.serialize_none(),
+                }
+            }
+        }
+    }
+}
+
+#[allow(unreachable_pub)]
+pub(crate) mod proto {
+    pub(crate) mod reports {
+        #![allow(clippy::derive_partial_eq_without_eq)]
+        tonic::include_proto!("reports");
+    }
+}
+
+async fn report(
+    bytes: Bytes,
+    Extension(state): Extension<Arc<Mutex<Vec<Report>>>>,
+) -> Result<Json<()>, http::StatusCode> {
+    let mut gz = GzDecoder::new(&*bytes);
+    let mut buf = Vec::new();
+    gz.read_to_end(&mut buf)
+        .expect("could not decompress bytes");
+    let report = Report::decode(&*buf).expect("could not deserialize report");
+    state.lock().await.push(report);
+    Ok(Json(()))
+}
+
+async fn get_trace_report(request: supergraph::Request) -> Report {
+    get_report(request, |r| {
+        !r.traces_per_query
+            .values()
+            .next()
+            .expect("traces and stats required")
+            .trace
+            .is_empty()
+    })
+    .await
+}
+
+async fn get_metrics_report(request: supergraph::Request) -> Report {
+    get_report(request, |r| {
+        !r.traces_per_query
+            .values()
+            .next()
+            .expect("traces and stats required")
+            .stats_with_context
+            .is_empty()
+    })
+    .await
+}
+
+async fn get_report<T: Fn(&&Report) -> bool + Send + Sync + Copy + 'static>(
+    request: supergraph::Request,
+    filter: T,
+) -> Report {
+    ROUTER_SERVICE_RUNTIME
+        .spawn(async move {
+            let mut found_report;
+            {
+                let _test_guard = TEST.lock().await;
+                {
+                    REPORTS.clone().lock().await.clear();
+                }
+                let req: router::Request = request.try_into().expect("could not convert request");
+
+                let response = get_router_service()
+                    .await
+                    .ready()
+                    .await
+                    .expect("router service was never ready")
+                    .call(req)
+                    .await
+                    .expect("router service call failed");
+
+                // Drain the response
+                found_report = match hyper::body::to_bytes(response.response.into_body())
+                    .await
+                    .map(|b| String::from_utf8(b.to_vec()))
+                {
+                    Ok(Ok(response)) => {
+                        if response.contains("errors") {
+                            eprintln!("response had errors {}", response);
+                        }
+                        Ok(None)
+                    }
+                    _ => Err(anyhow!("error retrieving response")),
+                };
+
+                // We must always try to find the report regardless of if the response had failures
+                for _ in 0..10 {
+                    let reports = REPORTS.lock().await;
+                    let report = reports.iter().find(filter);
+                    if report.is_some() {
+                        if matches!(found_report, Ok(None)) {
+                            found_report = Ok(report.cloned());
+                        }
+                        break;
+                    }
+                    drop(reports);
+                    tokio::time::sleep(Duration::from_millis(100)).await;
+                }
+            }
+
+            found_report
+        })
+        .await
+        .expect("failed to get report")
+        .expect("failed to get report")
+        .expect("failed to find report")
+}
+#[tokio::test(flavor = "multi_thread")]
+async fn non_defer() {
+    let request = supergraph::Request::fake_builder()
+        .query("query{topProducts{name reviews {author{name}} reviews{author{name}}}}")
+        .build()
+        .unwrap();
+    let report = get_trace_report(request).await;
+    assert_report!(report);
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_condition_if() {
+    let request = supergraph::Request::fake_builder()
+        .query("query($if: Boolean!) {topProducts {  name    ... @defer(if: $if) {  reviews {    author {      name    }  }  reviews {    author {      name    }  }    }}}")
+        .variable("if", true)
+        .header(ACCEPT, "multipart/mixed; deferSpec=20220824")
+        .build()
+        .unwrap();
+    let report = get_trace_report(request).await;
+    assert_report!(report);
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_condition_else() {
+    let request = supergraph::Request::fake_builder()
+        .query("query($if: Boolean!) {topProducts {  name    ... @defer(if: $if) {  reviews {    author {      name    }  }  reviews {    author {      name    }  }    }}}")
+        .variable("if", false)
+        .header(ACCEPT, "multipart/mixed; deferSpec=20220824")
+        .build()
+        .unwrap();
+    let report = get_trace_report(request).await;
+    assert_report!(report);
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_trace_id() {
+    let request = supergraph::Request::fake_builder()
+        .query("query{topProducts{name reviews {author{name}} reviews{author{name}}}}")
+        .build()
+        .unwrap();
+    let report = get_trace_report(request).await;
+    assert_report!(report);
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_client_name() {
+    let request = supergraph::Request::fake_builder()
+        .query("query{topProducts{name reviews {author{name}} reviews{author{name}}}}")
+        .header("apollographql-client-name", "my client")
+        .build()
+        .unwrap();
+    let report = get_trace_report(request).await;
+    assert_report!(report);
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_client_version() {
+    let request = supergraph::Request::fake_builder()
+        .query("query{topProducts{name reviews {author{name}} reviews{author{name}}}}")
+        .header("apollographql-client-version", "my client version")
+        .build()
+        .unwrap();
+    let report = get_trace_report(request).await;
+    assert_report!(report);
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_send_header() {
+    let request = supergraph::Request::fake_builder()
+        .query("query{topProducts{name reviews {author{name}} reviews{author{name}}}}")
+        .header("send-header", "Header value")
+        .header("dont-send-header", "Header value")
+        .build()
+        .unwrap();
+    let report = get_trace_report(request).await;
+    assert_report!(report);
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_send_variable_value() {
+    let request = supergraph::Request::fake_builder()
+        .query("query($sendValue:Boolean!, $dontSendValue: Boolean!){topProducts{name reviews @include(if: $sendValue) {author{name}} reviews @include(if: $dontSendValue){author{name}}}}")
+        .variable("sendValue", true)
+        .variable("dontSendValue", true)
+        .build()
+        .unwrap();
+    let report = get_trace_report(request).await;
+    assert_report!(report);
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_stats() {
+    let request = supergraph::Request::fake_builder()
+        .query("query{topProducts{name reviews {author{name}} reviews{author{name}}}}")
+        .build()
+        .unwrap();
+    let report = get_metrics_report(request).await;
+    assert_report!(report);
+}
diff --git a/apollo-router/tests/common.rs b/apollo-router/tests/common.rs
index b67b44d5b4..d4d5d313a4 100644
--- a/apollo-router/tests/common.rs
+++ b/apollo-router/tests/common.rs
@@ -10,6 +10,7 @@ use std::time::Duration;
 use http::header::ACCEPT;
 use http::header::CONTENT_TYPE;
 use jsonpath_lib::Selector;
+use mime::APPLICATION_JSON;
 use opentelemetry::global;
 use opentelemetry::propagation::TextMapPropagator;
 use opentelemetry::sdk::trace::Tracer;
@@ -95,7 +96,7 @@ impl TracingTest {
         for _i in 0..100 {
             let mut request = client
                 .post("http://localhost:4000")
-                .header(CONTENT_TYPE, "application/json")
+                .header(CONTENT_TYPE, APPLICATION_JSON.essence_str())
                 .header("apollographql-client-name", "custom_name")
                 .header("apollographql-client-version", "1.0")
                 .json(&json!({"query":"{topProducts{name}}","variables":{}}))
diff --git a/apollo-router/tests/fixtures/apollo_reports.router.yaml b/apollo-router/tests/fixtures/apollo_reports.router.yaml
new file mode 100644
index 0000000000..0e0a2b5f03
--- /dev/null
+++ b/apollo-router/tests/fixtures/apollo_reports.router.yaml
@@ -0,0 +1,25 @@
+include_subgraph_errors:
+  all: true
+telemetry:
+  tracing:
+    experimental_response_trace_id:
+      enabled: true
+      header_name: "my_trace_id"
+    trace_config:
+      sampler: always_on
+
+  apollo:
+    client_name_header: apollographql-client-name
+    client_version_header: apollographql-client-version
+    endpoint: ENDPOINT
+    batch_processor:
+      scheduled_delay: 10ms
+    field_level_instrumentation_sampler: always_on
+    send_headers:
+      only:
+        - "send-header"
+    send_variable_values:
+      only:
+        - "sendValue"
+
+
diff --git a/apollo-router/tests/infrastructure_tests.rs b/apollo-router/tests/infrastructure_tests.rs
index c88fa14557..e4a95f165a 100644
--- a/apollo-router/tests/infrastructure_tests.rs
+++ b/apollo-router/tests/infrastructure_tests.rs
@@ -4,7 +4,7 @@ async fn test_starstuff_supergraph_is_valid() {
     let schema = include_str!("../../examples/graphql/supergraph.graphql");
     apollo_router::TestHarness::builder()
         .schema(schema)
-        .build()
+        .build_router()
         .await
         .expect(
             r#"Couldn't parse the supergraph example.
diff --git a/apollo-router/tests/integration_tests.rs b/apollo-router/tests/integration_tests.rs
index 04b2ff4990..617c2e2ee7 100644
--- a/apollo-router/tests/integration_tests.rs
+++ b/apollo-router/tests/integration_tests.rs
@@ -7,19 +7,24 @@ use std::collections::HashMap;
 use std::sync::Arc;
 use std::sync::Mutex;
 
+use apollo_router::Context;
 use apollo_router::_private::TelemetryPlugin;
 use apollo_router::graphql;
 use apollo_router::plugin::Plugin;
 use apollo_router::plugin::PluginInit;
+use apollo_router::services::router;
 use apollo_router::services::subgraph;
 use apollo_router::services::supergraph;
+use futures::StreamExt;
 use http::header::ACCEPT;
 use http::header::CONTENT_TYPE;
 use http::Method;
 use http::StatusCode;
+use http::Uri;
 use insta::internals::Content;
 use insta::internals::Redaction;
 use maplit::hashmap;
+use mime::APPLICATION_JSON;
 use serde_json::to_string_pretty;
 use serde_json_bytes::json;
 use serde_json_bytes::Value;
@@ -165,12 +170,19 @@ async fn basic_mutation() {
 
 #[tokio::test(flavor = "multi_thread")]
 async fn queries_should_work_over_get() {
-    let request = supergraph::Request::fake_builder()
-        .query(r#"{ topProducts { upc name reviews {id product { name } author { id name } } } }"#)
-        .variable("topProductsFirst", 2_i32)
-        .variable("reviewsForAuthorAuthorId", 1_i32)
+    // get request
+    let get_request = supergraph::Request::builder()
+        .query("{ topProducts { upc name reviews {id product { name } author { id name } } } }")
+        .variable("topProductsFirst", 2_usize)
+        .variable("reviewsForAuthorAuthorId", 1_usize)
+        .header(CONTENT_TYPE, APPLICATION_JSON.essence_str())
+        .uri(Uri::from_static("/"))
+        .method(Method::GET)
+        .context(Context::new())
         .build()
-        .expect("expecting valid request");
+        .unwrap()
+        .try_into()
+        .unwrap();
 
     let expected_service_hits = hashmap! {
         "products".to_string()=>2,
@@ -178,8 +190,13 @@ async fn queries_should_work_over_get() {
         "accounts".to_string()=>1,
     };
 
-    let (actual, registry) = query_rust(request).await;
-
+    let (actual, registry) = {
+        let (router, counting_registry) = setup_router_and_registry(serde_json::json!({})).await;
+        (
+            query_with_router(router, get_request).await,
+            counting_registry,
+        )
+    };
     assert_eq!(0, actual.errors.len());
     assert_eq!(registry.totals(), expected_service_hits);
 }
@@ -190,20 +207,32 @@ async fn simple_queries_should_not_work() {
     Please either specify a 'content-type' header \
     (with a mime-type that is not one of application/x-www-form-urlencoded, multipart/form-data, text/plain) \
     or provide one of the following headers: x-apollo-operation-name, apollo-require-preflight";
-    let expected_error = graphql::Error::builder().message(message).build();
+    let expected_error = graphql::Error::builder()
+        .message(message)
+        .extension_code("CSRF_ERROR")
+        .build();
 
-    let mut request = supergraph::Request::fake_builder()
-        .query(r#"{ topProducts { upc name reviews {id product { name } author { id name } } } }"#)
-        .variable("topProductsFirst", 2_i32)
-        .variable("reviewsForAuthorAuthorId", 1_i32)
+    let mut get_request: router::Request = supergraph::Request::builder()
+        .query("{ topProducts { upc name reviews {id product { name } author { id name } } } }")
+        .variable("topProductsFirst", 2_usize)
+        .variable("reviewsForAuthorAuthorId", 1_usize)
+        .header(CONTENT_TYPE, APPLICATION_JSON.essence_str())
+        .uri(Uri::from_static("/"))
+        .method(Method::GET)
+        .context(Context::new())
         .build()
-        .expect("expecting valid request");
-    request
-        .supergraph_request
+        .unwrap()
+        .try_into()
+        .unwrap();
+
+    get_request
+        .router_request
         .headers_mut()
         .remove("content-type");
 
-    let (actual, registry) = query_rust(request).await;
+    let (router, registry) = setup_router_and_registry(serde_json::json!({})).await;
+
+    let actual = query_with_router(router, get_request).await;
 
     assert_eq!(
         1,
@@ -221,7 +250,7 @@ async fn queries_should_work_with_compression() {
         .variable("topProductsFirst", 2_i32)
         .variable("reviewsForAuthorAuthorId", 1_i32)
         .method(Method::POST)
-        .header(CONTENT_TYPE, "application/json")
+        .header(CONTENT_TYPE, APPLICATION_JSON.essence_str())
         .header("accept-encoding", "gzip")
         .build()
         .expect("expecting valid request");
@@ -268,6 +297,7 @@ async fn service_errors_should_be_propagated() {
     let expected_error = apollo_router::graphql::Error::builder()
         .message(message)
         .extensions(extensions_map)
+        .extension_code("VALIDATION_ERROR")
         .build();
 
     let request = supergraph::Request::fake_builder()
@@ -286,31 +316,44 @@ async fn service_errors_should_be_propagated() {
 
 #[tokio::test(flavor = "multi_thread")]
 async fn mutation_should_not_work_over_get() {
-    let request = supergraph::Request::fake_builder()
+    // get request
+    let get_request: router::Request = supergraph::Request::builder()
         .query(
             r#"mutation {
-                createProduct(upc:"8", name:"Bob") {
-                  upc
-                  name
-                  reviews {
-                    body
-                  }
-                }
-                createReview(upc: "8", id:"100", body: "Bif"){
-                  id
-                  body
-                }
-              }"#,
+            createProduct(upc:"8", name:"Bob") {
+              upc
+              name
+              reviews {
+                body
+              }
+            }
+            createReview(upc: "8", id:"100", body: "Bif"){
+              id
+              body
+            }
+          }"#,
         )
-        .variable("topProductsFirst", 2_i32)
-        .variable("reviewsForAuthorAuthorId", 1_i32)
+        .variable("topProductsFirst", 2_usize)
+        .variable("reviewsForAuthorAuthorId", 1_usize)
+        .header(CONTENT_TYPE, APPLICATION_JSON.essence_str())
+        .uri(Uri::from_static("/"))
+        .method(Method::GET)
+        .context(Context::new())
         .build()
-        .expect("expecting valid request");
+        .unwrap()
+        .try_into()
+        .unwrap();
 
     // No services should be queried
     let expected_service_hits = hashmap! {};
 
-    let (actual, registry) = query_rust(request).await;
+    let (actual, registry) = {
+        let (router, counting_registry) = setup_router_and_registry(serde_json::json!({})).await;
+        (
+            query_with_router(router, get_request).await,
+            counting_registry,
+        )
+    };
 
     assert_eq!(1, actual.errors.len());
     assert_eq!(registry.totals(), expected_service_hits);
@@ -357,13 +400,13 @@ async fn automated_persisted_queries() {
 
     let expected_apq_miss_error = apollo_router::graphql::Error::builder()
         .message("PersistedQueryNotFound")
-        .extension("code", "PERSISTED_QUERY_NOT_FOUND")
         .extension(
             "exception",
             json!({
                 "stacktrace": ["PersistedQueryNotFoundError: PersistedQueryNotFound"]
             }),
         )
+        .extension_code("PERSISTED_QUERY_NOT_FOUND")
         .build();
 
     let persisted = json!({
@@ -381,7 +424,7 @@ async fn automated_persisted_queries() {
     // No services should be queried
     let expected_service_hits = hashmap! {};
 
-    let actual = query_with_router(router.clone(), apq_only_request).await;
+    let actual = query_with_router(router.clone(), apq_only_request.try_into().unwrap()).await;
 
     assert_eq!(expected_apq_miss_error, actual.errors[0]);
     assert_eq!(1, actual.errors.len());
@@ -400,7 +443,8 @@ async fn automated_persisted_queries() {
         "accounts".to_string()=>1,
     };
 
-    let actual = query_with_router(router.clone(), apq_request_with_query).await;
+    let actual =
+        query_with_router(router.clone(), apq_request_with_query.try_into().unwrap()).await;
 
     assert_eq!(0, actual.errors.len());
     assert_eq!(registry.totals(), expected_service_hits);
@@ -416,7 +460,7 @@ async fn automated_persisted_queries() {
         "accounts".to_string()=>2,
     };
 
-    let actual = query_with_router(router, apq_only_request).await;
+    let actual = query_with_router(router, apq_only_request.try_into().unwrap()).await;
 
     assert_eq!(0, actual.errors.len());
     assert_eq!(registry.totals(), expected_service_hits);
@@ -473,16 +517,26 @@ async fn missing_variables() {
 
     assert_eq!(StatusCode::BAD_REQUEST, http_response.response.status());
 
-    let mut response = http_response.next_response().await.unwrap();
+    let mut response = serde_json::from_slice::<graphql::Response>(
+        http_response
+            .next_response()
+            .await
+            .unwrap()
+            .unwrap()
+            .to_vec()
+            .as_slice(),
+    )
+    .unwrap();
+
     let mut expected = vec![
         graphql::Error::builder()
             .message("invalid type for variable: 'missingVariable'")
-            .extension("type", "ValidationInvalidTypeVariable")
+            .extension_code("VALIDATION_INVALID_TYPE_VARIABLE")
             .extension("name", "missingVariable")
             .build(),
         graphql::Error::builder()
             .message("invalid type for variable: 'yetAnotherMissingVariable'")
-            .extension("type", "ValidationInvalidTypeVariable")
+            .extension_code("VALIDATION_INVALID_TYPE_VARIABLE")
             .extension("name", "yetAnotherMissingVariable")
             .build(),
     ];
@@ -540,9 +594,20 @@ async fn normal_query_with_defer_accept_header() {
         .header(ACCEPT, "multipart/mixed; deferSpec=20220824")
         .build()
         .expect("expecting valid request");
-    let (actual, _registry) = query_rust_with_config(request, serde_json::json!({})).await;
-
-    assert!(actual.errors.is_empty());
+    let (mut response, _registry) = {
+        let (router, counting_registry) = setup_router_and_registry(serde_json::json!({})).await;
+        (
+            router
+                .oneshot(request.try_into().unwrap())
+                .await
+                .unwrap()
+                .into_graphql_response_stream()
+                .await,
+            counting_registry,
+        )
+    };
+    insta::assert_json_snapshot!(response.next().await.unwrap().unwrap());
+    assert!(response.next().await.is_none());
 }
 
 #[tokio::test(flavor = "multi_thread")]
@@ -574,10 +639,15 @@ async fn defer_path_with_disabled_config() {
 
     let (router, _) = setup_router_and_registry(config).await;
 
-    let mut stream = router.oneshot(request).await.unwrap();
+    let mut stream = router
+        .oneshot(request.try_into().unwrap())
+        .await
+        .unwrap()
+        .into_graphql_response_stream()
+        .await;
 
-    let only = stream.next_response().await.unwrap();
-    insta::assert_json_snapshot!(only);
+    insta::assert_json_snapshot!(stream.next().await.unwrap().unwrap());
+    assert!(stream.next().await.is_none());
 }
 
 #[tokio::test(flavor = "multi_thread")]
@@ -606,13 +676,16 @@ async fn defer_path() {
 
     let (router, _) = setup_router_and_registry(config).await;
 
-    let mut stream = router.oneshot(request).await.unwrap();
-
-    let first = stream.next_response().await.unwrap();
-    insta::assert_json_snapshot!(first);
+    let mut stream = router
+        .oneshot(request.try_into().unwrap())
+        .await
+        .unwrap()
+        .into_graphql_response_stream()
+        .await;
 
-    let second = stream.next_response().await.unwrap();
-    insta::assert_json_snapshot!(second);
+    insta::assert_json_snapshot!(stream.next().await.unwrap().unwrap());
+    insta::assert_json_snapshot!(stream.next().await.unwrap().unwrap());
+    assert!(stream.next().await.is_none());
 }
 
 #[tokio::test(flavor = "multi_thread")]
@@ -646,17 +719,16 @@ async fn defer_path_in_array() {
 
     let (router, _) = setup_router_and_registry(config).await;
 
-    let mut stream = router.oneshot(request).await.unwrap();
-
-    let first = stream.next_response().await.unwrap();
-    insta::assert_json_snapshot!(first);
-    assert_eq!(first.has_next, Some(true));
-
-    let second = stream.next_response().await.unwrap();
-    insta::assert_json_snapshot!(second);
-    assert_eq!(second.has_next, Some(false));
+    let mut stream = router
+        .oneshot(request.try_into().unwrap())
+        .await
+        .unwrap()
+        .into_graphql_response_stream()
+        .await;
 
-    assert_eq!(stream.next_response().await, None);
+    insta::assert_json_snapshot!(stream.next().await.unwrap().unwrap());
+    insta::assert_json_snapshot!(stream.next().await.unwrap().unwrap());
+    assert!(stream.next().await.is_none());
 }
 
 #[tokio::test(flavor = "multi_thread")]
@@ -684,16 +756,15 @@ async fn defer_query_without_accept() {
                 }
             }"#,
         )
-        .header(ACCEPT, "application/json")
+        .header(ACCEPT, APPLICATION_JSON.essence_str())
         .build()
         .expect("expecting valid request");
 
     let (router, _) = setup_router_and_registry(config).await;
 
-    let mut stream = router.oneshot(request).await.unwrap();
-
-    let first = stream.next_response().await.unwrap();
-    insta::assert_json_snapshot!(first);
+    let mut stream = router.oneshot(request.try_into().unwrap()).await.unwrap();
+    let first = stream.next_response().await.unwrap().unwrap();
+    insta::assert_snapshot!(std::str::from_utf8(first.to_vec().as_slice()).unwrap());
 }
 
 #[tokio::test(flavor = "multi_thread")]
@@ -721,13 +792,16 @@ async fn defer_empty_primary_response() {
 
     let (router, _) = setup_router_and_registry(config).await;
 
-    let mut stream = router.oneshot(request).await.unwrap();
-
-    let first = stream.next_response().await.unwrap();
-    insta::assert_json_snapshot!(first);
+    let mut stream = router
+        .oneshot(request.try_into().unwrap())
+        .await
+        .unwrap()
+        .into_graphql_response_stream()
+        .await;
 
-    let second = stream.next_response().await.unwrap();
-    insta::assert_json_snapshot!(second);
+    insta::assert_json_snapshot!(stream.next().await.unwrap().unwrap());
+    insta::assert_json_snapshot!(stream.next().await.unwrap().unwrap());
+    assert!(stream.next().await.is_none());
 }
 
 #[tokio::test(flavor = "multi_thread")]
@@ -755,13 +829,16 @@ async fn defer_default_variable() {
 
     let (router, _) = setup_router_and_registry(config.clone()).await;
 
-    let mut stream = router.oneshot(request).await.unwrap();
-
-    let first = stream.next_response().await.unwrap();
-    insta::assert_json_snapshot!(first);
+    let mut stream = router
+        .oneshot(request.try_into().unwrap())
+        .await
+        .unwrap()
+        .into_graphql_response_stream()
+        .await;
 
-    let second = stream.next_response().await.unwrap();
-    insta::assert_json_snapshot!(second);
+    insta::assert_json_snapshot!(stream.next().await.unwrap().unwrap());
+    insta::assert_json_snapshot!(stream.next().await.unwrap().unwrap());
+    assert!(stream.next().await.is_none());
 
     let request = supergraph::Request::fake_builder()
         .query(query)
@@ -772,13 +849,15 @@ async fn defer_default_variable() {
 
     let (router, _) = setup_router_and_registry(config).await;
 
-    let mut stream = router.oneshot(request).await.unwrap();
-
-    let first = stream.next_response().await.unwrap();
-    insta::assert_json_snapshot!(first);
+    let mut stream = router
+        .oneshot(request.try_into().unwrap())
+        .await
+        .unwrap()
+        .into_graphql_response_stream()
+        .await;
 
-    let second = stream.next_response().await;
-    assert!(second.is_none());
+    insta::assert_json_snapshot!(stream.next().await.unwrap().unwrap());
+    assert!(stream.next().await.is_none());
 }
 
 async fn query_node(request: &supergraph::Request) -> Result<graphql::Response, String> {
@@ -795,7 +874,7 @@ async fn query_node(request: &supergraph::Request) -> Result<graphql::Response,
 
 async fn http_query_rust(
     request: supergraph::Request,
-) -> (supergraph::Response, CountingServiceRegistry) {
+) -> (router::Response, CountingServiceRegistry) {
     http_query_rust_with_config(request, serde_json::json!({})).await
 }
 
@@ -808,10 +887,10 @@ async fn query_rust(
 async fn http_query_rust_with_config(
     request: supergraph::Request,
     config: serde_json::Value,
-) -> (supergraph::Response, CountingServiceRegistry) {
+) -> (router::Response, CountingServiceRegistry) {
     let (router, counting_registry) = setup_router_and_registry(config).await;
     (
-        http_query_with_router(router, request).await,
+        http_query_with_router(router, request.try_into().unwrap()).await,
         counting_registry,
     )
 }
@@ -821,12 +900,15 @@ async fn query_rust_with_config(
     config: serde_json::Value,
 ) -> (apollo_router::graphql::Response, CountingServiceRegistry) {
     let (router, counting_registry) = setup_router_and_registry(config).await;
-    (query_with_router(router, request).await, counting_registry)
+    (
+        query_with_router(router, request.try_into().unwrap()).await,
+        counting_registry,
+    )
 }
 
 async fn setup_router_and_registry(
     config: serde_json::Value,
-) -> (supergraph::BoxCloneService, CountingServiceRegistry) {
+) -> (router::BoxCloneService, CountingServiceRegistry) {
     let counting_registry = CountingServiceRegistry::new();
     let telemetry = TelemetryPlugin::new_with_subscriber(
         serde_json::json!({
@@ -846,29 +928,35 @@ async fn setup_router_and_registry(
         .schema(include_str!("fixtures/supergraph.graphql"))
         .extra_plugin(counting_registry.clone())
         .extra_plugin(telemetry)
-        .build()
+        .build_router()
         .await
         .unwrap();
     (router, counting_registry)
 }
 
 async fn query_with_router(
-    router: supergraph::BoxCloneService,
-    request: supergraph::Request,
+    router: router::BoxCloneService,
+    request: router::Request,
 ) -> graphql::Response {
-    router
-        .oneshot(request)
-        .await
-        .unwrap()
-        .next_response()
-        .await
-        .unwrap()
+    serde_json::from_slice(
+        router
+            .oneshot(request)
+            .await
+            .unwrap()
+            .next_response()
+            .await
+            .unwrap()
+            .unwrap()
+            .to_vec()
+            .as_slice(),
+    )
+    .unwrap()
 }
 
 async fn http_query_with_router(
-    router: supergraph::BoxCloneService,
-    request: supergraph::Request,
-) -> supergraph::Response {
+    router: router::BoxCloneService,
+    request: router::Request,
+) -> router::Response {
     router.oneshot(request).await.unwrap()
 }
 
@@ -975,23 +1063,34 @@ impl ValueExt for Value {
 fn redact_dynamic() -> Redaction {
     insta::dynamic_redaction(|value, _path| {
         if let Some(value_slice) = value.as_slice() {
-            if value_slice.get(0).and_then(|v| v.as_str()) == Some("request.id") {
+            if value_slice
+                .get(0)
+                .and_then(|v| {
+                    v.as_str()
+                        .map(|s| ["request.id", "response_headers", "trace_id"].contains(&s))
+                })
+                .unwrap_or_default()
+            {
                 return Content::Seq(vec![
                     value_slice.get(0).unwrap().clone(),
                     Content::String("[REDACTED]".to_string()),
                 ]);
             }
-            if value_slice.get(0).and_then(|v| v.as_str())
-                == Some("apollo_private.sent_time_offset")
+            if value_slice
+                .get(0)
+                .and_then(|v| {
+                    v.as_str().map(|s| {
+                        [
+                            "apollo_private.sent_time_offset",
+                            "apollo_private.duration_ns",
+                        ]
+                        .contains(&s)
+                    })
+                })
+                .unwrap_or_default()
             {
                 return Content::Seq(vec![value_slice.get(0).unwrap().clone(), Content::I64(0)]);
             }
-            if value_slice.get(0).and_then(|v| v.as_str()) == Some("response_headers") {
-                return Content::Seq(vec![
-                    value_slice.get(0).unwrap().clone(),
-                    Content::String("[REDACTED]".to_string()),
-                ]);
-            }
         }
         value
     })
diff --git a/apollo-router/tests/jaeger_test.rs b/apollo-router/tests/jaeger_test.rs
index 18a8828237..77ff2fa9e4 100644
--- a/apollo-router/tests/jaeger_test.rs
+++ b/apollo-router/tests/jaeger_test.rs
@@ -16,6 +16,7 @@ use hyper::server::Server;
 use hyper::service::make_service_fn;
 use hyper::service::service_fn;
 use hyper::Body;
+use mime::APPLICATION_JSON;
 use opentelemetry::propagation::TextMapPropagator;
 use opentelemetry::trace::Span;
 use opentelemetry::trace::Tracer;
@@ -97,6 +98,9 @@ async fn find_valid_trace(url: &str) -> Result<(), BoxError> {
     // Verify that all spans have a path to the root 'client_request' span
     verify_span_parenting(&trace)?;
 
+    // Verify that supergraph span fields are present
+    verify_supergraph_span_fields(&trace)?;
+
     // Verify that router span fields are present
     verify_router_span_fields(&trace)?;
 
@@ -104,31 +108,38 @@ async fn find_valid_trace(url: &str) -> Result<(), BoxError> {
 }
 
 fn verify_router_span_fields(trace: &Value) -> Result<(), BoxError> {
-    let router_span = trace.select_path("$..spans[?(@.operationName == 'supergraph')]")?[0];
+    let router_span = trace.select_path("$..spans[?(@.operationName == 'router')]")?[0];
     // We can't actually assert the values on a span. Only that a field has been set.
     assert_eq!(
         router_span
-            .select_path("$.tags[?(@.key == 'graphql.document')].value")?
+            .select_path("$.tags[?(@.key == 'client.name')].value")?
             .get(0),
-        Some(&&Value::String("{topProducts{name}}".to_string()))
+        Some(&&Value::String("custom_name".to_string()))
     );
     assert_eq!(
         router_span
-            .select_path("$.tags[?(@.key == 'graphql.operation.name')].value")?
+            .select_path("$.tags[?(@.key == 'client.version')].value")?
             .get(0),
-        Some(&&Value::String("".to_string()))
+        Some(&&Value::String("1.0".to_string()))
     );
+
+    Ok(())
+}
+
+fn verify_supergraph_span_fields(trace: &Value) -> Result<(), BoxError> {
+    let supergraph_span = trace.select_path("$..spans[?(@.operationName == 'supergraph')]")?[0];
+    // We can't actually assert the values on a span. Only that a field has been set.
     assert_eq!(
-        router_span
-            .select_path("$.tags[?(@.key == 'client.name')].value")?
+        supergraph_span
+            .select_path("$.tags[?(@.key == 'graphql.document')].value")?
             .get(0),
-        Some(&&Value::String("custom_name".to_string()))
+        Some(&&Value::String("{topProducts{name}}".to_string()))
     );
     assert_eq!(
-        router_span
-            .select_path("$.tags[?(@.key == 'client.version')].value")?
+        supergraph_span
+            .select_path("$.tags[?(@.key == 'graphql.operation.name')].value")?
             .get(0),
-        Some(&&Value::String("1.0".to_string()))
+        Some(&&Value::String("".to_string()))
     );
 
     Ok(())
@@ -267,7 +278,7 @@ async fn subgraph() {
             std::str::from_utf8(&body_bytes).unwrap()
         );
         Ok(Response::builder()
-            .header(CONTENT_TYPE, "application/json")
+            .header(CONTENT_TYPE, APPLICATION_JSON.essence_str())
             .status(StatusCode::OK)
             .body(
                 r#"{"data":{"topProducts":[{"name":"Table"},{"name":"Couch"},{"name":"Chair"}]}}"#
diff --git a/apollo-router/tests/logging_test.rs b/apollo-router/tests/logging_test.rs
index 20fb5c93b9..ffd0c581b8 100644
--- a/apollo-router/tests/logging_test.rs
+++ b/apollo-router/tests/logging_test.rs
@@ -3,6 +3,7 @@ use std::sync::Mutex;
 
 use apollo_router::_private::TelemetryPlugin;
 use apollo_router::graphql;
+use apollo_router::services::router;
 use apollo_router::services::supergraph;
 use tower::ServiceExt;
 use tracing::field;
@@ -63,7 +64,7 @@ async fn setup_router(
     config: serde_json::Value,
     logging_config: serde_json::Value,
     subscriber: TestLogSubscriber,
-) -> supergraph::BoxCloneService {
+) -> router::BoxCloneService {
     let telemetry = TelemetryPlugin::new_with_subscriber(
         serde_json::json!({
             "tracing": {},
@@ -83,22 +84,28 @@ async fn setup_router(
         .unwrap()
         .schema(include_str!("fixtures/supergraph.graphql"))
         .extra_plugin(telemetry)
-        .build()
+        .build_router()
         .await
         .unwrap()
 }
 
 async fn query_with_router(
-    router: supergraph::BoxCloneService,
+    router: router::BoxCloneService,
     request: supergraph::Request,
 ) -> graphql::Response {
-    router
-        .oneshot(request)
-        .await
-        .unwrap()
-        .next_response()
-        .await
-        .unwrap()
+    serde_json::from_slice(
+        router
+            .oneshot(request.try_into().unwrap())
+            .await
+            .unwrap()
+            .next_response()
+            .await
+            .unwrap()
+            .unwrap()
+            .to_vec()
+            .as_slice(),
+    )
+    .unwrap()
 }
 
 #[derive(Default, Clone, PartialEq, Debug)]
diff --git a/apollo-router/tests/rhai_tests.rs b/apollo-router/tests/rhai_tests.rs
index fa98490dea..e1578ae423 100644
--- a/apollo-router/tests/rhai_tests.rs
+++ b/apollo-router/tests/rhai_tests.rs
@@ -1,3 +1,4 @@
+use apollo_router::graphql;
 use apollo_router::services::supergraph;
 use apollo_router::TestHarness;
 use tower::ServiceExt;
@@ -23,20 +24,26 @@ async fn all_rhai_callbacks_are_invoked() {
         .configuration_json(config)
         .unwrap()
         .schema(include_str!("./fixtures/supergraph.graphql"))
-        .build()
+        .build_router()
         .await
         .unwrap();
     let request = supergraph::Request::fake_builder()
         .query("{ topProducts { name } }")
         .build()
         .unwrap();
-    let _response = router
-        .oneshot(request)
-        .await
-        .unwrap()
-        .next_response()
-        .await
-        .unwrap();
+    let _response: graphql::Response = serde_json::from_slice(
+        router
+            .oneshot(request.try_into().unwrap())
+            .await
+            .unwrap()
+            .next_response()
+            .await
+            .unwrap()
+            .unwrap()
+            .to_vec()
+            .as_slice(),
+    )
+    .unwrap();
     dbg!(_response);
     for expected_log in [
         "supergraph_service setup",
diff --git a/apollo-router/tests/snapshots/apollo_reports__client_name.snap b/apollo-router/tests/snapshots/apollo_reports__client_name.snap
new file mode 100644
index 0000000000..1462acf541
--- /dev/null
+++ b/apollo-router/tests/snapshots/apollo_reports__client_name.snap
@@ -0,0 +1,593 @@
+---
+source: apollo-router/tests/apollo_reports.rs
+expression: report
+---
+header:
+  graph_ref: test
+  hostname: "[hostname]"
+  agent_version: "[agent_version]"
+  service_version: ""
+  runtime_version: rust
+  uname: "[uname]"
+  executable_schema_id: "[executable_schema_id]"
+traces_per_query:
+  "# -\n{topProducts{name reviews{author{name}}reviews{author{name}}}}":
+    trace:
+      - start_time:
+          seconds: "[seconds]"
+          nanos: "[nanos]"
+        end_time:
+          seconds: "[seconds]"
+          nanos: "[nanos]"
+        duration_ns: "[duration_ns]"
+        root: ~
+        is_incomplete: false
+        signature: ""
+        unexecuted_operation_body: ""
+        unexecuted_operation_name: ""
+        details:
+          variables_json: {}
+          operation_name: ""
+        client_name: my client
+        client_version: ""
+        http:
+          method: 4
+          request_headers:
+            apollographql-client-name:
+              value:
+                - ""
+            content-type:
+              value:
+                - ""
+          response_headers:
+            my_trace_id: "[my_trace_id]"
+          status_code: 0
+        cache_policy: ~
+        query_plan:
+          node:
+            Sequence:
+              nodes:
+                - node:
+                    Fetch:
+                      service_name: products
+                      trace_parsing_failed: false
+                      trace:
+                        start_time:
+                          seconds: "[seconds]"
+                          nanos: "[nanos]"
+                        end_time:
+                          seconds: "[seconds]"
+                          nanos: "[nanos]"
+                        duration_ns: "[duration_ns]"
+                        root:
+                          original_field_name: ""
+                          type: ""
+                          parent_type: ""
+                          cache_policy: ~
+                          start_time: 0
+                          end_time: 0
+                          error: []
+                          child:
+                            - original_field_name: ""
+                              type: "[Product]"
+                              parent_type: Query
+                              cache_policy: ~
+                              start_time: "[start_time]"
+                              end_time: "[end_time]"
+                              error: []
+                              child:
+                                - original_field_name: ""
+                                  type: ""
+                                  parent_type: ""
+                                  cache_policy: ~
+                                  start_time: "[start_time]"
+                                  end_time: "[end_time]"
+                                  error: []
+                                  child:
+                                    - original_field_name: ""
+                                      type: String!
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: upc
+                                    - original_field_name: ""
+                                      type: String
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: name
+                                  id:
+                                    Index: 0
+                                - original_field_name: ""
+                                  type: ""
+                                  parent_type: ""
+                                  cache_policy: ~
+                                  start_time: "[start_time]"
+                                  end_time: "[end_time]"
+                                  error: []
+                                  child:
+                                    - original_field_name: ""
+                                      type: String!
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: upc
+                                    - original_field_name: ""
+                                      type: String
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: name
+                                  id:
+                                    Index: 1
+                                - original_field_name: ""
+                                  type: ""
+                                  parent_type: ""
+                                  cache_policy: ~
+                                  start_time: "[start_time]"
+                                  end_time: "[end_time]"
+                                  error: []
+                                  child:
+                                    - original_field_name: ""
+                                      type: String!
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: upc
+                                    - original_field_name: ""
+                                      type: String
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: name
+                                  id:
+                                    Index: 2
+                              id:
+                                ResponseName: topProducts
+                          id: ~
+                        is_incomplete: false
+                        signature: ""
+                        unexecuted_operation_body: ""
+                        unexecuted_operation_name: ""
+                        details: ~
+                        client_name: ""
+                        client_version: ""
+                        http: ~
+                        cache_policy: ~
+                        query_plan: ~
+                        full_query_cache_hit: false
+                        persisted_query_hit: false
+                        persisted_query_register: false
+                        registered_operation: false
+                        forbidden_operation: false
+                        field_execution_weight: 1
+                      sent_time_offset: "[sent_time_offset]"
+                      sent_time:
+                        seconds: "[seconds]"
+                        nanos: "[nanos]"
+                      received_time:
+                        seconds: "[seconds]"
+                        nanos: "[nanos]"
+                - node:
+                    Flatten:
+                      response_path:
+                        - id:
+                            FieldName: topProducts
+                      node:
+                        node:
+                          Fetch:
+                            service_name: reviews
+                            trace_parsing_failed: false
+                            trace:
+                              start_time:
+                                seconds: "[seconds]"
+                                nanos: "[nanos]"
+                              end_time:
+                                seconds: "[seconds]"
+                                nanos: "[nanos]"
+                              duration_ns: "[duration_ns]"
+                              root:
+                                original_field_name: ""
+                                type: ""
+                                parent_type: ""
+                                cache_policy: ~
+                                start_time: 0
+                                end_time: 0
+                                error: []
+                                child:
+                                  - original_field_name: ""
+                                    type: "[_Entity]!"
+                                    parent_type: Query
+                                    cache_policy: ~
+                                    start_time: "[start_time]"
+                                    end_time: "[end_time]"
+                                    error: []
+                                    child:
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: "[Review]"
+                                            parent_type: Product
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child:
+                                              - original_field_name: ""
+                                                type: ""
+                                                parent_type: ""
+                                                cache_policy: ~
+                                                start_time: "[start_time]"
+                                                end_time: "[end_time]"
+                                                error: []
+                                                child:
+                                                  - original_field_name: ""
+                                                    type: User
+                                                    parent_type: Review
+                                                    cache_policy: ~
+                                                    start_time: "[start_time]"
+                                                    end_time: "[end_time]"
+                                                    error: []
+                                                    child:
+                                                      - original_field_name: ""
+                                                        type: ID!
+                                                        parent_type: User
+                                                        cache_policy: ~
+                                                        start_time: "[start_time]"
+                                                        end_time: "[end_time]"
+                                                        error: []
+                                                        child: []
+                                                        id:
+                                                          ResponseName: id
+                                                    id:
+                                                      ResponseName: author
+                                                id:
+                                                  Index: 0
+                                              - original_field_name: ""
+                                                type: ""
+                                                parent_type: ""
+                                                cache_policy: ~
+                                                start_time: "[start_time]"
+                                                end_time: "[end_time]"
+                                                error: []
+                                                child:
+                                                  - original_field_name: ""
+                                                    type: User
+                                                    parent_type: Review
+                                                    cache_policy: ~
+                                                    start_time: "[start_time]"
+                                                    end_time: "[end_time]"
+                                                    error: []
+                                                    child:
+                                                      - original_field_name: ""
+                                                        type: ID!
+                                                        parent_type: User
+                                                        cache_policy: ~
+                                                        start_time: "[start_time]"
+                                                        end_time: "[end_time]"
+                                                        error: []
+                                                        child: []
+                                                        id:
+                                                          ResponseName: id
+                                                    id:
+                                                      ResponseName: author
+                                                id:
+                                                  Index: 1
+                                            id:
+                                              ResponseName: reviews
+                                        id:
+                                          Index: 0
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: "[Review]"
+                                            parent_type: Product
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child:
+                                              - original_field_name: ""
+                                                type: ""
+                                                parent_type: ""
+                                                cache_policy: ~
+                                                start_time: "[start_time]"
+                                                end_time: "[end_time]"
+                                                error: []
+                                                child:
+                                                  - original_field_name: ""
+                                                    type: User
+                                                    parent_type: Review
+                                                    cache_policy: ~
+                                                    start_time: "[start_time]"
+                                                    end_time: "[end_time]"
+                                                    error: []
+                                                    child:
+                                                      - original_field_name: ""
+                                                        type: ID!
+                                                        parent_type: User
+                                                        cache_policy: ~
+                                                        start_time: "[start_time]"
+                                                        end_time: "[end_time]"
+                                                        error: []
+                                                        child: []
+                                                        id:
+                                                          ResponseName: id
+                                                    id:
+                                                      ResponseName: author
+                                                id:
+                                                  Index: 0
+                                            id:
+                                              ResponseName: reviews
+                                        id:
+                                          Index: 1
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: "[Review]"
+                                            parent_type: Product
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child:
+                                              - original_field_name: ""
+                                                type: ""
+                                                parent_type: ""
+                                                cache_policy: ~
+                                                start_time: "[start_time]"
+                                                end_time: "[end_time]"
+                                                error: []
+                                                child:
+                                                  - original_field_name: ""
+                                                    type: User
+                                                    parent_type: Review
+                                                    cache_policy: ~
+                                                    start_time: "[start_time]"
+                                                    end_time: "[end_time]"
+                                                    error: []
+                                                    child:
+                                                      - original_field_name: ""
+                                                        type: ID!
+                                                        parent_type: User
+                                                        cache_policy: ~
+                                                        start_time: "[start_time]"
+                                                        end_time: "[end_time]"
+                                                        error: []
+                                                        child: []
+                                                        id:
+                                                          ResponseName: id
+                                                    id:
+                                                      ResponseName: author
+                                                id:
+                                                  Index: 0
+                                            id:
+                                              ResponseName: reviews
+                                        id:
+                                          Index: 2
+                                    id:
+                                      ResponseName: _entities
+                                id: ~
+                              is_incomplete: false
+                              signature: ""
+                              unexecuted_operation_body: ""
+                              unexecuted_operation_name: ""
+                              details: ~
+                              client_name: ""
+                              client_version: ""
+                              http: ~
+                              cache_policy: ~
+                              query_plan: ~
+                              full_query_cache_hit: false
+                              persisted_query_hit: false
+                              persisted_query_register: false
+                              registered_operation: false
+                              forbidden_operation: false
+                              field_execution_weight: 1
+                            sent_time_offset: "[sent_time_offset]"
+                            sent_time:
+                              seconds: "[seconds]"
+                              nanos: "[nanos]"
+                            received_time:
+                              seconds: "[seconds]"
+                              nanos: "[nanos]"
+                - node:
+                    Flatten:
+                      response_path:
+                        - id:
+                            FieldName: topProducts
+                        - id:
+                            FieldName: reviews
+                        - id:
+                            FieldName: author
+                      node:
+                        node:
+                          Fetch:
+                            service_name: accounts
+                            trace_parsing_failed: false
+                            trace:
+                              start_time:
+                                seconds: "[seconds]"
+                                nanos: "[nanos]"
+                              end_time:
+                                seconds: "[seconds]"
+                                nanos: "[nanos]"
+                              duration_ns: "[duration_ns]"
+                              root:
+                                original_field_name: ""
+                                type: ""
+                                parent_type: ""
+                                cache_policy: ~
+                                start_time: 0
+                                end_time: 0
+                                error: []
+                                child:
+                                  - original_field_name: ""
+                                    type: "[_Entity]!"
+                                    parent_type: Query
+                                    cache_policy: ~
+                                    start_time: "[start_time]"
+                                    end_time: "[end_time]"
+                                    error: []
+                                    child:
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: String
+                                            parent_type: User
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child: []
+                                            id:
+                                              ResponseName: name
+                                        id:
+                                          Index: 0
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: String
+                                            parent_type: User
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child: []
+                                            id:
+                                              ResponseName: name
+                                        id:
+                                          Index: 1
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: String
+                                            parent_type: User
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child: []
+                                            id:
+                                              ResponseName: name
+                                        id:
+                                          Index: 2
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: String
+                                            parent_type: User
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child: []
+                                            id:
+                                              ResponseName: name
+                                        id:
+                                          Index: 3
+                                    id:
+                                      ResponseName: _entities
+                                id: ~
+                              is_incomplete: false
+                              signature: ""
+                              unexecuted_operation_body: ""
+                              unexecuted_operation_name: ""
+                              details: ~
+                              client_name: ""
+                              client_version: ""
+                              http: ~
+                              cache_policy: ~
+                              query_plan: ~
+                              full_query_cache_hit: false
+                              persisted_query_hit: false
+                              persisted_query_register: false
+                              registered_operation: false
+                              forbidden_operation: false
+                              field_execution_weight: 1
+                            sent_time_offset: "[sent_time_offset]"
+                            sent_time:
+                              seconds: "[seconds]"
+                              nanos: "[nanos]"
+                            received_time:
+                              seconds: "[seconds]"
+                              nanos: "[nanos]"
+        full_query_cache_hit: false
+        persisted_query_hit: false
+        persisted_query_register: false
+        registered_operation: false
+        forbidden_operation: false
+        field_execution_weight: 1
+    stats_with_context: []
+    referenced_fields_by_type: {}
+    internal_traces_contributing_to_stats: []
+end_time: "[end_time]"
+operation_count: 0
+traces_pre_aggregated: true
+
diff --git a/apollo-router/tests/snapshots/apollo_reports__client_version.snap b/apollo-router/tests/snapshots/apollo_reports__client_version.snap
new file mode 100644
index 0000000000..7576a20b49
--- /dev/null
+++ b/apollo-router/tests/snapshots/apollo_reports__client_version.snap
@@ -0,0 +1,593 @@
+---
+source: apollo-router/tests/apollo_reports.rs
+expression: report
+---
+header:
+  graph_ref: test
+  hostname: "[hostname]"
+  agent_version: "[agent_version]"
+  service_version: ""
+  runtime_version: rust
+  uname: "[uname]"
+  executable_schema_id: "[executable_schema_id]"
+traces_per_query:
+  "# -\n{topProducts{name reviews{author{name}}reviews{author{name}}}}":
+    trace:
+      - start_time:
+          seconds: "[seconds]"
+          nanos: "[nanos]"
+        end_time:
+          seconds: "[seconds]"
+          nanos: "[nanos]"
+        duration_ns: "[duration_ns]"
+        root: ~
+        is_incomplete: false
+        signature: ""
+        unexecuted_operation_body: ""
+        unexecuted_operation_name: ""
+        details:
+          variables_json: {}
+          operation_name: ""
+        client_name: ""
+        client_version: my client version
+        http:
+          method: 4
+          request_headers:
+            apollographql-client-version:
+              value:
+                - ""
+            content-type:
+              value:
+                - ""
+          response_headers:
+            my_trace_id: "[my_trace_id]"
+          status_code: 0
+        cache_policy: ~
+        query_plan:
+          node:
+            Sequence:
+              nodes:
+                - node:
+                    Fetch:
+                      service_name: products
+                      trace_parsing_failed: false
+                      trace:
+                        start_time:
+                          seconds: "[seconds]"
+                          nanos: "[nanos]"
+                        end_time:
+                          seconds: "[seconds]"
+                          nanos: "[nanos]"
+                        duration_ns: "[duration_ns]"
+                        root:
+                          original_field_name: ""
+                          type: ""
+                          parent_type: ""
+                          cache_policy: ~
+                          start_time: 0
+                          end_time: 0
+                          error: []
+                          child:
+                            - original_field_name: ""
+                              type: "[Product]"
+                              parent_type: Query
+                              cache_policy: ~
+                              start_time: "[start_time]"
+                              end_time: "[end_time]"
+                              error: []
+                              child:
+                                - original_field_name: ""
+                                  type: ""
+                                  parent_type: ""
+                                  cache_policy: ~
+                                  start_time: "[start_time]"
+                                  end_time: "[end_time]"
+                                  error: []
+                                  child:
+                                    - original_field_name: ""
+                                      type: String!
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: upc
+                                    - original_field_name: ""
+                                      type: String
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: name
+                                  id:
+                                    Index: 0
+                                - original_field_name: ""
+                                  type: ""
+                                  parent_type: ""
+                                  cache_policy: ~
+                                  start_time: "[start_time]"
+                                  end_time: "[end_time]"
+                                  error: []
+                                  child:
+                                    - original_field_name: ""
+                                      type: String!
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: upc
+                                    - original_field_name: ""
+                                      type: String
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: name
+                                  id:
+                                    Index: 1
+                                - original_field_name: ""
+                                  type: ""
+                                  parent_type: ""
+                                  cache_policy: ~
+                                  start_time: "[start_time]"
+                                  end_time: "[end_time]"
+                                  error: []
+                                  child:
+                                    - original_field_name: ""
+                                      type: String!
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: upc
+                                    - original_field_name: ""
+                                      type: String
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: name
+                                  id:
+                                    Index: 2
+                              id:
+                                ResponseName: topProducts
+                          id: ~
+                        is_incomplete: false
+                        signature: ""
+                        unexecuted_operation_body: ""
+                        unexecuted_operation_name: ""
+                        details: ~
+                        client_name: ""
+                        client_version: ""
+                        http: ~
+                        cache_policy: ~
+                        query_plan: ~
+                        full_query_cache_hit: false
+                        persisted_query_hit: false
+                        persisted_query_register: false
+                        registered_operation: false
+                        forbidden_operation: false
+                        field_execution_weight: 1
+                      sent_time_offset: "[sent_time_offset]"
+                      sent_time:
+                        seconds: "[seconds]"
+                        nanos: "[nanos]"
+                      received_time:
+                        seconds: "[seconds]"
+                        nanos: "[nanos]"
+                - node:
+                    Flatten:
+                      response_path:
+                        - id:
+                            FieldName: topProducts
+                      node:
+                        node:
+                          Fetch:
+                            service_name: reviews
+                            trace_parsing_failed: false
+                            trace:
+                              start_time:
+                                seconds: "[seconds]"
+                                nanos: "[nanos]"
+                              end_time:
+                                seconds: "[seconds]"
+                                nanos: "[nanos]"
+                              duration_ns: "[duration_ns]"
+                              root:
+                                original_field_name: ""
+                                type: ""
+                                parent_type: ""
+                                cache_policy: ~
+                                start_time: 0
+                                end_time: 0
+                                error: []
+                                child:
+                                  - original_field_name: ""
+                                    type: "[_Entity]!"
+                                    parent_type: Query
+                                    cache_policy: ~
+                                    start_time: "[start_time]"
+                                    end_time: "[end_time]"
+                                    error: []
+                                    child:
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: "[Review]"
+                                            parent_type: Product
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child:
+                                              - original_field_name: ""
+                                                type: ""
+                                                parent_type: ""
+                                                cache_policy: ~
+                                                start_time: "[start_time]"
+                                                end_time: "[end_time]"
+                                                error: []
+                                                child:
+                                                  - original_field_name: ""
+                                                    type: User
+                                                    parent_type: Review
+                                                    cache_policy: ~
+                                                    start_time: "[start_time]"
+                                                    end_time: "[end_time]"
+                                                    error: []
+                                                    child:
+                                                      - original_field_name: ""
+                                                        type: ID!
+                                                        parent_type: User
+                                                        cache_policy: ~
+                                                        start_time: "[start_time]"
+                                                        end_time: "[end_time]"
+                                                        error: []
+                                                        child: []
+                                                        id:
+                                                          ResponseName: id
+                                                    id:
+                                                      ResponseName: author
+                                                id:
+                                                  Index: 0
+                                              - original_field_name: ""
+                                                type: ""
+                                                parent_type: ""
+                                                cache_policy: ~
+                                                start_time: "[start_time]"
+                                                end_time: "[end_time]"
+                                                error: []
+                                                child:
+                                                  - original_field_name: ""
+                                                    type: User
+                                                    parent_type: Review
+                                                    cache_policy: ~
+                                                    start_time: "[start_time]"
+                                                    end_time: "[end_time]"
+                                                    error: []
+                                                    child:
+                                                      - original_field_name: ""
+                                                        type: ID!
+                                                        parent_type: User
+                                                        cache_policy: ~
+                                                        start_time: "[start_time]"
+                                                        end_time: "[end_time]"
+                                                        error: []
+                                                        child: []
+                                                        id:
+                                                          ResponseName: id
+                                                    id:
+                                                      ResponseName: author
+                                                id:
+                                                  Index: 1
+                                            id:
+                                              ResponseName: reviews
+                                        id:
+                                          Index: 0
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: "[Review]"
+                                            parent_type: Product
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child:
+                                              - original_field_name: ""
+                                                type: ""
+                                                parent_type: ""
+                                                cache_policy: ~
+                                                start_time: "[start_time]"
+                                                end_time: "[end_time]"
+                                                error: []
+                                                child:
+                                                  - original_field_name: ""
+                                                    type: User
+                                                    parent_type: Review
+                                                    cache_policy: ~
+                                                    start_time: "[start_time]"
+                                                    end_time: "[end_time]"
+                                                    error: []
+                                                    child:
+                                                      - original_field_name: ""
+                                                        type: ID!
+                                                        parent_type: User
+                                                        cache_policy: ~
+                                                        start_time: "[start_time]"
+                                                        end_time: "[end_time]"
+                                                        error: []
+                                                        child: []
+                                                        id:
+                                                          ResponseName: id
+                                                    id:
+                                                      ResponseName: author
+                                                id:
+                                                  Index: 0
+                                            id:
+                                              ResponseName: reviews
+                                        id:
+                                          Index: 1
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: "[Review]"
+                                            parent_type: Product
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child:
+                                              - original_field_name: ""
+                                                type: ""
+                                                parent_type: ""
+                                                cache_policy: ~
+                                                start_time: "[start_time]"
+                                                end_time: "[end_time]"
+                                                error: []
+                                                child:
+                                                  - original_field_name: ""
+                                                    type: User
+                                                    parent_type: Review
+                                                    cache_policy: ~
+                                                    start_time: "[start_time]"
+                                                    end_time: "[end_time]"
+                                                    error: []
+                                                    child:
+                                                      - original_field_name: ""
+                                                        type: ID!
+                                                        parent_type: User
+                                                        cache_policy: ~
+                                                        start_time: "[start_time]"
+                                                        end_time: "[end_time]"
+                                                        error: []
+                                                        child: []
+                                                        id:
+                                                          ResponseName: id
+                                                    id:
+                                                      ResponseName: author
+                                                id:
+                                                  Index: 0
+                                            id:
+                                              ResponseName: reviews
+                                        id:
+                                          Index: 2
+                                    id:
+                                      ResponseName: _entities
+                                id: ~
+                              is_incomplete: false
+                              signature: ""
+                              unexecuted_operation_body: ""
+                              unexecuted_operation_name: ""
+                              details: ~
+                              client_name: ""
+                              client_version: ""
+                              http: ~
+                              cache_policy: ~
+                              query_plan: ~
+                              full_query_cache_hit: false
+                              persisted_query_hit: false
+                              persisted_query_register: false
+                              registered_operation: false
+                              forbidden_operation: false
+                              field_execution_weight: 1
+                            sent_time_offset: "[sent_time_offset]"
+                            sent_time:
+                              seconds: "[seconds]"
+                              nanos: "[nanos]"
+                            received_time:
+                              seconds: "[seconds]"
+                              nanos: "[nanos]"
+                - node:
+                    Flatten:
+                      response_path:
+                        - id:
+                            FieldName: topProducts
+                        - id:
+                            FieldName: reviews
+                        - id:
+                            FieldName: author
+                      node:
+                        node:
+                          Fetch:
+                            service_name: accounts
+                            trace_parsing_failed: false
+                            trace:
+                              start_time:
+                                seconds: "[seconds]"
+                                nanos: "[nanos]"
+                              end_time:
+                                seconds: "[seconds]"
+                                nanos: "[nanos]"
+                              duration_ns: "[duration_ns]"
+                              root:
+                                original_field_name: ""
+                                type: ""
+                                parent_type: ""
+                                cache_policy: ~
+                                start_time: 0
+                                end_time: 0
+                                error: []
+                                child:
+                                  - original_field_name: ""
+                                    type: "[_Entity]!"
+                                    parent_type: Query
+                                    cache_policy: ~
+                                    start_time: "[start_time]"
+                                    end_time: "[end_time]"
+                                    error: []
+                                    child:
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: String
+                                            parent_type: User
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child: []
+                                            id:
+                                              ResponseName: name
+                                        id:
+                                          Index: 0
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: String
+                                            parent_type: User
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child: []
+                                            id:
+                                              ResponseName: name
+                                        id:
+                                          Index: 1
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: String
+                                            parent_type: User
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child: []
+                                            id:
+                                              ResponseName: name
+                                        id:
+                                          Index: 2
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: String
+                                            parent_type: User
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child: []
+                                            id:
+                                              ResponseName: name
+                                        id:
+                                          Index: 3
+                                    id:
+                                      ResponseName: _entities
+                                id: ~
+                              is_incomplete: false
+                              signature: ""
+                              unexecuted_operation_body: ""
+                              unexecuted_operation_name: ""
+                              details: ~
+                              client_name: ""
+                              client_version: ""
+                              http: ~
+                              cache_policy: ~
+                              query_plan: ~
+                              full_query_cache_hit: false
+                              persisted_query_hit: false
+                              persisted_query_register: false
+                              registered_operation: false
+                              forbidden_operation: false
+                              field_execution_weight: 1
+                            sent_time_offset: "[sent_time_offset]"
+                            sent_time:
+                              seconds: "[seconds]"
+                              nanos: "[nanos]"
+                            received_time:
+                              seconds: "[seconds]"
+                              nanos: "[nanos]"
+        full_query_cache_hit: false
+        persisted_query_hit: false
+        persisted_query_register: false
+        registered_operation: false
+        forbidden_operation: false
+        field_execution_weight: 1
+    stats_with_context: []
+    referenced_fields_by_type: {}
+    internal_traces_contributing_to_stats: []
+end_time: "[end_time]"
+operation_count: 0
+traces_pre_aggregated: true
+
diff --git a/apollo-router/src/plugins/telemetry/tracing/snapshots/apollo_router__plugins__telemetry__tracing__apollo_telemetry__test__condition_else.snap b/apollo-router/tests/snapshots/apollo_reports__condition_else.snap
similarity index 98%
rename from apollo-router/src/plugins/telemetry/tracing/snapshots/apollo_router__plugins__telemetry__tracing__apollo_telemetry__test__condition_else.snap
rename to apollo-router/tests/snapshots/apollo_reports__condition_else.snap
index 5dd95f672c..98979a0b28 100644
--- a/apollo-router/src/plugins/telemetry/tracing/snapshots/apollo_router__plugins__telemetry__tracing__apollo_telemetry__test__condition_else.snap
+++ b/apollo-router/tests/snapshots/apollo_reports__condition_else.snap
@@ -1,10 +1,18 @@
 ---
-source: apollo-router/src/plugins/telemetry/tracing/apollo_telemetry.rs
+source: apollo-router/tests/apollo_reports.rs
 expression: report
 ---
+header:
+  graph_ref: test
+  hostname: "[hostname]"
+  agent_version: "[agent_version]"
+  service_version: ""
+  runtime_version: rust
+  uname: "[uname]"
+  executable_schema_id: "[executable_schema_id]"
 traces_per_query:
   "# -\nquery($if:Boolean!){topProducts{name...@defer(if:$if){reviews{author{name}}reviews{author{name}}}}}":
-    traces:
+    trace:
       - start_time:
           seconds: "[seconds]"
           nanos: "[nanos]"
@@ -19,7 +27,7 @@ traces_per_query:
         unexecuted_operation_name: ""
         details:
           variables_json:
-            if: "false"
+            if: ""
           operation_name: ""
         client_name: ""
         client_version: ""
@@ -29,19 +37,11 @@ traces_per_query:
             accept:
               value:
                 - ""
-            content-length:
-              value:
-                - ""
             content-type:
               value:
                 - ""
-            host:
-              value:
-                - ""
-            user-agent:
-              value:
-                - ""
-          response_headers: {}
+          response_headers:
+            my_trace_id: "[my_trace_id]"
           status_code: 0
         cache_policy: ~
         query_plan:
@@ -592,5 +592,8 @@ traces_per_query:
         field_execution_weight: 1
     stats_with_context: []
     referenced_fields_by_type: {}
-operation_count: 1
+    internal_traces_contributing_to_stats: []
+end_time: "[end_time]"
+operation_count: 0
+traces_pre_aggregated: true
 
diff --git a/apollo-router/src/plugins/telemetry/tracing/snapshots/apollo_router__plugins__telemetry__tracing__apollo_telemetry__test__trace_id.snap b/apollo-router/tests/snapshots/apollo_reports__condition_if.snap
similarity index 98%
rename from apollo-router/src/plugins/telemetry/tracing/snapshots/apollo_router__plugins__telemetry__tracing__apollo_telemetry__test__trace_id.snap
rename to apollo-router/tests/snapshots/apollo_reports__condition_if.snap
index 240bdb604e..16c804bb54 100644
--- a/apollo-router/src/plugins/telemetry/tracing/snapshots/apollo_router__plugins__telemetry__tracing__apollo_telemetry__test__trace_id.snap
+++ b/apollo-router/tests/snapshots/apollo_reports__condition_if.snap
@@ -1,10 +1,18 @@
 ---
-source: apollo-router/src/plugins/telemetry/tracing/apollo_telemetry.rs
+source: apollo-router/tests/apollo_reports.rs
 expression: report
 ---
+header:
+  graph_ref: test
+  hostname: "[hostname]"
+  agent_version: "[agent_version]"
+  service_version: ""
+  runtime_version: rust
+  uname: "[uname]"
+  executable_schema_id: "[executable_schema_id]"
 traces_per_query:
   "# -\nquery($if:Boolean!){topProducts{name...@defer(if:$if){reviews{author{name}}reviews{author{name}}}}}":
-    traces:
+    trace:
       - start_time:
           seconds: "[seconds]"
           nanos: "[nanos]"
@@ -19,7 +27,7 @@ traces_per_query:
         unexecuted_operation_name: ""
         details:
           variables_json:
-            if: "true"
+            if: ""
           operation_name: ""
         client_name: ""
         client_version: ""
@@ -29,22 +37,11 @@ traces_per_query:
             accept:
               value:
                 - ""
-            content-length:
-              value:
-                - ""
             content-type:
               value:
                 - ""
-            host:
-              value:
-                - ""
-            user-agent:
-              value:
-                - ""
           response_headers:
-            trace_id:
-              value:
-                - "[trace_id]"
+            my_trace_id: "[my_trace_id]"
           status_code: 0
         cache_policy: ~
         query_plan:
@@ -608,5 +605,8 @@ traces_per_query:
         field_execution_weight: 1
     stats_with_context: []
     referenced_fields_by_type: {}
-operation_count: 1
+    internal_traces_contributing_to_stats: []
+end_time: "[end_time]"
+operation_count: 0
+traces_pre_aggregated: true
 
diff --git a/apollo-router/tests/snapshots/apollo_reports__non_defer.snap b/apollo-router/tests/snapshots/apollo_reports__non_defer.snap
new file mode 100644
index 0000000000..e8b23bc69d
--- /dev/null
+++ b/apollo-router/tests/snapshots/apollo_reports__non_defer.snap
@@ -0,0 +1,590 @@
+---
+source: apollo-router/tests/apollo_reports.rs
+expression: report
+---
+header:
+  graph_ref: test
+  hostname: "[hostname]"
+  agent_version: "[agent_version]"
+  service_version: ""
+  runtime_version: rust
+  uname: "[uname]"
+  executable_schema_id: "[executable_schema_id]"
+traces_per_query:
+  "# -\n{topProducts{name reviews{author{name}}reviews{author{name}}}}":
+    trace:
+      - start_time:
+          seconds: "[seconds]"
+          nanos: "[nanos]"
+        end_time:
+          seconds: "[seconds]"
+          nanos: "[nanos]"
+        duration_ns: "[duration_ns]"
+        root: ~
+        is_incomplete: false
+        signature: ""
+        unexecuted_operation_body: ""
+        unexecuted_operation_name: ""
+        details:
+          variables_json: {}
+          operation_name: ""
+        client_name: ""
+        client_version: ""
+        http:
+          method: 4
+          request_headers:
+            content-type:
+              value:
+                - ""
+          response_headers:
+            my_trace_id: "[my_trace_id]"
+          status_code: 0
+        cache_policy: ~
+        query_plan:
+          node:
+            Sequence:
+              nodes:
+                - node:
+                    Fetch:
+                      service_name: products
+                      trace_parsing_failed: false
+                      trace:
+                        start_time:
+                          seconds: "[seconds]"
+                          nanos: "[nanos]"
+                        end_time:
+                          seconds: "[seconds]"
+                          nanos: "[nanos]"
+                        duration_ns: "[duration_ns]"
+                        root:
+                          original_field_name: ""
+                          type: ""
+                          parent_type: ""
+                          cache_policy: ~
+                          start_time: 0
+                          end_time: 0
+                          error: []
+                          child:
+                            - original_field_name: ""
+                              type: "[Product]"
+                              parent_type: Query
+                              cache_policy: ~
+                              start_time: "[start_time]"
+                              end_time: "[end_time]"
+                              error: []
+                              child:
+                                - original_field_name: ""
+                                  type: ""
+                                  parent_type: ""
+                                  cache_policy: ~
+                                  start_time: "[start_time]"
+                                  end_time: "[end_time]"
+                                  error: []
+                                  child:
+                                    - original_field_name: ""
+                                      type: String!
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: upc
+                                    - original_field_name: ""
+                                      type: String
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: name
+                                  id:
+                                    Index: 0
+                                - original_field_name: ""
+                                  type: ""
+                                  parent_type: ""
+                                  cache_policy: ~
+                                  start_time: "[start_time]"
+                                  end_time: "[end_time]"
+                                  error: []
+                                  child:
+                                    - original_field_name: ""
+                                      type: String!
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: upc
+                                    - original_field_name: ""
+                                      type: String
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: name
+                                  id:
+                                    Index: 1
+                                - original_field_name: ""
+                                  type: ""
+                                  parent_type: ""
+                                  cache_policy: ~
+                                  start_time: "[start_time]"
+                                  end_time: "[end_time]"
+                                  error: []
+                                  child:
+                                    - original_field_name: ""
+                                      type: String!
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: upc
+                                    - original_field_name: ""
+                                      type: String
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: name
+                                  id:
+                                    Index: 2
+                              id:
+                                ResponseName: topProducts
+                          id: ~
+                        is_incomplete: false
+                        signature: ""
+                        unexecuted_operation_body: ""
+                        unexecuted_operation_name: ""
+                        details: ~
+                        client_name: ""
+                        client_version: ""
+                        http: ~
+                        cache_policy: ~
+                        query_plan: ~
+                        full_query_cache_hit: false
+                        persisted_query_hit: false
+                        persisted_query_register: false
+                        registered_operation: false
+                        forbidden_operation: false
+                        field_execution_weight: 1
+                      sent_time_offset: "[sent_time_offset]"
+                      sent_time:
+                        seconds: "[seconds]"
+                        nanos: "[nanos]"
+                      received_time:
+                        seconds: "[seconds]"
+                        nanos: "[nanos]"
+                - node:
+                    Flatten:
+                      response_path:
+                        - id:
+                            FieldName: topProducts
+                      node:
+                        node:
+                          Fetch:
+                            service_name: reviews
+                            trace_parsing_failed: false
+                            trace:
+                              start_time:
+                                seconds: "[seconds]"
+                                nanos: "[nanos]"
+                              end_time:
+                                seconds: "[seconds]"
+                                nanos: "[nanos]"
+                              duration_ns: "[duration_ns]"
+                              root:
+                                original_field_name: ""
+                                type: ""
+                                parent_type: ""
+                                cache_policy: ~
+                                start_time: 0
+                                end_time: 0
+                                error: []
+                                child:
+                                  - original_field_name: ""
+                                    type: "[_Entity]!"
+                                    parent_type: Query
+                                    cache_policy: ~
+                                    start_time: "[start_time]"
+                                    end_time: "[end_time]"
+                                    error: []
+                                    child:
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: "[Review]"
+                                            parent_type: Product
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child:
+                                              - original_field_name: ""
+                                                type: ""
+                                                parent_type: ""
+                                                cache_policy: ~
+                                                start_time: "[start_time]"
+                                                end_time: "[end_time]"
+                                                error: []
+                                                child:
+                                                  - original_field_name: ""
+                                                    type: User
+                                                    parent_type: Review
+                                                    cache_policy: ~
+                                                    start_time: "[start_time]"
+                                                    end_time: "[end_time]"
+                                                    error: []
+                                                    child:
+                                                      - original_field_name: ""
+                                                        type: ID!
+                                                        parent_type: User
+                                                        cache_policy: ~
+                                                        start_time: "[start_time]"
+                                                        end_time: "[end_time]"
+                                                        error: []
+                                                        child: []
+                                                        id:
+                                                          ResponseName: id
+                                                    id:
+                                                      ResponseName: author
+                                                id:
+                                                  Index: 0
+                                              - original_field_name: ""
+                                                type: ""
+                                                parent_type: ""
+                                                cache_policy: ~
+                                                start_time: "[start_time]"
+                                                end_time: "[end_time]"
+                                                error: []
+                                                child:
+                                                  - original_field_name: ""
+                                                    type: User
+                                                    parent_type: Review
+                                                    cache_policy: ~
+                                                    start_time: "[start_time]"
+                                                    end_time: "[end_time]"
+                                                    error: []
+                                                    child:
+                                                      - original_field_name: ""
+                                                        type: ID!
+                                                        parent_type: User
+                                                        cache_policy: ~
+                                                        start_time: "[start_time]"
+                                                        end_time: "[end_time]"
+                                                        error: []
+                                                        child: []
+                                                        id:
+                                                          ResponseName: id
+                                                    id:
+                                                      ResponseName: author
+                                                id:
+                                                  Index: 1
+                                            id:
+                                              ResponseName: reviews
+                                        id:
+                                          Index: 0
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: "[Review]"
+                                            parent_type: Product
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child:
+                                              - original_field_name: ""
+                                                type: ""
+                                                parent_type: ""
+                                                cache_policy: ~
+                                                start_time: "[start_time]"
+                                                end_time: "[end_time]"
+                                                error: []
+                                                child:
+                                                  - original_field_name: ""
+                                                    type: User
+                                                    parent_type: Review
+                                                    cache_policy: ~
+                                                    start_time: "[start_time]"
+                                                    end_time: "[end_time]"
+                                                    error: []
+                                                    child:
+                                                      - original_field_name: ""
+                                                        type: ID!
+                                                        parent_type: User
+                                                        cache_policy: ~
+                                                        start_time: "[start_time]"
+                                                        end_time: "[end_time]"
+                                                        error: []
+                                                        child: []
+                                                        id:
+                                                          ResponseName: id
+                                                    id:
+                                                      ResponseName: author
+                                                id:
+                                                  Index: 0
+                                            id:
+                                              ResponseName: reviews
+                                        id:
+                                          Index: 1
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: "[Review]"
+                                            parent_type: Product
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child:
+                                              - original_field_name: ""
+                                                type: ""
+                                                parent_type: ""
+                                                cache_policy: ~
+                                                start_time: "[start_time]"
+                                                end_time: "[end_time]"
+                                                error: []
+                                                child:
+                                                  - original_field_name: ""
+                                                    type: User
+                                                    parent_type: Review
+                                                    cache_policy: ~
+                                                    start_time: "[start_time]"
+                                                    end_time: "[end_time]"
+                                                    error: []
+                                                    child:
+                                                      - original_field_name: ""
+                                                        type: ID!
+                                                        parent_type: User
+                                                        cache_policy: ~
+                                                        start_time: "[start_time]"
+                                                        end_time: "[end_time]"
+                                                        error: []
+                                                        child: []
+                                                        id:
+                                                          ResponseName: id
+                                                    id:
+                                                      ResponseName: author
+                                                id:
+                                                  Index: 0
+                                            id:
+                                              ResponseName: reviews
+                                        id:
+                                          Index: 2
+                                    id:
+                                      ResponseName: _entities
+                                id: ~
+                              is_incomplete: false
+                              signature: ""
+                              unexecuted_operation_body: ""
+                              unexecuted_operation_name: ""
+                              details: ~
+                              client_name: ""
+                              client_version: ""
+                              http: ~
+                              cache_policy: ~
+                              query_plan: ~
+                              full_query_cache_hit: false
+                              persisted_query_hit: false
+                              persisted_query_register: false
+                              registered_operation: false
+                              forbidden_operation: false
+                              field_execution_weight: 1
+                            sent_time_offset: "[sent_time_offset]"
+                            sent_time:
+                              seconds: "[seconds]"
+                              nanos: "[nanos]"
+                            received_time:
+                              seconds: "[seconds]"
+                              nanos: "[nanos]"
+                - node:
+                    Flatten:
+                      response_path:
+                        - id:
+                            FieldName: topProducts
+                        - id:
+                            FieldName: reviews
+                        - id:
+                            FieldName: author
+                      node:
+                        node:
+                          Fetch:
+                            service_name: accounts
+                            trace_parsing_failed: false
+                            trace:
+                              start_time:
+                                seconds: "[seconds]"
+                                nanos: "[nanos]"
+                              end_time:
+                                seconds: "[seconds]"
+                                nanos: "[nanos]"
+                              duration_ns: "[duration_ns]"
+                              root:
+                                original_field_name: ""
+                                type: ""
+                                parent_type: ""
+                                cache_policy: ~
+                                start_time: 0
+                                end_time: 0
+                                error: []
+                                child:
+                                  - original_field_name: ""
+                                    type: "[_Entity]!"
+                                    parent_type: Query
+                                    cache_policy: ~
+                                    start_time: "[start_time]"
+                                    end_time: "[end_time]"
+                                    error: []
+                                    child:
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: String
+                                            parent_type: User
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child: []
+                                            id:
+                                              ResponseName: name
+                                        id:
+                                          Index: 0
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: String
+                                            parent_type: User
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child: []
+                                            id:
+                                              ResponseName: name
+                                        id:
+                                          Index: 1
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: String
+                                            parent_type: User
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child: []
+                                            id:
+                                              ResponseName: name
+                                        id:
+                                          Index: 2
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: String
+                                            parent_type: User
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child: []
+                                            id:
+                                              ResponseName: name
+                                        id:
+                                          Index: 3
+                                    id:
+                                      ResponseName: _entities
+                                id: ~
+                              is_incomplete: false
+                              signature: ""
+                              unexecuted_operation_body: ""
+                              unexecuted_operation_name: ""
+                              details: ~
+                              client_name: ""
+                              client_version: ""
+                              http: ~
+                              cache_policy: ~
+                              query_plan: ~
+                              full_query_cache_hit: false
+                              persisted_query_hit: false
+                              persisted_query_register: false
+                              registered_operation: false
+                              forbidden_operation: false
+                              field_execution_weight: 1
+                            sent_time_offset: "[sent_time_offset]"
+                            sent_time:
+                              seconds: "[seconds]"
+                              nanos: "[nanos]"
+                            received_time:
+                              seconds: "[seconds]"
+                              nanos: "[nanos]"
+        full_query_cache_hit: false
+        persisted_query_hit: false
+        persisted_query_register: false
+        registered_operation: false
+        forbidden_operation: false
+        field_execution_weight: 1
+    stats_with_context: []
+    referenced_fields_by_type: {}
+    internal_traces_contributing_to_stats: []
+end_time: "[end_time]"
+operation_count: 0
+traces_pre_aggregated: true
+
diff --git a/apollo-router/tests/snapshots/apollo_reports__send_header.snap b/apollo-router/tests/snapshots/apollo_reports__send_header.snap
new file mode 100644
index 0000000000..299674f641
--- /dev/null
+++ b/apollo-router/tests/snapshots/apollo_reports__send_header.snap
@@ -0,0 +1,596 @@
+---
+source: apollo-router/tests/apollo_reports.rs
+expression: report
+---
+header:
+  graph_ref: test
+  hostname: "[hostname]"
+  agent_version: "[agent_version]"
+  service_version: ""
+  runtime_version: rust
+  uname: "[uname]"
+  executable_schema_id: "[executable_schema_id]"
+traces_per_query:
+  "# -\n{topProducts{name reviews{author{name}}reviews{author{name}}}}":
+    trace:
+      - start_time:
+          seconds: "[seconds]"
+          nanos: "[nanos]"
+        end_time:
+          seconds: "[seconds]"
+          nanos: "[nanos]"
+        duration_ns: "[duration_ns]"
+        root: ~
+        is_incomplete: false
+        signature: ""
+        unexecuted_operation_body: ""
+        unexecuted_operation_name: ""
+        details:
+          variables_json: {}
+          operation_name: ""
+        client_name: ""
+        client_version: ""
+        http:
+          method: 4
+          request_headers:
+            content-type:
+              value:
+                - ""
+            dont-send-header:
+              value:
+                - ""
+            send-header:
+              value:
+                - Header value
+          response_headers:
+            my_trace_id: "[my_trace_id]"
+          status_code: 0
+        cache_policy: ~
+        query_plan:
+          node:
+            Sequence:
+              nodes:
+                - node:
+                    Fetch:
+                      service_name: products
+                      trace_parsing_failed: false
+                      trace:
+                        start_time:
+                          seconds: "[seconds]"
+                          nanos: "[nanos]"
+                        end_time:
+                          seconds: "[seconds]"
+                          nanos: "[nanos]"
+                        duration_ns: "[duration_ns]"
+                        root:
+                          original_field_name: ""
+                          type: ""
+                          parent_type: ""
+                          cache_policy: ~
+                          start_time: 0
+                          end_time: 0
+                          error: []
+                          child:
+                            - original_field_name: ""
+                              type: "[Product]"
+                              parent_type: Query
+                              cache_policy: ~
+                              start_time: "[start_time]"
+                              end_time: "[end_time]"
+                              error: []
+                              child:
+                                - original_field_name: ""
+                                  type: ""
+                                  parent_type: ""
+                                  cache_policy: ~
+                                  start_time: "[start_time]"
+                                  end_time: "[end_time]"
+                                  error: []
+                                  child:
+                                    - original_field_name: ""
+                                      type: String!
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: upc
+                                    - original_field_name: ""
+                                      type: String
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: name
+                                  id:
+                                    Index: 0
+                                - original_field_name: ""
+                                  type: ""
+                                  parent_type: ""
+                                  cache_policy: ~
+                                  start_time: "[start_time]"
+                                  end_time: "[end_time]"
+                                  error: []
+                                  child:
+                                    - original_field_name: ""
+                                      type: String!
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: upc
+                                    - original_field_name: ""
+                                      type: String
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: name
+                                  id:
+                                    Index: 1
+                                - original_field_name: ""
+                                  type: ""
+                                  parent_type: ""
+                                  cache_policy: ~
+                                  start_time: "[start_time]"
+                                  end_time: "[end_time]"
+                                  error: []
+                                  child:
+                                    - original_field_name: ""
+                                      type: String!
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: upc
+                                    - original_field_name: ""
+                                      type: String
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: name
+                                  id:
+                                    Index: 2
+                              id:
+                                ResponseName: topProducts
+                          id: ~
+                        is_incomplete: false
+                        signature: ""
+                        unexecuted_operation_body: ""
+                        unexecuted_operation_name: ""
+                        details: ~
+                        client_name: ""
+                        client_version: ""
+                        http: ~
+                        cache_policy: ~
+                        query_plan: ~
+                        full_query_cache_hit: false
+                        persisted_query_hit: false
+                        persisted_query_register: false
+                        registered_operation: false
+                        forbidden_operation: false
+                        field_execution_weight: 1
+                      sent_time_offset: "[sent_time_offset]"
+                      sent_time:
+                        seconds: "[seconds]"
+                        nanos: "[nanos]"
+                      received_time:
+                        seconds: "[seconds]"
+                        nanos: "[nanos]"
+                - node:
+                    Flatten:
+                      response_path:
+                        - id:
+                            FieldName: topProducts
+                      node:
+                        node:
+                          Fetch:
+                            service_name: reviews
+                            trace_parsing_failed: false
+                            trace:
+                              start_time:
+                                seconds: "[seconds]"
+                                nanos: "[nanos]"
+                              end_time:
+                                seconds: "[seconds]"
+                                nanos: "[nanos]"
+                              duration_ns: "[duration_ns]"
+                              root:
+                                original_field_name: ""
+                                type: ""
+                                parent_type: ""
+                                cache_policy: ~
+                                start_time: 0
+                                end_time: 0
+                                error: []
+                                child:
+                                  - original_field_name: ""
+                                    type: "[_Entity]!"
+                                    parent_type: Query
+                                    cache_policy: ~
+                                    start_time: "[start_time]"
+                                    end_time: "[end_time]"
+                                    error: []
+                                    child:
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: "[Review]"
+                                            parent_type: Product
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child:
+                                              - original_field_name: ""
+                                                type: ""
+                                                parent_type: ""
+                                                cache_policy: ~
+                                                start_time: "[start_time]"
+                                                end_time: "[end_time]"
+                                                error: []
+                                                child:
+                                                  - original_field_name: ""
+                                                    type: User
+                                                    parent_type: Review
+                                                    cache_policy: ~
+                                                    start_time: "[start_time]"
+                                                    end_time: "[end_time]"
+                                                    error: []
+                                                    child:
+                                                      - original_field_name: ""
+                                                        type: ID!
+                                                        parent_type: User
+                                                        cache_policy: ~
+                                                        start_time: "[start_time]"
+                                                        end_time: "[end_time]"
+                                                        error: []
+                                                        child: []
+                                                        id:
+                                                          ResponseName: id
+                                                    id:
+                                                      ResponseName: author
+                                                id:
+                                                  Index: 0
+                                              - original_field_name: ""
+                                                type: ""
+                                                parent_type: ""
+                                                cache_policy: ~
+                                                start_time: "[start_time]"
+                                                end_time: "[end_time]"
+                                                error: []
+                                                child:
+                                                  - original_field_name: ""
+                                                    type: User
+                                                    parent_type: Review
+                                                    cache_policy: ~
+                                                    start_time: "[start_time]"
+                                                    end_time: "[end_time]"
+                                                    error: []
+                                                    child:
+                                                      - original_field_name: ""
+                                                        type: ID!
+                                                        parent_type: User
+                                                        cache_policy: ~
+                                                        start_time: "[start_time]"
+                                                        end_time: "[end_time]"
+                                                        error: []
+                                                        child: []
+                                                        id:
+                                                          ResponseName: id
+                                                    id:
+                                                      ResponseName: author
+                                                id:
+                                                  Index: 1
+                                            id:
+                                              ResponseName: reviews
+                                        id:
+                                          Index: 0
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: "[Review]"
+                                            parent_type: Product
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child:
+                                              - original_field_name: ""
+                                                type: ""
+                                                parent_type: ""
+                                                cache_policy: ~
+                                                start_time: "[start_time]"
+                                                end_time: "[end_time]"
+                                                error: []
+                                                child:
+                                                  - original_field_name: ""
+                                                    type: User
+                                                    parent_type: Review
+                                                    cache_policy: ~
+                                                    start_time: "[start_time]"
+                                                    end_time: "[end_time]"
+                                                    error: []
+                                                    child:
+                                                      - original_field_name: ""
+                                                        type: ID!
+                                                        parent_type: User
+                                                        cache_policy: ~
+                                                        start_time: "[start_time]"
+                                                        end_time: "[end_time]"
+                                                        error: []
+                                                        child: []
+                                                        id:
+                                                          ResponseName: id
+                                                    id:
+                                                      ResponseName: author
+                                                id:
+                                                  Index: 0
+                                            id:
+                                              ResponseName: reviews
+                                        id:
+                                          Index: 1
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: "[Review]"
+                                            parent_type: Product
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child:
+                                              - original_field_name: ""
+                                                type: ""
+                                                parent_type: ""
+                                                cache_policy: ~
+                                                start_time: "[start_time]"
+                                                end_time: "[end_time]"
+                                                error: []
+                                                child:
+                                                  - original_field_name: ""
+                                                    type: User
+                                                    parent_type: Review
+                                                    cache_policy: ~
+                                                    start_time: "[start_time]"
+                                                    end_time: "[end_time]"
+                                                    error: []
+                                                    child:
+                                                      - original_field_name: ""
+                                                        type: ID!
+                                                        parent_type: User
+                                                        cache_policy: ~
+                                                        start_time: "[start_time]"
+                                                        end_time: "[end_time]"
+                                                        error: []
+                                                        child: []
+                                                        id:
+                                                          ResponseName: id
+                                                    id:
+                                                      ResponseName: author
+                                                id:
+                                                  Index: 0
+                                            id:
+                                              ResponseName: reviews
+                                        id:
+                                          Index: 2
+                                    id:
+                                      ResponseName: _entities
+                                id: ~
+                              is_incomplete: false
+                              signature: ""
+                              unexecuted_operation_body: ""
+                              unexecuted_operation_name: ""
+                              details: ~
+                              client_name: ""
+                              client_version: ""
+                              http: ~
+                              cache_policy: ~
+                              query_plan: ~
+                              full_query_cache_hit: false
+                              persisted_query_hit: false
+                              persisted_query_register: false
+                              registered_operation: false
+                              forbidden_operation: false
+                              field_execution_weight: 1
+                            sent_time_offset: "[sent_time_offset]"
+                            sent_time:
+                              seconds: "[seconds]"
+                              nanos: "[nanos]"
+                            received_time:
+                              seconds: "[seconds]"
+                              nanos: "[nanos]"
+                - node:
+                    Flatten:
+                      response_path:
+                        - id:
+                            FieldName: topProducts
+                        - id:
+                            FieldName: reviews
+                        - id:
+                            FieldName: author
+                      node:
+                        node:
+                          Fetch:
+                            service_name: accounts
+                            trace_parsing_failed: false
+                            trace:
+                              start_time:
+                                seconds: "[seconds]"
+                                nanos: "[nanos]"
+                              end_time:
+                                seconds: "[seconds]"
+                                nanos: "[nanos]"
+                              duration_ns: "[duration_ns]"
+                              root:
+                                original_field_name: ""
+                                type: ""
+                                parent_type: ""
+                                cache_policy: ~
+                                start_time: 0
+                                end_time: 0
+                                error: []
+                                child:
+                                  - original_field_name: ""
+                                    type: "[_Entity]!"
+                                    parent_type: Query
+                                    cache_policy: ~
+                                    start_time: "[start_time]"
+                                    end_time: "[end_time]"
+                                    error: []
+                                    child:
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: String
+                                            parent_type: User
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child: []
+                                            id:
+                                              ResponseName: name
+                                        id:
+                                          Index: 0
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: String
+                                            parent_type: User
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child: []
+                                            id:
+                                              ResponseName: name
+                                        id:
+                                          Index: 1
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: String
+                                            parent_type: User
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child: []
+                                            id:
+                                              ResponseName: name
+                                        id:
+                                          Index: 2
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: String
+                                            parent_type: User
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child: []
+                                            id:
+                                              ResponseName: name
+                                        id:
+                                          Index: 3
+                                    id:
+                                      ResponseName: _entities
+                                id: ~
+                              is_incomplete: false
+                              signature: ""
+                              unexecuted_operation_body: ""
+                              unexecuted_operation_name: ""
+                              details: ~
+                              client_name: ""
+                              client_version: ""
+                              http: ~
+                              cache_policy: ~
+                              query_plan: ~
+                              full_query_cache_hit: false
+                              persisted_query_hit: false
+                              persisted_query_register: false
+                              registered_operation: false
+                              forbidden_operation: false
+                              field_execution_weight: 1
+                            sent_time_offset: "[sent_time_offset]"
+                            sent_time:
+                              seconds: "[seconds]"
+                              nanos: "[nanos]"
+                            received_time:
+                              seconds: "[seconds]"
+                              nanos: "[nanos]"
+        full_query_cache_hit: false
+        persisted_query_hit: false
+        persisted_query_register: false
+        registered_operation: false
+        forbidden_operation: false
+        field_execution_weight: 1
+    stats_with_context: []
+    referenced_fields_by_type: {}
+    internal_traces_contributing_to_stats: []
+end_time: "[end_time]"
+operation_count: 0
+traces_pre_aggregated: true
+
diff --git a/apollo-router/tests/snapshots/apollo_reports__send_variable_value.snap b/apollo-router/tests/snapshots/apollo_reports__send_variable_value.snap
new file mode 100644
index 0000000000..d5a2b09f4f
--- /dev/null
+++ b/apollo-router/tests/snapshots/apollo_reports__send_variable_value.snap
@@ -0,0 +1,592 @@
+---
+source: apollo-router/tests/apollo_reports.rs
+expression: report
+---
+header:
+  graph_ref: test
+  hostname: "[hostname]"
+  agent_version: "[agent_version]"
+  service_version: ""
+  runtime_version: rust
+  uname: "[uname]"
+  executable_schema_id: "[executable_schema_id]"
+traces_per_query:
+  "# -\nquery($dontSendValue:Boolean!,$sendValue:Boolean!){topProducts{name reviews@include(if:$sendValue){author{name}}reviews@include(if:$dontSendValue){author{name}}}}":
+    trace:
+      - start_time:
+          seconds: "[seconds]"
+          nanos: "[nanos]"
+        end_time:
+          seconds: "[seconds]"
+          nanos: "[nanos]"
+        duration_ns: "[duration_ns]"
+        root: ~
+        is_incomplete: false
+        signature: ""
+        unexecuted_operation_body: ""
+        unexecuted_operation_name: ""
+        details:
+          variables_json:
+            dontSendValue: ""
+            sendValue: "true"
+          operation_name: ""
+        client_name: ""
+        client_version: ""
+        http:
+          method: 4
+          request_headers:
+            content-type:
+              value:
+                - ""
+          response_headers:
+            my_trace_id: "[my_trace_id]"
+          status_code: 0
+        cache_policy: ~
+        query_plan:
+          node:
+            Sequence:
+              nodes:
+                - node:
+                    Fetch:
+                      service_name: products
+                      trace_parsing_failed: false
+                      trace:
+                        start_time:
+                          seconds: "[seconds]"
+                          nanos: "[nanos]"
+                        end_time:
+                          seconds: "[seconds]"
+                          nanos: "[nanos]"
+                        duration_ns: "[duration_ns]"
+                        root:
+                          original_field_name: ""
+                          type: ""
+                          parent_type: ""
+                          cache_policy: ~
+                          start_time: 0
+                          end_time: 0
+                          error: []
+                          child:
+                            - original_field_name: ""
+                              type: "[Product]"
+                              parent_type: Query
+                              cache_policy: ~
+                              start_time: "[start_time]"
+                              end_time: "[end_time]"
+                              error: []
+                              child:
+                                - original_field_name: ""
+                                  type: ""
+                                  parent_type: ""
+                                  cache_policy: ~
+                                  start_time: "[start_time]"
+                                  end_time: "[end_time]"
+                                  error: []
+                                  child:
+                                    - original_field_name: ""
+                                      type: String!
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: upc
+                                    - original_field_name: ""
+                                      type: String
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: name
+                                  id:
+                                    Index: 0
+                                - original_field_name: ""
+                                  type: ""
+                                  parent_type: ""
+                                  cache_policy: ~
+                                  start_time: "[start_time]"
+                                  end_time: "[end_time]"
+                                  error: []
+                                  child:
+                                    - original_field_name: ""
+                                      type: String!
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: upc
+                                    - original_field_name: ""
+                                      type: String
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: name
+                                  id:
+                                    Index: 1
+                                - original_field_name: ""
+                                  type: ""
+                                  parent_type: ""
+                                  cache_policy: ~
+                                  start_time: "[start_time]"
+                                  end_time: "[end_time]"
+                                  error: []
+                                  child:
+                                    - original_field_name: ""
+                                      type: String!
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: upc
+                                    - original_field_name: ""
+                                      type: String
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: name
+                                  id:
+                                    Index: 2
+                              id:
+                                ResponseName: topProducts
+                          id: ~
+                        is_incomplete: false
+                        signature: ""
+                        unexecuted_operation_body: ""
+                        unexecuted_operation_name: ""
+                        details: ~
+                        client_name: ""
+                        client_version: ""
+                        http: ~
+                        cache_policy: ~
+                        query_plan: ~
+                        full_query_cache_hit: false
+                        persisted_query_hit: false
+                        persisted_query_register: false
+                        registered_operation: false
+                        forbidden_operation: false
+                        field_execution_weight: 1
+                      sent_time_offset: "[sent_time_offset]"
+                      sent_time:
+                        seconds: "[seconds]"
+                        nanos: "[nanos]"
+                      received_time:
+                        seconds: "[seconds]"
+                        nanos: "[nanos]"
+                - node:
+                    Flatten:
+                      response_path:
+                        - id:
+                            FieldName: topProducts
+                      node:
+                        node:
+                          Fetch:
+                            service_name: reviews
+                            trace_parsing_failed: false
+                            trace:
+                              start_time:
+                                seconds: "[seconds]"
+                                nanos: "[nanos]"
+                              end_time:
+                                seconds: "[seconds]"
+                                nanos: "[nanos]"
+                              duration_ns: "[duration_ns]"
+                              root:
+                                original_field_name: ""
+                                type: ""
+                                parent_type: ""
+                                cache_policy: ~
+                                start_time: 0
+                                end_time: 0
+                                error: []
+                                child:
+                                  - original_field_name: ""
+                                    type: "[_Entity]!"
+                                    parent_type: Query
+                                    cache_policy: ~
+                                    start_time: "[start_time]"
+                                    end_time: "[end_time]"
+                                    error: []
+                                    child:
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: "[Review]"
+                                            parent_type: Product
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child:
+                                              - original_field_name: ""
+                                                type: ""
+                                                parent_type: ""
+                                                cache_policy: ~
+                                                start_time: "[start_time]"
+                                                end_time: "[end_time]"
+                                                error: []
+                                                child:
+                                                  - original_field_name: ""
+                                                    type: User
+                                                    parent_type: Review
+                                                    cache_policy: ~
+                                                    start_time: "[start_time]"
+                                                    end_time: "[end_time]"
+                                                    error: []
+                                                    child:
+                                                      - original_field_name: ""
+                                                        type: ID!
+                                                        parent_type: User
+                                                        cache_policy: ~
+                                                        start_time: "[start_time]"
+                                                        end_time: "[end_time]"
+                                                        error: []
+                                                        child: []
+                                                        id:
+                                                          ResponseName: id
+                                                    id:
+                                                      ResponseName: author
+                                                id:
+                                                  Index: 0
+                                              - original_field_name: ""
+                                                type: ""
+                                                parent_type: ""
+                                                cache_policy: ~
+                                                start_time: "[start_time]"
+                                                end_time: "[end_time]"
+                                                error: []
+                                                child:
+                                                  - original_field_name: ""
+                                                    type: User
+                                                    parent_type: Review
+                                                    cache_policy: ~
+                                                    start_time: "[start_time]"
+                                                    end_time: "[end_time]"
+                                                    error: []
+                                                    child:
+                                                      - original_field_name: ""
+                                                        type: ID!
+                                                        parent_type: User
+                                                        cache_policy: ~
+                                                        start_time: "[start_time]"
+                                                        end_time: "[end_time]"
+                                                        error: []
+                                                        child: []
+                                                        id:
+                                                          ResponseName: id
+                                                    id:
+                                                      ResponseName: author
+                                                id:
+                                                  Index: 1
+                                            id:
+                                              ResponseName: reviews
+                                        id:
+                                          Index: 0
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: "[Review]"
+                                            parent_type: Product
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child:
+                                              - original_field_name: ""
+                                                type: ""
+                                                parent_type: ""
+                                                cache_policy: ~
+                                                start_time: "[start_time]"
+                                                end_time: "[end_time]"
+                                                error: []
+                                                child:
+                                                  - original_field_name: ""
+                                                    type: User
+                                                    parent_type: Review
+                                                    cache_policy: ~
+                                                    start_time: "[start_time]"
+                                                    end_time: "[end_time]"
+                                                    error: []
+                                                    child:
+                                                      - original_field_name: ""
+                                                        type: ID!
+                                                        parent_type: User
+                                                        cache_policy: ~
+                                                        start_time: "[start_time]"
+                                                        end_time: "[end_time]"
+                                                        error: []
+                                                        child: []
+                                                        id:
+                                                          ResponseName: id
+                                                    id:
+                                                      ResponseName: author
+                                                id:
+                                                  Index: 0
+                                            id:
+                                              ResponseName: reviews
+                                        id:
+                                          Index: 1
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: "[Review]"
+                                            parent_type: Product
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child:
+                                              - original_field_name: ""
+                                                type: ""
+                                                parent_type: ""
+                                                cache_policy: ~
+                                                start_time: "[start_time]"
+                                                end_time: "[end_time]"
+                                                error: []
+                                                child:
+                                                  - original_field_name: ""
+                                                    type: User
+                                                    parent_type: Review
+                                                    cache_policy: ~
+                                                    start_time: "[start_time]"
+                                                    end_time: "[end_time]"
+                                                    error: []
+                                                    child:
+                                                      - original_field_name: ""
+                                                        type: ID!
+                                                        parent_type: User
+                                                        cache_policy: ~
+                                                        start_time: "[start_time]"
+                                                        end_time: "[end_time]"
+                                                        error: []
+                                                        child: []
+                                                        id:
+                                                          ResponseName: id
+                                                    id:
+                                                      ResponseName: author
+                                                id:
+                                                  Index: 0
+                                            id:
+                                              ResponseName: reviews
+                                        id:
+                                          Index: 2
+                                    id:
+                                      ResponseName: _entities
+                                id: ~
+                              is_incomplete: false
+                              signature: ""
+                              unexecuted_operation_body: ""
+                              unexecuted_operation_name: ""
+                              details: ~
+                              client_name: ""
+                              client_version: ""
+                              http: ~
+                              cache_policy: ~
+                              query_plan: ~
+                              full_query_cache_hit: false
+                              persisted_query_hit: false
+                              persisted_query_register: false
+                              registered_operation: false
+                              forbidden_operation: false
+                              field_execution_weight: 1
+                            sent_time_offset: "[sent_time_offset]"
+                            sent_time:
+                              seconds: "[seconds]"
+                              nanos: "[nanos]"
+                            received_time:
+                              seconds: "[seconds]"
+                              nanos: "[nanos]"
+                - node:
+                    Flatten:
+                      response_path:
+                        - id:
+                            FieldName: topProducts
+                        - id:
+                            FieldName: reviews
+                        - id:
+                            FieldName: author
+                      node:
+                        node:
+                          Fetch:
+                            service_name: accounts
+                            trace_parsing_failed: false
+                            trace:
+                              start_time:
+                                seconds: "[seconds]"
+                                nanos: "[nanos]"
+                              end_time:
+                                seconds: "[seconds]"
+                                nanos: "[nanos]"
+                              duration_ns: "[duration_ns]"
+                              root:
+                                original_field_name: ""
+                                type: ""
+                                parent_type: ""
+                                cache_policy: ~
+                                start_time: 0
+                                end_time: 0
+                                error: []
+                                child:
+                                  - original_field_name: ""
+                                    type: "[_Entity]!"
+                                    parent_type: Query
+                                    cache_policy: ~
+                                    start_time: "[start_time]"
+                                    end_time: "[end_time]"
+                                    error: []
+                                    child:
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: String
+                                            parent_type: User
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child: []
+                                            id:
+                                              ResponseName: name
+                                        id:
+                                          Index: 0
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: String
+                                            parent_type: User
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child: []
+                                            id:
+                                              ResponseName: name
+                                        id:
+                                          Index: 1
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: String
+                                            parent_type: User
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child: []
+                                            id:
+                                              ResponseName: name
+                                        id:
+                                          Index: 2
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: String
+                                            parent_type: User
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child: []
+                                            id:
+                                              ResponseName: name
+                                        id:
+                                          Index: 3
+                                    id:
+                                      ResponseName: _entities
+                                id: ~
+                              is_incomplete: false
+                              signature: ""
+                              unexecuted_operation_body: ""
+                              unexecuted_operation_name: ""
+                              details: ~
+                              client_name: ""
+                              client_version: ""
+                              http: ~
+                              cache_policy: ~
+                              query_plan: ~
+                              full_query_cache_hit: false
+                              persisted_query_hit: false
+                              persisted_query_register: false
+                              registered_operation: false
+                              forbidden_operation: false
+                              field_execution_weight: 1
+                            sent_time_offset: "[sent_time_offset]"
+                            sent_time:
+                              seconds: "[seconds]"
+                              nanos: "[nanos]"
+                            received_time:
+                              seconds: "[seconds]"
+                              nanos: "[nanos]"
+        full_query_cache_hit: false
+        persisted_query_hit: false
+        persisted_query_register: false
+        registered_operation: false
+        forbidden_operation: false
+        field_execution_weight: 1
+    stats_with_context: []
+    referenced_fields_by_type: {}
+    internal_traces_contributing_to_stats: []
+end_time: "[end_time]"
+operation_count: 0
+traces_pre_aggregated: true
+
diff --git a/apollo-router/tests/snapshots/apollo_reports__stats.snap b/apollo-router/tests/snapshots/apollo_reports__stats.snap
new file mode 100644
index 0000000000..9fba3388e1
--- /dev/null
+++ b/apollo-router/tests/snapshots/apollo_reports__stats.snap
@@ -0,0 +1,60 @@
+---
+source: apollo-router/tests/apollo_reports.rs
+expression: report
+---
+header:
+  graph_ref: test
+  hostname: "[hostname]"
+  agent_version: "[agent_version]"
+  service_version: ""
+  runtime_version: rust
+  uname: "[uname]"
+  executable_schema_id: "[executable_schema_id]"
+traces_per_query:
+  "# -\n{topProducts{name reviews{author{name}}reviews{author{name}}}}":
+    trace: []
+    stats_with_context:
+      - context:
+          client_name: ""
+          client_version: ""
+        query_latency_stats:
+          latency_count: "[latency_count]"
+          request_count: 1
+          cache_hits: 0
+          persisted_query_hits: 0
+          persisted_query_misses: 0
+          cache_latency_count: "[cache_latency_count]"
+          root_error_stats:
+            children: {}
+            errors_count: 0
+            requests_with_errors_count: 0
+          requests_with_errors_count: 0
+          public_cache_ttl_count: "[public_cache_ttl_count]"
+          private_cache_ttl_count: "[private_cache_ttl_count]"
+          registered_operation_count: 0
+          forbidden_operation_count: 0
+          requests_without_field_instrumentation: 0
+        per_type_stat: {}
+    referenced_fields_by_type:
+      Product:
+        field_names:
+          - name
+          - reviews
+        is_interface: false
+      Query:
+        field_names:
+          - topProducts
+        is_interface: false
+      Review:
+        field_names:
+          - author
+        is_interface: false
+      User:
+        field_names:
+          - name
+        is_interface: false
+    internal_traces_contributing_to_stats: []
+end_time: "[end_time]"
+operation_count: 1
+traces_pre_aggregated: true
+
diff --git a/apollo-router/tests/snapshots/apollo_reports__trace_id.snap b/apollo-router/tests/snapshots/apollo_reports__trace_id.snap
new file mode 100644
index 0000000000..e8b23bc69d
--- /dev/null
+++ b/apollo-router/tests/snapshots/apollo_reports__trace_id.snap
@@ -0,0 +1,590 @@
+---
+source: apollo-router/tests/apollo_reports.rs
+expression: report
+---
+header:
+  graph_ref: test
+  hostname: "[hostname]"
+  agent_version: "[agent_version]"
+  service_version: ""
+  runtime_version: rust
+  uname: "[uname]"
+  executable_schema_id: "[executable_schema_id]"
+traces_per_query:
+  "# -\n{topProducts{name reviews{author{name}}reviews{author{name}}}}":
+    trace:
+      - start_time:
+          seconds: "[seconds]"
+          nanos: "[nanos]"
+        end_time:
+          seconds: "[seconds]"
+          nanos: "[nanos]"
+        duration_ns: "[duration_ns]"
+        root: ~
+        is_incomplete: false
+        signature: ""
+        unexecuted_operation_body: ""
+        unexecuted_operation_name: ""
+        details:
+          variables_json: {}
+          operation_name: ""
+        client_name: ""
+        client_version: ""
+        http:
+          method: 4
+          request_headers:
+            content-type:
+              value:
+                - ""
+          response_headers:
+            my_trace_id: "[my_trace_id]"
+          status_code: 0
+        cache_policy: ~
+        query_plan:
+          node:
+            Sequence:
+              nodes:
+                - node:
+                    Fetch:
+                      service_name: products
+                      trace_parsing_failed: false
+                      trace:
+                        start_time:
+                          seconds: "[seconds]"
+                          nanos: "[nanos]"
+                        end_time:
+                          seconds: "[seconds]"
+                          nanos: "[nanos]"
+                        duration_ns: "[duration_ns]"
+                        root:
+                          original_field_name: ""
+                          type: ""
+                          parent_type: ""
+                          cache_policy: ~
+                          start_time: 0
+                          end_time: 0
+                          error: []
+                          child:
+                            - original_field_name: ""
+                              type: "[Product]"
+                              parent_type: Query
+                              cache_policy: ~
+                              start_time: "[start_time]"
+                              end_time: "[end_time]"
+                              error: []
+                              child:
+                                - original_field_name: ""
+                                  type: ""
+                                  parent_type: ""
+                                  cache_policy: ~
+                                  start_time: "[start_time]"
+                                  end_time: "[end_time]"
+                                  error: []
+                                  child:
+                                    - original_field_name: ""
+                                      type: String!
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: upc
+                                    - original_field_name: ""
+                                      type: String
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: name
+                                  id:
+                                    Index: 0
+                                - original_field_name: ""
+                                  type: ""
+                                  parent_type: ""
+                                  cache_policy: ~
+                                  start_time: "[start_time]"
+                                  end_time: "[end_time]"
+                                  error: []
+                                  child:
+                                    - original_field_name: ""
+                                      type: String!
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: upc
+                                    - original_field_name: ""
+                                      type: String
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: name
+                                  id:
+                                    Index: 1
+                                - original_field_name: ""
+                                  type: ""
+                                  parent_type: ""
+                                  cache_policy: ~
+                                  start_time: "[start_time]"
+                                  end_time: "[end_time]"
+                                  error: []
+                                  child:
+                                    - original_field_name: ""
+                                      type: String!
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: upc
+                                    - original_field_name: ""
+                                      type: String
+                                      parent_type: Product
+                                      cache_policy: ~
+                                      start_time: "[start_time]"
+                                      end_time: "[end_time]"
+                                      error: []
+                                      child: []
+                                      id:
+                                        ResponseName: name
+                                  id:
+                                    Index: 2
+                              id:
+                                ResponseName: topProducts
+                          id: ~
+                        is_incomplete: false
+                        signature: ""
+                        unexecuted_operation_body: ""
+                        unexecuted_operation_name: ""
+                        details: ~
+                        client_name: ""
+                        client_version: ""
+                        http: ~
+                        cache_policy: ~
+                        query_plan: ~
+                        full_query_cache_hit: false
+                        persisted_query_hit: false
+                        persisted_query_register: false
+                        registered_operation: false
+                        forbidden_operation: false
+                        field_execution_weight: 1
+                      sent_time_offset: "[sent_time_offset]"
+                      sent_time:
+                        seconds: "[seconds]"
+                        nanos: "[nanos]"
+                      received_time:
+                        seconds: "[seconds]"
+                        nanos: "[nanos]"
+                - node:
+                    Flatten:
+                      response_path:
+                        - id:
+                            FieldName: topProducts
+                      node:
+                        node:
+                          Fetch:
+                            service_name: reviews
+                            trace_parsing_failed: false
+                            trace:
+                              start_time:
+                                seconds: "[seconds]"
+                                nanos: "[nanos]"
+                              end_time:
+                                seconds: "[seconds]"
+                                nanos: "[nanos]"
+                              duration_ns: "[duration_ns]"
+                              root:
+                                original_field_name: ""
+                                type: ""
+                                parent_type: ""
+                                cache_policy: ~
+                                start_time: 0
+                                end_time: 0
+                                error: []
+                                child:
+                                  - original_field_name: ""
+                                    type: "[_Entity]!"
+                                    parent_type: Query
+                                    cache_policy: ~
+                                    start_time: "[start_time]"
+                                    end_time: "[end_time]"
+                                    error: []
+                                    child:
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: "[Review]"
+                                            parent_type: Product
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child:
+                                              - original_field_name: ""
+                                                type: ""
+                                                parent_type: ""
+                                                cache_policy: ~
+                                                start_time: "[start_time]"
+                                                end_time: "[end_time]"
+                                                error: []
+                                                child:
+                                                  - original_field_name: ""
+                                                    type: User
+                                                    parent_type: Review
+                                                    cache_policy: ~
+                                                    start_time: "[start_time]"
+                                                    end_time: "[end_time]"
+                                                    error: []
+                                                    child:
+                                                      - original_field_name: ""
+                                                        type: ID!
+                                                        parent_type: User
+                                                        cache_policy: ~
+                                                        start_time: "[start_time]"
+                                                        end_time: "[end_time]"
+                                                        error: []
+                                                        child: []
+                                                        id:
+                                                          ResponseName: id
+                                                    id:
+                                                      ResponseName: author
+                                                id:
+                                                  Index: 0
+                                              - original_field_name: ""
+                                                type: ""
+                                                parent_type: ""
+                                                cache_policy: ~
+                                                start_time: "[start_time]"
+                                                end_time: "[end_time]"
+                                                error: []
+                                                child:
+                                                  - original_field_name: ""
+                                                    type: User
+                                                    parent_type: Review
+                                                    cache_policy: ~
+                                                    start_time: "[start_time]"
+                                                    end_time: "[end_time]"
+                                                    error: []
+                                                    child:
+                                                      - original_field_name: ""
+                                                        type: ID!
+                                                        parent_type: User
+                                                        cache_policy: ~
+                                                        start_time: "[start_time]"
+                                                        end_time: "[end_time]"
+                                                        error: []
+                                                        child: []
+                                                        id:
+                                                          ResponseName: id
+                                                    id:
+                                                      ResponseName: author
+                                                id:
+                                                  Index: 1
+                                            id:
+                                              ResponseName: reviews
+                                        id:
+                                          Index: 0
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: "[Review]"
+                                            parent_type: Product
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child:
+                                              - original_field_name: ""
+                                                type: ""
+                                                parent_type: ""
+                                                cache_policy: ~
+                                                start_time: "[start_time]"
+                                                end_time: "[end_time]"
+                                                error: []
+                                                child:
+                                                  - original_field_name: ""
+                                                    type: User
+                                                    parent_type: Review
+                                                    cache_policy: ~
+                                                    start_time: "[start_time]"
+                                                    end_time: "[end_time]"
+                                                    error: []
+                                                    child:
+                                                      - original_field_name: ""
+                                                        type: ID!
+                                                        parent_type: User
+                                                        cache_policy: ~
+                                                        start_time: "[start_time]"
+                                                        end_time: "[end_time]"
+                                                        error: []
+                                                        child: []
+                                                        id:
+                                                          ResponseName: id
+                                                    id:
+                                                      ResponseName: author
+                                                id:
+                                                  Index: 0
+                                            id:
+                                              ResponseName: reviews
+                                        id:
+                                          Index: 1
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: "[Review]"
+                                            parent_type: Product
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child:
+                                              - original_field_name: ""
+                                                type: ""
+                                                parent_type: ""
+                                                cache_policy: ~
+                                                start_time: "[start_time]"
+                                                end_time: "[end_time]"
+                                                error: []
+                                                child:
+                                                  - original_field_name: ""
+                                                    type: User
+                                                    parent_type: Review
+                                                    cache_policy: ~
+                                                    start_time: "[start_time]"
+                                                    end_time: "[end_time]"
+                                                    error: []
+                                                    child:
+                                                      - original_field_name: ""
+                                                        type: ID!
+                                                        parent_type: User
+                                                        cache_policy: ~
+                                                        start_time: "[start_time]"
+                                                        end_time: "[end_time]"
+                                                        error: []
+                                                        child: []
+                                                        id:
+                                                          ResponseName: id
+                                                    id:
+                                                      ResponseName: author
+                                                id:
+                                                  Index: 0
+                                            id:
+                                              ResponseName: reviews
+                                        id:
+                                          Index: 2
+                                    id:
+                                      ResponseName: _entities
+                                id: ~
+                              is_incomplete: false
+                              signature: ""
+                              unexecuted_operation_body: ""
+                              unexecuted_operation_name: ""
+                              details: ~
+                              client_name: ""
+                              client_version: ""
+                              http: ~
+                              cache_policy: ~
+                              query_plan: ~
+                              full_query_cache_hit: false
+                              persisted_query_hit: false
+                              persisted_query_register: false
+                              registered_operation: false
+                              forbidden_operation: false
+                              field_execution_weight: 1
+                            sent_time_offset: "[sent_time_offset]"
+                            sent_time:
+                              seconds: "[seconds]"
+                              nanos: "[nanos]"
+                            received_time:
+                              seconds: "[seconds]"
+                              nanos: "[nanos]"
+                - node:
+                    Flatten:
+                      response_path:
+                        - id:
+                            FieldName: topProducts
+                        - id:
+                            FieldName: reviews
+                        - id:
+                            FieldName: author
+                      node:
+                        node:
+                          Fetch:
+                            service_name: accounts
+                            trace_parsing_failed: false
+                            trace:
+                              start_time:
+                                seconds: "[seconds]"
+                                nanos: "[nanos]"
+                              end_time:
+                                seconds: "[seconds]"
+                                nanos: "[nanos]"
+                              duration_ns: "[duration_ns]"
+                              root:
+                                original_field_name: ""
+                                type: ""
+                                parent_type: ""
+                                cache_policy: ~
+                                start_time: 0
+                                end_time: 0
+                                error: []
+                                child:
+                                  - original_field_name: ""
+                                    type: "[_Entity]!"
+                                    parent_type: Query
+                                    cache_policy: ~
+                                    start_time: "[start_time]"
+                                    end_time: "[end_time]"
+                                    error: []
+                                    child:
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: String
+                                            parent_type: User
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child: []
+                                            id:
+                                              ResponseName: name
+                                        id:
+                                          Index: 0
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: String
+                                            parent_type: User
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child: []
+                                            id:
+                                              ResponseName: name
+                                        id:
+                                          Index: 1
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: String
+                                            parent_type: User
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child: []
+                                            id:
+                                              ResponseName: name
+                                        id:
+                                          Index: 2
+                                      - original_field_name: ""
+                                        type: ""
+                                        parent_type: ""
+                                        cache_policy: ~
+                                        start_time: "[start_time]"
+                                        end_time: "[end_time]"
+                                        error: []
+                                        child:
+                                          - original_field_name: ""
+                                            type: String
+                                            parent_type: User
+                                            cache_policy: ~
+                                            start_time: "[start_time]"
+                                            end_time: "[end_time]"
+                                            error: []
+                                            child: []
+                                            id:
+                                              ResponseName: name
+                                        id:
+                                          Index: 3
+                                    id:
+                                      ResponseName: _entities
+                                id: ~
+                              is_incomplete: false
+                              signature: ""
+                              unexecuted_operation_body: ""
+                              unexecuted_operation_name: ""
+                              details: ~
+                              client_name: ""
+                              client_version: ""
+                              http: ~
+                              cache_policy: ~
+                              query_plan: ~
+                              full_query_cache_hit: false
+                              persisted_query_hit: false
+                              persisted_query_register: false
+                              registered_operation: false
+                              forbidden_operation: false
+                              field_execution_weight: 1
+                            sent_time_offset: "[sent_time_offset]"
+                            sent_time:
+                              seconds: "[seconds]"
+                              nanos: "[nanos]"
+                            received_time:
+                              seconds: "[seconds]"
+                              nanos: "[nanos]"
+        full_query_cache_hit: false
+        persisted_query_hit: false
+        persisted_query_register: false
+        registered_operation: false
+        forbidden_operation: false
+        field_execution_weight: 1
+    stats_with_context: []
+    referenced_fields_by_type: {}
+    internal_traces_contributing_to_stats: []
+end_time: "[end_time]"
+operation_count: 0
+traces_pre_aggregated: true
+
diff --git a/apollo-router/tests/snapshots/integration_tests__defer_default_variable-2.snap b/apollo-router/tests/snapshots/integration_tests__defer_default_variable-2.snap
index e0ee201e4b..41ff5f81f8 100644
--- a/apollo-router/tests/snapshots/integration_tests__defer_default_variable-2.snap
+++ b/apollo-router/tests/snapshots/integration_tests__defer_default_variable-2.snap
@@ -1,6 +1,6 @@
 ---
 source: apollo-router/tests/integration_tests.rs
-expression: second
+expression: stream.next().await.unwrap().unwrap()
 ---
 {
   "hasNext": false,
diff --git a/apollo-router/tests/snapshots/integration_tests__defer_default_variable-3.snap b/apollo-router/tests/snapshots/integration_tests__defer_default_variable-3.snap
index 986b382756..60eddf2a41 100644
--- a/apollo-router/tests/snapshots/integration_tests__defer_default_variable-3.snap
+++ b/apollo-router/tests/snapshots/integration_tests__defer_default_variable-3.snap
@@ -1,6 +1,6 @@
 ---
 source: apollo-router/tests/integration_tests.rs
-expression: first
+expression: stream.next().await.unwrap().unwrap()
 ---
 {
   "data": {
diff --git a/apollo-router/tests/snapshots/integration_tests__defer_default_variable.snap b/apollo-router/tests/snapshots/integration_tests__defer_default_variable.snap
index 65ea4d19b4..c8e908593c 100644
--- a/apollo-router/tests/snapshots/integration_tests__defer_default_variable.snap
+++ b/apollo-router/tests/snapshots/integration_tests__defer_default_variable.snap
@@ -1,6 +1,6 @@
 ---
 source: apollo-router/tests/integration_tests.rs
-expression: first
+expression: stream.next().await.unwrap().unwrap()
 ---
 {
   "data": {
diff --git a/apollo-router/tests/snapshots/integration_tests__defer_empty_primary_response-2.snap b/apollo-router/tests/snapshots/integration_tests__defer_empty_primary_response-2.snap
index e0ee201e4b..41ff5f81f8 100644
--- a/apollo-router/tests/snapshots/integration_tests__defer_empty_primary_response-2.snap
+++ b/apollo-router/tests/snapshots/integration_tests__defer_empty_primary_response-2.snap
@@ -1,6 +1,6 @@
 ---
 source: apollo-router/tests/integration_tests.rs
-expression: second
+expression: stream.next().await.unwrap().unwrap()
 ---
 {
   "hasNext": false,
diff --git a/apollo-router/tests/snapshots/integration_tests__defer_empty_primary_response.snap b/apollo-router/tests/snapshots/integration_tests__defer_empty_primary_response.snap
index 62b241e106..06cdcf8157 100644
--- a/apollo-router/tests/snapshots/integration_tests__defer_empty_primary_response.snap
+++ b/apollo-router/tests/snapshots/integration_tests__defer_empty_primary_response.snap
@@ -1,6 +1,6 @@
 ---
 source: apollo-router/tests/integration_tests.rs
-expression: first
+expression: stream.next().await.unwrap().unwrap()
 ---
 {
   "data": {},
diff --git a/apollo-router/tests/snapshots/integration_tests__defer_path-2.snap b/apollo-router/tests/snapshots/integration_tests__defer_path-2.snap
index 755c011e91..41ff5f81f8 100644
--- a/apollo-router/tests/snapshots/integration_tests__defer_path-2.snap
+++ b/apollo-router/tests/snapshots/integration_tests__defer_path-2.snap
@@ -1,7 +1,6 @@
 ---
 source: apollo-router/tests/integration_tests.rs
-assertion_line: 679
-expression: second
+expression: stream.next().await.unwrap().unwrap()
 ---
 {
   "hasNext": false,
diff --git a/apollo-router/tests/snapshots/integration_tests__defer_path.snap b/apollo-router/tests/snapshots/integration_tests__defer_path.snap
index 65ea4d19b4..c8e908593c 100644
--- a/apollo-router/tests/snapshots/integration_tests__defer_path.snap
+++ b/apollo-router/tests/snapshots/integration_tests__defer_path.snap
@@ -1,6 +1,6 @@
 ---
 source: apollo-router/tests/integration_tests.rs
-expression: first
+expression: stream.next().await.unwrap().unwrap()
 ---
 {
   "data": {
diff --git a/apollo-router/tests/snapshots/integration_tests__defer_path_in_array-2.snap b/apollo-router/tests/snapshots/integration_tests__defer_path_in_array-2.snap
index d7c5615564..d4c9a574ce 100644
--- a/apollo-router/tests/snapshots/integration_tests__defer_path_in_array-2.snap
+++ b/apollo-router/tests/snapshots/integration_tests__defer_path_in_array-2.snap
@@ -1,7 +1,6 @@
 ---
 source: apollo-router/tests/integration_tests.rs
-assertion_line: 726
-expression: second
+expression: stream.next().await.unwrap().unwrap()
 ---
 {
   "hasNext": false,
diff --git a/apollo-router/tests/snapshots/integration_tests__defer_path_in_array.snap b/apollo-router/tests/snapshots/integration_tests__defer_path_in_array.snap
index b42e5b7c81..8ea844f775 100644
--- a/apollo-router/tests/snapshots/integration_tests__defer_path_in_array.snap
+++ b/apollo-router/tests/snapshots/integration_tests__defer_path_in_array.snap
@@ -1,6 +1,6 @@
 ---
 source: apollo-router/tests/integration_tests.rs
-expression: first
+expression: stream.next().await.unwrap().unwrap()
 ---
 {
   "data": {
diff --git a/apollo-router/tests/snapshots/integration_tests__defer_path_with_disabled_config.snap b/apollo-router/tests/snapshots/integration_tests__defer_path_with_disabled_config.snap
index eb05bf0983..6068eed14f 100644
--- a/apollo-router/tests/snapshots/integration_tests__defer_path_with_disabled_config.snap
+++ b/apollo-router/tests/snapshots/integration_tests__defer_path_with_disabled_config.snap
@@ -1,6 +1,6 @@
 ---
 source: apollo-router/tests/integration_tests.rs
-expression: only
+expression: stream.next().await.unwrap().unwrap()
 ---
 {
   "errors": [
diff --git a/apollo-router/tests/snapshots/integration_tests__defer_query_without_accept.snap b/apollo-router/tests/snapshots/integration_tests__defer_query_without_accept.snap
index 49a4aca3d9..26c3b92917 100644
--- a/apollo-router/tests/snapshots/integration_tests__defer_query_without_accept.snap
+++ b/apollo-router/tests/snapshots/integration_tests__defer_query_without_accept.snap
@@ -1,11 +1,5 @@
 ---
 source: apollo-router/tests/integration_tests.rs
-expression: first
+expression: "std::str::from_utf8(first.to_vec().as_slice()).unwrap()"
 ---
-{
-  "errors": [
-    {
-      "message": "the router received a query with the @defer directive but the client does not accept multipart/mixed HTTP responses. To enable @defer support, add the HTTP header 'Accept: multipart/mixed; deferSpec=20220824'"
-    }
-  ]
-}
+{"errors":[{"message":"the router received a query with the @defer directive but the client does not accept multipart/mixed HTTP responses. To enable @defer support, add the HTTP header 'Accept: multipart/mixed; deferSpec=20220824'","extensions":{"code":"DEFER_BAD_HEADER"}}]}
diff --git a/apollo-router/tests/snapshots/integration_tests__normal_query_with_defer_accept_header.snap b/apollo-router/tests/snapshots/integration_tests__normal_query_with_defer_accept_header.snap
new file mode 100644
index 0000000000..95e1df44d9
--- /dev/null
+++ b/apollo-router/tests/snapshots/integration_tests__normal_query_with_defer_accept_header.snap
@@ -0,0 +1,44 @@
+---
+source: apollo-router/tests/integration_tests.rs
+expression: "serde_json::from_slice::<graphql::Response>(&response.bytes().await.unwrap()).unwrap()"
+---
+{
+  "data": {
+    "me": {
+      "reviews": [
+        {
+          "author": {
+            "reviews": [
+              {
+                "author": {
+                  "name": "Ada Lovelace"
+                }
+              },
+              {
+                "author": {
+                  "name": "Ada Lovelace"
+                }
+              }
+            ]
+          }
+        },
+        {
+          "author": {
+            "reviews": [
+              {
+                "author": {
+                  "name": "Ada Lovelace"
+                }
+              },
+              {
+                "author": {
+                  "name": "Ada Lovelace"
+                }
+              }
+            ]
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/apollo-router/tests/snapshots/integration_tests__traced_basic_composition.snap b/apollo-router/tests/snapshots/integration_tests__traced_basic_composition.snap
index af31a12cb6..aa302a1fa1 100644
--- a/apollo-router/tests/snapshots/integration_tests__traced_basic_composition.snap
+++ b/apollo-router/tests/snapshots/integration_tests__traced_basic_composition.snap
@@ -17,382 +17,169 @@ expression: get_spans()
     }
   },
   "children": {
-    "apollo_router::plugins::telemetry::supergraph": {
-      "name": "apollo_router::plugins::telemetry::supergraph",
+    "apollo_router::axum_factory::utils::request": {
+      "name": "apollo_router::axum_factory::utils::request",
       "record": {
         "entries": [
           [
-            "graphql.document",
-            "{ topProducts { upc name reviews {id product { name } author { id name } } } }"
+            "http.method",
+            "POST"
           ],
           [
-            "graphql.operation.name",
-            ""
+            "http.route",
+            "http://default/"
           ],
           [
-            "client.name",
-            ""
-          ],
-          [
-            "client.version",
-            ""
+            "http.flavor",
+            "HTTP/1.1"
           ],
           [
             "otel.kind",
-            "INTERNAL"
-          ],
-          [
-            "apollo_private.field_level_instrumentation_ratio",
-            0.0
-          ],
-          [
-            "apollo_private.graphql.variables",
-            "{\"reviewsForAuthorAuthorId\":\"\",\"topProductsFirst\":\"\"}"
-          ],
-          [
-            "apollo_private.http.request_headers",
-            "{\"content-type\":[\"\"]}"
-          ],
-          [
-            "apollo_private.operation_signature",
-            "# -\n{topProducts{name reviews{author{id name}id product{name}}upc}}"
+            "SERVER"
           ]
         ],
         "metadata": {
-          "name": "supergraph",
-          "target": "apollo_router::plugins::telemetry",
+          "name": "request",
+          "target": "apollo_router::axum_factory::utils",
           "level": "INFO",
-          "module_path": "apollo_router::plugins::telemetry",
+          "module_path": "apollo_router::axum_factory::utils",
           "fields": {
             "names": [
-              "graphql.document",
-              "graphql.operation.name",
-              "client.name",
-              "client.version",
-              "otel.kind",
-              "apollo_private.field_level_instrumentation_ratio",
-              "apollo_private.operation_signature",
-              "apollo_private.graphql.variables",
-              "apollo_private.http.request_headers"
+              "http.method",
+              "http.route",
+              "http.flavor",
+              "otel.kind"
             ]
           }
         }
       },
       "children": {
-        "apollo_router::services::supergraph_service::query_planning": {
-          "name": "apollo_router::services::supergraph_service::query_planning",
+        "apollo_router::plugins::telemetry::router": {
+          "name": "apollo_router::plugins::telemetry::router",
           "record": {
             "entries": [
               [
-                "graphql.document",
-                "{ topProducts { upc name reviews {id product { name } author { id name } } } }"
+                "http.method",
+                "POST"
+              ],
+              [
+                "http.route",
+                "http://default/"
+              ],
+              [
+                "http.flavor",
+                "HTTP/1.1"
               ],
               [
-                "graphql.operation.name",
+                "trace_id",
+                "[REDACTED]"
+              ],
+              [
+                "client.name",
                 ""
               ],
               [
-                "otel.kind",
-                "INTERNAL"
-              ]
-            ],
-            "metadata": {
-              "name": "query_planning",
-              "target": "apollo_router::services::supergraph_service",
-              "level": "INFO",
-              "module_path": "apollo_router::services::supergraph_service",
-              "fields": {
-                "names": [
-                  "graphql.document",
-                  "graphql.operation.name",
-                  "otel.kind"
-                ]
-              }
-            }
-          },
-          "children": {
-            "apollo_router::query_planner::bridge_query_planner::parse_query": {
-              "name": "apollo_router::query_planner::bridge_query_planner::parse_query",
-              "record": {
-                "entries": [
-                  [
-                    "otel.kind",
-                    "INTERNAL"
-                  ]
-                ],
-                "metadata": {
-                  "name": "parse_query",
-                  "target": "apollo_router::query_planner::bridge_query_planner",
-                  "level": "INFO",
-                  "module_path": "apollo_router::query_planner::bridge_query_planner",
-                  "fields": {
-                    "names": [
-                      "otel.kind"
-                    ]
-                  }
-                }
-              },
-              "children": {}
-            }
-          }
-        },
-        "apollo_router::plugins::telemetry::execution": {
-          "name": "apollo_router::plugins::telemetry::execution",
-          "record": {
-            "entries": [
+                "client.version",
+                ""
+              ],
               [
                 "otel.kind",
                 "INTERNAL"
               ],
               [
-                "message",
-                "dropping telemetry..."
+                "apollo_private.http.request_headers",
+                "{\"content-type\":[\"\"]}"
+              ],
+              [
+                "apollo_private.duration_ns",
+                0
+              ],
+              [
+                "otel.status_code",
+                "Ok"
               ]
             ],
             "metadata": {
-              "name": "execution",
+              "name": "router",
               "target": "apollo_router::plugins::telemetry",
               "level": "INFO",
               "module_path": "apollo_router::plugins::telemetry",
               "fields": {
                 "names": [
-                  "otel.kind"
+                  "http.method",
+                  "http.route",
+                  "http.flavor",
+                  "trace_id",
+                  "client.name",
+                  "client.version",
+                  "otel.kind",
+                  "otel.status_code",
+                  "apollo_private.duration_ns",
+                  "apollo_private.http.request_headers",
+                  "apollo_private.http.response_headers"
                 ]
               }
             }
           },
           "children": {
-            "apollo_router::query_planner::execution::sequence": {
-              "name": "apollo_router::query_planner::execution::sequence",
+            "apollo_router::plugins::telemetry::supergraph": {
+              "name": "apollo_router::plugins::telemetry::supergraph",
               "record": {
                 "entries": [
+                  [
+                    "graphql.document",
+                    "{ topProducts { upc name reviews {id product { name } author { id name } } } }"
+                  ],
+                  [
+                    "graphql.operation.name",
+                    ""
+                  ],
                   [
                     "otel.kind",
                     "INTERNAL"
+                  ],
+                  [
+                    "apollo_private.field_level_instrumentation_ratio",
+                    0.01
+                  ],
+                  [
+                    "apollo_private.graphql.variables",
+                    "{\"reviewsForAuthorAuthorId\":\"\",\"topProductsFirst\":\"\"}"
+                  ],
+                  [
+                    "apollo_private.operation_signature",
+                    "# -\n{topProducts{name reviews{author{id name}id product{name}}upc}}"
                   ]
                 ],
                 "metadata": {
-                  "name": "sequence",
-                  "target": "apollo_router::query_planner::execution",
+                  "name": "supergraph",
+                  "target": "apollo_router::plugins::telemetry",
                   "level": "INFO",
-                  "module_path": "apollo_router::query_planner::execution",
+                  "module_path": "apollo_router::plugins::telemetry",
                   "fields": {
                     "names": [
-                      "otel.kind"
+                      "graphql.document",
+                      "graphql.operation.name",
+                      "otel.kind",
+                      "apollo_private.field_level_instrumentation_ratio",
+                      "apollo_private.operation_signature",
+                      "apollo_private.graphql.variables"
                     ]
                   }
                 }
               },
               "children": {
-                "apollo_router::query_planner::execution::fetch": {
-                  "name": "apollo_router::query_planner::execution::fetch",
+                "apollo_router::services::supergraph_service::query_planning": {
+                  "name": "apollo_router::services::supergraph_service::query_planning",
                   "record": {
                     "entries": [
                       [
-                        "otel.kind",
-                        "INTERNAL"
+                        "graphql.document",
+                        "{ topProducts { upc name reviews {id product { name } author { id name } } } }"
                       ],
                       [
-                        "apollo.subgraph.name",
-                        "products"
-                      ],
-                      [
-                        "apollo_private.sent_time_offset",
-                        0
-                      ]
-                    ],
-                    "metadata": {
-                      "name": "fetch",
-                      "target": "apollo_router::query_planner::execution",
-                      "level": "INFO",
-                      "module_path": "apollo_router::query_planner::execution",
-                      "fields": {
-                        "names": [
-                          "otel.kind",
-                          "apollo.subgraph.name",
-                          "apollo_private.sent_time_offset"
-                        ]
-                      }
-                    }
-                  },
-                  "children": {
-                    "apollo_router::query_planner::fetch::make_variables": {
-                      "name": "apollo_router::query_planner::fetch::make_variables",
-                      "record": {
-                        "entries": [],
-                        "metadata": {
-                          "name": "make_variables",
-                          "target": "apollo_router::query_planner::fetch",
-                          "level": "DEBUG",
-                          "module_path": "apollo_router::query_planner::fetch",
-                          "fields": {
-                            "names": []
-                          }
-                        }
-                      },
-                      "children": {}
-                    },
-                    "apollo_router::plugins::telemetry::subgraph": {
-                      "name": "apollo_router::plugins::telemetry::subgraph",
-                      "record": {
-                        "entries": [
-                          [
-                            "apollo.subgraph.name",
-                            "products"
-                          ],
-                          [
-                            "graphql.document",
-                            "{topProducts{__typename upc name}}"
-                          ],
-                          [
-                            "graphql.operation.name",
-                            ""
-                          ],
-                          [
-                            "otel.kind",
-                            "INTERNAL"
-                          ]
-                        ],
-                        "metadata": {
-                          "name": "subgraph",
-                          "target": "apollo_router::plugins::telemetry",
-                          "level": "INFO",
-                          "module_path": "apollo_router::plugins::telemetry",
-                          "fields": {
-                            "names": [
-                              "apollo.subgraph.name",
-                              "graphql.document",
-                              "graphql.operation.name",
-                              "otel.kind",
-                              "apollo_private.ftv1"
-                            ]
-                          }
-                        }
-                      },
-                      "children": {
-                        "apollo_router::services::subgraph_service::body_compression": {
-                          "name": "apollo_router::services::subgraph_service::body_compression",
-                          "record": {
-                            "entries": [],
-                            "metadata": {
-                              "name": "body_compression",
-                              "target": "apollo_router::services::subgraph_service",
-                              "level": "DEBUG",
-                              "module_path": "apollo_router::services::subgraph_service",
-                              "fields": {
-                                "names": []
-                              }
-                            }
-                          },
-                          "children": {}
-                        },
-                        "apollo_router::services::subgraph_service::subgraph_request": {
-                          "name": "apollo_router::services::subgraph_service::subgraph_request",
-                          "record": {
-                            "entries": [
-                              [
-                                "otel.kind",
-                                "CLIENT"
-                              ],
-                              [
-                                "net.peer.name",
-                                "products.demo.starstuff.dev"
-                              ],
-                              [
-                                "net.peer.port",
-                                "443"
-                              ],
-                              [
-                                "http.route",
-                                "/"
-                              ],
-                              [
-                                "net.transport",
-                                "ip_tcp"
-                              ],
-                              [
-                                "apollo.subgraph.name",
-                                "products"
-                              ]
-                            ],
-                            "metadata": {
-                              "name": "subgraph_request",
-                              "target": "apollo_router::services::subgraph_service",
-                              "level": "INFO",
-                              "module_path": "apollo_router::services::subgraph_service",
-                              "fields": {
-                                "names": [
-                                  "otel.kind",
-                                  "net.peer.name",
-                                  "net.peer.port",
-                                  "http.route",
-                                  "net.transport",
-                                  "apollo.subgraph.name"
-                                ]
-                              }
-                            }
-                          },
-                          "children": {}
-                        },
-                        "apollo_router::services::subgraph_service::aggregate_response_data": {
-                          "name": "apollo_router::services::subgraph_service::aggregate_response_data",
-                          "record": {
-                            "entries": [],
-                            "metadata": {
-                              "name": "aggregate_response_data",
-                              "target": "apollo_router::services::subgraph_service",
-                              "level": "DEBUG",
-                              "module_path": "apollo_router::services::subgraph_service",
-                              "fields": {
-                                "names": []
-                              }
-                            }
-                          },
-                          "children": {}
-                        },
-                        "apollo_router::services::subgraph_service::parse_subgraph_response": {
-                          "name": "apollo_router::services::subgraph_service::parse_subgraph_response",
-                          "record": {
-                            "entries": [],
-                            "metadata": {
-                              "name": "parse_subgraph_response",
-                              "target": "apollo_router::services::subgraph_service",
-                              "level": "DEBUG",
-                              "module_path": "apollo_router::services::subgraph_service",
-                              "fields": {
-                                "names": []
-                              }
-                            }
-                          },
-                          "children": {}
-                        }
-                      }
-                    },
-                    "apollo_router::query_planner::fetch::response_insert": {
-                      "name": "apollo_router::query_planner::fetch::response_insert",
-                      "record": {
-                        "entries": [],
-                        "metadata": {
-                          "name": "response_insert",
-                          "target": "apollo_router::query_planner::fetch",
-                          "level": "DEBUG",
-                          "module_path": "apollo_router::query_planner::fetch",
-                          "fields": {
-                            "names": []
-                          }
-                        }
-                      },
-                      "children": {}
-                    }
-                  }
-                },
-                "apollo_router::query_planner::execution::flatten": {
-                  "name": "apollo_router::query_planner::execution::flatten",
-                  "record": {
-                    "entries": [
-                      [
-                        "graphql.path",
-                        "/topProducts/@"
+                        "graphql.operation.name",
+                        ""
                       ],
                       [
                         "otel.kind",
@@ -400,237 +187,63 @@ expression: get_spans()
                       ]
                     ],
                     "metadata": {
-                      "name": "flatten",
-                      "target": "apollo_router::query_planner::execution",
+                      "name": "query_planning",
+                      "target": "apollo_router::services::supergraph_service",
                       "level": "INFO",
-                      "module_path": "apollo_router::query_planner::execution",
+                      "module_path": "apollo_router::services::supergraph_service",
                       "fields": {
                         "names": [
-                          "graphql.path",
+                          "graphql.document",
+                          "graphql.operation.name",
                           "otel.kind"
                         ]
                       }
                     }
                   },
                   "children": {
-                    "apollo_router::query_planner::execution::fetch": {
-                      "name": "apollo_router::query_planner::execution::fetch",
+                    "apollo_router::query_planner::bridge_query_planner::parse_query": {
+                      "name": "apollo_router::query_planner::bridge_query_planner::parse_query",
                       "record": {
                         "entries": [
                           [
                             "otel.kind",
                             "INTERNAL"
-                          ],
-                          [
-                            "apollo.subgraph.name",
-                            "reviews"
-                          ],
-                          [
-                            "apollo_private.sent_time_offset",
-                            0
                           ]
                         ],
                         "metadata": {
-                          "name": "fetch",
-                          "target": "apollo_router::query_planner::execution",
+                          "name": "parse_query",
+                          "target": "apollo_router::query_planner::bridge_query_planner",
                           "level": "INFO",
-                          "module_path": "apollo_router::query_planner::execution",
+                          "module_path": "apollo_router::query_planner::bridge_query_planner",
                           "fields": {
                             "names": [
-                              "otel.kind",
-                              "apollo.subgraph.name",
-                              "apollo_private.sent_time_offset"
-                            ]
-                          }
-                        }
-                      },
-                      "children": {
-                        "apollo_router::query_planner::fetch::make_variables": {
-                          "name": "apollo_router::query_planner::fetch::make_variables",
-                          "record": {
-                            "entries": [],
-                            "metadata": {
-                              "name": "make_variables",
-                              "target": "apollo_router::query_planner::fetch",
-                              "level": "DEBUG",
-                              "module_path": "apollo_router::query_planner::fetch",
-                              "fields": {
-                                "names": []
-                              }
-                            }
-                          },
-                          "children": {}
-                        },
-                        "apollo_router::plugins::telemetry::subgraph": {
-                          "name": "apollo_router::plugins::telemetry::subgraph",
-                          "record": {
-                            "entries": [
-                              [
-                                "apollo.subgraph.name",
-                                "reviews"
-                              ],
-                              [
-                                "graphql.document",
-                                "query($representations:[_Any!]!){_entities(representations:$representations){...on Product{reviews{id product{__typename upc}author{__typename id}}}}}"
-                              ],
-                              [
-                                "graphql.operation.name",
-                                ""
-                              ],
-                              [
-                                "otel.kind",
-                                "INTERNAL"
-                              ]
-                            ],
-                            "metadata": {
-                              "name": "subgraph",
-                              "target": "apollo_router::plugins::telemetry",
-                              "level": "INFO",
-                              "module_path": "apollo_router::plugins::telemetry",
-                              "fields": {
-                                "names": [
-                                  "apollo.subgraph.name",
-                                  "graphql.document",
-                                  "graphql.operation.name",
-                                  "otel.kind",
-                                  "apollo_private.ftv1"
-                                ]
-                              }
-                            }
-                          },
-                          "children": {
-                            "apollo_router::services::subgraph_service::body_compression": {
-                              "name": "apollo_router::services::subgraph_service::body_compression",
-                              "record": {
-                                "entries": [],
-                                "metadata": {
-                                  "name": "body_compression",
-                                  "target": "apollo_router::services::subgraph_service",
-                                  "level": "DEBUG",
-                                  "module_path": "apollo_router::services::subgraph_service",
-                                  "fields": {
-                                    "names": []
-                                  }
-                                }
-                              },
-                              "children": {}
-                            },
-                            "apollo_router::services::subgraph_service::subgraph_request": {
-                              "name": "apollo_router::services::subgraph_service::subgraph_request",
-                              "record": {
-                                "entries": [
-                                  [
-                                    "otel.kind",
-                                    "CLIENT"
-                                  ],
-                                  [
-                                    "net.peer.name",
-                                    "reviews.demo.starstuff.dev"
-                                  ],
-                                  [
-                                    "net.peer.port",
-                                    "443"
-                                  ],
-                                  [
-                                    "http.route",
-                                    "/"
-                                  ],
-                                  [
-                                    "net.transport",
-                                    "ip_tcp"
-                                  ],
-                                  [
-                                    "apollo.subgraph.name",
-                                    "reviews"
-                                  ]
-                                ],
-                                "metadata": {
-                                  "name": "subgraph_request",
-                                  "target": "apollo_router::services::subgraph_service",
-                                  "level": "INFO",
-                                  "module_path": "apollo_router::services::subgraph_service",
-                                  "fields": {
-                                    "names": [
-                                      "otel.kind",
-                                      "net.peer.name",
-                                      "net.peer.port",
-                                      "http.route",
-                                      "net.transport",
-                                      "apollo.subgraph.name"
-                                    ]
-                                  }
-                                }
-                              },
-                              "children": {}
-                            },
-                            "apollo_router::services::subgraph_service::aggregate_response_data": {
-                              "name": "apollo_router::services::subgraph_service::aggregate_response_data",
-                              "record": {
-                                "entries": [],
-                                "metadata": {
-                                  "name": "aggregate_response_data",
-                                  "target": "apollo_router::services::subgraph_service",
-                                  "level": "DEBUG",
-                                  "module_path": "apollo_router::services::subgraph_service",
-                                  "fields": {
-                                    "names": []
-                                  }
-                                }
-                              },
-                              "children": {}
-                            },
-                            "apollo_router::services::subgraph_service::parse_subgraph_response": {
-                              "name": "apollo_router::services::subgraph_service::parse_subgraph_response",
-                              "record": {
-                                "entries": [],
-                                "metadata": {
-                                  "name": "parse_subgraph_response",
-                                  "target": "apollo_router::services::subgraph_service",
-                                  "level": "DEBUG",
-                                  "module_path": "apollo_router::services::subgraph_service",
-                                  "fields": {
-                                    "names": []
-                                  }
-                                }
-                              },
-                              "children": {}
-                            }
-                          }
-                        },
-                        "apollo_router::query_planner::fetch::response_insert": {
-                          "name": "apollo_router::query_planner::fetch::response_insert",
-                          "record": {
-                            "entries": [],
-                            "metadata": {
-                              "name": "response_insert",
-                              "target": "apollo_router::query_planner::fetch",
-                              "level": "DEBUG",
-                              "module_path": "apollo_router::query_planner::fetch",
-                              "fields": {
-                                "names": []
-                              }
-                            }
-                          },
-                          "children": {}
+                              "otel.kind"
+                            ]
+                          }
                         }
-                      }
+                      },
+                      "children": {}
                     }
                   }
                 },
-                "apollo_router::query_planner::execution::parallel": {
-                  "name": "apollo_router::query_planner::execution::parallel",
+                "apollo_router::plugins::telemetry::execution": {
+                  "name": "apollo_router::plugins::telemetry::execution",
                   "record": {
                     "entries": [
                       [
                         "otel.kind",
                         "INTERNAL"
+                      ],
+                      [
+                        "message",
+                        "dropping telemetry..."
                       ]
                     ],
                     "metadata": {
-                      "name": "parallel",
-                      "target": "apollo_router::query_planner::execution",
+                      "name": "execution",
+                      "target": "apollo_router::plugins::telemetry",
                       "level": "INFO",
-                      "module_path": "apollo_router::query_planner::execution",
+                      "module_path": "apollo_router::plugins::telemetry",
                       "fields": {
                         "names": [
                           "otel.kind"
@@ -639,27 +252,22 @@ expression: get_spans()
                     }
                   },
                   "children": {
-                    "apollo_router::query_planner::execution::flatten": {
-                      "name": "apollo_router::query_planner::execution::flatten",
+                    "apollo_router::query_planner::execution::sequence": {
+                      "name": "apollo_router::query_planner::execution::sequence",
                       "record": {
                         "entries": [
-                          [
-                            "graphql.path",
-                            "/topProducts/@/reviews/@/product"
-                          ],
                           [
                             "otel.kind",
                             "INTERNAL"
                           ]
                         ],
                         "metadata": {
-                          "name": "flatten",
+                          "name": "sequence",
                           "target": "apollo_router::query_planner::execution",
                           "level": "INFO",
                           "module_path": "apollo_router::query_planner::execution",
                           "fields": {
                             "names": [
-                              "graphql.path",
                               "otel.kind"
                             ]
                           }
@@ -724,7 +332,7 @@ expression: get_spans()
                                   ],
                                   [
                                     "graphql.document",
-                                    "query($representations:[_Any!]!){_entities(representations:$representations){...on Product{name}}}"
+                                    "{topProducts{__typename upc name}}"
                                   ],
                                   [
                                     "graphql.operation.name",
@@ -788,6 +396,10 @@ expression: get_spans()
                                         "http.route",
                                         "/"
                                       ],
+                                      [
+                                        "http.url",
+                                        "https://products.demo.starstuff.dev/"
+                                      ],
                                       [
                                         "net.transport",
                                         "ip_tcp"
@@ -808,6 +420,7 @@ expression: get_spans()
                                           "net.peer.name",
                                           "net.peer.port",
                                           "http.route",
+                                          "http.url",
                                           "net.transport",
                                           "apollo.subgraph.name"
                                         ]
@@ -867,131 +480,75 @@ expression: get_spans()
                               "children": {}
                             }
                           }
-                        }
-                      }
-                    },
-                    "apollo_router::query_planner::execution::flatten": {
-                      "name": "apollo_router::query_planner::execution::flatten",
-                      "record": {
-                        "entries": [
-                          [
-                            "graphql.path",
-                            "/topProducts/@/reviews/@/author"
-                          ],
-                          [
-                            "otel.kind",
-                            "INTERNAL"
-                          ]
-                        ],
-                        "metadata": {
-                          "name": "flatten",
-                          "target": "apollo_router::query_planner::execution",
-                          "level": "INFO",
-                          "module_path": "apollo_router::query_planner::execution",
-                          "fields": {
-                            "names": [
-                              "graphql.path",
-                              "otel.kind"
-                            ]
-                          }
-                        }
-                      },
-                      "children": {
-                        "apollo_router::query_planner::execution::fetch": {
-                          "name": "apollo_router::query_planner::execution::fetch",
+                        },
+                        "apollo_router::query_planner::execution::flatten": {
+                          "name": "apollo_router::query_planner::execution::flatten",
                           "record": {
                             "entries": [
                               [
-                                "otel.kind",
-                                "INTERNAL"
-                              ],
-                              [
-                                "apollo.subgraph.name",
-                                "accounts"
+                                "graphql.path",
+                                "/topProducts/@"
                               ],
                               [
-                                "apollo_private.sent_time_offset",
-                                0
+                                "otel.kind",
+                                "INTERNAL"
                               ]
                             ],
                             "metadata": {
-                              "name": "fetch",
+                              "name": "flatten",
                               "target": "apollo_router::query_planner::execution",
                               "level": "INFO",
                               "module_path": "apollo_router::query_planner::execution",
                               "fields": {
                                 "names": [
-                                  "otel.kind",
-                                  "apollo.subgraph.name",
-                                  "apollo_private.sent_time_offset"
+                                  "graphql.path",
+                                  "otel.kind"
                                 ]
                               }
                             }
                           },
                           "children": {
-                            "apollo_router::query_planner::fetch::make_variables": {
-                              "name": "apollo_router::query_planner::fetch::make_variables",
-                              "record": {
-                                "entries": [],
-                                "metadata": {
-                                  "name": "make_variables",
-                                  "target": "apollo_router::query_planner::fetch",
-                                  "level": "DEBUG",
-                                  "module_path": "apollo_router::query_planner::fetch",
-                                  "fields": {
-                                    "names": []
-                                  }
-                                }
-                              },
-                              "children": {}
-                            },
-                            "apollo_router::plugins::telemetry::subgraph": {
-                              "name": "apollo_router::plugins::telemetry::subgraph",
+                            "apollo_router::query_planner::execution::fetch": {
+                              "name": "apollo_router::query_planner::execution::fetch",
                               "record": {
                                 "entries": [
                                   [
-                                    "apollo.subgraph.name",
-                                    "accounts"
-                                  ],
-                                  [
-                                    "graphql.document",
-                                    "query($representations:[_Any!]!){_entities(representations:$representations){...on User{name}}}"
+                                    "otel.kind",
+                                    "INTERNAL"
                                   ],
                                   [
-                                    "graphql.operation.name",
-                                    ""
+                                    "apollo.subgraph.name",
+                                    "reviews"
                                   ],
                                   [
-                                    "otel.kind",
-                                    "INTERNAL"
+                                    "apollo_private.sent_time_offset",
+                                    0
                                   ]
                                 ],
                                 "metadata": {
-                                  "name": "subgraph",
-                                  "target": "apollo_router::plugins::telemetry",
+                                  "name": "fetch",
+                                  "target": "apollo_router::query_planner::execution",
                                   "level": "INFO",
-                                  "module_path": "apollo_router::plugins::telemetry",
+                                  "module_path": "apollo_router::query_planner::execution",
                                   "fields": {
                                     "names": [
-                                      "apollo.subgraph.name",
-                                      "graphql.document",
-                                      "graphql.operation.name",
                                       "otel.kind",
-                                      "apollo_private.ftv1"
+                                      "apollo.subgraph.name",
+                                      "apollo_private.sent_time_offset"
                                     ]
                                   }
                                 }
                               },
                               "children": {
-                                "apollo_router::services::subgraph_service::body_compression": {
-                                  "name": "apollo_router::services::subgraph_service::body_compression",
+                                "apollo_router::query_planner::fetch::make_variables": {
+                                  "name": "apollo_router::query_planner::fetch::make_variables",
                                   "record": {
                                     "entries": [],
                                     "metadata": {
-                                      "name": "body_compression",
-                                      "target": "apollo_router::services::subgraph_service",
+                                      "name": "make_variables",
+                                      "target": "apollo_router::query_planner::fetch",
                                       "level": "DEBUG",
-                                      "module_path": "apollo_router::services::subgraph_service",
+                                      "module_path": "apollo_router::query_planner::fetch",
                                       "fields": {
                                         "names": []
                                       }
@@ -999,129 +556,686 @@ expression: get_spans()
                                   },
                                   "children": {}
                                 },
-                                "apollo_router::services::subgraph_service::subgraph_request": {
-                                  "name": "apollo_router::services::subgraph_service::subgraph_request",
+                                "apollo_router::plugins::telemetry::subgraph": {
+                                  "name": "apollo_router::plugins::telemetry::subgraph",
                                   "record": {
                                     "entries": [
                                       [
-                                        "otel.kind",
-                                        "CLIENT"
-                                      ],
-                                      [
-                                        "net.peer.name",
-                                        "accounts.demo.starstuff.dev"
-                                      ],
-                                      [
-                                        "net.peer.port",
-                                        "443"
+                                        "apollo.subgraph.name",
+                                        "reviews"
                                       ],
                                       [
-                                        "http.route",
-                                        "/"
+                                        "graphql.document",
+                                        "query($representations:[_Any!]!){_entities(representations:$representations){...on Product{reviews{id product{__typename upc}author{__typename id}}}}}"
                                       ],
                                       [
-                                        "net.transport",
-                                        "ip_tcp"
+                                        "graphql.operation.name",
+                                        ""
                                       ],
                                       [
-                                        "apollo.subgraph.name",
-                                        "accounts"
+                                        "otel.kind",
+                                        "INTERNAL"
                                       ]
                                     ],
                                     "metadata": {
-                                      "name": "subgraph_request",
-                                      "target": "apollo_router::services::subgraph_service",
+                                      "name": "subgraph",
+                                      "target": "apollo_router::plugins::telemetry",
                                       "level": "INFO",
-                                      "module_path": "apollo_router::services::subgraph_service",
+                                      "module_path": "apollo_router::plugins::telemetry",
                                       "fields": {
                                         "names": [
+                                          "apollo.subgraph.name",
+                                          "graphql.document",
+                                          "graphql.operation.name",
                                           "otel.kind",
-                                          "net.peer.name",
-                                          "net.peer.port",
-                                          "http.route",
-                                          "net.transport",
-                                          "apollo.subgraph.name"
+                                          "apollo_private.ftv1"
                                         ]
                                       }
                                     }
                                   },
-                                  "children": {}
+                                  "children": {
+                                    "apollo_router::services::subgraph_service::body_compression": {
+                                      "name": "apollo_router::services::subgraph_service::body_compression",
+                                      "record": {
+                                        "entries": [],
+                                        "metadata": {
+                                          "name": "body_compression",
+                                          "target": "apollo_router::services::subgraph_service",
+                                          "level": "DEBUG",
+                                          "module_path": "apollo_router::services::subgraph_service",
+                                          "fields": {
+                                            "names": []
+                                          }
+                                        }
+                                      },
+                                      "children": {}
+                                    },
+                                    "apollo_router::services::subgraph_service::subgraph_request": {
+                                      "name": "apollo_router::services::subgraph_service::subgraph_request",
+                                      "record": {
+                                        "entries": [
+                                          [
+                                            "otel.kind",
+                                            "CLIENT"
+                                          ],
+                                          [
+                                            "net.peer.name",
+                                            "reviews.demo.starstuff.dev"
+                                          ],
+                                          [
+                                            "net.peer.port",
+                                            "443"
+                                          ],
+                                          [
+                                            "http.route",
+                                            "/"
+                                          ],
+                                          [
+                                            "http.url",
+                                            "https://reviews.demo.starstuff.dev/"
+                                          ],
+                                          [
+                                            "net.transport",
+                                            "ip_tcp"
+                                          ],
+                                          [
+                                            "apollo.subgraph.name",
+                                            "reviews"
+                                          ]
+                                        ],
+                                        "metadata": {
+                                          "name": "subgraph_request",
+                                          "target": "apollo_router::services::subgraph_service",
+                                          "level": "INFO",
+                                          "module_path": "apollo_router::services::subgraph_service",
+                                          "fields": {
+                                            "names": [
+                                              "otel.kind",
+                                              "net.peer.name",
+                                              "net.peer.port",
+                                              "http.route",
+                                              "http.url",
+                                              "net.transport",
+                                              "apollo.subgraph.name"
+                                            ]
+                                          }
+                                        }
+                                      },
+                                      "children": {}
+                                    },
+                                    "apollo_router::services::subgraph_service::aggregate_response_data": {
+                                      "name": "apollo_router::services::subgraph_service::aggregate_response_data",
+                                      "record": {
+                                        "entries": [],
+                                        "metadata": {
+                                          "name": "aggregate_response_data",
+                                          "target": "apollo_router::services::subgraph_service",
+                                          "level": "DEBUG",
+                                          "module_path": "apollo_router::services::subgraph_service",
+                                          "fields": {
+                                            "names": []
+                                          }
+                                        }
+                                      },
+                                      "children": {}
+                                    },
+                                    "apollo_router::services::subgraph_service::parse_subgraph_response": {
+                                      "name": "apollo_router::services::subgraph_service::parse_subgraph_response",
+                                      "record": {
+                                        "entries": [],
+                                        "metadata": {
+                                          "name": "parse_subgraph_response",
+                                          "target": "apollo_router::services::subgraph_service",
+                                          "level": "DEBUG",
+                                          "module_path": "apollo_router::services::subgraph_service",
+                                          "fields": {
+                                            "names": []
+                                          }
+                                        }
+                                      },
+                                      "children": {}
+                                    }
+                                  }
                                 },
-                                "apollo_router::services::subgraph_service::aggregate_response_data": {
-                                  "name": "apollo_router::services::subgraph_service::aggregate_response_data",
+                                "apollo_router::query_planner::fetch::response_insert": {
+                                  "name": "apollo_router::query_planner::fetch::response_insert",
                                   "record": {
                                     "entries": [],
                                     "metadata": {
-                                      "name": "aggregate_response_data",
-                                      "target": "apollo_router::services::subgraph_service",
+                                      "name": "response_insert",
+                                      "target": "apollo_router::query_planner::fetch",
                                       "level": "DEBUG",
-                                      "module_path": "apollo_router::services::subgraph_service",
+                                      "module_path": "apollo_router::query_planner::fetch",
                                       "fields": {
                                         "names": []
                                       }
                                     }
                                   },
                                   "children": {}
-                                },
-                                "apollo_router::services::subgraph_service::parse_subgraph_response": {
-                                  "name": "apollo_router::services::subgraph_service::parse_subgraph_response",
+                                }
+                              }
+                            }
+                          }
+                        },
+                        "apollo_router::query_planner::execution::parallel": {
+                          "name": "apollo_router::query_planner::execution::parallel",
+                          "record": {
+                            "entries": [
+                              [
+                                "otel.kind",
+                                "INTERNAL"
+                              ]
+                            ],
+                            "metadata": {
+                              "name": "parallel",
+                              "target": "apollo_router::query_planner::execution",
+                              "level": "INFO",
+                              "module_path": "apollo_router::query_planner::execution",
+                              "fields": {
+                                "names": [
+                                  "otel.kind"
+                                ]
+                              }
+                            }
+                          },
+                          "children": {
+                            "apollo_router::query_planner::execution::flatten": {
+                              "name": "apollo_router::query_planner::execution::flatten",
+                              "record": {
+                                "entries": [
+                                  [
+                                    "graphql.path",
+                                    "/topProducts/@/reviews/@/product"
+                                  ],
+                                  [
+                                    "otel.kind",
+                                    "INTERNAL"
+                                  ]
+                                ],
+                                "metadata": {
+                                  "name": "flatten",
+                                  "target": "apollo_router::query_planner::execution",
+                                  "level": "INFO",
+                                  "module_path": "apollo_router::query_planner::execution",
+                                  "fields": {
+                                    "names": [
+                                      "graphql.path",
+                                      "otel.kind"
+                                    ]
+                                  }
+                                }
+                              },
+                              "children": {
+                                "apollo_router::query_planner::execution::fetch": {
+                                  "name": "apollo_router::query_planner::execution::fetch",
                                   "record": {
-                                    "entries": [],
+                                    "entries": [
+                                      [
+                                        "otel.kind",
+                                        "INTERNAL"
+                                      ],
+                                      [
+                                        "apollo.subgraph.name",
+                                        "products"
+                                      ],
+                                      [
+                                        "apollo_private.sent_time_offset",
+                                        0
+                                      ]
+                                    ],
                                     "metadata": {
-                                      "name": "parse_subgraph_response",
-                                      "target": "apollo_router::services::subgraph_service",
-                                      "level": "DEBUG",
-                                      "module_path": "apollo_router::services::subgraph_service",
+                                      "name": "fetch",
+                                      "target": "apollo_router::query_planner::execution",
+                                      "level": "INFO",
+                                      "module_path": "apollo_router::query_planner::execution",
                                       "fields": {
-                                        "names": []
+                                        "names": [
+                                          "otel.kind",
+                                          "apollo.subgraph.name",
+                                          "apollo_private.sent_time_offset"
+                                        ]
                                       }
                                     }
                                   },
-                                  "children": {}
+                                  "children": {
+                                    "apollo_router::query_planner::fetch::make_variables": {
+                                      "name": "apollo_router::query_planner::fetch::make_variables",
+                                      "record": {
+                                        "entries": [],
+                                        "metadata": {
+                                          "name": "make_variables",
+                                          "target": "apollo_router::query_planner::fetch",
+                                          "level": "DEBUG",
+                                          "module_path": "apollo_router::query_planner::fetch",
+                                          "fields": {
+                                            "names": []
+                                          }
+                                        }
+                                      },
+                                      "children": {}
+                                    },
+                                    "apollo_router::plugins::telemetry::subgraph": {
+                                      "name": "apollo_router::plugins::telemetry::subgraph",
+                                      "record": {
+                                        "entries": [
+                                          [
+                                            "apollo.subgraph.name",
+                                            "products"
+                                          ],
+                                          [
+                                            "graphql.document",
+                                            "query($representations:[_Any!]!){_entities(representations:$representations){...on Product{name}}}"
+                                          ],
+                                          [
+                                            "graphql.operation.name",
+                                            ""
+                                          ],
+                                          [
+                                            "otel.kind",
+                                            "INTERNAL"
+                                          ]
+                                        ],
+                                        "metadata": {
+                                          "name": "subgraph",
+                                          "target": "apollo_router::plugins::telemetry",
+                                          "level": "INFO",
+                                          "module_path": "apollo_router::plugins::telemetry",
+                                          "fields": {
+                                            "names": [
+                                              "apollo.subgraph.name",
+                                              "graphql.document",
+                                              "graphql.operation.name",
+                                              "otel.kind",
+                                              "apollo_private.ftv1"
+                                            ]
+                                          }
+                                        }
+                                      },
+                                      "children": {
+                                        "apollo_router::services::subgraph_service::body_compression": {
+                                          "name": "apollo_router::services::subgraph_service::body_compression",
+                                          "record": {
+                                            "entries": [],
+                                            "metadata": {
+                                              "name": "body_compression",
+                                              "target": "apollo_router::services::subgraph_service",
+                                              "level": "DEBUG",
+                                              "module_path": "apollo_router::services::subgraph_service",
+                                              "fields": {
+                                                "names": []
+                                              }
+                                            }
+                                          },
+                                          "children": {}
+                                        },
+                                        "apollo_router::services::subgraph_service::subgraph_request": {
+                                          "name": "apollo_router::services::subgraph_service::subgraph_request",
+                                          "record": {
+                                            "entries": [
+                                              [
+                                                "otel.kind",
+                                                "CLIENT"
+                                              ],
+                                              [
+                                                "net.peer.name",
+                                                "products.demo.starstuff.dev"
+                                              ],
+                                              [
+                                                "net.peer.port",
+                                                "443"
+                                              ],
+                                              [
+                                                "http.route",
+                                                "/"
+                                              ],
+                                              [
+                                                "http.url",
+                                                "https://products.demo.starstuff.dev/"
+                                              ],
+                                              [
+                                                "net.transport",
+                                                "ip_tcp"
+                                              ],
+                                              [
+                                                "apollo.subgraph.name",
+                                                "products"
+                                              ]
+                                            ],
+                                            "metadata": {
+                                              "name": "subgraph_request",
+                                              "target": "apollo_router::services::subgraph_service",
+                                              "level": "INFO",
+                                              "module_path": "apollo_router::services::subgraph_service",
+                                              "fields": {
+                                                "names": [
+                                                  "otel.kind",
+                                                  "net.peer.name",
+                                                  "net.peer.port",
+                                                  "http.route",
+                                                  "http.url",
+                                                  "net.transport",
+                                                  "apollo.subgraph.name"
+                                                ]
+                                              }
+                                            }
+                                          },
+                                          "children": {}
+                                        },
+                                        "apollo_router::services::subgraph_service::aggregate_response_data": {
+                                          "name": "apollo_router::services::subgraph_service::aggregate_response_data",
+                                          "record": {
+                                            "entries": [],
+                                            "metadata": {
+                                              "name": "aggregate_response_data",
+                                              "target": "apollo_router::services::subgraph_service",
+                                              "level": "DEBUG",
+                                              "module_path": "apollo_router::services::subgraph_service",
+                                              "fields": {
+                                                "names": []
+                                              }
+                                            }
+                                          },
+                                          "children": {}
+                                        },
+                                        "apollo_router::services::subgraph_service::parse_subgraph_response": {
+                                          "name": "apollo_router::services::subgraph_service::parse_subgraph_response",
+                                          "record": {
+                                            "entries": [],
+                                            "metadata": {
+                                              "name": "parse_subgraph_response",
+                                              "target": "apollo_router::services::subgraph_service",
+                                              "level": "DEBUG",
+                                              "module_path": "apollo_router::services::subgraph_service",
+                                              "fields": {
+                                                "names": []
+                                              }
+                                            }
+                                          },
+                                          "children": {}
+                                        }
+                                      }
+                                    },
+                                    "apollo_router::query_planner::fetch::response_insert": {
+                                      "name": "apollo_router::query_planner::fetch::response_insert",
+                                      "record": {
+                                        "entries": [],
+                                        "metadata": {
+                                          "name": "response_insert",
+                                          "target": "apollo_router::query_planner::fetch",
+                                          "level": "DEBUG",
+                                          "module_path": "apollo_router::query_planner::fetch",
+                                          "fields": {
+                                            "names": []
+                                          }
+                                        }
+                                      },
+                                      "children": {}
+                                    }
+                                  }
                                 }
                               }
                             },
-                            "apollo_router::query_planner::fetch::response_insert": {
-                              "name": "apollo_router::query_planner::fetch::response_insert",
+                            "apollo_router::query_planner::execution::flatten": {
+                              "name": "apollo_router::query_planner::execution::flatten",
                               "record": {
-                                "entries": [],
+                                "entries": [
+                                  [
+                                    "graphql.path",
+                                    "/topProducts/@/reviews/@/author"
+                                  ],
+                                  [
+                                    "otel.kind",
+                                    "INTERNAL"
+                                  ]
+                                ],
                                 "metadata": {
-                                  "name": "response_insert",
-                                  "target": "apollo_router::query_planner::fetch",
-                                  "level": "DEBUG",
-                                  "module_path": "apollo_router::query_planner::fetch",
+                                  "name": "flatten",
+                                  "target": "apollo_router::query_planner::execution",
+                                  "level": "INFO",
+                                  "module_path": "apollo_router::query_planner::execution",
                                   "fields": {
-                                    "names": []
+                                    "names": [
+                                      "graphql.path",
+                                      "otel.kind"
+                                    ]
                                   }
                                 }
                               },
-                              "children": {}
+                              "children": {
+                                "apollo_router::query_planner::execution::fetch": {
+                                  "name": "apollo_router::query_planner::execution::fetch",
+                                  "record": {
+                                    "entries": [
+                                      [
+                                        "otel.kind",
+                                        "INTERNAL"
+                                      ],
+                                      [
+                                        "apollo.subgraph.name",
+                                        "accounts"
+                                      ],
+                                      [
+                                        "apollo_private.sent_time_offset",
+                                        0
+                                      ]
+                                    ],
+                                    "metadata": {
+                                      "name": "fetch",
+                                      "target": "apollo_router::query_planner::execution",
+                                      "level": "INFO",
+                                      "module_path": "apollo_router::query_planner::execution",
+                                      "fields": {
+                                        "names": [
+                                          "otel.kind",
+                                          "apollo.subgraph.name",
+                                          "apollo_private.sent_time_offset"
+                                        ]
+                                      }
+                                    }
+                                  },
+                                  "children": {
+                                    "apollo_router::query_planner::fetch::make_variables": {
+                                      "name": "apollo_router::query_planner::fetch::make_variables",
+                                      "record": {
+                                        "entries": [],
+                                        "metadata": {
+                                          "name": "make_variables",
+                                          "target": "apollo_router::query_planner::fetch",
+                                          "level": "DEBUG",
+                                          "module_path": "apollo_router::query_planner::fetch",
+                                          "fields": {
+                                            "names": []
+                                          }
+                                        }
+                                      },
+                                      "children": {}
+                                    },
+                                    "apollo_router::plugins::telemetry::subgraph": {
+                                      "name": "apollo_router::plugins::telemetry::subgraph",
+                                      "record": {
+                                        "entries": [
+                                          [
+                                            "apollo.subgraph.name",
+                                            "accounts"
+                                          ],
+                                          [
+                                            "graphql.document",
+                                            "query($representations:[_Any!]!){_entities(representations:$representations){...on User{name}}}"
+                                          ],
+                                          [
+                                            "graphql.operation.name",
+                                            ""
+                                          ],
+                                          [
+                                            "otel.kind",
+                                            "INTERNAL"
+                                          ]
+                                        ],
+                                        "metadata": {
+                                          "name": "subgraph",
+                                          "target": "apollo_router::plugins::telemetry",
+                                          "level": "INFO",
+                                          "module_path": "apollo_router::plugins::telemetry",
+                                          "fields": {
+                                            "names": [
+                                              "apollo.subgraph.name",
+                                              "graphql.document",
+                                              "graphql.operation.name",
+                                              "otel.kind",
+                                              "apollo_private.ftv1"
+                                            ]
+                                          }
+                                        }
+                                      },
+                                      "children": {
+                                        "apollo_router::services::subgraph_service::body_compression": {
+                                          "name": "apollo_router::services::subgraph_service::body_compression",
+                                          "record": {
+                                            "entries": [],
+                                            "metadata": {
+                                              "name": "body_compression",
+                                              "target": "apollo_router::services::subgraph_service",
+                                              "level": "DEBUG",
+                                              "module_path": "apollo_router::services::subgraph_service",
+                                              "fields": {
+                                                "names": []
+                                              }
+                                            }
+                                          },
+                                          "children": {}
+                                        },
+                                        "apollo_router::services::subgraph_service::subgraph_request": {
+                                          "name": "apollo_router::services::subgraph_service::subgraph_request",
+                                          "record": {
+                                            "entries": [
+                                              [
+                                                "otel.kind",
+                                                "CLIENT"
+                                              ],
+                                              [
+                                                "net.peer.name",
+                                                "accounts.demo.starstuff.dev"
+                                              ],
+                                              [
+                                                "net.peer.port",
+                                                "443"
+                                              ],
+                                              [
+                                                "http.route",
+                                                "/"
+                                              ],
+                                              [
+                                                "http.url",
+                                                "https://accounts.demo.starstuff.dev/"
+                                              ],
+                                              [
+                                                "net.transport",
+                                                "ip_tcp"
+                                              ],
+                                              [
+                                                "apollo.subgraph.name",
+                                                "accounts"
+                                              ]
+                                            ],
+                                            "metadata": {
+                                              "name": "subgraph_request",
+                                              "target": "apollo_router::services::subgraph_service",
+                                              "level": "INFO",
+                                              "module_path": "apollo_router::services::subgraph_service",
+                                              "fields": {
+                                                "names": [
+                                                  "otel.kind",
+                                                  "net.peer.name",
+                                                  "net.peer.port",
+                                                  "http.route",
+                                                  "http.url",
+                                                  "net.transport",
+                                                  "apollo.subgraph.name"
+                                                ]
+                                              }
+                                            }
+                                          },
+                                          "children": {}
+                                        },
+                                        "apollo_router::services::subgraph_service::aggregate_response_data": {
+                                          "name": "apollo_router::services::subgraph_service::aggregate_response_data",
+                                          "record": {
+                                            "entries": [],
+                                            "metadata": {
+                                              "name": "aggregate_response_data",
+                                              "target": "apollo_router::services::subgraph_service",
+                                              "level": "DEBUG",
+                                              "module_path": "apollo_router::services::subgraph_service",
+                                              "fields": {
+                                                "names": []
+                                              }
+                                            }
+                                          },
+                                          "children": {}
+                                        },
+                                        "apollo_router::services::subgraph_service::parse_subgraph_response": {
+                                          "name": "apollo_router::services::subgraph_service::parse_subgraph_response",
+                                          "record": {
+                                            "entries": [],
+                                            "metadata": {
+                                              "name": "parse_subgraph_response",
+                                              "target": "apollo_router::services::subgraph_service",
+                                              "level": "DEBUG",
+                                              "module_path": "apollo_router::services::subgraph_service",
+                                              "fields": {
+                                                "names": []
+                                              }
+                                            }
+                                          },
+                                          "children": {}
+                                        }
+                                      }
+                                    },
+                                    "apollo_router::query_planner::fetch::response_insert": {
+                                      "name": "apollo_router::query_planner::fetch::response_insert",
+                                      "record": {
+                                        "entries": [],
+                                        "metadata": {
+                                          "name": "response_insert",
+                                          "target": "apollo_router::query_planner::fetch",
+                                          "level": "DEBUG",
+                                          "module_path": "apollo_router::query_planner::fetch",
+                                          "fields": {
+                                            "names": []
+                                          }
+                                        }
+                                      },
+                                      "children": {}
+                                    }
+                                  }
+                                }
+                              }
                             }
                           }
                         }
                       }
                     }
                   }
+                },
+                "apollo_router::services::execution_service::format_response": {
+                  "name": "apollo_router::services::execution_service::format_response",
+                  "record": {
+                    "entries": [],
+                    "metadata": {
+                      "name": "format_response",
+                      "target": "apollo_router::services::execution_service",
+                      "level": "DEBUG",
+                      "module_path": "apollo_router::services::execution_service",
+                      "fields": {
+                        "names": []
+                      }
+                    }
+                  },
+                  "children": {}
                 }
               }
             }
           }
-        },
-        "apollo_router::services::execution_service::format_response": {
-          "name": "apollo_router::services::execution_service::format_response",
-          "record": {
-            "entries": [],
-            "metadata": {
-              "name": "format_response",
-              "target": "apollo_router::services::execution_service",
-              "level": "DEBUG",
-              "module_path": "apollo_router::services::execution_service",
-              "fields": {
-                "names": []
-              }
-            }
-          },
-          "children": {}
         }
       }
     }
diff --git a/apollo-router/tests/snapshots/integration_tests__traced_basic_request.snap b/apollo-router/tests/snapshots/integration_tests__traced_basic_request.snap
index 1a1c2edb19..4aeec38297 100644
--- a/apollo-router/tests/snapshots/integration_tests__traced_basic_request.snap
+++ b/apollo-router/tests/snapshots/integration_tests__traced_basic_request.snap
@@ -17,210 +17,165 @@ expression: get_spans()
     }
   },
   "children": {
-    "apollo_router::plugins::telemetry::supergraph": {
-      "name": "apollo_router::plugins::telemetry::supergraph",
+    "apollo_router::axum_factory::utils::request": {
+      "name": "apollo_router::axum_factory::utils::request",
       "record": {
         "entries": [
           [
-            "graphql.document",
-            "{ topProducts { name name2:name } }"
+            "http.method",
+            "POST"
           ],
           [
-            "graphql.operation.name",
-            ""
+            "http.route",
+            "http://default/"
           ],
           [
-            "client.name",
-            ""
-          ],
-          [
-            "client.version",
-            ""
+            "http.flavor",
+            "HTTP/1.1"
           ],
           [
             "otel.kind",
-            "INTERNAL"
-          ],
-          [
-            "apollo_private.field_level_instrumentation_ratio",
-            0.0
-          ],
-          [
-            "apollo_private.graphql.variables",
-            "{\"reviewsForAuthorAuthorId\":\"\",\"topProductsFirst\":\"\"}"
-          ],
-          [
-            "apollo_private.http.request_headers",
-            "{\"content-type\":[\"\"]}"
-          ],
-          [
-            "apollo_private.operation_signature",
-            "# -\n{topProducts{name name}}"
+            "SERVER"
           ]
         ],
         "metadata": {
-          "name": "supergraph",
-          "target": "apollo_router::plugins::telemetry",
+          "name": "request",
+          "target": "apollo_router::axum_factory::utils",
           "level": "INFO",
-          "module_path": "apollo_router::plugins::telemetry",
+          "module_path": "apollo_router::axum_factory::utils",
           "fields": {
             "names": [
-              "graphql.document",
-              "graphql.operation.name",
-              "client.name",
-              "client.version",
-              "otel.kind",
-              "apollo_private.field_level_instrumentation_ratio",
-              "apollo_private.operation_signature",
-              "apollo_private.graphql.variables",
-              "apollo_private.http.request_headers"
+              "http.method",
+              "http.route",
+              "http.flavor",
+              "otel.kind"
             ]
           }
         }
       },
       "children": {
-        "apollo_router::services::supergraph_service::query_planning": {
-          "name": "apollo_router::services::supergraph_service::query_planning",
+        "apollo_router::plugins::telemetry::router": {
+          "name": "apollo_router::plugins::telemetry::router",
           "record": {
             "entries": [
               [
-                "graphql.document",
-                "{ topProducts { name name2:name } }"
+                "http.method",
+                "POST"
+              ],
+              [
+                "http.route",
+                "http://default/"
+              ],
+              [
+                "http.flavor",
+                "HTTP/1.1"
+              ],
+              [
+                "trace_id",
+                "[REDACTED]"
               ],
               [
-                "graphql.operation.name",
+                "client.name",
                 ""
               ],
               [
-                "otel.kind",
-                "INTERNAL"
-              ]
-            ],
-            "metadata": {
-              "name": "query_planning",
-              "target": "apollo_router::services::supergraph_service",
-              "level": "INFO",
-              "module_path": "apollo_router::services::supergraph_service",
-              "fields": {
-                "names": [
-                  "graphql.document",
-                  "graphql.operation.name",
-                  "otel.kind"
-                ]
-              }
-            }
-          },
-          "children": {
-            "apollo_router::query_planner::bridge_query_planner::parse_query": {
-              "name": "apollo_router::query_planner::bridge_query_planner::parse_query",
-              "record": {
-                "entries": [
-                  [
-                    "otel.kind",
-                    "INTERNAL"
-                  ]
-                ],
-                "metadata": {
-                  "name": "parse_query",
-                  "target": "apollo_router::query_planner::bridge_query_planner",
-                  "level": "INFO",
-                  "module_path": "apollo_router::query_planner::bridge_query_planner",
-                  "fields": {
-                    "names": [
-                      "otel.kind"
-                    ]
-                  }
-                }
-              },
-              "children": {}
-            }
-          }
-        },
-        "apollo_router::plugins::telemetry::execution": {
-          "name": "apollo_router::plugins::telemetry::execution",
-          "record": {
-            "entries": [
+                "client.version",
+                ""
+              ],
               [
                 "otel.kind",
                 "INTERNAL"
               ],
               [
-                "message",
-                "dropping telemetry..."
+                "apollo_private.http.request_headers",
+                "{\"content-type\":[\"\"]}"
+              ],
+              [
+                "apollo_private.duration_ns",
+                0
+              ],
+              [
+                "otel.status_code",
+                "Ok"
               ]
             ],
             "metadata": {
-              "name": "execution",
+              "name": "router",
               "target": "apollo_router::plugins::telemetry",
               "level": "INFO",
               "module_path": "apollo_router::plugins::telemetry",
               "fields": {
                 "names": [
-                  "otel.kind"
+                  "http.method",
+                  "http.route",
+                  "http.flavor",
+                  "trace_id",
+                  "client.name",
+                  "client.version",
+                  "otel.kind",
+                  "otel.status_code",
+                  "apollo_private.duration_ns",
+                  "apollo_private.http.request_headers",
+                  "apollo_private.http.response_headers"
                 ]
               }
             }
           },
           "children": {
-            "apollo_router::query_planner::execution::fetch": {
-              "name": "apollo_router::query_planner::execution::fetch",
+            "apollo_router::plugins::telemetry::supergraph": {
+              "name": "apollo_router::plugins::telemetry::supergraph",
               "record": {
                 "entries": [
+                  [
+                    "graphql.document",
+                    "{ topProducts { name name2:name } }"
+                  ],
+                  [
+                    "graphql.operation.name",
+                    ""
+                  ],
                   [
                     "otel.kind",
                     "INTERNAL"
                   ],
                   [
-                    "apollo.subgraph.name",
-                    "products"
+                    "apollo_private.field_level_instrumentation_ratio",
+                    0.01
+                  ],
+                  [
+                    "apollo_private.graphql.variables",
+                    "{\"reviewsForAuthorAuthorId\":\"\",\"topProductsFirst\":\"\"}"
                   ],
                   [
-                    "apollo_private.sent_time_offset",
-                    0
+                    "apollo_private.operation_signature",
+                    "# -\n{topProducts{name name}}"
                   ]
                 ],
                 "metadata": {
-                  "name": "fetch",
-                  "target": "apollo_router::query_planner::execution",
+                  "name": "supergraph",
+                  "target": "apollo_router::plugins::telemetry",
                   "level": "INFO",
-                  "module_path": "apollo_router::query_planner::execution",
+                  "module_path": "apollo_router::plugins::telemetry",
                   "fields": {
                     "names": [
+                      "graphql.document",
+                      "graphql.operation.name",
                       "otel.kind",
-                      "apollo.subgraph.name",
-                      "apollo_private.sent_time_offset"
+                      "apollo_private.field_level_instrumentation_ratio",
+                      "apollo_private.operation_signature",
+                      "apollo_private.graphql.variables"
                     ]
                   }
                 }
               },
               "children": {
-                "apollo_router::query_planner::fetch::make_variables": {
-                  "name": "apollo_router::query_planner::fetch::make_variables",
-                  "record": {
-                    "entries": [],
-                    "metadata": {
-                      "name": "make_variables",
-                      "target": "apollo_router::query_planner::fetch",
-                      "level": "DEBUG",
-                      "module_path": "apollo_router::query_planner::fetch",
-                      "fields": {
-                        "names": []
-                      }
-                    }
-                  },
-                  "children": {}
-                },
-                "apollo_router::plugins::telemetry::subgraph": {
-                  "name": "apollo_router::plugins::telemetry::subgraph",
+                "apollo_router::services::supergraph_service::query_planning": {
+                  "name": "apollo_router::services::supergraph_service::query_planning",
                   "record": {
                     "entries": [
-                      [
-                        "apollo.subgraph.name",
-                        "products"
-                      ],
                       [
                         "graphql.document",
-                        "{topProducts{name name2:name}}"
+                        "{ topProducts { name name2:name } }"
                       ],
                       [
                         "graphql.operation.name",
@@ -232,129 +187,289 @@ expression: get_spans()
                       ]
                     ],
                     "metadata": {
-                      "name": "subgraph",
-                      "target": "apollo_router::plugins::telemetry",
+                      "name": "query_planning",
+                      "target": "apollo_router::services::supergraph_service",
                       "level": "INFO",
-                      "module_path": "apollo_router::plugins::telemetry",
+                      "module_path": "apollo_router::services::supergraph_service",
                       "fields": {
                         "names": [
-                          "apollo.subgraph.name",
                           "graphql.document",
                           "graphql.operation.name",
-                          "otel.kind",
-                          "apollo_private.ftv1"
+                          "otel.kind"
                         ]
                       }
                     }
                   },
                   "children": {
-                    "apollo_router::services::subgraph_service::body_compression": {
-                      "name": "apollo_router::services::subgraph_service::body_compression",
+                    "apollo_router::query_planner::bridge_query_planner::parse_query": {
+                      "name": "apollo_router::query_planner::bridge_query_planner::parse_query",
                       "record": {
-                        "entries": [],
+                        "entries": [
+                          [
+                            "otel.kind",
+                            "INTERNAL"
+                          ]
+                        ],
                         "metadata": {
-                          "name": "body_compression",
-                          "target": "apollo_router::services::subgraph_service",
-                          "level": "DEBUG",
-                          "module_path": "apollo_router::services::subgraph_service",
+                          "name": "parse_query",
+                          "target": "apollo_router::query_planner::bridge_query_planner",
+                          "level": "INFO",
+                          "module_path": "apollo_router::query_planner::bridge_query_planner",
                           "fields": {
-                            "names": []
+                            "names": [
+                              "otel.kind"
+                            ]
                           }
                         }
                       },
                       "children": {}
-                    },
-                    "apollo_router::services::subgraph_service::subgraph_request": {
-                      "name": "apollo_router::services::subgraph_service::subgraph_request",
+                    }
+                  }
+                },
+                "apollo_router::plugins::telemetry::execution": {
+                  "name": "apollo_router::plugins::telemetry::execution",
+                  "record": {
+                    "entries": [
+                      [
+                        "otel.kind",
+                        "INTERNAL"
+                      ],
+                      [
+                        "message",
+                        "dropping telemetry..."
+                      ]
+                    ],
+                    "metadata": {
+                      "name": "execution",
+                      "target": "apollo_router::plugins::telemetry",
+                      "level": "INFO",
+                      "module_path": "apollo_router::plugins::telemetry",
+                      "fields": {
+                        "names": [
+                          "otel.kind"
+                        ]
+                      }
+                    }
+                  },
+                  "children": {
+                    "apollo_router::query_planner::execution::fetch": {
+                      "name": "apollo_router::query_planner::execution::fetch",
                       "record": {
                         "entries": [
                           [
                             "otel.kind",
-                            "CLIENT"
-                          ],
-                          [
-                            "net.peer.name",
-                            "products.demo.starstuff.dev"
-                          ],
-                          [
-                            "net.peer.port",
-                            "443"
-                          ],
-                          [
-                            "http.route",
-                            "/"
-                          ],
-                          [
-                            "net.transport",
-                            "ip_tcp"
+                            "INTERNAL"
                           ],
                           [
                             "apollo.subgraph.name",
                             "products"
+                          ],
+                          [
+                            "apollo_private.sent_time_offset",
+                            0
                           ]
                         ],
                         "metadata": {
-                          "name": "subgraph_request",
-                          "target": "apollo_router::services::subgraph_service",
+                          "name": "fetch",
+                          "target": "apollo_router::query_planner::execution",
                           "level": "INFO",
-                          "module_path": "apollo_router::services::subgraph_service",
+                          "module_path": "apollo_router::query_planner::execution",
                           "fields": {
                             "names": [
                               "otel.kind",
-                              "net.peer.name",
-                              "net.peer.port",
-                              "http.route",
-                              "net.transport",
-                              "apollo.subgraph.name"
+                              "apollo.subgraph.name",
+                              "apollo_private.sent_time_offset"
                             ]
                           }
                         }
                       },
-                      "children": {}
-                    },
-                    "apollo_router::services::subgraph_service::aggregate_response_data": {
-                      "name": "apollo_router::services::subgraph_service::aggregate_response_data",
-                      "record": {
-                        "entries": [],
-                        "metadata": {
-                          "name": "aggregate_response_data",
-                          "target": "apollo_router::services::subgraph_service",
-                          "level": "DEBUG",
-                          "module_path": "apollo_router::services::subgraph_service",
-                          "fields": {
-                            "names": []
-                          }
-                        }
-                      },
-                      "children": {}
-                    },
-                    "apollo_router::services::subgraph_service::parse_subgraph_response": {
-                      "name": "apollo_router::services::subgraph_service::parse_subgraph_response",
-                      "record": {
-                        "entries": [],
-                        "metadata": {
-                          "name": "parse_subgraph_response",
-                          "target": "apollo_router::services::subgraph_service",
-                          "level": "DEBUG",
-                          "module_path": "apollo_router::services::subgraph_service",
-                          "fields": {
-                            "names": []
+                      "children": {
+                        "apollo_router::query_planner::fetch::make_variables": {
+                          "name": "apollo_router::query_planner::fetch::make_variables",
+                          "record": {
+                            "entries": [],
+                            "metadata": {
+                              "name": "make_variables",
+                              "target": "apollo_router::query_planner::fetch",
+                              "level": "DEBUG",
+                              "module_path": "apollo_router::query_planner::fetch",
+                              "fields": {
+                                "names": []
+                              }
+                            }
+                          },
+                          "children": {}
+                        },
+                        "apollo_router::plugins::telemetry::subgraph": {
+                          "name": "apollo_router::plugins::telemetry::subgraph",
+                          "record": {
+                            "entries": [
+                              [
+                                "apollo.subgraph.name",
+                                "products"
+                              ],
+                              [
+                                "graphql.document",
+                                "{topProducts{name name2:name}}"
+                              ],
+                              [
+                                "graphql.operation.name",
+                                ""
+                              ],
+                              [
+                                "otel.kind",
+                                "INTERNAL"
+                              ]
+                            ],
+                            "metadata": {
+                              "name": "subgraph",
+                              "target": "apollo_router::plugins::telemetry",
+                              "level": "INFO",
+                              "module_path": "apollo_router::plugins::telemetry",
+                              "fields": {
+                                "names": [
+                                  "apollo.subgraph.name",
+                                  "graphql.document",
+                                  "graphql.operation.name",
+                                  "otel.kind",
+                                  "apollo_private.ftv1"
+                                ]
+                              }
+                            }
+                          },
+                          "children": {
+                            "apollo_router::services::subgraph_service::body_compression": {
+                              "name": "apollo_router::services::subgraph_service::body_compression",
+                              "record": {
+                                "entries": [],
+                                "metadata": {
+                                  "name": "body_compression",
+                                  "target": "apollo_router::services::subgraph_service",
+                                  "level": "DEBUG",
+                                  "module_path": "apollo_router::services::subgraph_service",
+                                  "fields": {
+                                    "names": []
+                                  }
+                                }
+                              },
+                              "children": {}
+                            },
+                            "apollo_router::services::subgraph_service::subgraph_request": {
+                              "name": "apollo_router::services::subgraph_service::subgraph_request",
+                              "record": {
+                                "entries": [
+                                  [
+                                    "otel.kind",
+                                    "CLIENT"
+                                  ],
+                                  [
+                                    "net.peer.name",
+                                    "products.demo.starstuff.dev"
+                                  ],
+                                  [
+                                    "net.peer.port",
+                                    "443"
+                                  ],
+                                  [
+                                    "http.route",
+                                    "/"
+                                  ],
+                                  [
+                                    "http.url",
+                                    "https://products.demo.starstuff.dev/"
+                                  ],
+                                  [
+                                    "net.transport",
+                                    "ip_tcp"
+                                  ],
+                                  [
+                                    "apollo.subgraph.name",
+                                    "products"
+                                  ]
+                                ],
+                                "metadata": {
+                                  "name": "subgraph_request",
+                                  "target": "apollo_router::services::subgraph_service",
+                                  "level": "INFO",
+                                  "module_path": "apollo_router::services::subgraph_service",
+                                  "fields": {
+                                    "names": [
+                                      "otel.kind",
+                                      "net.peer.name",
+                                      "net.peer.port",
+                                      "http.route",
+                                      "http.url",
+                                      "net.transport",
+                                      "apollo.subgraph.name"
+                                    ]
+                                  }
+                                }
+                              },
+                              "children": {}
+                            },
+                            "apollo_router::services::subgraph_service::aggregate_response_data": {
+                              "name": "apollo_router::services::subgraph_service::aggregate_response_data",
+                              "record": {
+                                "entries": [],
+                                "metadata": {
+                                  "name": "aggregate_response_data",
+                                  "target": "apollo_router::services::subgraph_service",
+                                  "level": "DEBUG",
+                                  "module_path": "apollo_router::services::subgraph_service",
+                                  "fields": {
+                                    "names": []
+                                  }
+                                }
+                              },
+                              "children": {}
+                            },
+                            "apollo_router::services::subgraph_service::parse_subgraph_response": {
+                              "name": "apollo_router::services::subgraph_service::parse_subgraph_response",
+                              "record": {
+                                "entries": [],
+                                "metadata": {
+                                  "name": "parse_subgraph_response",
+                                  "target": "apollo_router::services::subgraph_service",
+                                  "level": "DEBUG",
+                                  "module_path": "apollo_router::services::subgraph_service",
+                                  "fields": {
+                                    "names": []
+                                  }
+                                }
+                              },
+                              "children": {}
+                            }
                           }
+                        },
+                        "apollo_router::query_planner::fetch::response_insert": {
+                          "name": "apollo_router::query_planner::fetch::response_insert",
+                          "record": {
+                            "entries": [],
+                            "metadata": {
+                              "name": "response_insert",
+                              "target": "apollo_router::query_planner::fetch",
+                              "level": "DEBUG",
+                              "module_path": "apollo_router::query_planner::fetch",
+                              "fields": {
+                                "names": []
+                              }
+                            }
+                          },
+                          "children": {}
                         }
-                      },
-                      "children": {}
+                      }
                     }
                   }
                 },
-                "apollo_router::query_planner::fetch::response_insert": {
-                  "name": "apollo_router::query_planner::fetch::response_insert",
+                "apollo_router::services::execution_service::format_response": {
+                  "name": "apollo_router::services::execution_service::format_response",
                   "record": {
                     "entries": [],
                     "metadata": {
-                      "name": "response_insert",
-                      "target": "apollo_router::query_planner::fetch",
+                      "name": "format_response",
+                      "target": "apollo_router::services::execution_service",
                       "level": "DEBUG",
-                      "module_path": "apollo_router::query_planner::fetch",
+                      "module_path": "apollo_router::services::execution_service",
                       "fields": {
                         "names": []
                       }
@@ -365,22 +480,6 @@ expression: get_spans()
               }
             }
           }
-        },
-        "apollo_router::services::execution_service::format_response": {
-          "name": "apollo_router::services::execution_service::format_response",
-          "record": {
-            "entries": [],
-            "metadata": {
-              "name": "format_response",
-              "target": "apollo_router::services::execution_service",
-              "level": "DEBUG",
-              "module_path": "apollo_router::services::execution_service",
-              "fields": {
-                "names": []
-              }
-            }
-          },
-          "children": {}
         }
       }
     }
diff --git a/dockerfiles/Dockerfile.federation-demo b/dockerfiles/Dockerfile.federation-demo
index f1a5e2bc81..9b99d06cff 100644
--- a/dockerfiles/Dockerfile.federation-demo
+++ b/dockerfiles/Dockerfile.federation-demo
@@ -1,7 +1,6 @@
 FROM node:18-bullseye
 
 WORKDIR /usr/src/app
-# TODO: use https://github.com/apollographql/federation-demo once PR #89 lands
-RUN git clone -b igni/use_introspect_and_compose https://github.com/o0Ignition0o/federation-demo.git . && \
+RUN git clone https://github.com/apollographql/federation-demo . && \
     npm install
 
diff --git a/dockerfiles/tracing/docker-compose.datadog.yml b/dockerfiles/tracing/docker-compose.datadog.yml
index ea355eb84f..f7165b4e35 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.6.0
+    image: ghcr.io/apollographql/router:v1.7.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 6b59c6f04b..f8e663c809 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.6.0
+    image: ghcr.io/apollographql/router:v1.7.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 e0f5b0afb3..90d86c0696 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.6.0
+    image: ghcr.io/apollographql/router:v1.7.0
     volumes:
       - ./supergraph.graphql:/etc/config/supergraph.graphql
       - ./router/zipkin.router.yaml:/etc/config/configuration.yaml
diff --git a/docs/source/config.json b/docs/source/config.json
index e0092db222..5be2b78458 100644
--- a/docs/source/config.json
+++ b/docs/source/config.json
@@ -10,8 +10,10 @@
     "Federation version support": "/federation-version-support",
     "Configuration": {
       "Overview": "/configuration/overview",
+      "Caching": "/configuration/caching",
       "CORS": "/configuration/cors",
       "CSRF prevention": "/configuration/csrf",
+      "External extensibility": "/configuration/external",
       "Logging": "/configuration/logging",
       "Header propagation": "/configuration/header-propagation",
       "Traffic shaping": "/configuration/traffic-shaping",
diff --git a/docs/source/configuration/external.mdx b/docs/source/configuration/external.mdx
new file mode 100644
index 0000000000..11870c114f
--- /dev/null
+++ b/docs/source/configuration/external.mdx
@@ -0,0 +1,348 @@
+---
+title: External Extensibility in the Apollo Router
+sidebar_title: External extensibility
+description: Configure external co-processing for the router
+---
+
+> This is part of an experimental feature, it means any time until it's stabilized (without the prefix `experimental_`) we might change the configuration shape,  add or remove features.
+> If you want to give feedback or participate in that feature feel free to join [this discussion on GitHub](https://github.com/apollographql/router/discussions/2266).
+
+The router provides extensive in-process customization functionality:
+ - configuration
+ - rhai script
+ - rust plugin
+
+However, you may find that you have existing components in your system which can't be re-worked to any of these options for a variety of reasons, including, but not limited to:
+ - choice of implementation language
+ - bespoke packages/libs
+ - access to existing services/infrastructure
+
+For these situations, you can use external extensibility to interact with data flowing through the router.
+
+If external extensibility is configured, then a block of data is transmitted (encoded as JSON) to an endpoint via an HTTP POST request. Details of the encoding and expected communication protocol are documented below. The router will process the response to the POST request before resuming execution.
+
+Conceptually, an external co-processor performs the same functionality as you may provide via a rust plugin or a rhai script within the router. The difference is the protocol which governs the interaction between the router and the co-processor.
+
+```mermaid
+sequenceDiagram
+    actor Client
+    participant RouterService
+    participant CoProcessor
+    participant SupergraphService
+    participant ExecutionService
+    participant SubgraphService(s)
+
+    Client->>RouterService: Sends HTTP request
+    alt has coprocessor
+        RouterService->>CoProcessor: HTTP Post
+        CoProcessor-->>RouterService: HTTP Post Response
+        alt continue
+            RouterService->>SupergraphService: Continues request
+        else break
+            RouterService-->>Client: Breaks and returns HTTP response
+        end
+    else no coprocessor
+        RouterService->>SupergraphService: Processes request
+    end
+    SupergraphService->>ExecutionService: Initiates query<br/>plan execution
+    par
+    ExecutionService->>SubgraphService(s): Initiates<br/>sub-operation
+    SubgraphService(s)-->>ExecutionService: 
+    and
+    ExecutionService->>SubgraphService(s): Initiates<br/>sub-operation
+    SubgraphService(s)-->>ExecutionService: 
+    and
+    ExecutionService->>SubgraphService(s): Initiates<br/>sub-operation
+    SubgraphService(s)-->>ExecutionService: 
+    end
+    ExecutionService-->>SupergraphService: Assembles and<br/>returns response
+    SupergraphService-->>RouterService: Returns response
+    alt has coprocessor
+        RouterService->>CoProcessor: HTTP Post
+        CoProcessor-->>RouterService: HTTP Post Response
+        RouterService-->>Client: Returns HTTP response
+    else no coprocessor
+        RouterService-->>Client: Returns HTTP response
+    end
+```
+
+The external interface makes the following data available in the HTTP Post request:
+
+ - control
+     - control
+     - stage
+     - trace id
+     - version
+ - data
+     - body
+     - context
+     - headers
+     - sdl (schema)
+
+The "control" attributes, provide information about the context of the specific router request or response and provide a mechanism to influence the flow of data within the router.
+
+The "data" attributes, provide information about the substance of a request or response. Apart from the SDL, this data is all modifiable. All of these fields are "optional" (via configuration) to provide control over what data is externalized.
+
+## Terminology
+
+It can be confusing to talk about requests/responses external processes within the context of an externalized interaction. For the purposes of clarity, this is how we will talk about the various components in this process:
+
+<table class="field-table terminology">
+  <thead>
+    <tr>
+      <th>Text</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+
+<tbody>
+<tr class="required">
+<td style="min-width: 150px;">
+
+##### `request`
+
+</td>
+<td>
+
+A request from a client being processed by a router
+
+</td>
+</tr>
+<tr class="required">
+<td style="min-width: 150px;">
+
+##### `response`
+
+</td>
+<td>
+
+A request to a client being processed by a router
+
+</td>
+</tr>
+
+<tr class="required">
+<td style="min-width: 150px;">
+
+##### `co-processor`
+
+</td>
+<td>
+
+An external program, processing information about a router request or response
+
+</td>
+</tr>
+
+<tr class="required">
+<td style="min-width: 150px;">
+
+##### `co-processor request`
+
+</td>
+<td>
+
+A POST from a router to a co-processor containing information about a router request or response
+
+</td>
+</tr>
+
+<tr class="required">
+<td style="min-width: 150px;">
+
+##### `co-processor response`
+
+</td>
+<td>
+
+A POST reply from a co-processor to a router containing information about a router request or response
+
+</td>
+</tr>
+</tbody>
+</table>
+
+## Configuration
+
+The plugin is configured like other plugins. The typical configuration would look something like this. This is sending all available data related to a router request to a co-processor at the router stage and also sending the headers and context at the router response stage. A timeout is always in force for all co-processor requests.
+
+```yaml title="typical.yaml"
+plugins:
+  experimental.external:
+    url: http://127.0.0.1:8081 # mandatory URL which is the address of the co-processor
+    timeout: 2s # optional timeout (2 seconds in this example). If not set, defaults to 1 second
+    stages: # In future, multiple stages may be configurable
+      router: # Currently, the only valid value is router
+        request: # What data should we transmit to the co-processor from the router request?
+          headers: true # All of these data content attributes are optional and false by default.
+          context: true
+          body: true
+          sdl: true
+        response: # What data should we transmit to the co-processor from the router response?
+          headers: true
+          context: true
+```
+
+The minimal data to transfer would be nothing on every router request. This is sending no data from the router request (just the control data) to a co-processor. This probably wouldn't be very useful in production, but could be in testing.
+
+```yaml title="minimal.yaml"
+plugins:
+  experimental.external:
+    url: http://127.0.0.1:8081 # mandatory URL which is the POST target
+    stages: # In future, multiple stages may be configurable
+      router: # Currently, the only valid value is router
+        request: # What data should we transmit from the request?
+```
+
+## Encoding
+
+The data is encoded into JSON. Here's what the data would look like for a request at the router stage. This would be delivered as a POST request to the configured URL.
+
+```json title="router_request.json"
+{
+  "version": 1,
+  "stage": "RouterRequest",
+  "control": "Continue",
+  "id": "1b19c05fdafc521016df33148ad63c1b",
+  "headers": {
+    "cookie": [
+      "tasty_cookie=strawberry"
+    ],
+    "content-type": [
+      "application/json"
+    ],
+    "host": [
+      "127.0.0.1:4000"
+    ],
+    "apollo-federation-include-trace": [
+      "ftv1"
+    ],
+    "apollographql-client-name": [
+      "manual"
+    ],
+    "accept": [
+      "*/*"
+    ],
+    "user-agent": [
+      "curl/7.79.1"
+    ],
+    "content-length": [
+      "46"
+    ]
+  },
+  "body": {
+    "query": "query Long {\n  me {\n  name\n}\n}"
+  },
+  "context": {
+    "entries": {
+      "accepts-json": false,
+      "accepts-wildcard": true,
+      "accepts-multipart": false
+    }
+  },
+  "sdl": "schema\n  @core(feature: \"https://specs.apollo.dev/core/v0.1\"),\n  @core(feature: \"https://specs.apollo.dev/join/v0.1\")\n{\n  query: Query\n  mutation: Mutation\n}\n\ndirective @core(feature: String!) repeatable on SCHEMA\n\ndirective @join__field(graph: join__Graph, requires: join__FieldSet, provides: join__FieldSet) on FIELD_DEFINITION\n\ndirective @join__type(graph: join__Graph!, key: join__FieldSet) repeatable on OBJECT | INTERFACE\n\ndirective @join__owner(graph: join__Graph!) on OBJECT | INTERFACE\n\ndirective @join__graph(name: String!, url: String!) on ENUM_VALUE\n\nscalar join__FieldSet\n\nenum join__Graph {\n  ACCOUNTS @join__graph(name: \"accounts\" url: \"http://localhost:4001\")\n  INVENTORY @join__graph(name: \"inventory\" url: \"http://localhost:4004\")\n  PRODUCTS @join__graph(name: \"products\" url: \"http://localhost:4003\")\n  REVIEWS @join__graph(name: \"reviews\" url: \"http://localhost:4002\")\n}\n\ntype Mutation {\n  createProduct(name: String, upc: ID!): Product @join__field(graph: PRODUCTS)\n  createReview(body: String, id: ID!, upc: ID!): Review @join__field(graph: REVIEWS)\n}\n\ntype Product\n  @join__owner(graph: PRODUCTS)\n  @join__type(graph: PRODUCTS, key: \"upc\")\n  @join__type(graph: INVENTORY, key: \"upc\")\n  @join__type(graph: REVIEWS, key: \"upc\")\n{\n  inStock: Boolean @join__field(graph: INVENTORY)\n  name: String @join__field(graph: PRODUCTS)\n  price: Int @join__field(graph: PRODUCTS)\n  reviews: [Review] @join__field(graph: REVIEWS)\n  reviewsForAuthor(authorID: ID!): [Review] @join__field(graph: REVIEWS)\n  shippingEstimate: Int @join__field(graph: INVENTORY, requires: \"price weight\")\n  upc: String! @join__field(graph: PRODUCTS)\n  weight: Int @join__field(graph: PRODUCTS)\n}\n\ntype Query {\n  me: User @join__field(graph: ACCOUNTS)\n  topProducts(first: Int = 5): [Product] @join__field(graph: PRODUCTS)\n}\n\ntype Review\n  @join__owner(graph: REVIEWS)\n  @join__type(graph: REVIEWS, key: \"id\")\n{\n  author: User @join__field(graph: REVIEWS, provides: \"username\")\n  body: String @join__field(graph: REVIEWS)\n  id: ID! @join__field(graph: REVIEWS)\n  product: Product @join__field(graph: REVIEWS)\n}\n\ntype User\n  @join__owner(graph: ACCOUNTS)\n  @join__type(graph: ACCOUNTS, key: \"id\")\n  @join__type(graph: REVIEWS, key: \"id\")\n{\n  id: ID! @join__field(graph: ACCOUNTS)\n  name: String @join__field(graph: ACCOUNTS)\n  reviews: [Review] @join__field(graph: REVIEWS)\n  username: String @join__field(graph: ACCOUNTS)\n}\n"
+}
+```
+
+And here's what a router stage response may look like:
+
+```json title="router_response.json"
+{
+  "version": 1,
+  "stage": "RouterResponse",
+  "control": "Continue",
+  "id": "1b19c05fdafc521016df33148ad63c1b",
+  "headers": {
+    "vary": [
+      "origin"
+    ],
+    "content-type": [
+      "application/json"
+    ]
+  },
+  "body": {
+    "data": {
+      "me": {
+        "name": "Ada Lovelace"
+      }
+    }
+  },
+  "context": {
+    "entries": {
+      "apollo_telemetry::subgraph_metrics_attributes": {},
+      "accepts-json": false,
+      "accepts-multipart": false,
+      "apollo_telemetry::client_name": "manual",
+      "apollo_telemetry::usage_reporting": {
+        "statsReportKey": "# Long\nquery Long{me{name}}",
+        "referencedFieldsByType": {
+          "User": {
+            "fieldNames": [
+              "name"
+            ],
+            "isInterface": false
+          },
+          "Query": {
+            "fieldNames": [
+              "me"
+            ],
+            "isInterface": false
+          }
+        }
+      },
+      "apollo_telemetry::client_version": "",
+      "accepts-wildcard": true
+    }
+  },
+  "sdl": "schema\n  @core(feature: \"https://specs.apollo.dev/core/v0.1\"),\n  @core(feature: \"https://specs.apollo.dev/join/v0.1\")\n{\n  query: Query\n  mutation: Mutation\n}\n\ndirective @core(feature: String!) repeatable on SCHEMA\n\ndirective @join__field(graph: join__Graph, requires: join__FieldSet, provides: join__FieldSet) on FIELD_DEFINITION\n\ndirective @join__type(graph: join__Graph!, key: join__FieldSet) repeatable on OBJECT | INTERFACE\n\ndirective @join__owner(graph: join__Graph!) on OBJECT | INTERFACE\n\ndirective @join__graph(name: String!, url: String!) on ENUM_VALUE\n\nscalar join__FieldSet\n\nenum join__Graph {\n  ACCOUNTS @join__graph(name: \"accounts\" url: \"http://localhost:4001\")\n  INVENTORY @join__graph(name: \"inventory\" url: \"http://localhost:4004\")\n  PRODUCTS @join__graph(name: \"products\" url: \"http://localhost:4003\")\n  REVIEWS @join__graph(name: \"reviews\" url: \"http://localhost:4002\")\n}\n\ntype Mutation {\n  createProduct(name: String, upc: ID!): Product @join__field(graph: PRODUCTS)\n  createReview(body: String, id: ID!, upc: ID!): Review @join__field(graph: REVIEWS)\n}\n\ntype Product\n  @join__owner(graph: PRODUCTS)\n  @join__type(graph: PRODUCTS, key: \"upc\")\n  @join__type(graph: INVENTORY, key: \"upc\")\n  @join__type(graph: REVIEWS, key: \"upc\")\n{\n  inStock: Boolean @join__field(graph: INVENTORY)\n  name: String @join__field(graph: PRODUCTS)\n  price: Int @join__field(graph: PRODUCTS)\n  reviews: [Review] @join__field(graph: REVIEWS)\n  reviewsForAuthor(authorID: ID!): [Review] @join__field(graph: REVIEWS)\n  shippingEstimate: Int @join__field(graph: INVENTORY, requires: \"price weight\")\n  upc: String! @join__field(graph: PRODUCTS)\n  weight: Int @join__field(graph: PRODUCTS)\n}\n\ntype Query {\n  me: User @join__field(graph: ACCOUNTS)\n  topProducts(first: Int = 5): [Product] @join__field(graph: PRODUCTS)\n}\n\ntype Review\n  @join__owner(graph: REVIEWS)\n  @join__type(graph: REVIEWS, key: \"id\")\n{\n  author: User @join__field(graph: REVIEWS, provides: \"username\")\n  body: String @join__field(graph: REVIEWS)\n  id: ID! @join__field(graph: REVIEWS)\n  product: Product @join__field(graph: REVIEWS)\n}\n\ntype User\n  @join__owner(graph: ACCOUNTS)\n  @join__type(graph: ACCOUNTS, key: \"id\")\n  @join__type(graph: REVIEWS, key: \"id\")\n{\n  id: ID! @join__field(graph: ACCOUNTS)\n  name: String @join__field(graph: ACCOUNTS)\n  reviews: [Review] @join__field(graph: REVIEWS)\n  username: String @join__field(graph: ACCOUNTS)\n}\n"
+}
+```
+
+The co-processor can make use of this data however they choose, the response will dictate how the data continues to flow through the router.
+
+## Protocol
+
+The protocol is very simple. A payload is transmitted to a co-processor and a response is expected. The payload of the response must comply to the defined format and is interpreted as follows.
+
+### Control
+
+Control field changes are ignored with the exception of the control field. The control field indicates to the router how processing of a request/response should proceed. Valid values are:
+
+ - "Continue"
+ - { "Break": &lt;status code&gt; }
+
+If the value of the "control" field is "Continue", then processing will continue as normal through the router. If the value is a map with a key of "Break" and a numeric status code, then the router will stop processing and return a response to the client. The data returned to the client is the "body" of the co-processor response to the router.
+
+If the Break code is a "success" code (2xx), then the body of the co-processor response should be valid data that the client is expecting. If the Break code is a "failure" code, then the body of the co-processor response will be formatted into an error response for the client.
+
+> In the case of an externalized response, the router is already returning to the client, so the flow isn't altered, but the status code may still be changed.
+
+
+For example, if the co-processor updated a received request so that the control block of the co-processor response data looked like this:
+
+```json title="router_request_break.json"
+{
+  "version": 1,
+  "stage": "RouterRequest",
+  "control": { "Break": 403 },
+  "id": "1b19c05fdafc521016df33148ad63c1b",
+  "body": "You are not allowed to do this",
+  (etc...)
+}
+```
+
+then the router would stop processing the request and return a response to the client with an HTTP status code of 403 and the error message "You are not allowed to do this" (read from the body).
+
+### Data
+
+The router will read back the values of "body", "headers" and "context" and assign the returned values to the request/response. If the values are absent from the co-processor response, then the values are left unchanged. Any changes to "sdl" are always ignored by the router.
+
+## Reliability
+
+The router is written to try and maintain the highest standards of fidelity as a federated GraphQL processor. Externalization weakens that guarantee to some extent, since the responsibility for formatting data/errors is now partially devolved to a co-processor. It is the responsibility of the co-processor author to ensure that the externalization protocol is followed carefully to minimize the opportunity for unexpected failures.
+
+## Performance
+
+There is a cost to sending data from the router to a co-processor and waiting for the response and then processing any changes. We've done some basic benchmarking where we externalized all data on a request to a co-processor which was on the same machine and simply echoed back the data to the router. This reduced performance of the router (in terms of transaction throughput) by ~33%. If we then did the same thing and also called the co-processor with the router response, transaction throughput was reduced by ~50%.
+
+Most co-processors will do substantially more than just echo a response back to a router, so expect the performance impact to be proportionately greater.
diff --git a/docs/source/configuration/overview.mdx b/docs/source/configuration/overview.mdx
index 65e45000e3..13f3160636 100644
--- a/docs/source/configuration/overview.mdx
+++ b/docs/source/configuration/overview.mdx
@@ -182,6 +182,23 @@ The default value is `10s` (ten seconds), which is also the minimum allowed valu
 <tr>
 <td style="min-width: 150px;">
 
+##### `--apollo-uplink-timeout`
+
+`APOLLO_UPLINK_TIMEOUT`
+
+</td>
+<td>
+
+The timeout for each of the polls to Apollo Uplink.
+
+The default value is `30s` (thirty seconds).
+
+</td>
+</tr>
+
+<tr>
+<td style="min-width: 150px;">
+
 ##### `schema`
 
 </td>
@@ -249,7 +266,6 @@ Print configuration that has been upgraded to the current Router version.
 </tbody>
 </table>
 
-
 ## YAML config file
 
 The Apollo Router takes an optional YAML configuration file as input via the `--config` option. If the `--hot-reload` flag is also passed (or the `APOLLO_ROUTER_HOT_RELOAD` environment variable is set to `true`), the router automatically restarts when changes to the configuration file are made.
@@ -361,6 +377,10 @@ See [Sending HTTP headers to subgraphs](./header-propagation/).
 
 See [Configuring CORS in the Apollo Router](./cors).
 
+### External Extensibility
+
+See [External Extensibility in the Apollo Router](./external).
+
 ### OpenTelemetry tracing
 
 See [Tracing in the Apollo Router](./tracing/).
diff --git a/docs/source/containerization/docker.mdx b/docs/source/containerization/docker.mdx
index c23310dd84..15adf38055 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.6.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.7.0`
 
 ## Override the configuration
 
@@ -123,3 +123,7 @@ Usage: build_docker_image.sh [-b [-r <repo>]] [-d] [<release>]
 		build_docker_image.sh -d v0.9.1
 ```
 Note: The script has to be run from the `dockerfiles/diy` directory because it makes assumptions about the relative availability of various files. The example uses [debian:bullseye-slim image](https://hub.docker.com/_/debian/) for the final image build. Feel free to modify the script to use images which better suit your own needs, but be careful if using the [-d] flag since it makes the assumption that there is a `heaptrack` package available to install.
+
+## Building your own container with plugins
+
+Any project created using the method shown in the [Custom router binary](../../customizations/custom-binary) section of this documentation contains a Dockerfile. Use and adapt the provided [Dockerfile](https://github.com/apollographql/router/tree/main/apollo-router-scaffold/templates/base/Dockerfile) to suit your usecase.
diff --git a/docs/source/containerization/kubernetes.mdx b/docs/source/containerization/kubernetes.mdx
index 1026c0f7a6..4da7a19684 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.6.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.7.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.0.0-rc.10
+    helm.sh/chart: router-1.0.0-rc.11
     app.kubernetes.io/name: router
     app.kubernetes.io/instance: release-name
-    app.kubernetes.io/version: "v1.6.0"
+    app.kubernetes.io/version: "v1.7.0"
     app.kubernetes.io/managed-by: Helm
 ---
 # Source: router/templates/secret.yaml
@@ -76,13 +76,13 @@ kind: Secret
 metadata:
   name: "release-name-router"
   labels:
-    helm.sh/chart: router-1.0.0-rc.10
+    helm.sh/chart: router-1.0.0-rc.11
     app.kubernetes.io/name: router
     app.kubernetes.io/instance: release-name
-    app.kubernetes.io/version: "v1.6.0"
+    app.kubernetes.io/version: "v1.7.0"
     app.kubernetes.io/managed-by: Helm
 data:
-  managedFederationApiKey: "IlJFREFDVEVEIg=="
+  managedFederationApiKey: "UkVEQUNURUQ="
 ---
 # Source: router/templates/configmap.yaml
 apiVersion: v1
@@ -90,10 +90,10 @@ kind: ConfigMap
 metadata:
   name: release-name-router
   labels:
-    helm.sh/chart: router-1.0.0-rc.10
+    helm.sh/chart: router-1.0.0-rc.11
     app.kubernetes.io/name: router
     app.kubernetes.io/instance: release-name
-    app.kubernetes.io/version: "v1.6.0"
+    app.kubernetes.io/version: "v1.7.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.0.0-rc.10
+    helm.sh/chart: router-1.0.0-rc.11
     app.kubernetes.io/name: router
     app.kubernetes.io/instance: release-name
-    app.kubernetes.io/version: "v1.6.0"
+    app.kubernetes.io/version: "v1.7.0"
     app.kubernetes.io/managed-by: Helm
 spec:
   type: ClusterIP
@@ -143,12 +143,12 @@ kind: Deployment
 metadata:
   name: release-name-router
   labels:
-    helm.sh/chart: router-1.0.0-rc.10
+    helm.sh/chart: router-1.0.0-rc.11
     app.kubernetes.io/name: router
     app.kubernetes.io/instance: release-name
-    app.kubernetes.io/version: "v1.6.0"
+    app.kubernetes.io/version: "v1.7.0"
     app.kubernetes.io/managed-by: Helm
-  
+
   annotations:
     prometheus.io/path: /metrics
     prometheus.io/port: "9090"
@@ -172,7 +172,7 @@ spec:
         - name: router
           securityContext:
             {}
-          image: "ghcr.io/apollographql/router:v1.6.0"
+          image: "ghcr.io/apollographql/router:v1.7.0"
           imagePullPolicy: IfNotPresent
           args:
             - --hot-reload
@@ -186,7 +186,7 @@ spec:
                   key: managedFederationApiKey
                   optional: true
             - name: APOLLO_GRAPH_REF
-              value: "REDACTED"
+              value: REDACTED
           ports:
             - name: http
               containerPort: 80
@@ -220,10 +220,10 @@ kind: Pod
 metadata:
   name: "release-name-router-test-connection"
   labels:
-    helm.sh/chart: router-1.0.0-rc.10
+    helm.sh/chart: router-1.0.0-rc.11
     app.kubernetes.io/name: router
     app.kubernetes.io/instance: release-name
-    app.kubernetes.io/version: "v1.6.0"
+    app.kubernetes.io/version: "v1.7.0"
     app.kubernetes.io/managed-by: Helm
   annotations:
     "helm.sh/hook": test
diff --git a/docs/source/customizations/custom-binary.mdx b/docs/source/customizations/custom-binary.mdx
index ab5ff4f25f..e99893308a 100644
--- a/docs/source/customizations/custom-binary.mdx
+++ b/docs/source/customizations/custom-binary.mdx
@@ -28,7 +28,7 @@ cargo install cargo-scaffold
 1. Use the `cargo-scaffold` command to create a project for your custom router:
 
    ```bash
-   cargo-scaffold scaffold https://github.com/apollographql/router.git -r apollo-router-scaffold/templates/base
+   cargo-scaffold scaffold https://github.com/apollographql/router.git -r apollo-router-scaffold/templates/base -t main
    ```
 
 2. The `cargo-scaffold` command prompts you for some configuration settings. For the purposes of this tutorial, set your project's name to `starstuff`.
@@ -152,3 +152,35 @@ cargo router plugin remove hello_world
 ```
 
 Note that depending on the structure of your plugin, the command might fail to remove all of its associated files.
+
+## Docker
+
+You can use the provided [Dockerfile](https://github.com/apollographql/router/tree/main/apollo-router-scaffold/templates/base/Dockerfile) to build a release container.
+
+Make sure your router is configured to listen to `0.0.0.0` so you can query it from outside the container:
+
+```yml
+ supergraph:
+   listen: 0.0.0.0:4000
+```
+
+Use your `APOLLO_KEY` and `APOLLO_GRAPH_REF` environment variables to run the router in managed federation.
+
+   ```bash
+      docker build -t my_custom_router .
+      docker run -e APOLLO_KEY="your apollo key" -e APOLLO_GRAPH_REF="your apollo graph ref" my_custom_router
+   ```
+
+Otherwise add a `COPY` step to the Dockerfile, and edit the entrypoint:
+
+```Dockerfile
+# Copy configuration for docker image
+COPY router.yaml /dist/config.yaml
+# Copy supergraph for docker image
+COPY my_supergraph.graphql /dist/supergraph.graphql
+
+# [...] and change the entrypoint
+
+# Default executable is the router
+ENTRYPOINT ["/dist/router", "-s", "/dist/supergraph.graphql"]
+```
diff --git a/docs/source/customizations/native.mdx b/docs/source/customizations/native.mdx
index 17cbb3e1ff..5aa54c232a 100644
--- a/docs/source/customizations/native.mdx
+++ b/docs/source/customizations/native.mdx
@@ -88,6 +88,13 @@ impl Plugin for HelloWorld {
 
     // Only define the hooks you need to modify. Each default hook
     // implementation returns its associated service with no changes.
+    fn router_service(
+        &mut self,
+        service: router::BoxService,
+    ) -> router::BoxService {
+        service
+    }
+
     fn supergraph_service(
         &mut self,
         service: router::BoxService,
diff --git a/docs/source/customizations/overview.mdx b/docs/source/customizations/overview.mdx
index d06d3e536b..55475c2323 100644
--- a/docs/source/customizations/overview.mdx
+++ b/docs/source/customizations/overview.mdx
@@ -28,11 +28,13 @@ Before you build a customization, it helps to understand how the Apollo Router h
 ```mermaid
 sequenceDiagram
     actor Client
+    participant RouterService (experimental)
     participant SupergraphService
     participant ExecutionService
     participant SubgraphService(s)
 
-    Client->>SupergraphService: Sends request
+    Client->>RouterService: Sends request
+    RouterService->>SupergraphService: Transforms the raw HTTP request into a GraphQL/JSON request
     SupergraphService->>ExecutionService: Initiates query<br/>plan execution
     par
     ExecutionService->>SubgraphService(s): Initiates<br/>sub-operation
@@ -45,10 +47,11 @@ sequenceDiagram
     SubgraphService(s)-->>ExecutionService: 
     end
     ExecutionService-->>SupergraphService: Assembles and<br/>returns response
-    SupergraphService-->>Client: Returns response
+    SupergraphService-->>RouterService: Returns GraphQL/JSON response
+    RouterService-->>Client: Returns an HTTP response
 ```
 
-As execution proceeds "left to right" from the `SupergraphService` to individual `SubgraphService`s, each service passes the client's original request along to the _next_ service. Similarly, as execution continues "right to left" from `SubgraphService`s to the `SupergraphService`, each service passes the generated response for the client.
+As execution proceeds "left to right" from the `RouterService` to individual `SubgraphService`s, each service passes the client's original request along to the _next_ service. Similarly, as execution continues "right to left" from `SubgraphService`s to the `RouterService`, each service passes the generated response for the client.
 
 Apollo Router customizations can hook into _any combination_ of these services and modify the request, response, and/or related metadata as they're passed along.
 
@@ -68,15 +71,30 @@ Each Apollo Router service has a corresponding function that a customization can
 <tr>
 <td>
 
+##### `RouterService (experimental)`
+
+`router_service`
+</td>
+<td>
+
+Runs at the very beginning and very end of the request lifecycle.
+
+Define `router_service` if your customization needs to interact at the earliest or latest point possible. For example, this is a good opportunity to perform JWT verification before allowing a request to proceed further, or to make the payload a valid GraphQL request.
+
+</td>
+</tr>
+<tr>
+<td>
+
 ##### `SupergraphService`
 
 `supergraph_service`
 </td>
 <td>
 
-Runs at the very beginning and very end of the request lifecycle.
+Runs at the very beginning and very end of the GraphQL request lifecycle.
 
-Define `supergraph_service` if your customization needs to interact at the earliest or latest point possible. For example, this is a good opportunity to perform JWT verification before allowing a request to proceed further.
+Define `supergraph_service` if your customization needs to interact with the GraphQL request or the GraphQL response. For example, you can add a check for Anonymous queries.
 
 </td>
 </tr>
diff --git a/docs/source/federation-version-support.mdx b/docs/source/federation-version-support.mdx
index 962bbf4006..c6c2411c0b 100644
--- a/docs/source/federation-version-support.mdx
+++ b/docs/source/federation-version-support.mdx
@@ -23,7 +23,15 @@ The table below shows which version of federation each router release is compile
     <tbody>
     <tr>
         <td>
-            v1.2.1 and later (<a href="https://github.com/apollographql/router/releases">see latest releases</a>)
+            v1.6.0 and later (<a href="https://github.com/apollographql/router/releases">see latest releases</a>)
+        </td>
+        <td>
+            2.2.2
+        </td>
+    </tr>
+    <tr>
+        <td>
+            v1.2.1 - v1.5.0
         </td>
         <td>
             2.1.4
diff --git a/examples/add-timestamp-header/rhai/src/main.rs b/examples/add-timestamp-header/rhai/src/main.rs
index 735070d2a0..3769cca26c 100644
--- a/examples/add-timestamp-header/rhai/src/main.rs
+++ b/examples/add-timestamp-header/rhai/src/main.rs
@@ -12,6 +12,7 @@ fn main() -> Result<()> {
 
 #[cfg(test)]
 mod tests {
+    use apollo_router::graphql;
     use apollo_router::plugin::test;
     use apollo_router::services::supergraph;
     use http::StatusCode;
@@ -52,7 +53,7 @@ mod tests {
             .configuration_json(config)
             .unwrap()
             .supergraph_hook(move |_| mock_service.clone().boxed())
-            .build()
+            .build_router()
             .await
             .unwrap();
 
@@ -64,11 +65,20 @@ mod tests {
 
         // ...And call our service stack with it
         let mut service_response = test_harness
-            .oneshot(request_with_appropriate_name)
+            .oneshot(request_with_appropriate_name.try_into().unwrap())
             .await
             .unwrap();
 
-        let response = service_response.next_response().await.unwrap();
+        let response: graphql::Response = serde_json::from_slice(
+            service_response
+                .next_response()
+                .await
+                .unwrap()
+                .unwrap()
+                .to_vec()
+                .as_slice(),
+        )
+        .unwrap();
         assert_eq!(response.errors, []);
 
         // Rhai should return a 200...
diff --git a/examples/async-auth/rust/src/allow_client_id_from_file.rs b/examples/async-auth/rust/src/allow_client_id_from_file.rs
index 834af4a0ac..8a073a65b0 100644
--- a/examples/async-auth/rust/src/allow_client_id_from_file.rs
+++ b/examples/async-auth/rust/src/allow_client_id_from_file.rs
@@ -69,6 +69,7 @@ impl Plugin for AllowClientIdFromFile {
                         .error(
                             graphql::Error::builder()
                                 .message(format!("Missing '{header_key}' header"))
+                                .extension_code("AUTH_ERROR")
                                 .build(),
                         )
                         .status_code(StatusCode::UNAUTHORIZED)
@@ -104,6 +105,7 @@ impl Plugin for AllowClientIdFromFile {
                                     .error(
                                         graphql::Error::builder()
                                             .message("client-id is not allowed")
+                                            .extension_code("UNAUTHORIZED_CLIENT_ID")
                                             .build(),
                                     )
                                     .status_code(StatusCode::FORBIDDEN)
@@ -120,6 +122,7 @@ impl Plugin for AllowClientIdFromFile {
                                 .error(
                                     graphql::Error::builder()
                                         .message(format!("'{header_key}' value is not a string"))
+                                        .extension_code("BAD_CLIENT_ID")
                                         .build(),
                                 )
                                 .status_code(StatusCode::BAD_REQUEST)
@@ -204,7 +207,7 @@ mod tests {
         TestHarness::builder()
             .configuration_json(config)
             .unwrap()
-            .build()
+            .build_router()
             .await
             .unwrap();
     }
diff --git a/examples/cookies-to-headers/rhai/src/main.rs b/examples/cookies-to-headers/rhai/src/main.rs
index 84e2a91b75..6ff83b1d75 100644
--- a/examples/cookies-to-headers/rhai/src/main.rs
+++ b/examples/cookies-to-headers/rhai/src/main.rs
@@ -32,6 +32,7 @@ fn main() -> Result<()> {
 
 #[cfg(test)]
 mod tests {
+    use apollo_router::graphql;
     use apollo_router::plugin::test;
     use apollo_router::services::subgraph;
     use apollo_router::services::supergraph;
@@ -97,7 +98,7 @@ mod tests {
                     })
                     .boxed()
             })
-            .build()
+            .build_router()
             .await
             .unwrap();
 
@@ -108,11 +109,20 @@ mod tests {
 
         // ...And call our service stack with it
         let mut service_response = test_harness
-            .oneshot(request_with_appropriate_cookies)
+            .oneshot(request_with_appropriate_cookies.try_into().unwrap())
             .await
             .unwrap();
 
-        let response = service_response.next_response().await.unwrap();
+        let response: graphql::Response = serde_json::from_slice(
+            service_response
+                .next_response()
+                .await
+                .unwrap()
+                .unwrap()
+                .to_vec()
+                .as_slice(),
+        )
+        .unwrap();
         assert_eq!(response.errors, []);
         // Rhai should return a 200...
         assert_eq!(StatusCode::OK, service_response.response.status());
diff --git a/examples/data-response-mutate/rhai/src/main.rs b/examples/data-response-mutate/rhai/src/main.rs
index 5b75920026..07fc7d817e 100644
--- a/examples/data-response-mutate/rhai/src/main.rs
+++ b/examples/data-response-mutate/rhai/src/main.rs
@@ -15,7 +15,7 @@ mod tests {
     use apollo_router::services::supergraph;
     use apollo_router::Context;
     use http::StatusCode;
-    use tower::util::ServiceExt;
+    use tower::ServiceExt;
 
     #[tokio::test]
     async fn test_subgraph_mutates_data() {
@@ -28,7 +28,7 @@ mod tests {
         let test_harness = apollo_router::TestHarness::builder()
             .configuration_json(config)
             .unwrap()
-            .build()
+            .build_router()
             .await
             .unwrap();
 
@@ -48,7 +48,9 @@ mod tests {
                     .and_operation_name(operation_name)
                     .and_context(context)
                     .build()
-                    .expect("a valid SupergraphRequest"),
+                    .expect("a valid SupergraphRequest")
+                    .try_into()
+                    .unwrap(),
             )
             .await
             .expect("a router response");
diff --git a/examples/embedded/rust/src/main.rs b/examples/embedded/rust/src/main.rs
index 25a919270e..c5e840b3f7 100644
--- a/examples/embedded/rust/src/main.rs
+++ b/examples/embedded/rust/src/main.rs
@@ -8,7 +8,7 @@ async fn main() -> Result<(), tower::BoxError> {
     let router = TestHarness::builder()
         .schema(include_str!("../../../graphql/supergraph.graphql"))
         .with_subgraph_network_requests()
-        .build()
+        .build_router()
         .await?;
 
     // ...then create a GraphQL request...
@@ -19,19 +19,13 @@ async fn main() -> Result<(), tower::BoxError> {
 
     // ... and run it against the router service!
     let res = router
-        .oneshot(request)
+        .oneshot(request.try_into()?)
         .await?
         .next_response()
         .await
-        .unwrap();
+        .unwrap()?;
 
-    // {
-    //   "data": {
-    //     "me": {
-    //       "name": "Ada Lovelace"
-    //     }
-    //   }
-    // }
-    println!("{}", serde_json::to_string_pretty(&res)?);
+    // {"data":{"me":{"name":"Ada Lovelace"}}}
+    println!("{}", std::str::from_utf8(res.to_vec().as_slice())?);
     Ok(())
 }
diff --git a/examples/error-response-mutate/rhai/src/main.rs b/examples/error-response-mutate/rhai/src/main.rs
index 3e96337ca2..1068f8bdff 100644
--- a/examples/error-response-mutate/rhai/src/main.rs
+++ b/examples/error-response-mutate/rhai/src/main.rs
@@ -15,7 +15,7 @@ mod tests {
     use apollo_router::services::supergraph;
     use apollo_router::Context;
     use http::StatusCode;
-    use tower::util::ServiceExt;
+    use tower::ServiceExt;
 
     #[tokio::test]
     async fn test_subgraph_mutates_error() {
@@ -28,7 +28,7 @@ mod tests {
         let test_harness = apollo_router::TestHarness::builder()
             .configuration_json(config)
             .unwrap()
-            .build()
+            .build_router()
             .await
             .unwrap();
 
@@ -48,7 +48,9 @@ mod tests {
                     .and_operation_name(operation_name)
                     .and_context(context)
                     .build()
-                    .expect("a valid SupergraphRequest"),
+                    .expect("a valid SupergraphRequest")
+                    .try_into()
+                    .unwrap(),
             )
             .await
             .expect("a router response");
diff --git a/examples/external/README.md b/examples/external/README.md
new file mode 100644
index 0000000000..937cad4027
--- /dev/null
+++ b/examples/external/README.md
@@ -0,0 +1,15 @@
+# External co-processing
+
+Demonstrates router request/response externalization can be performed via yaml configuration.
+
+Possible operations include externalizing:
+- Headers
+- Body
+- Context
+- SDL (schema)
+
+## Usage
+
+```bash
+cargo run -- -s ../graphql/supergraph.graphql -c ./router.yaml
+```
diff --git a/examples/external/router.yaml b/examples/external/router.yaml
new file mode 100644
index 0000000000..a749a77f08
--- /dev/null
+++ b/examples/external/router.yaml
@@ -0,0 +1,33 @@
+###
+# This feature is experimental and subject to change without notice.
+#
+# The only mandatory parameter is the url, which specifies the target of an HTTP post payload
+# 
+# optional parameters:
+# - timeout: defaults to 1s if not specified
+# - stages: which stages of the router to externalize
+#   (if specified, must include at least one stage. The only valid value right now is "router")
+#   - request: which data to populate in the request externalization payload
+#       - headers: all of the headers received in the client request
+#       - context: the context of the request/response
+#       - body: the body of the client request
+#       - sdl: the sdl (schema) of the router
+#   - response: which data to populate in the response externalization payload
+#       - headers: all of the headers about to be returned to the client
+#       - context: the context of the request/response
+#       - body: the body of the client response
+#       - sdl: the sdl (schema) of the router
+###
+plugins:
+  experimental.external:
+    url: http://127.0.0.1:8081
+    timeout: 5s
+    stages:
+      router:
+        request:
+          headers: true
+          context: true
+          body: true
+          sdl: true
+        response:
+          headers: true
diff --git a/examples/forbid-anonymous-operations/rhai/src/main.rs b/examples/forbid-anonymous-operations/rhai/src/main.rs
index 2c384ea32c..42a1fc9848 100644
--- a/examples/forbid-anonymous-operations/rhai/src/main.rs
+++ b/examples/forbid-anonymous-operations/rhai/src/main.rs
@@ -52,7 +52,7 @@ mod tests {
             .configuration_json(config)
             .unwrap()
             .supergraph_hook(move |_| mock_service.clone().boxed())
-            .build()
+            .build_router()
             .await
             .unwrap();
 
@@ -60,7 +60,10 @@ mod tests {
         let request_with_no_name = supergraph::Request::canned_builder().build().unwrap();
 
         // ...And call our service stack with it
-        let mut service_response = test_harness.oneshot(request_with_no_name).await.unwrap();
+        let mut service_response = test_harness
+            .oneshot(request_with_no_name.try_into().unwrap())
+            .await
+            .unwrap();
 
         let _response = service_response.next_response().await.unwrap();
         println!("RESPONSE: {:?}", _response);
diff --git a/examples/forbid-anonymous-operations/rust/src/forbid_anonymous_operations.rs b/examples/forbid-anonymous-operations/rust/src/forbid_anonymous_operations.rs
index c1460861bb..87690aa4b6 100644
--- a/examples/forbid-anonymous-operations/rust/src/forbid_anonymous_operations.rs
+++ b/examples/forbid-anonymous-operations/rust/src/forbid_anonymous_operations.rs
@@ -58,6 +58,7 @@ impl Plugin for ForbidAnonymousOperations {
                         .error(
                             graphql::Error::builder()
                                 .message("Anonymous operations are not allowed")
+                                .extension_code("ANONYMOUS_OPERATION")
                                 .build(),
                         )
                         .status_code(StatusCode::BAD_REQUEST)
@@ -116,7 +117,7 @@ mod tests {
         apollo_router::TestHarness::builder()
             .configuration_json(config)
             .unwrap()
-            .build()
+            .build_router()
             .await
             .unwrap();
     }
diff --git a/examples/header-manipulation/README.md b/examples/header-manipulation/README.md
index d8618aa7bb..987b1ecd7f 100644
--- a/examples/header-manipulation/README.md
+++ b/examples/header-manipulation/README.md
@@ -11,5 +11,5 @@ Possible operations are:
 ## Usage
 
 ```bash
-cargo run -- -s ../../graphql/supergraph.graphql -c ./router.yaml
+cargo run -- -s ../graphql/supergraph.graphql -c ./router.yaml
 ```
diff --git a/examples/hello-world/rust/src/hello_world.rs b/examples/hello-world/rust/src/hello_world.rs
index cbe47cf453..b1c13d8c8b 100644
--- a/examples/hello-world/rust/src/hello_world.rs
+++ b/examples/hello-world/rust/src/hello_world.rs
@@ -99,7 +99,7 @@ mod tests {
         let _test_harness = apollo_router::TestHarness::builder()
             .configuration_json(config)
             .unwrap()
-            .build()
+            .build_router()
             .await
             .unwrap();
     }
diff --git a/examples/jwt-auth/rust/src/jwt.rs b/examples/jwt-auth/rust/src/jwt.rs
index 973f6c0fb9..c12643a202 100644
--- a/examples/jwt-auth/rust/src/jwt.rs
+++ b/examples/jwt-auth/rust/src/jwt.rs
@@ -236,7 +236,7 @@ impl Plugin for JwtAuth {
                     status: StatusCode,
                 ) -> Result<ControlFlow<supergraph::Response, supergraph::Request>, BoxError> {
                     let res = supergraph::Response::error_builder()
-                        .error(graphql::Error::builder().message(msg).build())
+                        .error(graphql::Error::builder().message(msg).extension_code("AUTH_ERROR").build())
                         .status_code(status)
                         .context(context)
                         .build()?;
@@ -406,7 +406,7 @@ mod tests {
         apollo_router::TestHarness::builder()
             .configuration_json(config)
             .unwrap()
-            .build()
+            .build_router()
             .await
             .unwrap();
     }
diff --git a/examples/logging/rhai/src/main.rs b/examples/logging/rhai/src/main.rs
index 05906d3fc3..b64e76e49b 100644
--- a/examples/logging/rhai/src/main.rs
+++ b/examples/logging/rhai/src/main.rs
@@ -13,6 +13,7 @@ fn main() -> Result<()> {
 
 #[cfg(test)]
 mod tests {
+    use apollo_router::graphql;
     use apollo_router::plugin::test;
     use apollo_router::services::supergraph;
     use http::StatusCode;
@@ -32,9 +33,10 @@ mod tests {
             mock_service
                 .expect_call()
                 .once()
-                .returning(move |_req: supergraph::Request| {
+                .returning(move |req: supergraph::Request| {
                     Ok(supergraph::Response::fake_builder()
                         .data(expected_mock_response_data)
+                        .context(req.context)
                         .build()
                         .unwrap())
                 });
@@ -51,7 +53,7 @@ mod tests {
             .configuration_json(config)
             .unwrap()
             .supergraph_hook(move |_| mock_service.clone().boxed())
-            .build()
+            .build_router()
             .await
             .unwrap();
 
@@ -63,10 +65,19 @@ mod tests {
 
         // ...And call our service stack with it
         let mut service_response = test_harness
-            .oneshot(request_with_appropriate_name)
+            .oneshot(request_with_appropriate_name.try_into().unwrap())
             .await
             .unwrap();
-        let response = service_response.next_response().await.unwrap();
+        let response: graphql::Response = serde_json::from_slice(
+            service_response
+                .next_response()
+                .await
+                .unwrap()
+                .unwrap()
+                .to_vec()
+                .as_slice(),
+        )
+        .unwrap();
         assert_eq!(response.errors, []);
 
         // Rhai should return a 200...
diff --git a/examples/op-name-to-header/rhai/src/main.rs b/examples/op-name-to-header/rhai/src/main.rs
index 20997bed7d..10e62b6113 100644
--- a/examples/op-name-to-header/rhai/src/main.rs
+++ b/examples/op-name-to-header/rhai/src/main.rs
@@ -12,6 +12,7 @@ fn main() -> Result<()> {
 
 #[cfg(test)]
 mod tests {
+    use apollo_router::graphql;
     use apollo_router::plugin::test;
     use apollo_router::services::supergraph;
     use http::StatusCode;
@@ -58,7 +59,7 @@ mod tests {
             .configuration_json(config)
             .unwrap()
             .supergraph_hook(move |_| mock_service.clone().boxed())
-            .build()
+            .build_router()
             .await
             .unwrap();
 
@@ -70,10 +71,19 @@ mod tests {
 
         // ...And call our service stack with it
         let mut service_response = test_harness
-            .oneshot(request_with_appropriate_name)
+            .oneshot(request_with_appropriate_name.try_into().unwrap())
             .await
             .unwrap();
-        let response = service_response.next_response().await.unwrap();
+        let response: graphql::Response = serde_json::from_slice(
+            service_response
+                .next_response()
+                .await
+                .unwrap()
+                .unwrap()
+                .to_vec()
+                .as_slice(),
+        )
+        .unwrap();
         assert_eq!(response.errors, []);
 
         // Rhai should return a 200...
diff --git a/examples/status-code-propagation/rust/src/propagate_status_code.rs b/examples/status-code-propagation/rust/src/propagate_status_code.rs
index bfab4f5c1e..3d5e98bf3e 100644
--- a/examples/status-code-propagation/rust/src/propagate_status_code.rs
+++ b/examples/status-code-propagation/rust/src/propagate_status_code.rs
@@ -116,7 +116,7 @@ mod tests {
         apollo_router::TestHarness::builder()
             .configuration_json(config)
             .unwrap()
-            .build()
+            .build_router()
             .await
             .unwrap();
     }
diff --git a/examples/subgraph-request-log/rhai/src/main.rs b/examples/subgraph-request-log/rhai/src/main.rs
index 81f0506b9a..b7f7017fde 100644
--- a/examples/subgraph-request-log/rhai/src/main.rs
+++ b/examples/subgraph-request-log/rhai/src/main.rs
@@ -28,7 +28,7 @@ mod tests {
         let test_harness = apollo_router::TestHarness::builder()
             .configuration_json(config)
             .unwrap()
-            .build()
+            .build_router()
             .await
             .unwrap();
 
@@ -48,7 +48,9 @@ mod tests {
                     .and_operation_name(operation_name)
                     .and_context(context)
                     .build()
-                    .expect("a valid SupergraphRequest"),
+                    .expect("a valid SupergraphRequest")
+                    .try_into()
+                    .unwrap(),
             )
             .await
             .expect("a router response");
diff --git a/examples/surrogate-cache-key/rhai/src/main.rs b/examples/surrogate-cache-key/rhai/src/main.rs
index 84a37e9891..93db510212 100644
--- a/examples/surrogate-cache-key/rhai/src/main.rs
+++ b/examples/surrogate-cache-key/rhai/src/main.rs
@@ -28,7 +28,7 @@ mod tests {
         let test_harness = apollo_router::TestHarness::builder()
             .configuration_json(config)
             .unwrap()
-            .build()
+            .build_router()
             .await
             .unwrap();
 
@@ -48,7 +48,9 @@ mod tests {
                     .and_operation_name(operation_name)
                     .and_context(context)
                     .build()
-                    .expect("a valid SupergraphRequest"),
+                    .expect("a valid SupergraphRequest")
+                    .try_into()
+                    .unwrap(),
             )
             .await
             .expect("a router response");
diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
index 3da0c2411c..4054407831 100644
--- a/fuzz/Cargo.toml
+++ b/fuzz/Cargo.toml
@@ -13,7 +13,7 @@ cargo-fuzz = true
 libfuzzer-sys = "0.4"
 apollo-smith = { version = "0.3.1", features = ["parser-impl"] }
 apollo-parser = "0.4.0"
-env_logger = "0.9.3"
+env_logger = "0.10.0"
 log = "0.4"
 reqwest = { version = "0.11", features = ["json", "blocking"] }
 serde_json = "1"
diff --git a/helm/chart/router/Chart.yaml b/helm/chart/router/Chart.yaml
index d0ec9a7dd3..17d6ff715d 100644
--- a/helm/chart/router/Chart.yaml
+++ b/helm/chart/router/Chart.yaml
@@ -19,10 +19,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.0-rc.10
+version: 1.0.0-rc.11
 
 # 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.6.0"
+appVersion: "v1.7.0"
diff --git a/helm/chart/router/README.md b/helm/chart/router/README.md
index 327eb04833..7957c2d469 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.0.0-rc.10](https://img.shields.io/badge/Version-1.0.0--rc.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.6.0](https://img.shields.io/badge/AppVersion-v1.6.0-informational?style=flat-square)
+![Version: 1.0.0-rc.11](https://img.shields.io/badge/Version-1.0.0--rc.11-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.7.0](https://img.shields.io/badge/AppVersion-v1.7.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.0.0-rc.10
+helm pull oci://ghcr.io/apollographql/helm-charts/router --version 1.0.0-rc.11
 ```
 
 ## Install Chart
@@ -19,7 +19,7 @@ helm pull oci://ghcr.io/apollographql/helm-charts/router --version 1.0.0-rc.10
 **Important:** only helm3 is supported
 
 ```console
-helm upgrade --install [RELEASE_NAME] oci://ghcr.io/apollographql/helm-charts/router --version 1.0.0-rc.10 --values my-values.yaml
+helm upgrade --install [RELEASE_NAME] oci://ghcr.io/apollographql/helm-charts/router --version 1.0.0-rc.11 --values my-values.yaml
 ```
 
 _See [configuration](#configuration) below._
diff --git a/licenses.html b/licenses.html
index 7f27d0842e..d7c5cc1d6c 100644
--- a/licenses.html
+++ b/licenses.html
@@ -44,8 +44,8 @@ <h1>Third Party Licenses</h1>
     
         <h2>Overview of licenses:</h2>
         <ul class="licenses-overview">
-            <li><a href="#MIT">MIT License</a> (77)</li>
-            <li><a href="#Apache-2.0">Apache License 2.0</a> (53)</li>
+            <li><a href="#MIT">MIT License</a> (79)</li>
+            <li><a href="#Apache-2.0">Apache License 2.0</a> (51)</li>
             <li><a href="#ISC">ISC License</a> (12)</li>
             <li><a href="#BSD-3-Clause">BSD 3-Clause &quot;New&quot; or &quot;Revised&quot; License</a> (6)</li>
             <li><a href="#Elastic-2.0">Elastic License 2.0</a> (2)</li>
@@ -890,8 +890,8 @@ <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/assert-rs/predicates-rs ">predicates</a></li>
-                    <li><a href=" https://github.com/assert-rs/predicates-rs/tree/master/predicates-core ">predicates-core</a></li>
-                    <li><a href=" https://github.com/assert-rs/predicates-rs/tree/master/predicates-tree ">predicates-tree</a></li>
+                    <li><a href=" https://github.com/assert-rs/predicates-rs/tree/master/crates/core ">predicates-core</a></li>
+                    <li><a href=" https://github.com/assert-rs/predicates-rs/tree/master/crates/tree ">predicates-tree</a></li>
                 </ul>
                 <pre class="license-text">                                 Apache License
                            Version 2.0, January 2004
@@ -5866,10 +5866,10 @@ <h4>Used by:</h4>
                     <li><a href=" https://github.com/rust-lang/backtrace-rs ">backtrace</a></li>
                     <li><a href=" https://github.com/marshallpierce/rust-base64 ">base64</a></li>
                     <li><a href=" https://github.com/marshallpierce/rust-base64 ">base64</a></li>
+                    <li><a href=" https://github.com/marshallpierce/rust-base64 ">base64</a></li>
                     <li><a href=" https://github.com/bitflags/bitflags ">bitflags</a></li>
                     <li><a href=" https://github.com/BurntSushi/bstr ">bstr</a></li>
                     <li><a href=" https://github.com/fitzgen/bumpalo ">bumpalo</a></li>
-                    <li><a href=" https://github.com/smol-rs/cache-padded ">cache-padded</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/smol-rs/concurrent-queue ">concurrent-queue</a></li>
@@ -5885,7 +5885,7 @@ <h4>Used by:</h4>
                     <li><a href=" https://github.com/yaahc/displaydoc ">displaydoc</a></li>
                     <li><a href=" https://github.com/dtolnay/dyn-clone ">dyn-clone</a></li>
                     <li><a href=" https://github.com/bluss/either ">either</a></li>
-                    <li><a href=" https://github.com/env-logger-rs/env_logger/ ">env_logger</a></li>
+                    <li><a href=" https://github.com/rust-cli/env_logger/ ">env_logger</a></li>
                     <li><a href=" https://github.com/dtolnay/erased-serde ">erased-serde</a></li>
                     <li><a href=" https://github.com/smol-rs/event-listener ">event-listener</a></li>
                     <li><a href=" https://github.com/smol-rs/fastrand ">fastrand</a></li>
@@ -5904,6 +5904,7 @@ <h4>Used by:</h4>
                     <li><a href=" https://github.com/withoutboats/heck ">heck</a></li>
                     <li><a href=" https://github.com/withoutboats/heck ">heck</a></li>
                     <li><a href=" https://github.com/hermitcore/libhermit-rs ">hermit-abi</a></li>
+                    <li><a href=" https://github.com/hermitcore/rusty-hermit ">hermit-abi</a></li>
                     <li><a href=" https://github.com/seanmonstar/httparse ">httparse</a></li>
                     <li><a href=" https://github.com/jean-airoldie/humantime-serde ">humantime-serde</a></li>
                     <li><a href=" https://github.com/ctz/hyper-rustls ">hyper-rustls</a></li>
@@ -5913,6 +5914,7 @@ <h4>Used by:</h4>
                     <li><a href=" https://github.com/lambda-fairy/if_chain ">if_chain</a></li>
                     <li><a href=" https://github.com/bluss/indexmap ">indexmap</a></li>
                     <li><a href=" https://github.com/dtolnay/inventory ">inventory</a></li>
+                    <li><a href=" https://github.com/sunfishcode/io-lifetimes ">io-lifetimes</a></li>
                     <li><a href=" https://github.com/rust-itertools/itertools ">itertools</a></li>
                     <li><a href=" https://github.com/dtolnay/itoa ">itoa</a></li>
                     <li><a href=" https://github.com/alexcrichton/jobserver-rs ">jobserver</a></li>
@@ -5923,6 +5925,7 @@ <h4>Used by:</h4>
                     <li><a href=" https://github.com/rust-lang/libm ">libm</a></li>
                     <li><a href=" https://github.com/rust-lang/libz-sys ">libz-sys</a></li>
                     <li><a href=" https://github.com/dtolnay/linkme ">linkme</a></li>
+                    <li><a href=" https://github.com/sunfishcode/linux-raw-sys ">linux-raw-sys</a></li>
                     <li><a href=" https://github.com/Amanieu/parking_lot ">lock_api</a></li>
                     <li><a href=" https://github.com/hyperium/mime ">mime</a></li>
                     <li><a href=" https://github.com/asomers/mockall ">mockall</a></li>
@@ -5968,6 +5971,7 @@ <h4>Used by:</h4>
                     <li><a href=" https://github.com/rust-lang-nursery/rustc-hash ">rustc-hash</a></li>
                     <li><a href=" https://github.com/Kimundi/rustc-version-rs ">rustc_version</a></li>
                     <li><a href=" https://github.com/Kimundi/rustc-version-rs ">rustc_version</a></li>
+                    <li><a href=" https://github.com/bytecodealliance/rustix ">rustix</a></li>
                     <li><a href=" https://github.com/rustls/rustls ">rustls</a></li>
                     <li><a href=" https://github.com/ctz/rustls-native-certs ">rustls-native-certs</a></li>
                     <li><a href=" https://github.com/rustls/pemfile ">rustls-pemfile</a></li>
@@ -9602,6 +9606,7 @@ <h4>Used by:</h4>
                     <li><a href=" https://github.com/dtolnay/linkme ">linkme-impl</a></li>
                     <li><a href=" https://github.com/stainless-steel/md5 ">md5</a></li>
                     <li><a href=" https://github.com/lifthrasiir/num-cmp ">num-cmp</a></li>
+                    <li><a href=" https://github.com/sfackler/rust-openssl ">openssl</a></li>
                     <li><a href=" https://github.com/rhaiscript/rhai ">rhai_codegen</a></li>
                     <li><a href=" https://github.com/apache/thrift/tree/master/lib/rs ">thrift</a></li>
                     <li><a href=" https://github.com/Soveu/tinyvec_macros ">tinyvec_macros</a></li>
@@ -9936,29 +9941,6 @@ <h4>Used by:</h4>
 governing permissions and
 
 limitations under the License.</pre>
-            </li>
-            <li class="license">
-                <h3 id="Apache-2.0">Apache License 2.0</h3>
-                <h4>Used by:</h4>
-                <ul class="license-used-by">
-                    <li><a href=" https://github.com/sfackler/rust-openssl ">openssl</a></li>
-                </ul>
-                <pre class="license-text">Copyright 2011-2017 Google Inc.
-          2013 Jack Lloyd
-          2013-2014 Steven Fackler
-
-Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-</pre>
             </li>
             <li class="license">
                 <h3 id="Apache-2.0">Apache License 2.0</h3>
@@ -9999,14 +9981,6 @@ <h4>Used by:</h4>
 according to those terms.
 </pre>
             </li>
-            <li class="license">
-                <h3 id="Apache-2.0">Apache License 2.0</h3>
-                <h4>Used by:</h4>
-                <ul class="license-used-by">
-                    <li><a href=" https://github.com/paholg/typenum ">typenum</a></li>
-                </ul>
-                <pre class="license-text">MIT OR Apache-2.0</pre>
-            </li>
             <li class="license">
                 <h3 id="BSD-2-Clause">BSD 2-Clause &quot;Simplified&quot; License</h3>
                 <h4>Used by:</h4>
@@ -11954,7 +11928,6 @@ <h4>Used by:</h4>
                 <ul class="license-used-by">
                     <li><a href=" https://github.com/mgeisler/textwrap ">textwrap</a></li>
                     <li><a href=" https://github.com/mgeisler/textwrap ">textwrap</a></li>
-                    <li><a href=" https://github.com/mgeisler/textwrap ">textwrap</a></li>
                 </ul>
                 <pre class="license-text">MIT License
 
@@ -12204,6 +12177,35 @@ <h4>Used by:</h4>
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
+THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, 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.
+</pre>
+            </li>
+            <li class="license">
+                <h3 id="MIT">MIT License</h3>
+                <h4>Used by:</h4>
+                <ul class="license-used-by">
+                    <li><a href=" https://github.com/rousan/multer-rs ">multer</a></li>
+                </ul>
+                <pre class="license-text">MIT License
+
+Copyright (c) 2020 Rousan Ali
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the &quot;Software&quot;), 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 &quot;AS IS&quot;, 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
@@ -12400,6 +12402,37 @@ <h4>Used by:</h4>
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, 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.
+</pre>
+            </li>
+            <li class="license">
+                <h3 id="MIT">MIT License</h3>
+                <h4>Used by:</h4>
+                <ul class="license-used-by">
+                    <li><a href=" https://github.com/sunfishcode/is-terminal ">is-terminal</a></li>
+                </ul>
+                <pre class="license-text">Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the &quot;Software&quot;), 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 &quot;AS IS&quot;, 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.
 </pre>
             </li>
             <li class="license">
@@ -12495,6 +12528,7 @@ <h3 id="MIT">MIT License</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
                     <li><a href=" https://github.com/mvdnes/spin-rs.git ">spin</a></li>
+                    <li><a href=" https://github.com/mvdnes/spin-rs.git ">spin</a></li>
                 </ul>
                 <pre class="license-text">The MIT License (MIT)
 
@@ -13480,27 +13514,379 @@ <h4>Used by:</h4>
                 <ul class="license-used-by">
                     <li><a href=" https://github.com/rustls/webpki-roots ">webpki-roots</a></li>
                 </ul>
-                <pre class="license-text">This packge contains a modified version of ca-bundle.crt:
+                <pre class="license-text">Mozilla Public License Version 2.0
+&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;&#x3D;
+
+1. Definitions
+--------------
+
+1.1. &quot;Contributor&quot;
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. &quot;Contributor Version&quot;
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor&#x27;s Contribution.
+
+1.3. &quot;Contribution&quot;
+    means Covered Software of a particular Contributor.
+
+1.4. &quot;Covered Software&quot;
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. &quot;Incompatible With Secondary Licenses&quot;
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. &quot;Executable Form&quot;
+    means any form of the work other than Source Code Form.
+
+1.7. &quot;Larger Work&quot;
+    means a work that combines Covered Software with other material, in 
+    a separate file or files, that is not Covered Software.
+
+1.8. &quot;License&quot;
+    means this document.
+
+1.9. &quot;Licensable&quot;
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. &quot;Modifications&quot;
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. &quot;Patent Claims&quot; of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. &quot;Secondary License&quot;
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. &quot;Source Code Form&quot;
+    means the form of the work preferred for making modifications.
 
-ca-bundle.crt -- Bundle of CA Root Certificates
+1.14. &quot;You&quot; (or &quot;Your&quot;)
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, &quot;You&quot; includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, &quot;control&quot; means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
 
-Certificate data from Mozilla as of: Thu Nov  3 19:04:19 2011#
-This is a bundle of X.509 certificates of public Certificate Authorities
-(CA). These were automatically extracted from Mozilla&#x27;s root certificates
-file (certdata.txt).  This file can be found in the mozilla source tree:
-http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw&#x3D;1#
-It contains the certificates in PEM format and therefore
-can be directly used with curl / libcurl / php_curl, or with
-an Apache+mod_ssl webserver for SSL client authentication.
-Just configure this file as the SSLCACertificateFile.#
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party&#x27;s
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients&#x27; rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients&#x27; rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an &quot;as is&quot;       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party&#x27;s negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party&#x27;s ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
 
-***** BEGIN LICENSE BLOCK *****
-This Source Code Form is subject to the terms of the Mozilla Public License,
-v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain
-one at http://mozilla.org/MPL/2.0/.
+Exhibit B - &quot;Incompatible With Secondary Licenses&quot; Notice
+---------------------------------------------------------
 
-***** END LICENSE BLOCK *****
-@(#) $RCSfile: certdata.txt,v $ $Revision: 1.80 $ $Date: 2011/11/03 15:11:58 $
+  This Source Code Form is &quot;Incompatible With Secondary Licenses&quot;, as
+  defined by the Mozilla Public License, v. 2.0.
 </pre>
             </li>
             <li class="license">
diff --git a/scripts/install.sh b/scripts/install.sh
index a99fa55d0d..66c45edec6 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.6.0"
+PACKAGE_VERSION="v1.7.0"
 
 download_binary() {
     downloader --check
diff --git a/xtask/Cargo.lock b/xtask/Cargo.lock
index 7044c87d9a..903059341b 100644
--- a/xtask/Cargo.lock
+++ b/xtask/Cargo.lock
@@ -75,6 +75,12 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
+[[package]]
+name = "base64"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5"
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -632,7 +638,7 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5617e92fc2f2501c3e2bc6ce547cad841adba2bae5b921c7e52510beca6d084c"
 dependencies = [
- "base64",
+ "base64 0.13.1",
  "bytes",
  "http",
  "httpdate",
@@ -732,7 +738,7 @@ version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09f4f04699947111ec1733e71778d763555737579e44b85844cae8e1940a1828"
 dependencies = [
- "base64",
+ "base64 0.13.1",
  "pem",
  "ring",
  "serde",
@@ -1023,7 +1029,7 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4"
 dependencies = [
- "base64",
+ "base64 0.13.1",
 ]
 
 [[package]]
@@ -1189,7 +1195,7 @@ version = "0.11.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c"
 dependencies = [
- "base64",
+ "base64 0.13.1",
  "bytes",
  "encoding_rs",
  "futures-core",
@@ -1334,7 +1340,7 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55"
 dependencies = [
- "base64",
+ "base64 0.13.1",
 ]
 
 [[package]]
@@ -2282,7 +2288,7 @@ version = "1.5.0"
 dependencies = [
  "ansi_term",
  "anyhow",
- "base64",
+ "base64 0.20.0",
  "camino",
  "cargo_metadata",
  "chrono",
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index a1038384a5..c6c6f6cb71 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
 [dependencies]
 ansi_term = "0.12"
 anyhow = "1"
-base64 = "0.13"
+base64 = "0.20"
 camino = "1"
 cargo_metadata = "0.15"
 chrono = "0.4.23"
diff --git a/xtask/src/commands/lint.rs b/xtask/src/commands/lint.rs
index b8fd9e4f80..2b6b8976fc 100644
--- a/xtask/src/commands/lint.rs
+++ b/xtask/src/commands/lint.rs
@@ -1,5 +1,4 @@
 use std::process::Command;
-use std::process::Stdio;
 
 use anyhow::ensure;
 use anyhow::Result;
@@ -9,8 +8,6 @@ use xtask::*;
 #[derive(Debug, StructOpt)]
 pub struct Lint {}
 
-const RUSTFMT_TOOLCHAIN: &str = "nightly-2022-06-26";
-
 const RUSTFMT_CONFIG: &[&str] = &["imports_granularity=Item", "group_imports=StdExternalCrate"];
 
 impl Lint {
@@ -35,33 +32,12 @@ impl Lint {
     }
 
     fn run_common(&self, fmt: impl FnOnce() -> Result<()>) -> Result<()> {
-        Self::install_rustfmt()?;
         fmt()?;
-        cargo!(["clippy", "--all", "--all-targets", "--", "-D", "warnings"]);
+        cargo!(["clippy", "--all", "--all-targets", "--", "-D", "warnings",]);
         cargo!(["doc", "--all", "--no-deps"], env = { "RUSTDOCFLAGS" => "-Dwarnings" });
         Ok(())
     }
 
-    fn install_rustfmt() -> Result<()> {
-        let nightly = RUSTFMT_TOOLCHAIN;
-        if !output("rustup", &["toolchain", "list"])?
-            .lines()
-            .any(|line| line.starts_with(nightly))
-        {
-            let args = ["toolchain", "install", nightly, "--profile", "minimal"];
-            run("rustup", &args)?
-        }
-        let args = ["component", "list", "--installed", "--toolchain", nightly];
-        if !output("rustup", &args)?
-            .lines()
-            .any(|line| line.starts_with("rustfmt"))
-        {
-            let args = ["component", "add", "rustfmt", "--toolchain", nightly];
-            run("rustup", &args)?
-        }
-        Ok(())
-    }
-
     fn check_fmt() -> Result<()> {
         let status = Self::fmt_command()?.arg("--check").status()?;
         ensure!(status.success(), "cargo fmt check failed");
@@ -69,11 +45,8 @@ impl Lint {
     }
 
     fn fmt_command() -> Result<Command> {
-        let mut command = Command::new(which::which("rustup")?);
+        let mut command = Command::new(which::which("cargo")?);
         command.current_dir(&*PKG_PROJECT_ROOT).args([
-            "run",
-            RUSTFMT_TOOLCHAIN,
-            "cargo",
             "fmt",
             "--all",
             "--",
@@ -83,18 +56,3 @@ impl Lint {
         Ok(command)
     }
 }
-
-fn run(program: &str, args: &[&str]) -> Result<()> {
-    let status = Command::new(which::which(program)?).args(args).status()?;
-    ensure!(status.success(), "{} failed", program);
-    Ok(())
-}
-
-fn output(program: &str, args: &[&str]) -> Result<String> {
-    let output = Command::new(which::which(program)?)
-        .args(args)
-        .stderr(Stdio::piped())
-        .output()?;
-    ensure!(output.status.success(), "{} failed", program);
-    Ok(String::from_utf8(output.stdout)?)
-}
diff --git a/xtask/src/commands/test.rs b/xtask/src/commands/test.rs
index 718ea37ad5..fe2fd6d407 100644
--- a/xtask/src/commands/test.rs
+++ b/xtask/src/commands/test.rs
@@ -33,7 +33,6 @@ impl Test {
             !(self.no_demo && self.with_demo),
             "--no-demo and --with-demo are mutually exclusive",
         );
-
         let _guard: Box<dyn std::any::Any> = if self.no_demo {
             eprintln!("Flag --no-demo is the default now. Not running federation-demo.");
             Box::new(())