Skip to content

Fix email alert failures because of newlines in error messages (fixes #1745) #1749

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 1 commit into from
Mar 4, 2025
Merged

Fix email alert failures because of newlines in error messages (fixes #1745) #1749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 13 additions & 2 deletions internal-packages/emails/src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import MagicLinkEmail from "../emails/magic-link";
import WelcomeEmail from "../emails/welcome";
import { constructMailTransport, MailTransport, MailTransportOptions } from "./transports";

export { type MailTransportOptions }
export { type MailTransportOptions };

export const DeliverEmailSchema = z
.discriminatedUnion("email", [
Expand Down Expand Up @@ -109,7 +109,9 @@ export class EmailClient {
}
case "alert-run": {
return {
subject: `[${data.organization}] Run ${data.runId} failed for ${data.taskIdentifier} [${data.version}.${data.environment}] ${data.error.message}`,
subject: `[${data.organization}] Run ${data.runId} failed for ${data.taskIdentifier} [${
data.version
}.${data.environment}] ${formatErrorMessageForSubject(data.error.message)}`,
component: <AlertRunFailureEmail {...data} />,
};
}
Expand All @@ -128,3 +130,12 @@ export class EmailClient {
}
}
}

function formatErrorMessageForSubject(message?: string) {
if (!message) {
return "";
}

const singleLine = message.replace(/[\r\n]+/g, " ");
return singleLine.length > 30 ? singleLine.substring(0, 27) + "..." : singleLine;
Copy link
Collaborator

@nicktrn nicktrn Mar 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@samejr will shout at you for not using ellipsis

}
2 changes: 0 additions & 2 deletions references/v3-catalog/trigger.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { ffmpeg, syncEnvVars } from "@trigger.dev/build/extensions/core";
import { puppeteer } from "@trigger.dev/build/extensions/puppeteer";
import { prismaExtension } from "@trigger.dev/build/extensions/prisma";
import { emitDecoratorMetadata } from "@trigger.dev/build/extensions/typescript";
import { pythonExtension } from "@trigger.dev/python/extension";
import { defineConfig } from "@trigger.dev/sdk/v3";

export { handleError } from "./src/handleError.js";
Expand Down Expand Up @@ -87,7 +86,6 @@ export default defineConfig({
value: secret.secretValue,
}));
}),
pythonExtension(),
puppeteer(),
],
external: ["re2"],
Expand Down