patch @sentry/remix to prevent memory leaks

Author: ericallam

apps/webapp/app/presenters/v3/TaskListPresenter.server.ts

@@ -12,7 +12,6 @@ import {
   type DailyTaskActivity,
   type EnvironmentMetricsRepository,
 } from "~/services/environmentMetricsRepository.server";
-import { singleton } from "~/utils/singleton";
 import { findCurrentWorkerFromEnvironment } from "~/v3/models/workerDeployment.server";
 
 export type TaskListItem = {
@@ -106,9 +105,7 @@ export class TaskListPresenter {
   }
 }
 
-export const taskListPresenter = singleton("taskListPresenter", setupTaskListPresenter);
-
-function setupTaskListPresenter() {
+export function getTaskListPresenter() {
   const environmentMetricsRepository = new ClickHouseEnvironmentMetricsRepository({
     clickhouse: clickhouseClient,
   });

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam._index/route.tsx

@@ -74,9 +74,9 @@ import { useProject } from "~/hooks/useProject";
 import { findProjectBySlug } from "~/models/project.server";
 import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
 import {
+  getTaskListPresenter,
   type TaskActivity,
   type TaskListItem,
-  taskListPresenter,
 } from "~/presenters/v3/TaskListPresenter.server";
 import {
   getUsefulLinksPreference,
@@ -124,6 +124,8 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
   }
 
   try {
+    const taskListPresenter = getTaskListPresenter();
+
     const { tasks, activity, runningStats, durations } = await taskListPresenter.call({
       organizationId: project.organizationId,
       projectId: project.id,

apps/webapp/app/routes/admin.api.v1.gc.ts

@@ -2,7 +2,8 @@ import { type DataFunctionArgs } from "@remix-run/node";
 import { PerformanceObserver } from "node:perf_hooks";
 import { runInNewContext } from "node:vm";
 import v8 from "v8";
-import { requireUser } from "~/services/session.server";
+import { prisma } from "~/db.server";
+import { authenticateApiRequestWithPersonalAccessToken } from "~/services/personalAccessToken.server";
 
 async function waitTillGcFinishes() {
   let resolver: (value: PerformanceEntry) => void;
@@ -35,9 +36,19 @@ async function waitTillGcFinishes() {
 }
 
 export async function loader({ request }: DataFunctionArgs) {
-  const user = await requireUser(request);
+  const authenticationResult = await authenticateApiRequestWithPersonalAccessToken(request);
 
-  if (!user.admin) {
+  if (!authenticationResult) {
+    throw new Response("You must be an admin to perform this action", { status: 403 });
+  }
+
+  const user = await prisma.user.findFirst({
+    where: {
+      id: authenticationResult.userId,
+    },
+  });
+
+  if (!user?.admin) {
     throw new Response("You must be an admin to perform this action", { status: 403 });
   }
 

apps/webapp/app/routes/api.v1.mock.ts

@@ -0,0 +1,20 @@
+import { ActionFunctionArgs } from "@remix-run/server-runtime";
+
+export async function action({ request }: ActionFunctionArgs) {
+  if (process.env.NODE_ENV === "production") {
+    return new Response("Not found", { status: 404 });
+  }
+
+  return new Response(
+    JSON.stringify({
+      data: {
+        id: "123",
+        type: "mock",
+        attributes: {
+          name: "Mock",
+        },
+      },
+    }),
+    { status: 200 }
+  );
+}

apps/webapp/app/v3/scheduleEngine.server.ts

@@ -47,6 +47,9 @@ async function isDevEnvironmentConnectedHandler(environmentId: string) {
   return v4Connected;
 }
 
+// This will trigger either v1 or v2 depending on the engine of the project
+const triggerService = new TriggerTaskService();
+
 function createScheduleEngine() {
   const engine = new ScheduleEngine({
     prisma,
@@ -82,9 +85,6 @@ function createScheduleEngine() {
       exactScheduleTime,
     }) => {
       try {
-        // This will trigger either v1 or v2 depending on the engine of the project
-        const triggerService = new TriggerTaskService();
-
         const payloadPacket = await stringifyIO(payload);
 
         logger.debug("Triggering scheduled task", {

package.json

@@ -79,7 +79,8 @@
       "[email protected]": "patches/[email protected]",
       "[email protected]": "patches/[email protected]",
       "[email protected]": "patches/[email protected]",
-      "@kubernetes/[email protected]": "patches/@[email protected]"
+      "@kubernetes/[email protected]": "patches/@[email protected]",
+      "@sentry/[email protected]": "patches/@[email protected]"
     },
     "overrides": {
       "express@^4>body-parser": "1.20.3",

patches/@[email protected]

@@ -0,0 +1,39 @@
+diff --git a/build/cjs/vendor/instrumentation.js b/build/cjs/vendor/instrumentation.js
+index 84e18d1051f57d5807e65c8b8ce858ceee7d4557..640a5253d565650338fe33e0ea52c8dffc63e4e7 100644
+--- a/build/cjs/vendor/instrumentation.js
++++ b/build/cjs/vendor/instrumentation.js
+@@ -238,7 +238,7 @@ class RemixInstrumentation extends instrumentation.InstrumentationBase {
+     return function callRouteAction(original) {
+       return async function patchCallRouteAction( ...args) {
+         const [params] = args;
+-        const clonedRequest = params.request.clone();
++        const clonedRequest = params.request;
+         const span = plugin.tracer.startSpan(
+           `ACTION ${params.routeId}`,
+           { attributes: { [semanticConventions.SemanticAttributes.CODE_FUNCTION]: 'action' } },
+@@ -257,25 +257,6 @@ class RemixInstrumentation extends instrumentation.InstrumentationBase {
+               .then(async response => {
+                 addResponseAttributesToSpan(span, response);
+ 
+-                try {
+-                  const formData = await clonedRequest.formData();
+-                  const { actionFormDataAttributes: actionFormAttributes } = plugin.getConfig();
+-
+-                  formData.forEach((value, key) => {
+-                    if (
+-                      actionFormAttributes?.[key] &&
+-                      actionFormAttributes[key] !== false &&
+-                      typeof value === 'string'
+-                    ) {
+-                      const keyName = actionFormAttributes[key] === true ? key : actionFormAttributes[key];
+-                      span.setAttribute(`formData.${keyName}`, value.toString());
+-                    }
+-                  });
+-                } catch {
+-                  // Silently continue on any error. Typically happens because the action body cannot be processed
+-                  // into FormData, in which case we should just continue.
+-                }
+-
+                 return response;
+               })
+               .catch(async error => {