From 0445adcac33a6aeafc0e4730492443306c03ff10 Mon Sep 17 00:00:00 2001
From: Chris Eager <chris@signal.org>
Date: Fri, 25 Mar 2022 18:16:00 -0700
Subject: [PATCH] Conclude `ReportMessageManager` ACI migration

---
 .../storage/ReportMessageManager.java         | 43 ++++---------------
 .../storage/ReportMessageManagerTest.java     |  2 +-
 2 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/ReportMessageManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/ReportMessageManager.java
index b4f395b73..5e078fd99 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/ReportMessageManager.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/ReportMessageManager.java
@@ -1,9 +1,11 @@
+/*
+ * Copyright 2021-2022 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
 package org.whispersystems.textsecuregcm.storage;
 
-import static org.whispersystems.textsecuregcm.metrics.MetricsUtil.name;
-
 import io.lettuce.core.RedisException;
-import io.micrometer.core.instrument.Metrics;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -20,8 +22,6 @@ import org.whispersystems.textsecuregcm.util.UUIDUtil;
 
 public class ReportMessageManager {
 
-  private static final String MIGRATION_COUNTER_NAME = name(ReportMessageManager.class, "migration");
-
   private final ReportMessageDynamoDb reportMessageDynamoDb;
   private final FaultTolerantRedisCluster rateLimitCluster;
 
@@ -59,21 +59,11 @@ public class ReportMessageManager {
   public void report(Optional<String> sourceNumber, Optional<UUID> sourceAci, Optional<UUID> sourcePni,
       UUID messageGuid, UUID reporterUuid) {
 
-    // TODO sourceNumber can be removed after 2022-04-15
-    final boolean foundByNumber = sourceNumber.map(number -> reportMessageDynamoDb.remove(hash(messageGuid, number)))
+    final boolean found = sourceAci.map(uuid -> reportMessageDynamoDb.remove(hash(messageGuid, uuid.toString())))
         .orElse(false);
 
-    final boolean foundByAci = sourceAci.map(uuid -> reportMessageDynamoDb.remove(hash(messageGuid, uuid.toString()))).
-        orElse(false);
-
-    if (foundByNumber || foundByAci) {
+    if (found) {
       rateLimitCluster.useCluster(connection -> {
-        sourceNumber.ifPresent(number -> {
-          final String reportedSenderKey = getReportedSenderKey(number);
-          connection.sync().pfadd(reportedSenderKey, reporterUuid.toString());
-          connection.sync().expire(reportedSenderKey, counterTtl.toSeconds());
-        });
-
         sourcePni.ifPresent(pni -> {
           final String reportedSenderKey = getReportedSenderPniKey(pni);
           connection.sync().pfadd(reportedSenderKey, reporterUuid.toString());
@@ -96,15 +86,6 @@ public class ReportMessageManager {
             }
           }));
     }
-
-    Metrics.counter(
-        MIGRATION_COUNTER_NAME,
-        "foundByNumber", String.valueOf(foundByNumber),
-        "foundByAci", String.valueOf(foundByAci),
-        "sourceAciPresent", String.valueOf(sourceAci.isPresent()),
-        "sourcePniPresent", String.valueOf(sourcePni.isPresent()),
-        "sourceNumberPresent", String.valueOf(sourceNumber.isPresent())
-    ).increment();
   }
 
   /**
@@ -120,11 +101,7 @@ public class ReportMessageManager {
       return rateLimitCluster.withCluster(
           connection ->
               Math.max(
-                  Math.max(
-                      // TODO number can be removed after 2022-04-15
-                      connection.sync().pfcount(getReportedSenderKey(account.getNumber())).intValue(),
-                      connection.sync().pfcount(getReportedSenderPniKey(account.getPhoneNumberIdentifier()))
-                          .intValue()),
+                  connection.sync().pfcount(getReportedSenderPniKey(account.getPhoneNumberIdentifier())).intValue(),
                   connection.sync().pfcount(getReportedSenderAciKey(account.getUuid())).intValue()));
     } catch (final RedisException e) {
       return 0;
@@ -145,10 +122,6 @@ public class ReportMessageManager {
     return sha256.digest();
   }
 
-  private static String getReportedSenderKey(final String senderNumber) {
-    return "reported_number::" + senderNumber;
-  }
-
   private static String getReportedSenderAciKey(final UUID aci) {
     return "reported_account::" + aci.toString();
   }
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/storage/ReportMessageManagerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/storage/ReportMessageManagerTest.java
index df7c35adc..cd1345fc3 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/storage/ReportMessageManagerTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/storage/ReportMessageManagerTest.java
@@ -126,7 +126,7 @@ class ReportMessageManagerTest {
     assertEquals(0, reportMessageManager.getRecentReportCount(sourceAccount));
 
     for (int i = 0; i < 100; i++) {
-      reportMessageManager.report(Optional.of(sourceNumber), Optional.empty(), Optional.of(sourcePni),
+      reportMessageManager.report(Optional.empty(), Optional.of(sourceAci), Optional.of(sourcePni),
           messageGuid, UUID.randomUUID());
     }