From 15f7c10071178a185759cde5385c3a8b34eb56a6 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 20 Aug 2020 17:33:18 -0600
Subject: [PATCH] [CORL-1293] Sentry Error Integration (#3109)

* feat: initial server impl

* feat: transitioned to vanilla apollo-server-express

* fix: disable APQ

* feat: client side error reporting support

* fix: updated snapshots

* feat: add domain tags to requests

* fix: remove email from error payload

* fix: fixed based on review comments

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
---
 package-lock.json                             | 484 ++++++++++++------
 package.json                                  |   6 +-
 src/core/client/account/index.tsx             |   7 +
 src/core/client/admin/index.tsx               |   8 +
 .../admin/routes/AuthCheck/AuthCheckRoute.tsx |  40 +-
 .../admin/routes/AuthCheck/Restricted.tsx     |  24 +-
 .../routes/AuthCheck/RestrictedContainer.tsx  |   4 +-
 .../__snapshots__/Restricted.spec.tsx.snap    |  15 +-
 src/core/client/auth/index.tsx                |   7 +
 .../helpers/injectConditionalPolyfills.tsx    |   1 +
 .../framework/lib/bootstrap/CoralContext.tsx  |   6 +
 .../framework/lib/bootstrap/createManaged.tsx |  21 +-
 src/core/client/framework/lib/errors/index.ts |   1 +
 .../lib/errors/reporter/createReporter.ts     |  52 ++
 .../framework/lib/errors/reporter/index.ts    |   3 +
 .../framework/lib/errors/reporter/reporter.ts |  46 ++
 .../framework/lib/errors/reporter/sentry.tsx  |  49 ++
 src/core/client/install/index.tsx             |   7 +
 src/core/client/stream/index.tsx              |   8 +
 src/core/common/config.ts                     |  31 ++
 src/core/server/app/handlers/api/graphql.ts   |  79 ---
 src/core/server/app/handlers/api/index.ts     |   1 -
 src/core/server/app/index.ts                  |  20 +-
 src/core/server/app/middleware/csp/index.ts   |   1 +
 src/core/server/app/middleware/error.ts       | 119 ++++-
 .../app/middleware/graphql/apolloServer.ts    | 114 +++++
 .../middleware/graphql/graphqlMiddleware.ts   |  76 ---
 .../server/app/middleware/graphql/index.ts    |   4 +-
 ...edQueryMiddleware.ts => persistedQuery.ts} |   4 +-
 src/core/server/app/middleware/index.ts       |  17 +
 src/core/server/app/middleware/installed.ts   |  14 +-
 src/core/server/app/middleware/logging.ts     |  22 +-
 src/core/server/app/middleware/metrics.ts     |   2 -
 .../server/app/middleware/passport/index.ts   |   6 +-
 src/core/server/app/middleware/tenant.ts      |   4 +-
 src/core/server/app/middleware/userLimiter.ts |   4 +-
 src/core/server/app/router/api/index.ts       |  34 +-
 src/core/server/app/router/client.ts          |  23 +-
 src/core/server/app/router/index.ts           |  23 +-
 src/core/server/app/views/error.html          |  57 ++-
 src/core/server/config.ts                     |  10 +
 src/core/server/errors/index.ts               |  18 +
 src/core/server/graph/context.ts              |   4 +
 .../extensions/ErrorWrappingExtension.ts      | 121 -----
 .../graph/extensions/MetricsExtension.ts      |  43 --
 src/core/server/graph/extensions/helpers.ts   |  82 ---
 src/core/server/graph/extensions/index.ts     |   3 -
 src/core/server/graph/persisted/loader.ts     |   2 +-
 src/core/server/graph/plugins/error.ts        |  22 +
 src/core/server/graph/plugins/helpers.ts      | 182 +++++++
 src/core/server/graph/plugins/index.ts        |   4 +
 .../LoggerExtension.ts => plugins/logger.ts}  | 102 ++--
 src/core/server/graph/plugins/metrics.ts      |  40 ++
 src/core/server/graph/subscriptions/server.ts |  10 +-
 src/core/server/index.ts                      |  42 +-
 src/core/server/services/errors/index.ts      |   2 +
 src/core/server/services/errors/reporter.ts   |  36 ++
 src/core/server/services/errors/sentry.ts     |  60 +++
 src/locales/da/admin.ftl                      |   2 +-
 src/locales/en-US/admin.ftl                   |   2 +-
 src/locales/es/admin.ftl                      |   2 +-
 src/locales/fr-FR/admin.ftl                   |   2 +-
 src/locales/pt-BR/admin.ftl                   |   2 +-
 63 files changed, 1484 insertions(+), 753 deletions(-)
 create mode 100644 src/core/client/framework/lib/errors/reporter/createReporter.ts
 create mode 100644 src/core/client/framework/lib/errors/reporter/index.ts
 create mode 100644 src/core/client/framework/lib/errors/reporter/reporter.ts
 create mode 100644 src/core/client/framework/lib/errors/reporter/sentry.tsx
 create mode 100644 src/core/common/config.ts
 delete mode 100644 src/core/server/app/handlers/api/graphql.ts
 create mode 100644 src/core/server/app/middleware/csp/index.ts
 create mode 100644 src/core/server/app/middleware/graphql/apolloServer.ts
 delete mode 100644 src/core/server/app/middleware/graphql/graphqlMiddleware.ts
 rename src/core/server/app/middleware/graphql/{persistedQueryMiddleware.ts => persistedQuery.ts} (96%)
 create mode 100644 src/core/server/app/middleware/index.ts
 delete mode 100644 src/core/server/graph/extensions/ErrorWrappingExtension.ts
 delete mode 100644 src/core/server/graph/extensions/MetricsExtension.ts
 delete mode 100644 src/core/server/graph/extensions/helpers.ts
 delete mode 100644 src/core/server/graph/extensions/index.ts
 create mode 100644 src/core/server/graph/plugins/error.ts
 create mode 100644 src/core/server/graph/plugins/helpers.ts
 create mode 100644 src/core/server/graph/plugins/index.ts
 rename src/core/server/graph/{extensions/LoggerExtension.ts => plugins/logger.ts} (53%)
 create mode 100644 src/core/server/graph/plugins/metrics.ts
 create mode 100644 src/core/server/services/errors/index.ts
 create mode 100644 src/core/server/services/errors/reporter.ts
 create mode 100644 src/core/server/services/errors/sentry.ts

diff --git a/package-lock.json b/package-lock.json
index 1b4b28d686..2a404524aa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -40,9 +40,12 @@
       }
     },
     "@apollographql/graphql-playground-html": {
-      "version": "1.6.24",
-      "resolved": "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.24.tgz",
-      "integrity": "sha512-8GqG48m1XqyXh4mIZrtB5xOhUwSsh1WsrrsaZQOEYYql3YN9DEu9OOSg0ILzXHZo/h2Q74777YE4YzlArQzQEQ=="
+      "version": "1.6.26",
+      "resolved": "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.26.tgz",
+      "integrity": "sha512-XAwXOIab51QyhBxnxySdK3nuMEUohhDsHQ5Rbco/V1vjlP75zZ0ZLHD9dTpXTN8uxKxopb2lUvJTq+M4g2Q0HQ==",
+      "requires": {
+        "xss": "^1.0.6"
+      }
     },
     "@ardatan/aggregate-error": {
       "version": "0.0.1",
@@ -8232,6 +8235,149 @@
         "join-component": "^1.1.0"
       }
     },
+    "@sentry/apm": {
+      "version": "5.21.1",
+      "resolved": "https://registry.npmjs.org/@sentry/apm/-/apm-5.21.1.tgz",
+      "integrity": "sha512-mxMOCpeXULbQCC/f9SwPqW+g12mk3nWRNjeAUm5dyiKHY13agtQBSSYs4ROEH190YxmwTZr3vxhlR2jNSdSZcg==",
+      "requires": {
+        "@sentry/browser": "5.21.1",
+        "@sentry/hub": "5.21.1",
+        "@sentry/minimal": "5.21.1",
+        "@sentry/types": "5.21.1",
+        "@sentry/utils": "5.21.1",
+        "tslib": "^1.9.3"
+      }
+    },
+    "@sentry/browser": {
+      "version": "5.21.1",
+      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-5.21.1.tgz",
+      "integrity": "sha512-sUxsW545klZxJE4iBAYQ8SuVS85HTOGNmIIIZWFUogB5oW3O0L+nJluXEqf/pHU82LnjDIzqsWCYQ0cRUaeYow==",
+      "requires": {
+        "@sentry/core": "5.21.1",
+        "@sentry/types": "5.21.1",
+        "@sentry/utils": "5.21.1",
+        "tslib": "^1.9.3"
+      }
+    },
+    "@sentry/core": {
+      "version": "5.21.1",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.21.1.tgz",
+      "integrity": "sha512-Luulwx3GLUiY0gmHOhU+4eSga28Ce8DwoBcRq9GkGuhPu9r80057d5urxrDLp/leIZBXVvpY7tvmSN/rMtvF9w==",
+      "requires": {
+        "@sentry/hub": "5.21.1",
+        "@sentry/minimal": "5.21.1",
+        "@sentry/types": "5.21.1",
+        "@sentry/utils": "5.21.1",
+        "tslib": "^1.9.3"
+      }
+    },
+    "@sentry/hub": {
+      "version": "5.21.1",
+      "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.21.1.tgz",
+      "integrity": "sha512-x5i9Ggi5ZYMhBYL5kyTu2fUJ6owjKH2tgJL3UExoZdRyZkbLAFZb+DtfSnteWgQ6wriGfgPD3r/hAIEdaomk2A==",
+      "requires": {
+        "@sentry/types": "5.21.1",
+        "@sentry/utils": "5.21.1",
+        "tslib": "^1.9.3"
+      }
+    },
+    "@sentry/minimal": {
+      "version": "5.21.1",
+      "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.21.1.tgz",
+      "integrity": "sha512-OBVPASZ+mcXMKajvJon9RjEZ+ny3+VGhOI66acoP1hmYxKvji1OC2bYEuP1r4qtHxWVLAdV7qFj3EQ9ckErZmQ==",
+      "requires": {
+        "@sentry/hub": "5.21.1",
+        "@sentry/types": "5.21.1",
+        "tslib": "^1.9.3"
+      }
+    },
+    "@sentry/node": {
+      "version": "5.21.1",
+      "resolved": "https://registry.npmjs.org/@sentry/node/-/node-5.21.1.tgz",
+      "integrity": "sha512-+QLqGz6+/gtShv0F16nI2+AuVEDZG2k9L25BVCNoysYzH1J1/QIKHsl7YF2trDMlWM4T7cbu5Fh8AhK6an+5/g==",
+      "requires": {
+        "@sentry/apm": "5.21.1",
+        "@sentry/core": "5.21.1",
+        "@sentry/hub": "5.21.1",
+        "@sentry/types": "5.21.1",
+        "@sentry/utils": "5.21.1",
+        "cookie": "^0.4.1",
+        "https-proxy-agent": "^5.0.0",
+        "lru_map": "^0.3.3",
+        "tslib": "^1.9.3"
+      },
+      "dependencies": {
+        "agent-base": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.1.tgz",
+          "integrity": "sha512-01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg==",
+          "requires": {
+            "debug": "4"
+          }
+        },
+        "cookie": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz",
+          "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "https-proxy-agent": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+          "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+          "requires": {
+            "agent-base": "6",
+            "debug": "4"
+          }
+        }
+      }
+    },
+    "@sentry/react": {
+      "version": "5.21.1",
+      "resolved": "https://registry.npmjs.org/@sentry/react/-/react-5.21.1.tgz",
+      "integrity": "sha512-e60erzdQOwZ88+j6Hi1AnRlxex7ZmwQPGSoFjtihQJR3Xv9Esj5DBKVrWu6Z/QCDxTc8uaX08XjUyhse2YyutQ==",
+      "dev": true,
+      "requires": {
+        "@sentry/browser": "5.21.1",
+        "@sentry/minimal": "5.21.1",
+        "@sentry/types": "5.21.1",
+        "@sentry/utils": "5.21.1",
+        "hoist-non-react-statics": "^3.3.2",
+        "tslib": "^1.9.3"
+      },
+      "dependencies": {
+        "hoist-non-react-statics": {
+          "version": "3.3.2",
+          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+          "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+          "dev": true,
+          "requires": {
+            "react-is": "^16.7.0"
+          }
+        }
+      }
+    },
+    "@sentry/types": {
+      "version": "5.21.1",
+      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.21.1.tgz",
+      "integrity": "sha512-hFN4aDduMpjj6vZSIIp+9kSr8MglcKO/UmbuUXN6hKLewhxt+Zj2wjXN7ulSs5OK5mjXP9QLA5YJvVQsl2//qw=="
+    },
+    "@sentry/utils": {
+      "version": "5.21.1",
+      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.21.1.tgz",
+      "integrity": "sha512-p5vPuc7+GfOmW8CXxWd0samS77Q00YrN8q5TC/ztF8nBhEF18GiMeWAdQnlSwt3iWal3q3gSSrbF4c9guIugng==",
+      "requires": {
+        "@sentry/types": "5.21.1",
+        "tslib": "^1.9.3"
+      }
+    },
     "@sindresorhus/is": {
       "version": "0.14.0",
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
@@ -8358,7 +8504,7 @@
     },
     "@types/accepts": {
       "version": "1.3.5",
-      "resolved": "http://registry.npmjs.org/@types/accepts/-/accepts-1.3.5.tgz",
+      "resolved": "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.5.tgz",
       "integrity": "sha512-jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ==",
       "requires": {
         "@types/node": "*"
@@ -10463,18 +10609,18 @@
       }
     },
     "apollo-cache-control": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.11.0.tgz",
-      "integrity": "sha512-dmRnQ9AXGw2SHahVGLzB/p4UW/taFBAJxifxubp8hqY5p9qdlSu4MPRq8zvV2ULMYf50rBtZyC4C+dZLqmHuHQ==",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.11.1.tgz",
+      "integrity": "sha512-6iHa8TkcKt4rx5SKRzDNjUIpCQX+7/FlZwD7vRh9JDnM4VH8SWhpj8fUR3CiEY8Kuc4ChXnOY8bCcMju5KPnIQ==",
       "requires": {
-        "apollo-server-env": "^2.4.4",
-        "apollo-server-plugin-base": "^0.9.0"
+        "apollo-server-env": "^2.4.5",
+        "apollo-server-plugin-base": "^0.9.1"
       },
       "dependencies": {
         "apollo-server-env": {
-          "version": "2.4.4",
-          "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.4.tgz",
-          "integrity": "sha512-c2oddDS3lwAl6QNCIKCLEzt/dF9M3/tjjYRVdxOVN20TidybI7rAbnT4QOzf4tORnGXtiznEAvr/Kc9ahhKADg==",
+          "version": "2.4.5",
+          "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.5.tgz",
+          "integrity": "sha512-nfNhmGPzbq3xCEWT8eRpoHXIPNcNy3QcEoBlzVMjeglrBGryLG2LXwBSPnVmTRRrzUYugX0ULBtgE3rBFNoUgA==",
           "requires": {
             "node-fetch": "^2.1.2",
             "util.promisify": "^1.0.0"
@@ -10483,18 +10629,26 @@
       }
     },
     "apollo-datasource": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.7.1.tgz",
-      "integrity": "sha512-h++/jQAY7GA+4TBM+7ezvctFmmGNLrAPf51KsagZj+NkT9qvxp585rdsuatynVbSl59toPK2EuVmc6ilmQHf+g==",
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.7.2.tgz",
+      "integrity": "sha512-ibnW+s4BMp4K2AgzLEtvzkjg7dJgCaw9M5b5N0YKNmeRZRnl/I/qBTQae648FsRKgMwTbRQIvBhQ0URUFAqFOw==",
       "requires": {
-        "apollo-server-caching": "^0.5.1",
-        "apollo-server-env": "^2.4.4"
+        "apollo-server-caching": "^0.5.2",
+        "apollo-server-env": "^2.4.5"
       },
       "dependencies": {
+        "apollo-server-caching": {
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.5.2.tgz",
+          "integrity": "sha512-HUcP3TlgRsuGgeTOn8QMbkdx0hLPXyEJehZIPrcof0ATz7j7aTPA4at7gaiFHCo8gk07DaWYGB3PFgjboXRcWQ==",
+          "requires": {
+            "lru-cache": "^5.0.0"
+          }
+        },
         "apollo-server-env": {
-          "version": "2.4.4",
-          "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.4.tgz",
-          "integrity": "sha512-c2oddDS3lwAl6QNCIKCLEzt/dF9M3/tjjYRVdxOVN20TidybI7rAbnT4QOzf4tORnGXtiznEAvr/Kc9ahhKADg==",
+          "version": "2.4.5",
+          "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.5.tgz",
+          "integrity": "sha512-nfNhmGPzbq3xCEWT8eRpoHXIPNcNy3QcEoBlzVMjeglrBGryLG2LXwBSPnVmTRRrzUYugX0ULBtgE3rBFNoUgA==",
           "requires": {
             "node-fetch": "^2.1.2",
             "util.promisify": "^1.0.0"
@@ -10503,52 +10657,60 @@
       }
     },
     "apollo-engine-reporting": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-2.0.1.tgz",
-      "integrity": "sha512-3OYYk7DqNuJ5xKYnyLy5O2n506jYSryim8WqzBTn9MRphRamwPFjHYQm+akPA60AubXrWnYa6A8euMAiQU0ttA==",
-      "requires": {
-        "apollo-engine-reporting-protobuf": "^0.5.1",
-        "apollo-graphql": "^0.4.0",
-        "apollo-server-caching": "^0.5.1",
-        "apollo-server-env": "^2.4.4",
-        "apollo-server-errors": "^2.4.1",
-        "apollo-server-plugin-base": "^0.9.0",
-        "apollo-server-types": "^0.5.0",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-2.3.0.tgz",
+      "integrity": "sha512-SbcPLFuUZcRqDEZ6mSs8uHM9Ftr8yyt2IEu0JA8c3LNBmYXSLM7MHqFe80SVcosYSTBgtMz8mLJO8orhYoSYZw==",
+      "requires": {
+        "apollo-engine-reporting-protobuf": "^0.5.2",
+        "apollo-graphql": "^0.5.0",
+        "apollo-server-caching": "^0.5.2",
+        "apollo-server-env": "^2.4.5",
+        "apollo-server-errors": "^2.4.2",
+        "apollo-server-plugin-base": "^0.9.1",
+        "apollo-server-types": "^0.5.1",
         "async-retry": "^1.2.1",
         "uuid": "^8.0.0"
       },
       "dependencies": {
         "apollo-engine-reporting-protobuf": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.5.1.tgz",
-          "integrity": "sha512-TSfr9iAaInV8dhXkesdcmqsthRkVcJkzznmiM+1Ob/GScK7r6hBYCjVDt2613EHAg9SUzTOltIKlGD+N+GJRUw==",
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.5.2.tgz",
+          "integrity": "sha512-4wm9FR3B7UvJxcK/69rOiS5CAJPEYKufeRWb257ZLfX7NGFTMqvbc1hu4q8Ch7swB26rTpkzfsftLED9DqH9qg==",
           "requires": {
             "@apollo/protobufjs": "^1.0.3"
           }
         },
+        "apollo-server-caching": {
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.5.2.tgz",
+          "integrity": "sha512-HUcP3TlgRsuGgeTOn8QMbkdx0hLPXyEJehZIPrcof0ATz7j7aTPA4at7gaiFHCo8gk07DaWYGB3PFgjboXRcWQ==",
+          "requires": {
+            "lru-cache": "^5.0.0"
+          }
+        },
         "apollo-server-env": {
-          "version": "2.4.4",
-          "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.4.tgz",
-          "integrity": "sha512-c2oddDS3lwAl6QNCIKCLEzt/dF9M3/tjjYRVdxOVN20TidybI7rAbnT4QOzf4tORnGXtiznEAvr/Kc9ahhKADg==",
+          "version": "2.4.5",
+          "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.5.tgz",
+          "integrity": "sha512-nfNhmGPzbq3xCEWT8eRpoHXIPNcNy3QcEoBlzVMjeglrBGryLG2LXwBSPnVmTRRrzUYugX0ULBtgE3rBFNoUgA==",
           "requires": {
             "node-fetch": "^2.1.2",
             "util.promisify": "^1.0.0"
           }
         },
         "apollo-server-types": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.5.0.tgz",
-          "integrity": "sha512-zhtsqqqfdeoJQAfc41Sy6WnnBVxKNgZ34BKXf/Q+kXmw7rbZ/B5SG3SJMvj1iFsbzZxILmWdUsE9aD20lEr0bg==",
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.5.1.tgz",
+          "integrity": "sha512-my2cPw+DAb2qVnIuBcsRKGyS28uIc2vjFxa1NpRoJZe9gK0BWUBk7wzXnIzWy3HZ5Er11e/40MPTUesNfMYNVA==",
           "requires": {
-            "apollo-engine-reporting-protobuf": "^0.5.1",
-            "apollo-server-caching": "^0.5.1",
-            "apollo-server-env": "^2.4.4"
+            "apollo-engine-reporting-protobuf": "^0.5.2",
+            "apollo-server-caching": "^0.5.2",
+            "apollo-server-env": "^2.4.5"
           }
         },
         "uuid": {
-          "version": "8.1.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.1.0.tgz",
-          "integrity": "sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg=="
+          "version": "8.3.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz",
+          "integrity": "sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ=="
         }
       }
     },
@@ -10572,9 +10734,9 @@
       }
     },
     "apollo-graphql": {
-      "version": "0.4.5",
-      "resolved": "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.4.5.tgz",
-      "integrity": "sha512-0qa7UOoq7E71kBYE7idi6mNQhHLVdMEDInWk6TNw3KsSWZE2/I68gARP84Mj+paFTO5NYuw1Dht66PVX76Cc2w==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.5.0.tgz",
+      "integrity": "sha512-YSdF/BKPbsnQpxWpmCE53pBJX44aaoif31Y22I/qKpB6ZSGzYijV5YBoCL5Q15H2oA/v/02Oazh9lbp4ek3eig==",
       "requires": {
         "apollo-env": "^0.6.5",
         "lodash.sortby": "^4.7.0"
@@ -10660,25 +10822,25 @@
       }
     },
     "apollo-server-core": {
-      "version": "2.14.4",
-      "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.14.4.tgz",
-      "integrity": "sha512-aAfsvbJ2YrqAXDBgcBQocOmQJ5DkeOnEYQ6ADdkkDNU68V5yBRkAHLTOzPfbUlGHVrnOH8PT1FIVWwu5mBgkVA==",
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.16.1.tgz",
+      "integrity": "sha512-nuwn5ZBbmzPwDetb3FgiFFJlNK7ZBFg8kis/raymrjd3eBGdNcOyMTJDl6J9673X9Xqp+dXQmFYDW/G3G8S1YA==",
       "requires": {
         "@apollographql/apollo-tools": "^0.4.3",
         "@apollographql/graphql-playground-html": "1.6.26",
         "@types/graphql-upload": "^8.0.0",
         "@types/ws": "^7.0.0",
-        "apollo-cache-control": "^0.11.0",
-        "apollo-datasource": "^0.7.1",
-        "apollo-engine-reporting": "^2.0.1",
-        "apollo-server-caching": "^0.5.1",
-        "apollo-server-env": "^2.4.4",
-        "apollo-server-errors": "^2.4.1",
-        "apollo-server-plugin-base": "^0.9.0",
-        "apollo-server-types": "^0.5.0",
-        "apollo-tracing": "^0.11.0",
+        "apollo-cache-control": "^0.11.1",
+        "apollo-datasource": "^0.7.2",
+        "apollo-engine-reporting": "^2.3.0",
+        "apollo-server-caching": "^0.5.2",
+        "apollo-server-env": "^2.4.5",
+        "apollo-server-errors": "^2.4.2",
+        "apollo-server-plugin-base": "^0.9.1",
+        "apollo-server-types": "^0.5.1",
+        "apollo-tracing": "^0.11.1",
         "fast-json-stable-stringify": "^2.0.0",
-        "graphql-extensions": "^0.12.3",
+        "graphql-extensions": "^0.12.4",
         "graphql-tag": "^2.9.2",
         "graphql-tools": "^4.0.0",
         "graphql-upload": "^8.0.2",
@@ -10688,49 +10850,49 @@
         "ws": "^6.0.0"
       },
       "dependencies": {
-        "@apollographql/graphql-playground-html": {
-          "version": "1.6.26",
-          "resolved": "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.26.tgz",
-          "integrity": "sha512-XAwXOIab51QyhBxnxySdK3nuMEUohhDsHQ5Rbco/V1vjlP75zZ0ZLHD9dTpXTN8uxKxopb2lUvJTq+M4g2Q0HQ==",
+        "apollo-engine-reporting-protobuf": {
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.5.2.tgz",
+          "integrity": "sha512-4wm9FR3B7UvJxcK/69rOiS5CAJPEYKufeRWb257ZLfX7NGFTMqvbc1hu4q8Ch7swB26rTpkzfsftLED9DqH9qg==",
           "requires": {
-            "xss": "^1.0.6"
+            "@apollo/protobufjs": "^1.0.3"
           }
         },
-        "apollo-engine-reporting-protobuf": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.5.1.tgz",
-          "integrity": "sha512-TSfr9iAaInV8dhXkesdcmqsthRkVcJkzznmiM+1Ob/GScK7r6hBYCjVDt2613EHAg9SUzTOltIKlGD+N+GJRUw==",
+        "apollo-server-caching": {
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.5.2.tgz",
+          "integrity": "sha512-HUcP3TlgRsuGgeTOn8QMbkdx0hLPXyEJehZIPrcof0ATz7j7aTPA4at7gaiFHCo8gk07DaWYGB3PFgjboXRcWQ==",
           "requires": {
-            "@apollo/protobufjs": "^1.0.3"
+            "lru-cache": "^5.0.0"
           }
         },
         "apollo-server-env": {
-          "version": "2.4.4",
-          "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.4.tgz",
-          "integrity": "sha512-c2oddDS3lwAl6QNCIKCLEzt/dF9M3/tjjYRVdxOVN20TidybI7rAbnT4QOzf4tORnGXtiznEAvr/Kc9ahhKADg==",
+          "version": "2.4.5",
+          "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.5.tgz",
+          "integrity": "sha512-nfNhmGPzbq3xCEWT8eRpoHXIPNcNy3QcEoBlzVMjeglrBGryLG2LXwBSPnVmTRRrzUYugX0ULBtgE3rBFNoUgA==",
           "requires": {
             "node-fetch": "^2.1.2",
             "util.promisify": "^1.0.0"
           }
         },
         "apollo-server-types": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.5.0.tgz",
-          "integrity": "sha512-zhtsqqqfdeoJQAfc41Sy6WnnBVxKNgZ34BKXf/Q+kXmw7rbZ/B5SG3SJMvj1iFsbzZxILmWdUsE9aD20lEr0bg==",
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.5.1.tgz",
+          "integrity": "sha512-my2cPw+DAb2qVnIuBcsRKGyS28uIc2vjFxa1NpRoJZe9gK0BWUBk7wzXnIzWy3HZ5Er11e/40MPTUesNfMYNVA==",
           "requires": {
-            "apollo-engine-reporting-protobuf": "^0.5.1",
-            "apollo-server-caching": "^0.5.1",
-            "apollo-server-env": "^2.4.4"
+            "apollo-engine-reporting-protobuf": "^0.5.2",
+            "apollo-server-caching": "^0.5.2",
+            "apollo-server-env": "^2.4.5"
           }
         },
         "graphql-extensions": {
-          "version": "0.12.3",
-          "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.3.tgz",
-          "integrity": "sha512-W7iT0kzlwTiZU7fXfw9IgWnsqVj7EFLd0/wVcZZRAbR8L3f4+YsGls0oxKdsrvYBnbG347BXKQmIyo6GTEk4XA==",
+          "version": "0.12.4",
+          "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.4.tgz",
+          "integrity": "sha512-GnR4LiWk3s2bGOqIh6V1JgnSXw2RCH4NOgbCFEWvB6JqWHXTlXnLZ8bRSkCiD4pltv7RHUPWqN/sGh8R6Ae/ag==",
           "requires": {
             "@apollographql/apollo-tools": "^0.4.3",
-            "apollo-server-env": "^2.4.4",
-            "apollo-server-types": "^0.5.0"
+            "apollo-server-env": "^2.4.5",
+            "apollo-server-types": "^0.5.1"
           }
         },
         "ws": {
@@ -10753,23 +10915,23 @@
       }
     },
     "apollo-server-errors": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.4.1.tgz",
-      "integrity": "sha512-7oEd6pUxqyWYUbQ9TA8tM0NU/3aGtXSEibo6+txUkuHe7QaxfZ2wHRp+pfT1LC1K3RXYjKj61/C2xEO19s3Kdg=="
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.4.2.tgz",
+      "integrity": "sha512-FeGxW3Batn6sUtX3OVVUm7o56EgjxDlmgpTLNyWcLb0j6P8mw9oLNyAm3B+deHA4KNdNHO5BmHS2g1SJYjqPCQ=="
     },
     "apollo-server-express": {
-      "version": "2.14.2",
-      "resolved": "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.14.2.tgz",
-      "integrity": "sha512-iYyZm0kQqkM561i9l0WC9HbJsGZJbHP9bhnWaa1Itd+yNBS2AJFp6mRR3hQacsWXUw7ewaKAracMIggvfSH5Aw==",
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.16.1.tgz",
+      "integrity": "sha512-Oq5YNcaMYnRk6jDmA9LWf8oSd2KHDVe7jQ4wtooAvG9FVUD+FaFBgSkytXHMvtifQh2wdF07Ri8uDLMz6IQjTw==",
       "requires": {
-        "@apollographql/graphql-playground-html": "1.6.24",
+        "@apollographql/graphql-playground-html": "1.6.26",
         "@types/accepts": "^1.3.5",
         "@types/body-parser": "1.19.0",
         "@types/cors": "^2.8.4",
-        "@types/express": "4.17.4",
+        "@types/express": "4.17.7",
         "accepts": "^1.3.5",
-        "apollo-server-core": "^2.14.2",
-        "apollo-server-types": "^0.5.0",
+        "apollo-server-core": "^2.16.1",
+        "apollo-server-types": "^0.5.1",
         "body-parser": "^1.18.3",
         "cors": "^2.8.4",
         "express": "^4.17.1",
@@ -10780,68 +10942,95 @@
         "type-is": "^1.6.16"
       },
       "dependencies": {
+        "@types/express": {
+          "version": "4.17.7",
+          "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.7.tgz",
+          "integrity": "sha512-dCOT5lcmV/uC2J9k0rPafATeeyz+99xTt54ReX11/LObZgfzJqZNcW27zGhYyX+9iSEGXGt5qLPwRSvBZcLvtQ==",
+          "requires": {
+            "@types/body-parser": "*",
+            "@types/express-serve-static-core": "*",
+            "@types/qs": "*",
+            "@types/serve-static": "*"
+          }
+        },
         "apollo-engine-reporting-protobuf": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.5.1.tgz",
-          "integrity": "sha512-TSfr9iAaInV8dhXkesdcmqsthRkVcJkzznmiM+1Ob/GScK7r6hBYCjVDt2613EHAg9SUzTOltIKlGD+N+GJRUw==",
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.5.2.tgz",
+          "integrity": "sha512-4wm9FR3B7UvJxcK/69rOiS5CAJPEYKufeRWb257ZLfX7NGFTMqvbc1hu4q8Ch7swB26rTpkzfsftLED9DqH9qg==",
           "requires": {
             "@apollo/protobufjs": "^1.0.3"
           }
         },
+        "apollo-server-caching": {
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.5.2.tgz",
+          "integrity": "sha512-HUcP3TlgRsuGgeTOn8QMbkdx0hLPXyEJehZIPrcof0ATz7j7aTPA4at7gaiFHCo8gk07DaWYGB3PFgjboXRcWQ==",
+          "requires": {
+            "lru-cache": "^5.0.0"
+          }
+        },
         "apollo-server-env": {
-          "version": "2.4.4",
-          "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.4.tgz",
-          "integrity": "sha512-c2oddDS3lwAl6QNCIKCLEzt/dF9M3/tjjYRVdxOVN20TidybI7rAbnT4QOzf4tORnGXtiznEAvr/Kc9ahhKADg==",
+          "version": "2.4.5",
+          "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.5.tgz",
+          "integrity": "sha512-nfNhmGPzbq3xCEWT8eRpoHXIPNcNy3QcEoBlzVMjeglrBGryLG2LXwBSPnVmTRRrzUYugX0ULBtgE3rBFNoUgA==",
           "requires": {
             "node-fetch": "^2.1.2",
             "util.promisify": "^1.0.0"
           }
         },
         "apollo-server-types": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.5.0.tgz",
-          "integrity": "sha512-zhtsqqqfdeoJQAfc41Sy6WnnBVxKNgZ34BKXf/Q+kXmw7rbZ/B5SG3SJMvj1iFsbzZxILmWdUsE9aD20lEr0bg==",
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.5.1.tgz",
+          "integrity": "sha512-my2cPw+DAb2qVnIuBcsRKGyS28uIc2vjFxa1NpRoJZe9gK0BWUBk7wzXnIzWy3HZ5Er11e/40MPTUesNfMYNVA==",
           "requires": {
-            "apollo-engine-reporting-protobuf": "^0.5.1",
-            "apollo-server-caching": "^0.5.1",
-            "apollo-server-env": "^2.4.4"
+            "apollo-engine-reporting-protobuf": "^0.5.2",
+            "apollo-server-caching": "^0.5.2",
+            "apollo-server-env": "^2.4.5"
           }
         }
       }
     },
     "apollo-server-plugin-base": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.9.0.tgz",
-      "integrity": "sha512-LWcPrsy2+xqwlNseh/QaGa/MPNopS8c4qGgh0g0cAn0lZBRrJ9Yab7dq+iQ6vdUBwIhUWYN6s9dwUWCZw2SL8g==",
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.9.1.tgz",
+      "integrity": "sha512-kvrX4Z3FdpjrZdHkyl5iY2A1Wvp4b6KQp00DeZqss7GyyKNUBKr80/7RQgBLEw7EWM7WB19j459xM/TjvW0FKQ==",
       "requires": {
-        "apollo-server-types": "^0.5.0"
+        "apollo-server-types": "^0.5.1"
       },
       "dependencies": {
         "apollo-engine-reporting-protobuf": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.5.1.tgz",
-          "integrity": "sha512-TSfr9iAaInV8dhXkesdcmqsthRkVcJkzznmiM+1Ob/GScK7r6hBYCjVDt2613EHAg9SUzTOltIKlGD+N+GJRUw==",
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.5.2.tgz",
+          "integrity": "sha512-4wm9FR3B7UvJxcK/69rOiS5CAJPEYKufeRWb257ZLfX7NGFTMqvbc1hu4q8Ch7swB26rTpkzfsftLED9DqH9qg==",
           "requires": {
             "@apollo/protobufjs": "^1.0.3"
           }
         },
+        "apollo-server-caching": {
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.5.2.tgz",
+          "integrity": "sha512-HUcP3TlgRsuGgeTOn8QMbkdx0hLPXyEJehZIPrcof0ATz7j7aTPA4at7gaiFHCo8gk07DaWYGB3PFgjboXRcWQ==",
+          "requires": {
+            "lru-cache": "^5.0.0"
+          }
+        },
         "apollo-server-env": {
-          "version": "2.4.4",
-          "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.4.tgz",
-          "integrity": "sha512-c2oddDS3lwAl6QNCIKCLEzt/dF9M3/tjjYRVdxOVN20TidybI7rAbnT4QOzf4tORnGXtiznEAvr/Kc9ahhKADg==",
+          "version": "2.4.5",
+          "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.5.tgz",
+          "integrity": "sha512-nfNhmGPzbq3xCEWT8eRpoHXIPNcNy3QcEoBlzVMjeglrBGryLG2LXwBSPnVmTRRrzUYugX0ULBtgE3rBFNoUgA==",
           "requires": {
             "node-fetch": "^2.1.2",
             "util.promisify": "^1.0.0"
           }
         },
         "apollo-server-types": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.5.0.tgz",
-          "integrity": "sha512-zhtsqqqfdeoJQAfc41Sy6WnnBVxKNgZ34BKXf/Q+kXmw7rbZ/B5SG3SJMvj1iFsbzZxILmWdUsE9aD20lEr0bg==",
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.5.1.tgz",
+          "integrity": "sha512-my2cPw+DAb2qVnIuBcsRKGyS28uIc2vjFxa1NpRoJZe9gK0BWUBk7wzXnIzWy3HZ5Er11e/40MPTUesNfMYNVA==",
           "requires": {
-            "apollo-engine-reporting-protobuf": "^0.5.1",
-            "apollo-server-caching": "^0.5.1",
-            "apollo-server-env": "^2.4.4"
+            "apollo-engine-reporting-protobuf": "^0.5.2",
+            "apollo-server-caching": "^0.5.2",
+            "apollo-server-env": "^2.4.5"
           }
         }
       }
@@ -10857,18 +11046,18 @@
       }
     },
     "apollo-tracing": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.11.0.tgz",
-      "integrity": "sha512-I9IFb/8lkBW8ZwOAi4LEojfT7dMfUSkpnV8LHQI8Rcj0HtzL9HObQ3woBmzyGHdGHLFuD/6/VHyFD67SesSrJg==",
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.11.1.tgz",
+      "integrity": "sha512-l7g+uILw7v32GA46IRXIx5XXbZhFI96BhSqrGK9yyvfq+NMcvVZrj3kIhRImPGhAjMdV+5biA/jztabElAbDjg==",
       "requires": {
-        "apollo-server-env": "^2.4.4",
-        "apollo-server-plugin-base": "^0.9.0"
+        "apollo-server-env": "^2.4.5",
+        "apollo-server-plugin-base": "^0.9.1"
       },
       "dependencies": {
         "apollo-server-env": {
-          "version": "2.4.4",
-          "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.4.tgz",
-          "integrity": "sha512-c2oddDS3lwAl6QNCIKCLEzt/dF9M3/tjjYRVdxOVN20TidybI7rAbnT4QOzf4tORnGXtiznEAvr/Kc9ahhKADg==",
+          "version": "2.4.5",
+          "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.5.tgz",
+          "integrity": "sha512-nfNhmGPzbq3xCEWT8eRpoHXIPNcNy3QcEoBlzVMjeglrBGryLG2LXwBSPnVmTRRrzUYugX0ULBtgE3rBFNoUgA==",
           "requires": {
             "node-fetch": "^2.1.2",
             "util.promisify": "^1.0.0"
@@ -30161,9 +30350,9 @@
       }
     },
     "graphql-tag": {
-      "version": "2.10.3",
-      "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.3.tgz",
-      "integrity": "sha512-4FOv3ZKfA4WdOKJeHdz6B3F/vxBLSgmBcGeAFPf4n1F64ltJUvOOerNj0rsJxONQGdhUMynQIvd6LzB+1J5oKA=="
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.11.0.tgz",
+      "integrity": "sha512-VmsD5pJqWJnQZMUeRwrDhfgoyqcfwEkvtpANqcoUG8/tOLkwNgU9mzub/Mc78OJMhHjx7gfAMTxzdG43VGg3bA=="
     },
     "graphql-tools": {
       "version": "4.0.7",
@@ -30202,13 +30391,13 @@
       },
       "dependencies": {
         "http-errors": {
-          "version": "1.7.3",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
-          "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==",
+          "version": "1.8.0",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.0.tgz",
+          "integrity": "sha512-4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A==",
           "requires": {
             "depd": "~1.1.2",
             "inherits": "2.0.4",
-            "setprototypeof": "1.1.1",
+            "setprototypeof": "1.2.0",
             "statuses": ">= 1.5.0 < 2",
             "toidentifier": "1.0.0"
           }
@@ -30219,9 +30408,9 @@
           "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
         },
         "setprototypeof": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-          "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+          "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
         },
         "statuses": {
           "version": "1.5.0",
@@ -38281,9 +38470,9 @@
       }
     },
     "loglevel": {
-      "version": "1.6.7",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz",
-      "integrity": "sha512-cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A=="
+      "version": "1.6.8",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz",
+      "integrity": "sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA=="
     },
     "long": {
       "version": "4.0.0",
@@ -38384,6 +38573,11 @@
         "es5-ext": "~0.10.2"
       }
     },
+    "lru_map": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz",
+      "integrity": "sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0="
+    },
     "luxon": {
       "version": "1.22.2",
       "resolved": "https://registry.npmjs.org/luxon/-/luxon-1.22.2.tgz",
diff --git a/package.json b/package.json
index 2daf658a7c..7323c8e3f2 100644
--- a/package.json
+++ b/package.json
@@ -67,10 +67,11 @@
     "@hapi/joi": "^17.1.1",
     "@metascraper/helpers": "^5.11.6",
     "@rudderstack/rudder-sdk-node": "0.0.2",
+    "@sentry/node": "^5.21.1",
     "abort-controller": "^3.0.0",
     "akismet-api": "^5.0.0",
-    "apollo-server-core": "^2.14.4",
-    "apollo-server-express": "^2.14.2",
+    "apollo-server-express": "^2.16.1",
+    "apollo-server-plugin-base": "^0.9.1",
     "archiver": "^3.1.1",
     "basic-auth": "^2.0.1",
     "bcryptjs": "^2.4.3",
@@ -155,6 +156,7 @@
     "@coralproject/rte": "^1.2.3",
     "@fluent/react": "^0.11.1",
     "@intervolga/optimize-cssnano-plugin": "^1.0.6",
+    "@sentry/react": "^5.21.1",
     "@types/archiver": "^3.1.0",
     "@types/basic-auth": "^1.1.3",
     "@types/bcryptjs": "^2.4.2",
diff --git a/src/core/client/account/index.tsx b/src/core/client/account/index.tsx
index e31c248d04..c43c9a6f15 100644
--- a/src/core/client/account/index.tsx
+++ b/src/core/client/account/index.tsx
@@ -4,6 +4,7 @@ import ReactDOM from "react-dom";
 import injectConditionalPolyfills from "coral-framework/helpers/injectConditionalPolyfills";
 import potentiallyInjectAxe from "coral-framework/helpers/potentiallyInjectAxe";
 import { createManaged } from "coral-framework/lib/bootstrap";
+import { createReporter } from "coral-framework/lib/errors/reporter";
 
 import App from "./App";
 import { initLocalState } from "./local";
@@ -13,12 +14,18 @@ import localesData from "./locales";
 import "coral-ui/theme/stream.css";
 
 async function main() {
+  // Configure and load the error reporter.
+  const reporter = createReporter();
+
   await injectConditionalPolyfills();
+
   // Potentially inject react-axe for runtime a11y checks.
   await potentiallyInjectAxe();
+
   const ManagedCoralContextProvider = await createManaged({
     initLocalState,
     localesData,
+    reporter,
   });
 
   const Index: FunctionComponent = () => (
diff --git a/src/core/client/admin/index.tsx b/src/core/client/admin/index.tsx
index 223ef05edb..6c5ee17802 100644
--- a/src/core/client/admin/index.tsx
+++ b/src/core/client/admin/index.tsx
@@ -4,6 +4,7 @@ import ReactDOM from "react-dom";
 import injectConditionalPolyfills from "coral-framework/helpers/injectConditionalPolyfills";
 import potentiallyInjectAxe from "coral-framework/helpers/potentiallyInjectAxe";
 import { createManaged } from "coral-framework/lib/bootstrap";
+import { createReporter } from "coral-framework/lib/errors/reporter";
 
 import App from "./App";
 import Head from "./Head";
@@ -14,12 +15,19 @@ import localesData from "./locales";
 import "coral-ui/theme/admin.css";
 
 async function main() {
+  // Configure and load the error reporter with the boundary element.
+  const reporter = createReporter({ reporterFeedbackPrompt: true });
+
+  // Load any polyfills that are required.
   await injectConditionalPolyfills();
+
   // Potentially inject react-axe for runtime a11y checks.
   await potentiallyInjectAxe();
+
   const ManagedCoralContextProvider = await createManaged({
     initLocalState,
     localesData,
+    reporter,
   });
 
   const Index: FunctionComponent = () => (
diff --git a/src/core/client/admin/routes/AuthCheck/AuthCheckRoute.tsx b/src/core/client/admin/routes/AuthCheck/AuthCheckRoute.tsx
index b98e6c80e4..6e7fdc8fc3 100644
--- a/src/core/client/admin/routes/AuthCheck/AuthCheckRoute.tsx
+++ b/src/core/client/admin/routes/AuthCheck/AuthCheckRoute.tsx
@@ -5,6 +5,7 @@ import { graphql } from "react-relay";
 import { SetRedirectPathMutation } from "coral-admin/mutations";
 import { AbilityType, can } from "coral-admin/permissions";
 import { roleIsAtLeast } from "coral-framework/helpers";
+import { CoralContext, withContext } from "coral-framework/lib/bootstrap";
 import { MutationProp, withMutation } from "coral-framework/lib/relay";
 import { withRouteConfig } from "coral-framework/lib/router";
 import { GQLUSER_ROLE } from "coral-framework/schema";
@@ -15,6 +16,7 @@ import NetworkError from "./NetworkError";
 import RestrictedContainer from "./RestrictedContainer";
 
 interface Props {
+  reporter: CoralContext["reporter"];
   match: Match;
   router: Router;
   setRedirectPath: MutationProp<typeof SetRedirectPathMutation>;
@@ -88,17 +90,45 @@ function createAuthCheckRoute(check: CheckParams) {
       props.router.replace("/admin/login");
     }
 
+    public componentDidUpdate(prevProps: Props) {
+      // Whenever the viewer changes on this component, update the user on the
+      // reporter.
+      if (!this.props.reporter) {
+        return;
+      }
+
+      // Pull the viewer out of the next props (`this.props`) and the current
+      // props (`prevProps`) to compare them.
+      const next = this.props.data?.viewer || null;
+      const curr = prevProps.data?.viewer || null;
+
+      // If the next is different than current, then...
+      if (next !== curr) {
+        // If they are both provided then if the id of the viewer didn't change,
+        // then the user hasn't changed (at least, it hasn't changed enough to
+        // require another update to the reporter).
+        if (next && curr && next.id === curr.id) {
+          return;
+        }
+
+        this.props.reporter.setUser(next);
+      }
+    }
+
     public render() {
       if (this.props.error) {
         return <NetworkError />;
       }
+
       if (!this.props.data || this.shouldRedirectTo()) {
         return null;
       }
+
       if (this.hasAccess()) {
         return this.props.children;
       }
-      return <RestrictedContainer viewer={this.props.data.viewer!} />;
+
+      return <RestrictedContainer viewer={this.props.data.viewer} />;
     }
   }
 
@@ -107,6 +137,7 @@ function createAuthCheckRoute(check: CheckParams) {
       query AuthCheckRouteQuery {
         viewer {
           ...RestrictedContainer_viewer
+          id
           username
           email
           profiles {
@@ -129,7 +160,12 @@ function createAuthCheckRoute(check: CheckParams) {
         }
       }
     `,
-  })(withRouter(withMutation(SetRedirectPathMutation)(AuthCheckRoute)));
+  })(
+    withContext(({ reporter }) => ({ reporter }))(
+      withRouter(withMutation(SetRedirectPathMutation)(AuthCheckRoute))
+    )
+  );
+
   return enhanced;
 }
 
diff --git a/src/core/client/admin/routes/AuthCheck/Restricted.tsx b/src/core/client/admin/routes/AuthCheck/Restricted.tsx
index a511ba9f65..9999ddde95 100644
--- a/src/core/client/admin/routes/AuthCheck/Restricted.tsx
+++ b/src/core/client/admin/routes/AuthCheck/Restricted.tsx
@@ -8,12 +8,11 @@ import { Button, Flex, HorizontalGutter, Icon } from "coral-ui/components/v2";
 import styles from "./Restricted.css";
 
 interface Props {
-  username: string;
+  username: string | null;
   onSignInAs: React.MouseEventHandler;
 }
 
 const SignIn: FunctionComponent<Props> = ({ username, onSignInAs }) => {
-  const Username = () => <div className={styles.username}>{username}</div>;
   return (
     <AuthBox
       title={
@@ -37,13 +36,20 @@ const SignIn: FunctionComponent<Props> = ({ username, onSignInAs }) => {
             </div>
           </Localized>
         </div>
-        <div>
-          <Localized id="restricted-signedInAs" Username={<Username />}>
-            <div className={styles.copy}>
-              {"You are signed in as: <Username></Username>"}
-            </div>
-          </Localized>
-        </div>
+        {username && (
+          <div>
+            <Localized
+              id="restricted-signedInAs"
+              strong={<div className={styles.username} />}
+              $username={username}
+            >
+              <div className={styles.copy}>
+                You are signed in as:{" "}
+                <div className={styles.username}>{username}</div>
+              </div>
+            </Localized>
+          </div>
+        )}
         <Flex justifyContent="center">
           <Localized id="restricted-signInWithADifferentAccount">
             <Button
diff --git a/src/core/client/admin/routes/AuthCheck/RestrictedContainer.tsx b/src/core/client/admin/routes/AuthCheck/RestrictedContainer.tsx
index 57981d098d..bd7dd9499c 100644
--- a/src/core/client/admin/routes/AuthCheck/RestrictedContainer.tsx
+++ b/src/core/client/admin/routes/AuthCheck/RestrictedContainer.tsx
@@ -19,7 +19,7 @@ import { RestrictedContainer_viewer as ViewerData } from "coral-admin/__generate
 import Restricted from "./Restricted";
 
 interface Props {
-  viewer: ViewerData;
+  viewer: ViewerData | null;
   error?: Error | null;
   signOut: SignOutMutation;
   setRedirectPath: MutationProp<typeof SetRedirectPathMutation>;
@@ -44,7 +44,7 @@ class RestrictedContainer extends Component<Props> {
 
     return (
       <Restricted
-        username={this.props.viewer.username!}
+        username={this.props.viewer.username}
         onSignInAs={this.handleSignInAs}
       />
     );
diff --git a/src/core/client/admin/routes/AuthCheck/__snapshots__/Restricted.spec.tsx.snap b/src/core/client/admin/routes/AuthCheck/__snapshots__/Restricted.spec.tsx.snap
index b0d3203a9e..1e6e925df2 100644
--- a/src/core/client/admin/routes/AuthCheck/__snapshots__/Restricted.spec.tsx.snap
+++ b/src/core/client/admin/routes/AuthCheck/__snapshots__/Restricted.spec.tsx.snap
@@ -42,13 +42,24 @@ exports[`renders correctly 1`] = `
     </div>
     <div>
       <Localized
-        Username={<Username />}
+        $username="User"
         id="restricted-signedInAs"
+        strong={
+          <div
+            className="Restricted-username"
+          />
+        }
       >
         <div
           className="Restricted-copy"
         >
-          You are signed in as: &lt;Username&gt;&lt;/Username&gt;
+          You are signed in as:
+           
+          <div
+            className="Restricted-username"
+          >
+            User
+          </div>
         </div>
       </Localized>
     </div>
diff --git a/src/core/client/auth/index.tsx b/src/core/client/auth/index.tsx
index e31c248d04..c43c9a6f15 100644
--- a/src/core/client/auth/index.tsx
+++ b/src/core/client/auth/index.tsx
@@ -4,6 +4,7 @@ import ReactDOM from "react-dom";
 import injectConditionalPolyfills from "coral-framework/helpers/injectConditionalPolyfills";
 import potentiallyInjectAxe from "coral-framework/helpers/potentiallyInjectAxe";
 import { createManaged } from "coral-framework/lib/bootstrap";
+import { createReporter } from "coral-framework/lib/errors/reporter";
 
 import App from "./App";
 import { initLocalState } from "./local";
@@ -13,12 +14,18 @@ import localesData from "./locales";
 import "coral-ui/theme/stream.css";
 
 async function main() {
+  // Configure and load the error reporter.
+  const reporter = createReporter();
+
   await injectConditionalPolyfills();
+
   // Potentially inject react-axe for runtime a11y checks.
   await potentiallyInjectAxe();
+
   const ManagedCoralContextProvider = await createManaged({
     initLocalState,
     localesData,
+    reporter,
   });
 
   const Index: FunctionComponent = () => (
diff --git a/src/core/client/framework/helpers/injectConditionalPolyfills.tsx b/src/core/client/framework/helpers/injectConditionalPolyfills.tsx
index f2b98e144a..31e8f740b9 100644
--- a/src/core/client/framework/helpers/injectConditionalPolyfills.tsx
+++ b/src/core/client/framework/helpers/injectConditionalPolyfills.tsx
@@ -37,5 +37,6 @@ export default async function injectConditionalPolyfills() {
   if (!browser.supports.cssVariables) {
     pending.push(polyfillCSSVars());
   }
+
   await Promise.all(pending);
 }
diff --git a/src/core/client/framework/lib/bootstrap/CoralContext.tsx b/src/core/client/framework/lib/bootstrap/CoralContext.tsx
index 8bc71bc2e0..eb8815c446 100644
--- a/src/core/client/framework/lib/bootstrap/CoralContext.tsx
+++ b/src/core/client/framework/lib/bootstrap/CoralContext.tsx
@@ -9,6 +9,7 @@ import { Environment } from "relay-runtime";
 
 import { LanguageCode } from "coral-common/helpers/i18n";
 import { BrowserInfo } from "coral-framework/lib/browserInfo";
+import { ErrorReporter } from "coral-framework/lib/errors";
 import { PostMessageService } from "coral-framework/lib/postMessage";
 import { RestClient } from "coral-framework/lib/rest";
 import { PromisifiedStorage } from "coral-framework/lib/storage";
@@ -73,6 +74,11 @@ export interface CoralContext {
 
   /** Controls router transitions (for tests) */
   transitionControl?: TransitionControlData;
+
+  /**
+   * reporter is the designated ErrorReporter for this application.
+   */
+  reporter?: ErrorReporter;
 }
 
 export const CoralReactContext = React.createContext<CoralContext>({} as any);
diff --git a/src/core/client/framework/lib/bootstrap/createManaged.tsx b/src/core/client/framework/lib/bootstrap/createManaged.tsx
index 253c2cee91..802af0298e 100644
--- a/src/core/client/framework/lib/bootstrap/createManaged.tsx
+++ b/src/core/client/framework/lib/bootstrap/createManaged.tsx
@@ -10,6 +10,7 @@ import { v1 as uuid } from "uuid";
 import { LanguageCode } from "coral-common/helpers/i18n";
 import polyfillIntlLocale from "coral-framework/helpers/polyfillIntlLocale";
 import { getBrowserInfo } from "coral-framework/lib/browserInfo";
+import { ErrorReporter } from "coral-framework/lib/errors";
 import { RestClient } from "coral-framework/lib/rest";
 import {
   createLocalStorage,
@@ -60,6 +61,11 @@ interface CreateContextArguments {
 
   /** Supports emitting and listening to events. */
   eventEmitter?: EventEmitter2;
+
+  /**
+   * reporter is the designated ErrorReporter for this application.
+   */
+  reporter?: ErrorReporter;
 }
 
 /** websocketURL points to our live graphql server */
@@ -226,9 +232,20 @@ function createManagedCoralContextProvider(
     };
 
     public render() {
+      // If the boundary is available from the reporter (also, if it's
+      // available) then use it to wrap the lower children for any error that
+      // happens.
+
+      // NOTE: (wyattjoh) there should be another way to do this better...
+      const Boundary = this.state.context.reporter?.ErrorBoundary;
+
       return (
         <CoralContextProvider value={this.state.context}>
-          {this.props.children}
+          {Boundary ? (
+            <Boundary>{this.props.children}</Boundary>
+          ) : (
+            this.props.children
+          )}
           {this.state.context.pym && <SendPymReady />}
         </CoralContextProvider>
       );
@@ -271,6 +288,7 @@ export default async function createManaged({
   initLocalState = noop,
   localesData,
   pym,
+  reporter,
   eventEmitter = new EventEmitter2({ wildcard: true, maxListeners: 20 }),
 }: CreateContextArguments): Promise<ComponentType> {
   // Listen for outside clicks.
@@ -337,6 +355,7 @@ export default async function createManaged({
     timeagoFormatter,
     pym,
     eventEmitter,
+    reporter,
     registerClickFarAway,
     rest: createRestClient(clientID, accessTokenProvider),
     postMessage: new PostMessageService(),
diff --git a/src/core/client/framework/lib/errors/index.ts b/src/core/client/framework/lib/errors/index.ts
index 24292d0614..3830e14774 100644
--- a/src/core/client/framework/lib/errors/index.ts
+++ b/src/core/client/framework/lib/errors/index.ts
@@ -1,3 +1,4 @@
 export { default as UnknownServerError } from "./unknownServerError";
 export { default as InvalidRequestError } from "./invalidRequestError";
 export { default as ModerationNudgeError } from "./moderationNudgeError";
+export * from "./reporter";
diff --git a/src/core/client/framework/lib/errors/reporter/createReporter.ts b/src/core/client/framework/lib/errors/reporter/createReporter.ts
new file mode 100644
index 0000000000..0523e6a53f
--- /dev/null
+++ b/src/core/client/framework/lib/errors/reporter/createReporter.ts
@@ -0,0 +1,52 @@
+import { StaticConfig } from "coral-common/config";
+
+import { ErrorReporter } from "./reporter";
+import { SentryErrorReporter } from "./sentry";
+
+interface Options {
+  /**
+   * reporterPrompt when true will ensure that the reporters error boundary
+   * element is configured if the reporter supports it to collect user feedback.
+   */
+  reporterFeedbackPrompt?: boolean;
+}
+
+function createReporter({ reporterFeedbackPrompt = false }: Options = {}):
+  | ErrorReporter
+  | undefined {
+  // Parse and load the reporter configuration from the config element on the
+  // page.
+  const element = document.getElementById("config")!;
+  if (!element) {
+    return;
+  }
+
+  // Parse the config from the element text, it should always be a valid JSON
+  // string if the element is available. We should allow the error to bubble if
+  // we are unable to parse it.
+  const config: StaticConfig = JSON.parse(element.innerText);
+
+  // If no reporter is configured, we don't have to do anything.
+  if (!config.reporter) {
+    return;
+  }
+
+  // Based on the reporter's name, create the reporter.
+  switch (config.reporter.name) {
+    case "sentry":
+      return new SentryErrorReporter(
+        reporterFeedbackPrompt,
+        config.reporter.dsn
+      );
+    default:
+      // We're in a part of the code where we're creating an error reporter, so
+      // if we have problems with that, instead of throwing which wouldn't be
+      // too helpful, let's just log it out instead.
+
+      // eslint-disable-next-line no-console
+      console.error(`Unsupported error reporter: ${config.reporter.name}`);
+      return;
+  }
+}
+
+export default createReporter;
diff --git a/src/core/client/framework/lib/errors/reporter/index.ts b/src/core/client/framework/lib/errors/reporter/index.ts
new file mode 100644
index 0000000000..be71e45ea2
--- /dev/null
+++ b/src/core/client/framework/lib/errors/reporter/index.ts
@@ -0,0 +1,3 @@
+export { default as createReporter } from "./createReporter";
+export * from "./sentry";
+export * from "./reporter";
diff --git a/src/core/client/framework/lib/errors/reporter/reporter.ts b/src/core/client/framework/lib/errors/reporter/reporter.ts
new file mode 100644
index 0000000000..79c66af212
--- /dev/null
+++ b/src/core/client/framework/lib/errors/reporter/reporter.ts
@@ -0,0 +1,46 @@
+/**
+ * ErrorReport is the report to be provided by the error reporter when an error
+ * is reported.
+ */
+export interface ErrorReport {
+  /**
+   * name is used to identify the specific error reporter that captured the
+   * report.
+   */
+  name: string;
+
+  /**
+   * id is identifier sent by the error reporter associated with this error
+   * report.
+   */
+  id: string;
+}
+
+export interface User {
+  id?: string;
+  username?: string | null;
+  role?: string;
+}
+
+export interface ErrorReporter {
+  /**
+   * report will send a report to the reporter service.
+   *
+   * @param err the error to report
+   */
+  report(err: any): ErrorReport;
+
+  /**
+   * setUser should set the user that's currently interacting with the
+   * application.
+   *
+   * @param user the current logged in user or null for none.
+   */
+  setUser(user: User | null): void;
+
+  /**
+   * ErrorBoundary is the optional component that this reporter provides to catch
+   * and display errors to the user.
+   */
+  readonly ErrorBoundary?: React.ComponentType;
+}
diff --git a/src/core/client/framework/lib/errors/reporter/sentry.tsx b/src/core/client/framework/lib/errors/reporter/sentry.tsx
new file mode 100644
index 0000000000..36508894be
--- /dev/null
+++ b/src/core/client/framework/lib/errors/reporter/sentry.tsx
@@ -0,0 +1,49 @@
+import * as Sentry from "@sentry/react";
+import React, { FunctionComponent } from "react";
+
+import { ErrorReport, ErrorReporter, User } from "./reporter";
+
+export class SentryErrorReporter implements ErrorReporter {
+  public readonly ErrorBoundary?: FunctionComponent;
+
+  constructor(reporterFeedbackPrompt: boolean, dsn: string) {
+    // Initialize sentry.
+    Sentry.init({ dsn, release: `coral@${process.env.TALK_VERSION}` });
+    Sentry.setTag("domain", window.location.host);
+
+    // Initialize the boundary if enabled.
+
+    // NOTE: (wyattjoh) there should be another way to do this better...
+    if (reporterFeedbackPrompt) {
+      this.ErrorBoundary = function ErrorBoundary({ children }) {
+        return (
+          <Sentry.ErrorBoundary showDialog>{children}</Sentry.ErrorBoundary>
+        );
+      };
+    }
+  }
+
+  public report(err: any): ErrorReport {
+    // Capture and report the error to Sentry.
+    const id = Sentry.captureException(err);
+
+    return { name: "sentry", id };
+  }
+
+  private transformUser(user: User | null): Sentry.User | null {
+    if (!user) {
+      return null;
+    }
+
+    return {
+      id: user.id,
+      username: user.username || undefined,
+      role: user.role,
+    };
+  }
+
+  public setUser(user: User | null): void {
+    const transformed = this.transformUser(user);
+    Sentry.setUser(transformed);
+  }
+}
diff --git a/src/core/client/install/index.tsx b/src/core/client/install/index.tsx
index 44f0ecff3b..f0a7f19102 100644
--- a/src/core/client/install/index.tsx
+++ b/src/core/client/install/index.tsx
@@ -4,6 +4,7 @@ import ReactDOM from "react-dom";
 import injectConditionalPolyfills from "coral-framework/helpers/injectConditionalPolyfills";
 import potentiallyInjectAxe from "coral-framework/helpers/potentiallyInjectAxe";
 import { createManaged } from "coral-framework/lib/bootstrap";
+import { createReporter } from "coral-framework/lib/errors/reporter";
 
 import App from "./App";
 import { initLocalState } from "./local";
@@ -13,12 +14,18 @@ import localesData from "./locales";
 import "coral-ui/theme/admin.css";
 
 async function main() {
+  // Configure and load the error reporter.
+  const reporter = createReporter();
+
   await injectConditionalPolyfills();
+
   // Potentially inject react-axe for runtime a11y checks.
   await potentiallyInjectAxe();
+
   const ManagedCoralContextProvider = await createManaged({
     localesData,
     initLocalState,
+    reporter,
   });
 
   const Index: FunctionComponent = () => (
diff --git a/src/core/client/stream/index.tsx b/src/core/client/stream/index.tsx
index ff8ff6c1e1..bb78f55f46 100644
--- a/src/core/client/stream/index.tsx
+++ b/src/core/client/stream/index.tsx
@@ -5,6 +5,7 @@ import ReactDOM from "react-dom";
 import injectConditionalPolyfills from "coral-framework/helpers/injectConditionalPolyfills";
 import potentiallyInjectAxe from "coral-framework/helpers/potentiallyInjectAxe";
 import { createManaged } from "coral-framework/lib/bootstrap";
+import { createReporter } from "coral-framework/lib/errors/reporter";
 
 import AppContainer from "./App";
 import { initLocalState } from "./local";
@@ -14,16 +15,23 @@ import localesData from "./locales";
 import "coral-ui/theme/stream.css";
 
 async function main() {
+  // Configure and load the error reporter.
+  const reporter = createReporter();
+
   const pym = new PymChild({
     polling: 100,
   });
+
   await injectConditionalPolyfills();
+
   // Potentially inject react-axe for runtime a11y checks.
   await potentiallyInjectAxe(pym.parentUrl);
+
   const ManagedCoralContextProvider = await createManaged({
     initLocalState,
     localesData,
     pym,
+    reporter,
   });
 
   const Index: FunctionComponent = () => (
diff --git a/src/core/common/config.ts b/src/core/common/config.ts
new file mode 100644
index 0000000000..347d174717
--- /dev/null
+++ b/src/core/common/config.ts
@@ -0,0 +1,31 @@
+/**
+ * SentryReporterConfig is the ReporterConfig for the Sentry service.
+ */
+export interface SentryReporterConfig {
+  name: "sentry";
+
+  /**
+   * dsn is the string representing this particular integration.
+   */
+  dsn: string;
+}
+
+export type ReporterConfig = SentryReporterConfig;
+
+/**
+ * StaticConfig is the configuration provided to the client javascript via a
+ * JSON blob on the HTML of the embedding page.
+ */
+export interface StaticConfig {
+  /**
+   * staticURI is prepended to the static url's that are included on the static
+   * pages.
+   */
+  staticURI: string;
+
+  /**
+   * reporter stores the reporter configuration for the current reporter
+   * available.
+   */
+  reporter?: ReporterConfig;
+}
diff --git a/src/core/server/app/handlers/api/graphql.ts b/src/core/server/app/handlers/api/graphql.ts
deleted file mode 100644
index 48b45e1b1c..0000000000
--- a/src/core/server/app/handlers/api/graphql.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { generateSchemaHash } from "apollo-server-core/dist/utils/schemaHash";
-
-import { CLIENT_ID_HEADER } from "coral-common/constants";
-import { AppOptions } from "coral-server/app";
-import { graphqlMiddleware } from "coral-server/app/middleware/graphql";
-import GraphContext, { GraphContextOptions } from "coral-server/graph/context";
-import {
-  Request,
-  RequestHandler,
-  TenantCoralRequest,
-} from "coral-server/types/express";
-
-export type GraphMiddlewareOptions = Pick<
-  AppOptions,
-  | "config"
-  | "i18n"
-  | "mailerQueue"
-  | "scraperQueue"
-  | "rejectorQueue"
-  | "notifierQueue"
-  | "webhookQueue"
-  | "mongo"
-  | "redis"
-  | "schema"
-  | "signingConfig"
-  | "pubsub"
-  | "tenantCache"
-  | "metrics"
-  | "broker"
->;
-
-export const graphQLHandler = ({
-  schema,
-  config,
-  metrics,
-  ...options
-}: GraphMiddlewareOptions): RequestHandler<TenantCoralRequest> => {
-  // Generate the schema hash.
-  const schemaHash = generateSchemaHash(schema);
-
-  return graphqlMiddleware(
-    config,
-    async (req: Request<TenantCoralRequest>) => {
-      // Pull out some useful properties from Coral.
-      const { id, now, tenant, logger, persisted } = req.coral;
-
-      // Create some new options to store the tenant context details inside.
-      const opts: GraphContextOptions = {
-        ...options,
-        id,
-        now,
-        req,
-        persisted,
-        config,
-        tenant,
-        logger,
-      };
-
-      // Add the user if there is one.
-      if (req.user) {
-        opts.user = req.user;
-      }
-
-      // Add the clientID if there is one on the request.
-      const clientID = req.get(CLIENT_ID_HEADER);
-      if (clientID) {
-        // TODO: (wyattjoh) validate length
-        opts.clientID = clientID;
-      }
-
-      return {
-        schema,
-        schemaHash,
-        context: new GraphContext(opts),
-      };
-    },
-    metrics
-  );
-};
diff --git a/src/core/server/app/handlers/api/index.ts b/src/core/server/app/handlers/api/index.ts
index 13b7ceb03a..6b185e6006 100644
--- a/src/core/server/app/handlers/api/index.ts
+++ b/src/core/server/app/handlers/api/index.ts
@@ -1,6 +1,5 @@
 export * from "./account";
 export * from "./auth";
-export * from "./graphql";
 export * from "./health";
 export * from "./install";
 export * from "./version";
diff --git a/src/core/server/app/index.ts b/src/core/server/app/index.ts
index f856ca5dfc..5d12bdf633 100644
--- a/src/core/server/app/index.ts
+++ b/src/core/server/app/index.ts
@@ -29,6 +29,7 @@ import { NotifierQueue } from "coral-server/queue/tasks/notifier";
 import { RejectorQueue } from "coral-server/queue/tasks/rejector";
 import { ScraperQueue } from "coral-server/queue/tasks/scraper";
 import { WebhookQueue } from "coral-server/queue/tasks/webhook";
+import { ErrorReporter } from "coral-server/services/errors";
 import { I18n } from "coral-server/services/i18n";
 import { JWTSigningConfig } from "coral-server/services/jwt";
 import { Metrics } from "coral-server/services/metrics";
@@ -40,32 +41,33 @@ import { TenantCache } from "coral-server/services/tenant/cache";
 import { healthHandler, versionHandler } from "./handlers";
 import { compileTrust } from "./helpers";
 import { basicAuth } from "./middleware/basicAuth";
-import { accessLogger, errorLogger } from "./middleware/logging";
+import { accessLogger } from "./middleware/logging";
 import { metricsRecorder } from "./middleware/metrics";
 import serveStatic from "./middleware/serveStatic";
 import { createRouter } from "./router";
 
 export interface AppOptions {
+  broker: CoralEventListenerBroker;
   config: Config;
   disableClientRoutes: boolean;
   i18n: I18n;
   mailerQueue: MailerQueue;
-  scraperQueue: ScraperQueue;
-  rejectorQueue: RejectorQueue;
-  webhookQueue: WebhookQueue;
-  notifierQueue: NotifierQueue;
   metrics: Metrics;
+  migrationManager: MigrationManager;
   mongo: Db;
+  notifierQueue: NotifierQueue;
   parent: Express;
   persistedQueriesRequired: boolean;
   persistedQueryCache: PersistedQueryCache;
   pubsub: RedisPubSub;
   redis: AugmentedRedis;
+  rejectorQueue: RejectorQueue;
+  reporter?: ErrorReporter;
   schema: GraphQLSchema;
+  scraperQueue: ScraperQueue;
   signingConfig: JWTSigningConfig;
   tenantCache: TenantCache;
-  migrationManager: MigrationManager;
-  broker: CoralEventListenerBroker;
+  webhookQueue: WebhookQueue;
 }
 
 /**
@@ -113,8 +115,7 @@ export async function createApp(options: AppOptions): Promise<Express> {
 
   // Error Handling
   parent.use(notFoundMiddleware);
-  parent.use(errorLogger);
-  parent.use(HTMLErrorHandler(options.i18n));
+  parent.use(HTMLErrorHandler(options));
 
   return parent;
 }
@@ -235,7 +236,6 @@ export default function createMetricsServer(config: Config) {
 
   // Error handling.
   server.use(notFoundMiddleware);
-  server.use(errorLogger);
   server.use(JSONErrorHandler());
 
   return server;
diff --git a/src/core/server/app/middleware/csp/index.ts b/src/core/server/app/middleware/csp/index.ts
new file mode 100644
index 0000000000..593e67b0cd
--- /dev/null
+++ b/src/core/server/app/middleware/csp/index.ts
@@ -0,0 +1 @@
+export * from "./tenant";
diff --git a/src/core/server/app/middleware/error.ts b/src/core/server/app/middleware/error.ts
index 7b5b1047a5..937b4ba11d 100644
--- a/src/core/server/app/middleware/error.ts
+++ b/src/core/server/app/middleware/error.ts
@@ -1,9 +1,19 @@
 import { FluentBundle } from "@fluent/bundle/compat";
+import { Response } from "express";
 
-import { CoralError, WrappedInternalError } from "coral-server/errors";
+import {
+  CoralError,
+  CoralErrorExtensions,
+  WrappedInternalError,
+} from "coral-server/errors";
+import logger from "coral-server/logger";
+import { ErrorReport, ErrorReporterScope } from "coral-server/services/errors";
 import { I18n } from "coral-server/services/i18n";
 import { ErrorRequestHandler, Request } from "coral-server/types/express";
 
+import { AppOptions } from "../";
+import { extractLoggerMetadata } from "./logging";
+
 /**
  * wrapError ensures that the error being propagated is a CoralError.
  *
@@ -37,28 +47,103 @@ const serializeError = (err: CoralError, req: Request, bundles?: I18n) => {
   };
 };
 
-export const JSONErrorHandler = (bundles?: I18n): ErrorRequestHandler => (
-  err,
-  req,
-  res,
-  next
-) => {
+type ErrorHandlerOptions = Partial<Pick<AppOptions, "i18n" | "reporter">>;
+
+interface ErrorHandlerResponse {
+  status: number;
+  context: {
+    error: CoralErrorExtensions;
+    report: ErrorReport | null;
+  };
+}
+
+function wrapAndReport(
+  err: Error,
+  req: Request,
+  res: Response,
+  { i18n, reporter }: ErrorHandlerOptions
+): ErrorHandlerResponse {
+  // Grab the logger.
+  const log = req.coral ? req.coral.logger : logger;
+
   // Wrap the error if it needs to be wrapped.
   const e = wrapError(err);
 
+  // Serialize the error.
+  const { error } = serializeError(e, req, i18n);
+
+  // If there's no reporter active, then return now.
+  if (!reporter || !reporter.shouldReport(err)) {
+    // Log the error.
+    log.error(
+      { ...extractLoggerMetadata(req, res), err, statusCode: e.status },
+      "http error"
+    );
+
+    return {
+      status: e.status,
+      context: {
+        error,
+        report: null,
+      },
+    };
+  }
+
+  // Collect the error scope for the reporter.
+  const scope: ErrorReporterScope = {
+    ipAddress: req.ip,
+  };
+
+  // Add Tenant details to the scope.
+  if (req.coral.tenant) {
+    scope.tenantID = req.coral.tenant.id;
+    scope.tenantDomain = req.coral.tenant.domain;
+
+    // Can't have a User if we don't have a Tenant.. So check now that we have a
+    // User and add it to the scope.
+    if (req.user) {
+      scope.userID = req.user.id;
+      scope.userRole = req.user.role;
+    }
+  }
+
+  // Report the error.
+  const report = reporter.report(e, scope);
+
+  // Log the error.
+  log.error(
+    {
+      ...extractLoggerMetadata(req, res),
+      err,
+      statusCode: e.status,
+      report,
+    },
+    "http error"
+  );
+
+  return {
+    status: e.status,
+    context: {
+      error,
+      report,
+    },
+  };
+}
+
+export const JSONErrorHandler = (
+  options: ErrorHandlerOptions = {}
+): ErrorRequestHandler => (err, req, res, next) => {
+  const { status, context } = wrapAndReport(err, req, res, options);
+
   // Send the response via JSON.
-  res.status(e.status).json(serializeError(e, req, bundles));
+  res.status(status).json(context);
 };
 
-export const HTMLErrorHandler = (bundles?: I18n): ErrorRequestHandler => (
-  err,
-  req,
-  res,
-  next
-) => {
-  // Wrap the error if it needs to be wrapped.
-  const e = wrapError(err);
+export const HTMLErrorHandler = (
+  options: ErrorHandlerOptions = {}
+): ErrorRequestHandler => (err, req, res, next) => {
+  const { status, context } = wrapAndReport(err, req, res, options);
 
   // Send the response via HTML.
-  res.status(e.status).render("error", serializeError(e, req, bundles));
+  res.status(status).render("error", context);
 };
diff --git a/src/core/server/app/middleware/graphql/apolloServer.ts b/src/core/server/app/middleware/graphql/apolloServer.ts
new file mode 100644
index 0000000000..8fe5035b64
--- /dev/null
+++ b/src/core/server/app/middleware/graphql/apolloServer.ts
@@ -0,0 +1,114 @@
+import { ApolloServer } from "apollo-server-express";
+
+import { CLIENT_ID_HEADER } from "coral-common/constants";
+import { AppOptions } from "coral-server/app";
+import GraphContext, { GraphContextOptions } from "coral-server/graph/context";
+import {
+  ErrorApolloServerPlugin,
+  LoggerApolloServerPlugin,
+  MetricsApolloServerPlugin,
+} from "coral-server/graph/plugins";
+import { Request, TenantCoralRequest } from "coral-server/types/express";
+
+type ContextProviderOptions = Omit<AppOptions, "schema" | "metrics">;
+
+function contextProvider(options: ContextProviderOptions) {
+  return ({ req }: { req: Request<TenantCoralRequest> }) => {
+    // Grab the details from the Coral request.
+    const { id, now, tenant, logger, persisted } = req.coral;
+
+    // Create some new options to store the tenant context details inside.
+    const opts: GraphContextOptions = {
+      ...options,
+      id,
+      now,
+      req,
+      persisted,
+      tenant,
+      logger,
+    };
+
+    // Add the user if there is one.
+    if (req.user) {
+      opts.user = req.user;
+    }
+
+    // Add the clientID if there is one on the request.
+    const clientID = req.get(CLIENT_ID_HEADER);
+    if (clientID) {
+      // TODO: (wyattjoh) validate length
+      opts.clientID = clientID;
+    }
+
+    // Return the compiled context.
+    return new GraphContext(opts);
+  };
+}
+
+export const apolloGraphQLMiddleware = ({
+  schema,
+  metrics,
+  ...options
+}: AppOptions) => {
+  // Create the ApolloServer that we'll use to get the middleware from.
+  const server = new ApolloServer({
+    // Provide the executable schema that we assembled earlier.
+    schema,
+
+    // Create the context provider that'll create a new context for each
+    // request.
+    context: contextProvider(options),
+
+    // Introspection is enabled when we aren't in a production environment or if
+    // the GraphiQL is enabled.
+    introspection:
+      options.config.get("env") !== "production" ||
+      options.config.get("enable_graphiql"),
+
+    // Disable uploads, Coral doesn't handle any file uploads.
+    uploads: false,
+
+    // Disable the embedded playground, Coral provides it's own GraphiQL
+    // interface.
+    playground: false,
+
+    // Disable engine, Coral doesn't use it.
+    engine: false,
+
+    // Disable cache control, Coral doesn't use it yet.
+    cacheControl: false,
+
+    // Disable subscriptions as we'll be providing it seperatly.
+    subscriptions: false,
+
+    // Disable automated persisted queries as Coral will provide it's own
+    // implementation at the Express level.
+    persistedQueries: false,
+
+    // Configure plugins to be ran on requests.
+    plugins: [
+      ErrorApolloServerPlugin,
+      LoggerApolloServerPlugin,
+      MetricsApolloServerPlugin(metrics),
+    ],
+
+    // Disable the debug mode, as we already add in our logging function.
+    debug: false,
+  });
+
+  // Get the GraphQL middleware.
+  return server.getMiddleware({
+    // Disable the health check endpoint, Coral does not use this endpoint and
+    // instead uses the /api/health endpoint.
+    disableHealthCheck: true,
+
+    // Disable CORS, Coral does not allow cross origin requests.
+    cors: false,
+
+    // Disable the body parser, we will add our own.
+    bodyParserConfig: false,
+
+    // Configure the path.
+    path: "/graphql",
+  });
+};
diff --git a/src/core/server/app/middleware/graphql/graphqlMiddleware.ts b/src/core/server/app/middleware/graphql/graphqlMiddleware.ts
deleted file mode 100644
index 070a71fffb..0000000000
--- a/src/core/server/app/middleware/graphql/graphqlMiddleware.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { GraphQLExtension, GraphQLOptions } from "apollo-server-express";
-// TODO: when https://github.com/apollographql/apollo-server/pull/1907 is merged, update this import path
-import {
-  ExpressGraphQLOptionsFunction,
-  graphqlExpress,
-} from "apollo-server-express/dist/expressApollo";
-import { Handler } from "express";
-import { FieldDefinitionNode, GraphQLError, ValidationContext } from "graphql";
-
-import { Config } from "coral-server/config";
-import {
-  ErrorWrappingExtension,
-  LoggerExtension,
-  MetricsExtension,
-} from "coral-server/graph/extensions";
-import { Metrics } from "coral-server/services/metrics";
-
-// Sourced from: https://github.com/apollographql/apollo-server/blob/958846887598491fadea57b3f9373d129300f250/packages/apollo-server-core/src/ApolloServer.ts#L46-L57
-const NoIntrospection = (context: ValidationContext) => ({
-  Field(node: FieldDefinitionNode) {
-    if (node.name.value === "__schema" || node.name.value === "__type") {
-      context.reportError(
-        new GraphQLError(
-          "GraphQL introspection is not allowed in production, but the query contained __schema or __type.",
-          [node]
-        )
-      );
-    }
-  },
-});
-
-/**
- * graphqlMiddleware wraps the GraphQL middleware server with some custom
- * extension management.
- *
- * @param config application configuration
- * @param requestOptions options to pass to the graphql server
- */
-const graphqlMiddleware = (
-  config: Config,
-  requestOptions: ExpressGraphQLOptionsFunction,
-  metrics: Metrics
-): Handler => {
-  const extensions: Array<() => GraphQLExtension> = [
-    () => new ErrorWrappingExtension(),
-    () => new LoggerExtension(),
-    // Pass the metrics to the extension so it can increment.
-    () => new MetricsExtension(metrics),
-  ];
-
-  // Create a new baseOptions that will be merged into the new options.
-  const baseOptions: Omit<GraphQLOptions, "schema" | "schemaHash"> = {
-    // Disable the debug mode, as we already add in our logging function.
-    debug: false,
-    extensions,
-  };
-
-  if (config.get("env") === "production" && !config.get("enable_graphiql")) {
-    // Disable introspection in production.
-    baseOptions.validationRules = [NoIntrospection];
-  }
-
-  // Generate the actual middleware.
-  return graphqlExpress(async (req, res) => {
-    // Resolve the options for the GraphQL middleware.
-    const options = await requestOptions(req, res);
-
-    // Provide the options.
-    return {
-      ...options,
-      ...baseOptions,
-    };
-  });
-};
-
-export default graphqlMiddleware;
diff --git a/src/core/server/app/middleware/graphql/index.ts b/src/core/server/app/middleware/graphql/index.ts
index 5ff7819031..6756ca6c07 100644
--- a/src/core/server/app/middleware/graphql/index.ts
+++ b/src/core/server/app/middleware/graphql/index.ts
@@ -1,2 +1,2 @@
-export { default as graphqlMiddleware } from "./graphqlMiddleware";
-export { default as persistedQueryMiddleware } from "./persistedQueryMiddleware";
+export * from "./apolloServer";
+export * from "./persistedQuery";
diff --git a/src/core/server/app/middleware/graphql/persistedQueryMiddleware.ts b/src/core/server/app/middleware/graphql/persistedQuery.ts
similarity index 96%
rename from src/core/server/app/middleware/graphql/persistedQueryMiddleware.ts
rename to src/core/server/app/middleware/graphql/persistedQuery.ts
index 1cef8e03f0..f4e5afe50c 100644
--- a/src/core/server/app/middleware/graphql/persistedQueryMiddleware.ts
+++ b/src/core/server/app/middleware/graphql/persistedQuery.ts
@@ -14,7 +14,7 @@ type PersistedQueryMiddlewareOptions = Pick<
   "persistedQueryCache" | "persistedQueriesRequired"
 >;
 
-const persistedQueryMiddleware = ({
+export const persistedQueryMiddleware = ({
   persistedQueriesRequired,
   persistedQueryCache,
 }: PersistedQueryMiddlewareOptions): RequestHandler<
@@ -64,5 +64,3 @@ const persistedQueryMiddleware = ({
     return next(err);
   }
 };
-
-export default persistedQueryMiddleware;
diff --git a/src/core/server/app/middleware/index.ts b/src/core/server/app/middleware/index.ts
new file mode 100644
index 0000000000..2edaac1111
--- /dev/null
+++ b/src/core/server/app/middleware/index.ts
@@ -0,0 +1,17 @@
+export * from "./csp";
+export * from "./graphql";
+export * from "./passport";
+export * from "./basicAuth";
+export * from "./cacheHeaders";
+export * from "./error";
+export * from "./installed";
+export * from "./json";
+export * from "./loggedIn";
+export * from "./logging";
+export * from "./metrics";
+export * from "./notFound";
+export * from "./playground";
+export * from "./role";
+export * from "./serveStatic";
+export * from "./tenant";
+export * from "./userLimiter";
diff --git a/src/core/server/app/middleware/installed.ts b/src/core/server/app/middleware/installed.ts
index 8cbe86cf6a..93cb58937d 100644
--- a/src/core/server/app/middleware/installed.ts
+++ b/src/core/server/app/middleware/installed.ts
@@ -1,24 +1,20 @@
 import { isInstalled } from "coral-server/services/tenant";
 import { RequestHandler } from "coral-server/types/express";
 
-export interface InstalledMiddlewareOptions {
+interface Options {
   redirectURL?: string;
   redirectIfInstalled?: boolean;
 }
 
-const DefaultInstalledMiddlewareOptions: Required<InstalledMiddlewareOptions> = {
+const defaultOptions: Required<Options> = {
   redirectIfInstalled: false,
   redirectURL: "/install",
 };
 
 export const installedMiddleware = ({
-  redirectIfInstalled = DefaultInstalledMiddlewareOptions.redirectIfInstalled,
-  redirectURL = DefaultInstalledMiddlewareOptions.redirectURL,
-}: InstalledMiddlewareOptions = DefaultInstalledMiddlewareOptions): RequestHandler => async (
-  req,
-  res,
-  next
-) => {
+  redirectIfInstalled = defaultOptions.redirectIfInstalled,
+  redirectURL = defaultOptions.redirectURL,
+}: Options = defaultOptions): RequestHandler => async (req, res, next) => {
   const installed = await isInstalled(req.coral.cache.tenant, req.hostname);
 
   // If Coral is installed, and redirectIfInstall is true, then it will
diff --git a/src/core/server/app/middleware/logging.ts b/src/core/server/app/middleware/logging.ts
index 354a8e119c..e72ec2d31d 100644
--- a/src/core/server/app/middleware/logging.ts
+++ b/src/core/server/app/middleware/logging.ts
@@ -3,12 +3,9 @@ import onFinished from "on-finished";
 
 import { createTimer } from "coral-server/helpers";
 import logger from "coral-server/logger";
-import {
-  ErrorRequestHandler,
-  RequestHandler,
-} from "coral-server/types/express";
+import { RequestHandler } from "coral-server/types/express";
 
-const extractMetadata = (req: Request, res: Response) => ({
+export const extractLoggerMetadata = (req: Request, res: Response) => ({
   url: req.originalUrl || req.url,
   method: req.method,
   statusCode: res.statusCode,
@@ -27,18 +24,11 @@ export const accessLogger: RequestHandler = (req, res, next) => {
     const log = req.coral ? req.coral.logger : logger;
 
     // Log this out.
-    log.debug({ ...extractMetadata(req, res), responseTime }, "http request");
+    log.debug(
+      { ...extractLoggerMetadata(req, res), responseTime },
+      "http request"
+    );
   });
 
   next();
 };
-
-export const errorLogger: ErrorRequestHandler = (err, req, res, next) => {
-  // Grab the logger.
-  const log = req.coral ? req.coral.logger : logger;
-
-  // Log this out.
-  log.error({ ...extractMetadata(req, res), err }, "http error");
-
-  next(err);
-};
diff --git a/src/core/server/app/middleware/metrics.ts b/src/core/server/app/middleware/metrics.ts
index 621dca056e..55dcaf269a 100644
--- a/src/core/server/app/middleware/metrics.ts
+++ b/src/core/server/app/middleware/metrics.ts
@@ -4,8 +4,6 @@ import { createTimer } from "coral-server/helpers";
 import { Metrics } from "coral-server/services/metrics";
 import { RequestHandler } from "coral-server/types/express";
 
-export type MetricsRecorderOptions = Metrics;
-
 export const metricsRecorder = ({
   httpRequestsTotal,
   httpRequestDurationMilliseconds,
diff --git a/src/core/server/app/middleware/passport/index.ts b/src/core/server/app/middleware/passport/index.ts
index e8f5ca7449..e0d520e8f1 100644
--- a/src/core/server/app/middleware/passport/index.ts
+++ b/src/core/server/app/middleware/passport/index.ts
@@ -32,14 +32,12 @@ export type VerifyCallback = (
   info?: { message: string }
 ) => void;
 
-export type PassportOptions = Pick<
+type Options = Pick<
   AppOptions,
   "mongo" | "redis" | "config" | "tenantCache" | "signingConfig"
 >;
 
-export function createPassport(
-  options: PassportOptions
-): passport.Authenticator {
+export function createPassport(options: Options): passport.Authenticator {
   // Create the authenticator.
   const auth = new Authenticator();
 
diff --git a/src/core/server/app/middleware/tenant.ts b/src/core/server/app/middleware/tenant.ts
index 5a17d9c893..55d37c6853 100644
--- a/src/core/server/app/middleware/tenant.ts
+++ b/src/core/server/app/middleware/tenant.ts
@@ -5,7 +5,7 @@ import logger from "coral-server/logger";
 import { TenantCache } from "coral-server/services/tenant/cache";
 import { RequestHandler } from "coral-server/types/express";
 
-export interface MiddlewareOptions {
+interface Options {
   cache: TenantCache;
   passNoTenant?: boolean;
 }
@@ -13,7 +13,7 @@ export interface MiddlewareOptions {
 export const tenantMiddleware = ({
   cache,
   passNoTenant = false,
-}: MiddlewareOptions): RequestHandler => async (req, res, next) => {
+}: Options): RequestHandler => async (req, res, next) => {
   try {
     if (!req.coral) {
       const id = uuid();
diff --git a/src/core/server/app/middleware/userLimiter.ts b/src/core/server/app/middleware/userLimiter.ts
index f5c965a54d..4b15f4b276 100644
--- a/src/core/server/app/middleware/userLimiter.ts
+++ b/src/core/server/app/middleware/userLimiter.ts
@@ -4,7 +4,7 @@ import { RequestLimiter } from "coral-server/app/request/limiter";
 import { Config } from "coral-server/config";
 import { RequestHandler } from "coral-server/types/express";
 
-export interface MiddlewareOptions {
+interface Options {
   redis: Redis;
   config: Config;
 }
@@ -12,7 +12,7 @@ export interface MiddlewareOptions {
 export const userLimiterMiddleware = ({
   redis,
   config,
-}: MiddlewareOptions): RequestHandler => {
+}: Options): RequestHandler => {
   const limiter = new RequestLimiter({
     redis,
     ttl: "1m",
diff --git a/src/core/server/app/router/api/index.ts b/src/core/server/app/router/api/index.ts
index 09b8bf3ab1..813b46bdcc 100644
--- a/src/core/server/app/router/api/index.ts
+++ b/src/core/server/app/router/api/index.ts
@@ -2,18 +2,19 @@ import express from "express";
 import passport from "passport";
 
 import { AppOptions } from "coral-server/app";
-import { graphQLHandler } from "coral-server/app/handlers";
 import { oembedHandler } from "coral-server/app/handlers/api/oembed/oembed";
-import { cspSiteMiddleware } from "coral-server/app/middleware/csp/tenant";
-import { JSONErrorHandler } from "coral-server/app/middleware/error";
-import { persistedQueryMiddleware } from "coral-server/app/middleware/graphql";
-import { jsonMiddleware } from "coral-server/app/middleware/json";
-import { loggedInMiddleware } from "coral-server/app/middleware/loggedIn";
-import { errorLogger } from "coral-server/app/middleware/logging";
-import { notFoundMiddleware } from "coral-server/app/middleware/notFound";
-import { authenticate } from "coral-server/app/middleware/passport";
-import { roleMiddleware } from "coral-server/app/middleware/role";
-import { tenantMiddleware } from "coral-server/app/middleware/tenant";
+import {
+  apolloGraphQLMiddleware,
+  authenticate,
+  cspSiteMiddleware,
+  JSONErrorHandler,
+  jsonMiddleware,
+  loggedInMiddleware,
+  notFoundMiddleware,
+  persistedQueryMiddleware,
+  roleMiddleware,
+  tenantMiddleware,
+} from "coral-server/app/middleware";
 import { STAFF_ROLES } from "coral-server/models/user/constants";
 
 import { createNewAccountRouter } from "./account";
@@ -56,15 +57,17 @@ export function createAPIRouter(app: AppOptions, options: RouterOptions) {
 
   router.get("/oembed", cspSiteMiddleware(app), oembedHandler(app));
 
-  // Configure the GraphQL route.
+  // Configure the GraphQL route middleware.
   router.use(
     "/graphql",
     authenticate(options.passport),
     jsonMiddleware(app.config.get("max_request_size")),
-    persistedQueryMiddleware(app),
-    graphQLHandler(app)
+    persistedQueryMiddleware(app)
   );
 
+  // Attach the GraphQL router (which will be mounted on the same path).
+  router.use(apolloGraphQLMiddleware(app));
+
   router.use(
     "/dashboard",
     authenticate(options.passport),
@@ -81,8 +84,7 @@ export function createAPIRouter(app: AppOptions, options: RouterOptions) {
 
   // General API error handler.
   router.use(notFoundMiddleware);
-  router.use(errorLogger);
-  router.use(JSONErrorHandler(app.i18n));
+  router.use(JSONErrorHandler(app));
 
   return router;
 }
diff --git a/src/core/server/app/router/client.ts b/src/core/server/app/router/client.ts
index 2c118ae40d..1d2dd40944 100644
--- a/src/core/server/app/router/client.ts
+++ b/src/core/server/app/router/client.ts
@@ -2,6 +2,7 @@ import express, { Router } from "express";
 import { Db } from "mongodb";
 import path from "path";
 
+import { StaticConfig } from "coral-common/config";
 import { LanguageCode } from "coral-common/helpers/i18n/locales";
 import { cacheHeadersMiddleware } from "coral-server/app/middleware/cacheHeaders";
 import { cspSiteMiddleware } from "coral-server/app/middleware/csp/tenant";
@@ -34,6 +35,11 @@ export interface ClientTargetHandlerOptions {
     sdk: string;
   };
 
+  /**
+   * config is the static config to be loaded into the template.
+   */
+  config: StaticConfig;
+
   /**
    * defaultLocale is the configured fallback locale for this installation.
    */
@@ -64,12 +70,6 @@ export interface ClientTargetHandlerOptions {
    * cacheDuration is the cache duration that a given request should be cached for.
    */
   cacheDuration?: string | false;
-
-  /**
-   * staticURI is prepended to the static url's that are included on the static
-   * pages.
-   */
-  staticURI: string;
 }
 
 function createClientTargetRouter(options: ClientTargetHandlerOptions) {
@@ -96,23 +96,18 @@ interface MountClientRouteOptions {
   };
   defaultLocale: LanguageCode;
   tenantCache: TenantCache;
-  staticURI: string;
+  config: StaticConfig;
   mongo: Db;
 }
 
 const clientHandler = ({
   analytics,
-  staticURI,
+  config,
   entrypoint,
   enableCustomCSS,
   enableCustomCSSQuery,
   defaultLocale,
 }: ClientTargetHandlerOptions): RequestHandler => (req, res, next) => {
-  // Provide configuration to the frontend in the HTML.
-  const config = {
-    staticURI,
-  };
-
   // Grab the locale code from the tenant configuration, if available.
   let locale: LanguageCode = defaultLocale;
   if (req.coral.tenant) {
@@ -121,7 +116,7 @@ const clientHandler = ({
 
   res.render("client", {
     analytics,
-    staticURI,
+    staticURI: config.staticURI,
     entrypoint,
     enableCustomCSS,
     locale,
diff --git a/src/core/server/app/router/index.ts b/src/core/server/app/router/index.ts
index b219c0e342..b73e3f6fee 100644
--- a/src/core/server/app/router/index.ts
+++ b/src/core/server/app/router/index.ts
@@ -1,5 +1,6 @@
 import express, { Router } from "express";
 
+import { StaticConfig } from "coral-common/config";
 import { LanguageCode } from "coral-common/helpers/i18n/locales";
 import { AppOptions } from "coral-server/app";
 import playgroundMiddleware from "coral-server/app/middleware/playground";
@@ -25,6 +26,24 @@ export function createRouter(app: AppOptions, options: RouterOptions) {
   }
 
   if (!options.disableClientRoutes) {
+    // Prepare the client config to be injected on the page.
+    const config: StaticConfig = {
+      // When mounting client routes, we need to provide a staticURI even when
+      // not provided to the default current domain relative "/".
+      staticURI: app.config.get("static_uri") || "/",
+    };
+
+    // If sentry is configured, then add it's config to the config.
+    if (
+      app.config.get("env") === "production" &&
+      app.config.get("sentry_frontend_key")
+    ) {
+      config.reporter = {
+        name: "sentry",
+        dsn: app.config.get("sentry_frontend_key"),
+      };
+    }
+
     mountClientRoutes(router, {
       analytics: {
         key: app.config.get("analytics_frontend_key"),
@@ -32,11 +51,9 @@ export function createRouter(app: AppOptions, options: RouterOptions) {
         sdk: app.config.get("analytics_frontend_sdk_url"),
       },
       defaultLocale: app.config.get("default_locale") as LanguageCode,
-      // When mounting client routes, we need to provide a staticURI even when
-      // not provided to the default current domain relative "/".
-      staticURI: app.config.get("static_uri") || "/",
       tenantCache: app.tenantCache,
       mongo: app.mongo,
+      config,
     });
   } else {
     logger.warn("client routes are disabled");
diff --git a/src/core/server/app/views/error.html b/src/core/server/app/views/error.html
index b53ca8a77f..1acd59d9bc 100644
--- a/src/core/server/app/views/error.html
+++ b/src/core/server/app/views/error.html
@@ -1,24 +1,37 @@
-<!doctype html>
+<!DOCTYPE html>
 <html>
-<head>
-  <title>Error</title>
-  <meta charset="utf-8">
-  <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
-  <style type="text/css">
-    body, html { margin: 0; padding: 0; }
-    dl { max-width: 800px; margin: 20px auto; font-size: 23px; }
-    dh { font-weight: bold; }
-  </style>
-</head>
-<body>
-  <dl>
-    <dh>Message</dh>
-    <dd>{{ error.message }}</dd>
-    <dh>Code</dh>
-    <dd>{{ error.code }}</dd>
-    <dh>ID</dh>
-    <dd>{{ error.id }}</dd>
-  </dl>
-</body>
+  <head>
+    <title>Error</title>
+    <meta charset="utf-8" />
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+    <style type="text/css">
+      body,
+      html {
+        margin: 0;
+        padding: 0;
+      }
+      dl {
+        max-width: 800px;
+        margin: 20px auto;
+        font-size: 23px;
+      }
+      dh {
+        font-weight: bold;
+      }
+    </style>
+  </head>
+  <body>
+    <dl>
+      <dh>Message</dh>
+      <dd>{{ error.message }}</dd>
+      <dh>Code</dh>
+      <dd>{{ error.code }}</dd>
+      <dh>ID</dh>
+      <dd>{{ error.id }}</dd>
+      {% if reporter %}
+      <dh>{{ reporter.name }}</dh>
+      <dd>{{ reporter.id }}</dd>
+      {% endif %}
+    </dl>
+  </body>
 </html>
-
diff --git a/src/core/server/config.ts b/src/core/server/config.ts
index 4fc5739ef7..bbcc1443b0 100644
--- a/src/core/server/config.ts
+++ b/src/core/server/config.ts
@@ -282,6 +282,16 @@ const config = convict({
     default: ms("100ms"),
     env: "WORD_LIST_TIMEOUT",
   },
+  sentry_frontend_key: {
+    format: String,
+    default: "",
+    env: "SENTRY_FRONTEND_KEY",
+  },
+  sentry_backend_key: {
+    format: String,
+    default: "",
+    env: "SENTRY_BACKEND_KEY",
+  },
   analytics_frontend_key: {
     doc: "Analytics write key from RudderStack for the Javascript client.",
     format: String,
diff --git a/src/core/server/errors/index.ts b/src/core/server/errors/index.ts
index 0fe10758ca..218efa9694 100644
--- a/src/core/server/errors/index.ts
+++ b/src/core/server/errors/index.ts
@@ -111,6 +111,12 @@ export interface CoralErrorOptions {
    * be `input.email` to denote the specific input field that caused the error.
    */
   param?: string;
+
+  /**
+   * reportable when true indicates to the error reporter that this error
+   * should be reported.
+   */
+  reportable?: boolean;
 }
 
 export class CoralError extends VError {
@@ -149,11 +155,18 @@ export class CoralError extends VError {
    */
   public readonly context: Readonly<CoralErrorContext>;
 
+  /**
+   * reportable when true indicates to the error reporter that this error
+   * should be reported.
+   */
+  public readonly reportable: boolean;
+
   constructor({
     code,
     context = {},
     status = 500,
     type = ERROR_TYPES.INVALID_REQUEST_ERROR,
+    reportable = false,
     cause,
     param,
   }: CoralErrorOptions) {
@@ -181,6 +194,7 @@ export class CoralError extends VError {
     this.code = code;
     this.type = type;
     this.param = param;
+    this.reportable = reportable;
   }
 
   public serializeExtensions(
@@ -267,6 +281,7 @@ export class DuplicateStoryIDError extends CoralError {
   constructor(cause: MongoError, id: string, url?: string) {
     super({
       cause,
+      reportable: true,
       code: ERROR_CODES.DUPLICATE_STORY_ID,
       context: { pvt: { id, url } },
     });
@@ -479,6 +494,7 @@ export class WrappedInternalError extends CoralError {
     super({
       code: ERROR_CODES.INTERNAL_ERROR,
       cause,
+      reportable: true,
       context: { pvt: { reason } },
       status: 500,
     });
@@ -489,6 +505,7 @@ export class InternalError extends CoralError {
   constructor(reason: string, context?: Record<string, any>) {
     super({
       code: ERROR_CODES.INTERNAL_ERROR,
+      reportable: true,
       context: { pvt: { reason, ...context } },
       status: 500,
     });
@@ -566,6 +583,7 @@ export class JWTRevokedError extends CoralError {
   constructor(jti: string) {
     super({
       code: ERROR_CODES.AUTHENTICATION_ERROR,
+      status: 401,
       context: { pvt: { jti } },
     });
   }
diff --git a/src/core/server/graph/context.ts b/src/core/server/graph/context.ts
index 8145b43e74..4f24af12a0 100644
--- a/src/core/server/graph/context.ts
+++ b/src/core/server/graph/context.ts
@@ -16,6 +16,7 @@ import { NotifierQueue } from "coral-server/queue/tasks/notifier";
 import { RejectorQueue } from "coral-server/queue/tasks/rejector";
 import { ScraperQueue } from "coral-server/queue/tasks/scraper";
 import { WebhookQueue } from "coral-server/queue/tasks/webhook";
+import { ErrorReporter } from "coral-server/services/errors";
 import { I18n } from "coral-server/services/i18n";
 import { JWTSigningConfig } from "coral-server/services/jwt";
 import { AugmentedRedis } from "coral-server/services/redis";
@@ -33,6 +34,7 @@ export interface GraphContextOptions {
   logger?: Logger;
   now?: Date;
   persisted?: PersistedQuery;
+  reporter?: ErrorReporter;
   req?: Request;
   signingConfig?: JWTSigningConfig;
   user?: User;
@@ -57,6 +59,7 @@ export default class GraphContext {
   public readonly broker: CoralEventPublisherBroker;
   public readonly disableCaching: boolean;
   public readonly i18n: I18n;
+  public readonly reporter?: ErrorReporter;
   public readonly id: string;
   public readonly lang: LanguageCode;
   public readonly loaders: ReturnType<typeof loaders>;
@@ -108,6 +111,7 @@ export default class GraphContext {
     this.webhookQueue = options.webhookQueue;
     this.signingConfig = options.signingConfig;
     this.clientID = options.clientID;
+    this.reporter = options.reporter;
 
     this.broker = options.broker.instance(this);
     this.loaders = loaders(this);
diff --git a/src/core/server/graph/extensions/ErrorWrappingExtension.ts b/src/core/server/graph/extensions/ErrorWrappingExtension.ts
deleted file mode 100644
index 04993d1050..0000000000
--- a/src/core/server/graph/extensions/ErrorWrappingExtension.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import { ApolloError } from "apollo-server-core";
-import { GraphQLFormattedError } from "graphql";
-import { GraphQLExtension, GraphQLResponse } from "graphql-extensions";
-import { merge } from "lodash";
-
-import {
-  CoralError,
-  InternalDevelopmentError,
-  WrappedInternalError,
-} from "coral-server/errors";
-import GraphContext from "coral-server/graph/context";
-
-import { getOriginalError } from "./helpers";
-
-function hoistCoralErrorExtensions(
-  ctx: GraphContext,
-  err: GraphQLFormattedError
-): void {
-  // Grab or wrap the originalError so that it's a CoralError.
-  const originalError = getWrappedOriginalError(err, ctx);
-  if (!originalError) {
-    return;
-  }
-
-  // Get the translation bundle.
-  const bundle = ctx.i18n.getBundle(ctx.lang);
-
-  // Translate the extensions.
-  const extensions = originalError.serializeExtensions(bundle);
-
-  // Hoist the message from the original error into the message of the base
-  // error.
-  (err as any).message = extensions.message;
-
-  // Re-hoist the extensions.
-  merge(err.extensions, extensions);
-
-  return;
-}
-
-/**
- * extractOriginalError will pull out the original error if available.
- *
- * @param err the error to have their original error extracted from.
- * @param ctx the Context to extract the environment state.
- */
-function getWrappedOriginalError(
-  err: GraphQLFormattedError,
-  ctx: GraphContext
-): CoralError | undefined {
-  if (err instanceof ApolloError) {
-    // ApolloError's don't need to be hoisted as they contain validation
-    // messages about the graph.
-    return;
-  }
-
-  const originalError = getOriginalError(err);
-
-  if (!originalError) {
-    // Only errors that have an originalError need to be hoisted.
-    return;
-  }
-
-  if (originalError instanceof CoralError) {
-    return originalError;
-  }
-
-  if (ctx.config.get("env") !== "production") {
-    return new InternalDevelopmentError(
-      originalError,
-      "wrapped internal development error"
-    );
-  }
-
-  return new WrappedInternalError(originalError, "wrapped internal error");
-}
-
-/**
- * enrichAndLogError will enrich and then log out the error.
- *
- * @param ctx the GraphQL context for the request
- * @param err the error that occurred
- */
-export function enrichError(
-  ctx: GraphContext,
-  err: GraphQLFormattedError
-): GraphQLFormattedError {
-  if (err.extensions) {
-    // Delete the exception field from the error extension, we never need to
-    // provide that data.
-    if (err.extensions.exception) {
-      delete err.extensions.exception;
-    }
-
-    if (getOriginalError(err)) {
-      // Hoist the extensions onto the error.
-      hoistCoralErrorExtensions(ctx, err);
-    }
-  }
-
-  return err;
-}
-
-export class ErrorWrappingExtension implements GraphQLExtension<GraphContext> {
-  public willSendResponse(o: {
-    graphqlResponse: GraphQLResponse;
-    context: GraphContext;
-  }): void | { graphqlResponse: GraphQLResponse; context: GraphContext } {
-    if (o.graphqlResponse.errors) {
-      return {
-        ...o,
-        graphqlResponse: {
-          ...o.graphqlResponse,
-          errors: o.graphqlResponse.errors.map((err) =>
-            enrichError(o.context, err)
-          ),
-        },
-      };
-    }
-  }
-}
diff --git a/src/core/server/graph/extensions/MetricsExtension.ts b/src/core/server/graph/extensions/MetricsExtension.ts
deleted file mode 100644
index 96d66f82f7..0000000000
--- a/src/core/server/graph/extensions/MetricsExtension.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { ExecutionArgs } from "graphql";
-import { EndHandler, GraphQLExtension } from "graphql-extensions";
-
-import GraphContext from "coral-server/graph/context";
-import { createTimer } from "coral-server/helpers";
-import { Metrics } from "coral-server/services/metrics";
-
-import { getOperationMetadata } from "./helpers";
-
-export class MetricsExtension implements GraphQLExtension<GraphContext> {
-  constructor(private metrics: Metrics) {}
-
-  public executionDidStart(o: {
-    executionArgs: ExecutionArgs;
-  }): EndHandler | void {
-    // Only try to log things if the context is provided.
-    if (o.executionArgs.contextValue) {
-      // Grab the start time so we can calculate the time it takes to execute
-      // the graph query.
-      const timer = createTimer();
-      return () => {
-        // Compute the end time.
-        const responseTime = timer();
-
-        // Get the request metadata.
-        const { operation, operationName } = getOperationMetadata(
-          o.executionArgs.document
-        );
-
-        if (operation && operationName) {
-          // Increment the graph query value, tagging with the name of the query.
-          this.metrics.executedGraphQueriesTotalCounter
-            .labels(operation, operationName)
-            .inc();
-
-          this.metrics.graphQLExecutionTimingsHistogram
-            .labels(operation, operationName)
-            .observe(responseTime);
-        }
-      };
-    }
-  }
-}
diff --git a/src/core/server/graph/extensions/helpers.ts b/src/core/server/graph/extensions/helpers.ts
deleted file mode 100644
index a4bbab0823..0000000000
--- a/src/core/server/graph/extensions/helpers.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import {
-  DocumentNode,
-  GraphQLFormattedError,
-  OperationDefinitionNode,
-  OperationTypeNode,
-} from "graphql";
-
-import { PersistedQuery } from "coral-server/models/queries";
-
-export interface OperationMetadata {
-  operationName: string;
-  operation: OperationTypeNode;
-}
-
-/**
- * getOperationMetadata will extract the operation metadata from the document
- * node.
- *
- * @param doc the document node that can be used to extract operation metadata
- *            from
- */
-export const getOperationMetadata = (
-  doc: DocumentNode
-): Partial<OperationMetadata> => {
-  if (doc.kind === "Document") {
-    const operationDefinition = doc.definitions.find(
-      ({ kind }) => kind === "OperationDefinition"
-    ) as OperationDefinitionNode | undefined;
-    if (operationDefinition) {
-      let operationName: string | undefined;
-      if (operationDefinition.name) {
-        operationName = operationDefinition.name.value;
-      }
-
-      return {
-        operationName,
-        operation: operationDefinition.operation,
-      };
-    }
-  }
-
-  return {};
-};
-
-interface PersistedQueryOperationMetadata extends OperationMetadata {
-  persistedQueryID: string;
-  persistedQueryBundle: string;
-  persistedQueryVersion: string;
-}
-
-/**
- * getPersistedQueryMetadata will remap the persisted query to the operation
- * metadata.
- *
- * @param persisted persisted query to remap to operation metadata
- */
-export const getPersistedQueryMetadata = ({
-  id: persistedQueryID,
-  operation,
-  operationName,
-  bundle: persistedQueryBundle,
-  version: persistedQueryVersion,
-}: PersistedQuery): PersistedQueryOperationMetadata => ({
-  persistedQueryID,
-  persistedQueryBundle,
-  persistedQueryVersion,
-  operation,
-  operationName,
-});
-
-/**
- * getOriginalError tries to return the original error from a
- * formatted GraphQL error.
- *
- * @param err A GraphQL Formatted Error
- */
-export const getOriginalError = (err: GraphQLFormattedError) => {
-  if ((err as any).originalError) {
-    return (err as any).originalError as Error;
-  }
-  return null;
-};
diff --git a/src/core/server/graph/extensions/index.ts b/src/core/server/graph/extensions/index.ts
deleted file mode 100644
index 4657460627..0000000000
--- a/src/core/server/graph/extensions/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from "./ErrorWrappingExtension";
-export * from "./LoggerExtension";
-export * from "./MetricsExtension";
diff --git a/src/core/server/graph/persisted/loader.ts b/src/core/server/graph/persisted/loader.ts
index a7e5f81789..3ad7a43a3a 100644
--- a/src/core/server/graph/persisted/loader.ts
+++ b/src/core/server/graph/persisted/loader.ts
@@ -3,7 +3,7 @@ import { parse } from "graphql";
 import path from "path";
 
 import { version } from "coral-common/version";
-import { getOperationMetadata } from "coral-server/graph/extensions/helpers";
+import { getOperationMetadata } from "coral-server/graph/plugins";
 import logger from "coral-server/logger";
 import { PersistedQuery } from "coral-server/models/queries";
 
diff --git a/src/core/server/graph/plugins/error.ts b/src/core/server/graph/plugins/error.ts
new file mode 100644
index 0000000000..76c95a4264
--- /dev/null
+++ b/src/core/server/graph/plugins/error.ts
@@ -0,0 +1,22 @@
+import { ApolloServerPlugin } from "apollo-server-plugin-base";
+
+import GraphContext from "../context";
+import { enrichError } from "./helpers";
+
+export const ErrorApolloServerPlugin: ApolloServerPlugin<GraphContext> = {
+  requestDidStart() {
+    return {
+      willSendResponse({ response, context }) {
+        // If there's any errors on the response, we need to enrich their
+        // extensions with translated messages.
+        if (response.errors) {
+          response.errors = response.errors.map((err) =>
+            enrichError(context, err)
+          );
+        }
+      },
+    };
+  },
+};
+
+export default ErrorApolloServerPlugin;
diff --git a/src/core/server/graph/plugins/helpers.ts b/src/core/server/graph/plugins/helpers.ts
new file mode 100644
index 0000000000..58be13be69
--- /dev/null
+++ b/src/core/server/graph/plugins/helpers.ts
@@ -0,0 +1,182 @@
+import { ApolloError } from "apollo-server-express";
+import {
+  DocumentNode,
+  GraphQLFormattedError,
+  OperationDefinitionNode,
+  OperationTypeNode,
+} from "graphql";
+import { merge } from "lodash";
+
+import {
+  CoralError,
+  InternalDevelopmentError,
+  WrappedInternalError,
+} from "coral-server/errors";
+import { PersistedQuery } from "coral-server/models/queries";
+
+import GraphContext from "../context";
+
+export interface OperationMetadata {
+  operationName: string;
+  operation: OperationTypeNode;
+}
+
+/**
+ * getOperationMetadata will extract the operation metadata from the document
+ * node.
+ *
+ * @param doc the document node that can be used to extract operation metadata
+ *            from
+ */
+export const getOperationMetadata = (
+  doc: DocumentNode
+): Partial<OperationMetadata> => {
+  if (doc.kind === "Document") {
+    const operationDefinition = doc.definitions.find(
+      ({ kind }) => kind === "OperationDefinition"
+    ) as OperationDefinitionNode | undefined;
+    if (operationDefinition) {
+      let operationName: string | undefined;
+      if (operationDefinition.name) {
+        operationName = operationDefinition.name.value;
+      }
+
+      return {
+        operationName,
+        operation: operationDefinition.operation,
+      };
+    }
+  }
+
+  return {};
+};
+
+interface PersistedQueryOperationMetadata extends OperationMetadata {
+  persistedQueryID: string;
+  persistedQueryBundle: string;
+  persistedQueryVersion: string;
+}
+
+/**
+ * getPersistedQueryMetadata will remap the persisted query to the operation
+ * metadata.
+ *
+ * @param persisted persisted query to remap to operation metadata
+ */
+export const getPersistedQueryMetadata = ({
+  id: persistedQueryID,
+  operation,
+  operationName,
+  bundle: persistedQueryBundle,
+  version: persistedQueryVersion,
+}: PersistedQuery): PersistedQueryOperationMetadata => ({
+  persistedQueryID,
+  persistedQueryBundle,
+  persistedQueryVersion,
+  operation,
+  operationName,
+});
+
+/**
+ * getOriginalError tries to return the original error from a
+ * formatted GraphQL error.
+ *
+ * @param err A GraphQL Formatted Error
+ */
+export const getOriginalError = (err: GraphQLFormattedError) => {
+  if ((err as any).originalError) {
+    return (err as any).originalError as Error;
+  }
+  return null;
+};
+
+function hoistCoralErrorExtensions(
+  ctx: GraphContext,
+  err: GraphQLFormattedError
+): void {
+  // Grab or wrap the originalError so that it's a CoralError.
+  const originalError = getWrappedOriginalError(err, ctx);
+  if (!originalError) {
+    return;
+  }
+
+  // Get the translation bundle.
+  const bundle = ctx.i18n.getBundle(ctx.lang);
+
+  // Translate the extensions.
+  const extensions = originalError.serializeExtensions(bundle);
+
+  // Hoist the message from the original error into the message of the base
+  // error.
+  (err as any).message = extensions.message;
+
+  // Re-hoist the extensions.
+  merge(err.extensions, extensions);
+
+  return;
+}
+
+/**
+ * extractOriginalError will pull out the original error if available.
+ *
+ * @param err the error to have their original error extracted from.
+ * @param ctx the Context to extract the environment state.
+ */
+export function getWrappedOriginalError(
+  err: GraphQLFormattedError,
+  ctx?: GraphContext
+): CoralError | undefined {
+  if (err instanceof ApolloError) {
+    // ApolloError's don't need to be hoisted as they contain validation
+    // messages about the graph.
+    return;
+  }
+
+  const originalError = getOriginalError(err);
+
+  if (!originalError) {
+    // Only errors that have an originalError need to be hoisted.
+    return;
+  }
+
+  if (originalError instanceof CoralError) {
+    return originalError;
+  }
+
+  // If the context is provided, and we aren't in production, then return an
+  // internal development error instead of a wrapped internal error.
+  if (ctx && ctx.config.get("env") !== "production") {
+    return new InternalDevelopmentError(
+      originalError,
+      "wrapped internal development error"
+    );
+  }
+
+  return new WrappedInternalError(originalError, "wrapped internal error");
+}
+
+/**
+ * enrichAndLogError will enrich and then log out the error.
+ *
+ * @param ctx the GraphQL context for the request
+ * @param err the error that occurred
+ */
+export function enrichError(
+  ctx: GraphContext,
+  err: GraphQLFormattedError
+): GraphQLFormattedError {
+  if (err.extensions) {
+    // Delete the exception field from the error extension, we never need to
+    // provide that data.
+    if (err.extensions.exception) {
+      delete err.extensions.exception;
+    }
+
+    if (getOriginalError(err)) {
+      // Hoist the extensions onto the error.
+      hoistCoralErrorExtensions(ctx, err);
+    }
+  }
+
+  return err;
+}
diff --git a/src/core/server/graph/plugins/index.ts b/src/core/server/graph/plugins/index.ts
new file mode 100644
index 0000000000..ee0e081512
--- /dev/null
+++ b/src/core/server/graph/plugins/index.ts
@@ -0,0 +1,4 @@
+export * from "./error";
+export * from "./logger";
+export * from "./metrics";
+export * from "./helpers";
diff --git a/src/core/server/graph/extensions/LoggerExtension.ts b/src/core/server/graph/plugins/logger.ts
similarity index 53%
rename from src/core/server/graph/extensions/LoggerExtension.ts
rename to src/core/server/graph/plugins/logger.ts
index 098c4ea223..163eb359c4 100644
--- a/src/core/server/graph/extensions/LoggerExtension.ts
+++ b/src/core/server/graph/plugins/logger.ts
@@ -1,18 +1,50 @@
-import { DocumentNode, ExecutionArgs, GraphQLFormattedError } from "graphql";
-import {
-  EndHandler,
-  GraphQLExtension,
-  GraphQLResponse,
-} from "graphql-extensions";
+import { ApolloServerPlugin } from "apollo-server-plugin-base";
+import { DocumentNode, GraphQLFormattedError } from "graphql";
 
 import GraphContext from "coral-server/graph/context";
 import { createTimer } from "coral-server/helpers";
 import logger from "coral-server/logger";
+import { ErrorReporterScope } from "coral-server/services/errors";
+
+import {
+  getOperationMetadata,
+  getPersistedQueryMetadata,
+  getWrappedOriginalError,
+} from "./helpers";
+
+export function logAndReportError(
+  ctx: GraphContext,
+  graphQLError: GraphQLFormattedError
+) {
+  // Get the original error or fallback to the passed error instead.
+  const err = getWrappedOriginalError(graphQLError) || graphQLError;
+
+  // If there's no reporter active, then just log what we got and return now.
+  if (!ctx.reporter || !ctx.reporter.shouldReport(err)) {
+    ctx.logger.error({ err, report: null }, "graphql query error");
+    return;
+  }
 
-import { getOperationMetadata, getPersistedQueryMetadata } from "./helpers";
+  // Collect the error scope for the reporter.
+  const scope: ErrorReporterScope = {
+    ipAddress: ctx.req?.ip,
+  };
 
-export function logError(ctx: GraphContext, err: GraphQLFormattedError) {
-  ctx.logger.error({ err }, "graphql query error");
+  // Add Tenant details to the scope.
+  scope.tenantID = ctx.tenant.id;
+  scope.tenantDomain = ctx.tenant.domain;
+
+  // Add User details if there is any to the request.
+  if (ctx.user) {
+    scope.userID = ctx.user.id;
+    scope.userRole = ctx.user.role;
+  }
+
+  // Report the error and get back the report ID.
+  const report = ctx.reporter.report(err, scope);
+
+  // Log that we reported an error.
+  ctx.logger.error({ err, report }, "graphql query error");
 }
 
 export function logQuery(
@@ -76,35 +108,25 @@ export function logQuery(
   }
 }
 
-export class LoggerExtension implements GraphQLExtension<GraphContext> {
-  public executionDidStart(o: {
-    executionArgs: ExecutionArgs;
-  }): EndHandler | void {
-    // Only try to log things if the context is provided.
-    if (o.executionArgs.contextValue) {
-      // Grab the start time so we can calculate the time it takes to execute
-      // the graph query.
-      const timer = createTimer();
-      return () => {
-        // Log out the details of the request.
-        logQuery(
-          o.executionArgs.contextValue,
-          o.executionArgs.document,
-          undefined,
-          timer()
-        );
-      };
-    }
-  }
+export const LoggerApolloServerPlugin: ApolloServerPlugin<GraphContext> = {
+  requestDidStart() {
+    return {
+      willSendResponse({ response, context }) {
+        if (response.errors) {
+          // Log out the errors on this request.
+          response.errors.forEach((err) => logAndReportError(context, err));
+        }
+      },
+      executionDidStart({ document, context }) {
+        // Grab the start time so we can calculate the time it takes to execute
+        // the graph query.
+        const timer = createTimer();
 
-  public willSendResponse(response: {
-    graphqlResponse: GraphQLResponse;
-    context: GraphContext;
-  }): void {
-    if (response.graphqlResponse.errors) {
-      response.graphqlResponse.errors.forEach((err) =>
-        logError(response.context, err)
-      );
-    }
-  }
-}
+        return function executionDidEnd() {
+          // Log out the details of this request.
+          logQuery(context, document, context.persisted, timer());
+        };
+      },
+    };
+  },
+};
diff --git a/src/core/server/graph/plugins/metrics.ts b/src/core/server/graph/plugins/metrics.ts
new file mode 100644
index 0000000000..897e04bee3
--- /dev/null
+++ b/src/core/server/graph/plugins/metrics.ts
@@ -0,0 +1,40 @@
+import { ApolloServerPlugin } from "apollo-server-plugin-base";
+
+import { createTimer } from "coral-server/helpers";
+import { Metrics } from "coral-server/services/metrics";
+
+import { getOperationMetadata } from "./helpers";
+
+export const MetricsApolloServerPlugin = (
+  metrics: Metrics
+): ApolloServerPlugin => ({
+  requestDidStart() {
+    return {
+      executionDidStart({ document }) {
+        // Grab the start time so we can calculate the time it takes to execute
+        // the graph query.
+        const timer = createTimer();
+
+        return function executionDidEnd() {
+          // Compute the end time.
+          const responseTime = timer();
+
+          // Get the request metadata.
+          const { operation, operationName } = getOperationMetadata(document);
+          if (operation && operationName) {
+            // Increment the graph query value, tagging with the name of the query.
+            metrics.executedGraphQueriesTotalCounter
+              .labels(operation, operationName)
+              .inc();
+
+            metrics.graphQLExecutionTimingsHistogram
+              .labels(operation, operationName)
+              .observe(responseTime);
+          }
+        };
+      },
+    };
+  },
+});
+
+export default MetricsApolloServerPlugin;
diff --git a/src/core/server/graph/subscriptions/server.ts b/src/core/server/graph/subscriptions/server.ts
index a2265a2767..1a7366afaa 100644
--- a/src/core/server/graph/subscriptions/server.ts
+++ b/src/core/server/graph/subscriptions/server.ts
@@ -29,9 +29,13 @@ import {
   TenantNotFoundError,
   WrappedInternalError,
 } from "coral-server/errors";
-import { enrichError, logError, logQuery } from "coral-server/graph/extensions";
-import { getOperationMetadata } from "coral-server/graph/extensions/helpers";
 import { getPersistedQuery } from "coral-server/graph/persisted";
+import {
+  enrichError,
+  getOperationMetadata,
+  logAndReportError,
+  logQuery,
+} from "coral-server/graph/plugins";
 import logger from "coral-server/logger";
 import { PersistedQuery } from "coral-server/models/queries";
 import { hasStaffRole } from "coral-server/models/user/helpers";
@@ -199,7 +203,7 @@ export function formatResponse(
           const enriched = enrichError(context, err);
 
           // Log the error out.
-          logError(context, enriched);
+          logAndReportError(context, enriched);
 
           return enriched;
         }),
diff --git a/src/core/server/index.ts b/src/core/server/index.ts
index a69e4fd3f8..90e518b2e9 100644
--- a/src/core/server/index.ts
+++ b/src/core/server/index.ts
@@ -44,6 +44,7 @@ import {
   WebhookCoralEventListener,
 } from "./events/listeners";
 import CoralEventListenerBroker from "./events/publisher";
+import { ErrorReporter, SentryErrorReporter } from "./services/errors";
 import { isInstalled } from "./services/tenant";
 
 export interface ServerOptions {
@@ -115,6 +116,8 @@ class Server {
   // migrationManager is the manager for performing migrations on Coral.
   private migrationManager: MigrationManager;
 
+  private readonly reporter?: ErrorReporter;
+
   /**
    * broker stores a reference to all of the listeners that can be used in
    * conjunction with an event to publish activity occurring inside Coral.
@@ -143,6 +146,16 @@ class Server {
       }
     }
 
+    // Configure the error reporter.
+    if (
+      this.config.get("env") === "production" &&
+      this.config.get("sentry_backend_key")
+    ) {
+      this.reporter = new SentryErrorReporter(
+        this.config.get("sentry_backend_key")
+      );
+    }
+
     // Load the graph schemas.
     this.schema = getTenantSchema();
 
@@ -302,28 +315,29 @@ class Server {
     const disableClientRoutes = this.config.get("disable_client_routes");
 
     const options: AppOptions = {
-      parent,
       broker: this.broker,
-      pubsub: this.pubsub,
-      mongo: this.mongo,
-      redis: this.redis,
-      signingConfig: this.signingConfig,
-      tenantCache: this.tenantCache,
       config: this.config,
-      schema: this.schema,
+      disableClientRoutes,
       i18n: this.i18n,
       mailerQueue: this.tasks.mailer,
-      scraperQueue: this.tasks.scraper,
-      rejectorQueue: this.tasks.rejector,
-      webhookQueue: this.tasks.webhook,
-      notifierQueue: this.tasks.notifier,
-      disableClientRoutes,
-      persistedQueryCache: this.persistedQueryCache,
       metrics: createMetrics(),
+      migrationManager: this.migrationManager,
+      mongo: this.mongo,
+      notifierQueue: this.tasks.notifier,
+      parent,
       persistedQueriesRequired:
         this.config.get("env") === "production" &&
         !this.config.get("enable_graphiql"),
-      migrationManager: this.migrationManager,
+      persistedQueryCache: this.persistedQueryCache,
+      pubsub: this.pubsub,
+      redis: this.redis,
+      rejectorQueue: this.tasks.rejector,
+      reporter: this.reporter,
+      schema: this.schema,
+      scraperQueue: this.tasks.scraper,
+      signingConfig: this.signingConfig,
+      tenantCache: this.tenantCache,
+      webhookQueue: this.tasks.webhook,
     };
 
     // Create the Coral App, branching off from the parent app.
diff --git a/src/core/server/services/errors/index.ts b/src/core/server/services/errors/index.ts
new file mode 100644
index 0000000000..970f7345ce
--- /dev/null
+++ b/src/core/server/services/errors/index.ts
@@ -0,0 +1,2 @@
+export * from "./reporter";
+export * from "./sentry";
diff --git a/src/core/server/services/errors/reporter.ts b/src/core/server/services/errors/reporter.ts
new file mode 100644
index 0000000000..fac8d957ef
--- /dev/null
+++ b/src/core/server/services/errors/reporter.ts
@@ -0,0 +1,36 @@
+import { CoralError } from "coral-server/errors";
+import { GQLUSER_ROLE } from "coral-server/graph/schema/__generated__/types";
+
+export interface ErrorReporterScope {
+  tenantID?: string;
+  tenantDomain?: string;
+  userID?: string;
+  userUsername?: string;
+  userRole?: GQLUSER_ROLE;
+  ipAddress?: string;
+}
+
+export interface ErrorReport {
+  name: string;
+  id: string;
+}
+
+export abstract class ErrorReporter {
+  /**
+   * shouldReport will return if a particular error should be reported to the
+   * reporter.
+   *
+   * @param err the error to test if it should be reported or not.
+   */
+  public shouldReport(err: any): boolean {
+    if (!(err instanceof CoralError)) {
+      // The error isn't a CoralError, so send it!
+      return true;
+    }
+
+    // The error is a CoralError, so check to see if we should not report it.
+    return err.reportable;
+  }
+
+  public abstract report(err: any, scope: ErrorReporterScope): ErrorReport;
+}
diff --git a/src/core/server/services/errors/sentry.ts b/src/core/server/services/errors/sentry.ts
new file mode 100644
index 0000000000..704d05a8e4
--- /dev/null
+++ b/src/core/server/services/errors/sentry.ts
@@ -0,0 +1,60 @@
+import * as Sentry from "@sentry/node";
+
+import { version } from "coral-common/version";
+import logger from "coral-server/logger";
+
+import { ErrorReport, ErrorReporter, ErrorReporterScope } from "./reporter";
+
+interface Context {
+  user?: Sentry.User;
+  tags: Record<string, string>;
+}
+
+export class SentryErrorReporter extends ErrorReporter {
+  constructor(dsn: string) {
+    // Setup the base error reporter.
+    super();
+
+    logger.info({ reporter: "sentry" }, "now configuring error reporter");
+
+    // Initialize sentry.
+    Sentry.init({ dsn, release: `coral@${version}` });
+  }
+
+  public report(err: any, scope: ErrorReporterScope): ErrorReport {
+    // Transform the scope to a sentry scope.
+    const context: Context = {
+      tags: {},
+    };
+
+    // Add the User's ID and role if they are provided.
+    if (scope.userID && scope.userRole) {
+      context.user = {
+        id: scope.userID,
+        role: scope.userRole,
+      };
+
+      // Add the username to the context if it's available too.
+      if (scope.userUsername) {
+        context.user.username = scope.userUsername;
+      }
+
+      // Add the Tenant's ID to the user if it's provided.
+      if (scope.tenantID) {
+        context.user.tenant_id = scope.tenantID;
+      }
+    }
+
+    // Add the Tenant's ID and domain if they are provided.
+    if (scope.tenantID && scope.tenantDomain) {
+      context.tags.tenantID = scope.tenantID;
+      context.tags.domain = scope.tenantDomain;
+    }
+
+    // Capture and report the error to Sentry.
+    const id = Sentry.captureException(err, context);
+
+    // Return the error report.
+    return { name: "sentry", id };
+  }
+}
diff --git a/src/locales/da/admin.ftl b/src/locales/da/admin.ftl
index 1a27b66e91..d712d6f2a1 100644
--- a/src/locales/da/admin.ftl
+++ b/src/locales/da/admin.ftl
@@ -39,7 +39,7 @@ userMenu-popover =
 ## Restricted
 restricted-currentlySignedInTo = Aktuelt logget ind på
 restricted-noPermissionInfo = Du har ikke tilladelse til at få adgang til denne side.
-restricted-signedInAs = Du er logget ind som:<Username></Username>
+restricted-signedInAs = Du er logget ind som: <strong>{ $username }</strong>
 restricted-signInWithADifferentAccount = Log ind med en anden konto
 restricted-contactAdmin = Hvis du mener, at dette er en fejl, skal du kontakte din administrator for at få hjælp.
 
diff --git a/src/locales/en-US/admin.ftl b/src/locales/en-US/admin.ftl
index d0577cb50d..47762cf202 100644
--- a/src/locales/en-US/admin.ftl
+++ b/src/locales/en-US/admin.ftl
@@ -56,7 +56,7 @@ userMenu-popover =
 ## Restricted
 restricted-currentlySignedInTo = Currently signed in to
 restricted-noPermissionInfo = You do not have permission to access this page.
-restricted-signedInAs = You are signed in as: <Username></Username>
+restricted-signedInAs = You are signed in as: <strong>{ $username }</strong>
 restricted-signInWithADifferentAccount = Sign in with a different account
 restricted-contactAdmin = If you think this is an error, please contact your administrator for assistance.
 
diff --git a/src/locales/es/admin.ftl b/src/locales/es/admin.ftl
index ab20601661..fa375dd275 100644
--- a/src/locales/es/admin.ftl
+++ b/src/locales/es/admin.ftl
@@ -39,7 +39,7 @@ userMenu-popover =
 ## Restricted
 restricted-currentlySignedInTo = Actualmente ha iniciado sesión en
 restricted-noPermissionInfo = Usted no tiene permiso para acceder a esta página.
-restricted-signedInAs = Has iniciado sesión como: <Username></Username>
+restricted-signedInAs = Has iniciado sesión como: <strong>{ $username }</strong>
 restricted-signInWithADifferentAccount = Iniciar sesión con una cuenta diferente
 restricted-contactAdmin = Si cree que esto es un error, comuníquese con su administrador para obtener ayuda.
 
diff --git a/src/locales/fr-FR/admin.ftl b/src/locales/fr-FR/admin.ftl
index 927564f0cd..d08790aa25 100755
--- a/src/locales/fr-FR/admin.ftl
+++ b/src/locales/fr-FR/admin.ftl
@@ -40,7 +40,7 @@ userMenu-popover =
 ## Restricted
 restricted-currentlySignedInTo = Vous êtes connecté
 restricted-noPermissionInfo = Vous n'avez pas les droits pour accéder à cette page.
-restricted-signedInAs = Vous êtes connecté en tant que : <Username></Username>
+restricted-signedInAs = Vous êtes connecté en tant que : <strong>{ $username }</strong>
 restricted-signInWithADifferentAccount = Se connecter avec un autre compte.
 restricted-contactAdmin = Si vous pensez qu'il y a une erreur, merci de contacter votre administateur pour recevoir une aide.
 
diff --git a/src/locales/pt-BR/admin.ftl b/src/locales/pt-BR/admin.ftl
index f109da4154..f90f02ad17 100644
--- a/src/locales/pt-BR/admin.ftl
+++ b/src/locales/pt-BR/admin.ftl
@@ -44,7 +44,7 @@ userMenu-popover =
 ## Restricted
 restricted-currentlySignedInTo = Atualmente logado
 restricted-noPermissionInfo = Você não tem permissão para acessar esta página.
-restricted-signedInAs = Você está logado como: <username></username>
+restricted-signedInAs = Você está logado como: <strong>{ $username }</strong>
 restricted-signInWithADifferentAccount = Entrar com uma conta diferente
 restricted-contactAdmin = Se você acha que isso é um erro, entre em contato com seu administrador para obter ajuda.