MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add counter for skipped stale ephemeral MRM fetches

This commit is contained in:
Chris Eager 2024-11-12 08:52:35 -06:00 committed by Chris Eager
parent 744042e8c8
commit d53a6e4c42
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java
View File

@ -140,6 +140,8 @@ public class MessagesCache {
private final Counter mrmRetrievalErrorCounter = Metrics.counter(name(MessagesCache.class, "mrmRetrievalError")); private final Counter mrmRetrievalErrorCounter = Metrics.counter(name(MessagesCache.class, "mrmRetrievalError"));
private final Counter mrmPhaseTwoMissingContentCounter = Metrics.counter( private final Counter mrmPhaseTwoMissingContentCounter = Metrics.counter(
name(MessagesCache.class, "mrmPhaseTwoMissingContent")); name(MessagesCache.class, "mrmPhaseTwoMissingContent"));
private final Counter skippedStaleEphemeralMrmCounter = Metrics.counter(
name(MessagesCache.class, "skippedStaleEphemeralMrm"));
private final Counter sharedMrmDataKeyRemovedCounter = Metrics.counter( private final Counter sharedMrmDataKeyRemovedCounter = Metrics.counter(
name(MessagesCache.class, "sharedMrmKeyRemoved")); name(MessagesCache.class, "sharedMrmKeyRemoved"));
@ -366,6 +368,7 @@ public class MessagesCache {
if (isStaleEphemeralMessage(message, earliestAllowableEphemeralTimestamp)) { if (isStaleEphemeralMessage(message, earliestAllowableEphemeralTimestamp)) {
// skip fetching content for message that will be discarded // skip fetching content for message that will be discarded
messageMono = Mono.just(message.toBuilder().clearSharedMrmKey().build()); messageMono = Mono.just(message.toBuilder().clearSharedMrmKey().build());
skippedStaleEphemeralMrmCounter.increment();
} else { } else {
// mrm views phase 2: fetch shared MRM data -- internally depends on dynamic config that // mrm views phase 2: fetch shared MRM data -- internally depends on dynamic config that
// enables fetching and using it (the stored messages still always have `content` set upstream) // enables fetching and using it (the stored messages still always have `content` set upstream)