Skip to content

Commit 63a221a

Browse files
authored
Only include v4 debug logs for admins (#1910)
* fix retry spans * only download debug logs if admin
1 parent 030c8ae commit 63a221a

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

apps/webapp/app/routes/resources.runs.$runParam.logs.download.ts

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
import { LoaderFunctionArgs } from "@remix-run/server-runtime";
22
import { prisma } from "~/db.server";
3-
import { requireUserId } from "~/services/session.server";
3+
import { requireUser } from "~/services/session.server";
44
import { v3RunParamsSchema } from "~/utils/pathBuilder";
5-
import { PreparedEvent, RunPreparedEvent, eventRepository } from "~/v3/eventRepository.server";
5+
import { RunPreparedEvent, eventRepository } from "~/v3/eventRepository.server";
66
import { createGzip } from "zlib";
77
import { Readable } from "stream";
88
import { formatDurationMilliseconds } from "@trigger.dev/core/v3/utils/durations";
99
import { getDateFromNanoseconds } from "~/utils/taskEvent";
1010
import { getTaskEventStoreTableForRun } from "~/v3/taskEventStore.server";
11+
import { TaskEventKind } from "@trigger.dev/database";
1112

1213
export async function loader({ params, request }: LoaderFunctionArgs) {
13-
const userId = await requireUserId(request);
14+
const user = await requireUser(request);
1415
const parsedParams = v3RunParamsSchema.pick({ runParam: true }).parse(params);
1516

1617
const run = await prisma.taskRun.findFirst({
@@ -20,7 +21,7 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
2021
organization: {
2122
members: {
2223
some: {
23-
userId,
24+
userId: user.id,
2425
},
2526
},
2627
},
@@ -44,6 +45,10 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
4445
read() {
4546
runEvents.forEach((event) => {
4647
try {
48+
if (!user.admin && event.kind === TaskEventKind.LOG) {
49+
// Only return debug logs for admins
50+
return;
51+
}
4752
this.push(formatRunEvent(event) + "\n");
4853
} catch {}
4954
});

0 commit comments

Comments
 (0)