Merge branch 'dev' into geal/merge-dev-in-staging-perf

Author: Geal

.changesets/config_extra_labels_tpl.md

@@ -0,0 +1,38 @@
+### Improve handling of deferred response errors from rhai scripts ([Issue #2935](https://github.com/apollographql/router/issues/2935)) ([Issue #2936](https://github.com/apollographql/router/issues/2936))
+
+
+Whilst processing a deferred response; if a rhai script errors in rhai the router ignores the error and returns None in the stream of results. This has two unfortunate aspects:
+
+ - the error is not propagated to the client
+ - the stream is terminated (silently)
+
+The fix captures the error and propagates the response to the client.
+
+This fix also adds support for the `is_primary()` method which may be invoked on both supergraph_service() and execution_service() responses. It may be used to avoid implementing exception handling for header interactions and to determine if a response `is_primary()` (i.e.: first) or not.
+
+e.g.:
+
+```
+    if response.is_primary() {
+        print(`all response headers: ${response.headers}`);
+    } else {
+        print(`don't try to access headers`);
+    }
+```
+
+vs
+
+```
+    try {
+        print(`all response headers: ${response.headers}`);
+    }
+    catch(err) {
+        if err == "cannot access headers on a deferred response" {
+            print(`don't try to access headers`);
+        }
+    }
+```
+Note: This is a minimal example for purposes of illustration. A real exception handler would handle all error conditions.
+
+
+By [@garypen](https://github.com/garypen) in https://github.com/apollographql/router/pull/2945

.changesets/feat_garypen_2935_rhai_defer_error.md

@@ -0,0 +1,5 @@
+### Update the h2 dependency to fix a Denial of Service vulnerability 
+
+Fixes https://rustsec.org/advisories/RUSTSEC-2023-0034
+
+By [@Geal](https://github.com/Geal) in https://github.com/apollographql/router/pull/2982

.changesets/fix_geal_update_h2.md

@@ -0,0 +1,7 @@
+### fix: Traffic shaping configuration fallback for experimental_enable_http2 
+
+Fix a bug where experimental_enable_http2 wouldn't properly apply when a global configuration was set.
+
+Huge thanks to @westhechiang, @leggomuhgreggo @vecchp and @davidvasandani for discovering the issue and finding a reproducible testcase!
+
+By [@o0Ignition0o](https://github.com/o0Ignition0o) in https://github.com/apollographql/router/pull/2976

.changesets/fix_orangutan_vinegar_pioneer_lip.md

@@ -0,0 +1,8 @@
+### Rate limit errors emitted from open telemetry ([Issue #2953](https://github.com/apollographql/router/issues/2953))
+
+When a batch span exporter is unable to send accept a span because the buffer is full it will emit an error.
+These errors can be very frequent and could potentially impact performance.
+
+Otel errors are now rate limited to one every ten seconds per error type.
+
+By [@bryncooke](https://github.com/bryncooke) in https://github.com/apollographql/router/pull/2954

.changesets/fix_payday_floor_search_calcium.md

@@ -0,0 +1,5 @@
+### Add support of operationCountByType for apollo studio ([PR #2979](https://github.com/apollographql/router/pull/2979))
+
+Add more details about the operation type for apollo studio usage reporting.
+
+By [@bnjjj](https://github.com/bnjjj) in https://github.com/apollographql/router/pull/2979

.changesets/maint_climber_northeast_inspector_cried.md

@@ -4,6 +4,50 @@ 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.15.1] - 2023-04-18
+
+## 🐛 Fixes
+
+### Resolve Docker `unrecognized subcommand` error ([Issue #2966](https://github.com/apollographql/router/issues/2966))
+
+We've repaired the Docker build of the v1.15.0 release which broke due to the introduction of syntax in the Dockerfile which can only be used by the the `docker buildx` tooling [which leverages Moby BuildKit](https://www.docker.com/blog/introduction-to-heredocs-in-dockerfiles/).
+
+Furthermore, the change didn't apply to the `diy` ("do-it-yourself") image, and we'd like to prevent the two Dockerfiles from deviating more than necessary.
+
+Overall, this reverts [apollographql/router#2925](https://github.com/apollographql/router/pull/2925).
+
+By [@abernix](https://github.com/abernix) in https://github.com/apollographql/router/pull/2968
+
+### Helm Chart `extraContainers`
+
+This is another iteration on the functionality for supporting side-cars within Helm charts, which is quite useful for [coprocessor](https://www.apollographql.com/docs/router/customizations/coprocessor/) configurations.
+
+By [@pcarrier](https://github.com/pcarrier) in https://github.com/apollographql/router/pull/2967
+
+## 📃 Configuration
+
+### Treat Helm `extraLabels` as templates
+
+It is now possible to use data from Helm's `Values` or `Chart` objects to add additional labels to Kubernetes Deployments of Pods.
+
+As of this release, the following example:
+
+```yaml
+extraLabels:
+  env: {{ .Chart.AppVersion }}
+```
+
+... will now result in:
+
+```yaml
+labels:
+  env: "v1.2.3"
+```
+
+Previously, this would have resulted in merely emitting the untemplatized `{{ .Chart.AppVersion }}` value, resulting in an invalid label.
+
+By [@gscheibel](https://github.com/gscheibel) in https://github.com/apollographql/router/pull/2962
+
 # [1.15.0] - 2023-04-17
 
 ## 🚀 Features

CHANGELOG.md

@@ -272,10 +272,9 @@ dependencies = [
 
 [[package]]
 name = "apollo-router"
-version = "1.15.0"
+version = "1.15.1"
 dependencies = [
  "access-json",
- "ansi_term",
  "anyhow",
  "apollo-compiler",
  "apollo-parser 0.5.1",
@@ -334,6 +333,7 @@ dependencies = [
  "multer",
  "multimap",
  "notify",
+ "nu-ansi-term 0.47.0",
  "once_cell",
  "opentelemetry",
  "opentelemetry-datadog",
@@ -407,7 +407,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-router-benchmarks"
-version = "1.15.0"
+version = "1.15.1"
 dependencies = [
  "apollo-parser 0.4.1",
  "apollo-router",
@@ -423,7 +423,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-router-scaffold"
-version = "1.15.0"
+version = "1.15.1"
 dependencies = [
  "anyhow",
  "cargo-scaffold",
@@ -2530,9 +2530,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.16"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d"
+checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21"
 dependencies = [
  "bytes",
  "fnv",
@@ -3538,6 +3538,15 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
+[[package]]
+name = "nu-ansi-term"
+version = "0.47.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1df031e117bca634c262e9bd3173776844b6c17a90b3741c9163663b4385af76"
+dependencies = [
+ "windows-sys 0.45.0",
+]
+
 [[package]]
 name = "num"
 version = "0.4.0"
@@ -6298,7 +6307,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70"
 dependencies = [
  "matchers",
- "nu-ansi-term",
+ "nu-ansi-term 0.46.0",
  "once_cell",
  "regex",
  "serde",

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "apollo-router-benchmarks"
-version = "1.15.0"
+version = "1.15.1"
 authors = ["Apollo Graph, Inc. <packages@apollographql.com>"]
 edition = "2021"
 license = "Elastic-2.0"

apollo-router-benchmarks/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "apollo-router-scaffold"
-version = "1.15.0"
+version = "1.15.1"
 authors = ["Apollo Graph, Inc. <packages@apollographql.com>"]
 edition = "2021"
 license = "Elastic-2.0"