Merge branch 'charlesmchen/decryptDeduplicationLogging' into release/5.20.4

Author: charlesmchen-signal

SignalServiceKit/src/Messages/MessageProcessor.swift

@@ -540,6 +540,9 @@ class MessageDecryptDeduplicationRecord: Codable, FetchableRecord, PersistableRe
                 cull(latestServiceTimestamp: serviceTimestamp, transaction: transaction)
             }
 
+            if DebugFlags.internalLogging {
+                Logger.info("Proceeding with serviceTimestamp: \(serviceTimestamp), serverGuid: \(serverGuid)")
+            }
             return .nonDuplicate
         } catch {
             owsFailDebug("Error: \(error)")

SignalServiceKit/src/Messages/OWSMessageDecrypter.swift

@@ -290,7 +290,7 @@ public class OWSMessageDecrypter: OWSMessageHandler {
         contentHint: SealedSenderContentHint,
         transaction: SDSAnyWriteTransaction
     ) -> Error {
-        let logString = "Error while decrypting \(Self.description(forEnvelopeType: envelope)) message: \(error)"
+        let logString = "Error while decrypting \(Self.description(for: envelope)), error: \(error)"
 
         if case SignalError.duplicatedMessage(_) = error {
             Logger.info(logString)

SignalServiceKit/src/Messages/OWSMessageHandler.m

@@ -55,10 +55,13 @@ + (NSString *)descriptionForEnvelope:(SSKProtoEnvelope *)envelope
 {
     OWSAssertDebug(envelope != nil);
 
-    return [NSString stringWithFormat:@"<Envelope type: %@, source: %@, timestamp: %llu content.length: %lu />",
+    return [NSString stringWithFormat:@"<Envelope type: %@, source: %@, timestamp: %llu, serverTimestamp: %llu, "
+                                      @"serverGuid: %@, content.length: %lu />",
                      [self descriptionForEnvelopeType:envelope],
                      envelopeAddress(envelope),
                      envelope.timestamp,
+                     envelope.serverTimestamp,
+                     envelope.serverGuid,
                      (unsigned long)envelope.content.length];
 }