From d82b3dc42910b4d54d259e7c92559abef69f9a4a Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Fri, 16 Oct 2020 14:58:04 -0400
Subject: [PATCH] Record a count of deleted accounts by country.

---
 .../textsecuregcm/storage/AccountsManager.java              | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
index 112384665..2b3dcde1c 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
@@ -24,6 +24,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.lettuce.core.RedisException;
 import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
+import io.micrometer.core.instrument.Metrics;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.textsecuregcm.auth.AmbiguousIdentifier;
@@ -55,6 +56,9 @@ public class AccountsManager {
   private static final Timer redisUuidGetTimer   = metricRegistry.timer(name(AccountsManager.class, "redisUuidGet"  ));
   private static final Timer redisDeleteTimer    = metricRegistry.timer(name(AccountsManager.class, "redisDelete"   ));
 
+  private static final String DELETE_COUNTER_NAME   = name(AccountsManager.class, "deleteCounter");
+  private static final String COUNTRY_CODE_TAG_NAME = "country";
+
 
   private final Logger logger = LoggerFactory.getLogger(AccountsManager.class);
 
@@ -150,6 +154,8 @@ public class AccountsManager {
       redisDelete(account);
       databaseDelete(account);
     }
+
+    Metrics.counter(DELETE_COUNTER_NAME, COUNTRY_CODE_TAG_NAME, Util.getCountryCode(account.getNumber())).increment();
   }
 
   private void updateDirectory(Account account) {