From d53a6e4c42413293272e18cf4906177a3546866c Mon Sep 17 00:00:00 2001
From: Chris Eager <chris@signal.org>
Date: Tue, 12 Nov 2024 08:52:35 -0600
Subject: [PATCH] Add counter for skipped stale ephemeral MRM fetches

---
 .../whispersystems/textsecuregcm/storage/MessagesCache.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java
index 095333382..f830cf3f8 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java
@@ -140,6 +140,8 @@ public class MessagesCache {
   private final Counter mrmRetrievalErrorCounter = Metrics.counter(name(MessagesCache.class, "mrmRetrievalError"));
   private final Counter mrmPhaseTwoMissingContentCounter = Metrics.counter(
       name(MessagesCache.class, "mrmPhaseTwoMissingContent"));
+  private final Counter skippedStaleEphemeralMrmCounter = Metrics.counter(
+      name(MessagesCache.class, "skippedStaleEphemeralMrm"));
   private final Counter sharedMrmDataKeyRemovedCounter = Metrics.counter(
       name(MessagesCache.class, "sharedMrmKeyRemoved"));
 
@@ -366,6 +368,7 @@ public class MessagesCache {
                 if (isStaleEphemeralMessage(message, earliestAllowableEphemeralTimestamp)) {
                   // skip fetching content for message that will be discarded
                   messageMono = Mono.just(message.toBuilder().clearSharedMrmKey().build());
+                  skippedStaleEphemeralMrmCounter.increment();
                 } else {
                   // 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)