From 291cd75c6d18daac98fc686591d8eec3274be434 Mon Sep 17 00:00:00 2001
From: Bryn Cooke <BrynCooke@gmail.com>
Date: Wed, 30 Mar 2022 11:54:16 +0200
Subject: [PATCH 1/8] Move dedup to a traffic_shaping plugin (#753)

* Move dedup to a traffic_shaping plugin

* Only buffer if dedup layer is applied. We'll have to do something more intelligent when we add more functionality.

* Take in review comments

Co-authored-by: bryn <bryn@apollographql.com>
---
 CHANGELOG.md                                  |   5 +
 .../src/layers/deduplication.rs               |   1 +
 apollo-router-core/src/plugins/mod.rs         |   1 +
 .../src/plugins/traffic_shaping.rs            | 119 ++++++++++++++++++
 ...nfiguration__tests__schema_generation.snap |  28 ++++-
 apollo-router/src/router_factory.rs           |   7 +-
 docs/source/config.json                       |   1 +
 docs/source/configuration/traffic-shaping.mdx |  35 ++++++
 router.yaml                                   |   7 ++
 9 files changed, 198 insertions(+), 6 deletions(-)
 create mode 100644 apollo-router-core/src/plugins/traffic_shaping.rs
 create mode 100644 docs/source/configuration/traffic-shaping.mdx
 create mode 100644 router.yaml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2942fb08e2..0dbd43a2fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,11 +38,16 @@ server:
 ```
 
 ## 🐛 Fixes
+- **Move query dedup to an experimental `traffic_shaping` plugin** ([PR #753](https://github.com/apollographql/router/pull/753))
+
+  The experimental `traffic_shaping` plugin will be a central location where we can add things such as rate limiting and retry.
+
 - **Remove `hasNext` from our response objects** ([PR #733](https://github.com/apollographql/router/pull/733))
 
   `hasNext` is a field in the response that may be used in future to support features such as defer and stream. However, we are some way off supporting this and including it now may break clients. It has been removed.
 
 - **Extend Apollo uplink configurability** ([PR #741](https://github.com/apollographql/router/pull/741))
+
   Uplink url and poll interval can now be configured via command line arg and env variable:
   ```bash
     --apollo-schema-config-delivery-endpoint <apollo-schema-config-delivery-endpoint>
diff --git a/apollo-router-core/src/layers/deduplication.rs b/apollo-router-core/src/layers/deduplication.rs
index 970e355e1f..cc4de9183c 100644
--- a/apollo-router-core/src/layers/deduplication.rs
+++ b/apollo-router-core/src/layers/deduplication.rs
@@ -8,6 +8,7 @@ use std::{
 use tokio::sync::broadcast::{self, Sender};
 use tower::{BoxError, Layer, ServiceExt};
 
+#[derive(Default)]
 pub struct QueryDeduplicationLayer;
 
 impl<S> Layer<S> for QueryDeduplicationLayer
diff --git a/apollo-router-core/src/plugins/mod.rs b/apollo-router-core/src/plugins/mod.rs
index c922e505d1..b7a039aeca 100644
--- a/apollo-router-core/src/plugins/mod.rs
+++ b/apollo-router-core/src/plugins/mod.rs
@@ -1,2 +1,3 @@
 mod forbid_mutations;
 mod headers;
+mod traffic_shaping;
diff --git a/apollo-router-core/src/plugins/traffic_shaping.rs b/apollo-router-core/src/plugins/traffic_shaping.rs
new file mode 100644
index 0000000000..37f076cb2d
--- /dev/null
+++ b/apollo-router-core/src/plugins/traffic_shaping.rs
@@ -0,0 +1,119 @@
+use std::collections::HashMap;
+
+use schemars::JsonSchema;
+use serde::Deserialize;
+use tower::util::BoxService;
+use tower::{BoxError, ServiceBuilder, ServiceExt};
+
+use crate::deduplication::QueryDeduplicationLayer;
+use crate::plugin::Plugin;
+use crate::{register_plugin, SubgraphRequest, SubgraphResponse};
+
+#[derive(PartialEq, Debug, Clone, Deserialize, JsonSchema)]
+struct Shaping {
+    dedup: Option<bool>,
+}
+
+impl Shaping {
+    fn merge(&self, fallback: Option<&Shaping>) -> Shaping {
+        match fallback {
+            None => self.clone(),
+            Some(fallback) => Shaping {
+                dedup: self.dedup.or(fallback.dedup),
+            },
+        }
+    }
+}
+
+#[derive(PartialEq, Debug, Clone, Deserialize, JsonSchema)]
+struct Config {
+    #[serde(default)]
+    all: Option<Shaping>,
+    #[serde(default)]
+    subgraphs: HashMap<String, Shaping>,
+}
+
+struct TrafficShaping {
+    config: Config,
+}
+
+#[async_trait::async_trait]
+impl Plugin for TrafficShaping {
+    type Config = Config;
+
+    fn new(config: Self::Config) -> Result<Self, BoxError> {
+        Ok(Self { config })
+    }
+
+    fn subgraph_service(
+        &mut self,
+        name: &str,
+        service: BoxService<SubgraphRequest, SubgraphResponse, BoxError>,
+    ) -> BoxService<SubgraphRequest, SubgraphResponse, BoxError> {
+        // Either we have the subgraph config and we merge it with the all config, or we just have the all config or we have nothing.
+        let all_config = self.config.all.as_ref();
+        let subgraph_config = self.config.subgraphs.get(name);
+        let final_config = Self::merge_config(all_config, subgraph_config);
+
+        if let Some(config) = final_config {
+            ServiceBuilder::new()
+                .option_layer(config.dedup.unwrap_or_default().then(|| {
+                    //Buffer is required because dedup layer requires a clone service.
+                    ServiceBuilder::new()
+                        .layer(QueryDeduplicationLayer::default())
+                        .buffer(20_000)
+                }))
+                .service(service)
+                .boxed()
+        } else {
+            service
+        }
+    }
+}
+
+impl TrafficShaping {
+    fn merge_config(
+        all_config: Option<&Shaping>,
+        subgraph_config: Option<&Shaping>,
+    ) -> Option<Shaping> {
+        let merged_subgraph_config = subgraph_config.map(|c| c.merge(all_config));
+        merged_subgraph_config.or_else(|| all_config.cloned())
+    }
+}
+
+register_plugin!("experimental", "traffic_shaping", TrafficShaping);
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn test_merge_config() {
+        let config = serde_yaml::from_str::<Config>(
+            r#"
+        all:
+          dedup: true
+        subgraphs: 
+          products:
+            dedup: false
+        "#,
+        )
+        .unwrap();
+
+        assert_eq!(TrafficShaping::merge_config(None, None), None);
+        assert_eq!(
+            TrafficShaping::merge_config(config.all.as_ref(), None),
+            config.all
+        );
+        assert_eq!(
+            TrafficShaping::merge_config(config.all.as_ref(), config.subgraphs.get("products"))
+                .as_ref(),
+            config.subgraphs.get("products")
+        );
+
+        assert_eq!(
+            TrafficShaping::merge_config(None, config.subgraphs.get("products")).as_ref(),
+            config.subgraphs.get("products")
+        );
+    }
+}
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 0aab1cc106..5afcbe6ded 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
@@ -1,6 +1,5 @@
 ---
 source: apollo-router/src/configuration/mod.rs
-assertion_line: 439
 expression: "&schema"
 ---
 {
@@ -271,6 +270,33 @@ expression: "&schema"
             }
           },
           "additionalProperties": false
+        },
+        "experimental.traffic_shaping": {
+          "type": "object",
+          "properties": {
+            "all": {
+              "type": "object",
+              "properties": {
+                "dedup": {
+                  "type": "boolean",
+                  "nullable": true
+                }
+              },
+              "nullable": true
+            },
+            "subgraphs": {
+              "type": "object",
+              "additionalProperties": {
+                "type": "object",
+                "properties": {
+                  "dedup": {
+                    "type": "boolean",
+                    "nullable": true
+                  }
+                }
+              }
+            }
+          }
         }
       },
       "additionalProperties": false
diff --git a/apollo-router/src/router_factory.rs b/apollo-router/src/router_factory.rs
index 0414a02a67..71ecbbf1d4 100644
--- a/apollo-router/src/router_factory.rs
+++ b/apollo-router/src/router_factory.rs
@@ -1,5 +1,4 @@
 use crate::configuration::{Configuration, ConfigurationError};
-use apollo_router_core::deduplication::QueryDeduplicationLayer;
 use apollo_router_core::{
     http_compat::{Request, Response},
     PluggableRouterServiceBuilder, ResponseBody, RouterRequest, Schema,
@@ -9,7 +8,7 @@ use apollo_router_core::{DynPlugin, ReqwestSubgraphService};
 use std::sync::Arc;
 use tower::buffer::Buffer;
 use tower::util::{BoxCloneService, BoxService};
-use tower::{BoxError, Layer, ServiceBuilder, ServiceExt};
+use tower::{BoxError, ServiceBuilder, ServiceExt};
 use tower_service::Service;
 
 /// Factory for creating a RouterService
@@ -78,9 +77,7 @@ impl RouterServiceFactory for YamlRouterServiceFactory {
         }
 
         for (name, _) in schema.subgraphs() {
-            let dedup_layer = QueryDeduplicationLayer;
-            let subgraph_service =
-                BoxService::new(dedup_layer.layer(ReqwestSubgraphService::new(name.to_string())));
+            let subgraph_service = BoxService::new(ReqwestSubgraphService::new(name.to_string()));
 
             builder = builder.with_subgraph_service(name, subgraph_service);
         }
diff --git a/docs/source/config.json b/docs/source/config.json
index 3a15c67ad2..336a955198 100644
--- a/docs/source/config.json
+++ b/docs/source/config.json
@@ -14,6 +14,7 @@
       "Logging": "/configuration/logging",
       "Header propagation": "/configuration/header-propagation",
       "OpenTelemetry": "/configuration/opentelemetry",
+      "Traffic shaping": "/configuration/traffic-shaping",
       "Usage reporting": "/configuration/spaceport"
     },
     "Development workflow": {
diff --git a/docs/source/configuration/traffic-shaping.mdx b/docs/source/configuration/traffic-shaping.mdx
new file mode 100644
index 0000000000..e66d3dee9b
--- /dev/null
+++ b/docs/source/configuration/traffic-shaping.mdx
@@ -0,0 +1,35 @@
+---
+title: Traffic shaping
+description: Configuring traffic shaping
+---
+
+import { Link } from "gatsby";
+
+> ⚠️ Apollo Router support for traffic shaping is currently experimental.
+
+The Apollo Router provides experimental support for traffic shaping.
+
+Currently features are limited, but are expected to grow over time:
+
+* **Sub-query deduplication** - Identical, in-flight, non-mutation sub-queries are compressed into a single request.
+
+## Configuration
+To configure traffic shaping add the `traffic_shaping` plugin to `your router.yaml`:
+
+```yaml title="router.yaml"
+plugins:
+  experimental.traffic_shaping:
+    all:
+      dedup: true # Enable dedup for all subgraphs.
+    subgraphs: 
+      products:
+        dedup: false # Disable dedup for products.
+```
+
+Note that configuration in the `subgraphs` section will take precedence over that in the `all` section.
+
+### Sub-query deduplication
+
+Deduplication will cause any identical, in-flight, non-mutation sub-queries to be merged into a single request. This can reduce network bandwidth and CPU at your subgraph.
+
+Note that only in flight requests are deduplicated.
diff --git a/router.yaml b/router.yaml
new file mode 100644
index 0000000000..09af46f9d0
--- /dev/null
+++ b/router.yaml
@@ -0,0 +1,7 @@
+plugins:
+  experimental.traffic_shaping:
+    all:
+      dedup: true
+    subgraphs:
+      products:
+        dedup: true

From 2103a1e92673ac838e55cfadc2edcd22f3202f8d Mon Sep 17 00:00:00 2001
From: Jeremy Lempereur <jeremy.lempereur@gmail.com>
Date: Wed, 30 Mar 2022 12:18:26 +0200
Subject: [PATCH 2/8] chore: CORS default Configuration (#759)

Fixes :#40

The Router now allows only the `https://studio.apollographql.com` origin by default, instead of any origin.
---
 CHANGELOG.md                                  | 10 +++++--
 apollo-router/src/configuration/mod.rs        | 28 +++++++++++++++----
 ...nfiguration__tests__schema_generation.snap |  5 ++--
 docs/source/configuration/cors.mdx            | 11 ++++----
 examples/async-auth/router.yaml               |  4 ---
 examples/context/router.yaml                  |  6 ----
 examples/embedded/router.yaml                 |  4 ---
 .../forbid-anonymous-operations/router.yaml   |  4 ---
 examples/forbid_mutations/router.yaml         |  4 ---
 examples/hello-world/router.yaml              |  4 ---
 examples/jwt-auth/router.yaml                 |  8 +-----
 11 files changed, 41 insertions(+), 47 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0dbd43a2fb..8764ce619b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,8 +20,14 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
  -->
 
-<!--# [v0.1.0-preview.2] (unreleased) - 2022-mm-dd
+# [v0.1.0-preview.2] (unreleased) - 2022-mm-dd
 ## ❗ BREAKING ❗
+
+- **CORS default Configuration** ([#40](https://github.com/apollographql/router/issues/40))
+
+  The Router will allow only the https://studio.apollographql.com origin by default, instead of any origin.
+  This behavior can still be tweaked in the [YAML configuration](https://www.apollographql.com/docs/router/configuration/cors)
+
 ## 🚀 Features
 
 - **Skip and Include directives in post processing** ([PR #626](https://github.com/apollographql/router/pull/626))
@@ -69,7 +75,7 @@ server:
 ## 🛠 Maintenance
 ## 📚 Documentation
 
-# [v0.1.0-preview.1] - 2022-03-23
+<!--# [v0.1.0-preview.1] - 2022-03-23
 
 ## 🎉 **The Apollo Router has graduated to its Preview phase!** 🎉
 ## ❗ BREAKING ❗
diff --git a/apollo-router/src/configuration/mod.rs b/apollo-router/src/configuration/mod.rs
index 13bc5c0cb2..55b7024ecc 100644
--- a/apollo-router/src/configuration/mod.rs
+++ b/apollo-router/src/configuration/mod.rs
@@ -273,9 +273,9 @@ impl fmt::Display for ListenAddr {
 pub struct Cors {
     #[serde(default)]
     #[builder(default)]
-    /// Set to false to disallow any origin and rely exclusively on `origins`.
+    /// Set to true to allow any origin.
     ///
-    /// /!\ Defaults to true
+    /// Defaults to false
     /// Having this set to true is the only way to allow Origin: null.
     pub allow_any_origin: Option<bool>,
 
@@ -297,9 +297,9 @@ pub struct Cors {
     pub expose_headers: Option<Vec<String>>,
 
     /// The origin(s) to allow requests from.
-    /// Use `https://studio.apollographql.com/` to allow Apollo Studio to function.
+    /// Defaults to `https://studio.apollographql.com/` for Apollo Studio.
     #[serde(default)]
-    #[builder(default)]
+    #[builder(default_code = "default_origins()")]
     pub origins: Vec<String>,
 
     /// Allowed request methods. Defaults to GET, POST, OPTIONS.
@@ -308,6 +308,10 @@ pub struct Cors {
     pub methods: Vec<String>,
 }
 
+fn default_origins() -> Vec<String> {
+    vec!["https://studio.apollographql.com/".into()]
+}
+
 fn default_cors_headers() -> Vec<String> {
     vec!["Content-Type".into()]
 }
@@ -334,7 +338,7 @@ impl Cors {
             .expose_headers(self.allow_headers.iter().map(std::string::String::as_str))
             .allow_methods(self.methods.iter().map(std::string::String::as_str));
 
-        if self.allow_any_origin.unwrap_or(true) {
+        if self.allow_any_origin.unwrap_or_default() {
             cors.allow_any_origin()
         } else {
             cors.allow_origins(self.origins.iter().map(std::string::String::as_str))
@@ -579,4 +583,18 @@ mod tests {
             );
         }
     }
+
+    #[test]
+    fn cors_defaults() {
+        let cors = Cors::builder().build();
+
+        assert_eq!(
+            ["https://studio.apollographql.com/"],
+            cors.origins.as_slice()
+        );
+        assert!(
+            !cors.allow_any_origin.unwrap_or_default(),
+            "Allow any origin should be disabled by default"
+        );
+    }
 }
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 5afcbe6ded..c02755b9ee 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
@@ -1,5 +1,6 @@
 ---
 source: apollo-router/src/configuration/mod.rs
+assertion_line: 443
 expression: "&schema"
 ---
 {
@@ -316,7 +317,7 @@ expression: "&schema"
           "type": "object",
           "properties": {
             "allow_any_origin": {
-              "description": "Set to false to disallow any origin and rely exclusively on `origins`.\n\n/!\\ Defaults to true Having this set to true is the only way to allow Origin: null.",
+              "description": "Set to true to allow any origin.\n\nDefaults to false Having this set to true is the only way to allow Origin: null.",
               "default": null,
               "type": "boolean",
               "nullable": true
@@ -359,7 +360,7 @@ expression: "&schema"
               }
             },
             "origins": {
-              "description": "The origin(s) to allow requests from. Use `https://studio.apollographql.com/` to allow Apollo Studio to function.",
+              "description": "The origin(s) to allow requests from. Defaults to `https://studio.apollographql.com/` for Apollo Studio.",
               "default": [],
               "type": "array",
               "items": {
diff --git a/docs/source/configuration/cors.mdx b/docs/source/configuration/cors.mdx
index 5ca3618779..ad662bf327 100644
--- a/docs/source/configuration/cors.mdx
+++ b/docs/source/configuration/cors.mdx
@@ -5,7 +5,7 @@ sidebar_title: CORS
 
 import { Link } from 'gatsby';
 
-The Apollo Router supports [Cross-Origin Resource Sharing](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS) (CORS) to indicate which origins it accepts requests from. **By default, the router accepts requests from all origins**.
+The Apollo Router supports [Cross-Origin Resource Sharing](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS) (CORS) to indicate which origins it accepts requests from. **By default, the router accepts requests from the Apollo studio**.
 
 If your environment has security requirements around CORS, you can specify them in the router's [configuration file](./overview/#configuration-file):
 
@@ -16,14 +16,15 @@ server:
   #
   cors:
 
-    # Set to false to disallow any origin and rely exclusively on `origins`
-    # (Defaults to true)
-    allow_any_origin: false
+    # Set to true to allow any origin
+    # (Defaults to false)
+    allow_any_origin: true
 
     # List of accepted origins
     # (Ignored if allow_any_origin is true)
+    # (Defaults to the Apollo Studio url: `https://studio.apollographql.com`)
     origins:
-      - https://studio.apollographql.com
+      - https://www.my-frontend.com
 
     # Set to true to add the `Access-Control-Allow-Credentials` header
     # (Defaults to false)
diff --git a/examples/async-auth/router.yaml b/examples/async-auth/router.yaml
index 9354c3802b..3a40b710f9 100644
--- a/examples/async-auth/router.yaml
+++ b/examples/async-auth/router.yaml
@@ -1,7 +1,3 @@
-server:
-  cors:
-    origins:
-      - "https://studio.apollographql.com/"
 plugins:
   # this plugin takes a path
   # and will read from it everytime a request comes in
diff --git a/examples/context/router.yaml b/examples/context/router.yaml
index 05eeb64901..46b506a8c8 100644
--- a/examples/context/router.yaml
+++ b/examples/context/router.yaml
@@ -1,8 +1,4 @@
 version: 4.0.0
-server:
-  cors:
-    origins:
-      - "https://studio.apollographql.com/"
 telemetry:
   opentelemetry:
     jaeger:
@@ -13,5 +9,3 @@ plugins:
   # this plugin doesn't have any configuration
   # mention it here and you're set!
   example.context_data:
-
-
diff --git a/examples/embedded/router.yaml b/examples/embedded/router.yaml
index 2f1b4da78b..f960317006 100644
--- a/examples/embedded/router.yaml
+++ b/examples/embedded/router.yaml
@@ -1,6 +1,2 @@
-server:
-  cors:
-    origins:
-      - "https://studio.apollographql.com/"
 plugins:
   example.forbid_anonymous_operations:
diff --git a/examples/forbid-anonymous-operations/router.yaml b/examples/forbid-anonymous-operations/router.yaml
index 3384398fe3..db122ba672 100644
--- a/examples/forbid-anonymous-operations/router.yaml
+++ b/examples/forbid-anonymous-operations/router.yaml
@@ -1,7 +1,3 @@
-server:
-  cors:
-    origins:
-      - "https://studio.apollographql.com/"
 plugins:
   # this plugin doesn't have any configuration
   # mention it here and you're set!
diff --git a/examples/forbid_mutations/router.yaml b/examples/forbid_mutations/router.yaml
index f1b0c57b2d..86774fb051 100644
--- a/examples/forbid_mutations/router.yaml
+++ b/examples/forbid_mutations/router.yaml
@@ -2,8 +2,4 @@
 # ./router -c ./examples/forbid_mutations/router.yaml -s ./examples/graphql/supergraph.graphql
 # You can then open http://localhost:4000 on your browser,
 # and try to run a Query and a Mutation in apollo studio.
-server:
-  cors:
-    origins:
-      - "https://studio.apollographql.com/"
 forbid_mutations: true
diff --git a/examples/hello-world/router.yaml b/examples/hello-world/router.yaml
index 5557c6c96a..8406ba731f 100644
--- a/examples/hello-world/router.yaml
+++ b/examples/hello-world/router.yaml
@@ -1,7 +1,3 @@
-server:
-  cors:
-    origins:
-      - "https://studio.apollographql.com/"
 plugins:
   # this plugin doesn't have any configuration
   # mention it here and you're set!
diff --git a/examples/jwt-auth/router.yaml b/examples/jwt-auth/router.yaml
index 27cd5f168e..a4b6c94876 100644
--- a/examples/jwt-auth/router.yaml
+++ b/examples/jwt-auth/router.yaml
@@ -1,13 +1,9 @@
-server:
-  cors:
-    origins:
-      - "https://studio.apollographql.com/"
 plugins:
   # Authentication Mechanism
   # plugin name: example.jwt
   #
   # Mandatory Configuration:
-  #   - algorithm: HS256 | HS384 | HS512 
+  #   - algorithm: HS256 | HS384 | HS512
   #   - key: valid base64 encoded key
   #
   # Optional Configuration:
@@ -27,5 +23,3 @@ plugins:
     key: 629709bdc3bd794312ccc3a1c47beb03ac7310bc02d32d4587e59b5ad81c99ba
     time_tolerance: 60
     max_token_life: 600
-
-

From 209ce362824f82c8c613193aa3c343cc976e2f4c Mon Sep 17 00:00:00 2001
From: Jeremy Lempereur <jeremy.lempereur@gmail.com>
Date: Wed, 30 Mar 2022 16:57:52 +0200
Subject: [PATCH 3/8] chore: Ensure successful examples and benchmarks
 compilation. (#760)

* chore: Ensure successful examples and benchmarks compilation.

Fixes #716

Linux and OSx circleci build steps will now cargo check all of the examples and the benchmarks.
---
 .circleci/config.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ccbc80fa0c..f956cbd08c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -27,7 +27,7 @@ parameters:
   cache_version:
     type: string
     # increment that one to invalidate all the caches
-    default: v8-{{ checksum "rust-toolchain.toml" }}
+    default: v1-{{ checksum "rust-toolchain.toml" }}
 
 commands:
   initialize_submodules:
@@ -249,9 +249,11 @@ commands:
   build_all_permutations:
     steps:
       - build_common_permutations
-      - rust/build:
-          with_cache: false
-          crate: --locked --no-default-features -p apollo-router -p apollo-router-core
+      - run:
+          name: cargo check workspace and benchmarks
+          command: |
+            set -e -o pipefail
+            cargo check --locked --all --benches
   build_workspace:
     parameters:
       os:

From bfcd8071c0b009831a69a74b4ef003d6f4df2eb7 Mon Sep 17 00:00:00 2001
From: Gary Pennington <gary@apollographql.com>
Date: Thu, 31 Mar 2022 15:48:43 +0100
Subject: [PATCH 4/8] dockerfile example and publish on release to github
 (#764)

Add some containerization documentation and update circle-ci to build release/debug images when we cut a release. The kubernetes documentation is fairly minimal, so it will need to be expanded at some point.
---
 .circleci/config.yml                        | 18 +++++
 CHANGELOG.md                                | 14 ++++
 dockerfiles/Dockerfile.router               | 33 +++++++++
 dockerfiles/router.yaml                     |  5 ++
 docs/source/config.json                     |  5 ++
 docs/source/containerization/docker.mdx     | 78 +++++++++++++++++++++
 docs/source/containerization/kubernetes.mdx | 18 +++++
 docs/source/containerization/overview.mdx   | 34 +++++++++
 8 files changed, 205 insertions(+)
 create mode 100644 dockerfiles/Dockerfile.router
 create mode 100644 dockerfiles/router.yaml
 create mode 100644 docs/source/containerization/docker.mdx
 create mode 100644 docs/source/containerization/kubernetes.mdx
 create mode 100644 docs/source/containerization/overview.mdx

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f956cbd08c..fff743d0d0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -649,6 +649,24 @@ jobs:
       - run:
           command: >
             gh release create $VERSION --notes-file CHANGELOG.md --title $VERSION artifacts/*
+      - setup_remote_docker:
+          version: 20.10.11
+          docker_layer_caching: true
+      - run:
+          name: Docker build
+          command: |
+            ROUTER_RELEASE=${VERSION:1}
+            ROUTER_TAG=ghcr.io/apollographql/router
+            # Build debug image
+            docker build --build-arg ROUTER_RELEASE=${ROUTER_RELEASE} --build-arg DEBUG_IMAGE=":debug" -f dockerfiles/Dockerfile.router -t ${ROUTER_TAG}:v${ROUTER_RELEASE}-debug .
+            # Build release image
+            docker build --build-arg ROUTER_RELEASE=${ROUTER_RELEASE} -f dockerfiles/Dockerfile.router -t ${ROUTER_TAG}:${VERSION} .
+            # NB: GH token expires 30/3/2023
+            echo ${GITHUB_DOCKER_TOKEN} | docker login ghcr.io -u garypen --password-stdin
+            # Push debug image
+            docker push ${ROUTER_TAG}:${VERSION}-debug
+            # Push release image
+            docker push ${ROUTER_TAG}:${VERSION}
 
 workflows:
   ci_checks:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8764ce619b..61a5311576 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,20 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## 🚀 Features
 
+- **Container images are now available** ([PR #764](https://github.com/apollographql/router/pull/764))
+
+  We now build container images More details at:
+    https://github.com/apollographql/router/pkgs/container/router
+
+  You can use the images with docker, for example, as follows:
+    e.g.: docker pull ghcr.io/apollographql/router:v0.1.0-preview.1
+
+  The images are based on [distroless](https://github.com/GoogleContainerTools/distroless) which is a very constrained image, intended to be secure and small.
+
+  We'll provide release and debug images for each release. The debug image has a busybox shell which can be accessed using (for instance) --entrypoint=sh.
+
+  For more details about thse images, see the docs.
+
 - **Skip and Include directives in post processing** ([PR #626](https://github.com/apollographql/router/pull/626))
 
   The Router now understands the [@skip](https://spec.graphql.org/October2021/#sec--skip) and [@include](https://spec.graphql.org/October2021/#sec--include) directives in queries, to add or remove fields depending on variables. It works in post processing, by filtering fields after aggregating the subgraph responses.
diff --git a/dockerfiles/Dockerfile.router b/dockerfiles/Dockerfile.router
new file mode 100644
index 0000000000..eaed0d7af7
--- /dev/null
+++ b/dockerfiles/Dockerfile.router
@@ -0,0 +1,33 @@
+ARG DEBUG_IMAGE
+# Build is required to extract the release files
+FROM --platform=linux/amd64 alpine:latest AS build
+
+ARG ROUTER_RELEASE
+
+# Pull release from GH
+ADD https://github.com/apollographql/router/releases/download/v${ROUTER_RELEASE}/router-${ROUTER_RELEASE}-x86_64-linux.tar.gz /tmp/router.tar.gz
+
+WORKDIR /tmp
+
+# router.tar.gz extracts to "dist"
+RUN tar xvzf router.tar.gz -C /
+
+# Make directories for config and schema
+RUN mkdir /dist/config && mkdir /dist/schema
+
+COPY router.yaml /dist/config
+
+# Final image uses distroless
+FROM --platform=linux/amd64 gcr.io/distroless/cc-debian11${DEBUG_IMAGE}
+
+LABEL org.opencontainers.image.authors="ApolloGraphQL https://github.com/apollographql/router"
+
+# Copy in the extracted/created files
+COPY --from=build --chown=root:root /dist /dist
+
+WORKDIR /dist
+
+# Default executable is the router
+ENTRYPOINT ["./router"]
+
+CMD ["--config", "./config/router.yaml"]
diff --git a/dockerfiles/router.yaml b/dockerfiles/router.yaml
new file mode 100644
index 0000000000..86da497188
--- /dev/null
+++ b/dockerfiles/router.yaml
@@ -0,0 +1,5 @@
+# Configuration of the router's HTTP server
+# Default configuration for container
+server:
+  # The socket address and port to listen on
+  listen: 0.0.0.0:4000
diff --git a/docs/source/config.json b/docs/source/config.json
index 336a955198..5d9d0fe99c 100644
--- a/docs/source/config.json
+++ b/docs/source/config.json
@@ -17,6 +17,11 @@
       "Traffic shaping": "/configuration/traffic-shaping",
       "Usage reporting": "/configuration/spaceport"
     },
+    "Containerization": {
+      "Overview": "/containerization/overview",
+      "Docker": "/containerization/docker",
+      "Kubernetes": "/containerization/kubernetes"
+    },
     "Development workflow": {
       "Build and run queries": "/development-workflow/build-run-queries",
       "Request format": "/development-workflow/requests",
diff --git a/docs/source/containerization/docker.mdx b/docs/source/containerization/docker.mdx
new file mode 100644
index 0000000000..bed4b15c33
--- /dev/null
+++ b/docs/source/containerization/docker.mdx
@@ -0,0 +1,78 @@
+---
+title: Docker and the router
+description: Using docker to run router images
+---
+
+import { Link } from 'gatsby';
+
+The default behaviour of the router images is suitable for a quickstart or development scenario. You'll need to know how to customize this default behaviour if you wish to do any of the following.
+
+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.: `v0.1.0-preview.1`
+
+## Override the configuration
+
+If you wish to override the default configuration, then you need to provide the new configuration:
+
+```bash
+docker run -p 4000:4000 \
+  --env APOLLO_GRAPH_REF="<your graph>" \
+  --env APOLLO_KEY="<your key>" \
+  --mount "type=bind,source=/router.yaml,target=/dist/config/router.yaml" \
+  --rm \
+  ghcr.io/apollographql/router:<image version>
+```
+
+In this case we are mounting a file from our local system's root directory (Note: that path must be absolute) over the top of the default configuration in the image. 
+
+If, for whatever reason, we wish to specify a different location for our configuration, we can:
+
+```bash
+docker run -p 4000:4000 \
+  --env APOLLO_GRAPH_REF="<your graph>" \
+  --env APOLLO_KEY="<your key>" \
+  --mount "type=bind,source=/router.yaml,target=/tmp/router.yaml" \
+  --rm \
+  ghcr.io/apollographql/router:<image version> -c /tmp/router.yaml
+```
+
+Here, we are mounting our configuration into the /tmp directory and changing the router startup to let it know that it can find configuration in /tmp/router.yaml.
+
+## Debugging your container
+
+If you run the debug image, then it's easy to debug your container:
+
+```bash
+docker run -p 4000:4000 \
+  --env APOLLO_GRAPH_REF="<your graph>" \
+  --env APOLLO_KEY="<your key>" \
+  --mount "type=bind,source=/router.yaml,target=/dist/config/router.yaml" \
+  --rm \
+  --interactive \
+  --tty \
+  --entrypoint=sh
+  ghcr.io/apollographql/router:<image version>-debug
+/dist # pwd
+/dist
+/dist # ls
+LICENSE        config         router
+README.md      licenses.html  schema
+/dist # exit
+```
+
+In this case, we've added interactive and tty flags and changed the entrypoint of the image to be a shell.
+
+## Specifying the Supergraph
+
+If we don't want to use uplink to retrieve our subgraph, we can manually specify the details.
+
+```bash
+docker run -p 4000:4000 \
+  --mount "type=bind,source=/docker.graphql,target=/dist/schema/local.graphql" \
+  --rm \
+  ghcr.io/apollographql/router:<image version> -c config/router.yaml -s schema/local.graphql
+```
+
+Note: In this example we have to mount the local definition of the supergraph into our image AND specify the location of the file. It doesn't have to be mounted in the /dist/schema directory, but it's a reasonable location to use. We must specify the configuration file location as well, since overriding the default params will override our default config file location. In this case, since we don't want to change our router configuration but want to make sure it's used, we just specify the default location of the default configuration.
+
diff --git a/docs/source/containerization/kubernetes.mdx b/docs/source/containerization/kubernetes.mdx
new file mode 100644
index 0000000000..851ab18ae9
--- /dev/null
+++ b/docs/source/containerization/kubernetes.mdx
@@ -0,0 +1,18 @@
+---
+title: Kubernetes and the router
+description: Using router images with kubernetes
+---
+
+import { Link } from 'gatsby';
+
+## The health endpoint
+
+The router supports a health endpoint. If you have a router running on your localhost at port 4000, you can access it using curl as follows:
+
+```bash
+curl "http://localhost:4000/.well-known/apollo/server-health"
+{"status":"pass"}
+```
+
+This health endpoint can be used to check the health of the router. It will always return a status of pass if all is well.
+
diff --git a/docs/source/containerization/overview.mdx b/docs/source/containerization/overview.mdx
new file mode 100644
index 0000000000..65e11d473f
--- /dev/null
+++ b/docs/source/containerization/overview.mdx
@@ -0,0 +1,34 @@
+---
+title: Containerizing the Apollo Router
+description: Running the router in a container
+---
+
+import { Link } from "gatsby";
+
+> Find our more about the router images [here](https://github.com/apollographql/router/pkgs/container/router).
+
+We supply default and debug images for each release. Both images contain the same router build. Debug images additionally contain a "busybox" to help with container debugging.
+
+The simplest way to run the image, using for example docker, is as follows:
+
+```bash
+docker run -p 4000:4000 \
+  --env APOLLO_GRAPH_REF="<your graph>" \
+  --env APOLLO_KEY="<your key>" \
+  --rm \
+  ghcr.io/apollographql/router:<image version>
+```
+
+Note: The exact image version to use is your choice depending on which release you wish to use. Replace `<image version>` with your chosen version. e.g.: `v0.1.0-preview.1`
+
+This will download your supergraph and use a default configuration which listens for connections on port 4000. If you wish to do anything more complex, it's possible to override configuration, supergraph location, or use any of the available router parameters or configuration. See [configuration](../configuration/overview/) for more details about router configuration and parameters.
+
+For more examples of using the images in different environments, take a look at our [docker](./docker/) or [kubernetes](./kubernetes/) guides.
+
+## Default behaviour of the image.
+
+The router is located in a /dist directory. A default configuration file, router.yaml, is located in the /dist/config directory. There is also a /dist/schema directory for convenient mounting of locally defined supergraph schema. Licensing details are also in the /dist directory.
+
+## Image build
+
+The images are based on [distroless](https://github.com/GoogleContainerTools/distroless) which is a very constrained image, intended to be secure and small.

From b8de50ca6600d13fff60948d669a404423eacdaf Mon Sep 17 00:00:00 2001
From: Coenen Benjamin <benjamin.coenen@hotmail.com>
Date: Fri, 1 Apr 2022 10:34:44 +0200
Subject: [PATCH 5/8] fix the apollo-rs version for the fuzzer (#771)

Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
---
 Cargo.lock      | 10 +++++-----
 fuzz/Cargo.toml |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6d09c54e6a..bf8e2b3157 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -76,7 +76,7 @@ checksum = "c1da9c412262c1dd533a84c9b867dcb4e68ab852a0936e235d75242585dda631"
 [[package]]
 name = "apollo-encoder"
 version = "0.2.3"
-source = "git+https://github.com/apollographql/apollo-rs.git?rev=75dc54cdc129d1784e92a1e5ff32e4e4f2bfc958#75dc54cdc129d1784e92a1e5ff32e4e4f2bfc958"
+source = "git+https://github.com/apollographql/apollo-rs.git?rev=06b039f4be6e04557b762d09078f7a9e07ee40a2#06b039f4be6e04557b762d09078f7a9e07ee40a2"
 
 [[package]]
 name = "apollo-federation-types"
@@ -99,7 +99,7 @@ dependencies = [
 [[package]]
 name = "apollo-parser"
 version = "0.2.4"
-source = "git+https://github.com/apollographql/apollo-rs.git?rev=75dc54cdc129d1784e92a1e5ff32e4e4f2bfc958#75dc54cdc129d1784e92a1e5ff32e4e4f2bfc958"
+source = "git+https://github.com/apollographql/apollo-rs.git?rev=06b039f4be6e04557b762d09078f7a9e07ee40a2#06b039f4be6e04557b762d09078f7a9e07ee40a2"
 dependencies = [
  "rowan",
 ]
@@ -247,10 +247,10 @@ dependencies = [
 [[package]]
 name = "apollo-smith"
 version = "0.1.0"
-source = "git+https://github.com/apollographql/apollo-rs.git?rev=75dc54cdc129d1784e92a1e5ff32e4e4f2bfc958#75dc54cdc129d1784e92a1e5ff32e4e4f2bfc958"
+source = "git+https://github.com/apollographql/apollo-rs.git?rev=06b039f4be6e04557b762d09078f7a9e07ee40a2#06b039f4be6e04557b762d09078f7a9e07ee40a2"
 dependencies = [
  "apollo-encoder 0.2.3",
- "apollo-parser 0.2.4 (git+https://github.com/apollographql/apollo-rs.git?rev=75dc54cdc129d1784e92a1e5ff32e4e4f2bfc958)",
+ "apollo-parser 0.2.4 (git+https://github.com/apollographql/apollo-rs.git?rev=06b039f4be6e04557b762d09078f7a9e07ee40a2)",
  "arbitrary",
  "once_cell",
 ]
@@ -3654,7 +3654,7 @@ dependencies = [
 name = "router-fuzz"
 version = "0.0.0"
 dependencies = [
- "apollo-parser 0.2.4 (git+https://github.com/apollographql/apollo-rs.git?rev=75dc54cdc129d1784e92a1e5ff32e4e4f2bfc958)",
+ "apollo-parser 0.2.4 (git+https://github.com/apollographql/apollo-rs.git?rev=06b039f4be6e04557b762d09078f7a9e07ee40a2)",
  "apollo-smith",
  "env_logger",
  "libfuzzer-sys",
diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
index ef2a43698c..fb12bcf4b3 100644
--- a/fuzz/Cargo.toml
+++ b/fuzz/Cargo.toml
@@ -12,8 +12,8 @@ cargo-fuzz = true
 [dependencies]
 libfuzzer-sys = "0.4"
 # apollo-smith = { path = "../../apollo-rs/crates/apollo-smith", features = ["parser-impl"] }
-apollo-smith = { git = "https://github.com/apollographql/apollo-rs.git", rev = "75dc54cdc129d1784e92a1e5ff32e4e4f2bfc958", features = ["parser-impl"] }
-apollo-parser = { git = "https://github.com/apollographql/apollo-rs.git", rev = "75dc54cdc129d1784e92a1e5ff32e4e4f2bfc958" }
+apollo-smith = { git = "https://github.com/apollographql/apollo-rs.git", rev = "06b039f4be6e04557b762d09078f7a9e07ee40a2", features = ["parser-impl"] }
+apollo-parser = { git = "https://github.com/apollographql/apollo-rs.git", rev = "06b039f4be6e04557b762d09078f7a9e07ee40a2" }
 # apollo-parser = { path = "../../apollo-rs/crates/apollo-parser" }
 env_logger = "0.9.0"
 log = "0.4.16"

From 8037689840bb12497e6cb4181a39a75bafdf18dc Mon Sep 17 00:00:00 2001
From: Jeremy Lempereur <jeremy.lempereur@gmail.com>
Date: Fri, 1 Apr 2022 11:06:39 +0200
Subject: [PATCH 6/8] feat: Hot reload (#770)

* feat: Hot reload

fixes #766

The router now supports the HOT_RELOAD environment variable to watch for config and schema changes.
You can also run it using the --hr or --hot-reload flag
---
 CHANGELOG.md                           | 6 ++++++
 README.md                              | 2 +-
 apollo-router/src/executable.rs        | 8 ++++----
 docs/source/configuration/overview.mdx | 4 ++--
 docs/source/migrating-from-gateway.mdx | 2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61a5311576..8e7be80620 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,8 +28,14 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
   The Router will allow only the https://studio.apollographql.com origin by default, instead of any origin.
   This behavior can still be tweaked in the [YAML configuration](https://www.apollographql.com/docs/router/configuration/cors)
 
+- **Hot reload flag** ([766](https://github.com/apollographql/router/issues/766))
+  The `--watch` (or `-w`) flag that enables hot reload was renamed to `--hr` or `--hot-reload`
+
 ## 🚀 Features
 
+- **Hot reload via en environment variable** ([766](https://github.com/apollographql/router/issues/766))
+  You can now ust the ROUTER_HOT_RELOAD=true environment variable to have the router watch for configuration and schema changes and automatically reload.
+
 - **Container images are now available** ([PR #764](https://github.com/apollographql/router/pull/764))
 
   We now build container images More details at:
diff --git a/README.md b/README.md
index 7ea6fc5fe0..00d1453f8c 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ directory.
 OPTIONS:
     -c, --config <configuration-path>    Configuration file location
     -s, --supergraph <supergraph-path>   Supergraph Schema location
-    -w, --watch                          Watches for changes in the supergraph and configuration file
+    --hr, --hot-reload                   Watches for changes in the supergraph and configuration file
         --schema                         Prints out a JSON schema of the configuration file
 ```
 
diff --git a/apollo-router/src/executable.rs b/apollo-router/src/executable.rs
index cd6b8a92a8..69dbacc1f2 100644
--- a/apollo-router/src/executable.rs
+++ b/apollo-router/src/executable.rs
@@ -33,8 +33,8 @@ pub struct Opt {
     log_level: String,
 
     /// Reload configuration and schema files automatically.
-    #[clap(short, long)]
-    watch: bool,
+    #[clap(alias = "hr", long = "hot-reload", env = "ROUTER_HOT_RELOAD")]
+    hot_reload: bool,
 
     /// Configuration location relative to the project directory.
     #[clap(short, long = "config", parse(from_os_str), env)]
@@ -182,7 +182,7 @@ pub async fn rt_main() -> Result<()> {
 
             ConfigurationKind::File {
                 path,
-                watch: opt.watch,
+                watch: opt.hot_reload,
                 delay: None,
             }
         })
@@ -197,7 +197,7 @@ pub async fn rt_main() -> Result<()> {
             };
             SchemaKind::File {
                 path: supergraph_path,
-                watch: opt.watch,
+                watch: opt.hot_reload,
                 delay: None,
             }
         }
diff --git a/docs/source/configuration/overview.mdx b/docs/source/configuration/overview.mdx
index dd4dcbb0b8..f39c992b1e 100644
--- a/docs/source/configuration/overview.mdx
+++ b/docs/source/configuration/overview.mdx
@@ -85,7 +85,7 @@ Prints out a JSON schema of the configuration file, including plugin configurati
 <tr>
 <td style="min-width: 150px;">
 
-##### `-w` / `--watch`
+##### `--hr` / `--hot-reload`
 
 </td>
 <td>
@@ -161,7 +161,7 @@ The time between polls to Apollo uplink. Minimum 10s.
 
 ## Configuration file
 
-The Apollo Router takes an optional YAML configuration file as input via the `--config` option.  If the `--watch` flag is also passed, the router will automatically restart when changes to the configuration file are made.
+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 `ROUTER_HOT_RELOAD` environment variable is set to `true`), the router will automatically restart when changes to the configuration file are made.
 
 This file enables you to customize the router's behavior in many ways:
 
diff --git a/docs/source/migrating-from-gateway.mdx b/docs/source/migrating-from-gateway.mdx
index dc196018e2..6d5d8ed99c 100644
--- a/docs/source/migrating-from-gateway.mdx
+++ b/docs/source/migrating-from-gateway.mdx
@@ -8,7 +8,7 @@ If you're currently using the `@apollo/gateway` library in your federated graph,
 
 ## What's different?
 
-Unlike `@apollo/gateway`, the Apollo Router is usually packaged as a _static, standalone binary_. You can pass this binary a [YAML configuration file](./configuration/overview/#configuration-file) at startup to customize its behavior.  Additionally, if you start your router with the `--watch` flag, you can even _modify_ that configuration and have changes picked up without restarting the router.
+Unlike `@apollo/gateway`, the Apollo Router is usually packaged as a _static, standalone binary_. You can pass this binary a [YAML configuration file](./configuration/overview/#configuration-file) at startup to customize its behavior.  Additionally, if you start your router with the `--hot-reload` flag, or set the `ROUTER_HOT_RELOAD` environment variable to `true` you can even _modify_ that configuration and have changes picked up without restarting the router.
 
 You _can_ use the Apollo Router as a library in a larger project, but our goal is to remove the need to write custom code in your graph router (as is necessary with `@apollo/gateway`). Instead, the Apollo Router exposes the most common critical features via declarative configuration.
 

From b4ba5b5beaa49f66135585206a583a2d32315bd9 Mon Sep 17 00:00:00 2001
From: Bryn Cooke <BrynCooke@gmail.com>
Date: Fri, 1 Apr 2022 11:44:45 +0200
Subject: [PATCH 7/8] release: v0.1.0-preview.2 (#774)

* release: v0.1.0-preview.2

Co-authored-by: bryn <bryn@apollographql.com>
---
 CHANGELOG.md                        | 18 +++++++++---------
 Cargo.lock                          | 12 ++++++------
 apollo-router-benchmarks/Cargo.toml |  2 +-
 apollo-router-core/Cargo.toml       |  2 +-
 apollo-router/Cargo.toml            |  2 +-
 apollo-spaceport/Cargo.toml         |  2 +-
 deny.toml                           |  6 +++---
 uplink/Cargo.toml                   |  2 +-
 xtask/Cargo.toml                    |  2 +-
 9 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e7be80620..7fd149d536 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
  -->
 
-# [v0.1.0-preview.2] (unreleased) - 2022-mm-dd
+# [v0.1.0-preview.2] - 2022-04-01
 ## ❗ BREAKING ❗
 
 - **CORS default Configuration** ([#40](https://github.com/apollographql/router/issues/40))
@@ -34,7 +34,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ## 🚀 Features
 
 - **Hot reload via en environment variable** ([766](https://github.com/apollographql/router/issues/766))
-  You can now ust the ROUTER_HOT_RELOAD=true environment variable to have the router watch for configuration and schema changes and automatically reload.
+  You can now use the `ROUTER_HOT_RELOAD=true` environment variable to have the router watch for configuration and schema changes and automatically reload.
 
 - **Container images are now available** ([PR #764](https://github.com/apollographql/router/pull/764))
 
@@ -46,9 +46,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
   The images are based on [distroless](https://github.com/GoogleContainerTools/distroless) which is a very constrained image, intended to be secure and small.
 
-  We'll provide release and debug images for each release. The debug image has a busybox shell which can be accessed using (for instance) --entrypoint=sh.
+  We'll provide release and debug images for each release. The debug image has a busybox shell which can be accessed using (for instance) `--entrypoint=sh`.
 
-  For more details about thse images, see the docs.
+  For more details about these images, see the docs.
 
 - **Skip and Include directives in post processing** ([PR #626](https://github.com/apollographql/router/pull/626))
 
@@ -58,10 +58,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
   While schema introspection is useful in development, we might not want to expose the entire schema in production,
   so the router can be configured to forbid introspection queries as follows:
-```yaml
-server:
-  introspection: false
-```
+  ```yaml
+  server:
+    introspection: false
+  ```
 
 ## 🐛 Fixes
 - **Move query dedup to an experimental `traffic_shaping` plugin** ([PR #753](https://github.com/apollographql/router/pull/753))
@@ -90,7 +90,7 @@ server:
 
 - **Relax variables selection for subgraph queries** ([PR #755](https://github.com/apollographql/router/pull/755))
 
-  federated subgraph queries relying on partial or invalid data from previous subgraph queries could result in response failures or empty subgraph queries. The router is now more flexible when selecting data from previous queries, while still keeping a correct form for the final response
+  Federated subgraph queries relying on partial or invalid data from previous subgraph queries could result in response failures or empty subgraph queries. The router is now more flexible when selecting data from previous queries, while still keeping a correct form for the final response
 
 ## 🛠 Maintenance
 ## 📚 Documentation
diff --git a/Cargo.lock b/Cargo.lock
index bf8e2b3157..49efa19c85 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -114,7 +114,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-router"
-version = "0.1.0-preview.1"
+version = "0.1.0-preview.2"
 dependencies = [
  "anyhow",
  "apollo-parser 0.2.4 (git+https://github.com/apollographql/apollo-rs.git?rev=e707e0f78f41ace1c3ecfe69bc10f4144ffbf7ac)",
@@ -177,7 +177,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-router-benchmarks"
-version = "0.1.0-preview.1"
+version = "0.1.0-preview.2"
 dependencies = [
  "apollo-router",
  "apollo-router-core",
@@ -194,7 +194,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-router-core"
-version = "0.1.0-preview.1"
+version = "0.1.0-preview.2"
 dependencies = [
  "apollo-parser 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "async-trait",
@@ -257,7 +257,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-spaceport"
-version = "0.1.0-preview.1"
+version = "0.1.0-preview.2"
 dependencies = [
  "bytes",
  "clap 3.1.6",
@@ -278,7 +278,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-uplink"
-version = "0.1.0-preview.1"
+version = "0.1.0-preview.2"
 dependencies = [
  "futures",
  "graphql_client",
@@ -5377,7 +5377,7 @@ dependencies = [
 
 [[package]]
 name = "xtask"
-version = "0.1.0-preview.1"
+version = "0.1.0-preview.2"
 dependencies = [
  "ansi_term",
  "anyhow",
diff --git a/apollo-router-benchmarks/Cargo.toml b/apollo-router-benchmarks/Cargo.toml
index cf2eab1b61..b732ebbe09 100644
--- a/apollo-router-benchmarks/Cargo.toml
+++ b/apollo-router-benchmarks/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "apollo-router-benchmarks"
-version = "0.1.0-preview.1"
+version = "0.1.0-preview.2"
 authors = ["Apollo Graph, Inc. <packages@apollographql.com>"]
 edition = "2021"
 license = "LicenseRef-ELv2"
diff --git a/apollo-router-core/Cargo.toml b/apollo-router-core/Cargo.toml
index 6e193d7af0..0b165b5976 100644
--- a/apollo-router-core/Cargo.toml
+++ b/apollo-router-core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "apollo-router-core"
-version = "0.1.0-preview.1"
+version = "0.1.0-preview.2"
 authors = ["Apollo Graph, Inc. <packages@apollographql.com>"]
 edition = "2021"
 license-file = "./LICENSE"
diff --git a/apollo-router/Cargo.toml b/apollo-router/Cargo.toml
index c404a0a094..e67bf0ea79 100644
--- a/apollo-router/Cargo.toml
+++ b/apollo-router/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "apollo-router"
-version = "0.1.0-preview.1"
+version = "0.1.0-preview.2"
 authors = ["Apollo Graph, Inc. <packages@apollographql.com>"]
 edition = "2021"
 license-file = "./LICENSE"
diff --git a/apollo-spaceport/Cargo.toml b/apollo-spaceport/Cargo.toml
index 39a83a858e..df77cf4fe4 100644
--- a/apollo-spaceport/Cargo.toml
+++ b/apollo-spaceport/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "apollo-spaceport"
-version = "0.1.0-preview.1"
+version = "0.1.0-preview.2"
 authors = ["Apollo Graph, Inc. <packages@apollographql.com>"]
 edition = "2021"
 license-file = "./LICENSE"
diff --git a/deny.toml b/deny.toml
index a713c6acb8..16e1234711 100644
--- a/deny.toml
+++ b/deny.toml
@@ -64,13 +64,13 @@ license-files = [{ path = "LICENSE", hash = 0xbd0eed23 }]
 [[licenses.clarify]]
 name = "apollo-router"
 expression = "LicenseRef-ELv2"
-version = "0.1.0-preview.1"
+version = "0.1.0-preview.2"
 license-files = [{ path = "LICENSE", hash = 0xaceadac9 }]
 
 [[licenses.clarify]]
 name = "apollo-router-core"
 expression = "LicenseRef-ELv2"
-version = "0.1.0-preview.1"
+version = "0.1.0-preview.2"
 license-files = [{ path = "LICENSE", hash = 0xaceadac9 }]
 
 [[licenses.clarify]]
@@ -81,7 +81,7 @@ license-files = [{ path = "router-bridge/LICENSE", hash = 0xaceadac9 }]
 [[licenses.clarify]]
 name = "apollo-spaceport"
 expression = "LicenseRef-ELv2"
-version = "0.1.0-preview.1"
+version = "0.1.0-preview.2"
 license-files = [{ path = "LICENSE", hash = 0xaceadac9 }]
 
 [[licenses.clarify]]
diff --git a/uplink/Cargo.toml b/uplink/Cargo.toml
index 6e46ab01cf..7cf785da7d 100644
--- a/uplink/Cargo.toml
+++ b/uplink/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "apollo-uplink"
-version = "0.1.0-preview.1"
+version = "0.1.0-preview.2"
 edition = "2021"
 build = "build.rs"
 
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index 5420af74ec..e10e8e3804 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "xtask"
-version = "0.1.0-preview.1"
+version = "0.1.0-preview.2"
 authors = ["Apollo Graph, Inc. <packages@apollographql.com>"]
 edition = "2021"
 license = "LicenseRef-ELv2"

From d57b821fbefe91284180e8fbd9dae3145d94d564 Mon Sep 17 00:00:00 2001
From: Gary Pennington <gary@apollographql.com>
Date: Fri, 1 Apr 2022 10:08:41 +0100
Subject: [PATCH 8/8] add a user-agent header to the studio usage ingress
 submission

fixes: #733
---
 apollo-spaceport/src/server.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apollo-spaceport/src/server.rs b/apollo-spaceport/src/server.rs
index 0b82155102..07e348b05b 100644
--- a/apollo-spaceport/src/server.rs
+++ b/apollo-spaceport/src/server.rs
@@ -169,6 +169,14 @@ impl ReportSpaceport {
             .header("Content-Encoding", "gzip")
             .header("Content-Type", "application/protobuf")
             .header("Accept", "application/json")
+            .header(
+                "User-Agent",
+                format!(
+                    "{} / {} usage reporting",
+                    std::env!("CARGO_PKG_NAME"),
+                    std::env!("CARGO_PKG_VERSION")
+                ),
+            )
             .build()
             .map_err(|e| Status::unavailable(e.to_string()))?;