Merge branch 'version-0.x' into release-gateway-0.45.0

apollographql · Dec 9, 2021 · 44dd614 · 44dd614
2 parents 3797c84 + 4b6e43d
commit 44dd614
Show file tree

Hide file tree

Showing 5 changed files with 1,255 additions and 1,249 deletions.
diff --git a/docs/source/enterprise-guide/graph-administration.mdx b/docs/source/enterprise-guide/graph-administration.mdx
@@ -95,7 +95,7 @@ As more services are added to a federated graph and adoption spreads across clie
 
 ### Federated traces
 
-With federated tracing enabled ([which happens by default](/metrics/#turning-it-on) when an `APOLLO_KEY` variable is present in the gateway's environment), the gateway will include an HTTP header of `apollo-federation-include-trace: ftv1` with each request to a subgraph. Each subgraph will then [construct its trace](/metrics/#how-traces-are-constructed-and-aggregated) and add this data to the `extensions` of its response. Apollo Gateway then constructs the overall trace for the request based on the shape of the query plan. This process may be visualized as follows:
+With federated tracing enabled ([which happens by default](/metrics/#enabling-traces) when an `APOLLO_KEY` variable is present in the gateway's environment), the gateway will include an HTTP header of `apollo-federation-include-trace: ftv1` with each request to a subgraph. Each subgraph will then [construct its trace](/metrics/#how-traces-are-constructed-and-aggregated) and add this data to the `extensions` of its response. Apollo Gateway then constructs the overall trace for the request based on the shape of the query plan. This process may be visualized as follows:
 
 ![Federated tracing process](../images/enterprise-guide/federated-tracing.jpg)
 

diff --git a/gateway-js/CHANGELOG.md b/gateway-js/CHANGELOG.md
@@ -98,7 +98,7 @@
 
 ## v0.30.0
 
-- Send error reports to a configurable endpoint when providing the `APOLLO_OUT_OF_BAND_REPORTER_ENDPOINT` env variable. Using the Apollo URL `https://uplink.api.apollographql.com/monitoring` is recommended unless you have a custom configuration. Reports will only be sent if the env variable is set. [PR #777](https://github.com/apollographql/federation/pull/777)
+- Send error reports to a configurable endpoint when providing the `APOLLO_OUT_OF_BAND_REPORTER_ENDPOINT` env variable. Using the Apollo URL `https://outofbandreporter.api.apollographql.com` is recommended unless you have a custom configuration. Reports will only be sent if the env variable is set. [PR #777](https://github.com/apollographql/federation/pull/777)
 
 ## v0.29.1