From 2f6b0b1a558d0a36bc7e1edca2b068cd8f323fe5 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Wed, 16 Mar 2022 14:45:06 -0400
Subject: [PATCH] Tag push challenge attempt metrics by country code

---
 .../textsecuregcm/limits/PushChallengeManager.java             | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/limits/PushChallengeManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/limits/PushChallengeManager.java
index 93330085f..e9c9ccc3b 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/limits/PushChallengeManager.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/limits/PushChallengeManager.java
@@ -23,6 +23,7 @@ import org.whispersystems.textsecuregcm.push.NotPushRegisteredException;
 import org.whispersystems.textsecuregcm.storage.Account;
 import org.whispersystems.textsecuregcm.storage.Device;
 import org.whispersystems.textsecuregcm.storage.PushChallengeDynamoDb;
+import org.whispersystems.textsecuregcm.util.Util;
 import org.whispersystems.textsecuregcm.util.ua.ClientPlatform;
 
 public class PushChallengeManager {
@@ -42,6 +43,7 @@ public class PushChallengeManager {
   private static final String PLATFORM_TAG_NAME = "platform";
   private static final String SENT_TAG_NAME = "sent";
   private static final String SUCCESS_TAG_NAME = "success";
+  private static final String SOURCE_COUNTRY_TAG_NAME = "sourceCountry";
 
   public PushChallengeManager(final APNSender apnSender, final GCMSender gcmSender,
       final PushChallengeDynamoDb pushChallengeDynamoDb) {
@@ -108,6 +110,7 @@ public class PushChallengeManager {
 
     Metrics.counter(CHALLENGE_ANSWERED_COUNTER_NAME,
         PLATFORM_TAG_NAME, platform,
+        SOURCE_COUNTRY_TAG_NAME, Util.getCountryCode(account.getNumber()),
         SUCCESS_TAG_NAME, String.valueOf(success)).increment();
 
     return success;