From da5d9779d4d1a4553aeb8924d34349432e4fbaa4 Mon Sep 17 00:00:00 2001
From: Matt Aitken <matt@mattaitken.com>
Date: Thu, 6 Jul 2023 21:03:20 +0100
Subject: [PATCH] Check if the Highlight id is defined before attempting to
 send the error

---
 apps/webapp/app/entry.server.tsx | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/apps/webapp/app/entry.server.tsx b/apps/webapp/app/entry.server.tsx
index 61b7019c8..c416d183b 100644
--- a/apps/webapp/app/entry.server.tsx
+++ b/apps/webapp/app/entry.server.tsx
@@ -165,17 +165,19 @@ Worker.init().catch((error) => {
 });
 
 function logError(error: unknown, request?: Request) {
-  const parsed = request
-    ? H.parseHeaders(Object.fromEntries(request.headers))
-    : undefined;
-  if (error instanceof Error) {
-    H.consumeError(error, parsed?.secureSessionId, parsed?.requestId);
-  } else {
-    H.consumeError(
-      new Error(`Unknown error: ${JSON.stringify(error)}`),
-      parsed?.secureSessionId,
-      parsed?.requestId
-    );
+  if (env.HIGHLIGHT_PROJECT_ID) {
+    const parsed = request
+      ? H.parseHeaders(Object.fromEntries(request.headers))
+      : undefined;
+    if (error instanceof Error) {
+      H.consumeError(error, parsed?.secureSessionId, parsed?.requestId);
+    } else {
+      H.consumeError(
+        new Error(`Unknown error: ${JSON.stringify(error)}`),
+        parsed?.secureSessionId,
+        parsed?.requestId
+      );
+    }
   }
   console.error(error);
 }