Skip to content

Commit cdacca5

Browse files
committed
fix(webapp): sanitize metadata and webhook error logs
1 parent 802e613 commit cdacca5

2 files changed

Lines changed: 22 additions & 8 deletions

File tree

apps/webapp/app/services/metadata/updateMetadata.server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ export class UpdateMetadataService {
573573
if (this.flushLoggingEnabled) {
574574
this.logger.debug(`[updateRunMetadataDirectly] Updating metadata directly for run`, {
575575
runId,
576-
metadataSizeBytes: metadataPacket.data?.length ?? 0,
576+
metadataSizeBytes: Buffer.byteLength(metadataPacket.data ?? "", "utf8"),
577577
});
578578
}
579579

apps/webapp/app/v3/services/alerts/deliverAlert.server.ts

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,10 @@ export class DeliverAlertService extends BaseService {
455455
error,
456456
};
457457

458-
await this.#deliverWebhook(payload, webhookProperties.data, { webhookId: alert.channel.id, runId: alert.taskRun.friendlyId });
458+
await this.#deliverWebhook(payload, webhookProperties.data, {
459+
webhookId: alert.channel.id,
460+
runId: alert.taskRun.friendlyId,
461+
});
459462
break;
460463
}
461464
case "v2": {
@@ -516,7 +519,10 @@ export class DeliverAlertService extends BaseService {
516519
},
517520
};
518521

519-
await this.#deliverWebhook(payload, webhookProperties.data, { webhookId: alert.channel.id, runId: alert.taskRun.friendlyId });
522+
await this.#deliverWebhook(payload, webhookProperties.data, {
523+
webhookId: alert.channel.id,
524+
runId: alert.taskRun.friendlyId,
525+
});
520526

521527
break;
522528
}
@@ -577,7 +583,9 @@ export class DeliverAlertService extends BaseService {
577583
vercel: this.#buildWebhookVercelObject(deploymentMeta.vercelDeploymentUrl),
578584
};
579585

580-
await this.#deliverWebhook(payload, webhookProperties.data, { webhookId: alert.channel.id });
586+
await this.#deliverWebhook(payload, webhookProperties.data, {
587+
webhookId: alert.channel.id,
588+
});
581589
break;
582590
}
583591
case "v2": {
@@ -616,7 +624,9 @@ export class DeliverAlertService extends BaseService {
616624
},
617625
};
618626

619-
await this.#deliverWebhook(payload, webhookProperties.data, { webhookId: alert.channel.id });
627+
await this.#deliverWebhook(payload, webhookProperties.data, {
628+
webhookId: alert.channel.id,
629+
});
620630

621631
break;
622632
}
@@ -671,7 +681,9 @@ export class DeliverAlertService extends BaseService {
671681
vercel: this.#buildWebhookVercelObject(deploymentMeta.vercelDeploymentUrl),
672682
};
673683

674-
await this.#deliverWebhook(payload, webhookProperties.data, { webhookId: alert.channel.id });
684+
await this.#deliverWebhook(payload, webhookProperties.data, {
685+
webhookId: alert.channel.id,
686+
});
675687
break;
676688
}
677689
case "v2": {
@@ -716,7 +728,9 @@ export class DeliverAlertService extends BaseService {
716728
},
717729
};
718730

719-
await this.#deliverWebhook(payload, webhookProperties.data, { webhookId: alert.channel.id });
731+
await this.#deliverWebhook(payload, webhookProperties.data, {
732+
webhookId: alert.channel.id,
733+
});
720734

721735
break;
722736
}
@@ -1060,7 +1074,7 @@ export class DeliverAlertService extends BaseService {
10601074
runId: context.runId,
10611075
});
10621076

1063-
throw new Error(`Failed to send alert webhook to ${webhook.url}`);
1077+
throw new Error(`Failed to send alert webhook to ${safeUrlHost(webhook.url)}`);
10641078
}
10651079
}
10661080

0 commit comments

Comments
 (0)