Merge branch 'main' into cm/fix-file-from-url-flow

Author: CiaranMn

apps/hash-ai-worker-ts/src/main.ts

@@ -5,6 +5,12 @@ import * as Sentry from "@sentry/node";
 Sentry.init({
   dsn: process.env.HASH_TEMPORAL_WORKER_AI_SENTRY_DSN,
   enabled: !!process.env.HASH_TEMPORAL_WORKER_AI_SENTRY_DSN,
+  environment:
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    process.env.SENTRY_ENVIRONMENT ||
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    process.env.ENVIRONMENT ||
+    (process.env.NODE_ENV === "production" ? "production" : "development"),
   tracesSampleRate: process.env.NODE_ENV === "production" ? 1.0 : 0,
 });
 

apps/hash-api/src/instrument.mjs

@@ -20,7 +20,10 @@ const sentryDsn = process.env.NODE_API_SENTRY_DSN;
 Sentry.init({
   dsn: sentryDsn,
   enabled: !!sentryDsn,
-  environment: isProdEnv ? "production" : "development",
+  environment:
+    process.env.SENTRY_ENVIRONMENT ||
+    process.env.ENVIRONMENT ||
+    (isProdEnv ? "production" : "development"),
   sendDefaultPii: true,
   tracesSampleRate: isProdEnv ? 1.0 : 0,
 });

apps/hash-frontend/instrumentation-client.ts

@@ -7,14 +7,14 @@ import { buildStamp } from "./buildstamp";
 import { isProduction } from "./src/lib/config";
 import {
   SENTRY_DSN,
+  SENTRY_ENVIRONMENT,
   SENTRY_REPLAYS_SESSION_SAMPLE_RATE,
-  VERCEL_ENV,
 } from "./src/lib/public-env";
 
 Sentry.init({
   dsn: SENTRY_DSN,
   enabled: !!SENTRY_DSN,
-  environment: VERCEL_ENV || "development",
+  environment: SENTRY_ENVIRONMENT,
   integrations: [
     Sentry.browserApiErrorsIntegration(),
     Sentry.browserProfilingIntegration(),

apps/hash-frontend/next.config.js

@@ -46,6 +46,9 @@ process.env.NEXT_PUBLIC_API_ORIGIN =
   process.env.API_ORIGIN ?? "http://localhost:5001";
 
 process.env.NEXT_PUBLIC_SENTRY_DSN = process.env.SENTRY_DSN ?? "";
+process.env.NEXT_PUBLIC_ENVIRONMENT = process.env.ENVIRONMENT ?? "";
+process.env.NEXT_PUBLIC_SENTRY_ENVIRONMENT =
+  process.env.SENTRY_ENVIRONMENT ?? "";
 process.env.NEXT_PUBLIC_SENTRY_REPLAY_SESSION_SAMPLE_RATE =
   process.env.SENTRY_REPLAY_SESSION_SAMPLE_RATE ?? "1";
 

apps/hash-frontend/sentry.edge.config.ts

@@ -2,12 +2,12 @@ import * as Sentry from "@sentry/nextjs";
 
 import { buildStamp } from "./buildstamp";
 import { isProduction } from "./src/lib/config";
-import { SENTRY_DSN, VERCEL_ENV } from "./src/lib/public-env";
+import { SENTRY_DSN, SENTRY_ENVIRONMENT } from "./src/lib/public-env";
 
 Sentry.init({
   dsn: SENTRY_DSN,
   enabled: !!SENTRY_DSN,
-  environment: VERCEL_ENV || "development",
+  environment: SENTRY_ENVIRONMENT,
   release: buildStamp,
   sendDefaultPii: true,
   // release is set in next.config.js in the Sentry webpack plugin

apps/hash-frontend/sentry.server.config.ts

@@ -2,12 +2,12 @@ import * as Sentry from "@sentry/nextjs";
 
 import { buildStamp } from "./buildstamp";
 import { isProduction } from "./src/lib/config";
-import { SENTRY_DSN, VERCEL_ENV } from "./src/lib/public-env";
+import { SENTRY_DSN, SENTRY_ENVIRONMENT } from "./src/lib/public-env";
 
 Sentry.init({
   dsn: SENTRY_DSN,
   enabled: !!SENTRY_DSN,
-  environment: VERCEL_ENV || "development",
+  environment: SENTRY_ENVIRONMENT,
   release: buildStamp,
   sendDefaultPii: true,
   // release is set in next.config.js in the Sentry webpack plugin

apps/hash-frontend/src/lib/public-env.ts

@@ -3,4 +3,13 @@ export const SENTRY_DSN = process.env.NEXT_PUBLIC_SENTRY_DSN;
 export const SENTRY_REPLAYS_SESSION_SAMPLE_RATE =
   process.env.NEXT_PUBLIC_SENTRY_REPLAYS_SESSION_SAMPLE_RATE;
 
-export const VERCEL_ENV = process.env.NEXT_PUBLIC_VERCEL_ENV ?? "unset";
+export const ENVIRONMENT =
+  // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+  process.env.NEXT_PUBLIC_ENVIRONMENT ||
+  // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+  process.env.NEXT_PUBLIC_VERCEL_ENV ||
+  "development";
+
+export const SENTRY_ENVIRONMENT =
+  // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+  process.env.NEXT_PUBLIC_SENTRY_ENVIRONMENT || ENVIRONMENT;

apps/hash-integration-worker/src/main.ts

@@ -5,6 +5,12 @@ import * as Sentry from "@sentry/node";
 Sentry.init({
   dsn: process.env.HASH_TEMPORAL_WORKER_INTEGRATION_SENTRY_DSN,
   enabled: !!process.env.HASH_TEMPORAL_WORKER_INTEGRATION_SENTRY_DSN,
+  environment:
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    process.env.SENTRY_ENVIRONMENT ||
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    process.env.ENVIRONMENT ||
+    (process.env.NODE_ENV === "production" ? "production" : "development"),
   tracesSampleRate: process.env.NODE_ENV === "production" ? 1.0 : 0,
 });