chore: Update Sentry to avoid duplicate packages

chore: Pass current release version to Sentry and Datadog

server/app.js

@@ -114,10 +114,11 @@ if (isProduction) {
 // catch errors in one place, automatically set status and response headers
 onerror(app);
 
-if (process.env.SENTRY_DSN) {
+if (env.SENTRY_DSN) {
   Sentry.init({
-    dsn: process.env.SENTRY_DSN,
-    environment: process.env.NODE_ENV,
+    dsn: env.SENTRY_DSN,
+    environment: env.ENVIRONMENT,
+    release: env.RELEASE,
     maxBreadcrumbs: 0,
     ignoreErrors: [
       // emitted by Koa when bots attempt to snoop on paths such as wp-admin

server/env.js

@@ -1,12 +1,17 @@
 // @flow
+
+// Note: This entire object is stringified in the HTML exposed to the client
+// do not add anything here that should be a secret or password
 export default {
   URL: process.env.URL,
   CDN_URL: process.env.CDN_URL || "",
   DEPLOYMENT: process.env.DEPLOYMENT,
+  ENVIRONMENT: process.env.NODE_ENV,
   SENTRY_DSN: process.env.SENTRY_DSN,
   TEAM_LOGO: process.env.TEAM_LOGO,
   SLACK_KEY: process.env.SLACK_KEY,
   SLACK_APP_ID: process.env.SLACK_APP_ID,
   SUBDOMAINS_ENABLED: process.env.SUBDOMAINS_ENABLED === "true",
   GOOGLE_ANALYTICS_ID: process.env.GOOGLE_ANALYTICS_ID,
+  RELEASE: process.env.SOURCE_COMMIT || process.env.SOURCE_VERSION || undefined,
 };

server/index.js

@@ -4,7 +4,11 @@ require("dotenv").config({ silent: true });
 // If the DataDog agent is installed and the DD_API_KEY environment variable is
 // in the environment then we can safely attempt to start the DD tracer
 if (process.env.DD_API_KEY) {
-  require("dd-trace").init();
+  require("dd-trace").init({
+    // SOURCE_COMMIT is used by Docker Hub
+    // SOURCE_VERSION is used by Heroku
+    version: process.env.SOURCE_COMMIT || process.env.SOURCE_VERSION,
+  });
 }
 
 if (