AttachmentDownloadManager: Don't log errors/warnings in common cases

ts/jobs/AttachmentDownloadManager.ts

@@ -64,6 +64,7 @@ import {
 import { formatCountForLogging } from '../logging/formatCountForLogging';
 import { strictAssert } from '../util/assert';
 import { updateBackupMediaDownloadProgress } from '../util/updateBackupMediaDownloadProgress';
+import { HTTPError } from '../textsecure/Errors';
 
 const log = createLogger('AttachmentDownloadManager');
 
@@ -447,7 +448,7 @@ async function runDownloadAttachmentJob({
   const message = await getMessageById(job.messageId);
 
   if (!message) {
-    log.error(`${logId} message not found`);
+    log.info(`${logId} message not found, returning early`);
     return { status: 'finished' };
   }
 
@@ -476,9 +477,8 @@ async function runDownloadAttachmentJob({
     };
   } catch (error) {
     if (options.abortSignal.aborted) {
-      log.warn(
-        `${logId}: Cancelled attempt ${job.attempts}. Not scheduling a retry. Error:`,
-        Errors.toLogFormat(error)
+      log.info(
+        `${logId}: Cancelled attempt ${job.attempts}. Not scheduling a retry.`
       );
       // Remove `pending` flag from the attachment. User can retry later.
       await addAttachmentToMessage(
@@ -493,12 +493,8 @@ async function runDownloadAttachmentJob({
       return { status: 'finished' };
     }
 
-    log.error(
-      `${logId}: Failed to download attachment, attempt ${job.attempts}:`,
-      Errors.toLogFormat(error)
-    );
-
     if (error instanceof AttachmentSizeError) {
+      log.info(`${logId}: Attachment is too big.`);
       await addAttachmentToMessage(
         message.id,
         _markAttachmentAsTooBig(job.attachment),
@@ -517,10 +513,15 @@ async function runDownloadAttachmentJob({
         );
 
       if (job.source !== AttachmentDownloadSource.BACKFILL && canBackfill) {
+        log.info(
+          `${logId}: Attachment is permanently undownloadable, requesting backfill.`
+        );
         await AttachmentDownloadManager.requestBackfill(message.attributes);
         return { status: 'finished' };
       }
 
+      log.info(`${logId}: Attachment is permanently undownloadable.`);
+
       await addAttachmentToMessage(
         message.id,
         markAttachmentAsPermanentlyErrored(job.attachment, {
@@ -533,6 +534,13 @@ async function runDownloadAttachmentJob({
       return { status: 'finished' };
     }
 
+    const logText = `${logId}: Failed to fetch attachment, attempt ${job.attempts}: ${Errors.toLogFormat(error)}`;
+    if (error instanceof HTTPError) {
+      log.info(logText);
+    } else {
+      log.warn(logText);
+    }
+
     if (isLastAttempt) {
       await addAttachmentToMessage(
         message.id,

ts/textsecure/MessageReceiver.ts

@@ -413,7 +413,7 @@ export default class MessageReceiver
         const envelope: ProcessedEnvelope = {
           // Make non-private envelope IDs dashless so they don't get redacted
           //   from logs
-          id: getGuid().replace(/-/g, ''),
+          id: getGuid().replace(/-/g, '.'),
           receivedAtCounter: incrementMessageCounter(),
           receivedAtDate: Date.now(),
           // Calculate the message age (time on server).

ts/types/errors.ts

@@ -1,8 +1,15 @@
 // Copyright 2018 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
+import { HTTPError } from '../textsecure/Errors';
+
 export function toLogFormat(error: unknown): string {
   let result = '';
+
+  if (error instanceof HTTPError) {
+    return `HTTPError ${error.code}`;
+  }
+
   if (error instanceof Error && error.stack) {
     result = error.stack;
   } else if (error && typeof error === 'object' && 'message' in error) {