Skip to content

Override log retention #1385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 6, 2024
Merged

Override log retention #1385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4716a14
set full log retention as admin
samejr Oct 6, 2024
e55d501
If run.logsDeletedAt is set, don’t bother getting the trace
samejr Oct 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 34 additions & 41 deletions apps/webapp/app/presenters/v3/RunPresenter.server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,13 @@ export class RunPresenter {
projectSlug,
organizationSlug,
runFriendlyId,
showDeletedLogs,
}: {
userId: string;
projectSlug: string;
organizationSlug: string;
runFriendlyId: string;
showDeletedLogs: boolean;
}) {
const run = await this.#prismaClient.taskRun.findFirstOrThrow({
select: {
Expand Down Expand Up @@ -72,31 +74,41 @@ export class RunPresenter {
},
});

const showLogs = showDeletedLogs ? true : run.logsDeletedAt ? false : true;

const runData = {
id: run.id,
number: run.number,
friendlyId: run.friendlyId,
traceId: run.traceId,
spanId: run.spanId,
status: run.status,
isFinished: isFinalRunStatus(run.status),
completedAt: run.completedAt,
logsDeletedAt: showDeletedLogs ? null : run.logsDeletedAt,
rootTaskRun: run.rootTaskRun,
environment: {
id: run.runtimeEnvironment.id,
organizationId: run.runtimeEnvironment.organizationId,
type: run.runtimeEnvironment.type,
slug: run.runtimeEnvironment.slug,
userId: run.runtimeEnvironment.orgMember?.user.id,
userName: getUsername(run.runtimeEnvironment.orgMember?.user),
},
};

if (!showLogs) {
return {
run: runData,
trace: undefined,
};
}

// get the events
const traceSummary = await eventRepository.getTraceSummary(run.traceId);

if (!traceSummary) {
return {
run: {
id: run.id,
number: run.number,
friendlyId: run.friendlyId,
traceId: run.traceId,
spanId: run.spanId,
status: run.status,
isFinished: isFinalRunStatus(run.status),
completedAt: run.completedAt,
logsDeletedAt: run.logsDeletedAt,
rootTaskRun: run.rootTaskRun,
environment: {
id: run.runtimeEnvironment.id,
organizationId: run.runtimeEnvironment.organizationId,
type: run.runtimeEnvironment.type,
slug: run.runtimeEnvironment.slug,
userId: run.runtimeEnvironment.orgMember?.user.id,
userName: getUsername(run.runtimeEnvironment.orgMember?.user),
},
},
run: runData,
trace: undefined,
};
}
Expand Down Expand Up @@ -139,26 +151,7 @@ export class RunPresenter {
}

return {
run: {
id: run.id,
number: run.number,
friendlyId: run.friendlyId,
traceId: run.traceId,
spanId: run.spanId,
status: run.status,
isFinished: isFinalRunStatus(run.status),
completedAt: run.completedAt,
logsDeletedAt: run.logsDeletedAt,
rootTaskRun: run.rootTaskRun,
environment: {
id: run.runtimeEnvironment.id,
organizationId: run.runtimeEnvironment.organizationId,
type: run.runtimeEnvironment.type,
slug: run.runtimeEnvironment.slug,
userId: run.runtimeEnvironment.orgMember?.user.id,
userName: getUsername(run.runtimeEnvironment.orgMember?.user),
},
},
run: runData,
trace: {
rootSpanStatus,
events: events,
Expand Down
3 changes: 3 additions & 0 deletions ...app/routes/_app.orgs.$organizationSlug.projects.v3.$projectParam.runs.$runParam/route.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ import {
import { SpanView } from "../resources.orgs.$organizationSlug.projects.v3.$projectParam.runs.$runParam.spans.$spanParam/route";
import { useCurrentPlan } from "../_app.orgs.$organizationSlug/route";
import { getResizableSnapshot } from "~/services/resizablePanel.server";
import { getImpersonationId } from "~/services/impersonation.server";

const resizableSettings = {
parent: {
Expand Down Expand Up @@ -115,12 +116,14 @@ type TraceEvent = NonNullable<SerializeFrom<typeof loader>["trace"]>["events"][0

export const loader = async ({ request, params }: LoaderFunctionArgs) => {
const userId = await requireUserId(request);
const impersonationId = await getImpersonationId(request);
const { projectParam, organizationSlug, runParam } = v3RunParamsSchema.parse(params);

const presenter = new RunPresenter();
const result = await presenter.call({
userId,
organizationSlug,
showDeletedLogs: !!impersonationId,
projectSlug: projectParam,
runFriendlyId: runParam,
});
Expand Down